You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by ad...@apache.org on 2005/12/10 01:53:52 UTC

svn commit: r355669 [1/2] - in /geronimo/trunk: ./ applications/console-core/ applications/console-ear/ applications/console-framework/ applications/console-standard/ applications/demo/ applications/jmxdebug/ applications/magicGball/ applications/remot...

Author: adc
Date: Fri Dec  9 16:53:33 2005
New Revision: 355669

URL: http://svn.apache.org/viewcvs?rev=355669&view=rev
Log:
Specs are now under new artifact ids.

Modified:
    geronimo/trunk/applications/console-core/project.xml
    geronimo/trunk/applications/console-ear/project.xml
    geronimo/trunk/applications/console-framework/project.xml
    geronimo/trunk/applications/console-standard/project.xml
    geronimo/trunk/applications/demo/project.xml
    geronimo/trunk/applications/jmxdebug/project.xml
    geronimo/trunk/applications/magicGball/project.xml
    geronimo/trunk/applications/remote-deploy/project.xml
    geronimo/trunk/assemblies/j2ee-installer/project.xml
    geronimo/trunk/assemblies/j2ee-jetty-server/project.xml
    geronimo/trunk/assemblies/j2ee-tomcat-server/project.xml
    geronimo/trunk/configs/activemq-broker/project.xml
    geronimo/trunk/configs/activemq/project.xml
    geronimo/trunk/configs/client-corba/project.xml
    geronimo/trunk/configs/client-security/project.xml
    geronimo/trunk/configs/client-system/project.properties
    geronimo/trunk/configs/client-system/project.xml
    geronimo/trunk/configs/client/project.xml
    geronimo/trunk/configs/console-jetty/project.xml
    geronimo/trunk/configs/console-tomcat/project.xml
    geronimo/trunk/configs/directory/project.xml
    geronimo/trunk/configs/executable-deployer/project.properties
    geronimo/trunk/configs/executable-deployer/project.xml
    geronimo/trunk/configs/geronimo-gbean-deployer/project.properties
    geronimo/trunk/configs/hot-deployer/project.xml
    geronimo/trunk/configs/j2ee-corba/project.xml
    geronimo/trunk/configs/j2ee-deployer/project.xml
    geronimo/trunk/configs/j2ee-security/project.xml
    geronimo/trunk/configs/j2ee-server/project.xml
    geronimo/trunk/configs/j2ee-system/project.properties
    geronimo/trunk/configs/j2ee-system/project.xml
    geronimo/trunk/configs/jetty-deployer/project.xml
    geronimo/trunk/configs/jetty/project.xml
    geronimo/trunk/configs/jsp-examples-jetty/project.xml
    geronimo/trunk/configs/jsp-examples-tomcat/project.xml
    geronimo/trunk/configs/online-deployer/project.properties
    geronimo/trunk/configs/online-deployer/project.xml
    geronimo/trunk/configs/rmi-naming/project.xml
    geronimo/trunk/configs/servlets-examples-jetty/project.xml
    geronimo/trunk/configs/servlets-examples-tomcat/project.xml
    geronimo/trunk/configs/system-database/project.xml
    geronimo/trunk/configs/tomcat-deployer/project.xml
    geronimo/trunk/configs/tomcat/project.xml
    geronimo/trunk/configs/uddi-jetty/project.xml
    geronimo/trunk/configs/uddi-tomcat/project.xml
    geronimo/trunk/configs/welcome-jetty/project.xml
    geronimo/trunk/configs/welcome-tomcat/project.xml
    geronimo/trunk/etc/project.properties
    geronimo/trunk/maven.xml
    geronimo/trunk/modules/activation/pom.xml
    geronimo/trunk/modules/activation/project.xml
    geronimo/trunk/modules/axis-builder/project.xml
    geronimo/trunk/modules/axis/project.xml
    geronimo/trunk/modules/client-builder/project.xml
    geronimo/trunk/modules/client/project.xml
    geronimo/trunk/modules/connector-builder/project.xml
    geronimo/trunk/modules/connector/project.xml
    geronimo/trunk/modules/console-web/project.xml
    geronimo/trunk/modules/deploy-config/project.xml
    geronimo/trunk/modules/deploy-jsr88/project.xml
    geronimo/trunk/modules/deploy-jsr88/src/conf/manifest.mf
    geronimo/trunk/modules/deploy-tool/project.xml
    geronimo/trunk/modules/deployment/project.xml
    geronimo/trunk/modules/hot-deploy/project.xml
    geronimo/trunk/modules/interop/maven.xml
    geronimo/trunk/modules/interop/project.xml
    geronimo/trunk/modules/j2ee-builder/project.xml
    geronimo/trunk/modules/j2ee/project.xml
    geronimo/trunk/modules/javamail-transport/project.xml
    geronimo/trunk/modules/jetty-builder/project.xml
    geronimo/trunk/modules/jetty/project.xml
    geronimo/trunk/modules/kernel/project.xml
    geronimo/trunk/modules/mail/project.xml
    geronimo/trunk/modules/management/project.xml
    geronimo/trunk/modules/naming-builder/project.xml
    geronimo/trunk/modules/naming/project.xml
    geronimo/trunk/modules/security/project.xml
    geronimo/trunk/modules/service-builder/project.xml
    geronimo/trunk/modules/test-ddbean/project.xml
    geronimo/trunk/modules/timer/project.xml
    geronimo/trunk/modules/tomcat-builder/project.xml
    geronimo/trunk/modules/tomcat/project.xml
    geronimo/trunk/modules/tomcat/src/plan/tomcat-plan.xml
    geronimo/trunk/modules/transaction/project.xml
    geronimo/trunk/modules/util/project.xml
    geronimo/trunk/modules/web-builder/project.xml
    geronimo/trunk/modules/webservices/project.xml
    geronimo/trunk/plugins/geronimo-deployment-plugin/project.xml
    geronimo/trunk/plugins/geronimo-packaging-plugin/project.xml
    geronimo/trunk/pom.xml

Modified: geronimo/trunk/applications/console-core/project.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/applications/console-core/project.xml?rev=355669&r1=355668&r2=355669&view=diff
==============================================================================
--- geronimo/trunk/applications/console-core/project.xml (original)
+++ geronimo/trunk/applications/console-core/project.xml Fri Dec  9 16:53:33 2005
@@ -89,8 +89,8 @@
 
         <!-- JMS dependencies -->
          <dependency>
-            <groupId>geronimo-spec</groupId>
-            <artifactId>geronimo-spec-jms</artifactId>
+            <groupId>org.apache.geronimo.specs</groupId>
+            <artifactId>geronimo-jms_1.1_spec</artifactId>
             <version>${geronimo_spec_jms_version}</version>
         </dependency>
 

Modified: geronimo/trunk/applications/console-ear/project.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/applications/console-ear/project.xml?rev=355669&r1=355668&r2=355669&view=diff
==============================================================================
--- geronimo/trunk/applications/console-ear/project.xml (original)
+++ geronimo/trunk/applications/console-ear/project.xml Fri Dec  9 16:53:33 2005
@@ -55,8 +55,8 @@
             <version>${concurrent_version}</version>
         </dependency>
         <dependency>
-            <groupId>geronimo-spec</groupId>
-            <artifactId>geronimo-spec-j2ee</artifactId>
+            <groupId>org.apache.geronimo.specs</groupId>
+            <artifactId>geronimo-j2ee_1.4_spec</artifactId>
             <version>${geronimo_spec_j2ee_version}</version>
         </dependency>
         <dependency>

Modified: geronimo/trunk/applications/console-framework/project.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/applications/console-framework/project.xml?rev=355669&r1=355668&r2=355669&view=diff
==============================================================================
--- geronimo/trunk/applications/console-framework/project.xml (original)
+++ geronimo/trunk/applications/console-framework/project.xml Fri Dec  9 16:53:33 2005
@@ -33,8 +33,8 @@
             </properties>
         </dependency>
         <dependency>
-            <groupId>geronimo-spec</groupId>
-            <artifactId>geronimo-spec-j2ee</artifactId>
+            <groupId>org.apache.geronimo.specs</groupId>
+            <artifactId>geronimo-j2ee_1.4_spec</artifactId>
             <version>${geronimo_spec_j2ee_version}</version>
             <properties>
                 <repository>true</repository>

Modified: geronimo/trunk/applications/console-standard/project.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/applications/console-standard/project.xml?rev=355669&r1=355668&r2=355669&view=diff
==============================================================================
--- geronimo/trunk/applications/console-standard/project.xml (original)
+++ geronimo/trunk/applications/console-standard/project.xml Fri Dec  9 16:53:33 2005
@@ -21,8 +21,8 @@
              <version>${pom.currentVersion}</version>
          </dependency>
         <dependency>
-             <groupId>geronimo-spec</groupId>
-             <artifactId>geronimo-spec-j2ee-management</artifactId>
+             <groupId>org.apache.geronimo.specs</groupId>
+             <artifactId>geronimo-j2ee-management_1.0_spec</artifactId>
              <version>${geronimo_spec_j2ee_management_version}</version>
          </dependency>
         <dependency>
@@ -71,8 +71,8 @@
             <version>${pom.currentVersion}</version>
         </dependency>
         <dependency>
-            <groupId>geronimo-spec</groupId>
-            <artifactId>geronimo-spec-servlet</artifactId>
+            <groupId>org.apache.geronimo.specs</groupId>
+            <artifactId>geronimo-servlet_2.4_spec</artifactId>
             <version>${geronimo_spec_servlet_version}</version>
         </dependency>
         <dependency>
@@ -182,8 +182,8 @@
 
         <!-- JMS dependencies -->
          <dependency>
-            <groupId>geronimo-spec</groupId>
-            <artifactId>geronimo-spec-jms</artifactId>
+            <groupId>org.apache.geronimo.specs</groupId>
+            <artifactId>geronimo-jms_1.1_spec</artifactId>
             <version>${geronimo_spec_jms_version}</version>
         </dependency>  
          <dependency>
@@ -236,8 +236,8 @@
             </properties>
         </dependency>                       
         <dependency>
-            <groupId>geronimo-spec</groupId>
-            <artifactId>geronimo-spec-j2ee</artifactId>
+            <groupId>org.apache.geronimo.specs</groupId>
+            <artifactId>geronimo-j2ee_1.4_spec</artifactId>
             <version>${geronimo_spec_j2ee_version}</version>
             <properties>
                 <repository>true</repository>

Modified: geronimo/trunk/applications/demo/project.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/applications/demo/project.xml?rev=355669&r1=355668&r2=355669&view=diff
==============================================================================
--- geronimo/trunk/applications/demo/project.xml (original)
+++ geronimo/trunk/applications/demo/project.xml Fri Dec  9 16:53:33 2005
@@ -41,8 +41,8 @@
 
     <dependencies>
         <dependency>
-            <groupId>geronimo-spec</groupId>
-            <artifactId>geronimo-spec-servlet</artifactId>
+            <groupId>org.apache.geronimo.specs</groupId>
+            <artifactId>geronimo-servlet_2.4_spec</artifactId>
             <version>${geronimo_spec_servlet_version}</version>
         </dependency>
 

