Author: dkulp
Date: Fri Jul 17 17:37:42 2009
New Revision: 795161
URL: http://svn.apache.org/viewvc?rev=795161&view=rev
Log:
Merged revisions 794892 via svnmerge from
https://svn.apache.org/repos/asf/cxf/trunk
........
r794892 | peterjones | 2009-07-16 18:34:34 -0400 (Thu, 16 Jul 2009) | 4 lines
[CXF-2341] Remove exclusion of jaxp-api which is needed when using ibm jdk 5.
Also, added a null check to avoid a NullPointerException seen when running
the WSDLValidationTest.
........
Modified:
cxf/branches/2.2.x-fixes/ (props changed)
cxf/branches/2.2.x-fixes/common/common/src/main/java/org/apache/cxf/helpers/WSDLHelper.java
cxf/branches/2.2.x-fixes/parent/pom.xml
cxf/branches/2.2.x-fixes/rt/javascript/src/test/java/org/apache/cxf/javascript/GreeterClientTest.java
cxf/branches/2.2.x-fixes/tools/validator/src/test/java/org/apache/cxf/tools/validator/WSDLValidationTest.java
Propchange: cxf/branches/2.2.x-fixes/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Jul 17 17:37:42 2009
@@ -1 +1 @@
-/cxf/trunk:782728-782730,783097,783294,783396,784059,784181-784184,784893,784895,785279-785282,785468,785621,785624,785651,785734,785866,786142,786271-786272,786395,786512,786514,786582-786583,786638,786647,786850,787200,787269,787277-787279,787290-787291,787305,787323,787366,787849,788030,788060,788187,788444,788451,788703,788752,788774,788819-788820,789013,789371,789387,789420,789527-789530,789704-789705,789788,789811,789896-789901,790074,790094,790134,790188,790294,790553,790637-790644,790868,791301,791354,791538,791753,791947,792007,792096,792183,792261-792265,792271,792604,792683-792685,792975,792985,793059,793570,794297,794396,794680,794728,794771,794778-794780,795044,795104
+/cxf/trunk:782728-782730,783097,783294,783396,784059,784181-784184,784893,784895,785279-785282,785468,785621,785624,785651,785734,785866,786142,786271-786272,786395,786512,786514,786582-786583,786638,786647,786850,787200,787269,787277-787279,787290-787291,787305,787323,787366,787849,788030,788060,788187,788444,788451,788703,788752,788774,788819-788820,789013,789371,789387,789420,789527-789530,789704-789705,789788,789811,789896-789901,790074,790094,790134,790188,790294,790553,790637-790644,790868,791301,791354,791538,791753,791947,792007,792096,792183,792261-792265,792271,792604,792683-792685,792975,792985,793059,793570,794297,794396,794680,794728,794771,794778-794780,794892,795044,795104
Propchange: cxf/branches/2.2.x-fixes/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.
Modified:
cxf/branches/2.2.x-fixes/common/common/src/main/java/org/apache/cxf/helpers/WSDLHelper.java
URL:
http://svn.apache.org/viewvc/cxf/branches/2.2.x-fixes/common/common/src/main/java/org/apache/cxf/helpers/WSDLHelper.java?rev=795161&r1=795160&r2=795161&view=diff
==============================================================================
---
cxf/branches/2.2.x-fixes/common/common/src/main/java/org/apache/cxf/helpers/WSDLHelper.java
(original)
+++
cxf/branches/2.2.x-fixes/common/common/src/main/java/org/apache/cxf/helpers/WSDLHelper.java
Fri Jul 17 17:37:42 2009
@@ -97,7 +97,7 @@
public List<Part> getInMessageParts(Operation operation) {
Input input = operation.getInput();
List<Part> partsList = new ArrayList<Part>();
- if (input != null) {
+ if (input != null && input.getMessage() != null) {
Iterator ite = input.getMessage().getParts().values().iterator();
while (ite.hasNext()) {
partsList.add((Part)ite.next());
@@ -109,7 +109,7 @@
public List<Part> getOutMessageParts(Operation operation) {
Output output = operation.getOutput();
List<Part> partsList = new ArrayList<Part>();
- if (output != null) {
+ if (output != null && output.getMessage() != null) {
Iterator ite = output.getMessage().getParts().values().iterator();
while (ite.hasNext()) {
partsList.add((Part)ite.next());
Modified: cxf/branches/2.2.x-fixes/parent/pom.xml
URL:
http://svn.apache.org/viewvc/cxf/branches/2.2.x-fixes/parent/pom.xml?rev=795161&r1=795160&r2=795161&view=diff
==============================================================================
--- cxf/branches/2.2.x-fixes/parent/pom.xml (original)
+++ cxf/branches/2.2.x-fixes/parent/pom.xml Fri Jul 17 17:37:42 2009
@@ -474,12 +474,6 @@
<groupId>com.sun.xml.parsers</groupId>
<artifactId>jaxp-ri</artifactId>
<version>1.4.2</version>
- <exclusions>
- <exclusion>
- <groupId>javax.xml.parsers</groupId>
- <artifactId>jaxp-api</artifactId>
- </exclusion>
- </exclusions>
</dependency>
<dependency>
<groupId>org.apache.servicemix</groupId>
Modified:
cxf/branches/2.2.x-fixes/rt/javascript/src/test/java/org/apache/cxf/javascript/GreeterClientTest.java
URL:
http://svn.apache.org/viewvc/cxf/branches/2.2.x-fixes/rt/javascript/src/test/java/org/apache/cxf/javascript/GreeterClientTest.java?rev=795161&r1=795160&r2=795161&view=diff
==============================================================================
---
cxf/branches/2.2.x-fixes/rt/javascript/src/test/java/org/apache/cxf/javascript/GreeterClientTest.java
(original)
+++
cxf/branches/2.2.x-fixes/rt/javascript/src/test/java/org/apache/cxf/javascript/GreeterClientTest.java
Fri Jul 17 17:37:42 2009
@@ -58,7 +58,7 @@
testUtilities.rhinoCallConvert("sayHiTest", Notifier.class,
testUtilities.javaToJS(getAddress()));
- boolean notified = notifier.waitForJavascript(1000 * 10);
+ boolean notified = notifier.waitForJavascript(1000 * 15);
assertTrue(notified);
Integer errorStatus =
testUtilities.rhinoEvaluateConvert("globalErrorStatus", Integer.class);
assertNull(errorStatus);
@@ -86,7 +86,7 @@
testUtilities.rhinoCallConvert("requestClosureTest",
CountDownNotifier.class,
testUtilities.javaToJS(getAddress()));
- boolean notified = notifier.waitForJavascript(1000 * 10);
+ boolean notified = notifier.waitForJavascript(1000 * 15);
assertTrue(notified);
Integer errorStatus =
testUtilities.rhinoEvaluateConvert("globalErrorStatus", Integer.class);
assertNull(errorStatus);
Modified:
cxf/branches/2.2.x-fixes/tools/validator/src/test/java/org/apache/cxf/tools/validator/WSDLValidationTest.java
URL:
http://svn.apache.org/viewvc/cxf/branches/2.2.x-fixes/tools/validator/src/test/java/org/apache/cxf/tools/validator/WSDLValidationTest.java?rev=795161&r1=795160&r2=795161&view=diff
==============================================================================
---
cxf/branches/2.2.x-fixes/tools/validator/src/test/java/org/apache/cxf/tools/validator/WSDLValidationTest.java
(original)
+++
cxf/branches/2.2.x-fixes/tools/validator/src/test/java/org/apache/cxf/tools/validator/WSDLValidationTest.java
Fri Jul 17 17:37:42 2009
@@ -87,7 +87,8 @@
String error = getStdErr();
if (StaxUtils.isWoodstox()) {
// sjsxp doesn't report locations.
- assertTrue(error.indexOf("[147,3]") != -1);
+ assertTrue("error message does not contain [147,3]. error message:
"
+ + error, error.indexOf("[147,3]") != -1);
}
assertTrue(error.indexOf("Caused by
{http://apache.org/hello_world_soap_http}";
+ "[binding:Greeter_SOAPBinding1] not
exist.") != -1);
