cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dk...@apache.org
Subject svn commit: r750983 - in /cxf/branches/2.1.x-fixes: ./ parent/pom.xml systests/src/test/java/org/apache/cxf/systest/dispatch/DispatchClientServerTest.java systests/src/test/java/org/apache/cxf/systest/provider/HWSAXSourcePayloadProvider.java
Date Fri, 06 Mar 2009 17:02:46 GMT
Author: dkulp
Date: Fri Mar  6 17:02:46 2009
New Revision: 750983

URL: http://svn.apache.org/viewvc?rev=750983&view=rev
Log:
Merged revisions 750059 via svnmerge from 
https://svn.apache.org/repos/asf/cxf/trunk

........
  r750059 | dkulp | 2009-03-04 11:03:27 -0500 (Wed, 04 Mar 2009) | 3 lines
  
  Workaround two more tests with sjsxp
  Add profile for jaxp-ri (requires java 6)
........

Modified:
    cxf/branches/2.1.x-fixes/   (props changed)
    cxf/branches/2.1.x-fixes/parent/pom.xml
    cxf/branches/2.1.x-fixes/systests/src/test/java/org/apache/cxf/systest/dispatch/DispatchClientServerTest.java
    cxf/branches/2.1.x-fixes/systests/src/test/java/org/apache/cxf/systest/provider/HWSAXSourcePayloadProvider.java

Propchange: cxf/branches/2.1.x-fixes/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Mar  6 17:02:46 2009
@@ -1 +1 @@
-/cxf/trunk:686333-686363,686764,686820,687096,687194,687363,687387,687463,687543,687722,687798,687814,687817,687891,687910,687914,688086,688102,688133,688596,688735,688870,689572,689596,689855,689924,690067,690289,691246,691271,691295,691338,691355,691488,691602,691646,691706,691728,692116,692157,692310,692466,692499,693653,693819,694179,694263,694417,694716,694744,694747,694795,694869,694981,694987,694993,695041,695096,695396,695484,695537,695552,695561,695619,695684,695835,695840,695868,695935,695977,696016,696094,696433,696720,697085,697868,698128,699289,700261,700507,700602,700981,701316,701783,701830,701862,702187,702205-702248,702267,702547,702561,702580,702602,702609,702616,702653,702656,702957,703191,703239,703309,703501,703513,703548,704584,704937,704997,705150,705235,705274,705340,705446,705548,705614,705692,705708,706482,706631,706675,706900,706909,707034,707089,707100,707902,708035,708044,708074,708410,708417,708550,708554,709353-709354,709425,710076,710150,71015
 4,711193,711388,711410,711490,711635,711949,711975,712194,712198,712238,712272,712299,712312,712670,712893,713082,713095-713096,713099,713584,713597,713737,713804,713899,714167-714168,714245,714255,717937-717961,718281-718448,718565,718620,718640,718665,718970,719017,719210,719215-719218,719222-719273,719305,719327-719680,720053,720119-720218,720238,720293-720316,720497,721221,721241,721501,722117,722129,722412,722988,723024,723338,723378,723716-723791,724333-724372,724433-724438,724449,724481,724485,724668,724780,724782,724785,724793,724795,724940,725071,725316,725332,725335,725348,725364,725418,725425-725426,725455,725506,725554,725562,725651,725671,725688,725754,725773,725799,725839,726342,726524,726631,726634,726637,726639,726692,726724,726769,726992,727096,727445,727521,727568,727692,727754,727781,727792,728070,728087,728696,728897,729051,729430,729449,729460,729863,730082,730139,730889,730891,731598,731604,731615,731631,731635,732036,732050,732320,732363,732411,732450,
 732710,732773,732827,732829,733512,733582,733901,734367,734462,734666,734762,734772,734812,734836,734965,735113,735252,735722-735723,735729,735734,735751,735782,735787,735987,736332,736343,736352,736358-736362,736408,736423,736448,736491,736621,736726,736736,736738-736739,736766,736825,736852,737032,737046,737061,737069,737124,737237,737246,737299,737356,737494,737498,737761,737817,737849,737855,737994,738166,738178,738201,738210,738242,738244,738265,738516,738583,738863,738937,738983,739366-739367,739451-739452,739799-739800,739867,739876-739877,739922,739937,739990,740045,740108,740154,740186,740197,740255,740706,740730,740810,740844,740886,740902,740923,740994,741058,741124,741152,741188,741521,741529,741879,742914,743087,743439,743441,743459,743469,743965,743967,744175,744195,744237,744756,745214,745243,745560,745578,745586,745592,745638,745950,746012,746019-746020,746256,746266,746306,746357,746373-746374,747217,747386,747406,747454,747649,747766,747986,748159,748192,74
 8223,748305,748313,748603-748604,748768,749420,749449,749454-749456,749505,749511,749513,749584,749767,749771,749799,749890
