You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by dj...@apache.org on 2006/04/21 00:02:54 UTC
svn commit: r395709 [2/2] - in /geronimo/branches/1.1:
configs/activemq-broker/ configs/activemq/ configs/axis-deployer/
configs/axis/ configs/client-corba/ configs/client-deployer/
configs/client-security/ configs/client-system/ configs/client/ config...
Modified: geronimo/branches/1.1/configs/remote-deploy-tomcat/project.xml
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.1/configs/remote-deploy-tomcat/project.xml?rev=395709&r1=395708&r2=395709&view=diff
==============================================================================
--- geronimo/branches/1.1/configs/remote-deploy-tomcat/project.xml (original)
+++ geronimo/branches/1.1/configs/remote-deploy-tomcat/project.xml Thu Apr 20 15:02:48 2006
@@ -43,20 +43,39 @@
<artifactId>geronimo-gbean-deployer</artifactId>
<version>${geronimo_version}</version>
<type>car</type>
+ <properties>
+ <packaging.config.order>1</packaging.config.order>
+ </properties>
</dependency>
<dependency>
<groupId>geronimo</groupId>
<artifactId>j2ee-deployer</artifactId>
<version>${geronimo_version}</version>
<type>car</type>
+ <properties>
+ <packaging.config.order>2</packaging.config.order>
+ </properties>
</dependency>
<dependency>
<groupId>geronimo</groupId>
<artifactId>tomcat-deployer</artifactId>
<version>${geronimo_version}</version>
<type>car</type>
+ <properties>
+ <packaging.config.order>3</packaging.config.order>
+ </properties>
</dependency>
<dependency>
+ <groupId>geronimo</groupId>
+ <artifactId>openejb-deployer</artifactId>
+ <version>${geronimo_version}</version>
+ <type>car</type>
+ <properties>
+ <packaging.config.order>4</packaging.config.order>
+ </properties>
+ </dependency>
+
+ <dependency>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-servlet_2.4_spec</artifactId>
<version>${geronimo_spec_servlet_version}</version>
@@ -144,8 +163,8 @@
<artifactId>xbean</artifactId>
<version>${xmlbeans_version}</version>
<properties>
- <geronimo.dependency>true</geronimo.dependency>
- </properties>
+ <geronimo.dependency>true</geronimo.dependency>
+ </properties>
</dependency>
</dependencies>
</project>
Modified: geronimo/branches/1.1/configs/rmi-naming/project.properties
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.1/configs/rmi-naming/project.properties?rev=395709&r1=395708&r2=395709&view=diff
==============================================================================
--- geronimo/branches/1.1/configs/rmi-naming/project.properties (original)
+++ geronimo/branches/1.1/configs/rmi-naming/project.properties Thu Apr 20 15:02:48 2006
@@ -25,8 +25,5 @@
# Also will cause all config projects to be grouped together when imported into eclipse.
maven.eclipse.project.name=${geronimo.maven.eclipse.configs.project.prefix}${pom.artifactId}
-# just use basic GBean deployer
-geronimo.packaging.deploymentConfig=geronimo/geronimo-gbean-deployer/${geronimo_version}/car
-
PlanServerHostname=localhost
PlanNamingPort=1099
Modified: geronimo/branches/1.1/configs/rmi-naming/project.xml
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.1/configs/rmi-naming/project.xml?rev=395709&r1=395708&r2=395709&view=diff
==============================================================================
--- geronimo/branches/1.1/configs/rmi-naming/project.xml (original)
+++ geronimo/branches/1.1/configs/rmi-naming/project.xml Thu Apr 20 15:02:48 2006
@@ -37,6 +37,9 @@
<artifactId>geronimo-gbean-deployer</artifactId>
<version>${geronimo_version}</version>
<type>car</type>
+ <properties>
+ <packaging.config.order>1</packaging.config.order>
+ </properties>
</dependency>
<!-- parent config -->
<dependency>
Modified: geronimo/branches/1.1/configs/servlets-examples-jetty/project.properties
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.1/configs/servlets-examples-jetty/project.properties?rev=395709&r1=395708&r2=395709&view=diff
==============================================================================
--- geronimo/branches/1.1/configs/servlets-examples-jetty/project.properties (original)
+++ geronimo/branches/1.1/configs/servlets-examples-jetty/project.properties Thu Apr 20 15:02:48 2006
@@ -25,7 +25,5 @@
# Also will cause all config projects to be grouped together when imported into eclipse.
maven.eclipse.project.name=${geronimo.maven.eclipse.configs.project.prefix}${pom.artifactId}
-geronimo.packaging.deploymentConfig=geronimo/geronimo-gbean-deployer/${geronimo_version}/car,geronimo/j2ee-deployer/${geronimo_version}/car,geronimo/jetty-deployer/${geronimo_version}/car
-
geronimo.packaging.moduleFile=${maven.repo.local}/geronimo-samples/wars/geronimo-servlet-examples-tomcat-${tomcat_servlet_examples_version}.war
Modified: geronimo/branches/1.1/configs/servlets-examples-jetty/project.xml
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.1/configs/servlets-examples-jetty/project.xml?rev=395709&r1=395708&r2=395709&view=diff
==============================================================================
--- geronimo/branches/1.1/configs/servlets-examples-jetty/project.xml (original)
+++ geronimo/branches/1.1/configs/servlets-examples-jetty/project.xml Thu Apr 20 15:02:48 2006
@@ -37,18 +37,36 @@
<artifactId>geronimo-gbean-deployer</artifactId>
<version>${geronimo_version}</version>
<type>car</type>
+ <properties>
+ <packaging.config.order>1</packaging.config.order>
+ </properties>
</dependency>
<dependency>
<groupId>geronimo</groupId>
<artifactId>j2ee-deployer</artifactId>
<version>${geronimo_version}</version>
<type>car</type>
+ <properties>
+ <packaging.config.order>2</packaging.config.order>
+ </properties>
</dependency>
<dependency>
<groupId>geronimo</groupId>
<artifactId>jetty-deployer</artifactId>
<version>${geronimo_version}</version>
<type>car</type>
+ <properties>
+ <packaging.config.order>3</packaging.config.order>
+ </properties>
+ </dependency>
+ <dependency>
+ <groupId>geronimo</groupId>
+ <artifactId>openejb-deployer</artifactId>
+ <version>${geronimo_version}</version>
+ <type>car</type>
+ <properties>
+ <packaging.config.order>4</packaging.config.order>
+ </properties>
</dependency>
<!-- parent config -->
Modified: geronimo/branches/1.1/configs/servlets-examples-tomcat/project.properties
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.1/configs/servlets-examples-tomcat/project.properties?rev=395709&r1=395708&r2=395709&view=diff
==============================================================================
--- geronimo/branches/1.1/configs/servlets-examples-tomcat/project.properties (original)
+++ geronimo/branches/1.1/configs/servlets-examples-tomcat/project.properties Thu Apr 20 15:02:48 2006
@@ -25,7 +25,5 @@
# Also will cause all config projects to be grouped together when imported into eclipse.
maven.eclipse.project.name=${geronimo.maven.eclipse.configs.project.prefix}${pom.artifactId}
-geronimo.packaging.deploymentConfig=geronimo/geronimo-gbean-deployer/${geronimo_version}/car,geronimo/j2ee-deployer/${geronimo_version}/car,geronimo/tomcat-deployer/${geronimo_version}/car
-
geronimo.packaging.moduleFile=${maven.repo.local}/geronimo-samples/wars/geronimo-servlet-examples-tomcat-${tomcat_servlet_examples_version}.war
Modified: geronimo/branches/1.1/configs/servlets-examples-tomcat/project.xml
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.1/configs/servlets-examples-tomcat/project.xml?rev=395709&r1=395708&r2=395709&view=diff
==============================================================================
--- geronimo/branches/1.1/configs/servlets-examples-tomcat/project.xml (original)
+++ geronimo/branches/1.1/configs/servlets-examples-tomcat/project.xml Thu Apr 20 15:02:48 2006
@@ -37,18 +37,36 @@
<artifactId>geronimo-gbean-deployer</artifactId>
<version>${geronimo_version}</version>
<type>car</type>
+ <properties>
+ <packaging.config.order>1</packaging.config.order>
+ </properties>
</dependency>
<dependency>
<groupId>geronimo</groupId>
<artifactId>j2ee-deployer</artifactId>
<version>${geronimo_version}</version>
<type>car</type>
+ <properties>
+ <packaging.config.order>2</packaging.config.order>
+ </properties>
</dependency>
<dependency>
<groupId>geronimo</groupId>
<artifactId>tomcat-deployer</artifactId>
<version>${geronimo_version}</version>
<type>car</type>
+ <properties>
+ <packaging.config.order>3</packaging.config.order>
+ </properties>
+ </dependency>
+ <dependency>
+ <groupId>geronimo</groupId>
+ <artifactId>openejb-deployer</artifactId>
+ <version>${geronimo_version}</version>
+ <type>car</type>
+ <properties>
+ <packaging.config.order>4</packaging.config.order>
+ </properties>
</dependency>
<!-- parent config -->
Modified: geronimo/branches/1.1/configs/sharedlib/project.properties
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.1/configs/sharedlib/project.properties?rev=395709&r1=395708&r2=395709&view=diff
==============================================================================
--- geronimo/branches/1.1/configs/sharedlib/project.properties (original)
+++ geronimo/branches/1.1/configs/sharedlib/project.properties Thu Apr 20 15:02:48 2006
@@ -17,6 +17,4 @@
maven.multiproject.type=car
-# just use basic GBean deployer
-geronimo.packaging.deploymentConfig=geronimo/geronimo-gbean-deployer/${geronimo_version}/car
Modified: geronimo/branches/1.1/configs/sharedlib/project.xml
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.1/configs/sharedlib/project.xml?rev=395709&r1=395708&r2=395709&view=diff
==============================================================================
--- geronimo/branches/1.1/configs/sharedlib/project.xml (original)
+++ geronimo/branches/1.1/configs/sharedlib/project.xml Thu Apr 20 15:02:48 2006
@@ -35,6 +35,9 @@
<artifactId>geronimo-gbean-deployer</artifactId>
<version>${geronimo_version}</version>
<type>car</type>
+ <properties>
+ <packaging.config.order>1</packaging.config.order>
+ </properties>
</dependency>
<!-- parent config -->
Modified: geronimo/branches/1.1/configs/shutdown/project.xml
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.1/configs/shutdown/project.xml?rev=395709&r1=395708&r2=395709&view=diff
==============================================================================
--- geronimo/branches/1.1/configs/shutdown/project.xml (original)
+++ geronimo/branches/1.1/configs/shutdown/project.xml Thu Apr 20 15:02:48 2006
@@ -32,8 +32,17 @@
<version>${geronimo_packaging_plugin_version}</version>
<type>plugin</type>
</dependency>
+ <dependency>
+ <groupId>geronimo</groupId>
+ <artifactId>geronimo-gbean-deployer</artifactId>
+ <version>${geronimo_version}</version>
+ <type>car</type>
+ <properties>
+ <packaging.config.order>1</packaging.config.order>
+ </properties>
+ </dependency>
- <dependency>
+ <dependency>
<groupId>mx4j</groupId>
<artifactId>mx4j</artifactId>
<version>${mx4j_version}</version>
Modified: geronimo/branches/1.1/configs/system-database/project.properties
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.1/configs/system-database/project.properties?rev=395709&r1=395708&r2=395709&view=diff
==============================================================================
--- geronimo/branches/1.1/configs/system-database/project.properties (original)
+++ geronimo/branches/1.1/configs/system-database/project.properties Thu Apr 20 15:02:48 2006
@@ -25,8 +25,6 @@
# Also will cause all config projects to be grouped together when imported into eclipse.
maven.eclipse.project.name=${geronimo.maven.eclipse.configs.project.prefix}${pom.artifactId}
-geronimo.packaging.deploymentConfig=geronimo/geronimo-gbean-deployer/${geronimo_version}/car,geronimo/j2ee-deployer/${geronimo_version}/car
-
geronimo.packaging.moduleFile=${maven.repo.local}/tranql/rars/tranql-connector-derby-embed-xa-${tranql_connector_version}.rar
PlanHTTPPort=8080
Modified: geronimo/branches/1.1/configs/system-database/project.xml
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.1/configs/system-database/project.xml?rev=395709&r1=395708&r2=395709&view=diff
==============================================================================
--- geronimo/branches/1.1/configs/system-database/project.xml (original)
+++ geronimo/branches/1.1/configs/system-database/project.xml Thu Apr 20 15:02:48 2006
@@ -37,12 +37,18 @@
<artifactId>geronimo-gbean-deployer</artifactId>
<version>${geronimo_version}</version>
<type>car</type>
+ <properties>
+ <packaging.config.order>1</packaging.config.order>
+ </properties>
</dependency>
<dependency>
<groupId>geronimo</groupId>
<artifactId>j2ee-deployer</artifactId>
<version>${geronimo_version}</version>
<type>car</type>
+ <properties>
+ <packaging.config.order>2</packaging.config.order>
+ </properties>
</dependency>
<!-- parent config -->
Modified: geronimo/branches/1.1/configs/tomcat-deployer/project.properties
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.1/configs/tomcat-deployer/project.properties?rev=395709&r1=395708&r2=395709&view=diff
==============================================================================
--- geronimo/branches/1.1/configs/tomcat-deployer/project.properties (original)
+++ geronimo/branches/1.1/configs/tomcat-deployer/project.properties Thu Apr 20 15:02:48 2006
@@ -25,9 +25,6 @@
# Also will cause all config projects to be grouped together when imported into eclipse.
maven.eclipse.project.name=${geronimo.maven.eclipse.configs.project.prefix}${pom.artifactId}
-# just use basic GBean deployer
-geronimo.packaging.deploymentConfig=geronimo/geronimo-gbean-deployer/${geronimo_version}/car
-
PlanHTTPPort=8080
PlanHTTPSPort=8443
PlanOpenEJBPort=4201
Modified: geronimo/branches/1.1/configs/tomcat-deployer/project.xml
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.1/configs/tomcat-deployer/project.xml?rev=395709&r1=395708&r2=395709&view=diff
==============================================================================
--- geronimo/branches/1.1/configs/tomcat-deployer/project.xml (original)
+++ geronimo/branches/1.1/configs/tomcat-deployer/project.xml Thu Apr 20 15:02:48 2006
@@ -37,6 +37,9 @@
<artifactId>geronimo-gbean-deployer</artifactId>
<version>${geronimo_version}</version>
<type>car</type>
+ <properties>
+ <packaging.config.order>1</packaging.config.order>
+ </properties>
</dependency>
<!-- parent config -->
<dependency>
@@ -45,8 +48,9 @@
<version>${geronimo_version}</version>
<type>car</type>
<properties>
- <geronimo.import>true</geronimo.import>
- </properties>
+ <geronimo.import>true</geronimo.import>
+ <packaging.config.order>2</packaging.config.order>
+ </properties>
</dependency>
<dependency>
@@ -56,7 +60,7 @@
<type>car</type>
<properties>
<geronimo.dependency>true</geronimo.dependency>
- </properties>
+ </properties>
</dependency>
<!-- plan dependency -->
@@ -66,7 +70,7 @@
<version>${geronimo_version}</version>
<properties>
<geronimo.dependency>true</geronimo.dependency>
- </properties>
+ </properties>
</dependency>
<dependency>
Modified: geronimo/branches/1.1/configs/tomcat/project.properties
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.1/configs/tomcat/project.properties?rev=395709&r1=395708&r2=395709&view=diff
==============================================================================
--- geronimo/branches/1.1/configs/tomcat/project.properties (original)
+++ geronimo/branches/1.1/configs/tomcat/project.properties Thu Apr 20 15:02:48 2006
@@ -25,9 +25,6 @@
# Also will cause all config projects to be grouped together when imported into eclipse.
maven.eclipse.project.name=${geronimo.maven.eclipse.configs.project.prefix}${pom.artifactId}
-# just use basic GBean deployer
-geronimo.packaging.deploymentConfig=geronimo/geronimo-gbean-deployer/${geronimo_version}/car
-
PlanHTTPPort2=8090
PlanHTTPSPort2=8453
PlanAJPPort2=8019
Modified: geronimo/branches/1.1/configs/tomcat/project.xml
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.1/configs/tomcat/project.xml?rev=395709&r1=395708&r2=395709&view=diff
==============================================================================
--- geronimo/branches/1.1/configs/tomcat/project.xml (original)
+++ geronimo/branches/1.1/configs/tomcat/project.xml Thu Apr 20 15:02:48 2006
@@ -37,6 +37,9 @@
<artifactId>geronimo-gbean-deployer</artifactId>
<version>${geronimo_version}</version>
<type>car</type>
+ <properties>
+ <packaging.config.order>1</packaging.config.order>
+ </properties>
</dependency>
<!-- parent config -->
Modified: geronimo/branches/1.1/configs/uddi-jetty/project.properties
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.1/configs/uddi-jetty/project.properties?rev=395709&r1=395708&r2=395709&view=diff
==============================================================================
--- geronimo/branches/1.1/configs/uddi-jetty/project.properties (original)
+++ geronimo/branches/1.1/configs/uddi-jetty/project.properties Thu Apr 20 15:02:48 2006
@@ -25,7 +25,5 @@
# Also will cause all config projects to be grouped together when imported into eclipse.
maven.eclipse.project.name=${geronimo.maven.eclipse.configs.project.prefix}${pom.artifactId}
-geronimo.packaging.deploymentConfig=geronimo/geronimo-gbean-deployer/${geronimo_version}/car,geronimo/j2ee-deployer/${geronimo_version}/car,geronimo/jetty-deployer/${geronimo_version}/car
-
#geronimo.packaging.moduleFile=${maven.repo.local}/geronimo/wars/geronimo-uddi-server-${geronimo_version}.war
Modified: geronimo/branches/1.1/configs/uddi-jetty/project.xml
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.1/configs/uddi-jetty/project.xml?rev=395709&r1=395708&r2=395709&view=diff
==============================================================================
--- geronimo/branches/1.1/configs/uddi-jetty/project.xml (original)
+++ geronimo/branches/1.1/configs/uddi-jetty/project.xml Thu Apr 20 15:02:48 2006
@@ -37,18 +37,36 @@
<artifactId>geronimo-gbean-deployer</artifactId>
<version>${geronimo_version}</version>
<type>car</type>
+ <properties>
+ <packaging.config.order>1</packaging.config.order>
+ </properties>
</dependency>
<dependency>
<groupId>geronimo</groupId>
<artifactId>j2ee-deployer</artifactId>
<version>${geronimo_version}</version>
<type>car</type>
+ <properties>
+ <packaging.config.order>2</packaging.config.order>
+ </properties>
</dependency>
<dependency>
<groupId>geronimo</groupId>
<artifactId>jetty-deployer</artifactId>
<version>${geronimo_version}</version>
<type>car</type>
+ <properties>
+ <packaging.config.order>3</packaging.config.order>
+ </properties>
+ </dependency>
+ <dependency>
+ <groupId>geronimo</groupId>
+ <artifactId>openejb-deployer</artifactId>
+ <version>${geronimo_version}</version>
+ <type>car</type>
+ <properties>
+ <packaging.config.order>4</packaging.config.order>
+ </properties>
</dependency>
<!-- parent config -->
Modified: geronimo/branches/1.1/configs/uddi-tomcat/project.xml
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.1/configs/uddi-tomcat/project.xml?rev=395709&r1=395708&r2=395709&view=diff
==============================================================================
--- geronimo/branches/1.1/configs/uddi-tomcat/project.xml (original)
+++ geronimo/branches/1.1/configs/uddi-tomcat/project.xml Thu Apr 20 15:02:48 2006
@@ -37,18 +37,36 @@
<artifactId>geronimo-gbean-deployer</artifactId>
<version>${geronimo_version}</version>
<type>car</type>
+ <properties>
+ <packaging.config.order>1</packaging.config.order>
+ </properties>
</dependency>
<dependency>
<groupId>geronimo</groupId>
<artifactId>j2ee-deployer</artifactId>
<version>${geronimo_version}</version>
<type>car</type>
+ <properties>
+ <packaging.config.order>2</packaging.config.order>
+ </properties>
</dependency>
<dependency>
<groupId>geronimo</groupId>
<artifactId>tomcat-deployer</artifactId>
<version>${geronimo_version}</version>
<type>car</type>
+ <properties>
+ <packaging.config.order>3</packaging.config.order>
+ </properties>
+ </dependency>
+ <dependency>
+ <groupId>geronimo</groupId>
+ <artifactId>openejb-deployer</artifactId>
+ <version>${geronimo_version}</version>
+ <type>car</type>
+ <properties>
+ <packaging.config.order>4</packaging.config.order>
+ </properties>
</dependency>
<!-- parent config should be j2ee-server?-->
Modified: geronimo/branches/1.1/configs/unavailable-client-deployer/project.properties
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.1/configs/unavailable-client-deployer/project.properties?rev=395709&r1=395708&r2=395709&view=diff
==============================================================================
--- geronimo/branches/1.1/configs/unavailable-client-deployer/project.properties (original)
+++ geronimo/branches/1.1/configs/unavailable-client-deployer/project.properties Thu Apr 20 15:02:48 2006
@@ -21,5 +21,3 @@
maven.multiproject.type=car
-# just use basic GBean deployer
-geronimo.packaging.deploymentConfig=geronimo/geronimo-gbean-deployer/${geronimo_version}/car
Modified: geronimo/branches/1.1/configs/unavailable-client-deployer/project.xml
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.1/configs/unavailable-client-deployer/project.xml?rev=395709&r1=395708&r2=395709&view=diff
==============================================================================
--- geronimo/branches/1.1/configs/unavailable-client-deployer/project.xml (original)
+++ geronimo/branches/1.1/configs/unavailable-client-deployer/project.xml Thu Apr 20 15:02:48 2006
@@ -35,11 +35,21 @@
<dependency>
<groupId>geronimo</groupId>
+ <artifactId>geronimo-gbean-deployer</artifactId>
+ <version>${geronimo_version}</version>
+ <type>car</type>
+ <properties>
+ <packaging.config.order>1</packaging.config.order>
+ </properties>
+ </dependency>
+ <dependency>
+ <groupId>geronimo</groupId>
<type>car</type>
<artifactId>j2ee-deployer</artifactId>
<version>${pom.currentVersion}</version>
<properties>
<geronimo.import>true</geronimo.import>
+ <packaging.config.order>2</packaging.config.order>
</properties>
</dependency>
Modified: geronimo/branches/1.1/configs/unavailable-client-deployer/src/plan/plan.xml
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.1/configs/unavailable-client-deployer/src/plan/plan.xml?rev=395709&r1=395708&r2=395709&view=diff
==============================================================================
--- geronimo/branches/1.1/configs/unavailable-client-deployer/src/plan/plan.xml (original)
+++ geronimo/branches/1.1/configs/unavailable-client-deployer/src/plan/plan.xml Thu Apr 20 15:02:48 2006
@@ -20,6 +20,6 @@
>
- <gbean name="AppClientBuilder" class="org.apache.geronimo.j2ee.deployment.UnavailableModuleBuilder" />
+ <gbean name="UnavailableAppClientBuilder" class="org.apache.geronimo.j2ee.deployment.UnavailableModuleBuilder" />
</configuration>
Modified: geronimo/branches/1.1/configs/unavailable-ejb-deployer/project.xml
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.1/configs/unavailable-ejb-deployer/project.xml?rev=395709&r1=395708&r2=395709&view=diff
==============================================================================
--- geronimo/branches/1.1/configs/unavailable-ejb-deployer/project.xml (original)
+++ geronimo/branches/1.1/configs/unavailable-ejb-deployer/project.xml Thu Apr 20 15:02:48 2006
@@ -38,16 +38,19 @@
<artifactId>geronimo-gbean-deployer</artifactId>
<version>${geronimo_version}</version>
<type>car</type>
+ <properties>
+ <packaging.config.order>1</packaging.config.order>
+ </properties>
</dependency>
-
<dependency>
<groupId>geronimo</groupId>
<artifactId>j2ee-deployer</artifactId>
<version>${geronimo_version}</version>
<type>car</type>
<properties>
- <geronimo.import>true</geronimo.import>
- </properties>
+ <geronimo.import>true</geronimo.import>
+ <packaging.config.order>2</packaging.config.order>
+ </properties>
</dependency>
</dependencies>
Modified: geronimo/branches/1.1/configs/unavailable-ejb-deployer/src/plan/plan.xml
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.1/configs/unavailable-ejb-deployer/src/plan/plan.xml?rev=395709&r1=395708&r2=395709&view=diff
==============================================================================
--- geronimo/branches/1.1/configs/unavailable-ejb-deployer/src/plan/plan.xml (original)
+++ geronimo/branches/1.1/configs/unavailable-ejb-deployer/src/plan/plan.xml Thu Apr 20 15:02:48 2006
@@ -20,10 +20,10 @@
>
- <gbean name="EJBBuilder" class="org.apache.geronimo.j2ee.deployment.UnavailableModuleBuilder" />
+ <gbean name="UnavailableEJBBuilder" class="org.apache.geronimo.j2ee.deployment.UnavailableModuleBuilder" />
- <gbean name="ClientEJBReferenceBuilder" class="org.apache.geronimo.j2ee.deployment.UnavailableEJBReferenceBuilder" />
+ <gbean name="UnavailableClientEJBReferenceBuilder" class="org.apache.geronimo.j2ee.deployment.UnavailableEJBReferenceBuilder" />
- <gbean name="ServerEJBReferenceBuilder" class="org.apache.geronimo.j2ee.deployment.UnavailableEJBReferenceBuilder" />
+ <gbean name="UnavailableServerEJBReferenceBuilder" class="org.apache.geronimo.j2ee.deployment.UnavailableEJBReferenceBuilder" />
</configuration>
Modified: geronimo/branches/1.1/configs/unavailable-webservices-deployer/project.xml
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.1/configs/unavailable-webservices-deployer/project.xml?rev=395709&r1=395708&r2=395709&view=diff
==============================================================================
--- geronimo/branches/1.1/configs/unavailable-webservices-deployer/project.xml (original)
+++ geronimo/branches/1.1/configs/unavailable-webservices-deployer/project.xml Thu Apr 20 15:02:48 2006
@@ -34,22 +34,25 @@
</dependency>
<dependency>
- <groupId>geronimo</groupId>
- <artifactId>geronimo-gbean-deployer</artifactId>
- <version>${geronimo_version}</version>
- <type>car</type>
- </dependency>
-
- <dependency>
- <groupId>geronimo</groupId>
- <type>car</type>
- <artifactId>j2ee-deployer</artifactId>
- <version>${pom.currentVersion}</version>
- <properties>
- <geronimo.import>true</geronimo.import>
- </properties>
- </dependency>
-
+ <groupId>geronimo</groupId>
+ <artifactId>geronimo-gbean-deployer</artifactId>
+ <version>${geronimo_version}</version>
+ <type>car</type>
+ <properties>
+ <packaging.config.order>1</packaging.config.order>
+ </properties>
+ </dependency>
+ <dependency>
+ <groupId>geronimo</groupId>
+ <artifactId>j2ee-deployer</artifactId>
+ <version>${geronimo_version}</version>
+ <type>car</type>
+ <properties>
+ <geronimo.import>true</geronimo.import>
+ <packaging.config.order>2</packaging.config.order>
+ </properties>
+ </dependency>
+
</dependencies>
</project>
Modified: geronimo/branches/1.1/configs/welcome-jetty/project.xml
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.1/configs/welcome-jetty/project.xml?rev=395709&r1=395708&r2=395709&view=diff
==============================================================================
--- geronimo/branches/1.1/configs/welcome-jetty/project.xml (original)
+++ geronimo/branches/1.1/configs/welcome-jetty/project.xml Thu Apr 20 15:02:48 2006
@@ -37,18 +37,36 @@
<artifactId>geronimo-gbean-deployer</artifactId>
<version>${geronimo_version}</version>
<type>car</type>
+ <properties>
+ <packaging.config.order>1</packaging.config.order>
+ </properties>
</dependency>
<dependency>
<groupId>geronimo</groupId>
<artifactId>j2ee-deployer</artifactId>
<version>${geronimo_version}</version>
<type>car</type>
+ <properties>
+ <packaging.config.order>2</packaging.config.order>
+ </properties>
</dependency>
<dependency>
<groupId>geronimo</groupId>
<artifactId>jetty-deployer</artifactId>
<version>${geronimo_version}</version>
<type>car</type>
+ <properties>
+ <packaging.config.order>3</packaging.config.order>
+ </properties>
+ </dependency>
+ <dependency>
+ <groupId>geronimo</groupId>
+ <artifactId>openejb-deployer</artifactId>
+ <version>${geronimo_version}</version>
+ <type>car</type>
+ <properties>
+ <packaging.config.order>4</packaging.config.order>
+ </properties>
</dependency>
<!-- parent config -->
Modified: geronimo/branches/1.1/configs/welcome-tomcat/project.xml
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.1/configs/welcome-tomcat/project.xml?rev=395709&r1=395708&r2=395709&view=diff
==============================================================================
--- geronimo/branches/1.1/configs/welcome-tomcat/project.xml (original)
+++ geronimo/branches/1.1/configs/welcome-tomcat/project.xml Thu Apr 20 15:02:48 2006
@@ -37,18 +37,36 @@
<artifactId>geronimo-gbean-deployer</artifactId>
<version>${geronimo_version}</version>
<type>car</type>
+ <properties>
+ <packaging.config.order>1</packaging.config.order>
+ </properties>
</dependency>
<dependency>
<groupId>geronimo</groupId>
<artifactId>j2ee-deployer</artifactId>
<version>${geronimo_version}</version>
<type>car</type>
+ <properties>
+ <packaging.config.order>2</packaging.config.order>
+ </properties>
</dependency>
<dependency>
<groupId>geronimo</groupId>
- <artifactId>tomcat-deployer</artifactId>
+ <artifactId>jetty-deployer</artifactId>
<version>${geronimo_version}</version>
<type>car</type>
+ <properties>
+ <packaging.config.order>3</packaging.config.order>
+ </properties>
+ </dependency>
+ <dependency>
+ <groupId>geronimo</groupId>
+ <artifactId>openejb-deployer</artifactId>
+ <version>${geronimo_version}</version>
+ <type>car</type>
+ <properties>
+ <packaging.config.order>4</packaging.config.order>
+ </properties>
</dependency>
<!-- parent config -->
Modified: geronimo/branches/1.1/plugins/geronimo-packaging-plugin/plugin.jelly
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.1/plugins/geronimo-packaging-plugin/plugin.jelly?rev=395709&r1=395708&r2=395709&view=diff
==============================================================================
--- geronimo/branches/1.1/plugins/geronimo-packaging-plugin/plugin.jelly (original)
+++ geronimo/branches/1.1/plugins/geronimo-packaging-plugin/plugin.jelly Thu Apr 20 15:02:48 2006
@@ -52,7 +52,6 @@
artifacts="${pom.artifacts}"
pluginArtifacts="${plugin.artifacts}"
repository="${geronimo.packaging.repository}"
- deploymentConfig="${geronimo.packaging.deploymentConfig}"
deployerName="${geronimo.packaging.deployerName}"
planFile="${geronimo.packaging.buildFile}"
moduleFile="${geronimo.packaging.moduleFile}"
Modified: geronimo/branches/1.1/plugins/geronimo-packaging-plugin/src/java/org/apache/geronimo/plugin/packaging/PackageBuilder.java
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.1/plugins/geronimo-packaging-plugin/src/java/org/apache/geronimo/plugin/packaging/PackageBuilder.java?rev=395709&r1=395708&r2=395709&view=diff
==============================================================================
--- geronimo/branches/1.1/plugins/geronimo-packaging-plugin/src/java/org/apache/geronimo/plugin/packaging/PackageBuilder.java (original)
+++ geronimo/branches/1.1/plugins/geronimo-packaging-plugin/src/java/org/apache/geronimo/plugin/packaging/PackageBuilder.java Thu Apr 20 15:02:48 2006
@@ -20,6 +20,7 @@
import java.net.URI;
import java.util.Iterator;
import java.util.List;
+import java.util.Collection;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
@@ -75,8 +76,8 @@
private String configurationStoreClass;
private File repository;
- private String deploymentConfigString;
- private Artifact[] deploymentConfig;
+ private Collection deploymentConfigs;
+// private Artifact[] deploymentConfig;
private AbstractName deployerName;
private File planFile;
@@ -120,8 +121,8 @@
this.repository = repository;
}
- public String getDeploymentConfig() {
- return deploymentConfigString;
+ public Collection getDeploymentConfig() {
+ return deploymentConfigs;
}
/**
@@ -129,14 +130,8 @@
*
* @param deploymentConfigString comma-separated list of the ids of the Configurations performing the deployment
*/
- public void setDeploymentConfig(String deploymentConfigString) {
- this.deploymentConfigString = deploymentConfigString;
- String[] configNames = deploymentConfigString.split(",");
- deploymentConfig = new Artifact[configNames.length];
- for (int i = 0; i < configNames.length; i++) {
- String configName = configNames[i];
- deploymentConfig[i] = Artifact.create(configName);
- }
+ public void setDeploymentConfig(Collection deploymentConfigString) {
+ this.deploymentConfigs = deploymentConfigString;
}
public String getDeployerName() {
@@ -247,8 +242,9 @@
// start the Configuration we're going to use for this deployment
ConfigurationManager configurationManager = ConfigurationUtil.getConfigurationManager(kernel);
try {
- for (int i = 0; i < deploymentConfig.length; i++) {
- Artifact configName = deploymentConfig[i];
+ for (Iterator iterator = deploymentConfigs.iterator(); iterator.hasNext();) {
+ String artifactName = (String) iterator.next();
+ Artifact configName = Artifact.create(artifactName);
if (!configurationManager.isLoaded(configName)) {
configurationManager.loadConfiguration(configName);
configurationManager.startConfiguration(configName);
Modified: geronimo/branches/1.1/plugins/geronimo-packaging-plugin/src/java/org/apache/geronimo/plugin/packaging/PackageBuilderShell.java
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.1/plugins/geronimo-packaging-plugin/src/java/org/apache/geronimo/plugin/packaging/PackageBuilderShell.java?rev=395709&r1=395708&r2=395709&view=diff
==============================================================================
--- geronimo/branches/1.1/plugins/geronimo-packaging-plugin/src/java/org/apache/geronimo/plugin/packaging/PackageBuilderShell.java (original)
+++ geronimo/branches/1.1/plugins/geronimo-packaging-plugin/src/java/org/apache/geronimo/plugin/packaging/PackageBuilderShell.java Thu Apr 20 15:02:48 2006
@@ -25,6 +25,8 @@
import java.util.ArrayList;
import java.util.Iterator;
import java.util.List;
+import java.util.TreeMap;
+import java.util.Collection;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
@@ -41,6 +43,7 @@
*/
public class PackageBuilderShell {
private static final String PACKAGING_CLASSPATH_PROPERTY = "packaging.classpath";
+ private static final String PACKAGING_CONFIG_PROPERTY = "packaging.config.order";
private static Log log = LogFactory.getLog(PlanProcessor.class);
private List artifacts;
@@ -50,7 +53,7 @@
private static ClassLoader classLoader;
private File repository;
- private String deploymentConfigString;
+ private Collection deploymentConfigList;
private String deployerName;
private File planFile;
@@ -75,19 +78,6 @@
this.repository = repository;
}
- public String getDeploymentConfig() {
- return deploymentConfigString;
- }
-
- /**
- * Set the id of the Configuration to use to perform the packaging.
- *
- * @param deploymentConfigString comma-separated list of the ids of the Configurations performing the deployment
- */
- public void setDeploymentConfig(String deploymentConfigString) {
- this.deploymentConfigString = deploymentConfigString;
- }
-
public String getDeployerName() {
return deployerName;
}
@@ -183,6 +173,23 @@
public void setArtifacts(List artifacts) {
this.artifacts = artifacts;
+ TreeMap tree = new TreeMap();
+ for (Iterator iterator = artifacts.iterator(); iterator.hasNext();) {
+ Artifact artifact = (Artifact) iterator.next();
+ Dependency dependency = artifact.getDependency();
+ if (dependency.getProperty(PACKAGING_CONFIG_PROPERTY) != null) {
+ String orderString = dependency.getProperty(PACKAGING_CONFIG_PROPERTY);
+ try {
+ Integer order = Integer.decode(orderString);
+ String artifactString = dependency.getGroupId() + "/" + dependency.getArtifactId() + "/" + dependency.getVersion() + "/" + dependency.getType();
+ tree.put(order, artifactString);
+ } catch(NumberFormatException e) {
+ System.out.println("Could not interpret order for " + dependency);
+ }
+ }
+ }
+
+ deploymentConfigList = tree.values();
}
public List getPluginArtifacts() {
@@ -214,7 +221,7 @@
Object packageBuilder = getPackageBuilder();
set("setClassPath", classPath, String.class, packageBuilder);
set("setDeployerName", deployerName, String.class, packageBuilder);
- set("setDeploymentConfig", deploymentConfigString, String.class, packageBuilder);
+ set("setDeploymentConfig", deploymentConfigList, Collection.class, packageBuilder);
set("setEndorsedDirs", endorsedDirs, String.class, packageBuilder);
set("setExtensionDirs", extensionDirs, String.class, packageBuilder);
set("setMainClass", mainClass, String.class, packageBuilder);
@@ -246,17 +253,18 @@
List urls = new ArrayList();
for (Iterator iterator = pluginArtifacts.iterator(); iterator.hasNext();) {
Artifact artifact = (Artifact) iterator.next();
- Dependency dependency = (Dependency) artifact.getDependency();
+ Dependency dependency = artifact.getDependency();
if ("true".equals(dependency.getProperty(PACKAGING_CLASSPATH_PROPERTY))) {
String urlString = artifact.getUrlPath();
URL url = new File(repo + urlString).toURL();
urls.add(url);
}
}
+
boolean found = false;
for (Iterator iterator = artifacts.iterator(); iterator.hasNext();) {
Artifact artifact = (Artifact) iterator.next();
- Dependency dependency = (Dependency) artifact.getDependency();
+ Dependency dependency = artifact.getDependency();
if ("geronimo".equals(dependency.getGroupId())
&& "geronimo-packaging-plugin".equals(dependency.getArtifactId())
&& "plugin".equals(dependency.getType())) {
Modified: geronimo/branches/1.1/plugins/geronimo-packaging-plugin/src/java/org/apache/geronimo/plugin/packaging/PackagingCommandLine.java
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.1/plugins/geronimo-packaging-plugin/src/java/org/apache/geronimo/plugin/packaging/PackagingCommandLine.java?rev=395709&r1=395708&r2=395709&view=diff
==============================================================================
--- geronimo/branches/1.1/plugins/geronimo-packaging-plugin/src/java/org/apache/geronimo/plugin/packaging/PackagingCommandLine.java (original)
+++ geronimo/branches/1.1/plugins/geronimo-packaging-plugin/src/java/org/apache/geronimo/plugin/packaging/PackagingCommandLine.java Thu Apr 20 15:02:48 2006
@@ -20,6 +20,8 @@
import java.io.InputStream;
import java.io.FileInputStream;
import java.util.Properties;
+import java.util.Collection;
+import java.util.Arrays;
/**
* @version $Rev$ $Date$
@@ -69,7 +71,9 @@
builder.setClassPath(config.getProperty("classPath"));
builder.setConfigurationStoreClass(config.getProperty("configurationStoreClass"));
builder.setDeployerName(config.getProperty("deployerName"));
- builder.setDeploymentConfig(config.getProperty("deploymentConfig"));
+ String[] artifactNames = config.getProperty("deploymentConfig").split("/");
+ Collection configs = Arrays.asList(artifactNames);
+ builder.setDeploymentConfig(configs);
builder.setEndorsedDirs(config.getProperty("endorsedDirs"));
builder.setExtensionDirs(config.getProperty("extensionDirs"));
builder.setMainClass(config.getProperty("mainClass"));