geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From djen...@apache.org
Subject svn commit: r706448 - in /geronimo/server/trunk: ./ framework/configs/jee-specs/ plugins/connector-1_6/ plugins/connector-1_6/geronimo-connector-1_6/ plugins/connector-1_6/geronimo-connector-1_6/src/main/java/org/apache/geronimo/connector/work/ plugins...
Date Mon, 20 Oct 2008 23:10:25 GMT
Author: djencks
Date: Mon Oct 20 16:10:25 2008
New Revision: 706448

URL: http://svn.apache.org/viewvc?rev=706448&view=rev
Log:
GERONIMO-4360 set up some flags for easy switching between connector versions

Modified:
    geronimo/server/trunk/framework/configs/jee-specs/pom.xml
    geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-1_6/pom.xml
    geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-1_6/src/main/java/org/apache/geronimo/connector/work/GeronimoWorkManagerGBean.java
    geronimo/server/trunk/plugins/connector-1_6/pom.xml
    geronimo/server/trunk/plugins/connector/pom.xml
    geronimo/server/trunk/pom.xml

Modified: geronimo/server/trunk/framework/configs/jee-specs/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/configs/jee-specs/pom.xml?rev=706448&r1=706447&r2=706448&view=diff
==============================================================================
--- geronimo/server/trunk/framework/configs/jee-specs/pom.xml (original)
+++ geronimo/server/trunk/framework/configs/jee-specs/pom.xml Mon Oct 20 16:10:25 2008
@@ -71,7 +71,8 @@
 
         <dependency>
             <groupId>org.apache.geronimo.specs</groupId>
-            <artifactId>geronimo-j2ee-connector_1.5_spec</artifactId>
+            <!--<artifactId>geronimo-j2ee-connector_1.5_spec</artifactId>-->
+            <artifactId>${connectorSpec}</artifactId>
         </dependency>
 
         <dependency>

Modified: geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-1_6/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-1_6/pom.xml?rev=706448&r1=706447&r2=706448&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-1_6/pom.xml (original)
+++ geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-1_6/pom.xml Mon Oct 20
16:10:25 2008
@@ -73,7 +73,7 @@
 
         <dependency>
             <groupId>org.apache.geronimo.specs</groupId>
-            <artifactId>geronimo-j2ee-connector_1.5_spec</artifactId>
+            <artifactId>geronimo-j2ee-connector_1.6_spec</artifactId>
         </dependency>
 
         <!-- needed for passwordcredential realm-->

Modified: geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-1_6/src/main/java/org/apache/geronimo/connector/work/GeronimoWorkManagerGBean.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-1_6/src/main/java/org/apache/geronimo/connector/work/GeronimoWorkManagerGBean.java?rev=706448&r1=706447&r2=706448&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-1_6/src/main/java/org/apache/geronimo/connector/work/GeronimoWorkManagerGBean.java
(original)
+++ geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-1_6/src/main/java/org/apache/geronimo/connector/work/GeronimoWorkManagerGBean.java
Mon Oct 20 16:10:25 2008
@@ -18,6 +18,7 @@
 package org.apache.geronimo.connector.work;
 
 import java.util.concurrent.Executor;
+import java.util.Collections;
 
 import org.apache.geronimo.gbean.GBeanInfo;
 import org.apache.geronimo.gbean.GBeanInfoBuilder;
@@ -35,7 +36,7 @@
     }
 
     public GeronimoWorkManagerGBean(Executor sync, Executor start, Executor sched, XAWork
xaWork) {
-        super(sync, start, sched, xaWork);
+        super(sync, start, sched, Collections.<InflowContextHandler>singletonList(new
TransactionInflowContextHandler(xaWork)));
     }
 
     public static final GBeanInfo GBEAN_INFO;

Modified: geronimo/server/trunk/plugins/connector-1_6/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/connector-1_6/pom.xml?rev=706448&r1=706447&r2=706448&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/connector-1_6/pom.xml (original)
+++ geronimo/server/trunk/plugins/connector-1_6/pom.xml Mon Oct 20 16:10:25 2008
@@ -44,5 +44,29 @@
         <module>geronimo-transaction-1_6</module>
         <module>transaction-1_6</module>
     </modules>
