cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dk...@apache.org
Subject svn commit: r1236344 - in /cxf/trunk: api/ api/src/main/java/org/apache/cxf/jca/outbound/ integration/jca/src/main/java/org/apache/cxf/jca/core/resourceadapter/ integration/jca/src/main/java/org/apache/cxf/jca/outbound/
Date Thu, 26 Jan 2012 18:34:38 GMT
Author: dkulp
Date: Thu Jan 26 18:34:37 2012
New Revision: 1236344

URL: http://svn.apache.org/viewvc?rev=1236344&view=rev
Log:
Move all the JCA stuff into integration/jca to reduce API dependencies

Added:
    cxf/trunk/integration/jca/src/main/java/org/apache/cxf/jca/outbound/CXFConnection.java
  (contents, props changed)
      - copied, changed from r1236260, cxf/trunk/api/src/main/java/org/apache/cxf/jca/outbound/CXFConnection.java
    cxf/trunk/integration/jca/src/main/java/org/apache/cxf/jca/outbound/CXFConnectionFactory.java
  (contents, props changed)
      - copied, changed from r1236260, cxf/trunk/api/src/main/java/org/apache/cxf/jca/outbound/CXFConnectionFactory.java
    cxf/trunk/integration/jca/src/main/java/org/apache/cxf/jca/outbound/CXFConnectionSpec.java
  (contents, props changed)
      - copied, changed from r1236260, cxf/trunk/api/src/main/java/org/apache/cxf/jca/outbound/CXFConnectionSpec.java
Removed:
    cxf/trunk/api/src/main/java/org/apache/cxf/jca/outbound/CXFConnection.java
    cxf/trunk/api/src/main/java/org/apache/cxf/jca/outbound/CXFConnectionFactory.java
    cxf/trunk/api/src/main/java/org/apache/cxf/jca/outbound/CXFConnectionSpec.java
Modified:
    cxf/trunk/api/pom.xml
    cxf/trunk/integration/jca/src/main/java/org/apache/cxf/jca/core/resourceadapter/AbstractManagedConnectionFactoryImpl.java

Modified: cxf/trunk/api/pom.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/api/pom.xml?rev=1236344&r1=1236343&r2=1236344&view=diff
==============================================================================
--- cxf/trunk/api/pom.xml (original)
+++ cxf/trunk/api/pom.xml Thu Jan 26 18:34:37 2012
@@ -45,8 +45,6 @@
             javax.annotation;version="${cxf.osgi.javax.annotation.version}",
             javax.xml.bind*;version="${cxf.osgi.javax.bind.version}",
             javax.xml.stream*;version="${cxf.osgi.javax.stream.version}",
-            org.apache.commons.lang*;resolution:=optional;version="${cxf.osgi.commons.lang.version}",
-            javax.resource*;resolution:=optional
         </cxf.osgi.import>
         <cxf.osgi.dynamic.import>
             com.sun.xml.bind.api,
@@ -152,16 +150,6 @@
             <scope>test</scope>
         </dependency>
         <dependency>
-            <groupId>org.apache.geronimo.specs</groupId>
-            <artifactId>geronimo-j2ee-connector_1.5_spec</artifactId>
-            <scope>provided</scope>
-        </dependency>
-        <dependency>
-            <groupId>commons-lang</groupId>
-            <artifactId>commons-lang</artifactId>
-            <optional>true</optional>
-        </dependency>
-        <dependency>
             <groupId>wsdl4j</groupId>
             <artifactId>wsdl4j</artifactId>
         </dependency>

Modified: cxf/trunk/integration/jca/src/main/java/org/apache/cxf/jca/core/resourceadapter/AbstractManagedConnectionFactoryImpl.java
URL: http://svn.apache.org/viewvc/cxf/trunk/integration/jca/src/main/java/org/apache/cxf/jca/core/resourceadapter/AbstractManagedConnectionFactoryImpl.java?rev=1236344&r1=1236343&r2=1236344&view=diff
==============================================================================
--- cxf/trunk/integration/jca/src/main/java/org/apache/cxf/jca/core/resourceadapter/AbstractManagedConnectionFactoryImpl.java
(original)
+++ cxf/trunk/integration/jca/src/main/java/org/apache/cxf/jca/core/resourceadapter/AbstractManagedConnectionFactoryImpl.java
Thu Jan 26 18:34:37 2012
@@ -67,14 +67,15 @@ public abstract class AbstractManagedCon
     protected abstract void validateReference(AbstractManagedConnectionImpl conn, Subject
subject)
         throws ResourceAdapterInternalException;
 
