geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From djen...@apache.org
Subject svn commit: r604751 - in /geronimo/server/trunk: framework/configs/jee-specs/ framework/modules/geronimo-system/src/main/java/org/apache/geronimo/system/plugin/ plugins/axis/axis-deployer/ plugins/axis2/axis2-deployer/ plugins/axis2/axis2-ejb-deployer/...
Date Mon, 17 Dec 2007 00:15:58 GMT
Author: djencks
Date: Sun Dec 16 16:15:55 2007
New Revision: 604751

URL: http://svn.apache.org/viewvc?rev=604751&view=rev
Log:
GERONIMO-3607  Remove a lot of versions, resolve versions appropriately during export

Modified:
    geronimo/server/trunk/framework/configs/jee-specs/pom.xml
    geronimo/server/trunk/framework/modules/geronimo-system/src/main/java/org/apache/geronimo/system/plugin/GeronimoSourceRepository.java
    geronimo/server/trunk/framework/modules/geronimo-system/src/main/java/org/apache/geronimo/system/plugin/PluginInstallerGBean.java
    geronimo/server/trunk/plugins/axis/axis-deployer/pom.xml
    geronimo/server/trunk/plugins/axis2/axis2-deployer/pom.xml
    geronimo/server/trunk/plugins/axis2/axis2-ejb-deployer/pom.xml
    geronimo/server/trunk/plugins/client/client-deployer/pom.xml
    geronimo/server/trunk/plugins/connector/connector-deployer/pom.xml
    geronimo/server/trunk/plugins/corba/openejb-corba-deployer/pom.xml
    geronimo/server/trunk/plugins/cxf/cxf-deployer/pom.xml
    geronimo/server/trunk/plugins/cxf/cxf-ejb-deployer/pom.xml
    geronimo/server/trunk/plugins/j2ee/j2ee-server/pom.xml
    geronimo/server/trunk/plugins/j2ee/jsr88-ear-configurer/pom.xml
    geronimo/server/trunk/plugins/j2ee/jsr88-jar-configurer/pom.xml
    geronimo/server/trunk/plugins/j2ee/jsr88-rar-configurer/pom.xml
    geronimo/server/trunk/plugins/j2ee/jsr88-war-configurer/pom.xml
    geronimo/server/trunk/plugins/jasper/jasper-deployer/pom.xml
    geronimo/server/trunk/plugins/jetty/jetty6-deployer/pom.xml
    geronimo/server/trunk/plugins/jetty/jetty6/pom.xml
    geronimo/server/trunk/plugins/myfaces/myfaces-deployer/pom.xml
    geronimo/server/trunk/plugins/openejb/openejb-deployer/pom.xml
    geronimo/server/trunk/plugins/openjpa/persistence-jpa10-deployer/pom.xml
    geronimo/server/trunk/plugins/tomcat/tomcat6-deployer/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=604751&r1=604750&r2=604751&view=diff
==============================================================================
--- geronimo/server/trunk/framework/configs/jee-specs/pom.xml (original)
+++ geronimo/server/trunk/framework/configs/jee-specs/pom.xml Sun Dec 16 16:15:55 2007
@@ -178,7 +178,6 @@
             <artifactId>j2ee-system</artifactId>
             <version>${version}</version>
             <type>car</type>
-            <scope>provided</scope>
         </dependency>
         <!-- build order hint -->
         <dependency>
@@ -210,140 +209,117 @@
                         <dependency>
                             <groupId>org.apache.geronimo.configs</groupId>
                             <artifactId>j2ee-system</artifactId>
-                            <version>${version}</version>
                             <type>car</type>
                             <import>classes</import>
                         </dependency>
                         <dependency>
                             <groupId>org.apache.geronimo.specs</groupId>
                             <artifactId>geronimo-activation_1.1_spec</artifactId>
-                            <version>1.0.1</version>
                             <type>jar</type>
                         </dependency>
                         <dependency>
                             <groupId>org.apache.geronimo.specs</groupId>
                             <artifactId>geronimo-annotation_1.0_spec</artifactId>
-                            <version>1.1</version>
                             <type>jar</type>
                         </dependency>
                         <dependency>
                             <groupId>org.apache.geronimo.specs</groupId>
                             <artifactId>geronimo-ejb_3.0_spec</artifactId>
-                            <version>1.0</version>
                             <type>jar</type>
                         </dependency>
                         <dependency>
                             <groupId>org.apache.geronimo.specs</groupId>
                             <artifactId>geronimo-el_1.0_spec</artifactId>
-                            <version>1.0</version>
                             <type>jar</type>
                         </dependency>
                         <dependency>
                             <groupId>org.apache.geronimo.specs</groupId>
                             <artifactId>geronimo-interceptor_3.0_spec</artifactId>
-                            <version>1.0</version>
                             <type>jar</type>
                         </dependency>
                         <dependency>
                             <groupId>org.apache.geronimo.specs</groupId>
                             <artifactId>geronimo-j2ee-connector_1.5_spec</artifactId>
-                            <version>1.1.1</version>
                             <type>jar</type>
                         </dependency>
                         <dependency>
                             <groupId>org.apache.geronimo.specs</groupId>
                             <artifactId>geronimo-j2ee-management_1.1_spec</artifactId>