Modified: geronimo/trunk/applications/jmxdebug/project.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/applications/jmxdebug/project.xml?rev=355669&r1=355668&r2=355669&view=diff
==============================================================================
--- geronimo/trunk/applications/jmxdebug/project.xml (original)
+++ geronimo/trunk/applications/jmxdebug/project.xml Fri Dec  9 16:53:33 2005
@@ -41,8 +41,8 @@
 
     <dependencies>
         <dependency>
-            <groupId>geronimo-spec</groupId>
-            <artifactId>geronimo-spec-servlet</artifactId>
+            <groupId>org.apache.geronimo.specs</groupId>
+            <artifactId>geronimo-servlet_2.4_spec</artifactId>
             <version>${geronimo_spec_servlet_version}</version>
         </dependency>
 

Modified: geronimo/trunk/applications/magicGball/project.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/applications/magicGball/project.xml?rev=355669&r1=355668&r2=355669&view=diff
==============================================================================
--- geronimo/trunk/applications/magicGball/project.xml (original)
+++ geronimo/trunk/applications/magicGball/project.xml Fri Dec  9 16:53:33 2005
@@ -36,9 +36,9 @@
 
     <dependencies>
         <dependency>
-            <groupId>geronimo-spec</groupId>
-            <artifactId>geronimo-spec-j2ee</artifactId>
-            <version>1.4-rc4</version>
+            <groupId>org.apache.geronimo.specs</groupId>
+            <artifactId>geronimo-j2ee_1.4_spec</artifactId>
+            <version>${geronimo_spec_j2ee_version}</version>
         </dependency>
         <dependency>
             <groupId>geronimo</groupId>

Modified: geronimo/trunk/applications/remote-deploy/project.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/applications/remote-deploy/project.xml?rev=355669&r1=355668&r2=355669&view=diff
==============================================================================
--- geronimo/trunk/applications/remote-deploy/project.xml (original)
+++ geronimo/trunk/applications/remote-deploy/project.xml Fri Dec  9 16:53:33 2005
@@ -33,8 +33,8 @@
 
     <dependencies>
         <dependency>
-            <groupId>geronimo-spec</groupId>
-            <artifactId>geronimo-spec-servlet</artifactId>
+            <groupId>org.apache.geronimo.specs</groupId>
+            <artifactId>geronimo-servlet_2.4_spec</artifactId>
             <version>${geronimo_spec_servlet_version}</version>
         </dependency>
         <dependency>

Modified: geronimo/trunk/assemblies/j2ee-installer/project.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/assemblies/j2ee-installer/project.xml?rev=355669&r1=355668&r2=355669&view=diff
==============================================================================
--- geronimo/trunk/assemblies/j2ee-installer/project.xml (original)
+++ geronimo/trunk/assemblies/j2ee-installer/project.xml Fri Dec  9 16:53:33 2005
@@ -380,8 +380,8 @@
         </dependency>
 
         <dependency>
-            <groupId>geronimo-spec</groupId>
-            <artifactId>geronimo-spec-qname</artifactId>
+            <groupId>org.apache.geronimo.specs</groupId>
+            <artifactId>geronimo-qname_1.1_spec</artifactId>
             <version>${geronimo_spec_qname_version}</version>
             <properties>
                 <geronimo.assemble>library</geronimo.assemble>
@@ -451,8 +451,8 @@
 
         <!--dependencies for online-deployer -->
         <dependency>
-            <groupId>geronimo-spec</groupId>
-            <artifactId>geronimo-spec-j2ee-deployment</artifactId>
+            <groupId>org.apache.geronimo.specs</groupId>
+            <artifactId>geronimo-j2ee-deployment_1.1_spec</artifactId>
             <version>${geronimo_spec_j2ee_deployment_version}</version>
             <properties>
                 <geronimo.assemble>library</geronimo.assemble>
@@ -575,136 +575,136 @@
 
         <!-- all our specs.  These should be all included via transitive dependencies but most arent -->
         <dependency>
-            <groupId>geronimo-spec</groupId>
-            <artifactId>geronimo-spec-activation</artifactId>
+            <groupId>org.apache.geronimo.specs</groupId>
+            <artifactId>geronimo-activation_1.0.2_spec</artifactId>
             <version>${geronimo_spec_activation_version}</version>
             <properties>
                 <geronimo.assemble>repository</geronimo.assemble>
             </properties>
         </dependency>
         <dependency>
-            <groupId>geronimo-spec</groupId>
-            <artifactId>geronimo-spec-corba</artifactId>
+            <groupId>org.apache.geronimo.specs</groupId>
+            <artifactId>geronimo-corba_2.3_spec</artifactId>
             <version>${geronimo_spec_corba_version}</version>
             <properties>
                 <geronimo.assemble>repository</geronimo.assemble>
             </properties>
         </dependency>
         <dependency>
-            <groupId>geronimo-spec</groupId>
-            <artifactId>geronimo-spec-ejb</artifactId>
+            <groupId>org.apache.geronimo.specs</groupId>
+            <artifactId>geronimo-ejb_2.1_spec</artifactId>
             <version>${geronimo_spec_ejb_version}</version>
             <properties>
                 <geronimo.assemble>repository</geronimo.assemble>
             </properties>
         </dependency>
         <dependency>
-            <groupId>geronimo-spec</groupId>
-            <artifactId>geronimo-spec-j2ee</artifactId>
+            <groupId>org.apache.geronimo.specs</groupId>
+            <artifactId>geronimo-j2ee_1.4_spec</artifactId>
             <version>${geronimo_spec_j2ee_version}</version>
             <properties>
                 <geronimo.assemble>repository</geronimo.assemble>
             </properties>
         </dependency>
         <dependency>
-            <groupId>geronimo-spec</groupId>
-            <artifactId>geronimo-spec-j2ee-connector</artifactId>
+            <groupId>org.apache.geronimo.specs</groupId>
+            <artifactId>geronimo-j2ee-connector_1.5_spec</artifactId>
             <version>${geronimo_spec_j2ee_connector_version}</version>
             <properties>
                 <geronimo.assemble>repository</geronimo.assemble>
             </properties>
         </dependency>
         <dependency>
-            <groupId>geronimo-spec</groupId>
-            <artifactId>geronimo-spec-j2ee-deployment</artifactId>
+            <groupId>org.apache.geronimo.specs</groupId>
+            <artifactId>geronimo-j2ee-deployment_1.1_spec</artifactId>
             <version>${geronimo_spec_j2ee_deployment_version}</version>
             <properties>
                 <geronimo.assemble>repository</geronimo.assemble>
             </properties>
         </dependency>
         <dependency>
-            <groupId>geronimo-spec</groupId>
-            <artifactId>geronimo-spec-j2ee-jacc</artifactId>
+            <groupId>org.apache.geronimo.specs</groupId>
+            <artifactId>geronimo-j2ee-jacc1.0_spec</artifactId>
             <version>${geronimo_spec_j2ee_jacc_version}</version>
             <properties>
                 <geronimo.assemble>repository</geronimo.assemble>
             </properties>
         </dependency>
         <dependency>
-            <groupId>geronimo-spec</groupId>
-            <artifactId>geronimo-spec-j2ee-management</artifactId>
+            <groupId>org.apache.geronimo.specs</groupId>
+            <artifactId>geronimo-j2ee-management_1.0_spec</artifactId>
             <version>${geronimo_spec_j2ee_management_version}</version>
             <properties>
                 <geronimo.assemble>repository</geronimo.assemble>
             </properties>
         </dependency>
         <dependency>
-            <groupId>geronimo-spec</groupId>
-            <artifactId>geronimo-spec-javamail</artifactId>
+            <groupId>org.apache.geronimo.specs</groupId>
+            <artifactId>geronimo-javamail_1.3.1_spec</artifactId>
             <version>${geronimo_spec_javamail_version}</version>
             <properties>
                 <geronimo.assemble>repository</geronimo.assemble>
             </properties>
         </dependency>
         <dependency>
-            <groupId>geronimo-spec</groupId>
-            <artifactId>geronimo-spec-jaxr</artifactId>
+            <groupId>org.apache.geronimo.specs</groupId>
+            <artifactId>geronimo-jaxr1.0_spec</artifactId>
             <version>${geronimo_spec_jaxr_version}</version>
             <properties>
                 <geronimo.assemble>repository</geronimo.assemble>
             </properties>
         </dependency>
         <dependency>
-            <groupId>geronimo-spec</groupId>
-            <artifactId>geronimo-spec-jaxrpc</artifactId>
+            <groupId>org.apache.geronimo.specs</groupId>
+            <artifactId>geronimo-jaxrpc_1.1_spec</artifactId>
             <version>${geronimo_spec_jaxrpc_version}</version>
             <properties>
                 <geronimo.assemble>repository</geronimo.assemble>
             </properties>
         </dependency>
         <dependency>
-            <groupId>geronimo-spec</groupId>
-            <artifactId>geronimo-spec-jms</artifactId>
+            <groupId>org.apache.geronimo.specs</groupId>
+            <artifactId>geronimo-jms_1.1_spec</artifactId>
             <version>${geronimo_spec_jms_version}</version>
             <properties>
                 <geronimo.assemble>repository</geronimo.assemble>
             </properties>
         </dependency>
         <dependency>
-            <groupId>geronimo-spec</groupId>
-            <artifactId>geronimo-spec-jsp</artifactId>
+            <groupId>org.apache.geronimo.specs</groupId>
+            <artifactId>geronimo-jsp_2.0_spec</artifactId>
             <version>${geronimo_spec_jsp_version}</version>
             <properties>
                 <geronimo.assemble>repository</geronimo.assemble>
             </properties>
         </dependency>
         <dependency>
-            <groupId>geronimo-spec</groupId>
-            <artifactId>geronimo-spec-jta</artifactId>
+            <groupId>org.apache.geronimo.specs</groupId>
+            <artifactId>geronimo-jta_1.0.1B_spec</artifactId>
             <version>${geronimo_spec_jta_version}</version>
             <properties>
                 <geronimo.assemble>repository</geronimo.assemble>
             </properties>
         </dependency>
         <dependency>
-            <groupId>geronimo-spec</groupId>
-            <artifactId>geronimo-spec-qname</artifactId>
+            <groupId>org.apache.geronimo.specs</groupId>
+            <artifactId>geronimo-qname_1.1_spec</artifactId>
             <version>${geronimo_spec_qname_version}</version>
             <properties>
                 <geronimo.assemble>repository</geronimo.assemble>
             </properties>
         </dependency>
         <dependency>
-            <groupId>geronimo-spec</groupId>
-            <artifactId>geronimo-spec-saaj</artifactId>
+            <groupId>org.apache.geronimo.specs</groupId>
+            <artifactId>geronimo-saaj_1.1_spec</artifactId>
             <version>${geronimo_spec_saaj_version}</version>
             <properties>
                 <geronimo.assemble>repository</geronimo.assemble>
             </properties>
         </dependency>
         <dependency>
-            <groupId>geronimo-spec</groupId>
-            <artifactId>geronimo-spec-servlet</artifactId>
+            <groupId>org.apache.geronimo.specs</groupId>
+            <artifactId>geronimo-servlet_2.4_spec</artifactId>
             <version>${geronimo_spec_servlet_version}</version>
             <properties>
                 <geronimo.assemble>repository</geronimo.assemble>