+    <dependencyManagement>
+        <dependencies>
+            <dependency>
+                <groupId>org.apache.geronimo.components</groupId>
+                <artifactId>geronimo-connector</artifactId>
+                <version>2.2-SNAPSHOT</version>
+            </dependency>
+
+            <dependency>
+                <groupId>org.apache.geronimo.components</groupId>
+                <artifactId>geronimo-connector</artifactId>
+                <version>2.2-SNAPSHOT</version>
+                <classifier>tests</classifier>
+                <scope>test</scope>
+            </dependency>
+
+            <dependency>
+                <groupId>org.apache.geronimo.components</groupId>
+                <artifactId>geronimo-transaction</artifactId>
+                <version>2.2-SNAPSHOT</version>
+            </dependency>
+            
+        </dependencies>
+    </dependencyManagement>
 
 </project>

Modified: geronimo/server/trunk/plugins/connector/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/connector/pom.xml?rev=706448&r1=706447&r2=706448&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/connector/pom.xml (original)
+++ geronimo/server/trunk/plugins/connector/pom.xml Mon Oct 20 16:10:25 2008
@@ -45,4 +45,35 @@
         <module>transaction</module>
     </modules>
 
+    <dependencyManagement>
+        <dependencies>
+            <dependency>
+                <groupId>org.apache.geronimo.components</groupId>
+                <artifactId>geronimo-connector</artifactId>
+                <version>2.1.1</version>
+            </dependency>
+
+            <dependency>
+                <groupId>org.apache.geronimo.components</groupId>
+                <artifactId>geronimo-connector</artifactId>
+                <version>2.1.1</version>
+                <classifier>tests</classifier>
+                <scope>test</scope>
+            </dependency>
+
+            <dependency>
+                <groupId>org.apache.geronimo.components</groupId>
+                <artifactId>geronimo-transaction</artifactId>
+                <version>2.1.1</version>
+                <exclusions>
+                    <exclusion>
+                        <groupId>commons-logging</groupId>
+                        <artifactId>commons-logging</artifactId>
+                    </exclusion>
+                </exclusions>
+            </dependency>
+            
+        </dependencies>
+    </dependencyManagement>
+
 </project>

Modified: geronimo/server/trunk/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/pom.xml?rev=706448&r1=706447&r2=706448&view=diff
==============================================================================
--- geronimo/server/trunk/pom.xml (original)
+++ geronimo/server/trunk/pom.xml Mon Oct 20 16:10:25 2008
@@ -86,6 +86,11 @@
         <jetty>jetty6</jetty>
         <!--<jetty>jetty7</jetty>-->
 
+        <connectorSuffix></connectorSuffix>
+        <!--<connectorSuffix>-1_6</connectorSuffix>-->
+        <connectorSpec>geronimo-j2ee-connector_1.5_spec</connectorSpec>
+        <!--<connectorSpec>geronimo-j2ee-connector_1.6_spec</connectorSpec>-->
+
         <!-- Deployers -->
         <gbeanDeployerBootstrap>org.apache.geronimo.framework/geronimo-gbean-deployer-bootstrap/${version}/car</gbeanDeployerBootstrap>
         <gbeanDeployer>org.apache.geronimo.framework/geronimo-gbean-deployer/${version}/car</gbeanDeployer>
@@ -158,6 +163,11 @@
                 <artifactId>geronimo-j2ee-connector_1.5_spec</artifactId>
                 <version>2.0.0</version>
             </dependency>
+            <dependency>
+                <groupId>org.apache.geronimo.specs</groupId>
+                <artifactId>geronimo-j2ee-connector_1.6_spec</artifactId>
+                <version>1.0-EA-SNAPSHOT</version>
+            </dependency>
 
             <dependency>
                 <groupId>org.apache.geronimo.specs</groupId>
@@ -299,32 +309,6 @@
 
             <dependency>
                 <groupId>org.apache.geronimo.components</groupId>
-                <artifactId>geronimo-connector</artifactId>
-                <version>2.1.1</version>
-            </dependency>
-
-            <dependency>
-                <groupId>org.apache.geronimo.components</groupId>
-                <artifactId>geronimo-connector</artifactId>
-                <version>2.1.1</version>
-                <classifier>tests</classifier>
-                <scope>test</scope>
-            </dependency>
-
-            <dependency>
-                <groupId>org.apache.geronimo.components</groupId>
-                <artifactId>geronimo-transaction</artifactId>
-                <version>2.1.1</version>
-                <exclusions>
-                    <exclusion>
-                        <groupId>commons-logging</groupId>
-                        <artifactId>commons-logging</artifactId>
-                    </exclusion>
-                </exclusions>
-            </dependency>
-
-            <dependency>
-                <groupId>org.apache.geronimo.components</groupId>
                 <artifactId>geronimo-jaspi</artifactId>
                 <version>1.0-SNAPSHOT</version>
             </dependency>



Mime
View raw message