You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by pe...@apache.org on 2009/07/17 00:34:35 UTC
svn commit: r794892 - in /cxf/trunk:
common/common/src/main/java/org/apache/cxf/helpers/ parent/
rt/javascript/src/test/java/org/apache/cxf/javascript/
tools/validator/src/test/java/org/apache/cxf/tools/validator/
Author: peterjones
Date: Thu Jul 16 22:34:34 2009
New Revision: 794892
URL: http://svn.apache.org/viewvc?rev=794892&view=rev
Log:
[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/trunk/common/common/src/main/java/org/apache/cxf/helpers/WSDLHelper.java
cxf/trunk/parent/pom.xml
cxf/trunk/rt/javascript/src/test/java/org/apache/cxf/javascript/GreeterClientTest.java
cxf/trunk/tools/validator/src/test/java/org/apache/cxf/tools/validator/WSDLValidationTest.java
Modified: cxf/trunk/common/common/src/main/java/org/apache/cxf/helpers/WSDLHelper.java
URL: http://svn.apache.org/viewvc/cxf/trunk/common/common/src/main/java/org/apache/cxf/helpers/WSDLHelper.java?rev=794892&r1=794891&r2=794892&view=diff
==============================================================================
--- cxf/trunk/common/common/src/main/java/org/apache/cxf/helpers/WSDLHelper.java (original)
+++ cxf/trunk/common/common/src/main/java/org/apache/cxf/helpers/WSDLHelper.java Thu Jul 16 22:34:34 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/trunk/parent/pom.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/parent/pom.xml?rev=794892&r1=794891&r2=794892&view=diff
==============================================================================
--- cxf/trunk/parent/pom.xml (original)
+++ cxf/trunk/parent/pom.xml Thu Jul 16 22:34:34 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/trunk/rt/javascript/src/test/java/org/apache/cxf/javascript/GreeterClientTest.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/javascript/src/test/java/org/apache/cxf/javascript/GreeterClientTest.java?rev=794892&r1=794891&r2=794892&view=diff
==============================================================================
--- cxf/trunk/rt/javascript/src/test/java/org/apache/cxf/javascript/GreeterClientTest.java (original)
+++ cxf/trunk/rt/javascript/src/test/java/org/apache/cxf/javascript/GreeterClientTest.java Thu Jul 16 22:34:34 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/trunk/tools/validator/src/test/java/org/apache/cxf/tools/validator/WSDLValidationTest.java
URL: http://svn.apache.org/viewvc/cxf/trunk/tools/validator/src/test/java/org/apache/cxf/tools/validator/WSDLValidationTest.java?rev=794892&r1=794891&r2=794892&view=diff
==============================================================================
--- cxf/trunk/tools/validator/src/test/java/org/apache/cxf/tools/validator/WSDLValidationTest.java (original)
+++ cxf/trunk/tools/validator/src/test/java/org/apache/cxf/tools/validator/WSDLValidationTest.java Thu Jul 16 22:34:34 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);