geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From djen...@apache.org
Subject svn commit: r807372 [1/2] - in /geronimo/server/trunk: ./ framework/configs/jee-specs/ framework/configs/jee-specs/src/main/history/ plugins/ plugins/axis/geronimo-axis/ plugins/ca-helper/geronimo-ca-helper/ plugins/clustering/geronimo-clustering-wadi/...
Date Mon, 24 Aug 2009 20:56:44 GMT
Author: djencks
Date: Mon Aug 24 20:56:39 2009
New Revision: 807372

URL: http://svn.apache.org/viewvc?rev=807372&view=rev
Log:
Upgrade to ee6 specs for servlet, ejb. Upgrade to jetty 8. Use jpa 1.0 spec labelled 1.0.  Don't try to include openwebbeans until it has available snapshots

Modified:
    geronimo/server/trunk/framework/configs/jee-specs/pom.xml
    geronimo/server/trunk/framework/configs/jee-specs/src/main/history/dependencies.xml
    geronimo/server/trunk/plugins/axis/geronimo-axis/pom.xml
    geronimo/server/trunk/plugins/ca-helper/geronimo-ca-helper/pom.xml
    geronimo/server/trunk/plugins/clustering/geronimo-clustering-wadi/pom.xml
    geronimo/server/trunk/plugins/connector-1_6/geronimo-transaction-1_6/pom.xml
    geronimo/server/trunk/plugins/console/console-base-portlets/pom.xml
    geronimo/server/trunk/plugins/console/console-core/pom.xml
    geronimo/server/trunk/plugins/console/console-filter/pom.xml
    geronimo/server/trunk/plugins/console/console-portal-driver/pom.xml
    geronimo/server/trunk/plugins/console/plugin-portlets/pom.xml
    geronimo/server/trunk/plugins/corba/client-corba-yoko/pom.xml
    geronimo/server/trunk/plugins/debugviews/debugviews-portlets/pom.xml
    geronimo/server/trunk/plugins/j2ee/geronimo-web-2.5-builder/pom.xml
    geronimo/server/trunk/plugins/jasper/geronimo-jasper-builder/pom.xml
    geronimo/server/trunk/plugins/jasper/geronimo-jasper/pom.xml
    geronimo/server/trunk/plugins/jasper/pom.xml
    geronimo/server/trunk/plugins/jaxws/geronimo-jaxws/pom.xml
    geronimo/server/trunk/plugins/jetty7/geronimo-jetty7/pom.xml
    geronimo/server/trunk/plugins/jetty7/geronimo-jetty7/src/main/java/org/apache/geronimo/jetty7/JettyFilterMapping.java
    geronimo/server/trunk/plugins/jetty7/geronimo-jetty7/src/main/java/org/apache/geronimo/jetty7/handler/IntegrationContext.java
    geronimo/server/trunk/plugins/jetty7/geronimo-jetty7/src/main/java/org/apache/geronimo/jetty7/security/JettySecurityHandlerFactory.java
    geronimo/server/trunk/plugins/jetty7/geronimo-jetty7/src/test/java/org/apache/geronimo/jetty7/AbstractWebModuleTest.java
    geronimo/server/trunk/plugins/jetty7/pom.xml
    geronimo/server/trunk/plugins/mejb/geronimo-mejb/pom.xml
    geronimo/server/trunk/plugins/monitoring/agent-ejb/pom.xml
    geronimo/server/trunk/plugins/monitoring/mconsole-war/pom.xml
    geronimo/server/trunk/plugins/myfaces/geronimo-myfaces-builder/pom.xml
    geronimo/server/trunk/plugins/openejb/openejb/pom.xml
    geronimo/server/trunk/plugins/openjpa/geronimo-persistence-jpa10/pom.xml
    geronimo/server/trunk/plugins/pluto/geronimo-pluto/pom.xml
    geronimo/server/trunk/plugins/pom.xml
    geronimo/server/trunk/plugins/remote-deploy/geronimo-remote-deploy/pom.xml
    geronimo/server/trunk/plugins/tomcat/geronimo-tomcat6/pom.xml
    geronimo/server/trunk/plugins/tomcat/pom.xml
    geronimo/server/trunk/plugins/tomcat/tomcat6/src/main/history/dependencies.xml
    geronimo/server/trunk/plugins/webservices/geronimo-webservices/pom.xml
    geronimo/server/trunk/plugins/welcome/geronimo-welcome/pom.xml
    geronimo/server/trunk/pom.xml
    geronimo/server/trunk/testsuite/concurrent-testsuite/concurrent-basic/common-ejb/pom.xml
    geronimo/server/trunk/testsuite/concurrent-testsuite/concurrent-basic/common-jar/pom.xml
    geronimo/server/trunk/testsuite/concurrent-testsuite/concurrent-basic/concurrent-ejb-ear/pom.xml
    geronimo/server/trunk/testsuite/concurrent-testsuite/concurrent-basic/concurrent-ejb/pom.xml
    geronimo/server/trunk/testsuite/concurrent-testsuite/concurrent-basic/concurrent-war/pom.xml
    geronimo/server/trunk/testsuite/corba-testsuite/corba-helloworld/corba-helloworld-client/pom.xml
    geronimo/server/trunk/testsuite/corba-testsuite/corba-helloworld/corba-helloworld-ejb/pom.xml
    geronimo/server/trunk/testsuite/corba-testsuite/corba-helloworld/corba-helloworld-war/pom.xml
    geronimo/server/trunk/testsuite/corba-testsuite/corba-marshal/corba-marshal-client/pom.xml
    geronimo/server/trunk/testsuite/corba-testsuite/corba-marshal/corba-marshal-ejb/pom.xml
    geronimo/server/trunk/testsuite/corba-testsuite/corba-mytime/corba-mytime-ear/pom.xml
    geronimo/server/trunk/testsuite/corba-testsuite/corba-mytime/corba-mytime-ejb/pom.xml
    geronimo/server/trunk/testsuite/corba-testsuite/corba-mytime/corba-mytime-war/pom.xml
    geronimo/server/trunk/testsuite/deployment-testsuite/jca-cms-tests/jca-cms-war/pom.xml
    geronimo/server/trunk/testsuite/deployment-testsuite/manifestcp-tests/manifestcp-jar/pom.xml
    geronimo/server/trunk/testsuite/deployment-testsuite/manifestcp-tests/manifestcp-war-jar/pom.xml
    geronimo/server/trunk/testsuite/enterprise-testsuite/ejb-tests/ejb-war/pom.xml
    geronimo/server/trunk/testsuite/enterprise-testsuite/ejb-tests/pom.xml
    geronimo/server/trunk/testsuite/enterprise-testsuite/jms-tests/jms-ear/pom.xml
    geronimo/server/trunk/testsuite/enterprise-testsuite/jms-tests/jms-ejb/pom.xml
    geronimo/server/trunk/testsuite/enterprise-testsuite/jms-tests/jms-war/pom.xml
    geronimo/server/trunk/testsuite/enterprise-testsuite/jpa-tests/jpa-ejb/pom.xml
    geronimo/server/trunk/testsuite/enterprise-testsuite/jpa-tests/jpa-war/pom.xml
    geronimo/server/trunk/testsuite/enterprise-testsuite/sec-tests/sec-client/pom.xml
    geronimo/server/trunk/testsuite/enterprise-testsuite/sec-tests/sec-ejb/pom.xml
    geronimo/server/trunk/testsuite/enterprise-testsuite/sec-tests/sec-war/pom.xml
    geronimo/server/trunk/testsuite/security-testsuite/test-security/pom.xml
    geronimo/server/trunk/testsuite/web-testsuite/test-2.5-servlets/pom.xml
    geronimo/server/trunk/testsuite/web-testsuite/test-web-forward/web-forward-war-1/pom.xml
    geronimo/server/trunk/testsuite/web-testsuite/test-web-forward/web-forward-war-2/pom.xml
    geronimo/server/trunk/testsuite/web-testsuite/test-web-references/web-references-ejb/pom.xml
    geronimo/server/trunk/testsuite/web-testsuite/test-web-references/web-references-war/pom.xml
    geronimo/server/trunk/testsuite/webservices-testsuite/jaxb-tests/jaxb-ejb/pom.xml
    geronimo/server/trunk/testsuite/webservices-testsuite/jaxb-tests/jaxb-war/pom.xml
    geronimo/server/trunk/testsuite/webservices-testsuite/jaxr-tests/jaxr-ejb/pom.xml
    geronimo/server/trunk/testsuite/webservices-testsuite/jaxr-tests/jaxr-war/pom.xml
    geronimo/server/trunk/testsuite/webservices-testsuite/jaxrpc-tests/jaxrpc-ejb/pom.xml
    geronimo/server/trunk/testsuite/webservices-testsuite/jaxws-catalog-tests/catalog-ejb/pom.xml
    geronimo/server/trunk/testsuite/webservices-testsuite/jaxws-catalog-tests/catalog-war/pom.xml
    geronimo/server/trunk/testsuite/webservices-testsuite/jaxws-mtom-tests/mtom-ejb/pom.xml
    geronimo/server/trunk/testsuite/webservices-testsuite/jaxws-mtom-tests/mtom-test-war/pom.xml
    geronimo/server/trunk/testsuite/webservices-testsuite/jaxws-provider-tests/pom.xml
    geronimo/server/trunk/testsuite/webservices-testsuite/jaxws-tests/jaxws-ejb-sec/pom.xml
    geronimo/server/trunk/testsuite/webservices-testsuite/jaxws-tests/jaxws-ejb/pom.xml
    geronimo/server/trunk/testsuite/webservices-testsuite/jaxws-tests/jaxws-rest-war/pom.xml
    geronimo/server/trunk/testsuite/webservices-testsuite/jaxws-wsa-tests/wsa-ejb/pom.xml
    geronimo/server/trunk/testsuite/webservices-testsuite/jaxws-wsa-tests/wsa-test-war/pom.xml
    geronimo/server/trunk/testsuite/webservices-testsuite/saaj-tests/saaj-war/pom.xml
    geronimo/server/trunk/testsuite/webservices-testsuite/stax-tests/stax-ejb/pom.xml
    geronimo/server/trunk/testsuite/webservices-testsuite/stax-tests/stax-war/pom.xml
    geronimo/server/trunk/testsupport/test-deployment-j2ee_1.3/test-ejb-j2ee_1.3/pom.xml
    geronimo/server/trunk/testsupport/test-deployment-j2ee_1.3/test-rar-j2ee_1.3/pom.xml
    geronimo/server/trunk/testsupport/test-deployment-j2ee_1.3/test-war-j2ee_1.3/pom.xml
    geronimo/server/trunk/testsupport/test-deployment-j2ee_1.4/test-ejb-j2ee_1.4/pom.xml
    geronimo/server/trunk/testsupport/test-deployment-j2ee_1.4/test-rar-j2ee_1.4/pom.xml
    geronimo/server/trunk/testsupport/test-deployment-j2ee_1.4/test-war-j2ee_1.4/pom.xml
    geronimo/server/trunk/testsupport/test-deployment-javaee_5/test-ejb-javaee_5/pom.xml
    geronimo/server/trunk/testsupport/test-deployment-javaee_5/test-rar-javaee_5/pom.xml
    geronimo/server/trunk/testsupport/test-deployment-javaee_5/test-war-javaee_5/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=807372&r1=807371&r2=807372&view=diff
