Propchange: cxf/branches/2.2.x-fixes/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Tue Sep 1 00:45:05 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,794892,795044,795104,795160,795583,795907,796022-796023,796352,796593,796741,796780,796994-796997,797117,797159,797192,797194,797231-797233,797442,797505,797517,797534,797581-797583,797587,797640,797651,797699,797882-797883,798344-798346,798363,798461,798479,798533,798551,798557,798561-798562,798570,798573,79858 4,798654,798748-798749,798816,798891,798929-798930,799245,799267,799439,799448,799637,799723-799724,799792,800453,800497-800498,801380-801381,801447,801962,802892,803056,803129,803174,803419,803460,803493,803689,804002,804175,804276,805784,805907,805909,806020-806021,806023,806405-806406,806576,806602-806604,806620,806627,806631,806633,806638,806687,806876,806922,806979-806982,807181,807205,807295,807748,807807,808035,808069,808085,808107,808464,808488,808731,808885,808925,809082-809083,809162,809190,809417-809626,809631 +/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,795160,795583,795907,796022-796023,796352,796593,796741,796780,796994-796997,797117,797159,797192,797194,797231-797233,797442,797505,797517,797534,797581-797583,797587,797640,797651,797699,797882-797883,798344-798346,798363,798461,798479,798533,798551,798557,798561-798562,798570,798573,79858 4,798654,798748-798749,798816,798891,798929-798930,799245,799267,799439,799448,799637,799723-799724,799792,800453,800497-800498,801380-801381,801447,801962,802892,803056,803129,803174,803419,803460,803493,803689,804002,804175,804276,805784,805907,805909,806020-806021,806023,806405-806406,806576,806602-806604,806620,806627,806631,806633,806638,806687,806876,806922,806979-806982,807181,807205,807295,807748,807807,808035,808069,808085,808107,808464,808488,808731,808885,808925,809082-809083,809162,809190,809417-809626,809631,809663
Propchange: cxf/branches/2.2.x-fixes/ ------------------------------------------------------------------------------ Binary property 'svnmerge-integrated' - no diff available. Propchange: cxf/branches/2.2.x-fixes/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSAtomBookTest.java ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Tue Sep 1 00:45:05 2009 @@ -1 +1 @@ -/cxf/trunk/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSAtomBookTest.java:809417-809626,809631 +/cxf/trunk/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSAtomBookTest.java:809417-809626,809631,809663 Propchange: cxf/branches/2.2.x-fixes/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSSoapBookTest.java ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Tue Sep 1 00:45:05 2009 @@ -1 +1 @@ -/cxf/trunk/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSSoapBookTest.java:809417-809626,809631 +/cxf/trunk/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSSoapBookTest.java:809417-809626,809631,809663 Modified: cxf/branches/2.2.x-fixes/systests/pom.xml URL: http://svn.apache.org/viewvc/cxf/branches/2.2.x-fixes/systests/pom.xml?rev=809787&r1=809786&r2=809787&view=diff ============================================================================== --- cxf/branches/2.2.x-fixes/systests/pom.xml (original) +++ cxf/branches/2.2.x-fixes/systests/pom.xml Tue Sep 1 00:45:05 2009 @@ -35,6 +35,7 @@ <module>uncategorized</module> <module>aegis</module> <module>jaxrs</module> + <module>ws-specs</module> </modules> </project> Modified: cxf/branches/2.2.x-fixes/systests/uncategorized/pom.xml URL: http://svn.apache.org/viewvc/cxf/branches/2.2.x-fixes/systests/uncategorized/pom.xml?rev=809787&r1=809786&r2=809787&view=diff ============================================================================== --- cxf/branches/2.2.x-fixes/systests/uncategorized/pom.xml (original) +++ cxf/branches/2.2.x-fixes/systests/uncategorized/pom.xml Tue Sep 1 00:45:05 2009 @@ -138,51 +138,6 @@ <goal>wsdl2java</goal> </goals> </execution> - <execution> - <id>generate-wssec10-test-sources</id> - <phase>generate-test-sources</phase> - <configuration> - <testSourceRoot>${basedir}/target/generated/src/test/java</testSourceRoot> - <wsdlOptions> - <wsdlOption> - <wsdl>${basedir}/src/test/resources/wsdl_systest/wssec10/WsSecurity10.wsdl</wsdl> - </wsdlOption> - </wsdlOptions> - </configuration> - <goals> - <goal>wsdl2java</goal> - </goals> - </execution> - <execution> - <id>generate-wssec11-test-sources</id> - <phase>generate-test-sources</phase> - <configuration> - <testSourceRoot>${basedir}/target/generated/src/test/java</testSourceRoot> - <wsdlOptions> - <wsdlOption> - <wsdl>${basedir}/src/test/resources/wsdl_systest/wssec11/WsSecurity11.wsdl</wsdl> - </wsdlOption> - </wsdlOptions> - </configuration> - <goals> - <goal>wsdl2java</goal> - </goals> - </execution> - <execution> - <id>generate-wssc-test-sources</id> - <phase>generate-test-sources</phase> - <configuration> - <testSourceRoot>${basedir}/target/generated/src/test/java</testSourceRoot> - <wsdlOptions> - <wsdlOption> - <wsdl>${basedir}/src/test/resources/wsdl_systest/wssc/WSSecureConversation.wsdl</wsdl> - </wsdlOption> - </wsdlOptions> - </configuration> - <goals> - <goal>wsdl2java</goal> - </goals> - </execution> </executions> </plugin> <plugin> Modified: cxf/branches/2.2.x-fixes/systests/uncategorized/src/test/java/org/apache/cxf/systest/factory_pattern/MultiplexClientServerTest.java URL: http://svn.apache.org/viewvc/cxf/branches/2.2.x-fixes/systests/uncategorized/src/test/java/org/apache/cxf/systest/factory_pattern/MultiplexClientServerTest.java?rev=809787&r1=809786&r2=809787&view=diff ============================================================================== --- cxf/branches/2.2.x-fixes/systests/uncategorized/src/test/java/org/apache/cxf/systest/factory_pattern/MultiplexClientServerTest.java (original) +++ cxf/branches/2.2.x-fixes/systests/uncategorized/src/test/java/org/apache/cxf/systest/factory_pattern/MultiplexClientServerTest.java Tue Sep 1 00:45:05 2009 @@ -65,7 +65,7 @@ @BeforeClass public static void startServers() throws Exception { // requires ws-a support to propagate reference parameters - createStaticBus("org/apache/cxf/systest/ws/addressing/cxf.xml"); + createStaticBus("org/apache/cxf/systest/factory_pattern/cxf_multiplex.xml"); Map<String, String> props = new HashMap<String, String>(); if (System.getProperty("activemq.store.dir") != null) { props.put("activemq.store.dir", System.getProperty("activemq.store.dir")); @@ -120,7 +120,8 @@ num.isEven().isEven(); fail("there should be a fault on val 999"); } catch (Exception expected) { - assertTrue("match on exception message", expected.getMessage().indexOf("999") != -1); + assertTrue("match on exception message " + expected.getMessage(), + expected.getMessage().indexOf("999") != -1); } ref = factory.create("37"); Modified: cxf/branches/2.2.x-fixes/systests/uncategorized/src/test/java/org/apache/cxf/systest/lifecycle/LifeCycleTest.java URL: http://svn.apache.org/viewvc/cxf/branches/2.2.x-fixes/systests/uncategorized/src/test/java/org/apache/cxf/systest/lifecycle/LifeCycleTest.java?rev=809787&r1=809786&r2=809787&view=diff ============================================================================== --- cxf/branches/2.2.x-fixes/systests/uncategorized/src/test/java/org/apache/cxf/systest/lifecycle/LifeCycleTest.java (original) +++ cxf/branches/2.2.x-fixes/systests/uncategorized/src/test/java/org/apache/cxf/systest/lifecycle/LifeCycleTest.java Tue Sep 1 00:45:05 2009 @@ -23,6 +23,7 @@ import java.util.List; import java.util.Map; +import javax.jws.WebService; import javax.xml.ws.Endpoint; import org.apache.cxf.Bus; @@ -33,7 +34,6 @@ import org.apache.cxf.endpoint.ServerLifeCycleManager; import org.apache.cxf.feature.AbstractFeature; import org.apache.cxf.greeter_control.ControlImpl; -import org.apache.cxf.systest.ws.addressing.GreeterImpl; import org.apache.cxf.ws.addressing.WSAddressingFeature; import org.junit.After; @@ -181,5 +181,14 @@ } } } + + + @WebService(serviceName = "SOAPServiceAddressing", + portName = "SoapPort", + endpointInterface = "org.apache.hello_world_soap_http.Greeter", + targetNamespace = "http://apache.org/hello_world_soap_http";, + wsdlLocation = "testutils/hello_world.wsdl") + public class GreeterImpl extends org.apache.hello_world_soap_http.BaseGreeterImpl { + } } Propchange: cxf/branches/2.2.x-fixes/systests/uncategorized/src/test/java/org/apache/cxf/systest/wsdl/CrossSchemaImportsTests.java ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Tue Sep 1 00:45:05 2009 @@ -1 +1 @@ -/cxf/trunk/systests/uncategorized/src/test/java/org/apache/cxf/systest/wsdl/CrossSchemaImportsTests.java:809417-809626,809631 +/cxf/trunk/systests/uncategorized/src/test/java/org/apache/cxf/systest/wsdl/CrossSchemaImportsTests.java:809417-809626,809631,809663