@@ -863,7 +863,7 @@
         </dependency>
 
 <!-- geronimo jars -->
-<!-- geronimo-spec jars -->
+<!-- geronimo spec jars -->
 
         <dependency>
             <groupId>howl</groupId>
@@ -1140,32 +1140,32 @@
 
         <!-- Specification dependencies to preload into the repository -->
         <dependency>
-            <groupId>geronimo-spec</groupId>
-            <artifactId>geronimo-spec-j2ee</artifactId>
+            <groupId>org.apache.geronimo.specs</groupId>
+            <artifactId>geronimo-j2ee_1.4_spec</artifactId>
             <version>${geronimo_spec_j2ee_version}</version>
         </dependency>
 
         <dependency>
-            <groupId>geronimo-spec</groupId>
-            <artifactId>geronimo-spec-j2ee-jacc</artifactId>
+            <groupId>org.apache.geronimo.specs</groupId>
+            <artifactId>geronimo-j2ee-jacc1.0_spec</artifactId>
             <version>${geronimo_spec_j2ee_jacc_version}</version>
         </dependency>
 
         <dependency>
-            <groupId>geronimo-spec</groupId>
-            <artifactId>geronimo-spec-activation</artifactId>
+            <groupId>org.apache.geronimo.specs</groupId>
+            <artifactId>geronimo-activation_1.0.2_spec</artifactId>
             <version>${geronimo_spec_activation_version}</version>
         </dependency>
 
         <dependency>
-            <groupId>geronimo-spec</groupId>
-            <artifactId>geronimo-spec-javamail</artifactId>
+            <groupId>org.apache.geronimo.specs</groupId>
+            <artifactId>geronimo-javamail_1.3.1_spec</artifactId>
             <version>${geronimo_spec_javamail_version}</version>
         </dependency>
 
         <dependency>
-            <groupId>geronimo-spec</groupId>
-            <artifactId>geronimo-spec-corba</artifactId>
+            <groupId>org.apache.geronimo.specs</groupId>
+            <artifactId>geronimo-corba_2.3_spec</artifactId>
             <version>${geronimo_spec_corba_version}</version>
         </dependency>
 

Modified: geronimo/trunk/assemblies/j2ee-jetty-server/project.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/assemblies/j2ee-jetty-server/project.xml?rev=355669&r1=355668&r2=355669&view=diff
==============================================================================
--- geronimo/trunk/assemblies/j2ee-jetty-server/project.xml (original)
+++ geronimo/trunk/assemblies/j2ee-jetty-server/project.xml Fri Dec  9 16:53:33 2005
@@ -369,8 +369,8 @@
         </dependency>
 
         <dependency>
-            <groupId>geronimo-spec</groupId>
-            <artifactId>geronimo-spec-qname</artifactId>
+            <groupId>org.apache.geronimo.specs</groupId>
+            <artifactId>geronimo-qname_1.1_spec</artifactId>
             <version>${geronimo_spec_qname_version}</version>
             <properties>
                 <geronimo.assemble>library</geronimo.assemble>
@@ -438,8 +438,8 @@
 
         <!--dependencies for online-deployer --> 
         <dependency>
-            <groupId>geronimo-spec</groupId>
-            <artifactId>geronimo-spec-j2ee-deployment</artifactId>
+            <groupId>org.apache.geronimo.specs</groupId>
+            <artifactId>geronimo-j2ee-deployment_1.1_spec</artifactId>
             <version>${geronimo_spec_j2ee_deployment_version}</version>
             <properties>
                 <geronimo.assemble>library</geronimo.assemble>
@@ -561,136 +561,136 @@
 
         <!-- all our specs.  These should be all included via transitive dependencies but most arent -->
         <dependency>
-            <groupId>geronimo-spec</groupId>
-            <artifactId>geronimo-spec-activation</artifactId>
+            <groupId>org.apache.geronimo.specs</groupId>
+            <artifactId>geronimo-activation_1.0.2_spec</artifactId>
             <version>${geronimo_spec_activation_version}</version>
             <properties>
                 <geronimo.assemble>repository</geronimo.assemble>
             </properties>
         </dependency>
         <dependency>
-            <groupId>geronimo-spec</groupId>
-            <artifactId>geronimo-spec-corba</artifactId>
+            <groupId>org.apache.geronimo.specs</groupId>
+            <artifactId>geronimo-corba_2.3_spec</artifactId>
             <version>${geronimo_spec_corba_version}</version>
             <properties>
                 <geronimo.assemble>repository</geronimo.assemble>
             </properties>
         </dependency>
         <dependency>
-            <groupId>geronimo-spec</groupId>
-            <artifactId>geronimo-spec-ejb</artifactId>
+            <groupId>org.apache.geronimo.specs</groupId>
+            <artifactId>geronimo-ejb_2.1_spec</artifactId>
             <version>${geronimo_spec_ejb_version}</version>
             <properties>
                 <geronimo.assemble>repository</geronimo.assemble>
             </properties>
         </dependency>
         <dependency>
-            <groupId>geronimo-spec</groupId>
-            <artifactId>geronimo-spec-j2ee</artifactId>
+            <groupId>org.apache.geronimo.specs</groupId>
+            <artifactId>geronimo-j2ee_1.4_spec</artifactId>
             <version>${geronimo_spec_j2ee_version}</version>
             <properties>
                 <geronimo.assemble>repository</geronimo.assemble>
             </properties>
         </dependency>
         <dependency>
-            <groupId>geronimo-spec</groupId>
-            <artifactId>geronimo-spec-j2ee-connector</artifactId>
+            <groupId>org.apache.geronimo.specs</groupId>
+            <artifactId>geronimo-j2ee-connector_1.5_spec</artifactId>
             <version>${geronimo_spec_j2ee_connector_version}</version>
             <properties>
                 <geronimo.assemble>repository</geronimo.assemble>
             </properties>
         </dependency>
         <dependency>
-            <groupId>geronimo-spec</groupId>
-            <artifactId>geronimo-spec-j2ee-deployment</artifactId>
+            <groupId>org.apache.geronimo.specs</groupId>
+            <artifactId>geronimo-j2ee-deployment_1.1_spec</artifactId>
             <version>${geronimo_spec_j2ee_deployment_version}</version>
             <properties>
                 <geronimo.assemble>repository</geronimo.assemble>
             </properties>
         </dependency>
         <dependency>
-            <groupId>geronimo-spec</groupId>
-            <artifactId>geronimo-spec-j2ee-jacc</artifactId>
+            <groupId>org.apache.geronimo.specs</groupId>
+            <artifactId>geronimo-j2ee-jacc_1.0_spec</artifactId>
             <version>${geronimo_spec_j2ee_jacc_version}</version>
             <properties>
                 <geronimo.assemble>repository</geronimo.assemble>
             </properties>
         </dependency>
         <dependency>
-            <groupId>geronimo-spec</groupId>
-            <artifactId>geronimo-spec-j2ee-management</artifactId>
+            <groupId>org.apache.geronimo.specs</groupId>
+            <artifactId>geronimo-j2ee-management_1.0_spec</artifactId>
             <version>${geronimo_spec_j2ee_management_version}</version>
             <properties>
                 <geronimo.assemble>repository</geronimo.assemble>
             </properties>
         </dependency>
         <dependency>
-            <groupId>geronimo-spec</groupId>
-            <artifactId>geronimo-spec-javamail</artifactId>
+            <groupId>org.apache.geronimo.specs</groupId>
+            <artifactId>geronimo-javamail_1.3.1_spec</artifactId>
             <version>${geronimo_spec_javamail_version}</version>
             <properties>
                 <geronimo.assemble>repository</geronimo.assemble>
             </properties>
         </dependency>
         <dependency>
-            <groupId>geronimo-spec</groupId>
-            <artifactId>geronimo-spec-jaxr</artifactId>
+            <groupId>org.apache.geronimo.specs</groupId>
+            <artifactId>geronimo-jaxr1.0_spec</artifactId>
             <version>${geronimo_spec_jaxr_version}</version>
             <properties>
                 <geronimo.assemble>repository</geronimo.assemble>
             </properties>
         </dependency>
         <dependency>
-            <groupId>geronimo-spec</groupId>
-            <artifactId>geronimo-spec-jaxrpc</artifactId>
+            <groupId>org.apache.geronimo.specs</groupId>
+            <artifactId>geronimo-jaxrpc_1.1_spec</artifactId>
             <version>${geronimo_spec_jaxrpc_version}</version>
             <properties>
                 <geronimo.assemble>repository</geronimo.assemble>
             </properties>
         </dependency>
         <dependency>
-            <groupId>geronimo-spec</groupId>
-            <artifactId>geronimo-spec-jms</artifactId>
+            <groupId>org.apache.geronimo.specs</groupId>
+            <artifactId>geronimo-jms_1.1_spec</artifactId>
             <version>${geronimo_spec_jms_version}</version>
             <properties>
                 <geronimo.assemble>repository</geronimo.assemble>
             </properties>
         </dependency>
         <dependency>
-            <groupId>geronimo-spec</groupId>
-            <artifactId>geronimo-spec-jsp</artifactId>
+            <groupId>org.apache.geronimo.specs</groupId>
+            <artifactId>geronimo-jsp_2.0_spec</artifactId>
             <version>${geronimo_spec_jsp_version}</version>
             <properties>
                 <geronimo.assemble>repository</geronimo.assemble>
             </properties>
         </dependency>
         <dependency>
-            <groupId>geronimo-spec</groupId>
-            <artifactId>geronimo-spec-jta</artifactId>
+            <groupId>org.apache.geronimo.specs</groupId>
+            <artifactId>geronimo-jta_1.0.1B_spec</artifactId>
             <version>${geronimo_spec_jta_version}</version>
             <properties>
                 <geronimo.assemble>repository</geronimo.assemble>
             </properties>
         </dependency>
         <dependency>
-            <groupId>geronimo-spec</groupId>
-            <artifactId>geronimo-spec-qname</artifactId>
+            <groupId>org.apache.geronimo.specs</groupId>
+            <artifactId>geronimo-qname_1.1_spec</artifactId>
             <version>${geronimo_spec_qname_version}</version>
             <properties>
                 <geronimo.assemble>repository</geronimo.assemble>
             </properties>
         </dependency>
         <dependency>
-            <groupId>geronimo-spec</groupId>
-            <artifactId>geronimo-spec-saaj</artifactId>
+            <groupId>org.apache.geronimo.specs</groupId>
+            <artifactId>geronimo-saaj_1.1_spec</artifactId>
             <version>${geronimo_spec_saaj_version}</version>
             <properties>
                 <geronimo.assemble>repository</geronimo.assemble>
             </properties>
         </dependency>
         <dependency>
-            <groupId>geronimo-spec</groupId>
-            <artifactId>geronimo-spec-servlet</artifactId>
+            <groupId>org.apache.geronimo.specs</groupId>
+            <artifactId>geronimo-servlet_2.4_spec</artifactId>
             <version>${geronimo_spec_servlet_version}</version>
             <properties>
                 <geronimo.assemble>repository</geronimo.assemble>
@@ -849,7 +849,7 @@
         </dependency>
 
 <!-- geronimo jars -->