-                            <version>1.0</version>
                             <type>jar</type>
                         </dependency>
                         <dependency>
                             <groupId>org.apache.geronimo.specs</groupId>
                             <artifactId>geronimo-jacc_1.1_spec</artifactId>
-                            <version>1.0</version>
                             <type>jar</type>
                         </dependency>
                         <dependency>
                             <groupId>org.apache.geronimo.javamail</groupId>
                             <artifactId>geronimo-javamail_1.4_mail</artifactId>
-                            <version>1.3</version>
                             <type>jar</type>
                         </dependency>
                         <dependency>
                             <groupId>org.apache.geronimo.specs</groupId>
                             <artifactId>geronimo-jaxrpc_1.1_spec</artifactId>
-                            <version>1.1</version>
                             <type>jar</type>
                         </dependency>
                         <dependency>
                             <groupId>org.apache.geronimo.specs</groupId>
                             <artifactId>geronimo-jaxr_1.0_spec</artifactId>
-                            <version>1.1</version>
                             <type>jar</type>
                         </dependency>
                         <dependency>
                             <groupId>org.apache.geronimo.specs</groupId>
                             <artifactId>geronimo-jms_1.1_spec</artifactId>
-                            <version>1.1</version>
                             <type>jar</type>
                         </dependency>
                         <dependency>
                             <groupId>org.apache.geronimo.specs</groupId>
                             <artifactId>geronimo-jpa_3.0_spec</artifactId>
-                            <version>1.1</version>
                             <type>jar</type>
                         </dependency>
                         <dependency>
                             <groupId>org.apache.geronimo.specs</groupId>
                             <artifactId>geronimo-jsp_2.1_spec</artifactId>
-                            <version>1.0</version>
                             <type>jar</type>
                         </dependency>
                         <dependency>
                             <groupId>org.apache.geronimo.specs</groupId>
                             <artifactId>geronimo-jta_1.1_spec</artifactId>
-                            <version>1.1</version>
                             <type>jar</type>
                         </dependency>
                         <dependency>
                             <groupId>org.apache.geronimo.specs</groupId>
                             <artifactId>geronimo-servlet_2.5_spec</artifactId>
-                            <version>1.1</version>
                             <type>jar</type>
                         </dependency>
                         <dependency>
                             <groupId>org.apache.geronimo.specs</groupId>
                             <artifactId>geronimo-ws-metadata_2.0_spec</artifactId>
-                            <version>1.1.1</version>
                             <type>jar</type>
                         </dependency>
                         <dependency>
                             <groupId>org.apache.axis2</groupId>
                             <artifactId>axis2-jaxws-api</artifactId>
-                            <version>1.3</version>
                             <type>jar</type>
                         </dependency>
                         <dependency>
                             <groupId>org.apache.axis2</groupId>
                             <artifactId>axis2-saaj-api</artifactId>
-                            <version>1.3</version>
                             <type>jar</type>
                         </dependency>
                         <dependency>
                             <groupId>jstl</groupId>
                             <artifactId>jstl</artifactId>
-                            <version>1.2</version>
                             <type>jar</type>
                         </dependency>
                         <dependency>
                             <groupId>org.apache.myfaces.core</groupId>
                             <artifactId>myfaces-api</artifactId>
-                            <version>1.2.1-SNAPSHOT</version>
                             <type>jar</type>
                         </dependency>
                         <dependency>
                             <groupId>org.apache.geronimo.modules</groupId>
                             <artifactId>geronimo-jdbc</artifactId>
-                            <version>2.1-SNAPSHOT</version>
                             <type>jar</type>
                         </dependency>
                     </dependencies>

Modified: geronimo/server/trunk/framework/modules/geronimo-system/src/main/java/org/apache/geronimo/system/plugin/GeronimoSourceRepository.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/modules/geronimo-system/src/main/java/org/apache/geronimo/system/plugin/GeronimoSourceRepository.java?rev=604751&r1=604750&r2=604751&view=diff
==============================================================================
--- geronimo/server/trunk/framework/modules/geronimo-system/src/main/java/org/apache/geronimo/system/plugin/GeronimoSourceRepository.java (original)
+++ geronimo/server/trunk/framework/modules/geronimo-system/src/main/java/org/apache/geronimo/system/plugin/GeronimoSourceRepository.java Sun Dec 16 16:15:55 2007
@@ -44,19 +44,23 @@
 import org.apache.geronimo.kernel.repository.Repository;
 import org.apache.geronimo.kernel.repository.WritableListableRepository;
 import org.apache.geronimo.kernel.repository.WriteableRepository;