==============================================================================
--- geronimo/server/trunk/framework/configs/jee-specs/pom.xml (original)
+++ geronimo/server/trunk/framework/configs/jee-specs/pom.xml Mon Aug 24 20:56:39 2009
@@ -51,14 +51,9 @@
 
         <dependency>
             <groupId>org.apache.geronimo.specs</groupId>
-            <artifactId>geronimo-ejb_3.0_spec</artifactId>
+            <artifactId>geronimo-ejb_3.1_spec</artifactId>
         </dependency>
         
-         <dependency>
-           <groupId>org.apache.openejb</groupId>
-           <artifactId>ejb31-api-experimental</artifactId>
-        </dependency>
-
         <dependency>
             <groupId>org.apache.geronimo.specs</groupId>
             <artifactId>geronimo-el_1.0_spec</artifactId>
@@ -71,7 +66,6 @@
 
         <dependency>
             <groupId>org.apache.geronimo.specs</groupId>
-            <!--<artifactId>geronimo-j2ee-connector_1.5_spec</artifactId>-->
             <artifactId>${connectorSpec}</artifactId>
         </dependency>
 
@@ -116,7 +110,7 @@
 
         <dependency>
             <groupId>org.apache.geronimo.specs</groupId>
-            <artifactId>geronimo-jpa_3.0_spec</artifactId>
+            <artifactId>geronimo-jpa_1.0_spec</artifactId>
         </dependency>
 
         <dependency>

Modified: geronimo/server/trunk/framework/configs/jee-specs/src/main/history/dependencies.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/configs/jee-specs/src/main/history/dependencies.xml?rev=807372&r1=807371&r2=807372&view=diff
==============================================================================
--- geronimo/server/trunk/framework/configs/jee-specs/src/main/history/dependencies.xml (original)
+++ geronimo/server/trunk/framework/configs/jee-specs/src/main/history/dependencies.xml Mon Aug 24 20:56:39 2009
@@ -38,7 +38,7 @@
     </dependency>
     <dependency>
         <groupId>org.apache.geronimo.specs</groupId>
-        <artifactId>geronimo-ejb_3.0_spec</artifactId>
+        <artifactId>geronimo-ejb_3.1_spec</artifactId>
         <type>jar</type>
     </dependency>
     <dependency>
@@ -53,7 +53,7 @@
     </dependency>
     <dependency>
         <groupId>org.apache.geronimo.specs</groupId>
-        <artifactId>${connectorSpec}</artifactId>
+        <artifactId>geronimo-j2ee-connector_1.6_spec</artifactId>
         <type>jar</type>
     </dependency>
     <dependency>
@@ -93,7 +93,7 @@
     </dependency>
     <dependency>
         <groupId>org.apache.geronimo.specs</groupId>
-        <artifactId>geronimo-jpa_3.0_spec</artifactId>
+        <artifactId>geronimo-jpa_1.0_spec</artifactId>
         <type>jar</type>
     </dependency>
     <dependency>
@@ -113,7 +113,7 @@
     </dependency>
     <dependency>
         <groupId>org.apache.geronimo.specs</groupId>
-        <artifactId>${servletSpec}</artifactId>
+        <artifactId>geronimo-servlet_3.0_spec</artifactId>
         <type>jar</type>
     </dependency>
     <dependency>
@@ -126,9 +126,4 @@
         <artifactId>myfaces-api</artifactId>
         <type>jar</type>
     </dependency>
-    <dependency>
-        <groupId>org.apache.openejb</groupId>
-        <artifactId>ejb31-api-experimental</artifactId>
-        <type>jar</type>
-    </dependency>
 </plugin-artifact>

Modified: geronimo/server/trunk/plugins/axis/geronimo-axis/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/axis/geronimo-axis/pom.xml?rev=807372&r1=807371&r2=807372&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/axis/geronimo-axis/pom.xml (original)
+++ geronimo/server/trunk/plugins/axis/geronimo-axis/pom.xml Mon Aug 24 20:56:39 2009
@@ -73,7 +73,7 @@
 
         <dependency>
             <groupId>org.apache.geronimo.specs</groupId>
-            <artifactId>geronimo-ejb_3.0_spec</artifactId>
+            <artifactId>geronimo-ejb_3.1_spec</artifactId>
             <scope>provided</scope>
         </dependency>
 
@@ -91,7 +91,7 @@
 
         <dependency>
             <groupId>org.apache.geronimo.specs</groupId>
-            <artifactId>geronimo-servlet_2.5_spec</artifactId>
+            <artifactId>geronimo-servlet_3.0_spec</artifactId>
             <scope>provided</scope>
         </dependency>
         

Modified: geronimo/server/trunk/plugins/ca-helper/geronimo-ca-helper/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/ca-helper/geronimo-ca-helper/pom.xml?rev=807372&r1=807371&r2=807372&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/ca-helper/geronimo-ca-helper/pom.xml (original)
+++ geronimo/server/trunk/plugins/ca-helper/geronimo-ca-helper/pom.xml Mon Aug 24 20:56:39 2009
@@ -60,7 +60,7 @@
 
         <dependency>
             <groupId>org.apache.geronimo.specs</groupId>
-            <artifactId>geronimo-servlet_2.5_spec</artifactId>
+            <artifactId>geronimo-servlet_3.0_spec</artifactId>
             <scope>provided</scope>
         </dependency>
 

Modified: geronimo/server/trunk/plugins/clustering/geronimo-clustering-wadi/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/clustering/geronimo-clustering-wadi/pom.xml?rev=807372&r1=807371&r2=807372&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/clustering/geronimo-clustering-wadi/pom.xml (original)
+++ geronimo/server/trunk/plugins/clustering/geronimo-clustering-wadi/pom.xml Mon Aug 24 20:56:39 2009
@@ -41,7 +41,7 @@
 
         <dependency>
             <groupId>org.apache.geronimo.specs</groupId>
-            <artifactId>geronimo-servlet_2.5_spec</artifactId>
+            <artifactId>geronimo-servlet_3.0_spec</artifactId>
             <scope>provided</scope>
         </dependency>
 

Modified: geronimo/server/trunk/plugins/connector-1_6/geronimo-transaction-1_6/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/connector-1_6/geronimo-transaction-1_6/pom.xml?rev=807372&r1=807371&r2=807372&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/connector-1_6/geronimo-transaction-1_6/pom.xml (original)
+++ geronimo/server/trunk/plugins/connector-1_6/geronimo-transaction-1_6/pom.xml Mon Aug 24 20:56:39 2009
@@ -58,7 +58,7 @@
 
         <dependency>
             <groupId>org.apache.geronimo.specs</groupId>
-            <artifactId>geronimo-j2ee-connector_1.5_spec</artifactId>
+            <artifactId>geronimo-j2ee-connector_1.6_spec</artifactId>
             <scope>provided</scope>
         </dependency>
 

Modified: geronimo/server/trunk/plugins/console/console-base-portlets/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/console/console-base-portlets/pom.xml?rev=807372&r1=807371&r2=807372&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/console/console-base-portlets/pom.xml (original)
+++ geronimo/server/trunk/plugins/console/console-base-portlets/pom.xml Mon Aug 24 20:56:39 2009
@@ -63,7 +63,7 @@
 
         <dependency>
             <groupId>org.apache.geronimo.specs</groupId>
-            <artifactId>geronimo-servlet_2.5_spec</artifactId>
+            <artifactId>geronimo-servlet_3.0_spec</artifactId>
             <scope>provided</scope>
         </dependency>
 

Modified: geronimo/server/trunk/plugins/console/console-core/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/console/console-core/pom.xml?rev=807372&r1=807371&r2=807372&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/console/console-core/pom.xml (original)
+++ geronimo/server/trunk/plugins/console/console-core/pom.xml Mon Aug 24 20:56:39 2009
@@ -67,7 +67,7 @@
 
         <dependency>
             <groupId>org.apache.geronimo.specs</groupId>
-            <artifactId>geronimo-servlet_2.5_spec</artifactId>
+            <artifactId>geronimo-servlet_3.0_spec</artifactId>
             <scope>provided</scope>
         </dependency>
 

Modified: geronimo/server/trunk/plugins/console/console-filter/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/console/console-filter/pom.xml?rev=807372&r1=807371&r2=807372&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/console/console-filter/pom.xml (original)
+++ geronimo/server/trunk/plugins/console/console-filter/pom.xml Mon Aug 24 20:56:39 2009
@@ -34,7 +34,7 @@
     <dependencies>
         <dependency>
             <groupId>org.apache.geronimo.specs</groupId>
-            <artifactId>geronimo-servlet_2.5_spec</artifactId>
+            <artifactId>geronimo-servlet_3.0_spec</artifactId>
             <scope>provided</scope>
         </dependency>
     </dependencies>

Modified: geronimo/server/trunk/plugins/console/console-portal-driver/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/console/console-portal-driver/pom.xml?rev=807372&r1=807371&r2=807372&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/console/console-portal-driver/pom.xml (original)
+++ geronimo/server/trunk/plugins/console/console-portal-driver/pom.xml Mon Aug 24 20:56:39 2009
@@ -71,7 +71,7 @@
 
         <dependency>
             <groupId>org.apache.geronimo.specs</groupId>
-            <artifactId>geronimo-servlet_2.5_spec</artifactId>
+            <artifactId>geronimo-servlet_3.0_spec</artifactId>
             <scope>provided</scope>
         </dependency>
 

Modified: geronimo/server/trunk/plugins/console/plugin-portlets/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/console/plugin-portlets/pom.xml?rev=807372&r1=807371&r2=807372&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/console/plugin-portlets/pom.xml (original)
+++ geronimo/server/trunk/plugins/console/plugin-portlets/pom.xml Mon Aug 24 20:56:39 2009
@@ -79,7 +79,7 @@
 
         <dependency>
             <groupId>org.apache.geronimo.specs</groupId>
-            <artifactId>geronimo-servlet_2.5_spec</artifactId>
+            <artifactId>geronimo-servlet_3.0_spec</artifactId>
             <scope>provided</scope>
         </dependency>
 

Modified: geronimo/server/trunk/plugins/corba/client-corba-yoko/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/corba/client-corba-yoko/pom.xml?rev=807372&r1=807371&r2=807372&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/corba/client-corba-yoko/pom.xml (original)
+++ geronimo/server/trunk/plugins/corba/client-corba-yoko/pom.xml Mon Aug 24 20:56:39 2009
@@ -49,17 +49,6 @@
             <type>car</type>
         </dependency>
 