-<!-- geronimo-spec jars -->
+<!-- geronimo spec jars -->
 
         <dependency>
             <groupId>howl</groupId>
@@ -1124,32 +1124,32 @@
 
         <!-- Specification dependencies to preload into the repository -->
         <dependency>
-            <groupId>geronimo-spec</groupId>
-            <artifactId>geronimo-spec-j2ee</artifactId>
+            <groupId>org.apache.geronimo.specs</groupId>
+            <artifactId>geronimo-j2ee_1.4_spec</artifactId>
             <version>${geronimo_spec_j2ee_version}</version>
         </dependency>
 
         <dependency>
-            <groupId>geronimo-spec</groupId>
-            <artifactId>geronimo-spec-j2ee-jacc</artifactId>
+            <groupId>org.apache.geronimo.specs</groupId>
+            <artifactId>geronimo-j2ee-jacc_1.0_spec</artifactId>
             <version>${geronimo_spec_j2ee_jacc_version}</version>
         </dependency>
 
         <dependency>
-            <groupId>geronimo-spec</groupId>
-            <artifactId>geronimo-spec-activation</artifactId>
+            <groupId>org.apache.geronimo.specs</groupId>
+            <artifactId>geronimo-activation_1.0.2_spec</artifactId>
             <version>${geronimo_spec_activation_version}</version>
         </dependency>
 
         <dependency>
-            <groupId>geronimo-spec</groupId>
-            <artifactId>geronimo-spec-javamail</artifactId>
+            <groupId>org.apache.geronimo.specs</groupId>
+            <artifactId>geronimo-javamail_1.3.1_spec</artifactId>
             <version>${geronimo_spec_javamail_version}</version>
         </dependency>
 
         <dependency>
-            <groupId>geronimo-spec</groupId>
-            <artifactId>geronimo-spec-corba</artifactId>
+            <groupId>org.apache.geronimo.specs</groupId>
+            <artifactId>geronimo-corba_2.3_spec</artifactId>
             <version>${geronimo_spec_corba_version}</version>
         </dependency>
 

Modified: geronimo/trunk/assemblies/j2ee-tomcat-server/project.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/assemblies/j2ee-tomcat-server/project.xml?rev=355669&r1=355668&r2=355669&view=diff
==============================================================================
--- geronimo/trunk/assemblies/j2ee-tomcat-server/project.xml (original)
+++ geronimo/trunk/assemblies/j2ee-tomcat-server/project.xml Fri Dec  9 16:53:33 2005
@@ -368,8 +368,8 @@
         </dependency>
 
         <dependency>
-            <groupId>geronimo-spec</groupId>
-            <artifactId>geronimo-spec-qname</artifactId>
+            <groupId>org.apache.geronimo.specs</groupId>
+            <artifactId>geronimo-qname_1.1_spec</artifactId>
             <version>${geronimo_spec_qname_version}</version>
             <properties>
                 <geronimo.assemble>library</geronimo.assemble>
@@ -439,8 +439,8 @@
 
         <!--dependencies for online-deployer --> 
         <dependency>
-            <groupId>geronimo-spec</groupId>
-            <artifactId>geronimo-spec-j2ee-deployment</artifactId>
+            <groupId>org.apache.geronimo.specs</groupId>
+            <artifactId>geronimo-j2ee-deployment_1.1_spec</artifactId>
             <version>${geronimo_spec_j2ee_deployment_version}</version>
             <properties>
                 <geronimo.assemble>library</geronimo.assemble>
@@ -562,136 +562,136 @@
 
         <!-- all our specs.  These should be all included via transitive dependencies but most arent -->
         <dependency>
-            <groupId>geronimo-spec</groupId>
-            <artifactId>geronimo-spec-activation</artifactId>
+            <groupId>org.apache.geronimo.specs</groupId>
+            <artifactId>geronimo-activation_1.0.2_spec</artifactId>
             <version>${geronimo_spec_activation_version}</version>
             <properties>
                 <geronimo.assemble>repository</geronimo.assemble>
             </properties>
         </dependency>
         <dependency>
-            <groupId>geronimo-spec</groupId>
-            <artifactId>geronimo-spec-corba</artifactId>
+            <groupId>org.apache.geronimo.specs</groupId>
+            <artifactId>geronimo-corba_2.3_spec</artifactId>
             <version>${geronimo_spec_corba_version}</version>
             <properties>
                 <geronimo.assemble>repository</geronimo.assemble>
             </properties>
         </dependency>
         <dependency>
-            <groupId>geronimo-spec</groupId>
-            <artifactId>geronimo-spec-ejb</artifactId>
+            <groupId>org.apache.geronimo.specs</groupId>
+            <artifactId>geronimo-ejb_2.1_spec</artifactId>
             <version>${geronimo_spec_ejb_version}</version>
             <properties>
                 <geronimo.assemble>repository</geronimo.assemble>
             </properties>
         </dependency>
         <dependency>
-            <groupId>geronimo-spec</groupId>
-            <artifactId>geronimo-spec-j2ee</artifactId>
+            <groupId>org.apache.geronimo.specs</groupId>
+            <artifactId>geronimo-j2ee_1.4_spec</artifactId>
             <version>${geronimo_spec_j2ee_version}</version>
             <properties>
                 <geronimo.assemble>repository</geronimo.assemble>
             </properties>
         </dependency>
         <dependency>
-            <groupId>geronimo-spec</groupId>
-            <artifactId>geronimo-spec-j2ee-connector</artifactId>
+            <groupId>org.apache.geronimo.specs</groupId>
+            <artifactId>geronimo-j2ee-connector_1.5_spec</artifactId>
             <version>${geronimo_spec_j2ee_connector_version}</version>
             <properties>
                 <geronimo.assemble>repository</geronimo.assemble>
             </properties>
         </dependency>
         <dependency>
-            <groupId>geronimo-spec</groupId>
-            <artifactId>geronimo-spec-j2ee-deployment</artifactId>
+            <groupId>org.apache.geronimo.specs</groupId>
+            <artifactId>geronimo-j2ee-deployment_1.1_spec</artifactId>
             <version>${geronimo_spec_j2ee_deployment_version}</version>
             <properties>
                 <geronimo.assemble>repository</geronimo.assemble>
             </properties>
         </dependency>
         <dependency>
-            <groupId>geronimo-spec</groupId>
-            <artifactId>geronimo-spec-j2ee-jacc</artifactId>
+            <groupId>org.apache.geronimo.specs</groupId>
+            <artifactId>geronimo-j2ee-jacc_1.0_spec</artifactId>
             <version>${geronimo_spec_j2ee_jacc_version}</version>
             <properties>
                 <geronimo.assemble>repository</geronimo.assemble>
             </properties>
         </dependency>
         <dependency>
-            <groupId>geronimo-spec</groupId>
-            <artifactId>geronimo-spec-j2ee-management</artifactId>
+            <groupId>org.apache.geronimo.specs</groupId>
+            <artifactId>geronimo-j2ee-management_1.0_spec</artifactId>
             <version>${geronimo_spec_j2ee_management_version}</version>
             <properties>
                 <geronimo.assemble>repository</geronimo.assemble>
             </properties>
         </dependency>
         <dependency>
-            <groupId>geronimo-spec</groupId>
-            <artifactId>geronimo-spec-javamail</artifactId>
+            <groupId>org.apache.geronimo.specs</groupId>
+            <artifactId>geronimo-javamail_1.3.1_spec</artifactId>
             <version>${geronimo_spec_javamail_version}</version>
             <properties>
                 <geronimo.assemble>repository</geronimo.assemble>
             </properties>
         </dependency>
         <dependency>
-            <groupId>geronimo-spec</groupId>
-            <artifactId>geronimo-spec-jaxr</artifactId>
+            <groupId>org.apache.geronimo.specs</groupId>
+            <artifactId>geronimo-jaxr1.0_spec</artifactId>
             <version>${geronimo_spec_jaxr_version}</version>
             <properties>
                 <geronimo.assemble>repository</geronimo.assemble>
             </properties>
         </dependency>
         <dependency>
-            <groupId>geronimo-spec</groupId>
-            <artifactId>geronimo-spec-jaxrpc</artifactId>
+            <groupId>org.apache.geronimo.specs</groupId>
+            <artifactId>geronimo-jaxrpc_1.1_spec</artifactId>
             <version>${geronimo_spec_jaxrpc_version}</version>
             <properties>
                 <geronimo.assemble>repository</geronimo.assemble>
             </properties>
         </dependency>
         <dependency>
-            <groupId>geronimo-spec</groupId>
-            <artifactId>geronimo-spec-jms</artifactId>
+            <groupId>org.apache.geronimo.specs</groupId>
+            <artifactId>geronimo-jms_1.1_spec</artifactId>
             <version>${geronimo_spec_jms_version}</version>
             <properties>
                 <geronimo.assemble>repository</geronimo.assemble>
             </properties>
         </dependency>
         <dependency>
-            <groupId>geronimo-spec</groupId>
-            <artifactId>geronimo-spec-jsp</artifactId>
+            <groupId>org.apache.geronimo.specs</groupId>
+            <artifactId>geronimo-jsp_2.0_spec</artifactId>
             <version>${geronimo_spec_jsp_version}</version>
             <properties>
                 <geronimo.assemble>repository</geronimo.assemble>
             </properties>
         </dependency>
         <dependency>
-            <groupId>geronimo-spec</groupId>
-            <artifactId>geronimo-spec-jta</artifactId>
+            <groupId>org.apache.geronimo.specs</groupId>
+            <artifactId>geronimo-jta_1.0.1B_spec</artifactId>
             <version>${geronimo_spec_jta_version}</version>
             <properties>
                 <geronimo.assemble>repository</geronimo.assemble>
             </properties>
         </dependency>
         <dependency>
-            <groupId>geronimo-spec</groupId>
-            <artifactId>geronimo-spec-qname</artifactId>
+            <groupId>org.apache.geronimo.specs</groupId>
+            <artifactId>geronimo-qname_1.1_spec</artifactId>
             <version>${geronimo_spec_qname_version}</version>
             <properties>
                 <geronimo.assemble>repository</geronimo.assemble>
             </properties>
         </dependency>
         <dependency>
-            <groupId>geronimo-spec</groupId>
-            <artifactId>geronimo-spec-saaj</artifactId>
+            <groupId>org.apache.geronimo.specs</groupId>
+            <artifactId>geronimo-saaj_1.1_spec</artifactId>
             <version>${geronimo_spec_saaj_version}</version>
             <properties>
                 <geronimo.assemble>repository</geronimo.assemble>
             </properties>
         </dependency>
         <dependency>
-            <groupId>geronimo-spec</groupId>
-            <artifactId>geronimo-spec-servlet</artifactId>
+            <groupId>org.apache.geronimo.specs</groupId>
+            <artifactId>geronimo-servlet_2.4_spec</artifactId>
             <version>${geronimo_spec_servlet_version}</version>
             <properties>
                 <geronimo.assemble>repository</geronimo.assemble>
@@ -850,7 +850,7 @@
         </dependency>
 
 <!-- geronimo jars -->
-<!-- geronimo-spec jars -->
+<!-- geronimo spec jars -->
 
         <dependency>
             <groupId>howl</groupId>