+import org.apache.geronimo.kernel.repository.ArtifactResolver;
+import org.apache.geronimo.kernel.repository.MissingDependencyException;
 import org.apache.geronimo.system.configuration.RepositoryConfigurationStore;
 import org.apache.geronimo.system.plugin.model.PluginListType;
 import org.apache.geronimo.system.plugin.model.PluginType;
 
 /**
- * @version $Rev:$ $Date:$
+ * @version $Rev$ $Date$
  */
 public class GeronimoSourceRepository implements SourceRepository {
 
     private final Collection<? extends Repository> repos;
+    private final ArtifactResolver artifactResolver;
 
-    public GeronimoSourceRepository(Collection<? extends Repository> repos) {
+    public GeronimoSourceRepository(Collection<? extends Repository> repos, ArtifactResolver artifactResolver) {
         this.repos = repos;
+        this.artifactResolver = artifactResolver;
     }
 
     public PluginListType getPluginList() {
@@ -85,6 +89,11 @@
     }
 
     public OpenResult open(Artifact artifact, FileWriteMonitor monitor) throws IOException, FailedLoginException {
+        try {
+            artifact = artifactResolver.resolveInClassLoader(artifact);
+        } catch (MissingDependencyException e) {
+            return null;
+        }
         for (Repository repo: repos) {
             if (repo.contains(artifact)) {
                 File location = repo.getLocation(artifact);

Modified: geronimo/server/trunk/framework/modules/geronimo-system/src/main/java/org/apache/geronimo/system/plugin/PluginInstallerGBean.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/modules/geronimo-system/src/main/java/org/apache/geronimo/system/plugin/PluginInstallerGBean.java?rev=604751&r1=604750&r2=604751&view=diff
==============================================================================
--- geronimo/server/trunk/framework/modules/geronimo-system/src/main/java/org/apache/geronimo/system/plugin/PluginInstallerGBean.java (original)
+++ geronimo/server/trunk/framework/modules/geronimo-system/src/main/java/org/apache/geronimo/system/plugin/PluginInstallerGBean.java Sun Dec 16 16:15:55 2007
@@ -164,7 +164,7 @@
             throw new IllegalArgumentException("No default server instance set up");
         }
         this.configManager = configManager;
-        localSourceRepository = new GeronimoSourceRepository(configManager.getRepositories());
+        localSourceRepository = new GeronimoSourceRepository(configManager.getRepositories(), configManager.getArtifactResolver());
         if (serverInstanceDatas instanceof ReferenceCollection) {
             ((ReferenceCollection) serverInstanceDatas).addReferenceCollectionListener(new ReferenceCollectionListener() {
 
@@ -217,7 +217,7 @@
             addServerInstance(instance, artifactManager, writeableRepo, serverInfo, servers, false);
         }
         this.configManager = buildConfigurationManager(artifactManager, writeableRepo, kernel, configStore, classLoader, servers);
-        localSourceRepository = new GeronimoSourceRepository(configManager.getRepositories());
+        localSourceRepository = new GeronimoSourceRepository(configManager.getRepositories(), configManager.getArtifactResolver());
         if (serverInstanceDatas instanceof ReferenceCollection) {
             ((ReferenceCollection) serverInstanceDatas).addReferenceCollectionListener(new ReferenceCollectionListener() {
 
@@ -277,7 +277,7 @@
     /* now for tests only */
     PluginInstallerGBean(ConfigurationManager configManager, WritableListableRepository repository, ConfigurationStore configStore, ServerInfo serverInfo, ThreadPool threadPool, Collection<ServerInstance> servers) {
         this.configManager = configManager;
-        localSourceRepository = new GeronimoSourceRepository(configManager.getRepositories());
+        localSourceRepository = new GeronimoSourceRepository(configManager.getRepositories(), configManager.getArtifactResolver());
         this.writeableRepo = repository;
         this.configStore = configStore;
         this.serverInfo = serverInfo;

Modified: geronimo/server/trunk/plugins/axis/axis-deployer/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/axis/axis-deployer/pom.xml?rev=604751&r1=604750&r2=604751&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/axis/axis-deployer/pom.xml (original)
+++ geronimo/server/trunk/plugins/axis/axis-deployer/pom.xml Sun Dec 16 16:15:55 2007
@@ -87,32 +87,27 @@
                         <dependency>
                             <groupId>org.apache.geronimo.configs</groupId>
                             <artifactId>openejb-deployer</artifactId>
-                            <version>2.1-SNAPSHOT</version>
                             <type>car</type>
                         </dependency>
                         <dependency>
                             <groupId>org.apache.geronimo.configs</groupId>
                             <artifactId>axis</artifactId>
-                            <version>2.1-SNAPSHOT</version>
                             <type>car</type>
                             <import>classes</import>
                         </dependency>
                         <dependency>
                             <groupId>org.apache.geronimo.modules</groupId>
                             <artifactId>geronimo-webservices-builder</artifactId>
-                            <version>2.1-SNAPSHOT</version>
                             <type>jar</type>
                         </dependency>
                         <dependency>
                             <groupId>org.apache.geronimo.modules</groupId>
                             <artifactId>geronimo-axis-builder</artifactId>
-                            <version>2.1-SNAPSHOT</version>
                             <type>jar</type>
                         </dependency>
                         <dependency>
                             <groupId>org.apache.geronimo.configs</groupId>
                             <artifactId>j2ee-deployer</artifactId>
-                            <version>2.1-SNAPSHOT</version>
                             <type>car</type>
                         </dependency>
                     </dependencies>

Modified: geronimo/server/trunk/plugins/axis2/axis2-deployer/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/axis2/axis2-deployer/pom.xml?rev=604751&r1=604750&r2=604751&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/axis2/axis2-deployer/pom.xml (original)
+++ geronimo/server/trunk/plugins/axis2/axis2-deployer/pom.xml Sun Dec 16 16:15:55 2007
@@ -72,20 +72,17 @@
                       <dependency>
                         <groupId>org.apache.geronimo.configs</groupId>
                         <artifactId>jaxws-deployer</artifactId>
-                          <version>2.1-SNAPSHOT</version>
                         <type>car</type>
                       </dependency>
                       <dependency>
                         <groupId>org.apache.geronimo.configs</groupId>
                         <artifactId>axis2</artifactId>
-                          <version>2.1-SNAPSHOT</version>
                         <type>car</type>
                         <import>classes</import>
                       </dependency>
                       <dependency>
                         <groupId>org.apache.geronimo.modules</groupId>
                         <artifactId>geronimo-axis2-builder</artifactId>
-                        <version>2.1-SNAPSHOT</version>
                         <type>jar</type>
                         <import>classes</import>
                       </dependency>

Modified: geronimo/server/trunk/plugins/axis2/axis2-ejb-deployer/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/axis2/axis2-ejb-deployer/pom.xml?rev=604751&r1=604750&r2=604751&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/axis2/axis2-ejb-deployer/pom.xml (original)
+++ geronimo/server/trunk/plugins/axis2/axis2-ejb-deployer/pom.xml Sun Dec 16 16:15:55 2007
@@ -81,27 +81,23 @@
                         <dependency>
                             <groupId>org.apache.geronimo.configs</groupId>
                             <artifactId>jaxws-ejb-deployer</artifactId>
-                            <version>2.1-SNAPSHOT</version>
                             <type>car</type>
                         </dependency>
                         <dependency>
                             <groupId>org.apache.geronimo.configs</groupId>
                             <artifactId>axis2-deployer</artifactId>
-                            <version>2.1-SNAPSHOT</version>
                             <type>car</type>
                             <import>classes</import>
                         </dependency>
                         <dependency>
                             <groupId>org.apache.geronimo.configs</groupId>
                             <artifactId>axis2-ejb</artifactId>
-                            <version>2.1-SNAPSHOT</version>
                             <type>car</type>
                             <import>classes</import>
                         </dependency>
                         <dependency>
                             <groupId>org.apache.geronimo.modules</groupId>
                             <artifactId>geronimo-axis2-ejb-builder</artifactId>
-                            <version>2.1-SNAPSHOT</version>
                             <type>jar</type>
                             <import>classes</import>
                         </dependency>

Modified: geronimo/server/trunk/plugins/client/client-deployer/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/client/client-deployer/pom.xml?rev=604751&r1=604750&r2=604751&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/client/client-deployer/pom.xml (original)
+++ geronimo/server/trunk/plugins/client/client-deployer/pom.xml Sun Dec 16 16:15:55 2007
@@ -91,34 +91,29 @@
                         <dependency>
                             <groupId>org.apache.geronimo.configs</groupId>
                             <artifactId>j2ee-deployer</artifactId>
-                            <version>2.1-SNAPSHOT</version>
                             <type>car</type>
                         </dependency>
                         <dependency>
                             <groupId>org.apache.geronimo.modules</groupId>
                             <artifactId>geronimo-connector-builder</artifactId>
-                            <version>2.1-SNAPSHOT</version>
                             <type>jar</type>
                             <import>classes</import>
                         </dependency>
                         <dependency>
                             <groupId>org.apache.geronimo.configs</groupId>
                             <artifactId>client</artifactId>
-                            <version>2.1-SNAPSHOT</version>
                             <type>car</type>
                             <import>classes</import>
                         </dependency>
                         <dependency>
                             <groupId>org.apache.geronimo.modules</groupId>
                             <artifactId>geronimo-client-builder</artifactId>
-                            <version>2.1-SNAPSHOT</version>
                             <type>jar</type>
                             <import>classes</import>
                         </dependency>
                         <dependency>
                             <groupId>org.apache.geronimo.configs</groupId>
                             <artifactId>client-transaction</artifactId>
-                            <version>2.1-SNAPSHOT</version>
                             <type>car</type>
                             <import>classes</import>
                         </dependency>

Modified: geronimo/server/trunk/plugins/connector/connector-deployer/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/connector/connector-deployer/pom.xml?rev=604751&r1=604750&r2=604751&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/connector/connector-deployer/pom.xml (original)
+++ geronimo/server/trunk/plugins/connector/connector-deployer/pom.xml Sun Dec 16 16:15:55 2007
@@ -76,21 +76,18 @@
                       <dependency>
                         <groupId>org.apache.geronimo.modules</groupId>
                         <artifactId>geronimo-connector-builder</artifactId>
-                        <version>2.1-SNAPSHOT</version>
                         <type>jar</type>
                         <import>classes</import>
                       </dependency>
                       <dependency>
                         <groupId>org.apache.geronimo.configs</groupId>
                         <artifactId>transaction</artifactId>
-                          <version>2.1-SNAPSHOT</version>
                         <type>car</type>
                         <import>classes</import>
                       </dependency>
                       <dependency>
                         <groupId>org.apache.geronimo.configs</groupId>
                         <artifactId>j2ee-deployer</artifactId>
-                          <version>2.1-SNAPSHOT</version>
                         <type>car</type>
                       </dependency>
                     </dependencies>

Modified: geronimo/server/trunk/plugins/corba/openejb-corba-deployer/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/corba/openejb-corba-deployer/pom.xml?rev=604751&r1=604750&r2=604751&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/corba/openejb-corba-deployer/pom.xml (original)
+++ geronimo/server/trunk/plugins/corba/openejb-corba-deployer/pom.xml Sun Dec 16 16:15:55 2007
@@ -83,26 +83,22 @@
                         <dependency>
                             <groupId>org.apache.geronimo.configs</groupId>
                             <artifactId>openejb-deployer</artifactId>
-                            <version>2.1-SNAPSHOT</version>
                             <type>car</type>
                             <import>classes</import>
                         </dependency>
                         <dependency>
                             <groupId>org.apache.geronimo.modules</groupId>
                             <artifactId>geronimo-corba-builder</artifactId>
-                            <version>2.1-SNAPSHOT</version>
                             <type>jar</type>
                         </dependency>
                         <dependency>
                             <groupId>org.apache.geronimo.configs</groupId>
                             <artifactId>j2ee-deployer</artifactId>
-                            <version>2.1-SNAPSHOT</version>
                             <type>car</type>
                         </dependency>
                         <dependency>
                             <groupId>org.apache.geronimo.modules</groupId>
                             <artifactId>geronimo-corba</artifactId>
-                            <version>2.1-SNAPSHOT</version>
                             <type>jar</type>
                         </dependency>
                     </dependencies>

Modified: geronimo/server/trunk/plugins/cxf/cxf-deployer/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/cxf/cxf-deployer/pom.xml?rev=604751&r1=604750&r2=604751&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/cxf/cxf-deployer/pom.xml (original)
+++ geronimo/server/trunk/plugins/cxf/cxf-deployer/pom.xml Sun Dec 16 16:15:55 2007
@@ -74,20 +74,17 @@
                       <dependency>
                         <groupId>org.apache.geronimo.configs</groupId>
                         <artifactId>jaxws-deployer</artifactId>
-                          <version>2.1-SNAPSHOT</version>
                         <type>car</type>
                       </dependency>
                       <dependency>
                         <groupId>org.apache.geronimo.configs</groupId>
                         <artifactId>cxf</artifactId>
-                          <version>2.1-SNAPSHOT</version>
                         <type>car</type>
                         <import>classes</import>
                       </dependency>
                       <dependency>
                         <groupId>org.apache.geronimo.modules</groupId>
                         <artifactId>geronimo-cxf-builder</artifactId>
-                        <version>2.1-SNAPSHOT</version>
                         <type>jar</type>
                         <import>classes</import>
                       </dependency>

Modified: geronimo/server/trunk/plugins/cxf/cxf-ejb-deployer/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/cxf/cxf-ejb-deployer/pom.xml?rev=604751&r1=604750&r2=604751&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/cxf/cxf-ejb-deployer/pom.xml (original)
+++ geronimo/server/trunk/plugins/cxf/cxf-ejb-deployer/pom.xml Sun Dec 16 16:15:55 2007
@@ -81,27 +81,23 @@
                         <dependency>
                             <groupId>org.apache.geronimo.configs</groupId>
                             <artifactId>jaxws-ejb-deployer</artifactId>
-                            <version>2.1-SNAPSHOT</version>
                             <type>car</type>
                         </dependency>
                         <dependency>
                             <groupId>org.apache.geronimo.configs</groupId>
                             <artifactId>cxf-deployer</artifactId>
-                            <version>2.1-SNAPSHOT</version>
                             <type>car</type>
                             <import>classes</import>
                         </dependency>
                         <dependency>
                             <groupId>org.apache.geronimo.configs</groupId>
                             <artifactId>cxf-ejb</artifactId>
-                            <version>2.1-SNAPSHOT</version>
                             <type>car</type>
                             <import>classes</import>
                         </dependency>
                         <dependency>
                             <groupId>org.apache.geronimo.modules</groupId>
                             <artifactId>geronimo-cxf-ejb-builder</artifactId>
-                            <version>2.1-SNAPSHOT</version>
                             <type>jar</type>
                             <import>classes</import>
                         </dependency>

Modified: geronimo/server/trunk/plugins/j2ee/j2ee-server/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/j2ee/j2ee-server/pom.xml?rev=604751&r1=604750&r2=604751&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/j2ee/j2ee-server/pom.xml (original)
+++ geronimo/server/trunk/plugins/j2ee/j2ee-server/pom.xml Sun Dec 16 16:15:55 2007
@@ -106,7 +106,7 @@
 
                     <instance>
                         <plugin-artifact>
-                            <artifact-alias key="org.apache.geronimo.configs/j2ee-server//car">org.apache.geronimo.configs/j2ee-server/2.1-SNAPSHOT/car</artifact-alias>
+                            <artifact-alias key="org.apache.geronimo.configs/j2ee-server//car">org.apache.geronimo.configs/j2ee-server/${geronimoVersion}/car</artifact-alias>
                         </plugin-artifact>
                     </instance>
                 </configuration>

Modified: geronimo/server/trunk/plugins/j2ee/jsr88-ear-configurer/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/j2ee/jsr88-ear-configurer/pom.xml?rev=604751&r1=604750&r2=604751&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/j2ee/jsr88-ear-configurer/pom.xml (original)
+++ geronimo/server/trunk/plugins/j2ee/jsr88-ear-configurer/pom.xml Sun Dec 16 16:15:55 2007
@@ -64,7 +64,6 @@
                       <dependency>
                         <groupId>org.apache.geronimo.modules</groupId>
                         <artifactId>geronimo-j2ee-builder</artifactId>
-                        <version>2.1-SNAPSHOT</version>
                         <type>jar</type>
                         <import>classes</import>
                       </dependency>

Modified: geronimo/server/trunk/plugins/j2ee/jsr88-jar-configurer/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/j2ee/jsr88-jar-configurer/pom.xml?rev=604751&r1=604750&r2=604751&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/j2ee/jsr88-jar-configurer/pom.xml (original)
+++ geronimo/server/trunk/plugins/j2ee/jsr88-jar-configurer/pom.xml Sun Dec 16 16:15:55 2007
@@ -64,7 +64,6 @@
                       <dependency>
                         <groupId>org.apache.geronimo.modules</groupId>
                         <artifactId>geronimo-client-builder</artifactId>
-                        <version>2.1-SNAPSHOT</version>
                         <type>jar</type>
                         <import>classes</import>
                       </dependency>

Modified: geronimo/server/trunk/plugins/j2ee/jsr88-rar-configurer/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/j2ee/jsr88-rar-configurer/pom.xml?rev=604751&r1=604750&r2=604751&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/j2ee/jsr88-rar-configurer/pom.xml (original)
+++ geronimo/server/trunk/plugins/j2ee/jsr88-rar-configurer/pom.xml Sun Dec 16 16:15:55 2007
@@ -66,14 +66,12 @@
                       <dependency>
                         <groupId>org.apache.geronimo.configs</groupId>
                         <artifactId>connector-deployer</artifactId>
-                        <version>2.1-SNAPSHOT</version>
                         <type>car</type>
                         <import>classes</import>
                       </dependency>
                       <dependency>
                         <groupId>org.apache.geronimo.configs</groupId>
                         <artifactId>jsr88-cli</artifactId>
-                          <version>2.1-SNAPSHOT</version>
                         <type>car</type>
                         <import>classes</import>
                       </dependency>

Modified: geronimo/server/trunk/plugins/j2ee/jsr88-war-configurer/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/j2ee/jsr88-war-configurer/pom.xml?rev=604751&r1=604750&r2=604751&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/j2ee/jsr88-war-configurer/pom.xml (original)
+++ geronimo/server/trunk/plugins/j2ee/jsr88-war-configurer/pom.xml Sun Dec 16 16:15:55 2007
@@ -64,7 +64,6 @@
                       <dependency>
                         <groupId>org.apache.geronimo.modules</groupId>
                         <artifactId>geronimo-web-2.5-builder</artifactId>
-                        <version>2.1-SNAPSHOT</version>
                         <type>jar</type>
                         <import>classes</import>
                       </dependency>

Modified: geronimo/server/trunk/plugins/jasper/jasper-deployer/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/jasper/jasper-deployer/pom.xml?rev=604751&r1=604750&r2=604751&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/jasper/jasper-deployer/pom.xml (original)
+++ geronimo/server/trunk/plugins/jasper/jasper-deployer/pom.xml Sun Dec 16 16:15:55 2007
@@ -73,21 +73,18 @@
                       <dependency>
                         <groupId>org.apache.geronimo.configs</groupId>
                         <artifactId>jasper</artifactId>
-                          <version>2.1-SNAPSHOT</version>
                         <type>car</type>
                         <import>classes</import>
                       </dependency>
                       <dependency>
                         <groupId>org.apache.geronimo.modules</groupId>
                         <artifactId>geronimo-jasper-builder</artifactId>
-                        <version>2.1-SNAPSHOT</version>
                         <type>jar</type>
                         <import>classes</import>
                       </dependency>
                       <dependency>
                         <groupId>org.apache.geronimo.configs</groupId>
                         <artifactId>j2ee-deployer</artifactId>
-                          <version>2.1-SNAPSHOT</version>
                         <type>car</type>
                       </dependency>
                     </dependencies>

Modified: geronimo/server/trunk/plugins/jetty/jetty6-deployer/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/jetty/jetty6-deployer/pom.xml?rev=604751&r1=604750&r2=604751&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/jetty/jetty6-deployer/pom.xml (original)
+++ geronimo/server/trunk/plugins/jetty/jetty6-deployer/pom.xml Sun Dec 16 16:15:55 2007
@@ -88,33 +88,28 @@
                       <dependency>
                         <groupId>org.apache.geronimo.configs</groupId>
                         <artifactId>connector-deployer</artifactId>
-                          <version>2.1-SNAPSHOT</version>
                         <type>car</type>
                       </dependency>
                       <dependency>
                         <groupId>org.apache.geronimo.configs</groupId>
                         <artifactId>jetty6</artifactId>
-                          <version>2.1-SNAPSHOT</version>
                         <type>car</type>
                         <import>classes</import>
                       </dependency>
                       <dependency>
                         <groupId>org.apache.geronimo.configs</groupId>
                         <artifactId>j2ee-deployer</artifactId>
-                          <version>2.1-SNAPSHOT</version>
                         <type>car</type>
                       </dependency>
                       <dependency>
                         <groupId>org.apache.geronimo.modules</groupId>
                         <artifactId>geronimo-web-2.5-builder</artifactId>
-                        <version>2.1-SNAPSHOT</version>
                         <type>jar</type>
                         <import>classes</import>
                       </dependency>
                       <dependency>
                         <groupId>org.apache.geronimo.modules</groupId>
                         <artifactId>geronimo-jetty6-builder</artifactId>
-                        <version>2.1-SNAPSHOT</version>
                         <type>jar</type>
                         <import>classes</import>
                       </dependency>

Modified: geronimo/server/trunk/plugins/jetty/jetty6/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/jetty/jetty6/pom.xml?rev=604751&r1=604750&r2=604751&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/jetty/jetty6/pom.xml (original)
+++ geronimo/server/trunk/plugins/jetty/jetty6/pom.xml Sun Dec 16 16:15:55 2007
@@ -132,74 +132,62 @@
                         <dependency start="true">
                             <groupId>org.apache.geronimo.configs</groupId>
                             <artifactId>j2ee-server</artifactId>
-                            <version>2.1-SNAPSHOT</version>
                             <type>car</type>
                         </dependency>
                         <dependency start="true">
                             <groupId>org.apache.geronimo.configs</groupId>
                             <artifactId>server-security-config</artifactId>
-                            <version>2.1-SNAPSHOT</version>
                             <type>car</type>
                         </dependency>
                         <dependency start="true">
                             <groupId>org.apache.geronimo.configs</groupId>
                             <artifactId>transaction</artifactId>
-                            <version>2.1-SNAPSHOT</version>
                             <type>car</type>
                         </dependency>
                         <dependency start="true">
                             <groupId>org.apache.geronimo.modules</groupId>
                             <artifactId>geronimo-jetty6</artifactId>
-                            <version>2.1-SNAPSHOT</version>
                             <type>jar</type>
                         </dependency>
                         <dependency start="true">
                             <groupId>org.apache.geronimo.configs</groupId>
                             <artifactId>clustering</artifactId>
-                            <version>2.1-SNAPSHOT</version>
                             <type>car</type>
                             <import>classes</import>
                         </dependency>
                         <dependency start="true">
                             <groupId>org.slf4j</groupId>
                             <artifactId>slf4j-api</artifactId>
-                            <version>1.4.3</version>
                             <type>jar</type>
                         </dependency>
                         <dependency start="true">
                             <groupId>org.slf4j</groupId>
                             <artifactId>slf4j-jcl</artifactId>
-                            <version>1.4.3</version>
                             <type>jar</type>
                         </dependency>
                         <dependency start="true">
                             <groupId>org.mortbay.jetty</groupId>
                             <artifactId>jetty</artifactId>
-                            <version>6.1.5</version>
                             <type>jar</type>
                         </dependency>
                         <dependency start="true">
                             <groupId>org.mortbay.jetty</groupId>
                             <artifactId>jetty-ajp</artifactId>
-                            <version>6.1.5</version>
                             <type>jar</type>
                         </dependency>
                         <dependency start="true">
                             <groupId>org.mortbay.jetty</groupId>
                             <artifactId>jetty-sslengine</artifactId>
-                            <version>6.1.5</version>
                             <type>jar</type>
                         </dependency>
                         <dependency start="true">
                             <groupId>org.mortbay.jetty</groupId>
                             <artifactId>jetty-util</artifactId>
-                            <version>6.1.5</version>
                             <type>jar</type>
                         </dependency>
                         <dependency start="true">
                             <groupId>org.apache.geronimo.configs</groupId>
                             <artifactId>webservices-common</artifactId>
-                            <version>2.1-SNAPSHOT</version>
                             <type>car</type>
                         </dependency>
                     </dependencies>

Modified: geronimo/server/trunk/plugins/myfaces/myfaces-deployer/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/myfaces/myfaces-deployer/pom.xml?rev=604751&r1=604750&r2=604751&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/myfaces/myfaces-deployer/pom.xml (original)
+++ geronimo/server/trunk/plugins/myfaces/myfaces-deployer/pom.xml Sun Dec 16 16:15:55 2007
@@ -70,20 +70,17 @@
                       <dependency>
                         <groupId>org.apache.geronimo.modules</groupId>
                         <artifactId>geronimo-myfaces-builder</artifactId>
-                        <version>2.1-SNAPSHOT</version>
                         <type>jar</type>
                       </dependency>
                       <dependency>
                         <groupId>org.apache.geronimo.configs</groupId>
                         <artifactId>myfaces</artifactId>
-                          <version>2.1-SNAPSHOT</version>
                         <type>car</type>
                         <import>classes</import>
                       </dependency>
                       <dependency>
                         <groupId>org.apache.geronimo.configs</groupId>
                         <artifactId>j2ee-deployer</artifactId>
-                          <version>2.1-SNAPSHOT</version>
                         <type>car</type>
                       </dependency>
                     </dependencies>

Modified: geronimo/server/trunk/plugins/openejb/openejb-deployer/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/openejb/openejb-deployer/pom.xml?rev=604751&r1=604750&r2=604751&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/openejb/openejb-deployer/pom.xml (original)
+++ geronimo/server/trunk/plugins/openejb/openejb-deployer/pom.xml Sun Dec 16 16:15:55 2007
@@ -95,33 +95,28 @@
                         <dependency>
                             <groupId>org.apache.geronimo.configs</groupId>
                             <artifactId>connector-deployer</artifactId>
-                            <version>2.1-SNAPSHOT</version>
                             <type>car</type>
                         </dependency>
                         <dependency>
                             <groupId>org.apache.geronimo.modules</groupId>
                             <artifactId>geronimo-webservices-builder</artifactId>
-                            <version>${version}</version>
                             <type>jar</type>
                             <import>classes</import>
                         </dependency>
                         <dependency>
                             <groupId>org.apache.geronimo.modules</groupId>
                             <artifactId>geronimo-openejb-builder</artifactId>
-                            <version>${version}</version>
                             <type>jar</type>
                             <import>classes</import>
                         </dependency>
                         <dependency>
                             <groupId>org.apache.geronimo.configs</groupId>
                             <artifactId>j2ee-deployer</artifactId>
-                            <version>2.1-SNAPSHOT</version>
                             <type>car</type>
                         </dependency>
                         <dependency>
                             <groupId>org.apache.geronimo.configs</groupId>
                             <artifactId>openejb</artifactId>
-                            <version>2.1-SNAPSHOT</version>
                             <type>car</type>
                             <import>classes</import>
                         </dependency>

Modified: geronimo/server/trunk/plugins/openjpa/persistence-jpa10-deployer/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/openjpa/persistence-jpa10-deployer/pom.xml?rev=604751&r1=604750&r2=604751&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/openjpa/persistence-jpa10-deployer/pom.xml (original)
+++ geronimo/server/trunk/plugins/openjpa/persistence-jpa10-deployer/pom.xml Sun Dec 16 16:15:55 2007
@@ -85,21 +85,18 @@
                         <dependency>
                             <groupId>org.apache.geronimo.configs</groupId>
                             <artifactId>transaction</artifactId>
-                            <version>2.1-SNAPSHOT</version>
                             <type>car</type>
                             <import>classes</import>
                         </dependency>
                         <dependency>
                             <groupId>org.apache.geronimo.modules</groupId>
                             <artifactId>geronimo-persistence-jpa10-builder</artifactId>
-                            <version>2.1-SNAPSHOT</version>
                             <type>jar</type>
                             <import>classes</import>
                         </dependency>
                         <dependency>
                             <groupId>org.apache.geronimo.configs</groupId>
                             <artifactId>j2ee-deployer</artifactId>
-                            <version>2.1-SNAPSHOT</version>
                             <type>car</type>
                         </dependency>
                     </dependencies>

Modified: geronimo/server/trunk/plugins/tomcat/tomcat6-deployer/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/tomcat/tomcat6-deployer/pom.xml?rev=604751&r1=604750&r2=604751&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/tomcat/tomcat6-deployer/pom.xml (original)
+++ geronimo/server/trunk/plugins/tomcat/tomcat6-deployer/pom.xml Sun Dec 16 16:15:55 2007
@@ -96,33 +96,28 @@
                         <dependency>
                             <groupId>org.apache.geronimo.configs</groupId>
                             <artifactId>connector-deployer</artifactId>
-                            <version>2.1-SNAPSHOT</version>
                             <type>car</type>
                         </dependency>
                         <dependency>
                             <groupId>org.apache.geronimo.modules</groupId>
                             <artifactId>geronimo-tomcat6-builder</artifactId>
-                            <version>2.1-SNAPSHOT</version>
                             <type>jar</type>
                             <import>classes</import>
                         </dependency>
                         <dependency>
                             <groupId>org.apache.geronimo.configs</groupId>
                             <artifactId>j2ee-deployer</artifactId>
-                            <version>2.1-SNAPSHOT</version>
                             <type>car</type>
                         </dependency>
                         <dependency>
                             <groupId>org.apache.geronimo.modules</groupId>
                             <artifactId>geronimo-web-2.5-builder</artifactId>
-                            <version>2.1-SNAPSHOT</version>
                             <type>jar</type>
                             <import>classes</import>
                         </dependency>
                         <dependency>
                             <groupId>org.apache.geronimo.configs</groupId>
                             <artifactId>tomcat6</artifactId>
-                            <version>2.1-SNAPSHOT</version>
                             <type>car</type>
                             <import>classes</import>
                         </dependency>



Mime
View raw message