-        <!--<dependency>-->
-            <!--<groupId>org.apache.geronimo.specs</groupId>-->
-            <!--<artifactId>geronimo-ejb_3.0_spec</artifactId>-->
-        <!--</dependency>-->
-
-        <!--<dependency>-->
-            <!--<groupId>org.apache.geronimo.modules</groupId>-->
-            <!--<artifactId>geronimo-webservices-builder</artifactId>-->
-            <!--<version>${version}</version>-->
-        <!--</dependency>-->
-
         <dependency>
             <groupId>org.apache.openejb</groupId>
             <artifactId>openejb-client</artifactId>

Modified: geronimo/server/trunk/plugins/debugviews/debugviews-portlets/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/debugviews/debugviews-portlets/pom.xml?rev=807372&r1=807371&r2=807372&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/debugviews/debugviews-portlets/pom.xml (original)
+++ geronimo/server/trunk/plugins/debugviews/debugviews-portlets/pom.xml Mon Aug 24 20:56:39 2009
@@ -97,7 +97,7 @@
 
         <dependency>
             <groupId>org.apache.geronimo.specs</groupId>
-            <artifactId>geronimo-servlet_2.5_spec</artifactId>
+            <artifactId>geronimo-servlet_3.0_spec</artifactId>
             <scope>provided</scope>
         </dependency>
 

Modified: geronimo/server/trunk/plugins/j2ee/geronimo-web-2.5-builder/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/j2ee/geronimo-web-2.5-builder/pom.xml?rev=807372&r1=807371&r2=807372&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/j2ee/geronimo-web-2.5-builder/pom.xml (original)
+++ geronimo/server/trunk/plugins/j2ee/geronimo-web-2.5-builder/pom.xml Mon Aug 24 20:56:39 2009
@@ -55,7 +55,7 @@
 
         <dependency>
             <groupId>org.apache.geronimo.specs</groupId>
-            <artifactId>geronimo-servlet_2.5_spec</artifactId>
+            <artifactId>geronimo-servlet_3.0_spec</artifactId>
             <scope>provided</scope>
         </dependency>
     </dependencies>

Modified: geronimo/server/trunk/plugins/jasper/geronimo-jasper-builder/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/jasper/geronimo-jasper-builder/pom.xml?rev=807372&r1=807371&r2=807372&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/jasper/geronimo-jasper-builder/pom.xml (original)
+++ geronimo/server/trunk/plugins/jasper/geronimo-jasper-builder/pom.xml Mon Aug 24 20:56:39 2009
@@ -52,7 +52,7 @@
         
         <dependency>
             <groupId>org.apache.geronimo.specs</groupId>
-            <artifactId>geronimo-servlet_2.5_spec</artifactId>
+            <artifactId>geronimo-servlet_3.0_spec</artifactId>
             <scope>test</scope>
         </dependency>
     </dependencies>

Modified: geronimo/server/trunk/plugins/jasper/geronimo-jasper/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/jasper/geronimo-jasper/pom.xml?rev=807372&r1=807371&r2=807372&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/jasper/geronimo-jasper/pom.xml (original)
+++ geronimo/server/trunk/plugins/jasper/geronimo-jasper/pom.xml Mon Aug 24 20:56:39 2009
@@ -36,6 +36,12 @@
         <dependency>
             <groupId>${tomcatGroupId}</groupId>
             <artifactId>jasper</artifactId>
+            <exclusions>
+                <exclusion>
+                    <groupId>org.apache.geronimo.specs</groupId>
+                    <artifactId>geronimo-servlet_3.0_spec</artifactId>
+	         </exclusion>
+            </exclusions>
         </dependency>
 
         <!--<dependency>-->
@@ -64,7 +70,7 @@
         <!-- if our hacked jasper copy gets a pom we won't need these -->
         <dependency>
             <groupId>org.apache.geronimo.specs</groupId>
-            <artifactId>geronimo-servlet_2.5_spec</artifactId>
+            <artifactId>geronimo-servlet_3.0_spec</artifactId>
             <scope>provided</scope>
         </dependency>
 

Modified: geronimo/server/trunk/plugins/jasper/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/jasper/pom.xml?rev=807372&r1=807371&r2=807372&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/jasper/pom.xml (original)
+++ geronimo/server/trunk/plugins/jasper/pom.xml Mon Aug 24 20:56:39 2009
@@ -74,6 +74,10 @@
                     <!--<groupId>${tomcatGroupId}</groupId>-->
                     <!--<artifactId>annotations-api</artifactId>-->
                     <!--</exclusion>-->
+                    <exclusion>
+                        <groupId>org.apache.geronimo.specs</groupId>
+                        <artifactId>geronimo-servlet_2.5_spec</artifactId>
+                    </exclusion>
                 </exclusions>
             </dependency>
             <dependency>

Modified: geronimo/server/trunk/plugins/jaxws/geronimo-jaxws/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/jaxws/geronimo-jaxws/pom.xml?rev=807372&r1=807371&r2=807372&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/jaxws/geronimo-jaxws/pom.xml (original)
+++ geronimo/server/trunk/plugins/jaxws/geronimo-jaxws/pom.xml Mon Aug 24 20:56:39 2009
@@ -57,7 +57,7 @@
 
         <dependency>
             <groupId>org.apache.geronimo.specs</groupId>
-            <artifactId>geronimo-ejb_3.0_spec</artifactId>
+            <artifactId>geronimo-ejb_3.1_spec</artifactId>
         </dependency>
 
         <!--<dependency>-->

Modified: geronimo/server/trunk/plugins/jetty7/geronimo-jetty7/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/jetty7/geronimo-jetty7/pom.xml?rev=807372&r1=807371&r2=807372&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/jetty7/geronimo-jetty7/pom.xml (original)
+++ geronimo/server/trunk/plugins/jetty7/geronimo-jetty7/pom.xml Mon Aug 24 20:56:39 2009
@@ -35,7 +35,7 @@
     <dependencies>
         <dependency>
             <groupId>org.apache.geronimo.specs</groupId>
-            <artifactId>geronimo-servlet_2.5_spec</artifactId>
+            <artifactId>geronimo-servlet_3.0_spec</artifactId>
         </dependency>
         <dependency>
             <groupId>org.apache.geronimo.specs</groupId>

Modified: geronimo/server/trunk/plugins/jetty7/geronimo-jetty7/src/main/java/org/apache/geronimo/jetty7/JettyFilterMapping.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/jetty7/geronimo-jetty7/src/main/java/org/apache/geronimo/jetty7/JettyFilterMapping.java?rev=807372&r1=807371&r2=807372&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/jetty7/geronimo-jetty7/src/main/java/org/apache/geronimo/jetty7/JettyFilterMapping.java (original)
+++ geronimo/server/trunk/plugins/jetty7/geronimo-jetty7/src/main/java/org/apache/geronimo/jetty7/JettyFilterMapping.java Mon Aug 24 20:56:39 2009
@@ -19,8 +19,8 @@
 import java.util.Collection;
 import java.util.EnumSet;
 
-import org.eclipse.jetty.server.DispatcherType;
 
+import javax.servlet.DispatcherType;
 import org.apache.geronimo.gbean.ReferenceCollection;
 import org.apache.geronimo.gbean.ReferenceCollectionEvent;
 import org.apache.geronimo.gbean.ReferenceCollectionListener;

Modified: geronimo/server/trunk/plugins/jetty7/geronimo-jetty7/src/main/java/org/apache/geronimo/jetty7/handler/IntegrationContext.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/jetty7/geronimo-jetty7/src/main/java/org/apache/geronimo/jetty7/handler/IntegrationContext.java?rev=807372&r1=807371&r2=807372&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/jetty7/geronimo-jetty7/src/main/java/org/apache/geronimo/jetty7/handler/IntegrationContext.java (original)
+++ geronimo/server/trunk/plugins/jetty7/geronimo-jetty7/src/main/java/org/apache/geronimo/jetty7/handler/IntegrationContext.java Mon Aug 24 20:56:39 2009
@@ -27,6 +27,7 @@
 import javax.transaction.Status;
 import javax.transaction.SystemException;
 import javax.servlet.ServletException;
+import javax.servlet.DispatcherType;
 import javax.resource.ResourceException;
 
 import org.apache.geronimo.connector.outbound.connectiontracking.TrackedConnectionAssociator;
@@ -34,7 +35,6 @@
 import org.apache.geronimo.connector.outbound.connectiontracking.ConnectorInstanceContext;
 import org.apache.geronimo.naming.java.RootContext;
 import org.eclipse.jetty.server.Request;