@@ -1134,32 +1134,32 @@
 
         <!-- Specification dependencies to preload into the repository -->
         <dependency>
-            <groupId>geronimo-spec</groupId>
-            <artifactId>geronimo-spec-j2ee</artifactId>
+            <groupId>org.apache.geronimo.specs</groupId>
+            <artifactId>geronimo-j2ee_1.4_spec</artifactId>
             <version>${geronimo_spec_j2ee_version}</version>
         </dependency>
 
         <dependency>
-            <groupId>geronimo-spec</groupId>
-            <artifactId>geronimo-spec-j2ee-jacc</artifactId>
+            <groupId>org.apache.geronimo.specs</groupId>
+            <artifactId>geronimo-j2ee-jacc_1.0_spec</artifactId>
             <version>${geronimo_spec_j2ee_jacc_version}</version>
         </dependency>
 
         <dependency>
-            <groupId>geronimo-spec</groupId>
-            <artifactId>geronimo-spec-activation</artifactId>
+            <groupId>org.apache.geronimo.specs</groupId>
+            <artifactId>geronimo-activation_1.0.2_spec</artifactId>
             <version>${geronimo_spec_activation_version}</version>
         </dependency>
 
         <dependency>
-            <groupId>geronimo-spec</groupId>
-            <artifactId>geronimo-spec-javamail</artifactId>
+            <groupId>org.apache.geronimo.specs</groupId>
+            <artifactId>geronimo-javamail_1.3.1_spec</artifactId>
             <version>${geronimo_spec_javamail_version}</version>
         </dependency>
 
         <dependency>
-            <groupId>geronimo-spec</groupId>
-            <artifactId>geronimo-spec-corba</artifactId>
+            <groupId>org.apache.geronimo.specs</groupId>
+            <artifactId>geronimo-corba_2.3_spec</artifactId>
             <version>${geronimo_spec_corba_version}</version>
         </dependency>
 

Modified: geronimo/trunk/configs/activemq-broker/project.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/configs/activemq-broker/project.xml?rev=355669&r1=355668&r2=355669&view=diff
==============================================================================
--- geronimo/trunk/configs/activemq-broker/project.xml (original)
+++ geronimo/trunk/configs/activemq-broker/project.xml Fri Dec  9 16:53:33 2005
@@ -62,8 +62,8 @@
         </dependency>
 
         <dependency>
-            <groupId>geronimo-spec</groupId>
-            <artifactId>geronimo-spec-j2ee</artifactId>
+            <groupId>org.apache.geronimo.specs</groupId>
+            <artifactId>geronimo-j2ee_1.4_spec</artifactId>
             <version>${geronimo_spec_j2ee_version}</version>
         </dependency>
 

Modified: geronimo/trunk/configs/activemq/project.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/configs/activemq/project.xml?rev=355669&r1=355668&r2=355669&view=diff
==============================================================================
--- geronimo/trunk/configs/activemq/project.xml (original)
+++ geronimo/trunk/configs/activemq/project.xml Fri Dec  9 16:53:33 2005
@@ -62,8 +62,8 @@
         </dependency>
 
         <dependency>
-            <groupId>geronimo-spec</groupId>
-            <artifactId>geronimo-spec-j2ee</artifactId>
+            <groupId>org.apache.geronimo.specs</groupId>
+            <artifactId>geronimo-j2ee_1.4_spec</artifactId>
             <version>${geronimo_spec_j2ee_version}</version>
         </dependency>
 

Modified: geronimo/trunk/configs/client-corba/project.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/configs/client-corba/project.xml?rev=355669&r1=355668&r2=355669&view=diff
==============================================================================
--- geronimo/trunk/configs/client-corba/project.xml (original)
+++ geronimo/trunk/configs/client-corba/project.xml Fri Dec  9 16:53:33 2005
@@ -62,8 +62,8 @@
         </dependency>
 
         <dependency>
-            <groupId>geronimo-spec</groupId>
-            <artifactId>geronimo-spec-j2ee</artifactId>
+            <groupId>org.apache.geronimo.specs</groupId>
+            <artifactId>geronimo-j2ee_1.4_spec</artifactId>
             <version>${geronimo_spec_j2ee_version}</version>
         </dependency>
 

Modified: geronimo/trunk/configs/client-security/project.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/configs/client-security/project.xml?rev=355669&r1=355668&r2=355669&view=diff
==============================================================================
--- geronimo/trunk/configs/client-security/project.xml (original)
+++ geronimo/trunk/configs/client-security/project.xml Fri Dec  9 16:53:33 2005
@@ -56,8 +56,8 @@
         </dependency>
 
         <dependency>
-            <groupId>geronimo-spec</groupId>
-            <artifactId>geronimo-spec-j2ee</artifactId>
+            <groupId>org.apache.geronimo.specs</groupId>
+            <artifactId>geronimo-j2ee_1.4_spec</artifactId>
             <version>${geronimo_spec_j2ee_version}</version>
         </dependency>
 

Modified: geronimo/trunk/configs/client-system/project.properties
URL: http://svn.apache.org/viewcvs/geronimo/trunk/configs/client-system/project.properties?rev=355669&r1=355668&r2=355669&view=diff
==============================================================================
--- geronimo/trunk/configs/client-system/project.properties (original)
+++ geronimo/trunk/configs/client-system/project.properties Fri Dec  9 16:53:33 2005
@@ -27,7 +27,7 @@
 
 
 geronimo.packaging.classPath= \
-    ../lib/geronimo-spec-qname-${geronimo_spec_qname_version}.jar \
+    ../lib/geronimo-qname_${geronimo_spec_qname_version}_spec.jar \
     ../lib/geronimo-common-${geronimo_version}.jar \
     ../lib/geronimo-kernel-${geronimo_version}.jar \
     ../lib/geronimo-system-${geronimo_version}.jar \

Modified: geronimo/trunk/configs/client-system/project.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/configs/client-system/project.xml?rev=355669&r1=355668&r2=355669&view=diff
==============================================================================
--- geronimo/trunk/configs/client-system/project.xml (original)
+++ geronimo/trunk/configs/client-system/project.xml Fri Dec  9 16:53:33 2005
@@ -110,8 +110,8 @@
              </properties>
         </dependency>
         <dependency>
-            <groupId>geronimo-spec</groupId>
-            <artifactId>geronimo-spec-qname</artifactId>
+            <groupId>org.apache.geronimo.specs</groupId>
+            <artifactId>geronimo-qname_1.1_spec</artifactId>
             <version>${geronimo_spec_qname_version}</version>
             <properties>
                  <geronimo.dependency>true</geronimo.dependency>

Modified: geronimo/trunk/configs/client/project.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/configs/client/project.xml?rev=355669&r1=355668&r2=355669&view=diff
==============================================================================
--- geronimo/trunk/configs/client/project.xml (original)
+++ geronimo/trunk/configs/client/project.xml Fri Dec  9 16:53:33 2005
@@ -55,8 +55,8 @@
         </dependency>
 
         <dependency>
-            <groupId>geronimo-spec</groupId>
-            <artifactId>geronimo-spec-j2ee</artifactId>
+            <groupId>org.apache.geronimo.specs</groupId>
+            <artifactId>geronimo-j2ee_1.4_spec</artifactId>
             <version>${geronimo_spec_j2ee_version}</version>
             <properties>
                  <geronimo.dependency>true</geronimo.dependency>

Modified: geronimo/trunk/configs/console-jetty/project.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/configs/console-jetty/project.xml?rev=355669&r1=355668&r2=355669&view=diff
==============================================================================
--- geronimo/trunk/configs/console-jetty/project.xml (original)
+++ geronimo/trunk/configs/console-jetty/project.xml Fri Dec  9 16:53:33 2005
@@ -222,8 +222,8 @@
         </dependency>
 
         <dependency>
-            <groupId>geronimo-spec</groupId>
-            <artifactId>geronimo-spec-j2ee</artifactId>
+            <groupId>org.apache.geronimo.specs</groupId>
+            <artifactId>geronimo-j2ee_1.4_spec</artifactId>
             <version>${geronimo_spec_j2ee_version}</version>
         </dependency>
 

Modified: geronimo/trunk/configs/console-tomcat/project.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/configs/console-tomcat/project.xml?rev=355669&r1=355668&r2=355669&view=diff
==============================================================================
--- geronimo/trunk/configs/console-tomcat/project.xml (original)
+++ geronimo/trunk/configs/console-tomcat/project.xml Fri Dec  9 16:53:33 2005
@@ -223,8 +223,8 @@
         </dependency>
 
         <dependency>
-            <groupId>geronimo-spec</groupId>
-            <artifactId>geronimo-spec-j2ee</artifactId>
+            <groupId>org.apache.geronimo.specs</groupId>
+            <artifactId>geronimo-j2ee_1.4_spec</artifactId>
             <version>${geronimo_spec_j2ee_version}</version>
         </dependency>
 

Modified: geronimo/trunk/configs/directory/project.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/configs/directory/project.xml?rev=355669&r1=355668&r2=355669&view=diff
==============================================================================
--- geronimo/trunk/configs/directory/project.xml (original)
+++ geronimo/trunk/configs/directory/project.xml Fri Dec  9 16:53:33 2005
@@ -72,8 +72,8 @@
         </dependency>
 
         <dependency>
-            <groupId>geronimo-spec</groupId>
-            <artifactId>geronimo-spec-j2ee</artifactId>
+            <groupId>org.apache.geronimo.specs</groupId>
+            <artifactId>geronimo-j2ee_1.4_spec</artifactId>
             <version>${geronimo_spec_j2ee_version}</version>
         </dependency>
 

Modified: geronimo/trunk/configs/executable-deployer/project.properties
URL: http://svn.apache.org/viewcvs/geronimo/trunk/configs/executable-deployer/project.properties?rev=355669&r1=355668&r2=355669&view=diff
==============================================================================
--- geronimo/trunk/configs/executable-deployer/project.properties (original)
+++ geronimo/trunk/configs/executable-deployer/project.properties Fri Dec  9 16:53:33 2005
@@ -25,7 +25,7 @@
 geronimo.packaging.deploymentConfig=geronimo/geronimo-gbean-deployer/${geronimo_version}/car
 
 geronimo.packaging.classPath= \
-    ../lib/geronimo-spec-qname-${geronimo_spec_qname_version}.jar \
+    ../lib/geronimo-qname_${geronimo_spec_qname_version}_spec.jar \
     ../lib/geronimo-common-${geronimo_version}.jar \
     ../lib/geronimo-kernel-${geronimo_version}.jar \
     ../lib/geronimo-system-${geronimo_version}.jar \

Modified: geronimo/trunk/configs/executable-deployer/project.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/configs/executable-deployer/project.xml?rev=355669&r1=355668&r2=355669&view=diff
==============================================================================
--- geronimo/trunk/configs/executable-deployer/project.xml (original)
+++ geronimo/trunk/configs/executable-deployer/project.xml Fri Dec  9 16:53:33 2005
@@ -84,8 +84,8 @@
             <version>${mx4j_version}</version>
         </dependency>
         <dependency>
