Author: dkulp Date: Fri Sep 11 17:08:05 2009 New Revision: 813926 URL: http://svn.apache.org/viewvc?rev=813926&view=rev Log: Merged revisions 813883 via svnmerge from https://svn.apache.org/repos/asf/cxf/branches/2.2.x-fixes
................ r813883 | dkulp | 2009-09-11 11:46:41 -0400 (Fri, 11 Sep 2009) | 9 lines Merged revisions 811745 via svnmerge from https://svn.apache.org/repos/asf/cxf/trunk ........ r811745 | dkulp | 2009-09-05 21:47:00 -0400 (Sat, 05 Sep 2009) | 2 lines Move transport related systests into transports category ........ ................ Added: cxf/branches/2.1.x-fixes/systests/transports/src/test/java/org/apache/cxf/systest/http/ - copied from r813883, cxf/branches/2.2.x-fixes/systests/transports/src/test/java/org/apache/cxf/systest/http/ cxf/branches/2.1.x-fixes/systests/transports/src/test/java/org/apache/cxf/systest/http/BareServer.java - copied unchanged from r813883, cxf/branches/2.2.x-fixes/systests/transports/src/test/java/org/apache/cxf/systest/http/BareServer.java cxf/branches/2.1.x-fixes/systests/transports/src/test/java/org/apache/cxf/systest/http/BusServer.java - copied unchanged from r813883, cxf/branches/2.2.x-fixes/systests/transports/src/test/java/org/apache/cxf/systest/http/BusServer.java cxf/branches/2.1.x-fixes/systests/transports/src/test/java/org/apache/cxf/systest/http/ClientServerSessionTest.java - copied unchanged from r813883, cxf/branches/2.2.x-fixes/systests/transports/src/test/java/org/apache/cxf/systest/http/ClientServerSessionTest.java cxf/branches/2.1.x-fixes/systests/transports/src/test/java/org/apache/cxf/systest/http/GreeterImpl.java - copied unchanged from r813883, cxf/branches/2.2.x-fixes/systests/transports/src/test/java/org/apache/cxf/systest/http/GreeterImpl.java cxf/branches/2.1.x-fixes/systests/transports/src/test/java/org/apache/cxf/systest/http/GreeterSessionImpl.java - copied unchanged from r813883, cxf/branches/2.2.x-fixes/systests/transports/src/test/java/org/apache/cxf/systest/http/GreeterSessionImpl.java cxf/branches/2.1.x-fixes/systests/transports/src/test/java/org/apache/cxf/systest/http/HTTPConduitTest.java - copied unchanged from r813883, cxf/branches/2.2.x-fixes/systests/transports/src/test/java/org/apache/cxf/systest/http/HTTPConduitTest.java cxf/branches/2.1.x-fixes/systests/transports/src/test/java/org/apache/cxf/systest/http/HTTPSClientTest.java - copied unchanged from r813883, cxf/branches/2.2.x-fixes/systests/transports/src/test/java/org/apache/cxf/systest/http/HTTPSClientTest.java cxf/branches/2.1.x-fixes/systests/transports/src/test/java/org/apache/cxf/systest/http/PublishedEndpointUrlTest.java - copied unchanged from r813883, cxf/branches/2.2.x-fixes/systests/transports/src/test/java/org/apache/cxf/systest/http/PublishedEndpointUrlTest.java cxf/branches/2.1.x-fixes/systests/transports/src/test/java/org/apache/cxf/systest/http/PushBack401.java - copied unchanged from r813883, cxf/branches/2.2.x-fixes/systests/transports/src/test/java/org/apache/cxf/systest/http/PushBack401.java cxf/branches/2.1.x-fixes/systests/transports/src/test/java/org/apache/cxf/systest/http/Server.java - copied unchanged from r813883, cxf/branches/2.2.x-fixes/systests/transports/src/test/java/org/apache/cxf/systest/http/Server.java cxf/branches/2.1.x-fixes/systests/transports/src/test/java/org/apache/cxf/systest/http/SessionServer.java - copied unchanged from r813883, cxf/branches/2.2.x-fixes/systests/transports/src/test/java/org/apache/cxf/systest/http/SessionServer.java cxf/branches/2.1.x-fixes/systests/transports/src/test/java/org/apache/cxf/systest/http/TrustHandler.java - copied unchanged from r813883, cxf/branches/2.2.x-fixes/systests/transports/src/test/java/org/apache/cxf/systest/http/TrustHandler.java cxf/branches/2.1.x-fixes/systests/transports/src/test/java/org/apache/cxf/systest/http/WSDLAddressRewriteTest.java - copied unchanged from r813883, cxf/branches/2.2.x-fixes/systests/transports/src/test/java/org/apache/cxf/systest/http/WSDLAddressRewriteTest.java cxf/branches/2.1.x-fixes/systests/transports/src/test/java/org/apache/cxf/systest/http/WSDLQueryTest.java - copied unchanged from r813883, cxf/branches/2.2.x-fixes/systests/transports/src/test/java/org/apache/cxf/systest/http/WSDLQueryTest.java cxf/branches/2.1.x-fixes/systests/transports/src/test/java/org/apache/cxf/systest/http/resources/ - copied from r813883, cxf/branches/2.2.x-fixes/systests/transports/src/test/java/org/apache/cxf/systest/http/resources/ cxf/branches/2.1.x-fixes/systests/transports/src/test/java/org/apache/cxf/systest/http/resources/Abost.cxf - copied unchanged from r813883, cxf/branches/2.2.x-fixes/systests/transports/src/test/java/org/apache/cxf/systest/http/resources/Abost.cxf cxf/branches/2.1.x-fixes/systests/transports/src/test/java/org/apache/cxf/systest/http/resources/Bethal.cer - copied unchanged from r813883, cxf/branches/2.2.x-fixes/systests/transports/src/test/java/org/apache/cxf/systest/http/resources/Bethal.cer cxf/branches/2.1.x-fixes/systests/transports/src/test/java/org/apache/cxf/systest/http/resources/Bethal.cxf - copied unchanged from r813883, cxf/branches/2.2.x-fixes/systests/transports/src/test/java/org/apache/cxf/systest/http/resources/Bethal.cxf cxf/branches/2.1.x-fixes/systests/transports/src/test/java/org/apache/cxf/systest/http/resources/Bethal.jks - copied unchanged from r813883, cxf/branches/2.2.x-fixes/systests/transports/src/test/java/org/apache/cxf/systest/http/resources/Bethal.jks cxf/branches/2.1.x-fixes/systests/transports/src/test/java/org/apache/cxf/systest/http/resources/Bethal.p12 - copied unchanged from r813883, cxf/branches/2.2.x-fixes/systests/transports/src/test/java/org/apache/cxf/systest/http/resources/Bethal.p12 cxf/branches/2.1.x-fixes/systests/transports/src/test/java/org/apache/cxf/systest/http/resources/BethalClientBeans.xml - copied unchanged from r813883, cxf/branches/2.2.x-fixes/systests/transports/src/test/java/org/apache/cxf/systest/http/resources/BethalClientBeans.xml cxf/branches/2.1.x-fixes/systests/transports/src/test/java/org/apache/cxf/systest/http/resources/BethalClientConfig.cxf - copied unchanged from r813883, cxf/branches/2.2.x-fixes/systests/transports/src/test/java/org/apache/cxf/systest/http/resources/BethalClientConfig.cxf cxf/branches/2.1.x-fixes/systests/transports/src/test/java/org/apache/cxf/systest/http/resources/Gordy.cer - copied unchanged from r813883, cxf/branches/2.2.x-fixes/systests/transports/src/test/java/org/apache/cxf/systest/http/resources/Gordy.cer cxf/branches/2.1.x-fixes/systests/transports/src/test/java/org/apache/cxf/systest/http/resources/Gordy.cxf - copied unchanged from r813883, cxf/branches/2.2.x-fixes/systests/transports/src/test/java/org/apache/cxf/systest/http/resources/Gordy.cxf cxf/branches/2.1.x-fixes/systests/transports/src/test/java/org/apache/cxf/systest/http/resources/Gordy.jks - copied unchanged from r813883, cxf/branches/2.2.x-fixes/systests/transports/src/test/java/org/apache/cxf/systest/http/resources/Gordy.jks cxf/branches/2.1.x-fixes/systests/transports/src/test/java/org/apache/cxf/systest/http/resources/Http2HttpLoopRedirectFail.cxf - copied unchanged from r813883, cxf/branches/2.2.x-fixes/systests/transports/src/test/java/org/apache/cxf/systest/http/resources/Http2HttpLoopRedirectFail.cxf cxf/branches/2.1.x-fixes/systests/transports/src/test/java/org/apache/cxf/systest/http/resources/Http2HttpRedirect.cxf - copied unchanged from r813883, cxf/branches/2.2.x-fixes/systests/transports/src/test/java/org/apache/cxf/systest/http/resources/Http2HttpRedirect.cxf cxf/branches/2.1.x-fixes/systests/transports/src/test/java/org/apache/cxf/systest/http/resources/Hurlon.cxf - copied unchanged from r813883, cxf/branches/2.2.x-fixes/systests/transports/src/test/java/org/apache/cxf/systest/http/resources/Hurlon.cxf cxf/branches/2.1.x-fixes/systests/transports/src/test/java/org/apache/cxf/systest/http/resources/Morpit.cxf - copied unchanged from r813883, cxf/branches/2.2.x-fixes/systests/transports/src/test/java/org/apache/cxf/systest/http/resources/Morpit.cxf cxf/branches/2.1.x-fixes/systests/transports/src/test/java/org/apache/cxf/systest/http/resources/Morpit.jks - copied unchanged from r813883, cxf/branches/2.2.x-fixes/systests/transports/src/test/java/org/apache/cxf/systest/http/resources/Morpit.jks cxf/branches/2.1.x-fixes/systests/transports/src/test/java/org/apache/cxf/systest/http/resources/Morpit.p12 - copied unchanged from r813883, cxf/branches/2.2.x-fixes/systests/transports/src/test/java/org/apache/cxf/systest/http/resources/Morpit.p12 cxf/branches/2.1.x-fixes/systests/transports/src/test/java/org/apache/cxf/systest/http/resources/Mortimer.cxf - copied unchanged from r813883, cxf/branches/2.2.x-fixes/systests/transports/src/test/java/org/apache/cxf/systest/http/resources/Mortimer.cxf cxf/branches/2.1.x-fixes/systests/transports/src/test/java/org/apache/cxf/systest/http/resources/Poltim.cer - copied unchanged from r813883, cxf/branches/2.2.x-fixes/systests/transports/src/test/java/org/apache/cxf/systest/http/resources/Poltim.cer cxf/branches/2.1.x-fixes/systests/transports/src/test/java/org/apache/cxf/systest/http/resources/Poltim.cxf - copied unchanged from r813883, cxf/branches/2.2.x-fixes/systests/transports/src/test/java/org/apache/cxf/systest/http/resources/Poltim.cxf cxf/branches/2.1.x-fixes/systests/transports/src/test/java/org/apache/cxf/systest/http/resources/Poltim.jks - copied unchanged from r813883, cxf/branches/2.2.x-fixes/systests/transports/src/test/java/org/apache/cxf/systest/http/resources/Poltim.jks cxf/branches/2.1.x-fixes/systests/transports/src/test/java/org/apache/cxf/systest/http/resources/Rethwel.cxf - copied unchanged from r813883, cxf/branches/2.2.x-fixes/systests/transports/src/test/java/org/apache/cxf/systest/http/resources/Rethwel.cxf cxf/branches/2.1.x-fixes/systests/transports/src/test/java/org/apache/cxf/systest/http/resources/SessionServer.xml - copied unchanged from r813883, cxf/branches/2.2.x-fixes/systests/transports/src/test/java/org/apache/cxf/systest/http/resources/SessionServer.xml cxf/branches/2.1.x-fixes/systests/transports/src/test/java/org/apache/cxf/systest/http/resources/SessionServer_Windows.xml - copied unchanged from r813883, cxf/branches/2.2.x-fixes/systests/transports/src/test/java/org/apache/cxf/systest/http/resources/SessionServer_Windows.xml cxf/branches/2.1.x-fixes/systests/transports/src/test/java/org/apache/cxf/systest/http/resources/Tarpin.cer - copied unchanged from r813883, cxf/branches/2.2.x-fixes/systests/transports/src/test/java/org/apache/cxf/systest/http/resources/Tarpin.cer cxf/branches/2.1.x-fixes/systests/transports/src/test/java/org/apache/cxf/systest/http/resources/Tarpin.cxf - copied unchanged from r813883, cxf/branches/2.2.x-fixes/systests/transports/src/test/java/org/apache/cxf/systest/http/resources/Tarpin.cxf cxf/branches/2.1.x-fixes/systests/transports/src/test/java/org/apache/cxf/systest/http/resources/Tarpin.jks - copied unchanged from r813883, cxf/branches/2.2.x-fixes/systests/transports/src/test/java/org/apache/cxf/systest/http/resources/Tarpin.jks cxf/branches/2.1.x-fixes/systests/transports/src/test/java/org/apache/cxf/systest/http/resources/Truststore.jks - copied unchanged from r813883, cxf/branches/2.2.x-fixes/systests/transports/src/test/java/org/apache/cxf/systest/http/resources/Truststore.jks cxf/branches/2.1.x-fixes/systests/transports/src/test/java/org/apache/cxf/systest/http/resources/Truststore.pem - copied unchanged from r813883, cxf/branches/2.2.x-fixes/systests/transports/src/test/java/org/apache/cxf/systest/http/resources/Truststore.pem cxf/branches/2.1.x-fixes/systests/transports/src/test/java/org/apache/cxf/systest/http/resources/genkeys.sh - copied unchanged from r813883, cxf/branches/2.2.x-fixes/systests/transports/src/test/java/org/apache/cxf/systest/http/resources/genkeys.sh cxf/branches/2.1.x-fixes/systests/transports/src/test/java/org/apache/cxf/systest/http/resources/greeting.wsdl - copied unchanged from r813883, cxf/branches/2.2.x-fixes/systests/transports/src/test/java/org/apache/cxf/systest/http/resources/greeting.wsdl cxf/branches/2.1.x-fixes/systests/transports/src/test/java/org/apache/cxf/systest/http/resources/jaxws-publish.xml - copied unchanged from r813883, cxf/branches/2.2.x-fixes/systests/transports/src/test/java/org/apache/cxf/systest/http/resources/jaxws-publish.xml cxf/branches/2.1.x-fixes/systests/transports/src/test/java/org/apache/cxf/systest/http/resources/jaxws-server.xml - copied unchanged from r813883, cxf/branches/2.2.x-fixes/systests/transports/src/test/java/org/apache/cxf/systest/http/resources/jaxws-server.xml cxf/branches/2.1.x-fixes/systests/transports/src/test/java/org/apache/cxf/systest/http/resources/pkcs12.xml - copied unchanged from r813883, cxf/branches/2.2.x-fixes/systests/transports/src/test/java/org/apache/cxf/systest/http/resources/pkcs12.xml cxf/branches/2.1.x-fixes/systests/transports/src/test/java/org/apache/cxf/systest/http/resources/resource-key-spec-url.xml - copied unchanged from r813883, cxf/branches/2.2.x-fixes/systests/transports/src/test/java/org/apache/cxf/systest/http/resources/resource-key-spec-url.xml cxf/branches/2.1.x-fixes/systests/transports/src/test/java/org/apache/cxf/systest/http/resources/resource-key-spec.xml - copied unchanged from r813883, cxf/branches/2.2.x-fixes/systests/transports/src/test/java/org/apache/cxf/systest/http/resources/resource-key-spec.xml cxf/branches/2.1.x-fixes/systests/transports/src/test/java/org/apache/cxf/systest/http_jetty/ - copied from r813883, cxf/branches/2.2.x-fixes/systests/transports/src/test/java/org/apache/cxf/systest/http_jetty/ cxf/branches/2.1.x-fixes/systests/transports/src/test/java/org/apache/cxf/systest/http_jetty/Dummy.java - copied unchanged from r813883, cxf/branches/2.2.x-fixes/systests/transports/src/test/java/org/apache/cxf/systest/http_jetty/Dummy.java cxf/branches/2.1.x-fixes/systests/transports/src/test/java/org/apache/cxf/systest/http_jetty/DummyInterface.java - copied unchanged from r813883, cxf/branches/2.2.x-fixes/systests/transports/src/test/java/org/apache/cxf/systest/http_jetty/DummyInterface.java cxf/branches/2.1.x-fixes/systests/transports/src/test/java/org/apache/cxf/systest/http_jetty/EngineLifecycleTest.java - copied unchanged from r813883, cxf/branches/2.2.x-fixes/systests/transports/src/test/java/org/apache/cxf/systest/http_jetty/EngineLifecycleTest.java cxf/branches/2.1.x-fixes/systests/transports/src/test/java/org/apache/cxf/systest/http_jetty/GreeterImpl.java - copied unchanged from r813883, cxf/branches/2.2.x-fixes/systests/transports/src/test/java/org/apache/cxf/systest/http_jetty/GreeterImpl.java cxf/branches/2.1.x-fixes/systests/transports/src/test/java/org/apache/cxf/systest/http_jetty/Server.java - copied unchanged from r813883, cxf/branches/2.2.x-fixes/systests/transports/src/test/java/org/apache/cxf/systest/http_jetty/Server.java cxf/branches/2.1.x-fixes/systests/transports/src/test/java/org/apache/cxf/systest/http_jetty/ThreadPoolTest.java - copied unchanged from r813883, cxf/branches/2.2.x-fixes/systests/transports/src/test/java/org/apache/cxf/systest/http_jetty/ThreadPoolTest.java cxf/branches/2.1.x-fixes/systests/transports/src/test/java/org/apache/cxf/systest/http_jetty/continuations/ - copied from r813883, cxf/branches/2.2.x-fixes/systests/transports/src/test/java/org/apache/cxf/systest/http_jetty/continuations/ cxf/branches/2.1.x-fixes/systests/transports/src/test/java/org/apache/cxf/systest/http_jetty/continuations/ClientServerWrappedContinuationTest.java - copied unchanged from r813883, cxf/branches/2.2.x-fixes/systests/transports/src/test/java/org/apache/cxf/systest/http_jetty/continuations/ClientServerWrappedContinuationTest.java cxf/branches/2.1.x-fixes/systests/transports/src/test/java/org/apache/cxf/systest/http_jetty/continuations/ControlWorker.java - copied unchanged from r813883, cxf/branches/2.2.x-fixes/systests/transports/src/test/java/org/apache/cxf/systest/http_jetty/continuations/ControlWorker.java cxf/branches/2.1.x-fixes/systests/transports/src/test/java/org/apache/cxf/systest/http_jetty/continuations/HelloContinuation.java - copied unchanged from r813883, cxf/branches/2.2.x-fixes/systests/transports/src/test/java/org/apache/cxf/systest/http_jetty/continuations/HelloContinuation.java cxf/branches/2.1.x-fixes/systests/transports/src/test/java/org/apache/cxf/systest/http_jetty/continuations/HelloContinuationService.java - copied unchanged from r813883, cxf/branches/2.2.x-fixes/systests/transports/src/test/java/org/apache/cxf/systest/http_jetty/continuations/HelloContinuationService.java cxf/branches/2.1.x-fixes/systests/transports/src/test/java/org/apache/cxf/systest/http_jetty/continuations/HelloImplWithWrapppedContinuation.java - copied unchanged from r813883, cxf/branches/2.2.x-fixes/systests/transports/src/test/java/org/apache/cxf/systest/http_jetty/continuations/HelloImplWithWrapppedContinuation.java cxf/branches/2.1.x-fixes/systests/transports/src/test/java/org/apache/cxf/systest/http_jetty/continuations/HelloWorker.java - copied unchanged from r813883, cxf/branches/2.2.x-fixes/systests/transports/src/test/java/org/apache/cxf/systest/http_jetty/continuations/HelloWorker.java cxf/branches/2.1.x-fixes/systests/transports/src/test/java/org/apache/cxf/systest/http_jetty/continuations/cxf.xml - copied unchanged from r813883, cxf/branches/2.2.x-fixes/systests/transports/src/test/java/org/apache/cxf/systest/http_jetty/continuations/cxf.xml cxf/branches/2.1.x-fixes/systests/transports/src/test/java/org/apache/cxf/systest/http_jetty/continuations/jaxws-server.xml - copied unchanged from r813883, cxf/branches/2.2.x-fixes/systests/transports/src/test/java/org/apache/cxf/systest/http_jetty/continuations/jaxws-server.xml cxf/branches/2.1.x-fixes/systests/transports/src/test/java/org/apache/cxf/systest/http_jetty/continuations/jetty-engine.xml - copied unchanged from r813883, cxf/branches/2.2.x-fixes/systests/transports/src/test/java/org/apache/cxf/systest/http_jetty/continuations/jetty-engine.xml cxf/branches/2.1.x-fixes/systests/transports/src/test/java/org/apache/cxf/systest/http_jetty/continuations/test.wsdl - copied unchanged from r813883, cxf/branches/2.2.x-fixes/systests/transports/src/test/java/org/apache/cxf/systest/http_jetty/continuations/test.wsdl cxf/branches/2.1.x-fixes/systests/transports/src/test/java/org/apache/cxf/systest/http_jetty/cxf.xml - copied unchanged from r813883, cxf/branches/2.2.x-fixes/systests/transports/src/test/java/org/apache/cxf/systest/http_jetty/cxf.xml cxf/branches/2.1.x-fixes/systests/transports/src/test/java/org/apache/cxf/systest/http_jetty/jetty-engine.xml - copied unchanged from r813883, cxf/branches/2.2.x-fixes/systests/transports/src/test/java/org/apache/cxf/systest/http_jetty/jetty-engine.xml cxf/branches/2.1.x-fixes/systests/transports/src/test/java/org/apache/cxf/systest/http_jetty/server-lifecycle-beans.xml - copied unchanged from r813883, cxf/branches/2.2.x-fixes/systests/transports/src/test/java/org/apache/cxf/systest/http_jetty/server-lifecycle-beans.xml cxf/branches/2.1.x-fixes/systests/transports/src/test/java/org/apache/cxf/systest/http_jetty/server.xml - copied unchanged from r813883, cxf/branches/2.2.x-fixes/systests/transports/src/test/java/org/apache/cxf/systest/http_jetty/server.xml cxf/branches/2.1.x-fixes/systests/transports/src/test/java/org/apache/cxf/systest/http_jetty/test.html - copied unchanged from r813883, cxf/branches/2.2.x-fixes/systests/transports/src/test/java/org/apache/cxf/systest/http_jetty/test.html cxf/branches/2.1.x-fixes/systests/transports/src/test/java/org/apache/cxf/systest/local_transport/ - copied from r813883, cxf/branches/2.2.x-fixes/systests/transports/src/test/java/org/apache/cxf/systest/local_transport/ cxf/branches/2.1.x-fixes/systests/transports/src/test/java/org/apache/cxf/systest/local_transport/DirectDispatchClientTest.java - copied unchanged from r813883, cxf/branches/2.2.x-fixes/systests/transports/src/test/java/org/apache/cxf/systest/local_transport/DirectDispatchClientTest.java cxf/branches/2.1.x-fixes/systests/transports/src/test/java/org/apache/cxf/systest/local_transport/Server.java - copied unchanged from r813883, cxf/branches/2.2.x-fixes/systests/transports/src/test/java/org/apache/cxf/systest/local_transport/Server.java cxf/branches/2.1.x-fixes/systests/transports/src/test/java/org/apache/cxf/systest/multitransport/ - copied from r813883, cxf/branches/2.2.x-fixes/systests/transports/src/test/java/org/apache/cxf/systest/multitransport/ cxf/branches/2.1.x-fixes/systests/transports/src/test/java/org/apache/cxf/systest/multitransport/MultiTransportClientServerTest.java - copied unchanged from r813883, cxf/branches/2.2.x-fixes/systests/transports/src/test/java/org/apache/cxf/systest/multitransport/MultiTransportClientServerTest.java cxf/branches/2.1.x-fixes/systests/transports/src/test/java/org/apache/cxf/systest/servlet/ - copied from r813883, cxf/branches/2.2.x-fixes/systests/transports/src/test/java/org/apache/cxf/systest/servlet/ cxf/branches/2.1.x-fixes/systests/transports/src/test/java/org/apache/cxf/systest/servlet/CXFServletTest.java - copied unchanged from r813883, cxf/branches/2.2.x-fixes/systests/transports/src/test/java/org/apache/cxf/systest/servlet/CXFServletTest.java cxf/branches/2.1.x-fixes/systests/transports/src/test/java/org/apache/cxf/systest/servlet/ErrorContextSerletTest.java - copied unchanged from r813883, cxf/branches/2.2.x-fixes/systests/transports/src/test/java/org/apache/cxf/systest/servlet/ErrorContextSerletTest.java cxf/branches/2.1.x-fixes/systests/transports/src/test/java/org/apache/cxf/systest/servlet/ExternalServicesServletTest.java - copied unchanged from r813883, cxf/branches/2.2.x-fixes/systests/transports/src/test/java/org/apache/cxf/systest/servlet/ExternalServicesServletTest.java cxf/branches/2.1.x-fixes/systests/transports/src/test/java/org/apache/cxf/systest/servlet/GreeterMessage.xml - copied unchanged from r813883, cxf/branches/2.2.x-fixes/systests/transports/src/test/java/org/apache/cxf/systest/servlet/GreeterMessage.xml cxf/branches/2.1.x-fixes/systests/transports/src/test/java/org/apache/cxf/systest/servlet/Hello.java - copied unchanged from r813883, cxf/branches/2.2.x-fixes/systests/transports/src/test/java/org/apache/cxf/systest/servlet/Hello.java cxf/branches/2.1.x-fixes/systests/transports/src/test/java/org/apache/cxf/systest/servlet/HelloImpl.java - copied unchanged from r813883, cxf/branches/2.2.x-fixes/systests/transports/src/test/java/org/apache/cxf/systest/servlet/HelloImpl.java cxf/branches/2.1.x-fixes/systests/transports/src/test/java/org/apache/cxf/systest/servlet/HttpBindingServletTest.java - copied unchanged from r813883, cxf/branches/2.2.x-fixes/systests/transports/src/test/java/org/apache/cxf/systest/servlet/HttpBindingServletTest.java cxf/branches/2.1.x-fixes/systests/transports/src/test/java/org/apache/cxf/systest/servlet/JsFrontEndServletTest.java - copied unchanged from r813883, cxf/branches/2.2.x-fixes/systests/transports/src/test/java/org/apache/cxf/systest/servlet/JsFrontEndServletTest.java cxf/branches/2.1.x-fixes/systests/transports/src/test/java/org/apache/cxf/systest/servlet/NoSpringServletClientTest.java - copied unchanged from r813883, cxf/branches/2.2.x-fixes/systests/transports/src/test/java/org/apache/cxf/systest/servlet/NoSpringServletClientTest.java cxf/branches/2.1.x-fixes/systests/transports/src/test/java/org/apache/cxf/systest/servlet/NoSpringServletServer.java - copied unchanged from r813883, cxf/branches/2.2.x-fixes/systests/transports/src/test/java/org/apache/cxf/systest/servlet/NoSpringServletServer.java cxf/branches/2.1.x-fixes/systests/transports/src/test/java/org/apache/cxf/systest/servlet/SpringServletTest.java - copied unchanged from r813883, cxf/branches/2.2.x-fixes/systests/transports/src/test/java/org/apache/cxf/systest/servlet/SpringServletTest.java cxf/branches/2.1.x-fixes/systests/transports/src/test/java/org/apache/cxf/systest/servlet/add.xml - copied unchanged from r813883, cxf/branches/2.2.x-fixes/systests/transports/src/test/java/org/apache/cxf/systest/servlet/add.xml cxf/branches/2.1.x-fixes/systests/transports/src/test/java/org/apache/cxf/systest/servlet/cxf-jaxrs.xml - copied unchanged from r813883, cxf/branches/2.2.x-fixes/systests/transports/src/test/java/org/apache/cxf/systest/servlet/cxf-jaxrs.xml cxf/branches/2.1.x-fixes/systests/transports/src/test/java/org/apache/cxf/systest/servlet/cxf-servlet.xml - copied unchanged from r813883, cxf/branches/2.2.x-fixes/systests/transports/src/test/java/org/apache/cxf/systest/servlet/cxf-servlet.xml cxf/branches/2.1.x-fixes/systests/transports/src/test/java/org/apache/cxf/systest/servlet/hello_world.js - copied unchanged from r813883, cxf/branches/2.2.x-fixes/systests/transports/src/test/java/org/apache/cxf/systest/servlet/hello_world.js cxf/branches/2.1.x-fixes/systests/transports/src/test/java/org/apache/cxf/systest/servlet/hello_world.wsdl - copied unchanged from r813883, cxf/branches/2.2.x-fixes/systests/transports/src/test/java/org/apache/cxf/systest/servlet/hello_world.wsdl cxf/branches/2.1.x-fixes/systests/transports/src/test/java/org/apache/cxf/systest/servlet/hello_world_xml_wrapped.wsdl - copied unchanged from r813883, cxf/branches/2.2.x-fixes/systests/transports/src/test/java/org/apache/cxf/systest/servlet/hello_world_xml_wrapped.wsdl cxf/branches/2.1.x-fixes/systests/transports/src/test/java/org/apache/cxf/systest/servlet/restful_service.xml - copied unchanged from r813883, cxf/branches/2.2.x-fixes/systests/transports/src/test/java/org/apache/cxf/systest/servlet/restful_service.xml cxf/branches/2.1.x-fixes/systests/transports/src/test/java/org/apache/cxf/systest/servlet/spring-error.xml - copied unchanged from r813883, cxf/branches/2.2.x-fixes/systests/transports/src/test/java/org/apache/cxf/systest/servlet/spring-error.xml cxf/branches/2.1.x-fixes/systests/transports/src/test/java/org/apache/cxf/systest/servlet/spring-js.xml - copied unchanged from r813883, cxf/branches/2.2.x-fixes/systests/transports/src/test/java/org/apache/cxf/systest/servlet/spring-js.xml cxf/branches/2.1.x-fixes/systests/transports/src/test/java/org/apache/cxf/systest/servlet/spring.xml - copied unchanged from r813883, cxf/branches/2.2.x-fixes/systests/transports/src/test/java/org/apache/cxf/systest/servlet/spring.xml cxf/branches/2.1.x-fixes/systests/transports/src/test/java/org/apache/cxf/systest/servlet/test_import.xsd - copied unchanged from r813883, cxf/branches/2.2.x-fixes/systests/transports/src/test/java/org/apache/cxf/systest/servlet/test_import.xsd cxf/branches/2.1.x-fixes/systests/transports/src/test/java/org/apache/cxf/systest/servlet/update.xml - copied unchanged from r813883, cxf/branches/2.2.x-fixes/systests/transports/src/test/java/org/apache/cxf/systest/servlet/update.xml cxf/branches/2.1.x-fixes/systests/transports/src/test/java/org/apache/cxf/systest/servlet/web-external.xml - copied unchanged from r813883, cxf/branches/2.2.x-fixes/systests/transports/src/test/java/org/apache/cxf/systest/servlet/web-external.xml cxf/branches/2.1.x-fixes/systests/transports/src/test/java/org/apache/cxf/systest/servlet/web-js.xml - copied unchanged from r813883, cxf/branches/2.2.x-fixes/systests/transports/src/test/java/org/apache/cxf/systest/servlet/web-js.xml cxf/branches/2.1.x-fixes/systests/transports/src/test/java/org/apache/cxf/systest/servlet/web-restful.xml - copied unchanged from r813883, cxf/branches/2.2.x-fixes/systests/transports/src/test/java/org/apache/cxf/systest/servlet/web-restful.xml cxf/branches/2.1.x-fixes/systests/transports/src/test/java/org/apache/cxf/systest/servlet/web-spring-error.xml - copied unchanged from r813883, cxf/branches/2.2.x-fixes/systests/transports/src/test/java/org/apache/cxf/systest/servlet/web-spring-error.xml cxf/branches/2.1.x-fixes/systests/transports/src/test/java/org/apache/cxf/systest/servlet/web-spring.xml - copied unchanged from r813883, cxf/branches/2.2.x-fixes/systests/transports/src/test/java/org/apache/cxf/systest/servlet/web-spring.xml cxf/branches/2.1.x-fixes/testutils/src/main/java/org/apache/cxf/testutil/common/EmbeddedJMSBrokerLauncher.java - copied unchanged from r813883, cxf/branches/2.2.x-fixes/testutils/src/main/java/org/apache/cxf/testutil/common/EmbeddedJMSBrokerLauncher.java Removed: cxf/branches/2.1.x-fixes/systests/transports/src/test/resources/ cxf/branches/2.1.x-fixes/systests/uncategorized/src/test/java/org/apache/cxf/jms/ cxf/branches/2.1.x-fixes/systests/uncategorized/src/test/java/org/apache/cxf/systest/http/ cxf/branches/2.1.x-fixes/systests/uncategorized/src/test/java/org/apache/cxf/systest/http_jetty/ cxf/branches/2.1.x-fixes/systests/uncategorized/src/test/java/org/apache/cxf/systest/jms/ cxf/branches/2.1.x-fixes/systests/uncategorized/src/test/java/org/apache/cxf/systest/local_transport/ cxf/branches/2.1.x-fixes/systests/uncategorized/src/test/java/org/apache/cxf/systest/multitransport/ cxf/branches/2.1.x-fixes/systests/uncategorized/src/test/java/org/apache/cxf/systest/servlet/ cxf/branches/2.1.x-fixes/systests/uncategorized/src/test/resources/ Modified: cxf/branches/2.1.x-fixes/ (props changed) cxf/branches/2.1.x-fixes/systests/pom.xml cxf/branches/2.1.x-fixes/systests/transports/pom.xml cxf/branches/2.1.x-fixes/systests/uncategorized/pom.xml cxf/branches/2.1.x-fixes/systests/uncategorized/src/test/java/org/apache/cxf/systest/factory_pattern/MultiplexClientServerTest.java cxf/branches/2.1.x-fixes/systests/uncategorized/src/test/java/org/apache/cxf/systest/mtom/ClientMtomXopWithJMSTest.java cxf/branches/2.1.x-fixes/systests/ws-specs/ (props changed) cxf/branches/2.1.x-fixes/testutils/pom.xml Propchange: cxf/branches/2.1.x-fixes/ ------------------------------------------------------------------------------ Binary property 'svnmerge-integrated' - no diff available. Modified: cxf/branches/2.1.x-fixes/systests/pom.xml URL: http://svn.apache.org/viewvc/cxf/branches/2.1.x-fixes/systests/pom.xml?rev=813926&r1=813925&r2=813926&view=diff ============================================================================== --- cxf/branches/2.1.x-fixes/systests/pom.xml (original) +++ cxf/branches/2.1.x-fixes/systests/pom.xml Fri Sep 11 17:08:05 2009 @@ -32,8 +32,9 @@ </parent> <modules> <module>uncategorized</module> - <module>jaxws</module> - <module>aegis</module> + <module>transports</module> + <module>jaxws</module> + <module>aegis</module> <module>jaxrs</module> <module>ws-specs</module> </modules> Modified: cxf/branches/2.1.x-fixes/systests/transports/pom.xml URL: http://svn.apache.org/viewvc/cxf/branches/2.1.x-fixes/systests/transports/pom.xml?rev=813926&r1=813925&r2=813926&view=diff ============================================================================== --- cxf/branches/2.1.x-fixes/systests/transports/pom.xml (original) +++ cxf/branches/2.1.x-fixes/systests/transports/pom.xml Fri Sep 11 17:08:05 2009 @@ -33,24 +33,6 @@ <build> <plugins> <plugin> - <groupId>org.apache.cxf</groupId> - <artifactId>cxf-codegen-plugin</artifactId> - <version>${project.version}</version> - <executions> - <execution> - <id>generate-test-sources</id> - <phase>generate-test-sources</phase> - <configuration> - <testSourceRoot>${basedir}/target/generated/src/test/java</testSourceRoot> - <testWsdlRoot>${basedir}/src/test/resources/wsdl_systest_transport</testWsdlRoot> - </configuration> - <goals> - <goal>wsdl2java</goal> - </goals> - </execution> - </executions> - </plugin> - <plugin> <artifactId>maven-jar-plugin</artifactId> <executions> <execution> @@ -325,14 +307,6 @@ </exclusions> </dependency> - - <dependency> - <groupId>org.apache.cxf</groupId> - <artifactId>cxf-rt-databinding-sdo</artifactId> - <version>${project.version}</version> - <scope>test</scope> - </dependency> - <dependency> <groupId>org.springframework.security</groupId> <artifactId>spring-security-acl</artifactId> Modified: cxf/branches/2.1.x-fixes/systests/uncategorized/pom.xml URL: http://svn.apache.org/viewvc/cxf/branches/2.1.x-fixes/systests/uncategorized/pom.xml?rev=813926&r1=813925&r2=813926&view=diff ============================================================================== --- cxf/branches/2.1.x-fixes/systests/uncategorized/pom.xml (original) +++ cxf/branches/2.1.x-fixes/systests/uncategorized/pom.xml Fri Sep 11 17:08:05 2009 @@ -171,30 +171,6 @@ </execution> </executions> </plugin> - <plugin> - <groupId>org.apache.cxf</groupId> - <artifactId>cxf-common-xsd</artifactId> - <version>${project.version}</version> - <executions> - <execution> - <id>generate-sources</id> - <phase>generate-sources</phase> - <configuration> - <testSourceRoot>${basedir}/target/generated/src/test/java</testSourceRoot> - <xsdOptions> - <xsdOption> - <xsd>${basedir}/src/test/resources/jms/testcase.xsd</xsd> - <bindingFile>${basedir}/src/test/resources/jms/testcase.xjb</bindingFile> - <catalog>${basedir}/src/test/build-resources/catalog.cat</catalog> - </xsdOption> - </xsdOptions> - </configuration> - <goals> - <goal>xsdtojava</goal> - </goals> - </execution> - </executions> - </plugin> </plugins> </build> <profiles> Modified: cxf/branches/2.1.x-fixes/systests/uncategorized/src/test/java/org/apache/cxf/systest/factory_pattern/MultiplexClientServerTest.java URL: http://svn.apache.org/viewvc/cxf/branches/2.1.x-fixes/systests/uncategorized/src/test/java/org/apache/cxf/systest/factory_pattern/MultiplexClientServerTest.java?rev=813926&r1=813925&r2=813926&view=diff ============================================================================== --- cxf/branches/2.1.x-fixes/systests/uncategorized/src/test/java/org/apache/cxf/systest/factory_pattern/MultiplexClientServerTest.java (original) +++ cxf/branches/2.1.x-fixes/systests/uncategorized/src/test/java/org/apache/cxf/systest/factory_pattern/MultiplexClientServerTest.java Fri Sep 11 17:08:05 2009 @@ -32,9 +32,10 @@ import org.apache.cxf.factory_pattern.NumberService; import org.apache.cxf.jaxws.ServiceImpl; import org.apache.cxf.jaxws.support.ServiceDelegateAccessor; -import org.apache.cxf.systest.jms.EmbeddedJMSBrokerLauncher; import org.apache.cxf.testutil.common.AbstractBusClientServerTestBase; import org.apache.cxf.testutil.common.AbstractBusTestServerBase; +import org.apache.cxf.testutil.common.EmbeddedJMSBrokerLauncher; + import org.junit.BeforeClass; import org.junit.Test; Modified: cxf/branches/2.1.x-fixes/systests/uncategorized/src/test/java/org/apache/cxf/systest/mtom/ClientMtomXopWithJMSTest.java URL: http://svn.apache.org/viewvc/cxf/branches/2.1.x-fixes/systests/uncategorized/src/test/java/org/apache/cxf/systest/mtom/ClientMtomXopWithJMSTest.java?rev=813926&r1=813925&r2=813926&view=diff ============================================================================== --- cxf/branches/2.1.x-fixes/systests/uncategorized/src/test/java/org/apache/cxf/systest/mtom/ClientMtomXopWithJMSTest.java (original) +++ cxf/branches/2.1.x-fixes/systests/uncategorized/src/test/java/org/apache/cxf/systest/mtom/ClientMtomXopWithJMSTest.java Fri Sep 11 17:08:05 2009 @@ -44,9 +44,10 @@ import org.apache.cxf.service.Service; import org.apache.cxf.service.factory.ReflectionServiceFactoryBean; import org.apache.cxf.service.model.EndpointInfo; -import org.apache.cxf.systest.jms.EmbeddedJMSBrokerLauncher; import org.apache.cxf.test.TestUtilities; import org.apache.cxf.testutil.common.AbstractBusClientServerTestBase; +import org.apache.cxf.testutil.common.EmbeddedJMSBrokerLauncher; + import org.junit.AfterClass; import org.junit.BeforeClass; import org.junit.Test; Propchange: cxf/branches/2.1.x-fixes/systests/ws-specs/ ------------------------------------------------------------------------------ --- svn:ignore (added) +++ svn:ignore Fri Sep 11 17:08:05 2009 @@ -0,0 +1,10 @@ +.pmd +.checkstyle +.ruleset +target +eclipse-classes +.settings +.classpath +.project +.wtpmodules + Modified: cxf/branches/2.1.x-fixes/testutils/pom.xml URL: http://svn.apache.org/viewvc/cxf/branches/2.1.x-fixes/testutils/pom.xml?rev=813926&r1=813925&r2=813926&view=diff ============================================================================== --- cxf/branches/2.1.x-fixes/testutils/pom.xml (original) +++ cxf/branches/2.1.x-fixes/testutils/pom.xml Fri Sep 11 17:08:05 2009 @@ -72,6 +72,11 @@ <artifactId>cxf-api</artifactId> <version>${project.version}</version> </dependency> + <dependency> + <groupId>org.apache.activemq</groupId> + <artifactId>activemq-core</artifactId> + <scope>provided</scope> + </dependency> </dependencies> <build>
