Author: dkulp Date: Wed Oct 8 07:21:16 2008 New Revision: 702887 URL: http://svn.apache.org/viewvc?rev=702887&view=rev Log: Merged revisions 702443 via svnmerge from https://svn.apache.org/repos/asf/cxf/branches/2.1.x-fixes
................ r702443 | ningjiang | 2008-10-07 07:49:42 -0400 (Tue, 07 Oct 2008) | 9 lines Merged revisions 702420 via svnmerge from https://svn.apache.org/repos/asf/cxf/trunk ........ r702420 | ningjiang | 2008-10-07 18:00:21 +0800 (Tue, 07 Oct 2008) | 1 line CXF-1841 patch applied with thanks to William ........ ................ Added: cxf/branches/2.0.x-fixes/api/src/main/java/org/apache/cxf/jca/ - copied from r702443, cxf/branches/2.1.x-fixes/api/src/main/java/org/apache/cxf/jca/ cxf/branches/2.0.x-fixes/api/src/main/java/org/apache/cxf/jca/outbound/ - copied from r702443, cxf/branches/2.1.x-fixes/api/src/main/java/org/apache/cxf/jca/outbound/ cxf/branches/2.0.x-fixes/api/src/main/java/org/apache/cxf/jca/outbound/CXFConnection.java - copied unchanged from r702443, cxf/branches/2.1.x-fixes/api/src/main/java/org/apache/cxf/jca/outbound/CXFConnection.java cxf/branches/2.0.x-fixes/api/src/main/java/org/apache/cxf/jca/outbound/CXFConnectionFactory.java - copied unchanged from r702443, cxf/branches/2.1.x-fixes/api/src/main/java/org/apache/cxf/jca/outbound/CXFConnectionFactory.java cxf/branches/2.0.x-fixes/api/src/main/java/org/apache/cxf/jca/outbound/CXFConnectionSpec.java - copied unchanged from r702443, cxf/branches/2.1.x-fixes/api/src/main/java/org/apache/cxf/jca/outbound/CXFConnectionSpec.java cxf/branches/2.0.x-fixes/distribution/src/main/release/samples/integration/jca/outbound.was61/ - copied from r702443, cxf/branches/2.1.x-fixes/distribution/src/main/release/samples/integration/jca/outbound.was61/ cxf/branches/2.0.x-fixes/distribution/src/main/release/samples/integration/jca/outbound.was61/README.txt - copied unchanged from r702443, cxf/branches/2.1.x-fixes/distribution/src/main/release/samples/integration/jca/outbound.was61/README.txt cxf/branches/2.0.x-fixes/distribution/src/main/release/samples/integration/jca/outbound.was61/build.xml - copied unchanged from r702443, cxf/branches/2.1.x-fixes/distribution/src/main/release/samples/integration/jca/outbound.was61/build.xml cxf/branches/2.0.x-fixes/distribution/src/main/release/samples/integration/jca/outbound.was61/etc/ - copied from r702443, cxf/branches/2.1.x-fixes/distribution/src/main/release/samples/integration/jca/outbound.was61/etc/ cxf/branches/2.0.x-fixes/distribution/src/main/release/samples/integration/jca/outbound.was61/etc/cxf_client.xml - copied unchanged from r702443, cxf/branches/2.1.x-fixes/distribution/src/main/release/samples/integration/jca/outbound.was61/etc/cxf_client.xml cxf/branches/2.0.x-fixes/distribution/src/main/release/samples/integration/jca/outbound.was61/etc/ra.xml - copied unchanged from r702443, cxf/branches/2.1.x-fixes/distribution/src/main/release/samples/integration/jca/outbound.was61/etc/ra.xml cxf/branches/2.0.x-fixes/distribution/src/main/release/samples/integration/jca/outbound.was61/etc/web.xml - copied unchanged from r702443, cxf/branches/2.1.x-fixes/distribution/src/main/release/samples/integration/jca/outbound.was61/etc/web.xml cxf/branches/2.0.x-fixes/distribution/src/main/release/samples/integration/jca/outbound.was61/etc/wsdl/ - copied from r702443, cxf/branches/2.1.x-fixes/distribution/src/main/release/samples/integration/jca/outbound.was61/etc/wsdl/ cxf/branches/2.0.x-fixes/distribution/src/main/release/samples/integration/jca/outbound.was61/etc/wsdl/hello_world.wsdl - copied unchanged from r702443, cxf/branches/2.1.x-fixes/distribution/src/main/release/samples/integration/jca/outbound.was61/etc/wsdl/hello_world.wsdl cxf/branches/2.0.x-fixes/distribution/src/main/release/samples/integration/jca/outbound.was61/src/ - copied from r702443, cxf/branches/2.1.x-fixes/distribution/src/main/release/samples/integration/jca/outbound.was61/src/ cxf/branches/2.0.x-fixes/distribution/src/main/release/samples/integration/jca/outbound.was61/src/demo/ - copied from r702443, cxf/branches/2.1.x-fixes/distribution/src/main/release/samples/integration/jca/outbound.was61/src/demo/ cxf/branches/2.0.x-fixes/distribution/src/main/release/samples/integration/jca/outbound.was61/src/demo/client/ - copied from r702443, cxf/branches/2.1.x-fixes/distribution/src/main/release/samples/integration/jca/outbound.was61/src/demo/client/ cxf/branches/2.0.x-fixes/distribution/src/main/release/samples/integration/jca/outbound.was61/src/demo/client/Client.java - copied unchanged from r702443, cxf/branches/2.1.x-fixes/distribution/src/main/release/samples/integration/jca/outbound.was61/src/demo/client/Client.java cxf/branches/2.0.x-fixes/distribution/src/main/release/samples/integration/jca/outbound.was61/src/demo/servlet/ - copied from r702443, cxf/branches/2.1.x-fixes/distribution/src/main/release/samples/integration/jca/outbound.was61/src/demo/servlet/ cxf/branches/2.0.x-fixes/distribution/src/main/release/samples/integration/jca/outbound.was61/src/demo/servlet/HelloWorldServlet.java - copied unchanged from r702443, cxf/branches/2.1.x-fixes/distribution/src/main/release/samples/integration/jca/outbound.was61/src/demo/servlet/HelloWorldServlet.java cxf/branches/2.0.x-fixes/distribution/src/main/release/samples/integration/jca/outbound.was61/src/hello_world.wsdl - copied unchanged from r702443, cxf/branches/2.1.x-fixes/distribution/src/main/release/samples/integration/jca/outbound.was61/src/hello_world.wsdl cxf/branches/2.0.x-fixes/integration/jca/src/main/java/org/apache/cxf/jca/outbound/ - copied from r702443, cxf/branches/2.1.x-fixes/integration/jca/src/main/java/org/apache/cxf/jca/outbound/ cxf/branches/2.0.x-fixes/integration/jca/src/main/java/org/apache/cxf/jca/outbound/CXFManagedConnectionMetaData.java - copied unchanged from r702443, cxf/branches/2.1.x-fixes/integration/jca/src/main/java/org/apache/cxf/jca/outbound/CXFManagedConnectionMetaData.java cxf/branches/2.0.x-fixes/integration/jca/src/main/java/org/apache/cxf/jca/outbound/ConnectionFactoryImpl.java - copied unchanged from r702443, cxf/branches/2.1.x-fixes/integration/jca/src/main/java/org/apache/cxf/jca/outbound/ConnectionFactoryImpl.java cxf/branches/2.0.x-fixes/integration/jca/src/main/java/org/apache/cxf/jca/outbound/DefaultConnectionManager.java - copied unchanged from r702443, cxf/branches/2.1.x-fixes/integration/jca/src/main/java/org/apache/cxf/jca/outbound/DefaultConnectionManager.java cxf/branches/2.0.x-fixes/integration/jca/src/main/java/org/apache/cxf/jca/outbound/ManagedConnectionFactoryImpl.java - copied unchanged from r702443, cxf/branches/2.1.x-fixes/integration/jca/src/main/java/org/apache/cxf/jca/outbound/ManagedConnectionFactoryImpl.java cxf/branches/2.0.x-fixes/integration/jca/src/main/java/org/apache/cxf/jca/outbound/ManagedConnectionImpl.java - copied unchanged from r702443, cxf/branches/2.1.x-fixes/integration/jca/src/main/java/org/apache/cxf/jca/outbound/ManagedConnectionImpl.java Modified: cxf/branches/2.0.x-fixes/ (props changed) cxf/branches/2.0.x-fixes/api/pom.xml cxf/branches/2.0.x-fixes/integration/jca/pom.xml Propchange: cxf/branches/2.0.x-fixes/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Wed Oct 8 07:21:16 2008 @@ -1,3 +1,3 @@ -/cxf/branches/2.1.x-fixes:673548,674485,674547,674551,674562,674601,674649,674764,674887,675644,675653,677048,677385,678004,678009,678559,678629,678808,678852,678891,678893,679248,679597,680435,681060,681165,681813,681816,682902,682951,683089,683290,683318,684099,684790-684793,684842,684862,684895-684918,685205,685253,686237,686283,686299,686333-686364,686765,686827,687097,687464-687465,689109,689112,689122,691316,691357,691491,691711,691715,691745,692162-692163,692468,692500,694466-694469,694472,694717,694748-694749,694870,695503,695509,695553,695555,695563,695875-695877,695940,695980,696436,696455,696721,697086,698129,701526,701634,702275,702604,702610 +/cxf/branches/2.1.x-fixes:673548,674485,674547,674551,674562,674601,674649,674764,674887,675644,675653,677048,677385,678004,678009,678559,678629,678808,678852,678891,678893,679248,679597,680435,681060,681165,681813,681816,682902,682951,683089,683290,683318,684099,684790-684793,684842,684862,684895-684918,685205,685253,686237,686283,686299,686333-686364,686765,686827,687097,687464-687465,689109,689112,689122,691316,691357,691491,691711,691715,691745,692162-692163,692468,692500,694466-694469,694472,694717,694748-694749,694870,695503,695509,695553,695555,695563,695875-695877,695940,695980,696436,696455,696721,697086,698129,701526,701634,702275,702443,702604,702610 /cxf/trunk:651669-686342,686344-686363,686764,686820,687096,687387,687463,688086,688102,688735,691271,691355,691488,691602,691706,691728,692116,692157,692466,692499,693653,693819,694179,694263,694417,694716,694744,694747,694869,695396,695484,695537,695552,695561,695619,695684,695835,695935,695977,696094,696433,696720,697085,698128,700261,700602,702267,702602,702609 /incubator/cxf/trunk:434594-651668 Propchange: cxf/branches/2.0.x-fixes/ ------------------------------------------------------------------------------ Binary property 'svnmerge-integrated' - no diff available. Modified: cxf/branches/2.0.x-fixes/api/pom.xml URL: http://svn.apache.org/viewvc/cxf/branches/2.0.x-fixes/api/pom.xml?rev=702887&r1=702886&r2=702887&view=diff ============================================================================== --- cxf/branches/2.0.x-fixes/api/pom.xml (original) +++ cxf/branches/2.0.x-fixes/api/pom.xml Wed Oct 8 07:21:16 2008 @@ -74,6 +74,10 @@ <artifactId>geronimo-annotation_1.0_spec</artifactId> </dependency> <dependency> + <groupId>org.apache.geronimo.specs</groupId> + <artifactId>geronimo-j2ee-connector_1.5_spec</artifactId> + </dependency> + <dependency> <groupId>org.codehaus.woodstox</groupId> <artifactId>wstx-asl</artifactId> </dependency> Modified: cxf/branches/2.0.x-fixes/integration/jca/pom.xml URL: http://svn.apache.org/viewvc/cxf/branches/2.0.x-fixes/integration/jca/pom.xml?rev=702887&r1=702886&r2=702887&view=diff ============================================================================== --- cxf/branches/2.0.x-fixes/integration/jca/pom.xml (original) +++ cxf/branches/2.0.x-fixes/integration/jca/pom.xml Wed Oct 8 07:21:16 2008 @@ -113,12 +113,6 @@ <dependency> <groupId>org.apache.geronimo.specs</groupId> - <artifactId>geronimo-j2ee-connector_1.5_spec</artifactId> - <scope>provided</scope> - </dependency> - - <dependency> - <groupId>org.apache.geronimo.specs</groupId> <artifactId>geronimo-ejb_3.0_spec</artifactId> <scope>provided</scope> </dependency>
