cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dk...@apache.org
Subject svn commit: r795164 - in /cxf/branches/2.1.x-fixes: ./ 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/
Date Fri, 17 Jul 2009 17:44:38 GMT
Author: dkulp
Date: Fri Jul 17 17:44:37 2009
New Revision: 795164

URL: http://svn.apache.org/viewvc?rev=795164&view=rev
Log:
Merged revisions 795161 via svnmerge from 
https://svn.apache.org/repos/asf/cxf/branches/2.2.x-fixes

................
  r795161 | dkulp | 2009-07-17 13:37:42 -0400 (Fri, 17 Jul 2009) | 11 lines
  
  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.1.x-fixes/   (props changed)
    cxf/branches/2.1.x-fixes/common/common/src/main/java/org/apache/cxf/helpers/WSDLHelper.java
    cxf/branches/2.1.x-fixes/parent/pom.xml
    cxf/branches/2.1.x-fixes/rt/javascript/src/test/java/org/apache/cxf/javascript/GreeterClientTest.java
    cxf/branches/2.1.x-fixes/tools/validator/src/test/java/org/apache/cxf/tools/validator/WSDLValidationTest.java

Propchange: cxf/branches/2.1.x-fixes/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Jul 17 17:44:37 2009
@@ -1,2 +1,2 @@
-/cxf/branches/2.2.x-fixes:743446,753380,753397,753421,754585,755365,757499,757859,757899,757935,757951,758195,758303,758308,758378,758690,758910,759890,759961,759963-759964,759966,760029,760073,760150,760171,760178,760198,760212,760456,760468,760582,760938,761094,761113,761120,761317,761759,761789,762393,762518,762567,763200,763272,763495,763854,763931,763942,763953,764033-764034,764581,764599-764606,764887,765357,766013,766058,766100-766101,766763,766770,766860,766962-766963,767159,767191,767927,771416,772143,772402,772658,772714,773009-773010,773027,773049,773146,773581,773691,773693,774446-774496,774558,774760,774851,774979,775423,776024-776025,776218,776429,776459,777189,777224,777243,777481,777505,777572,777580,780033,780184,780213,780421,780664,780800,780902,780911,781497,781841,782733,782735-782736,783099,783407,784064,784197,785293,785296,785298-785299,785301,785656,786158,786587,786589,786591-786592,786640,787272,787276,787282-787283,787285,787295,787307,787324,7873
 67,788824-788825,788827-788828,788830,789423,789429,789707,789709-789710,789712,789721,789905,789908,789910,789912,790295,790646-790647,790651,790654-790655,790659,791948,791950,791952,791955,792276,792288,792291,792992,792995,792998,794402,794404,794735,794797,794799,794803
-/cxf/trunk:782181,782728-782730,783097,783396,784059,784181,784895,785279-785282,785468,786142,786271,786395,786582-786583,786638,786647,787269,787277-787279,787290,787305,787323,787366,788060,788187,788703,788774,788820,789371,789420,789527-789529,789704-789705,789896,789898-789900,790294,790637-790644,791354,791538,791753,791947,792261-792263,792684,792975,792985,794297,794396,794728,794778-794780
+/cxf/branches/2.2.x-fixes:743446,753380,753397,753421,754585,755365,757499,757859,757899,757935,757951,758195,758303,758308,758378,758690,758910,759890,759961,759963-759964,759966,760029,760073,760150,760171,760178,760198,760212,760456,760468,760582,760938,761094,761113,761120,761317,761759,761789,762393,762518,762567,763200,763272,763495,763854,763931,763942,763953,764033-764034,764581,764599-764606,764887,765357,766013,766058,766100-766101,766763,766770,766860,766962-766963,767159,767191,767927,771416,772143,772402,772658,772714,773009-773010,773027,773049,773146,773581,773691,773693,774446-774496,774558,774760,774851,774979,775423,776024-776025,776218,776429,776459,777189,777224,777243,777481,777505,777572,777580,780033,780184,780213,780421,780664,780800,780902,780911,781497,781841,782733,782735-782736,783099,783407,784064,784197,785293,785296,785298-785299,785301,785656,786158,786587,786589,786591-786592,786640,787272,787276,787282-787283,787285,787295,787307,787324,7873
 67,788824-788825,788827-788828,788830,789423,789429,789707,789709-789710,789712,789721,789905,789908,789910,789912,790295,790646-790647,790651,790654-790655,790659,791948,791950,791952,791955,792276,792288,792291,792992,792995,792998,794402,794404,794735,794797,794799,794803,795161
+/cxf/trunk:782181,782728-782730,783097,783396,784059,784181,784895,785279-785282,785468,786142,786271,786395,786582-786583,786638,786647,787269,787277-787279,787290,787305,787323,787366,788060,788187,788703,788774,788820,789371,789420,789527-789529,789704-789705,789896,789898-789900,790294,790637-790644,791354,791538,791753,791947,792261-792263,792684,792975,792985,794297,794396,794728,794778-794780,794892

Propchange: cxf/branches/2.1.x-fixes/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.

Modified: cxf/branches/2.1.x-fixes/common/common/src/main/java/org/apache/cxf/helpers/WSDLHelper.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.1.x-fixes/common/common/src/main/java/org/apache/cxf/helpers/WSDLHelper.java?rev=795164&r1=795163&r2=795164&view=diff
==============================================================================
--- cxf/branches/2.1.x-fixes/common/common/src/main/java/org/apache/cxf/helpers/WSDLHelper.java
(original)
+++ cxf/branches/2.1.x-fixes/common/common/src/main/java/org/apache/cxf/helpers/WSDLHelper.java
Fri Jul 17 17:44:37 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.1.x-fixes/parent/pom.xml
URL: http://svn.apache.org/viewvc/cxf/branches/2.1.x-fixes/parent/pom.xml?rev=795164&r1=795163&r2=795164&view=diff
==============================================================================
--- cxf/branches/2.1.x-fixes/parent/pom.xml (original)
+++ cxf/branches/2.1.x-fixes/parent/pom.xml Fri Jul 17 17:44:37 2009
@@ -471,12 +471,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.1.x-fixes/rt/javascript/src/test/java/org/apache/cxf/javascript/GreeterClientTest.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.1.x-fixes/rt/javascript/src/test/java/org/apache/cxf/javascript/GreeterClientTest.java?rev=795164&r1=795163&r2=795164&view=diff
==============================================================================
--- cxf/branches/2.1.x-fixes/rt/javascript/src/test/java/org/apache/cxf/javascript/GreeterClientTest.java
(original)
+++ cxf/branches/2.1.x-fixes/rt/javascript/src/test/java/org/apache/cxf/javascript/GreeterClientTest.java
Fri Jul 17 17:44:37 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.1.x-fixes/tools/validator/src/test/java/org/apache/cxf/tools/validator/WSDLValidationTest.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.1.x-fixes/tools/validator/src/test/java/org/apache/cxf/tools/validator/WSDLValidationTest.java?rev=795164&r1=795163&r2=795164&view=diff
==============================================================================
--- cxf/branches/2.1.x-fixes/tools/validator/src/test/java/org/apache/cxf/tools/validator/WSDLValidationTest.java
(original)
+++ cxf/branches/2.1.x-fixes/tools/validator/src/test/java/org/apache/cxf/tools/validator/WSDLValidationTest.java
Fri Jul 17 17:44:37 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);



Mime
View raw message