+/cxf/trunk:686333-686363,686764,686820,687096,687194,687363,687387,687463,687543,687722,687798,687814,687817,687891,687910,687914,688086,688102,688133,688596,688735,688870,689572,689596,689855,689924,690067,690289,691246,691271,691295,691338,691355,691488,691602,691646,691706,691728,692116,692157,692310,692466,692499,693653,693819,694179,694263,694417,694716,694744,694747,694795,694869,694981,694987,694993,695041,695096,695396,695484,695537,695552,695561,695619,695684,695835,695840,695868,695935,695977,696016,696094,696433,696720,697085,697868,698128,699289,700261,700507,700602,700981,701316,701783,701830,701862,702187,702205-702248,702267,702547,702561,702580,702602,702609,702616,702653,702656,702957,703191,703239,703309,703501,703513,703548,704584,704937,704997,705150,705235,705274,705340,705446,705548,705614,705692,705708,706482,706631,706675,706900,706909,707034,707089,707100,707902,708035,708044,708074,708410,708417,708550,708554,709353-709354,709425,710076,710150,71015
 4,711193,711388,711410,711490,711635,711949,711975,712194,712198,712238,712272,712299,712312,712670,712893,713082,713095-713096,713099,713584,713597,713737,713804,713899,714167-714168,714245,714255,717937-717961,718281-718448,718565,718620,718640,718665,718970,719017,719210,719215-719218,719222-719273,719305,719327-719680,720053,720119-720218,720238,720293-720316,720497,721221,721241,721501,722117,722129,722412,722988,723024,723338,723378,723716-723791,724333-724372,724433-724438,724449,724481,724485,724668,724780,724782,724785,724793,724795,724940,725071,725316,725332,725335,725348,725364,725418,725425-725426,725455,725506,725554,725562,725651,725671,725688,725754,725773,725799,725839,726342,726524,726631,726634,726637,726639,726692,726724,726769,726992,727096,727445,727521,727568,727692,727754,727781,727792,728070,728087,728696,728897,729051,729430,729449,729460,729863,730082,730139,730889,730891,731598,731604,731615,731631,731635,732036,732050,732320,732363,732411,732450,
 732710,732773,732827,732829,733512,733582,733901,734367,734462,734666,734762,734772,734812,734836,734965,735113,735252,735722-735723,735729,735734,735751,735782,735787,735987,736332,736343,736352,736358-736362,736408,736423,736448,736491,736621,736726,736736,736738-736739,736766,736825,736852,737032,737046,737061,737069,737124,737237,737246,737299,737356,737494,737498,737761,737817,737849,737855,737994,738166,738178,738201,738210,738242,738244,738265,738516,738583,738863,738937,738983,739366-739367,739451-739452,739799-739800,739867,739876-739877,739922,739937,739990,740045,740108,740154,740186,740197,740255,740706,740730,740810,740844,740886,740902,740923,740994,741058,741124,741152,741188,741521,741529,741879,742914,743087,743439,743441,743459,743469,743965,743967,744175,744195,744237,744756,745214,745243,745560,745578,745586,745592,745638,745950,746012,746019-746020,746256,746266,746306,746357,746373-746374,747217,747386,747406,747454,747649,747766,747986,748159,748192,74
 8223,748305,748313,748603-748604,748768,749420,749449,749454-749456,749505,749511,749513,749584,749767,749771,749799,749890,750059

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

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=750983&r1=750982&r2=750983&view=diff
==============================================================================
--- cxf/branches/2.1.x-fixes/parent/pom.xml (original)
+++ cxf/branches/2.1.x-fixes/parent/pom.xml Fri Mar  6 17:02:46 2009
@@ -286,10 +286,10 @@
                                 <name>spring.validation.mode</name>
                                 <value>${spring.validation.mode}</value>
                             </property>