-import org.eclipse.jetty.server.DispatcherType;
 
 /**
  * @version $Rev$ $Date$

Modified: geronimo/server/trunk/plugins/jetty7/geronimo-jetty7/src/main/java/org/apache/geronimo/jetty7/security/JettySecurityHandlerFactory.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/jetty7/geronimo-jetty7/src/main/java/org/apache/geronimo/jetty7/security/JettySecurityHandlerFactory.java?rev=807372&r1=807371&r2=807372&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/jetty7/geronimo-jetty7/src/main/java/org/apache/geronimo/jetty7/security/JettySecurityHandlerFactory.java (original)
+++ geronimo/server/trunk/plugins/jetty7/geronimo-jetty7/src/main/java/org/apache/geronimo/jetty7/security/JettySecurityHandlerFactory.java Mon Aug 24 20:56:39 2009
@@ -99,7 +99,8 @@
             authenticator = new ClientCertAuthenticator();
         } else if (authMethod == BuiltInAuthMethod.FORM) {
             boolean dispatch = true;
-            authenticator = new FormAuthenticator(loginPage, errorPage, dispatch);
+//            authenticator = new FormAuthenticator(loginPage, errorPage, dispatch);
+            authenticator = new FormAuthenticator(loginPage, errorPage);
         } else if (authMethod == BuiltInAuthMethod.NONE) {
             authenticator = new NoneAuthenticator();
         } else {

Modified: geronimo/server/trunk/plugins/jetty7/geronimo-jetty7/src/test/java/org/apache/geronimo/jetty7/AbstractWebModuleTest.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/jetty7/geronimo-jetty7/src/test/java/org/apache/geronimo/jetty7/AbstractWebModuleTest.java?rev=807372&r1=807371&r2=807372&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/jetty7/geronimo-jetty7/src/test/java/org/apache/geronimo/jetty7/AbstractWebModuleTest.java (original)
+++ geronimo/server/trunk/plugins/jetty7/geronimo-jetty7/src/test/java/org/apache/geronimo/jetty7/AbstractWebModuleTest.java Mon Aug 24 20:56:39 2009
@@ -174,7 +174,8 @@
         String policyContextId = "TEST";
         ApplicationPolicyConfigurationManager jacc = setUpJACC(roleDesignates, principalRoleMap, componentPermissions, policyContextId);
         LoginService loginService = newLoginService();
-        Authenticator serverAuthentication = new FormAuthenticator("/auth/logon.html?param=test", "/auth/logonError.html?param=test", true);
+//        Authenticator serverAuthentication = new FormAuthenticator("/auth/logon.html?param=test", "/auth/logonError.html?param=test", true);
+        Authenticator serverAuthentication = new FormAuthenticator("/auth/logon.html?param=test", "/auth/logonError.html?param=test");
         SecurityHandlerFactory securityHandlerFactory = new ServerAuthenticationGBean(serverAuthentication, loginService);
         return setUpAppContext(
                 securityRealmName,

Modified: geronimo/server/trunk/plugins/jetty7/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/jetty7/pom.xml?rev=807372&r1=807371&r2=807372&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/jetty7/pom.xml (original)
+++ geronimo/server/trunk/plugins/jetty7/pom.xml Mon Aug 24 20:56:39 2009
@@ -37,7 +37,7 @@
     </description>
 
     <properties>
-        <jettyVersion>7.0.0.RC4</jettyVersion>
+        <jettyVersion>8.0.0.M0-SNAPSHOT</jettyVersion>
     </properties>
 
     <dependencyManagement>
@@ -48,7 +48,7 @@
                 <version>${jettyVersion}</version>
                 <exclusions>
                     <exclusion>
-                        <groupId>javax.servlet</groupId>
+                        <groupId>org.mortbay.jetty</groupId>
                         <artifactId>servlet-api</artifactId>
                     </exclusion>
                 </exclusions>
@@ -65,7 +65,7 @@
                 <version>${jettyVersion}</version>
                 <exclusions>
                     <exclusion>
-                        <groupId>javax.servlet</groupId>
+                        <groupId>org.mortbay.jetty</groupId>
                         <artifactId>servlet-api</artifactId>
                     </exclusion>
                 </exclusions>
@@ -100,17 +100,15 @@
             <!--<version>${jettyVersion}</version>-->
             <!--</dependency>-->
 
-            <dependency>
-                <groupId>org.apache.geronimo.components</groupId>
-                <artifactId>geronimo-jaspi</artifactId>
-                <version>1.0-SNAPSHOT</version>
-            </dependency>
-            <dependency>
-                <groupId>org.apache.geronimo.components</groupId>
-                <artifactId>geronimo-jaspi</artifactId>
-                <version>1.0-SNAPSHOT</version>
-                <classifier>tests</classifier>
-            </dependency>
+            <!--<dependency>-->
+                <!--<groupId>org.apache.geronimo.components</groupId>-->
+                <!--<artifactId>geronimo-jaspi</artifactId>-->
+            <!--</dependency>-->
+            <!--<dependency>-->
+                <!--<groupId>org.apache.geronimo.components</groupId>-->
+                <!--<artifactId>geronimo-jaspi</artifactId>-->
+                <!--<classifier>tests</classifier>-->
+            <!--</dependency>-->
         </dependencies>
     </dependencyManagement>
 

Modified: geronimo/server/trunk/plugins/mejb/geronimo-mejb/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/mejb/geronimo-mejb/pom.xml?rev=807372&r1=807371&r2=807372&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/mejb/geronimo-mejb/pom.xml (original)
+++ geronimo/server/trunk/plugins/mejb/geronimo-mejb/pom.xml Mon Aug 24 20:56:39 2009
@@ -46,15 +46,10 @@
 
         <dependency>
             <groupId>org.apache.geronimo.specs</groupId>
-            <artifactId>geronimo-ejb_3.0_spec</artifactId>
+            <artifactId>geronimo-ejb_3.1_spec</artifactId>
         </dependency>
 
         <dependency>
-          <groupId>org.apache.openejb</groupId>
-          <artifactId>ejb31-api-experimental</artifactId>
-       </dependency>
-
-        <dependency>
             <groupId>org.apache.geronimo.specs</groupId>
             <artifactId>geronimo-j2ee-management_1.1_spec</artifactId>
         </dependency>

Modified: geronimo/server/trunk/plugins/monitoring/agent-ejb/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/monitoring/agent-ejb/pom.xml?rev=807372&r1=807371&r2=807372&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/monitoring/agent-ejb/pom.xml (original)
+++ geronimo/server/trunk/plugins/monitoring/agent-ejb/pom.xml Mon Aug 24 20:56:39 2009
@@ -62,14 +62,9 @@
         
         <dependency>
             <groupId>org.apache.geronimo.specs</groupId>
-            <artifactId>geronimo-ejb_3.0_spec</artifactId>
+            <artifactId>geronimo-ejb_3.1_spec</artifactId>
             <scope>provided</scope>
         </dependency>
-        
-        <dependency>
-          <groupId>org.apache.openejb</groupId>
-          <artifactId>ejb31-api-experimental</artifactId>
-       </dependency>
 
         <dependency>
             <groupId>org.apache.geronimo.plugins.monitoring</groupId>

Modified: geronimo/server/trunk/plugins/monitoring/mconsole-war/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/monitoring/mconsole-war/pom.xml?rev=807372&r1=807371&r2=807372&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/monitoring/mconsole-war/pom.xml (original)
+++ geronimo/server/trunk/plugins/monitoring/mconsole-war/pom.xml Mon Aug 24 20:56:39 2009
@@ -63,7 +63,7 @@
 
         <dependency>
             <groupId>org.apache.geronimo.specs</groupId>
-            <artifactId>geronimo-servlet_2.5_spec</artifactId>
+            <artifactId>geronimo-servlet_3.0_spec</artifactId>
             <scope>provided</scope>
         </dependency>
 

Modified: geronimo/server/trunk/plugins/myfaces/geronimo-myfaces-builder/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/myfaces/geronimo-myfaces-builder/pom.xml?rev=807372&r1=807371&r2=807372&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/myfaces/geronimo-myfaces-builder/pom.xml (original)
+++ geronimo/server/trunk/plugins/myfaces/geronimo-myfaces-builder/pom.xml Mon Aug 24 20:56:39 2009
@@ -47,7 +47,7 @@
         
         <dependency>
             <groupId>org.apache.geronimo.specs</groupId>
-            <artifactId>geronimo-servlet_2.5_spec</artifactId>
+            <artifactId>geronimo-servlet_3.0_spec</artifactId>
             <scope>test</scope>
         </dependency>
     </dependencies>

Modified: geronimo/server/trunk/plugins/openejb/openejb/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/openejb/openejb/pom.xml?rev=807372&r1=807371&r2=807372&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/openejb/openejb/pom.xml (original)
+++ geronimo/server/trunk/plugins/openejb/openejb/pom.xml Mon Aug 24 20:56:39 2009
@@ -74,41 +74,12 @@
 
         <dependency>
             <groupId>org.apache.openejb</groupId>
+            <artifactId>openejb-client</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.openejb</groupId>
             <artifactId>openejb-core</artifactId>
-            <!--<exclusions>-->
-                <!--<exclusion>-->
-                    <!--<groupId>org.apache.geronimo.framework</groupId>-->
-                    <!--<artifactId>geronimo-security</artifactId>-->
-                <!--</exclusion>-->
-                <!--<exclusion>-->
-                    <!--<groupId>org.apache.geronimo.framework</groupId>-->
-                    <!--<artifactId>geronimo-kernel</artifactId>-->
-                <!--</exclusion>-->
-                <!--<exclusion>-->
-                    <!--<groupId>org.apache.geronimo.modules</groupId>-->
-                    <!--<artifactId>geronimo-connector</artifactId>-->
-                <!--</exclusion>-->
-                <!--<exclusion>-->
-                    <!--<groupId>org.apache.geronimo.framework</groupId>-->
-                    <!--<artifactId>geronimo-interceptor</artifactId>-->
-                <!--</exclusion>-->
-                <!--<exclusion>-->
-                    <!--<groupId>org.apache.geronimo.framework</groupId>-->
-                    <!--<artifactId>geronimo-naming</artifactId>-->
-                <!--</exclusion>-->
-                <!--<exclusion>-->
-                    <!--<groupId>org.apache.geronimo.modules</groupId>-->
-                    <!--<artifactId>geronimo-transaction</artifactId>-->
-                <!--</exclusion>-->
-                <!--<exclusion>-->
-                    <!--<groupId>org.apache.geronimo.modules</groupId>-->
-                    <!--<artifactId>geronimo-timer</artifactId>-->
-                <!--</exclusion>-->
-                <!--<exclusion>-->
-                    <!--<groupId>org.apache.geronimo.modules</groupId>-->
-                    <!--<artifactId>geronimo-webservices</artifactId>-->
-                <!--</exclusion>-->
-            <!--</exclusions>-->
         </dependency>
 
         <dependency>

Modified: geronimo/server/trunk/plugins/openjpa/geronimo-persistence-jpa10/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/openjpa/geronimo-persistence-jpa10/pom.xml?rev=807372&r1=807371&r2=807372&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/openjpa/geronimo-persistence-jpa10/pom.xml (original)
+++ geronimo/server/trunk/plugins/openjpa/geronimo-persistence-jpa10/pom.xml Mon Aug 24 20:56:39 2009
@@ -55,12 +55,12 @@
 
         <dependency>
             <groupId>org.apache.geronimo.specs</groupId>
-            <artifactId>geronimo-jpa_3.0_spec</artifactId>
+            <artifactId>geronimo-jpa_1.0_spec</artifactId>
             <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>org.apache.geronimo.specs</groupId>
-            <artifactId>geronimo-ejb_3.0_spec</artifactId>
+            <artifactId>geronimo-ejb_3.1_spec</artifactId>
             <scope>provided</scope>
         </dependency>
         <dependency>

Modified: geronimo/server/trunk/plugins/pluto/geronimo-pluto/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/pluto/geronimo-pluto/pom.xml?rev=807372&r1=807371&r2=807372&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/pluto/geronimo-pluto/pom.xml (original)
+++ geronimo/server/trunk/plugins/pluto/geronimo-pluto/pom.xml Mon Aug 24 20:56:39 2009
@@ -54,7 +54,7 @@
         </dependency>
         <dependency>
             <groupId>org.apache.geronimo.specs</groupId>
-            <artifactId>geronimo-servlet_2.5_spec</artifactId>
+            <artifactId>geronimo-servlet_3.0_spec</artifactId>
             <scope>provided</scope>
         </dependency>
     </dependencies>

Modified: geronimo/server/trunk/plugins/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/pom.xml?rev=807372&r1=807371&r2=807372&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/pom.xml (original)
+++ geronimo/server/trunk/plugins/pom.xml Mon Aug 24 20:56:39 2009
@@ -81,7 +81,7 @@
         <module>myfaces</module>
         <module>openejb</module>
         <module>openjpa</module>
-        <module>openwebbeans</module>
+<!--        <module>openwebbeans</module>-->
         <module>plancreator</module>
         <module>webservices</module>
         <module>spring</module>

Modified: geronimo/server/trunk/plugins/remote-deploy/geronimo-remote-deploy/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/remote-deploy/geronimo-remote-deploy/pom.xml?rev=807372&r1=807371&r2=807372&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/remote-deploy/geronimo-remote-deploy/pom.xml (original)
+++ geronimo/server/trunk/plugins/remote-deploy/geronimo-remote-deploy/pom.xml Mon Aug 24 20:56:39 2009
@@ -41,7 +41,7 @@
     <dependencies>
         <dependency>
             <groupId>org.apache.geronimo.specs</groupId>
-            <artifactId>geronimo-servlet_2.5_spec</artifactId>
+            <artifactId>geronimo-servlet_3.0_spec</artifactId>
             <scope>provided</scope>
         </dependency>
 

Modified: geronimo/server/trunk/plugins/tomcat/geronimo-tomcat6/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/tomcat/geronimo-tomcat6/pom.xml?rev=807372&r1=807371&r2=807372&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/tomcat/geronimo-tomcat6/pom.xml (original)
+++ geronimo/server/trunk/plugins/tomcat/geronimo-tomcat6/pom.xml Mon Aug 24 20:56:39 2009
@@ -75,6 +75,11 @@
 
         <dependency>
             <groupId>${tomcatGroupId}</groupId>
+            <artifactId>util</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>${tomcatGroupId}</groupId>
             <artifactId>catalina-ha</artifactId>
         </dependency>
 

Modified: geronimo/server/trunk/plugins/tomcat/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/tomcat/pom.xml?rev=807372&r1=807371&r2=807372&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/tomcat/pom.xml (original)
+++ geronimo/server/trunk/plugins/tomcat/pom.xml Mon Aug 24 20:56:39 2009
@@ -18,7 +18,8 @@
 
 <!-- $Rev$ $Date$ -->
 
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
 
     <modelVersion>4.0.0</modelVersion>
 
@@ -128,10 +129,37 @@
                         <groupId>${tomcatGroupId}</groupId>
                         <artifactId>juli</artifactId>
                     </exclusion>
+                    <exclusion>
+                        <groupId>org.apache.geronimo.specs</groupId>
+                        <artifactId>geronimo-ejb_3.0_spec</artifactId>
+                    </exclusion>
+                    <exclusion>
+                        <groupId>org.apache.geronimo.specs</groupId>
+                        <artifactId>geronimo-servlet_2.5_spec</artifactId>
+                    </exclusion>
                 </exclusions>
             </dependency>
             <dependency>
                 <groupId>${tomcatGroupId}</groupId>
+                <artifactId>util</artifactId>
+                <version>${tomcatVersion}</version>
+                <exclusions>
+                    <exclusion>
+                        <groupId>${tomcatGroupId}</groupId>
+                        <artifactId>juli</artifactId>
+                    </exclusion>
+                    <exclusion>
+                        <groupId>org.apache.geronimo.specs</groupId>
+                        <artifactId>geronimo-ejb_3.0_spec</artifactId>
+                    </exclusion>
+                    <exclusion>
+                        <groupId>org.apache.geronimo.specs</groupId>
+                        <artifactId>geronimo-servlet_2.5_spec</artifactId>
+                    </exclusion>
+                 </exclusions>
+            </dependency>
+            <dependency>
+                <groupId>${tomcatGroupId}</groupId>
                 <artifactId>catalina-ha</artifactId>
                 <version>${tomcatVersion}</version>
                 <exclusions>
@@ -139,7 +167,15 @@
                         <groupId>${tomcatGroupId}</groupId>
                         <artifactId>juli</artifactId>
                     </exclusion>
-                </exclusions>
+                    <exclusion>
+                        <groupId>org.apache.geronimo.specs</groupId>
+                        <artifactId>geronimo-ejb_3.0_spec</artifactId>
+                    </exclusion>
+                    <exclusion>
+                        <groupId>org.apache.geronimo.specs</groupId>
+                        <artifactId>geronimo-servlet_2.5_spec</artifactId>
+                    </exclusion>
+                 </exclusions>
             </dependency>
             <dependency>
                 <groupId>${tomcatGroupId}</groupId>
@@ -150,7 +186,15 @@
                         <groupId>${tomcatGroupId}</groupId>
                         <artifactId>juli</artifactId>
                     </exclusion>
-                </exclusions>
+                    <exclusion>
+                        <groupId>org.apache.geronimo.specs</groupId>
+                        <artifactId>geronimo-ejb_3.0_spec</artifactId>
+                    </exclusion>
+                    <exclusion>
+                        <groupId>org.apache.geronimo.specs</groupId>
+                        <artifactId>geronimo-servlet_2.5_spec</artifactId>
+                    </exclusion>
+                 </exclusions>
             </dependency>
             <!--<dependency>-->
             <!--<groupId>${tomcatGroupId}</groupId>-->

Modified: geronimo/server/trunk/plugins/tomcat/tomcat6/src/main/history/dependencies.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/tomcat/tomcat6/src/main/history/dependencies.xml?rev=807372&r1=807371&r2=807372&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/tomcat/tomcat6/src/main/history/dependencies.xml (original)
+++ geronimo/server/trunk/plugins/tomcat/tomcat6/src/main/history/dependencies.xml Mon Aug 24 20:56:39 2009
@@ -66,9 +66,4 @@
         <artifactId>geronimo-javamail_1.4_spec</artifactId>
         <type>jar</type>
     </dependency>
-    <dependency>
-        <groupId>org.apache.geronimo.specs</groupId>
-        <artifactId>geronimo-jpa_1.0_spec</artifactId>
-        <type>jar</type>
-    </dependency>
 </plugin-artifact>

Modified: geronimo/server/trunk/plugins/webservices/geronimo-webservices/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/webservices/geronimo-webservices/pom.xml?rev=807372&r1=807371&r2=807372&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/webservices/geronimo-webservices/pom.xml (original)
+++ geronimo/server/trunk/plugins/webservices/geronimo-webservices/pom.xml Mon Aug 24 20:56:39 2009
@@ -71,7 +71,7 @@
 
         <dependency>
             <groupId>org.apache.geronimo.specs</groupId>
-            <artifactId>geronimo-servlet_2.5_spec</artifactId>
+            <artifactId>geronimo-servlet_3.0_spec</artifactId>
             <scope>provided</scope>
         </dependency>
         

Modified: geronimo/server/trunk/plugins/welcome/geronimo-welcome/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/welcome/geronimo-welcome/pom.xml?rev=807372&r1=807371&r2=807372&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/welcome/geronimo-welcome/pom.xml (original)
+++ geronimo/server/trunk/plugins/welcome/geronimo-welcome/pom.xml Mon Aug 24 20:56:39 2009
@@ -54,7 +54,7 @@
 
         <dependency>
             <groupId>org.apache.geronimo.specs</groupId>
-            <artifactId>geronimo-servlet_2.5_spec</artifactId>
+            <artifactId>geronimo-servlet_3.0_spec</artifactId>
             <scope>provided</scope>
         </dependency>
     </dependencies>

Modified: geronimo/server/trunk/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/pom.xml?rev=807372&r1=807371&r2=807372&view=diff
==============================================================================
--- geronimo/server/trunk/pom.xml (original)
+++ geronimo/server/trunk/pom.xml Mon Aug 24 20:56:39 2009
@@ -18,7 +18,8 @@
 
 <!-- $Rev$ $Date$ -->
 
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
 
     <modelVersion>4.0.0</modelVersion>
 
@@ -88,7 +89,7 @@
         <connectorSuffix>-1_6</connectorSuffix>
         <connectorSpec>geronimo-j2ee-connector_1.6_spec</connectorSpec>
         <txmanagerVersion>2.2-SNAPSHOT</txmanagerVersion>
-        <servletSpec>geronimo-servlet_2.5_spec</servletSpec>
+        <servletSpec>geronimo-servlet_3.0_spec</servletSpec>
 
         <monitoringConsoleVersion>${version}</monitoringConsoleVersion>
 
@@ -144,14 +145,8 @@
 
             <dependency>
                 <groupId>org.apache.geronimo.specs</groupId>
-                <artifactId>geronimo-ejb_3.0_spec</artifactId>
-                <version>1.0.1</version>
-            </dependency>
-
-            <dependency>
-                <groupId>org.apache.openejb</groupId>
-                <artifactId>ejb31-api-experimental</artifactId>
-                <version>${openejbVersion}</version>
+                <artifactId>geronimo-ejb_3.1_spec</artifactId>
+                <version>1.0.0-EA1-SNAPSHOT</version>
             </dependency>
 
             <dependency>
@@ -162,11 +157,6 @@
 
             <dependency>
                 <groupId>org.apache.geronimo.specs</groupId>
-                <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>
@@ -244,19 +234,14 @@
 
             <dependency>
                 <groupId>org.apache.geronimo.specs</groupId>
-                <artifactId>geronimo-servlet_2.5_spec</artifactId>
-                <version>1.2</version>
-            </dependency>
-            <dependency>
-                <groupId>org.apache.geronimo.specs</groupId>
                 <artifactId>geronimo-servlet_3.0_spec</artifactId>
                 <version>1.0-EA-SNAPSHOT</version>
             </dependency>
 
             <dependency>
                 <groupId>org.apache.geronimo.specs</groupId>
-                <artifactId>geronimo-jpa_3.0_spec</artifactId>
-                <version>1.1.1</version>
+                <artifactId>geronimo-jpa_1.0_spec</artifactId>
+                <version>1.1.2-SNAPSHOT</version>
             </dependency>
 
             <dependency>
@@ -325,23 +310,29 @@
                 <groupId>org.apache.geronimo.components</groupId>
                 <artifactId>geronimo-transaction</artifactId>
                 <version>${txmanagerVersion}</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>
-                <exclusions>
-                    <exclusion>
-                        <groupId>javax.xml.bind</groupId>
-                        <artifactId>jaxb-api</artifactId>
-                    </exclusion>
-                </exclusions>
+                <!--<exclusions>-->
+                <!--<exclusion>-->
+                <!--<groupId>javax.xml.bind</groupId>-->
+                <!--<artifactId>jaxb-api</artifactId>-->
+                <!--</exclusion>-->
+                <!--</exclusions>-->
+            </dependency>
+            <dependency>
+                <groupId>org.apache.geronimo.components</groupId>
+                <artifactId>geronimo-jaspi</artifactId>
+                <version>1.0-SNAPSHOT</version>
+                <classifier>tests</classifier>
+                <!--<exclusions>-->
+                <!--<exclusion>-->
+                <!--<groupId>javax.xml.bind</groupId>-->
+                <!--<artifactId>jaxb-api</artifactId>-->
+                <!--</exclusion>-->
+                <!--</exclusions>-->
             </dependency>
 
             <dependency>
@@ -1041,6 +1032,10 @@
                         <artifactId>javaee-api</artifactId>
                     </exclusion>
                     <exclusion>
+                        <groupId>org.apache.openejb</groupId>
+                        <artifactId>ejb31-api-experimental</artifactId>
+                    </exclusion>
+                    <exclusion>
                         <groupId>log4j</groupId>
                         <artifactId>log4j</artifactId>
                     </exclusion>
@@ -1101,6 +1096,10 @@
                         <artifactId>javaee-api</artifactId>
                     </exclusion>
                     <exclusion>
+                        <groupId>org.apache.openejb</groupId>
+                        <artifactId>ejb31-api-experimental</artifactId>
+                    </exclusion>
+                    <exclusion>
                         <groupId>log4j</groupId>
                         <artifactId>log4j</artifactId>
                     </exclusion>
@@ -1117,6 +1116,10 @@
                         <artifactId>javaee-api</artifactId>
                     </exclusion>
                     <exclusion>
+                        <groupId>org.apache.openejb</groupId>
+                        <artifactId>ejb31-api-experimental</artifactId>
+                    </exclusion>
+                    <exclusion>
                         <groupId>log4j</groupId>
                         <artifactId>log4j</artifactId>
                     </exclusion>
@@ -1133,6 +1136,10 @@
                         <artifactId>javaee-api</artifactId>
                     </exclusion>
                     <exclusion>
+                        <groupId>org.apache.openejb</groupId>
+                        <artifactId>ejb31-api-experimental</artifactId>
+                    </exclusion>
+                    <exclusion>
                         <groupId>log4j</groupId>
                         <artifactId>log4j</artifactId>
                     </exclusion>
@@ -1150,6 +1157,10 @@
                     </exclusion>
                     <exclusion>
                         <groupId>org.apache.openejb</groupId>
+                        <artifactId>ejb31-api-experimental</artifactId>
+                    </exclusion>
+                    <exclusion>
+                        <groupId>org.apache.openejb</groupId>
                         <artifactId>openejb-webservices</artifactId>
                     </exclusion>
                     <exclusion>
@@ -1177,6 +1188,10 @@
                         <artifactId>javaee-api</artifactId>
                     </exclusion>
                     <exclusion>
+                        <groupId>org.apache.openejb</groupId>
+                        <artifactId>ejb31-api-experimental</artifactId>
+                    </exclusion>
+                    <exclusion>
                         <groupId>log4j</groupId>
                         <artifactId>log4j</artifactId>
                     </exclusion>
@@ -1193,6 +1208,10 @@
                         <artifactId>javaee-api</artifactId>
                     </exclusion>
                     <exclusion>
+                        <groupId>org.apache.openejb</groupId>
+                        <artifactId>ejb31-api-experimental</artifactId>
+                    </exclusion>
+                    <exclusion>
                         <groupId>log4j</groupId>
                         <artifactId>log4j</artifactId>
                     </exclusion>
@@ -1209,6 +1228,10 @@
                         <artifactId>javaee-api</artifactId>
                     </exclusion>
                     <exclusion>
+                        <groupId>org.apache.openejb</groupId>
+                        <artifactId>ejb31-api-experimental</artifactId>
+                    </exclusion>
+                    <exclusion>
                         <groupId>log4j</groupId>
                         <artifactId>log4j</artifactId>
                     </exclusion>
@@ -1222,7 +1245,6 @@
             </dependency>
 
 
-
             <!--<dependency>-->
             <!--<groupId>org.apache.tomcat</groupId>-->
             <!--<artifactId>jasper</artifactId>-->
@@ -2173,7 +2195,7 @@
             <url>scp://people.apache.org/www/geronimo.apache.org/maven/server</url>
         </site>
     </distributionManagement>
-    
+
     <!--
         Remove this once the genesis 2.0.1 is released or there is a better solution
     -->
@@ -2193,7 +2215,7 @@
             </releases>
         </pluginRepository>
     </pluginRepositories>
-    
+
     <profiles>
         <profile>
             <id>default</id>
@@ -2362,7 +2384,6 @@
 
                 <!--<connectorSuffix></connectorSuffix>-->
                 <connectorSuffix>-1_6</connectorSuffix>
-                <!--<connectorSpec>geronimo-j2ee-connector_1.5_spec</connectorSpec>-->
                 <connectorSpec>geronimo-j2ee-connector_1.6_spec</connectorSpec>
                 <servletSpec>geronimo-servlet_3.0_spec</servletSpec>
                 <!--<txmanagerVersion>2.1.1</txmanagerVersion>-->
@@ -2376,7 +2397,7 @@
                 <module>assemblies</module>
             </modules>
         </profile>
-     
+
     </profiles>
 
 </project>

Modified: geronimo/server/trunk/testsuite/concurrent-testsuite/concurrent-basic/common-ejb/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/concurrent-testsuite/concurrent-basic/common-ejb/pom.xml?rev=807372&r1=807371&r2=807372&view=diff
==============================================================================
--- geronimo/server/trunk/testsuite/concurrent-testsuite/concurrent-basic/common-ejb/pom.xml (original)
+++ geronimo/server/trunk/testsuite/concurrent-testsuite/concurrent-basic/common-ejb/pom.xml Mon Aug 24 20:56:39 2009
@@ -37,15 +37,10 @@
    <dependencies>
         <dependency>
             <groupId>org.apache.geronimo.specs</groupId>
-            <artifactId>geronimo-ejb_3.0_spec</artifactId>
+            <artifactId>geronimo-ejb_3.1_spec</artifactId>
             <scope>provided</scope>
         </dependency>
         <dependency>
-          <groupId>org.apache.openejb</groupId>
-          <artifactId>ejb31-api-experimental</artifactId>
-          <scope>provided</scope>
-       </dependency>
-        <dependency>
             <groupId>org.apache.geronimo.specs</groupId>
             <artifactId>geronimo-annotation_1.0_spec</artifactId>
             <scope>provided</scope>

Modified: geronimo/server/trunk/testsuite/concurrent-testsuite/concurrent-basic/common-jar/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/concurrent-testsuite/concurrent-basic/common-jar/pom.xml?rev=807372&r1=807371&r2=807372&view=diff
==============================================================================
--- geronimo/server/trunk/testsuite/concurrent-testsuite/concurrent-basic/common-jar/pom.xml (original)
+++ geronimo/server/trunk/testsuite/concurrent-testsuite/concurrent-basic/common-jar/pom.xml Mon Aug 24 20:56:39 2009
@@ -58,15 +58,10 @@
         </dependency>
         <dependency>
             <groupId>org.apache.geronimo.specs</groupId>
-            <artifactId>geronimo-ejb_3.0_spec</artifactId>
+            <artifactId>geronimo-ejb_3.1_spec</artifactId>
             <scope>provided</scope>
         </dependency>
         <dependency>
-          <groupId>org.apache.openejb</groupId>
-          <artifactId>ejb31-api-experimental</artifactId>
-          <scope>provided</scope>
-       </dependency>
-        <dependency>
             <groupId>org.apache.geronimo.testsuite</groupId>
             <artifactId>common-ejb</artifactId>
             <version>${version}</version>

Modified: geronimo/server/trunk/testsuite/concurrent-testsuite/concurrent-basic/concurrent-ejb-ear/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/concurrent-testsuite/concurrent-basic/concurrent-ejb-ear/pom.xml?rev=807372&r1=807371&r2=807372&view=diff
==============================================================================
--- geronimo/server/trunk/testsuite/concurrent-testsuite/concurrent-basic/concurrent-ejb-ear/pom.xml (original)
+++ geronimo/server/trunk/testsuite/concurrent-testsuite/concurrent-basic/concurrent-ejb-ear/pom.xml Mon Aug 24 20:56:39 2009
@@ -80,15 +80,9 @@
 
         <dependency>
             <groupId>org.apache.geronimo.specs</groupId>
-            <artifactId>geronimo-ejb_3.0_spec</artifactId>
+            <artifactId>geronimo-ejb_3.1_spec</artifactId>
             <scope>test</scope>
-        </dependency>
-        
-        <dependency>
-          <groupId>org.apache.openejb</groupId>
-          <artifactId>ejb31-api-experimental</artifactId>
-          <scope>test</scope>
-       </dependency>
+        </dependency         
 
         <dependency>
             <groupId>org.apache.geronimo.framework</groupId>

Modified: geronimo/server/trunk/testsuite/concurrent-testsuite/concurrent-basic/concurrent-ejb/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/concurrent-testsuite/concurrent-basic/concurrent-ejb/pom.xml?rev=807372&r1=807371&r2=807372&view=diff
==============================================================================
--- geronimo/server/trunk/testsuite/concurrent-testsuite/concurrent-basic/concurrent-ejb/pom.xml (original)
+++ geronimo/server/trunk/testsuite/concurrent-testsuite/concurrent-basic/concurrent-ejb/pom.xml Mon Aug 24 20:56:39 2009
@@ -42,15 +42,10 @@
         </dependency>
         <dependency>
             <groupId>org.apache.geronimo.specs</groupId>
-            <artifactId>geronimo-ejb_3.0_spec</artifactId>
+            <artifactId>geronimo-ejb_3.1_spec</artifactId>
             <scope>provided</scope>
         </dependency>
         <dependency>
-          <groupId>org.apache.openejb</groupId>
-          <artifactId>ejb31-api-experimental</artifactId>
-          <scope>provided</scope>
-       </dependency>
-        <dependency>
             <groupId>org.apache.geronimo.specs</groupId>
             <artifactId>geronimo-annotation_1.0_spec</artifactId>
             <scope>provided</scope>

Modified: geronimo/server/trunk/testsuite/concurrent-testsuite/concurrent-basic/concurrent-war/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/concurrent-testsuite/concurrent-basic/concurrent-war/pom.xml?rev=807372&r1=807371&r2=807372&view=diff
==============================================================================
--- geronimo/server/trunk/testsuite/concurrent-testsuite/concurrent-basic/concurrent-war/pom.xml (original)
+++ geronimo/server/trunk/testsuite/concurrent-testsuite/concurrent-basic/concurrent-war/pom.xml Mon Aug 24 20:56:39 2009
@@ -1,4 +1,3 @@
-
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
     Licensed to the Apache Software Foundation (ASF) under one
@@ -64,17 +63,12 @@
         </dependency>
         <dependency>
             <groupId>org.apache.geronimo.specs</groupId>
-            <artifactId>geronimo-ejb_3.0_spec</artifactId>
+            <artifactId>geronimo-ejb_3.1_spec</artifactId>
             <scope>provided</scope>
         </dependency>
         <dependency>
-          <groupId>org.apache.openejb</groupId>
-          <artifactId>ejb31-api-experimental</artifactId>
-          <scope>provided</scope>
-       </dependency>
-        <dependency>
             <groupId>org.apache.geronimo.specs</groupId>
-            <artifactId>geronimo-servlet_2.5_spec</artifactId>
+            <artifactId>geronimo-servlet_3.0_spec</artifactId>
             <scope>provided</scope>
         </dependency>
         <dependency>

Modified: geronimo/server/trunk/testsuite/corba-testsuite/corba-helloworld/corba-helloworld-client/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/corba-testsuite/corba-helloworld/corba-helloworld-client/pom.xml?rev=807372&r1=807371&r2=807372&view=diff
==============================================================================
--- geronimo/server/trunk/testsuite/corba-testsuite/corba-helloworld/corba-helloworld-client/pom.xml (original)
+++ geronimo/server/trunk/testsuite/corba-testsuite/corba-helloworld/corba-helloworld-client/pom.xml Mon Aug 24 20:56:39 2009
@@ -55,14 +55,9 @@
         
         <dependency>
             <groupId>org.apache.geronimo.specs</groupId>
-            <artifactId>geronimo-ejb_3.0_spec</artifactId>
+            <artifactId>geronimo-ejb_3.1_spec</artifactId>
             <scope>provided</scope>
         </dependency>
-        <dependency>
-          <groupId>org.apache.openejb</groupId>
-          <artifactId>ejb31-api-experimental</artifactId>
-          <scope>provided</scope>
-       </dependency>
     </dependencies>
 
     <build>

Modified: geronimo/server/trunk/testsuite/corba-testsuite/corba-helloworld/corba-helloworld-ejb/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/corba-testsuite/corba-helloworld/corba-helloworld-ejb/pom.xml?rev=807372&r1=807371&r2=807372&view=diff
==============================================================================
--- geronimo/server/trunk/testsuite/corba-testsuite/corba-helloworld/corba-helloworld-ejb/pom.xml (original)
+++ geronimo/server/trunk/testsuite/corba-testsuite/corba-helloworld/corba-helloworld-ejb/pom.xml Mon Aug 24 20:56:39 2009
@@ -39,14 +39,9 @@
     <dependencies>
         <dependency>
             <groupId>org.apache.geronimo.specs</groupId>
-            <artifactId>geronimo-ejb_3.0_spec</artifactId>
+            <artifactId>geronimo-ejb_3.1_spec</artifactId>
             <scope>provided</scope>
         </dependency>
-        <dependency>
-          <groupId>org.apache.openejb</groupId>
-          <artifactId>ejb31-api-experimental</artifactId>
-          <scope>provided</scope>
-       </dependency>
     </dependencies>
 
 </project>

Modified: geronimo/server/trunk/testsuite/corba-testsuite/corba-helloworld/corba-helloworld-war/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/corba-testsuite/corba-helloworld/corba-helloworld-war/pom.xml?rev=807372&r1=807371&r2=807372&view=diff
==============================================================================
--- geronimo/server/trunk/testsuite/corba-testsuite/corba-helloworld/corba-helloworld-war/pom.xml (original)
+++ geronimo/server/trunk/testsuite/corba-testsuite/corba-helloworld/corba-helloworld-war/pom.xml Mon Aug 24 20:56:39 2009
@@ -44,19 +44,13 @@
         
         <dependency>
             <groupId>org.apache.geronimo.specs</groupId>
-            <artifactId>geronimo-ejb_3.0_spec</artifactId>
+            <artifactId>geronimo-ejb_3.1_spec</artifactId>
             <scope>provided</scope>
         </dependency>
         
         <dependency>
-          <groupId>org.apache.openejb</groupId>
-          <artifactId>ejb31-api-experimental</artifactId>
-          <scope>provided</scope>
-       </dependency>
-        
-        <dependency>
             <groupId>org.apache.geronimo.specs</groupId>
-            <artifactId>geronimo-servlet_2.5_spec</artifactId>
+            <artifactId>geronimo-servlet_3.0_spec</artifactId>
             <scope>provided</scope>
         </dependency>
     </dependencies>

Modified: geronimo/server/trunk/testsuite/corba-testsuite/corba-marshal/corba-marshal-client/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/corba-testsuite/corba-marshal/corba-marshal-client/pom.xml?rev=807372&r1=807371&r2=807372&view=diff
==============================================================================
--- geronimo/server/trunk/testsuite/corba-testsuite/corba-marshal/corba-marshal-client/pom.xml (original)
+++ geronimo/server/trunk/testsuite/corba-testsuite/corba-marshal/corba-marshal-client/pom.xml Mon Aug 24 20:56:39 2009
@@ -46,14 +46,9 @@
         
         <dependency>
             <groupId>org.apache.geronimo.specs</groupId>
-            <artifactId>geronimo-ejb_3.0_spec</artifactId>
+            <artifactId>geronimo-ejb_3.1_spec</artifactId>
             <scope>provided</scope>
         </dependency>
-        <dependency>
-          <groupId>org.apache.openejb</groupId>
-          <artifactId>ejb31-api-experimental</artifactId>
-          <scope>provided</scope>
-       </dependency>
     </dependencies>
 
     <build>

Modified: geronimo/server/trunk/testsuite/corba-testsuite/corba-marshal/corba-marshal-ejb/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/corba-testsuite/corba-marshal/corba-marshal-ejb/pom.xml?rev=807372&r1=807371&r2=807372&view=diff
==============================================================================
--- geronimo/server/trunk/testsuite/corba-testsuite/corba-marshal/corba-marshal-ejb/pom.xml (original)
+++ geronimo/server/trunk/testsuite/corba-testsuite/corba-marshal/corba-marshal-ejb/pom.xml Mon Aug 24 20:56:39 2009
@@ -1,3 +1,4 @@
+\
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
     Licensed to the Apache Software Foundation (ASF) under one
@@ -39,14 +40,9 @@
     <dependencies>
         <dependency>
             <groupId>org.apache.geronimo.specs</groupId>
-            <artifactId>geronimo-ejb_3.0_spec</artifactId>
+            <artifactId>geronimo-ejb_3.1_spec</artifactId>
             <scope>provided</scope>
         </dependency>
-        <dependency>
-          <groupId>org.apache.openejb</groupId>
-          <artifactId>ejb31-api-experimental</artifactId>
-          <scope>provided</scope>
-       </dependency>
     </dependencies>
 
 </project>

Modified: geronimo/server/trunk/testsuite/corba-testsuite/corba-mytime/corba-mytime-ear/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/corba-testsuite/corba-mytime/corba-mytime-ear/pom.xml?rev=807372&r1=807371&r2=807372&view=diff
==============================================================================
--- geronimo/server/trunk/testsuite/corba-testsuite/corba-mytime/corba-mytime-ear/pom.xml (original)
+++ geronimo/server/trunk/testsuite/corba-testsuite/corba-mytime/corba-mytime-ear/pom.xml Mon Aug 24 20:56:39 2009
@@ -61,14 +61,9 @@
         
         <dependency>
             <groupId>org.apache.geronimo.specs</groupId>
-            <artifactId>geronimo-ejb_3.0_spec</artifactId>
+            <artifactId>geronimo-ejb_3.1_spec</artifactId>
             <type>jar</type>
         </dependency>
-        <dependency>
-          <groupId>org.apache.openejb</groupId>
-          <artifactId>ejb31-api-experimental</artifactId>
-          <type>jar</type>
-       </dependency>
     </dependencies>
 
     <build>

Modified: geronimo/server/trunk/testsuite/corba-testsuite/corba-mytime/corba-mytime-ejb/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/corba-testsuite/corba-mytime/corba-mytime-ejb/pom.xml?rev=807372&r1=807371&r2=807372&view=diff
==============================================================================
--- geronimo/server/trunk/testsuite/corba-testsuite/corba-mytime/corba-mytime-ejb/pom.xml (original)
+++ geronimo/server/trunk/testsuite/corba-testsuite/corba-mytime/corba-mytime-ejb/pom.xml Mon Aug 24 20:56:39 2009
@@ -39,14 +39,9 @@
     <dependencies>
         <dependency>
             <groupId>org.apache.geronimo.specs</groupId>
-            <artifactId>geronimo-ejb_3.0_spec</artifactId>
+            <artifactId>geronimo-ejb_3.1_spec</artifactId>
             <scope>provided</scope>
         </dependency>
-        <dependency>
-          <groupId>org.apache.openejb</groupId>
-          <artifactId>ejb31-api-experimental</artifactId>
-          <scope>provided</scope>
-       </dependency>
     </dependencies>
 
 </project>

Modified: geronimo/server/trunk/testsuite/corba-testsuite/corba-mytime/corba-mytime-war/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/corba-testsuite/corba-mytime/corba-mytime-war/pom.xml?rev=807372&r1=807371&r2=807372&view=diff
==============================================================================
--- geronimo/server/trunk/testsuite/corba-testsuite/corba-mytime/corba-mytime-war/pom.xml (original)
+++ geronimo/server/trunk/testsuite/corba-testsuite/corba-mytime/corba-mytime-war/pom.xml Mon Aug 24 20:56:39 2009
@@ -46,19 +46,13 @@
         
         <dependency>
             <groupId>org.apache.geronimo.specs</groupId>
-            <artifactId>geronimo-ejb_3.0_spec</artifactId>
+            <artifactId>geronimo-ejb_3.1_spec</artifactId>
             <scope>provided</scope>
         </dependency>
         
         <dependency>
-          <groupId>org.apache.openejb</groupId>
-          <artifactId>ejb31-api-experimental</artifactId>
-          <scope>provided</scope>
-       </dependency>
-        
-        <dependency>
             <groupId>org.apache.geronimo.specs</groupId>
-            <artifactId>geronimo-servlet_2.5_spec</artifactId>
+            <artifactId>geronimo-servlet_3.0_spec</artifactId>
             <scope>provided</scope>
         </dependency>
     </dependencies>

Modified: geronimo/server/trunk/testsuite/deployment-testsuite/jca-cms-tests/jca-cms-war/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/deployment-testsuite/jca-cms-tests/jca-cms-war/pom.xml?rev=807372&r1=807371&r2=807372&view=diff
==============================================================================
--- geronimo/server/trunk/testsuite/deployment-testsuite/jca-cms-tests/jca-cms-war/pom.xml (original)
+++ geronimo/server/trunk/testsuite/deployment-testsuite/jca-cms-tests/jca-cms-war/pom.xml Mon Aug 24 20:56:39 2009
@@ -37,7 +37,7 @@
     <dependencies>
         <dependency>
             <groupId>org.apache.geronimo.specs</groupId>
-            <artifactId>geronimo-servlet_2.5_spec</artifactId>
+            <artifactId>geronimo-servlet_3.0_spec</artifactId>
             <scope>provided</scope>
         </dependency>
         

Modified: geronimo/server/trunk/testsuite/deployment-testsuite/manifestcp-tests/manifestcp-jar/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/deployment-testsuite/manifestcp-tests/manifestcp-jar/pom.xml?rev=807372&r1=807371&r2=807372&view=diff
==============================================================================
--- geronimo/server/trunk/testsuite/deployment-testsuite/manifestcp-tests/manifestcp-jar/pom.xml (original)
+++ geronimo/server/trunk/testsuite/deployment-testsuite/manifestcp-tests/manifestcp-jar/pom.xml Mon Aug 24 20:56:39 2009
@@ -36,17 +36,11 @@
     <dependencies>
         <dependency>
             <groupId>org.apache.geronimo.specs</groupId>
-            <artifactId>geronimo-ejb_3.0_spec</artifactId>
+            <artifactId>geronimo-ejb_3.1_spec</artifactId>
             <scope>provided</scope>
         </dependency>
         
         <dependency>
-          <groupId>org.apache.openejb</groupId>
-          <artifactId>ejb31-api-experimental</artifactId>
-          <scope>provided</scope>
-       </dependency>
-        
-        <dependency>
             <groupId>org.apache.geronimo.testsuite</groupId>
             <artifactId>manifestcp-jar2</artifactId>
             <version>${version}</version>

Modified: geronimo/server/trunk/testsuite/deployment-testsuite/manifestcp-tests/manifestcp-war-jar/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/deployment-testsuite/manifestcp-tests/manifestcp-war-jar/pom.xml?rev=807372&r1=807371&r2=807372&view=diff
==============================================================================
--- geronimo/server/trunk/testsuite/deployment-testsuite/manifestcp-tests/manifestcp-war-jar/pom.xml (original)
+++ geronimo/server/trunk/testsuite/deployment-testsuite/manifestcp-tests/manifestcp-war-jar/pom.xml Mon Aug 24 20:56:39 2009
@@ -36,7 +36,7 @@
     <dependencies>
         <dependency>
             <groupId>org.apache.geronimo.specs</groupId>
-            <artifactId>geronimo-servlet_2.5_spec</artifactId>
+            <artifactId>geronimo-servlet_3.0_spec</artifactId>
             <scope>provided</scope>
         </dependency>
         

Modified: geronimo/server/trunk/testsuite/enterprise-testsuite/ejb-tests/ejb-war/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/enterprise-testsuite/ejb-tests/ejb-war/pom.xml?rev=807372&r1=807371&r2=807372&view=diff
==============================================================================
--- geronimo/server/trunk/testsuite/enterprise-testsuite/ejb-tests/ejb-war/pom.xml (original)
+++ geronimo/server/trunk/testsuite/enterprise-testsuite/ejb-tests/ejb-war/pom.xml Mon Aug 24 20:56:39 2009
@@ -56,7 +56,7 @@
         
         <dependency>
             <groupId>org.apache.geronimo.specs</groupId>
-            <artifactId>geronimo-servlet_2.5_spec</artifactId>
+            <artifactId>geronimo-servlet_3.0_spec</artifactId>
             <scope>provided</scope>
         </dependency>
     </dependencies>

Modified: geronimo/server/trunk/testsuite/enterprise-testsuite/ejb-tests/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/enterprise-testsuite/ejb-tests/pom.xml?rev=807372&r1=807371&r2=807372&view=diff
==============================================================================
--- geronimo/server/trunk/testsuite/enterprise-testsuite/ejb-tests/pom.xml (original)
+++ geronimo/server/trunk/testsuite/enterprise-testsuite/ejb-tests/pom.xml Mon Aug 24 20:56:39 2009
@@ -38,16 +38,10 @@
     <dependencies>
         <dependency>
             <groupId>org.apache.geronimo.specs</groupId>
-            <artifactId>geronimo-ejb_3.0_spec</artifactId>
+            <artifactId>geronimo-ejb_3.1_spec</artifactId>
             <scope>provided</scope>
         </dependency>
-        
-        <dependency>
-          <groupId>org.apache.openejb</groupId>
-          <artifactId>ejb31-api-experimental</artifactId>
-          <scope>provided</scope>
-       </dependency>
-        
+\        
         <dependency>
             <groupId>org.apache.geronimo.specs</groupId>
             <artifactId>geronimo-annotation_1.0_spec</artifactId>

Modified: geronimo/server/trunk/testsuite/enterprise-testsuite/jms-tests/jms-ear/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/enterprise-testsuite/jms-tests/jms-ear/pom.xml?rev=807372&r1=807371&r2=807372&view=diff
==============================================================================
--- geronimo/server/trunk/testsuite/enterprise-testsuite/jms-tests/jms-ear/pom.xml (original)
+++ geronimo/server/trunk/testsuite/enterprise-testsuite/jms-tests/jms-ear/pom.xml Mon Aug 24 20:56:39 2009
@@ -66,15 +66,10 @@
         
         <dependency>
             <groupId>org.apache.geronimo.specs</groupId>
-            <artifactId>geronimo-ejb_3.0_spec</artifactId>
+            <artifactId>geronimo-ejb_3.1_spec</artifactId>
             <version>1.0.1</version>
             <scope>test</scope>
         </dependency>
-        <dependency>
-          <groupId>org.apache.openejb</groupId>
-          <artifactId>ejb31-api-experimental</artifactId>
-          <scope>test</scope>
-       </dependency>
     </dependencies>
     
     <build>

Modified: geronimo/server/trunk/testsuite/enterprise-testsuite/jms-tests/jms-ejb/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/enterprise-testsuite/jms-tests/jms-ejb/pom.xml?rev=807372&r1=807371&r2=807372&view=diff
==============================================================================
--- geronimo/server/trunk/testsuite/enterprise-testsuite/jms-tests/jms-ejb/pom.xml (original)
+++ geronimo/server/trunk/testsuite/enterprise-testsuite/jms-tests/jms-ejb/pom.xml Mon Aug 24 20:56:39 2009
@@ -43,18 +43,11 @@
         
         <dependency>
             <groupId>org.apache.geronimo.specs</groupId>
-            <artifactId>geronimo-ejb_3.0_spec</artifactId>
-            <version>1.0.1</version>
+            <artifactId>geronimo-ejb_3.1_spec</artifactId>
             <scope>provided</scope>
         </dependency>
         
         <dependency>
-          <groupId>org.apache.openejb</groupId>
-          <artifactId>ejb31-api-experimental</artifactId>
-          <scope>provided</scope>
-       </dependency>
-        
-        <dependency>
             <groupId>org.apache.geronimo.specs</groupId>
             <artifactId>geronimo-jms_1.1_spec</artifactId>
             <version>1.1.1</version>

Modified: geronimo/server/trunk/testsuite/enterprise-testsuite/jms-tests/jms-war/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/enterprise-testsuite/jms-tests/jms-war/pom.xml?rev=807372&r1=807371&r2=807372&view=diff
==============================================================================
--- geronimo/server/trunk/testsuite/enterprise-testsuite/jms-tests/jms-war/pom.xml (original)
+++ geronimo/server/trunk/testsuite/enterprise-testsuite/jms-tests/jms-war/pom.xml Mon Aug 24 20:56:39 2009
@@ -49,7 +49,7 @@
         
         <dependency>
             <groupId>org.apache.geronimo.specs</groupId>
-            <artifactId>geronimo-servlet_2.5_spec</artifactId>
+            <artifactId>geronimo-servlet_3.0_spec</artifactId>
             <scope>provided</scope>
         </dependency>
         

Modified: geronimo/server/trunk/testsuite/enterprise-testsuite/jpa-tests/jpa-ejb/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/enterprise-testsuite/jpa-tests/jpa-ejb/pom.xml?rev=807372&r1=807371&r2=807372&view=diff
==============================================================================
--- geronimo/server/trunk/testsuite/enterprise-testsuite/jpa-tests/jpa-ejb/pom.xml (original)
+++ geronimo/server/trunk/testsuite/enterprise-testsuite/jpa-tests/jpa-ejb/pom.xml Mon Aug 24 20:56:39 2009
@@ -55,16 +55,10 @@
         
         <dependency>
             <groupId>org.apache.geronimo.specs</groupId>
-            <artifactId>geronimo-ejb_3.0_spec</artifactId>
+            <artifactId>geronimo-ejb_3.1_spec</artifactId>
             <scope>provided</scope>
         </dependency>
-        
-        <dependency>
-          <groupId>org.apache.openejb</groupId>
-          <artifactId>ejb31-api-experimental</artifactId>
-          <scope>provided</scope>
-       </dependency>
-
+\
         <!-- the enhancer seems to need xerces -->
         <dependency>
             <groupId>xerces</groupId>

Modified: geronimo/server/trunk/testsuite/enterprise-testsuite/jpa-tests/jpa-war/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/enterprise-testsuite/jpa-tests/jpa-war/pom.xml?rev=807372&r1=807371&r2=807372&view=diff
==============================================================================
--- geronimo/server/trunk/testsuite/enterprise-testsuite/jpa-tests/jpa-war/pom.xml (original)
+++ geronimo/server/trunk/testsuite/enterprise-testsuite/jpa-tests/jpa-war/pom.xml Mon Aug 24 20:56:39 2009
@@ -44,23 +44,17 @@
         
         <dependency>
             <groupId>org.apache.geronimo.specs</groupId>
-            <artifactId>geronimo-servlet_2.5_spec</artifactId>
+            <artifactId>geronimo-servlet_3.0_spec</artifactId>
             <scope>provided</scope>
         </dependency>
         
         <dependency>
             <groupId>org.apache.geronimo.specs</groupId>
-            <artifactId>geronimo-ejb_3.0_spec</artifactId>
+            <artifactId>geronimo-ejb_3.1_spec</artifactId>
             <scope>provided</scope>
         </dependency>
         
         <dependency>
-          <groupId>org.apache.openejb</groupId>
-          <artifactId>ejb31-api-experimental</artifactId>
-          <scope>provided</scope>
-       </dependency>
-        
-        <dependency>
             <groupId>org.apache.geronimo.framework</groupId>
             <artifactId>geronimo-security</artifactId>
             <version>${version}</version>

Modified: geronimo/server/trunk/testsuite/enterprise-testsuite/sec-tests/sec-client/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/enterprise-testsuite/sec-tests/sec-client/pom.xml?rev=807372&r1=807371&r2=807372&view=diff
==============================================================================
--- geronimo/server/trunk/testsuite/enterprise-testsuite/sec-tests/sec-client/pom.xml (original)
+++ geronimo/server/trunk/testsuite/enterprise-testsuite/sec-tests/sec-client/pom.xml Mon Aug 24 20:56:39 2009
@@ -55,7 +55,7 @@
         </dependency>
         <dependency>
             <groupId>org.apache.geronimo.specs</groupId>
-            <artifactId>geronimo-ejb_3.0_spec</artifactId>
+            <artifactId>geronimo-ejb_3.1_spec</artifactId>
             <scope>provided</scope>
         </dependency>
     </dependencies>

Modified: geronimo/server/trunk/testsuite/enterprise-testsuite/sec-tests/sec-ejb/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/enterprise-testsuite/sec-tests/sec-ejb/pom.xml?rev=807372&r1=807371&r2=807372&view=diff
==============================================================================
--- geronimo/server/trunk/testsuite/enterprise-testsuite/sec-tests/sec-ejb/pom.xml (original)
+++ geronimo/server/trunk/testsuite/enterprise-testsuite/sec-tests/sec-ejb/pom.xml Mon Aug 24 20:56:39 2009
@@ -37,7 +37,7 @@
     <dependencies>
         <dependency>
             <groupId>org.apache.geronimo.specs</groupId>
-            <artifactId>geronimo-jpa_3.0_spec</artifactId>
+            <artifactId>geronimo-jpa_1.0_spec</artifactId>
             <scope>provided</scope>
         </dependency>
         
@@ -49,15 +49,10 @@
                 
         <dependency>
             <groupId>org.apache.geronimo.specs</groupId>
-            <artifactId>geronimo-ejb_3.0_spec</artifactId>
+            <artifactId>geronimo-ejb_3.1_spec</artifactId>
             <scope>provided</scope>
         </dependency>
         <dependency>
-          <groupId>org.apache.openejb</groupId>
-          <artifactId>ejb31-api-experimental</artifactId>
-          <scope>provided</scope>
-       </dependency>
-        <dependency>
             <groupId>org.apache.geronimo.specs</groupId>
             <artifactId>geronimo-annotation_1.0_spec</artifactId>
             <scope>provided</scope>



Mime
View raw message