-            <groupId>geronimo-spec</groupId>
-            <artifactId>geronimo-spec-qname</artifactId>
+            <groupId>org.apache.geronimo.specs</groupId>
+            <artifactId>geronimo-qname_1.1_spec</artifactId>
             <version>${geronimo_spec_qname_version}</version>
         </dependency>
         <dependency>

Modified: geronimo/trunk/configs/geronimo-gbean-deployer/project.properties
URL: http://svn.apache.org/viewcvs/geronimo/trunk/configs/geronimo-gbean-deployer/project.properties?rev=355669&r1=355668&r2=355669&view=diff
==============================================================================
--- geronimo/trunk/configs/geronimo-gbean-deployer/project.properties (original)
+++ geronimo/trunk/configs/geronimo-gbean-deployer/project.properties Fri Dec  9 16:53:33 2005
@@ -29,7 +29,7 @@
 
 #following is an experiment
 geronimo.packaging.classPath= \
-    ../lib/geronimo-spec-qname-${geronimo_spec_qname_version}.jar \
+    ../lib/geronimo-qname_${geronimo_spec_qname_version}_spec.jar \
     ../lib/geronimo-common-${geronimo_version}.jar \
     ../lib/geronimo-kernel-${geronimo_version}.jar \
     ../lib/geronimo-system-${geronimo_version}.jar \

Modified: geronimo/trunk/configs/hot-deployer/project.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/configs/hot-deployer/project.xml?rev=355669&r1=355668&r2=355669&view=diff
==============================================================================
--- geronimo/trunk/configs/hot-deployer/project.xml (original)
+++ geronimo/trunk/configs/hot-deployer/project.xml Fri Dec  9 16:53:33 2005
@@ -72,8 +72,8 @@
         </dependency>
 
         <dependency>
-            <groupId>geronimo-spec</groupId>
-            <artifactId>geronimo-spec-j2ee-deployment</artifactId>
+            <groupId>org.apache.geronimo.specs</groupId>
+            <artifactId>geronimo-j2ee-deployment_1.1_spec</artifactId>
             <version>${geronimo_spec_j2ee_deployment_version}</version>
             <properties>
                  <geronimo.dependency>true</geronimo.dependency>
@@ -95,8 +95,8 @@
         </dependency>
 
         <dependency>
-            <groupId>geronimo-spec</groupId>
-            <artifactId>geronimo-spec-j2ee</artifactId>
+            <groupId>org.apache.geronimo.specs</groupId>
+            <artifactId>geronimo-j2ee_1.4_spec</artifactId>
             <version>${geronimo_spec_j2ee_version}</version>
         </dependency>
 

Modified: geronimo/trunk/configs/j2ee-corba/project.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/configs/j2ee-corba/project.xml?rev=355669&r1=355668&r2=355669&view=diff
==============================================================================
--- geronimo/trunk/configs/j2ee-corba/project.xml (original)
+++ geronimo/trunk/configs/j2ee-corba/project.xml Fri Dec  9 16:53:33 2005
@@ -62,8 +62,8 @@
         </dependency>
 
         <dependency>
-            <groupId>geronimo-spec</groupId>
-            <artifactId>geronimo-spec-j2ee</artifactId>
+            <groupId>org.apache.geronimo.specs</groupId>
+            <artifactId>geronimo-j2ee_1.4_spec</artifactId>
             <version>${geronimo_spec_j2ee_version}</version>
         </dependency>
 

Modified: geronimo/trunk/configs/j2ee-deployer/project.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/configs/j2ee-deployer/project.xml?rev=355669&r1=355668&r2=355669&view=diff
==============================================================================
--- geronimo/trunk/configs/j2ee-deployer/project.xml (original)
+++ geronimo/trunk/configs/j2ee-deployer/project.xml Fri Dec  9 16:53:33 2005
@@ -110,16 +110,16 @@
 
         <!-- common libraries used by all builders -->
         <dependency>
-            <groupId>geronimo-spec</groupId>
-            <artifactId>geronimo-spec-j2ee</artifactId>
+            <groupId>org.apache.geronimo.specs</groupId>
+            <artifactId>geronimo-j2ee_1.4_spec</artifactId>
             <version>${geronimo_spec_j2ee_version}</version>
             <properties>
                  <geronimo.dependency>true</geronimo.dependency>
              </properties>
         </dependency>
         <dependency>
-            <groupId>geronimo-spec</groupId>
-            <artifactId>geronimo-spec-corba</artifactId>
+            <groupId>org.apache.geronimo.specs</groupId>
+            <artifactId>geronimo-corba_2.3_spec</artifactId>
             <version>${geronimo_spec_corba_version}</version>
             <properties>
                  <geronimo.dependency>true</geronimo.dependency>

Modified: geronimo/trunk/configs/j2ee-security/project.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/configs/j2ee-security/project.xml?rev=355669&r1=355668&r2=355669&view=diff
==============================================================================
--- geronimo/trunk/configs/j2ee-security/project.xml (original)
+++ geronimo/trunk/configs/j2ee-security/project.xml Fri Dec  9 16:53:33 2005
@@ -62,8 +62,8 @@
         </dependency>
 
         <dependency>
-            <groupId>geronimo-spec</groupId>
-            <artifactId>geronimo-spec-j2ee</artifactId>
+            <groupId>org.apache.geronimo.specs</groupId>
+            <artifactId>geronimo-j2ee_1.4_spec</artifactId>
             <version>${geronimo_spec_j2ee_version}</version>
         </dependency>
 

Modified: geronimo/trunk/configs/j2ee-server/project.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/configs/j2ee-server/project.xml?rev=355669&r1=355668&r2=355669&view=diff
==============================================================================
--- geronimo/trunk/configs/j2ee-server/project.xml (original)
+++ geronimo/trunk/configs/j2ee-server/project.xml Fri Dec  9 16:53:33 2005
@@ -240,8 +240,8 @@
         </dependency>
 
         <dependency>
-            <groupId>geronimo-spec</groupId>
-            <artifactId>geronimo-spec-j2ee</artifactId>
+            <groupId>org.apache.geronimo.specs</groupId>
+            <artifactId>geronimo-j2ee_1.4_spec</artifactId>
             <version>${geronimo_spec_j2ee_version}</version>
         </dependency>
 

Modified: geronimo/trunk/configs/j2ee-system/project.properties
URL: http://svn.apache.org/viewcvs/geronimo/trunk/configs/j2ee-system/project.properties?rev=355669&r1=355668&r2=355669&view=diff
==============================================================================
--- geronimo/trunk/configs/j2ee-system/project.properties (original)
+++ geronimo/trunk/configs/j2ee-system/project.properties Fri Dec  9 16:53:33 2005
@@ -25,7 +25,7 @@
 geronimo.packaging.deploymentConfig=geronimo/geronimo-gbean-deployer/${geronimo_version}/car
 
 geronimo.packaging.classPath= \
-    ../lib/geronimo-spec-qname-${geronimo_spec_qname_version}.jar \
+    ../lib/geronimo-qname_${geronimo_spec_qname_version}_spec.jar \
     ../lib/geronimo-common-${geronimo_version}.jar \
     ../lib/geronimo-kernel-${geronimo_version}.jar \
     ../lib/geronimo-system-${geronimo_version}.jar \

Modified: geronimo/trunk/configs/j2ee-system/project.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/configs/j2ee-system/project.xml?rev=355669&r1=355668&r2=355669&view=diff
==============================================================================
--- geronimo/trunk/configs/j2ee-system/project.xml (original)
+++ geronimo/trunk/configs/j2ee-system/project.xml Fri Dec  9 16:53:33 2005
@@ -110,8 +110,8 @@
              </properties>
         </dependency>
         <dependency>
-            <groupId>geronimo-spec</groupId>
-            <artifactId>geronimo-spec-qname</artifactId>
+            <groupId>org.apache.geronimo.specs</groupId>
+            <artifactId>geronimo-qname_1.1_spec</artifactId>
             <version>${geronimo_spec_qname_version}</version>
             <properties>
                  <geronimo.dependency>true</geronimo.dependency>

Modified: geronimo/trunk/configs/jetty-deployer/project.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/configs/jetty-deployer/project.xml?rev=355669&r1=355668&r2=355669&view=diff
==============================================================================
--- geronimo/trunk/configs/jetty-deployer/project.xml (original)
+++ geronimo/trunk/configs/jetty-deployer/project.xml Fri Dec  9 16:53:33 2005
@@ -69,8 +69,8 @@
         </dependency>
 
         <dependency>
-            <groupId>geronimo-spec</groupId>
-            <artifactId>geronimo-spec-j2ee</artifactId>
+            <groupId>org.apache.geronimo.specs</groupId>
+            <artifactId>geronimo-j2ee_1.4_spec</artifactId>
             <version>${geronimo_spec_j2ee_version}</version>
         </dependency>
 

Modified: geronimo/trunk/configs/jetty/project.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/configs/jetty/project.xml?rev=355669&r1=355668&r2=355669&view=diff
==============================================================================
--- geronimo/trunk/configs/jetty/project.xml (original)
+++ geronimo/trunk/configs/jetty/project.xml Fri Dec  9 16:53:33 2005
@@ -73,8 +73,8 @@
         </dependency>
 
         <dependency>
-            <groupId>geronimo-spec</groupId>
-            <artifactId>geronimo-spec-j2ee</artifactId>
+            <groupId>org.apache.geronimo.specs</groupId>
+            <artifactId>geronimo-j2ee_1.4_spec</artifactId>
             <version>${geronimo_spec_j2ee_version}</version>
         </dependency>
 

Modified: geronimo/trunk/configs/jsp-examples-jetty/project.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/configs/jsp-examples-jetty/project.xml?rev=355669&r1=355668&r2=355669&view=diff
==============================================================================
--- geronimo/trunk/configs/jsp-examples-jetty/project.xml (original)
+++ geronimo/trunk/configs/jsp-examples-jetty/project.xml Fri Dec  9 16:53:33 2005
@@ -73,8 +73,8 @@
         </dependency>
 
         <dependency>
-            <groupId>geronimo-spec</groupId>
-            <artifactId>geronimo-spec-j2ee</artifactId>
+            <groupId>org.apache.geronimo.specs</groupId>
+            <artifactId>geronimo-j2ee_1.4_spec</artifactId>
             <version>${geronimo_spec_j2ee_version}</version>
         </dependency>
 

Modified: geronimo/trunk/configs/jsp-examples-tomcat/project.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/configs/jsp-examples-tomcat/project.xml?rev=355669&r1=355668&r2=355669&view=diff
==============================================================================
--- geronimo/trunk/configs/jsp-examples-tomcat/project.xml (original)
+++ geronimo/trunk/configs/jsp-examples-tomcat/project.xml Fri Dec  9 16:53:33 2005
@@ -73,8 +73,8 @@
         </dependency>
 
         <dependency>
-            <groupId>geronimo-spec</groupId>
-            <artifactId>geronimo-spec-j2ee</artifactId>
+            <groupId>org.apache.geronimo.specs</groupId>
+            <artifactId>geronimo-j2ee_1.4_spec</artifactId>
             <version>${geronimo_spec_j2ee_version}</version>
         </dependency>
 