-			    <property>
-			        <name>surefire.fork.vmargs</name>
-				<value>${surefire.fork.vmargs}</value>
-		            </property>
+                            <property>
+                                <name>surefire.fork.vmargs</name>
+                                <value>${surefire.fork.vmargs}</value>
+                            </property>
                             <property>
                                 <!-- If we close the port after a client in the same JVM
has opened a keep-alive
                                 connection, on some Linux's, the socket remains consumed
until
@@ -1026,30 +1026,43 @@
 
     <profiles>
         <profile>
-	  <id>sjsxp</id>
-	  <properties>
-	    <stax.impl.groupId>com.sun.xml.stream</stax.impl.groupId>
-	    <stax.impl.artifactId>sjsxp</stax.impl.artifactId>
-	    <stax.impl.version>1.0.1</stax.impl.version>
-	  </properties>
-	</profile>
-        <profile>
-	  <id>woodstox4</id>
-	  <properties>
-	    <stax.impl.groupId>org.codehaus.woodstox</stax.impl.groupId>
-	    <stax.impl.artifactId>woodstox-core-asl</stax.impl.artifactId>
-	    <stax.impl.version>4.0.2</stax.impl.version>
-	  </properties>
-	</profile>
-
-	<profile>
-	  <id>axis2-saaj</id>
-	  <properties>
-	    <saaj.impl.groupId>org.apache.axis2</saaj.impl.groupId>
-	    <saaj.impl.artifactId>axis2-saaj</saaj.impl.artifactId>
-	    <saaj.impl.version>1.4.1</saaj.impl.version>
-	  </properties>
-	</profile>
+            <!-- sjsxp is really the precursor to the jaxp-ri jars.   However, getting
the jaxp-ri  jar to work on 
+            Java 5 requires endorsing it which is non-trivial in maven  :-(.
+            -->
+            <id>sjsxp</id>
+            <properties>
+                <stax.impl.groupId>com.sun.xml.stream</stax.impl.groupId>
+                <stax.impl.artifactId>sjsxp</stax.impl.artifactId>
+                <stax.impl.version>1.0.1</stax.impl.version>
+            </properties>
+        </profile>
+        <profile>
+            <!-- This really only works with Java 6 as the classes are identically named
with the same classes in the Java 5 JDK
+            and the Java 5 versions get picked up instead -->
+            <id>jaxpri</id>
+            <properties>
+                <stax.impl.groupId>com.sun.xml.parsers</stax.impl.groupId>
+                <stax.impl.artifactId>jaxp-ri</stax.impl.artifactId>
+                <stax.impl.version>1.4.2</stax.impl.version>
+            </properties>
+	        </profile>
+        <profile>
+            <id>woodstox4</id>
+            <properties>
+                <stax.impl.groupId>org.codehaus.woodstox</stax.impl.groupId>
+                <stax.impl.artifactId>woodstox-core-asl</stax.impl.artifactId>
+                <stax.impl.version>4.0.2</stax.impl.version>
+            </properties>
+        </profile>
+
+        <profile>
+            <id>axis2-saaj</id>
+            <properties>
+                <saaj.impl.groupId>org.apache.axis2</saaj.impl.groupId>
+                <saaj.impl.artifactId>axis2-saaj</saaj.impl.artifactId>
+                <saaj.impl.version>1.4.1</saaj.impl.version>
+            </properties>
+        </profile>
 
         <profile>
             <id>fastinstall</id>

Modified: cxf/branches/2.1.x-fixes/systests/src/test/java/org/apache/cxf/systest/dispatch/DispatchClientServerTest.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.1.x-fixes/systests/src/test/java/org/apache/cxf/systest/dispatch/DispatchClientServerTest.java?rev=750983&r1=750982&r2=750983&view=diff
==============================================================================
--- cxf/branches/2.1.x-fixes/systests/src/test/java/org/apache/cxf/systest/dispatch/DispatchClientServerTest.java
(original)
+++ cxf/branches/2.1.x-fixes/systests/src/test/java/org/apache/cxf/systest/dispatch/DispatchClientServerTest.java
Fri Mar  6 17:02:46 2009
@@ -424,6 +424,9 @@
         // Test request-response
         InputStream is = getClass().getResourceAsStream("resources/GreetMeDocLiteralSOAPBodyReq.xml");
         InputSource inputSource = new InputSource(is);
+        inputSource.setPublicId(getClass()
+                                    .getResource("resources/GreetMeDocLiteralSOAPBodyReq.xml").toString());
+        inputSource.setSystemId(inputSource.getPublicId());
         SAXSource saxSourceReq = new SAXSource(inputSource);
         assertNotNull(saxSourceReq);
         SAXSource saxSourceResp = disp.invoke(saxSourceReq);
@@ -434,6 +437,9 @@
         // Test oneway
         InputStream is1 = getClass().getResourceAsStream("resources/GreetMeDocLiteralSOAPBodyReq1.xml");
         InputSource inputSource1 = new InputSource(is1);
+        inputSource1.setPublicId(getClass()
+                                 .getResource("resources/GreetMeDocLiteralSOAPBodyReq1.xml").toString());
+        inputSource1.setSystemId(inputSource1.getPublicId());
         SAXSource saxSourceReq1 = new SAXSource(inputSource1);
         assertNotNull(saxSourceReq1);
         disp.invokeOneWay(saxSourceReq1);
@@ -441,6 +447,9 @@
         // Test async polling
         InputStream is2 = getClass().getResourceAsStream("resources/GreetMeDocLiteralSOAPBodyReq2.xml");
         InputSource inputSource2 = new InputSource(is2);
+        inputSource2.setPublicId(getClass()
+                                 .getResource("resources/GreetMeDocLiteralSOAPBodyReq2.xml").toString());
+        inputSource2.setSystemId(inputSource2.getPublicId());
         SAXSource saxSourceReq2 = new SAXSource(inputSource2);
         assertNotNull(saxSourceReq2);
         Response response = disp.invokeAsync(saxSourceReq2);
@@ -452,6 +461,9 @@
         // Test async callback
         InputStream is3 = getClass().getResourceAsStream("resources/GreetMeDocLiteralSOAPBodyReq3.xml");
         InputSource inputSource3 = new InputSource(is3);
+        inputSource3.setPublicId(getClass()
+                                 .getResource("resources/GreetMeDocLiteralSOAPBodyReq3.xml").toString());
+        inputSource3.setSystemId(inputSource3.getPublicId());
         SAXSource saxSourceReq3 = new SAXSource(inputSource3);
         assertNotNull(saxSourceReq3);
 

Modified: cxf/branches/2.1.x-fixes/systests/src/test/java/org/apache/cxf/systest/provider/HWSAXSourcePayloadProvider.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.1.x-fixes/systests/src/test/java/org/apache/cxf/systest/provider/HWSAXSourcePayloadProvider.java?rev=750983&r1=750982&r2=750983&view=diff
==============================================================================
--- cxf/branches/2.1.x-fixes/systests/src/test/java/org/apache/cxf/systest/provider/HWSAXSourcePayloadProvider.java
(original)
+++ cxf/branches/2.1.x-fixes/systests/src/test/java/org/apache/cxf/systest/provider/HWSAXSourcePayloadProvider.java
Fri Mar  6 17:02:46 2009
@@ -21,10 +21,13 @@
 
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
+import java.io.File;
+import java.io.FileOutputStream;
 import java.io.InputStream;
 
 import javax.xml.namespace.QName;
 import javax.xml.soap.MessageFactory;
+import javax.xml.stream.XMLStreamWriter;
 import javax.xml.transform.Transformer;
 import javax.xml.transform.TransformerFactory;
 import javax.xml.transform.dom.DOMResult;
@@ -44,6 +47,9 @@
 
 import org.xml.sax.InputSource;
 
+import org.apache.cxf.helpers.FileUtils;
+import org.apache.cxf.staxutils.StaxUtils;
+
 
 //The following wsdl file is used.
 //wsdlLocation = "/trunk/testutils/src/main/resources/wsdl/hello_world_rpc_lit.wsdl"
@@ -65,13 +71,12 @@
             factory = MessageFactory.newInstance();
             InputStream is = getClass().getResourceAsStream("resources/sayHiRpcLiteralResp.xml");
             Document sayHiDocument = factory.createMessage(null, is).getSOAPBody().extractContentAsDocument();
-            sayHiInputSource = new InputSource(getSOAPBodyStream(sayHiDocument));
+            sayHiInputSource = new InputSource(getSOAPBodyFile(sayHiDocument).toURI().toString());
             
             InputStream is2 = getClass().getResourceAsStream("resources/GreetMeRpcLiteralResp.xml");
             Document greetMeDocument = 
                 factory.createMessage(null, is2).getSOAPBody().extractContentAsDocument();
-            greetMeInputSource = new InputSource(getSOAPBodyStream(greetMeDocument));
-
+            greetMeInputSource = new InputSource(getSOAPBodyFile(greetMeDocument).toURI().toString());
         } catch (Exception ex) {
             ex.printStackTrace();
         }
