Author: ningjiang
Date: Tue Oct 7 04:49:42 2008
New Revision: 702443
URL: http://svn.apache.org/viewvc?rev=702443&view=rev
Log:
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.1.x-fixes/api/src/main/java/org/apache/cxf/jca/
- copied from r702420, cxf/trunk/api/src/main/java/org/apache/cxf/jca/
cxf/branches/2.1.x-fixes/api/src/main/java/org/apache/cxf/jca/outbound/
- copied from r702420,
cxf/trunk/api/src/main/java/org/apache/cxf/jca/outbound/
cxf/branches/2.1.x-fixes/api/src/main/java/org/apache/cxf/jca/outbound/CXFConnection.java
- copied unchanged from r702420,
cxf/trunk/api/src/main/java/org/apache/cxf/jca/outbound/CXFConnection.java
cxf/branches/2.1.x-fixes/api/src/main/java/org/apache/cxf/jca/outbound/CXFConnectionFactory.java
- copied unchanged from r702420,
cxf/trunk/api/src/main/java/org/apache/cxf/jca/outbound/CXFConnectionFactory.java
cxf/branches/2.1.x-fixes/api/src/main/java/org/apache/cxf/jca/outbound/CXFConnectionSpec.java
- copied unchanged from r702420,
cxf/trunk/api/src/main/java/org/apache/cxf/jca/outbound/CXFConnectionSpec.java
cxf/branches/2.1.x-fixes/distribution/src/main/release/samples/integration/jca/outbound.was61/
- copied from r702420,
cxf/trunk/distribution/src/main/release/samples/integration/jca/outbound.was61/
cxf/branches/2.1.x-fixes/distribution/src/main/release/samples/integration/jca/outbound.was61/README.txt
- copied unchanged from r702420,
cxf/trunk/distribution/src/main/release/samples/integration/jca/outbound.was61/README.txt
cxf/branches/2.1.x-fixes/distribution/src/main/release/samples/integration/jca/outbound.was61/build.xml
- copied unchanged from r702420,
cxf/trunk/distribution/src/main/release/samples/integration/jca/outbound.was61/build.xml
cxf/branches/2.1.x-fixes/distribution/src/main/release/samples/integration/jca/outbound.was61/etc/
- copied from r702420,
cxf/trunk/distribution/src/main/release/samples/integration/jca/outbound.was61/etc/
cxf/branches/2.1.x-fixes/distribution/src/main/release/samples/integration/jca/outbound.was61/etc/cxf_client.xml
- copied unchanged from r702420,
cxf/trunk/distribution/src/main/release/samples/integration/jca/outbound.was61/etc/cxf_client.xml
cxf/branches/2.1.x-fixes/distribution/src/main/release/samples/integration/jca/outbound.was61/etc/ra.xml
- copied unchanged from r702420,
cxf/trunk/distribution/src/main/release/samples/integration/jca/outbound.was61/etc/ra.xml
cxf/branches/2.1.x-fixes/distribution/src/main/release/samples/integration/jca/outbound.was61/etc/web.xml
- copied unchanged from r702420,
cxf/trunk/distribution/src/main/release/samples/integration/jca/outbound.was61/etc/web.xml
cxf/branches/2.1.x-fixes/distribution/src/main/release/samples/integration/jca/outbound.was61/etc/wsdl/
- copied from r702420,
cxf/trunk/distribution/src/main/release/samples/integration/jca/outbound.was61/etc/wsdl/
cxf/branches/2.1.x-fixes/distribution/src/main/release/samples/integration/jca/outbound.was61/etc/wsdl/hello_world.wsdl
- copied unchanged from r702420,
cxf/trunk/distribution/src/main/release/samples/integration/jca/outbound.was61/etc/wsdl/hello_world.wsdl
cxf/branches/2.1.x-fixes/distribution/src/main/release/samples/integration/jca/outbound.was61/src/
- copied from r702420,
cxf/trunk/distribution/src/main/release/samples/integration/jca/outbound.was61/src/
cxf/branches/2.1.x-fixes/distribution/src/main/release/samples/integration/jca/outbound.was61/src/demo/
- copied from r702420,
cxf/trunk/distribution/src/main/release/samples/integration/jca/outbound.was61/src/demo/
cxf/branches/2.1.x-fixes/distribution/src/main/release/samples/integration/jca/outbound.was61/src/demo/client/
- copied from r702420,
cxf/trunk/distribution/src/main/release/samples/integration/jca/outbound.was61/src/demo/client/
cxf/branches/2.1.x-fixes/distribution/src/main/release/samples/integration/jca/outbound.was61/src/demo/client/Client.java
- copied unchanged from r702420,
cxf/trunk/distribution/src/main/release/samples/integration/jca/outbound.was61/src/demo/client/Client.java
cxf/branches/2.1.x-fixes/distribution/src/main/release/samples/integration/jca/outbound.was61/src/demo/servlet/
- copied from r702420,
cxf/trunk/distribution/src/main/release/samples/integration/jca/outbound.was61/src/demo/servlet/
cxf/branches/2.1.x-fixes/distribution/src/main/release/samples/integration/jca/outbound.was61/src/demo/servlet/HelloWorldServlet.java
- copied unchanged from r702420,
cxf/trunk/distribution/src/main/release/samples/integration/jca/outbound.was61/src/demo/servlet/HelloWorldServlet.java
cxf/branches/2.1.x-fixes/distribution/src/main/release/samples/integration/jca/outbound.was61/src/hello_world.wsdl
- copied unchanged from r702420,
cxf/trunk/distribution/src/main/release/samples/integration/jca/outbound.was61/src/hello_world.wsdl
cxf/branches/2.1.x-fixes/integration/jca/src/main/java/org/apache/cxf/jca/outbound/
- copied from r702420,
cxf/trunk/integration/jca/src/main/java/org/apache/cxf/jca/outbound/
cxf/branches/2.1.x-fixes/integration/jca/src/main/java/org/apache/cxf/jca/outbound/CXFManagedConnectionMetaData.java
- copied unchanged from r702420,
cxf/trunk/integration/jca/src/main/java/org/apache/cxf/jca/outbound/CXFManagedConnectionMetaData.java
cxf/branches/2.1.x-fixes/integration/jca/src/main/java/org/apache/cxf/jca/outbound/ConnectionFactoryImpl.java
- copied unchanged from r702420,
cxf/trunk/integration/jca/src/main/java/org/apache/cxf/jca/outbound/ConnectionFactoryImpl.java
cxf/branches/2.1.x-fixes/integration/jca/src/main/java/org/apache/cxf/jca/outbound/DefaultConnectionManager.java
- copied unchanged from r702420,
cxf/trunk/integration/jca/src/main/java/org/apache/cxf/jca/outbound/DefaultConnectionManager.java
cxf/branches/2.1.x-fixes/integration/jca/src/main/java/org/apache/cxf/jca/outbound/ManagedConnectionFactoryImpl.java
- copied unchanged from r702420,
cxf/trunk/integration/jca/src/main/java/org/apache/cxf/jca/outbound/ManagedConnectionFactoryImpl.java
cxf/branches/2.1.x-fixes/integration/jca/src/main/java/org/apache/cxf/jca/outbound/ManagedConnectionImpl.java
- copied unchanged from r702420,
cxf/trunk/integration/jca/src/main/java/org/apache/cxf/jca/outbound/ManagedConnectionImpl.java
Modified:
cxf/branches/2.1.x-fixes/ (props changed)
cxf/branches/2.1.x-fixes/api/pom.xml
cxf/branches/2.1.x-fixes/integration/jca/pom.xml
Propchange: cxf/branches/2.1.x-fixes/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.
Modified: cxf/branches/2.1.x-fixes/api/pom.xml
URL:
http://svn.apache.org/viewvc/cxf/branches/2.1.x-fixes/api/pom.xml?rev=702443&r1=702442&r2=702443&view=diff
==============================================================================
--- cxf/branches/2.1.x-fixes/api/pom.xml (original)
+++ cxf/branches/2.1.x-fixes/api/pom.xml Tue Oct 7 04:49:42 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.1.x-fixes/integration/jca/pom.xml
URL:
http://svn.apache.org/viewvc/cxf/branches/2.1.x-fixes/integration/jca/pom.xml?rev=702443&r1=702442&r2=702443&view=diff
==============================================================================
--- cxf/branches/2.1.x-fixes/integration/jca/pom.xml (original)
+++ cxf/branches/2.1.x-fixes/integration/jca/pom.xml Tue Oct 7 04:49:42 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>