Modified: geronimo/trunk/configs/online-deployer/project.properties
URL: http://svn.apache.org/viewcvs/geronimo/trunk/configs/online-deployer/project.properties?rev=355669&r1=355668&r2=355669&view=diff
==============================================================================
--- geronimo/trunk/configs/online-deployer/project.properties (original)
+++ geronimo/trunk/configs/online-deployer/project.properties Fri Dec  9 16:53:33 2005
@@ -29,7 +29,7 @@
     ../lib/geronimo-kernel-${geronimo_version}.jar \
     ../lib/geronimo-system-${geronimo_version}.jar \
     ../lib/geronimo-util-${geronimo_version}.jar \
-    ../lib/geronimo-spec-j2ee-deployment-${geronimo_spec_j2ee_deployment_version}.jar \
+    ../lib/geronimo-j2ee-deployment_${geronimo_spec_j2ee_deployment_version}_spec.jar \
     ../lib/cglib-nodep-${cglib_version}.jar \
     ../lib/commons-cli-${commons_cli_version}.jar \
     ../lib/commons-logging-${commons_logging_version}.jar \

Modified: geronimo/trunk/configs/online-deployer/project.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/configs/online-deployer/project.xml?rev=355669&r1=355668&r2=355669&view=diff
==============================================================================
--- geronimo/trunk/configs/online-deployer/project.xml (original)
+++ geronimo/trunk/configs/online-deployer/project.xml Fri Dec  9 16:53:33 2005
@@ -54,8 +54,8 @@
         <!-- Module Dependencies -->
 
         <dependency>
-            <groupId>geronimo-spec</groupId>
-            <artifactId>geronimo-spec-j2ee-deployment</artifactId>
+            <groupId>org.apache.geronimo.specs</groupId>
+            <artifactId>geronimo-j2ee-deployment_1.1_spec</artifactId>
             <version>${geronimo_spec_j2ee_deployment_version}</version>
         </dependency>
 

Modified: geronimo/trunk/configs/rmi-naming/project.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/configs/rmi-naming/project.xml?rev=355669&r1=355668&r2=355669&view=diff
==============================================================================
--- geronimo/trunk/configs/rmi-naming/project.xml (original)
+++ geronimo/trunk/configs/rmi-naming/project.xml Fri Dec  9 16:53:33 2005
@@ -66,8 +66,8 @@
              </properties>
         </dependency>
         <dependency>
-            <groupId>geronimo-spec</groupId>
-            <artifactId>geronimo-spec-j2ee</artifactId>
+            <groupId>org.apache.geronimo.specs</groupId>
+            <artifactId>geronimo-j2ee_1.4_spec</artifactId>
             <version>${geronimo_spec_j2ee_version}</version>
             <properties>
                  <geronimo.dependency>true</geronimo.dependency>

Modified: geronimo/trunk/configs/servlets-examples-jetty/project.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/configs/servlets-examples-jetty/project.xml?rev=355669&r1=355668&r2=355669&view=diff
==============================================================================
--- geronimo/trunk/configs/servlets-examples-jetty/project.xml (original)
+++ geronimo/trunk/configs/servlets-examples-jetty/project.xml Fri Dec  9 16:53:33 2005
@@ -73,8 +73,8 @@
         </dependency>
 
         <dependency>
-            <groupId>geronimo-spec</groupId>
-            <artifactId>geronimo-spec-j2ee</artifactId>
+            <groupId>org.apache.geronimo.specs</groupId>
+            <artifactId>geronimo-j2ee_1.4_spec</artifactId>
             <version>${geronimo_spec_j2ee_version}</version>
         </dependency>
 

Modified: geronimo/trunk/configs/servlets-examples-tomcat/project.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/configs/servlets-examples-tomcat/project.xml?rev=355669&r1=355668&r2=355669&view=diff
==============================================================================
--- geronimo/trunk/configs/servlets-examples-tomcat/project.xml (original)
+++ geronimo/trunk/configs/servlets-examples-tomcat/project.xml Fri Dec  9 16:53:33 2005
@@ -73,8 +73,8 @@
         </dependency>
 
         <dependency>
-            <groupId>geronimo-spec</groupId>
-            <artifactId>geronimo-spec-j2ee</artifactId>
+            <groupId>org.apache.geronimo.specs</groupId>
+            <artifactId>geronimo-j2ee_1.4_spec</artifactId>
             <version>${geronimo_spec_j2ee_version}</version>
         </dependency>
 

Modified: geronimo/trunk/configs/system-database/project.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/configs/system-database/project.xml?rev=355669&r1=355668&r2=355669&view=diff
==============================================================================
--- geronimo/trunk/configs/system-database/project.xml (original)
+++ geronimo/trunk/configs/system-database/project.xml Fri Dec  9 16:53:33 2005
@@ -102,8 +102,8 @@
         </dependency>
 
         <dependency>
-            <groupId>geronimo-spec</groupId>
-            <artifactId>geronimo-spec-j2ee</artifactId>
+            <groupId>org.apache.geronimo.specs</groupId>
+            <artifactId>geronimo-j2ee_1.4_spec</artifactId>
             <version>${geronimo_spec_j2ee_version}</version>
         </dependency>
 

Modified: geronimo/trunk/configs/tomcat-deployer/project.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/configs/tomcat-deployer/project.xml?rev=355669&r1=355668&r2=355669&view=diff
==============================================================================
--- geronimo/trunk/configs/tomcat-deployer/project.xml (original)
+++ geronimo/trunk/configs/tomcat-deployer/project.xml Fri Dec  9 16:53:33 2005
@@ -70,8 +70,8 @@
         </dependency>
 
         <dependency>
-            <groupId>geronimo-spec</groupId>
-            <artifactId>geronimo-spec-j2ee</artifactId>
+            <groupId>org.apache.geronimo.specs</groupId>
+            <artifactId>geronimo-j2ee_1.4_spec</artifactId>
             <version>${geronimo_spec_j2ee_version}</version>
         </dependency>
 

Modified: geronimo/trunk/configs/tomcat/project.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/configs/tomcat/project.xml?rev=355669&r1=355668&r2=355669&view=diff
==============================================================================
--- geronimo/trunk/configs/tomcat/project.xml (original)
+++ geronimo/trunk/configs/tomcat/project.xml Fri Dec  9 16:53:33 2005
@@ -60,8 +60,8 @@
         </dependency>
 
         <dependency>
-            <groupId>geronimo-spec</groupId>
-            <artifactId>geronimo-spec-j2ee</artifactId>
+            <groupId>org.apache.geronimo.specs</groupId>
+            <artifactId>geronimo-j2ee_1.4_spec</artifactId>
             <version>${geronimo_spec_j2ee_version}</version>
         </dependency>
 

Modified: geronimo/trunk/configs/uddi-jetty/project.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/configs/uddi-jetty/project.xml?rev=355669&r1=355668&r2=355669&view=diff
==============================================================================
--- geronimo/trunk/configs/uddi-jetty/project.xml (original)
+++ geronimo/trunk/configs/uddi-jetty/project.xml Fri Dec  9 16:53:33 2005
@@ -108,8 +108,8 @@
         </dependency>
 
         <dependency>
-            <groupId>geronimo-spec</groupId>
-            <artifactId>geronimo-spec-j2ee</artifactId>
+            <groupId>org.apache.geronimo.specs</groupId>
+            <artifactId>geronimo-j2ee_1.4_spec</artifactId>
             <version>${geronimo_spec_j2ee_version}</version>
         </dependency>
 

Modified: geronimo/trunk/configs/uddi-tomcat/project.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/configs/uddi-tomcat/project.xml?rev=355669&r1=355668&r2=355669&view=diff
==============================================================================
--- geronimo/trunk/configs/uddi-tomcat/project.xml (original)
+++ geronimo/trunk/configs/uddi-tomcat/project.xml Fri Dec  9 16:53:33 2005
@@ -123,8 +123,8 @@
         </dependency>
 
         <dependency>
-            <groupId>geronimo-spec</groupId>
-            <artifactId>geronimo-spec-j2ee</artifactId>
+            <groupId>org.apache.geronimo.specs</groupId>
+            <artifactId>geronimo-j2ee_1.4_spec</artifactId>
             <version>${geronimo_spec_j2ee_version}</version>
         </dependency>
 

Modified: geronimo/trunk/configs/welcome-jetty/project.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/configs/welcome-jetty/project.xml?rev=355669&r1=355668&r2=355669&view=diff
==============================================================================
--- geronimo/trunk/configs/welcome-jetty/project.xml (original)
+++ geronimo/trunk/configs/welcome-jetty/project.xml Fri Dec  9 16:53:33 2005
@@ -73,8 +73,8 @@
         </dependency>
 
         <dependency>
-            <groupId>geronimo-spec</groupId>
-            <artifactId>geronimo-spec-j2ee</artifactId>
+            <groupId>org.apache.geronimo.specs</groupId>
+            <artifactId>geronimo-j2ee_1.4_spec</artifactId>
             <version>${geronimo_spec_j2ee_version}</version>
         </dependency>
 

Modified: geronimo/trunk/configs/welcome-tomcat/project.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/configs/welcome-tomcat/project.xml?rev=355669&r1=355668&r2=355669&view=diff
==============================================================================
--- geronimo/trunk/configs/welcome-tomcat/project.xml (original)
+++ geronimo/trunk/configs/welcome-tomcat/project.xml Fri Dec  9 16:53:33 2005
@@ -73,8 +73,8 @@
         </dependency>
 
         <dependency>
-            <groupId>geronimo-spec</groupId>
-            <artifactId>geronimo-spec-j2ee</artifactId>
+            <groupId>org.apache.geronimo.specs</groupId>
+            <artifactId>geronimo-j2ee_1.4_spec</artifactId>
             <version>${geronimo_spec_j2ee_version}</version>
         </dependency>
 

Modified: geronimo/trunk/etc/project.properties
URL: http://svn.apache.org/viewcvs/geronimo/trunk/etc/project.properties?rev=355669&r1=355668&r2=355669&view=diff
==============================================================================
--- geronimo/trunk/etc/project.properties (original)
+++ geronimo/trunk/etc/project.properties Fri Dec  9 16:53:33 2005
@@ -86,24 +86,24 @@
 tranql_connector_version=1.1-SNAPSHOT
 tranql_vendors_version=1.1-SNAPSHOT
 
-geronimo_spec_activation_version=1.0.2-rc4
-geronimo_spec_corba_version=2.3-rc4
-geronimo_spec_ejb_version=2.1-rc4
-geronimo_spec_j2ee_version=1.4-rc4
-geronimo_spec_j2ee_connector_version=1.5-rc4
-geronimo_spec_j2ee_deployment_version=1.1-rc4
-geronimo_spec_j2ee_jacc_version=1.0-rc5
-geronimo_spec_j2ee_management_version=1.0-rc4
-geronimo_spec_javamail_version=1.3.1-rc6
-geronimo_spec_jaxr_version=1.0-rc4
-geronimo_spec_jaxrpc_version=1.1-rc4
-geronimo_spec_jcache_version=1.0-rc1
-geronimo_spec_jms_version=1.1-rc4
-geronimo_spec_jsp_version=2.0-rc4
-geronimo_spec_jta_version=1.0.1B-rc4
-geronimo_spec_qname_version=1.1-rc4
-geronimo_spec_saaj_version=1.1-rc4
-geronimo_spec_servlet_version=2.4-rc4
+geronimo_spec_activation_version=1.0
+geronimo_spec_corba_version=1.0
+geronimo_spec_ejb_version=1.0
+geronimo_spec_j2ee_version=1.0
+geronimo_spec_j2ee_connector_version=1.0
+geronimo_spec_j2ee_deployment_version=1.0
+geronimo_spec_j2ee_jacc_version=1.0
+geronimo_spec_j2ee_management_version=1.0
+geronimo_spec_javamail_version=1.0
+geronimo_spec_jaxr_version=1.0
+geronimo_spec_jaxrpc_version=1.0
+geronimo_spec_jcache_version=1.0
+geronimo_spec_jms_version=1.0
+geronimo_spec_jsp_version=1.0
+geronimo_spec_jta_version=1.0
+geronimo_spec_qname_version=1.0
+geronimo_spec_saaj_version=1.0
+geronimo_spec_servlet_version=1.0
 
 ant_version=1.6.5
 antlr_version=2.7.2