+    @SuppressWarnings("rawtypes") 
     public ManagedConnection matchManagedConnections(
-        @SuppressWarnings("rawtypes") Set aMCSet, Subject subject, ConnectionRequestInfo
crInfo)
+        Set aMCSet, Subject subject, ConnectionRequestInfo crInfo)
         throws ResourceException {
         
         LOG.log(Level.FINE, "MATCHING_CONNECTIONS",
             new Object[] {new Integer(aMCSet.size()), crInfo, subject});
 
-        for (@SuppressWarnings("rawtypes") Iterator iterator = aMCSet.iterator(); iterator.hasNext();)
{
+        for (Iterator iterator = aMCSet.iterator(); iterator.hasNext();) {
             AbstractManagedConnectionImpl conn = (AbstractManagedConnectionImpl)iterator.next();
 
             LOG.log(Level.FINE, "MATCH_CONNECTION_AGAINST", 

Copied: cxf/trunk/integration/jca/src/main/java/org/apache/cxf/jca/outbound/CXFConnection.java
(from r1236260, cxf/trunk/api/src/main/java/org/apache/cxf/jca/outbound/CXFConnection.java)
URL: http://svn.apache.org/viewvc/cxf/trunk/integration/jca/src/main/java/org/apache/cxf/jca/outbound/CXFConnection.java?p2=cxf/trunk/integration/jca/src/main/java/org/apache/cxf/jca/outbound/CXFConnection.java&p1=cxf/trunk/api/src/main/java/org/apache/cxf/jca/outbound/CXFConnection.java&r1=1236260&r2=1236344&rev=1236344&view=diff
==============================================================================
    (empty)

Propchange: cxf/trunk/integration/jca/src/main/java/org/apache/cxf/jca/outbound/CXFConnection.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: cxf/trunk/integration/jca/src/main/java/org/apache/cxf/jca/outbound/CXFConnection.java
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Copied: cxf/trunk/integration/jca/src/main/java/org/apache/cxf/jca/outbound/CXFConnectionFactory.java
(from r1236260, cxf/trunk/api/src/main/java/org/apache/cxf/jca/outbound/CXFConnectionFactory.java)
URL: http://svn.apache.org/viewvc/cxf/trunk/integration/jca/src/main/java/org/apache/cxf/jca/outbound/CXFConnectionFactory.java?p2=cxf/trunk/integration/jca/src/main/java/org/apache/cxf/jca/outbound/CXFConnectionFactory.java&p1=cxf/trunk/api/src/main/java/org/apache/cxf/jca/outbound/CXFConnectionFactory.java&r1=1236260&r2=1236344&rev=1236344&view=diff
==============================================================================
    (empty)

Propchange: cxf/trunk/integration/jca/src/main/java/org/apache/cxf/jca/outbound/CXFConnectionFactory.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: cxf/trunk/integration/jca/src/main/java/org/apache/cxf/jca/outbound/CXFConnectionFactory.java
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Copied: cxf/trunk/integration/jca/src/main/java/org/apache/cxf/jca/outbound/CXFConnectionSpec.java
(from r1236260, cxf/trunk/api/src/main/java/org/apache/cxf/jca/outbound/CXFConnectionSpec.java)
URL: http://svn.apache.org/viewvc/cxf/trunk/integration/jca/src/main/java/org/apache/cxf/jca/outbound/CXFConnectionSpec.java?p2=cxf/trunk/integration/jca/src/main/java/org/apache/cxf/jca/outbound/CXFConnectionSpec.java&p1=cxf/trunk/api/src/main/java/org/apache/cxf/jca/outbound/CXFConnectionSpec.java&r1=1236260&r2=1236344&rev=1236344&view=diff
==============================================================================
    (empty)

Propchange: cxf/trunk/integration/jca/src/main/java/org/apache/cxf/jca/outbound/CXFConnectionSpec.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: cxf/trunk/integration/jca/src/main/java/org/apache/cxf/jca/outbound/CXFConnectionSpec.java
------------------------------------------------------------------------------
    svn:keywords = Rev Date



Mime
View raw message