@@ -101,27 +106,13 @@
         return response;
     }
     
-    private InputStream getSOAPBodyStream(Document doc) throws Exception {
-        // Try to get the DOMImplementation from the doc before
-        // defaulting to the sun implementation class (which uses
-        // sun internal xerces classes not found in the ibm jdk).
-        DOMImplementationLS impl = null;
-        DOMImplementation docImpl = doc.getImplementation();
-        if (docImpl != null && docImpl.hasFeature("LS", "3.0")) {
-            impl = (DOMImplementationLS)docImpl.getFeature("LS", "3.0");
-        } else {
-            System.setProperty(DOMImplementationRegistry.PROPERTY,
-                "com.sun.org.apache.xerces.internal.dom.DOMImplementationSourceImpl");
-            DOMImplementationRegistry registry = DOMImplementationRegistry.newInstance();
-            impl = (DOMImplementationLS)registry.getDOMImplementation("LS");
-        }
-        LSOutput output = impl.createLSOutput();
-        ByteArrayOutputStream byteArrayOutputStream = new ByteArrayOutputStream();
-        output.setByteStream(byteArrayOutputStream);
-        LSSerializer writer = impl.createLSSerializer();
-        writer.write(doc, output);
-        byte[] buf = byteArrayOutputStream.toByteArray();
-        return new ByteArrayInputStream(buf);
+    private File getSOAPBodyFile(Document doc) throws Exception {
+        File file = FileUtils.createTempFile("cxf-systest", "xml");
+        FileOutputStream out = new FileOutputStream(file);
+        XMLStreamWriter writer = StaxUtils.createXMLStreamWriter(out);
+        StaxUtils.writeDocument(doc, writer, true);
+        writer.close();
+        return file;
     }
 
 }



Mime
View raw message