Modified: geronimo/trunk/maven.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/maven.xml?rev=355669&r1=355668&r2=355669&view=diff
==============================================================================
--- geronimo/trunk/maven.xml (original)
+++ geronimo/trunk/maven.xml Fri Dec  9 16:53:33 2005
@@ -93,7 +93,7 @@
        |    Same as m:clean m:default
        |
        | m:rebuild-all
-       |    Same as m:clean m:clean-repo m:default and it includes geronimo-spec modules
+       |    Same as m:clean m:clean-repo m:default and it includes geronimo spec modules
        |
        | m:checkout or m:co
        |    Checks out ActiveMQ, OpenEJB, and TranQL
@@ -147,16 +147,10 @@
         </j:forEach>
     </goal>
 
-    <goal name="m:-all">
-        <!-- only include geronimo-spec when doeing a -all -->
-        <j:set var="maven.multiproject.includes" value="${maven.multiproject.includes},specs/*/project.xml"/>
-        <j:set var="geronimo.all" value="true"/>
-    </goal>
-
-    <goal name="m:rebuild-all" prereqs="m:-all,m:clean,m:clean-repo,m:default"/>
+    <goal name="m:rebuild-all" prereqs="m:clean,m:clean-repo,m:default"/>
     <goal name="m:rebuild" prereqs="m:clean,m:default"/>
 
-    <goal name="m:build-all" prereqs="m:-all,m:default"/>
+    <goal name="m:build-all" prereqs="m:default"/>
     <goal name="m:build" prereqs="m:default"/>
     <goal name="m:default" prereqs="m:init">
         <!-- don't run the active mq tests they take way too long and don't complete successfully -->
@@ -168,7 +162,7 @@
         <attainGoal name="multiproject:goal"/>
     </goal>
 
-    <goal name="m:clean-all" prereqs="m:-all,m:clean"/>
+    <goal name="m:clean-all" prereqs="m:clean"/>
     <goal name="m:clean" prereqs="m:init">
         <u:tokenize var="directories" delim=",">${modules.directories}</u:tokenize>
         <j:forEach var="directory" items="${directories}">
@@ -204,7 +198,7 @@
         <!--<delete dir="${maven.repo.local}/tranql"/>-->
         <!-- AMM: specs are no longer in main tree
         <j:if test="${context.getVariable('geronimo.all') == 'true'}">
-            <delete dir="${maven.repo.local}/geronimo-spec"/>
+            <delete dir="${maven.repo.local}/org.apache.geronimo.specs"/>
         </j:if>
         -->
     </goal>

Modified: geronimo/trunk/modules/activation/pom.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/activation/pom.xml?rev=355669&r1=355668&r2=355669&view=diff
==============================================================================
--- geronimo/trunk/modules/activation/pom.xml (original)
+++ geronimo/trunk/modules/activation/pom.xml Fri Dec  9 16:53:33 2005
@@ -11,11 +11,11 @@
   <dependencies>
     <dependency>
       <groupId>org.apache.geronimo.specs</groupId>
-      <artifactId>geronimo-spec-activation</artifactId>
+      <artifactId>geronimo-activation_1.0.2_spec</artifactId>
     </dependency>
     <dependency>
       <groupId>org.apache.geronimo.specs</groupId>
-      <artifactId>geronimo-spec-javamail</artifactId>
+      <artifactId>geronimo-javamail_1.3.1_spec</artifactId>
     </dependency>    
   </dependencies>
 </project>

Modified: geronimo/trunk/modules/activation/project.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/activation/project.xml?rev=355669&r1=355668&r2=355669&view=diff
==============================================================================
--- geronimo/trunk/modules/activation/project.xml (original)
+++ geronimo/trunk/modules/activation/project.xml Fri Dec  9 16:53:33 2005
@@ -47,14 +47,14 @@
     <dependencies>
 
         <dependency>
-            <groupId>geronimo-spec</groupId>
-            <artifactId>geronimo-spec-activation</artifactId>
+            <groupId>org.apache.geronimo.specs</groupId>
+            <artifactId>geronimo-activation_1.0.2_spec</artifactId>
             <version>${geronimo_spec_activation_version}</version>
         </dependency>
 
         <dependency>
-            <groupId>geronimo-spec</groupId>
-            <artifactId>geronimo-spec-javamail</artifactId>
+            <groupId>org.apache.geronimo.specs</groupId>
+            <artifactId>geronimo-javamail_1.3.1_spec</artifactId>
             <version>${geronimo_spec_javamail_version}</version>
         </dependency>
 

Modified: geronimo/trunk/modules/axis-builder/project.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/axis-builder/project.xml?rev=355669&r1=355668&r2=355669&view=diff
==============================================================================
--- geronimo/trunk/modules/axis-builder/project.xml (original)
+++ geronimo/trunk/modules/axis-builder/project.xml Fri Dec  9 16:53:33 2005
@@ -64,20 +64,20 @@
 
         <!-- Module Dependencies -->
         <dependency>
-            <groupId>geronimo-spec</groupId>
-            <artifactId>geronimo-spec-jaxrpc</artifactId>
+            <groupId>org.apache.geronimo.specs</groupId>
+            <artifactId>geronimo-jaxrpc_1.1_spec</artifactId>
             <version>${geronimo_spec_jaxrpc_version}</version>
         </dependency>
 
         <dependency>
-            <groupId>geronimo-spec</groupId>
-            <artifactId>geronimo-spec-saaj</artifactId>
+            <groupId>org.apache.geronimo.specs</groupId>
+            <artifactId>geronimo-saaj_1.1_spec</artifactId>
             <version>${geronimo_spec_saaj_version}</version>
         </dependency>
 
         <dependency>
-            <groupId>geronimo-spec</groupId>
-            <artifactId>geronimo-spec-qname</artifactId>
+            <groupId>org.apache.geronimo.specs</groupId>
+            <artifactId>geronimo-qname_1.1_spec</artifactId>
             <version>${geronimo_spec_qname_version}</version>
         </dependency>
 
@@ -190,8 +190,8 @@
         </dependency>
 
         <dependency>
-            <groupId>geronimo-spec</groupId>
-            <artifactId>geronimo-spec-jta</artifactId>
+            <groupId>org.apache.geronimo.specs</groupId>
+            <artifactId>geronimo-jta_1.0.1B_spec</artifactId>
             <version>${geronimo_spec_jta_version}</version>
         </dependency>
 

Modified: geronimo/trunk/modules/axis/project.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/axis/project.xml?rev=355669&r1=355668&r2=355669&view=diff
==============================================================================
--- geronimo/trunk/modules/axis/project.xml (original)
+++ geronimo/trunk/modules/axis/project.xml Fri Dec  9 16:53:33 2005
@@ -63,32 +63,32 @@
         </dependency>
 
         <dependency>
-            <groupId>geronimo-spec</groupId>
-            <artifactId>geronimo-spec-ejb</artifactId>
+            <groupId>org.apache.geronimo.specs</groupId>
+            <artifactId>geronimo-ejb_2.1_spec</artifactId>
             <version>${geronimo_spec_ejb_version}</version>
         </dependency>
 
         <dependency>
-            <groupId>geronimo-spec</groupId>
-            <artifactId>geronimo-spec-jaxrpc</artifactId>
+            <groupId>org.apache.geronimo.specs</groupId>
+            <artifactId>geronimo-jaxrpc_1.1_spec</artifactId>
             <version>${geronimo_spec_jaxrpc_version}</version>
         </dependency>
 
         <dependency>
-            <groupId>geronimo-spec</groupId>
-            <artifactId>geronimo-spec-qname</artifactId>
+            <groupId>org.apache.geronimo.specs</groupId>
+            <artifactId>geronimo-qname_1.1_spec</artifactId>
             <version>${geronimo_spec_qname_version}</version>
         </dependency>
 
         <dependency>
-            <groupId>geronimo-spec</groupId>
-            <artifactId>geronimo-spec-saaj</artifactId>
+            <groupId>org.apache.geronimo.specs</groupId>
+            <artifactId>geronimo-saaj_1.1_spec</artifactId>
             <version>${geronimo_spec_saaj_version}</version>
         </dependency>
 
         <dependency>
-            <groupId>geronimo-spec</groupId>
-            <artifactId>geronimo-spec-servlet</artifactId>
+            <groupId>org.apache.geronimo.specs</groupId>
+            <artifactId>geronimo-servlet_2.4_spec</artifactId>
             <version>${geronimo_spec_servlet_version}</version>
         </dependency>
 

Modified: geronimo/trunk/modules/client-builder/project.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/client-builder/project.xml?rev=355669&r1=355668&r2=355669&view=diff
==============================================================================
--- geronimo/trunk/modules/client-builder/project.xml (original)
+++ geronimo/trunk/modules/client-builder/project.xml Fri Dec  9 16:53:33 2005
@@ -174,8 +174,8 @@
         </dependency>
 
         <dependency>
-            <groupId>geronimo-spec</groupId>
-            <artifactId>geronimo-spec-jta</artifactId>
+            <groupId>org.apache.geronimo.specs</groupId>
+            <artifactId>geronimo-jta_1.0.1B_spec</artifactId>
             <version>${geronimo_spec_jta_version}</version>
         </dependency>
 

Modified: geronimo/trunk/modules/client/project.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/client/project.xml?rev=355669&r1=355668&r2=355669&view=diff
==============================================================================
--- geronimo/trunk/modules/client/project.xml (original)
+++ geronimo/trunk/modules/client/project.xml Fri Dec  9 16:53:33 2005
@@ -85,14 +85,14 @@
          </dependency>
 
         <dependency>
-            <groupId>geronimo-spec</groupId>
-            <artifactId>geronimo-spec-jta</artifactId>
+            <groupId>org.apache.geronimo.specs</groupId>
+            <artifactId>geronimo-jta_1.0.1B_spec</artifactId>
             <version>${geronimo_spec_jta_version}</version>
         </dependency>
 
         <dependency>
-            <groupId>geronimo-spec</groupId>
-            <artifactId>geronimo-spec-j2ee-connector</artifactId>
+            <groupId>org.apache.geronimo.specs</groupId>
+            <artifactId>geronimo-j2ee-connector_1.5_spec</artifactId>
             <version>${geronimo_spec_j2ee_connector_version}</version>
         </dependency>