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 2005/11/03 21:07:28 UTC
svn commit: r330620 - in /geronimo/trunk: configs/activemq-broker/
configs/activemq-broker/src/plan/ configs/client/ configs/client/src/plan/
configs/j2ee-corba/ configs/j2ee-corba/src/plan/ configs/j2ee-deployer/
configs/j2ee-deployer/src/plan/ config...
Author: djencks
Date: Thu Nov 3 12:07:18 2005
New Revision: 330620
URL: http://svn.apache.org/viewcvs?rev=330620&view=rev
Log:
Slight progress on GERONIMO-1126. Improve plugin, use it in a couple configs
Added:
geronimo/trunk/plugins/geronimo-packaging-plugin/src/java/org/apache/geronimo/plugin/packaging/PlanProcessor.java
Modified:
geronimo/trunk/configs/activemq-broker/project.xml
geronimo/trunk/configs/activemq-broker/src/plan/plan.xml
geronimo/trunk/configs/client/project.xml
geronimo/trunk/configs/client/src/plan/plan.xml
geronimo/trunk/configs/j2ee-corba/project.xml
geronimo/trunk/configs/j2ee-corba/src/plan/plan.xml
geronimo/trunk/configs/j2ee-deployer/project.xml
geronimo/trunk/configs/j2ee-deployer/src/plan/plan.xml
geronimo/trunk/configs/j2ee-security/project.xml
geronimo/trunk/configs/j2ee-security/src/plan/plan.xml
geronimo/trunk/configs/j2ee-server/project.xml
geronimo/trunk/configs/j2ee-server/src/plan/plan.xml
geronimo/trunk/configs/jetty-deployer/project.xml
geronimo/trunk/configs/jetty-deployer/src/plan/plan.xml
geronimo/trunk/configs/rmi-naming/project.xml
geronimo/trunk/configs/rmi-naming/src/plan/plan.xml
geronimo/trunk/configs/tomcat-deployer/project.xml
geronimo/trunk/plugins/geronimo-packaging-plugin/plugin.jelly
geronimo/trunk/plugins/geronimo-packaging-plugin/project.xml
geronimo/trunk/plugins/geronimo-packaging-plugin/src/java/org/apache/geronimo/plugin/packaging/PackageBuilder.java
Modified: geronimo/trunk/configs/activemq-broker/project.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/configs/activemq-broker/project.xml?rev=330620&r1=330619&r2=330620&view=diff
==============================================================================
--- geronimo/trunk/configs/activemq-broker/project.xml (original)
+++ geronimo/trunk/configs/activemq-broker/project.xml Thu Nov 3 12:07:18 2005
@@ -31,6 +31,9 @@
<artifactId>system-database</artifactId>
<version>${geronimo_version}</version>
<type>car</type>
+ <properties>
+ <geronimo.import>true</geronimo.import>
+ </properties>
</dependency>
<dependency>
<groupId>geronimo</groupId>
@@ -179,13 +182,27 @@
</dependency>
<dependency>
<groupId>activemq</groupId>
- <artifactId>activemq-gbean-management</artifactId>
+ <artifactId>activemq-core</artifactId>
<version>${activemq_version}</version>
+ <properties>
+ <geronimo.dependency>true</geronimo.dependency>
+ </properties>
+ </dependency>
+ <dependency>
+ <groupId>activemq</groupId>
+ <artifactId>activemq-gbean</artifactId>
+ <version>${activemq_version}</version>
+ <properties>
+ <geronimo.dependency>true</geronimo.dependency>
+ </properties>
</dependency>
<dependency>
<groupId>activeio</groupId>
<artifactId>activeio</artifactId>
<version>${activeio_version}</version>
+ <properties>
+ <geronimo.dependency>true</geronimo.dependency>
+ </properties>
</dependency>
<dependency>
Modified: geronimo/trunk/configs/activemq-broker/src/plan/plan.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/configs/activemq-broker/src/plan/plan.xml?rev=330620&r1=330619&r2=330620&view=diff
==============================================================================
--- geronimo/trunk/configs/activemq-broker/src/plan/plan.xml (original)
+++ geronimo/trunk/configs/activemq-broker/src/plan/plan.xml Thu Nov 3 12:07:18 2005
@@ -17,14 +17,14 @@
-->
<!-- $Rev: 47568 $ $Date: 2004-09-30 01:21:54 -0700 (Thu, 30 Sep 2004) $ -->
-
+<!-- parentId="${pom.groupId}/cars/system-database-${pom.currentVersion}.car"
+-->
<configuration
xmlns="http://geronimo.apache.org/xml/ns/deployment-1.0"
configId="${pom.groupId}/cars/${pom.artifactId}-${pom.currentVersion}.car"
- parentId="${pom.groupId}/cars/system-database-${pom.currentVersion}.car"
>
- <dependency>
+<!-- <dependency>
<uri>activemq/jars/activemq-core-${activemq_version}.jar</uri>
</dependency>
<dependency>
@@ -33,7 +33,7 @@
<dependency>
<uri>activeio/jars/activeio-${activeio_version}.jar</uri>
</dependency>
-
+-->
<!-- management -->
<gbean name="ActiveMQ" class="org.activemq.gbean.management.ActiveMQManagerGBean" />
Modified: geronimo/trunk/configs/client/project.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/configs/client/project.xml?rev=330620&r1=330619&r2=330620&view=diff
==============================================================================
--- geronimo/trunk/configs/client/project.xml (original)
+++ geronimo/trunk/configs/client/project.xml Thu Nov 3 12:07:18 2005
@@ -31,6 +31,9 @@
<artifactId>client-system</artifactId>
<version>${geronimo_version}</version>
<type>car</type>
+ <properties>
+ <geronimo.import>true</geronimo.import>
+ </properties>
</dependency>
<dependency>
<groupId>geronimo</groupId>
@@ -49,42 +52,70 @@
<groupId>geronimo-spec</groupId>
<artifactId>geronimo-spec-j2ee</artifactId>
<version>${geronimo_spec_j2ee_version}</version>
+ <properties>
+ <geronimo.dependency>true</geronimo.dependency>
+ </properties>
</dependency>
<dependency>
<groupId>geronimo</groupId>
<artifactId>geronimo-activation</artifactId>
<version>${geronimo_version}</version>
+ <properties>
+ <geronimo.dependency>true</geronimo.dependency>
+ </properties>
</dependency>
+ <!--connector deploys some jsr 77 beans... maybe this shoult be turned off-->
<dependency>
<groupId>geronimo</groupId>
<artifactId>geronimo-management</artifactId>
<version>${geronimo_version}</version>
+ <properties>
+ <geronimo.dependency>true</geronimo.dependency>
+ </properties>
</dependency>
+ <!--connector deploys some jsr 77 beans... maybe this shoult be turned off-->
<dependency>
<groupId>geronimo</groupId>
<artifactId>geronimo-j2ee</artifactId>
<version>${geronimo_version}</version>
+ <properties>
+ <geronimo.dependency>true</geronimo.dependency>
+ </properties>
</dependency>
+ <!-- client side connector support -->
<dependency>
<groupId>geronimo</groupId>
<artifactId>geronimo-core</artifactId>
<version>${geronimo_version}</version>
+ <properties>
+ <geronimo.dependency>true</geronimo.dependency>
+ </properties>
</dependency>
+ <!-- for property editor support for some login modules/principals -->
<dependency>
<groupId>geronimo</groupId>
<artifactId>geronimo-common</artifactId>
<version>${geronimo_version}</version>
+ <properties>
+ <geronimo.dependency>true</geronimo.dependency>
+ </properties>
</dependency>
<dependency>
<groupId>geronimo</groupId>
<artifactId>geronimo-connector</artifactId>
<version>${geronimo_version}</version>
+ <properties>
+ <geronimo.dependency>true</geronimo.dependency>
+ </properties>
</dependency>
<dependency>
<groupId>geronimo</groupId>
<artifactId>geronimo-naming</artifactId>
<version>${geronimo_version}</version>
+ <properties>
+ <geronimo.dependency>true</geronimo.dependency>
+ </properties>
</dependency>
<dependency>
<groupId>geronimo</groupId>
@@ -95,16 +126,25 @@
<groupId>geronimo</groupId>
<artifactId>geronimo-transaction</artifactId>
<version>${geronimo_version}</version>
+ <properties>
+ <geronimo.dependency>true</geronimo.dependency>
+ </properties>
</dependency>
<dependency>
<groupId>geronimo</groupId>
<artifactId>geronimo-security</artifactId>
<version>${geronimo_version}</version>
+ <properties>
+ <geronimo.dependency>true</geronimo.dependency>
+ </properties>
</dependency>
<dependency>
<groupId>geronimo</groupId>
<artifactId>geronimo-webservices</artifactId>
<version>${geronimo_version}</version>
+ <properties>
+ <geronimo.dependency>true</geronimo.dependency>
+ </properties>
</dependency>
<dependency>
<groupId>geronimo</groupId>
@@ -115,11 +155,17 @@
<groupId>geronimo</groupId>
<artifactId>geronimo-client</artifactId>
<version>${geronimo_version}</version>
+ <properties>
+ <geronimo.dependency>true</geronimo.dependency>
+ </properties>
</dependency>
<dependency>
<groupId>geronimo</groupId>
<artifactId>geronimo-axis</artifactId>
<version>${geronimo_version}</version>
+ <properties>
+ <geronimo.dependency>true</geronimo.dependency>
+ </properties>
</dependency>
<dependency>
<groupId>geronimo</groupId>
@@ -136,6 +182,9 @@
<groupId>concurrent</groupId>
<artifactId>concurrent</artifactId>
<version>${concurrent_version}</version>
+ <properties>
+ <geronimo.dependency>true</geronimo.dependency>
+ </properties>
</dependency>
<dependency>
<groupId>tranql</groupId>
@@ -146,6 +195,9 @@
<groupId>openejb</groupId>
<artifactId>openejb-core</artifactId>
<version>${openejb_version}</version>
+ <properties>
+ <geronimo.dependency>true</geronimo.dependency>
+ </properties>
</dependency>
<dependency>
<groupId>howl</groupId>
@@ -157,6 +209,7 @@
<artifactId>antlr</artifactId>
<version>${antlr_version}</version>
</dependency>
+ <!-- required for rar 1.5 to load realms -->
<dependency>
<groupId>regexp</groupId>
<artifactId>regexp</artifactId>
@@ -176,6 +229,9 @@
<groupId>asm</groupId>
<artifactId>asm</artifactId>
<version>${asm_version}</version>
+ <properties>
+ <geronimo.dependency>true</geronimo.dependency>
+ </properties>
</dependency>
<dependency>
<groupId>activemq</groupId>
@@ -186,6 +242,9 @@
<groupId>activeio</groupId>
<artifactId>activeio</artifactId>
<version>${activeio_version}</version>
+ <properties>
+ <geronimo.dependency>true</geronimo.dependency>
+ </properties>
</dependency>
<dependency>
@@ -193,6 +252,42 @@
<artifactId>org.mortbay.jetty</artifactId>
<version>${jetty_version}</version>
</dependency>
+ <dependency>
+ <groupId>scout</groupId>
+ <artifactId>jaxr-api</artifactId>
+ <version>${scout_version}</version>
+ <properties>
+ <geronimo.dependency>true</geronimo.dependency>
+ </properties>
+ </dependency>
+
+ <dependency>
+ <groupId>scout</groupId>
+ <artifactId>scout</artifactId>
+ <version>${scout_version}</version>
+ <properties>
+ <geronimo.dependency>true</geronimo.dependency>
+ </properties>
+ </dependency>
+
+ <dependency>
+ <groupId>juddi</groupId>
+ <artifactId>juddi</artifactId>
+ <version>${juddi_version}</version>
+ <properties>
+ <geronimo.dependency>true</geronimo.dependency>
+ </properties>
+ </dependency>
+
+ <dependency>
+ <groupId>jdom</groupId>
+ <artifactId>jdom</artifactId>
+ <version>${jdom_version}</version>
+ <properties>
+ <geronimo.dependency>true</geronimo.dependency>
+ </properties>
+ </dependency>
+
</dependencies>
</project>
Modified: geronimo/trunk/configs/client/src/plan/plan.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/configs/client/src/plan/plan.xml?rev=330620&r1=330619&r2=330620&view=diff
==============================================================================
--- geronimo/trunk/configs/client/src/plan/plan.xml (original)
+++ geronimo/trunk/configs/client/src/plan/plan.xml Thu Nov 3 12:07:18 2005
@@ -23,20 +23,19 @@
This configuration should contain those services normally provided
by the app client.
+ parentId="${pom.groupId}/cars/client-system-${pom.currentVersion}.car"
-->
<configuration
xmlns="http://geronimo.apache.org/xml/ns/deployment-1.0"
configId="${pom.groupId}/cars/${pom.artifactId}-${pom.currentVersion}.car"
- parentId="${pom.groupId}/cars/client-system-${pom.currentVersion}.car"
>
-
+<!--
<dependency>
<uri>geronimo-spec/jars/geronimo-spec-j2ee-${geronimo_spec_j2ee_version}.jar</uri>
</dependency>
<dependency>
<uri>geronimo/jars/geronimo-client-${geronimo_version}.jar</uri>
</dependency>
- <!-- for property editor support for some login modules/principals -->
<dependency>
<uri>geronimo/jars/geronimo-common-${geronimo_version}.jar</uri>
</dependency>
@@ -53,7 +52,6 @@
<uri>openejb/jars/openejb-core-${openejb_version}.jar</uri>
</dependency>
- <!-- client side connector support -->
<dependency>
<uri>geronimo/jars/geronimo-core-${geronimo_version}.jar</uri>
</dependency>
@@ -69,11 +67,9 @@
<dependency>
<uri>tranql/jars/tranql-${tranql_version}.jar</uri>
</dependency>
- <!-- required for rar 1.5 to load realms -->
<dependency>
<uri>regexp/jars/regexp-${regexp_version}.jar</uri>
</dependency>
- <!--connector deploys some jsr 77 beans... maybe this shoult be turned off-->
<dependency>
<uri>geronimo/jars/geronimo-j2ee-${geronimo_version}.jar</uri>
</dependency>
@@ -81,11 +77,9 @@
<uri>geronimo/jars/geronimo-management-${geronimo_version}.jar</uri>
</dependency>
- <!-- remote login -->
<dependency>
<uri>activeio/jars/activeio-${activeio_version}.jar</uri>
</dependency>
- <!--client side web services-->
<dependency>
<uri>asm/jars/asm-${asm_version}.jar</uri>
</dependency>
@@ -98,7 +92,6 @@
<uri>geronimo/jars/geronimo-webservices-${geronimo_version}.jar</uri>
</dependency>
- <!--scout -->
<dependency>
<uri>scout/jars/jaxr-api-${scout_version}.jar</uri>
</dependency>
@@ -114,7 +107,7 @@
<dependency>
<uri>jdom/jars/jdom-1.0.jar</uri>
</dependency>
-
+-->
<!-- Naming properties -->
<gbean name="NamingProperties" class="org.apache.geronimo.system.properties.NamingProperties">
<attribute name="namingFactoryInitial">com.sun.jndi.rmi.registry.RegistryContextFactory</attribute>
Modified: geronimo/trunk/configs/j2ee-corba/project.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/configs/j2ee-corba/project.xml?rev=330620&r1=330619&r2=330620&view=diff
==============================================================================
--- geronimo/trunk/configs/j2ee-corba/project.xml (original)
+++ geronimo/trunk/configs/j2ee-corba/project.xml Thu Nov 3 12:07:18 2005
@@ -31,6 +31,9 @@
<artifactId>j2ee-server</artifactId>
<version>${geronimo_version}</version>
<type>car</type>
+ <properties>
+ <geronimo.import>true</geronimo.import>
+ </properties>
</dependency>
<dependency>
<groupId>geronimo</groupId>
Modified: geronimo/trunk/configs/j2ee-corba/src/plan/plan.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/configs/j2ee-corba/src/plan/plan.xml?rev=330620&r1=330619&r2=330620&view=diff
==============================================================================
--- geronimo/trunk/configs/j2ee-corba/src/plan/plan.xml (original)
+++ geronimo/trunk/configs/j2ee-corba/src/plan/plan.xml Thu Nov 3 12:07:18 2005
@@ -20,12 +20,12 @@
<!--
Configuration for corba on a Geronimo serverl, including client and target security examples.
+ parentId="${pom.groupId}/cars/j2ee-server-${pom.currentVersion}.car"
-->
<configuration
xmlns="http://geronimo.apache.org/xml/ns/deployment-1.0"
configId="${pom.groupId}/cars/${pom.artifactId}-${pom.currentVersion}.car"
- parentId="${pom.groupId}/cars/j2ee-server-${pom.currentVersion}.car"
>
<!-- CORBA -->
Modified: geronimo/trunk/configs/j2ee-deployer/project.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/configs/j2ee-deployer/project.xml?rev=330620&r1=330619&r2=330620&view=diff
==============================================================================
--- geronimo/trunk/configs/j2ee-deployer/project.xml (original)
+++ geronimo/trunk/configs/j2ee-deployer/project.xml Thu Nov 3 12:07:18 2005
@@ -20,7 +20,8 @@
<project>
<pomVersion>3</pomVersion>
- <extend>../../etc/project.xml</extend>
+ <extend>../j2ee-server/project.xml</extend>
+<!-- <extend>../../etc/project.xml</extend>-->
<id>j2ee-deployer</id>
<name>Configuration for performing J2EE deployments</name>
@@ -30,7 +31,19 @@
<artifactId>geronimo-gbean-deployer</artifactId>
<version>${geronimo_version}</version>
<type>car</type>
- </dependency>
+ <properties>
+ <geronimo.import>true</geronimo.import>
+ </properties>
+ </dependency>
+ <dependency>
+ <groupId>geronimo</groupId>
+ <type>car</type>
+ <artifactId>j2ee-server</artifactId>
+ <version>${pom.currentVersion}</version>
+ <properties>
+ <geronimo.import>true</geronimo.import>
+ </properties>
+ </dependency>
<!-- dependencies from gbean-deployer needed as maven adds service builder to the maven.root classloader -->
<dependency>
@@ -69,6 +82,23 @@
<version>${stax_api_version}</version>
</dependency>
+<!-- <dependency>
+ <groupId>concurrent</groupId>
+ <artifactId>concurrent</artifactId>
+ <version>${concurrent_version}</version>
+ </dependency>
+ <dependency>
+ <groupId>howl</groupId>
+ <artifactId>howl-logger</artifactId>
+ <version>${howl_version}</version>
+ <url>http://forge.objectweb.org/projects/howl</url>
+ </dependency>
+ <dependency>
+ <groupId>activeio</groupId>
+ <artifactId>activeio</artifactId>
+ <version>${activeio_version}</version>
+ </dependency>
+-->
<!-- dependencies from plan -->
<!-- common libraries used by all builders -->
@@ -76,31 +106,49 @@
<groupId>geronimo-spec</groupId>
<artifactId>geronimo-spec-j2ee</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>
<version>${geronimo_spec_corba_version}</version>
+ <properties>
+ <geronimo.dependency>true</geronimo.dependency>
+ </properties>
</dependency>
<dependency>
<groupId>geronimo</groupId>
<artifactId>geronimo-j2ee-schema</artifactId>
<version>${geronimo_version}</version>
+ <properties>
+ <geronimo.dependency>true</geronimo.dependency>
+ </properties>
</dependency>
<dependency>
<groupId>geronimo</groupId>
<artifactId>geronimo-core</artifactId>
<version>${geronimo_version}</version>
+ <properties>
+ <geronimo.dependency>true</geronimo.dependency>
+ </properties>
</dependency>
<dependency>
<groupId>geronimo</groupId>
<artifactId>geronimo-management</artifactId>
<version>${geronimo_version}</version>
+ <properties>
+ <geronimo.dependency>true</geronimo.dependency>
+ </properties>
</dependency>
<dependency>
<groupId>geronimo</groupId>
<artifactId>geronimo-transaction</artifactId>
<version>${geronimo_version}</version>
+ <properties>
+ <geronimo.dependency>true</geronimo.dependency>
+ </properties>
</dependency>
@@ -110,46 +158,73 @@
<groupId>geronimo</groupId>
<artifactId>geronimo-j2ee-builder</artifactId>
<version>${geronimo_version}</version>
+ <properties>
+ <geronimo.dependency>true</geronimo.dependency>
+ </properties>
</dependency>
<dependency>
<groupId>geronimo</groupId>
<artifactId>geronimo-client-builder</artifactId>
<version>${geronimo_version}</version>
+ <properties>
+ <geronimo.dependency>true</geronimo.dependency>
+ </properties>
</dependency>
<dependency>
<groupId>geronimo</groupId>
<artifactId>geronimo-naming-builder</artifactId>
<version>${geronimo_version}</version>
+ <properties>
+ <geronimo.dependency>true</geronimo.dependency>
+ </properties>
</dependency>
<dependency>
<groupId>geronimo</groupId>
<artifactId>geronimo-naming</artifactId>
<version>${geronimo_version}</version>
+ <properties>
+ <geronimo.dependency>true</geronimo.dependency>
+ </properties>
</dependency>
<dependency>
<groupId>geronimo</groupId>
<artifactId>geronimo-security-builder</artifactId>
<version>${geronimo_version}</version>
+ <properties>
+ <geronimo.dependency>true</geronimo.dependency>
+ </properties>
</dependency>
<dependency>
<groupId>geronimo</groupId>
<artifactId>geronimo-security</artifactId>
<version>${geronimo_version}</version>
+ <properties>
+ <geronimo.dependency>true</geronimo.dependency>
+ </properties>
</dependency>
<dependency>
<groupId>geronimo</groupId>
<artifactId>geronimo-axis-builder</artifactId>
<version>${geronimo_version}</version>
+ <properties>
+ <geronimo.dependency>true</geronimo.dependency>
+ </properties>
</dependency>
<dependency>
<groupId>geronimo</groupId>
<artifactId>geronimo-axis</artifactId>
<version>${geronimo_version}</version>
+ <properties>
+ <geronimo.dependency>true</geronimo.dependency>
+ </properties>
</dependency>
<dependency>
<groupId>geronimo</groupId>
<artifactId>geronimo-webservices</artifactId>
<version>${geronimo_version}</version>
+ <properties>
+ <geronimo.dependency>true</geronimo.dependency>
+ </properties>
</dependency>
<dependency>
<groupId>axis</groupId>
@@ -167,6 +242,9 @@
<groupId>geronimo</groupId>
<artifactId>geronimo-web-builder</artifactId>
<version>${geronimo_version}</version>
+ <properties>
+ <geronimo.dependency>true</geronimo.dependency>
+ </properties>
</dependency>
<dependency>
<groupId>geronimo</groupId>
@@ -189,21 +267,33 @@
<groupId>openejb</groupId>
<artifactId>openejb-builder</artifactId>
<version>${openejb_version}</version>
+ <properties>
+ <geronimo.dependency>true</geronimo.dependency>
+ </properties>
</dependency>
<dependency>
<groupId>openejb</groupId>
<artifactId>openejb-pkgen-builder</artifactId>
<version>${openejb_version}</version>
+ <properties>
+ <geronimo.dependency>true</geronimo.dependency>
+ </properties>
</dependency>
<dependency>
<groupId>openejb</groupId>
<artifactId>openejb-core</artifactId>
<version>${openejb_version}</version>
+ <properties>
+ <geronimo.dependency>true</geronimo.dependency>
+ </properties>
</dependency>
<dependency>
<groupId>tranql</groupId>
<artifactId>tranql</artifactId>
<version>${tranql_version}</version>
+ <properties>
+ <geronimo.dependency>true</geronimo.dependency>
+ </properties>
</dependency>
<!-- RARs using Geronimo Connector implementation -->
@@ -211,11 +301,17 @@
<groupId>geronimo</groupId>
<artifactId>geronimo-connector-builder</artifactId>
<version>${geronimo_version}</version>
+ <properties>
+ <geronimo.dependency>true</geronimo.dependency>
+ </properties>
</dependency>
<dependency>
<groupId>geronimo</groupId>
<artifactId>geronimo-connector</artifactId>
<version>${geronimo_version}</version>
+ <properties>
+ <geronimo.dependency>true</geronimo.dependency>
+ </properties>
</dependency>
<!-- JBI using ServiceMix -->
@@ -223,6 +319,9 @@
<groupId>geronimo</groupId>
<artifactId>geronimo-servicemix-builder</artifactId>
<version>${geronimo_version}</version>
+ <properties>
+ <geronimo.dependency>true</geronimo.dependency>
+ </properties>
</dependency>
</dependencies>
</project>
Modified: geronimo/trunk/configs/j2ee-deployer/src/plan/plan.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/configs/j2ee-deployer/src/plan/plan.xml?rev=330620&r1=330619&r2=330620&view=diff
==============================================================================
--- geronimo/trunk/configs/j2ee-deployer/src/plan/plan.xml (original)
+++ geronimo/trunk/configs/j2ee-deployer/src/plan/plan.xml Thu Nov 3 12:07:18 2005
@@ -16,12 +16,20 @@
limitations under the License.
-->
+<!--
+ parentId="${pom.groupId}/cars/geronimo-gbean-deployer-${pom.currentVersion}.car"
+-->
<configuration xmlns="http://geronimo.apache.org/xml/ns/deployment-1.0"
configId="${pom.groupId}/cars/${pom.artifactId}-${pom.currentVersion}.car"
- parentId="${pom.groupId}/cars/geronimo-gbean-deployer-${pom.currentVersion}.car"
>
-
- <!-- common libraries used by all builders -->
+<!--
+ <import>
+ <groupId>geronimo</groupId>
+ <type>car</type>
+ <artifactId>j2ee-server</artifactId>
+ <version>${pom.currentVersion}</version>
+ </import>
+
<dependency>
<groupId>geronimo-spec</groupId>
<artifactId>geronimo-spec-j2ee</artifactId>
@@ -54,8 +62,6 @@
</dependency>
- <!-- todo builder implementations - can we move these to sub-plans? -->
- <!-- EAR, application-clients and other J2EE artifacts -->
<dependency>
<groupId>geronimo</groupId>
<artifactId>geronimo-j2ee-builder</artifactId>
@@ -108,7 +114,6 @@
<version>${geronimo_version}</version>
</dependency>
- <!-- EJBs using OpenEJB -->
<dependency>
<groupId>openejb</groupId>
<artifactId>openejb-builder</artifactId>
@@ -130,7 +135,6 @@
<version>${tranql_version}</version>
</dependency>
- <!-- RARs using Geronimo Connector implementation -->
<dependency>
<groupId>geronimo</groupId>
<artifactId>geronimo-connector-builder</artifactId>
@@ -142,13 +146,12 @@
<version>${geronimo_version}</version>
</dependency>
- <!-- JBI using ServiceMix -->
- <dependency>
+ <dependency>
<groupId>geronimo</groupId>
<artifactId>geronimo-servicemix-builder</artifactId>
<version>${geronimo_version}</version>
</dependency>
-
+-->
<gbean name="EARBuilder" class="org.apache.geronimo.j2ee.deployment.EARConfigBuilder">
<attribute name="defaultParentId">${pom.groupId}/cars/j2ee-server-${pom.currentVersion}.car</attribute>
<!--domain set to wildcard so datasources may be deployed independently on client. -->
Modified: geronimo/trunk/configs/j2ee-security/project.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/configs/j2ee-security/project.xml?rev=330620&r1=330619&r2=330620&view=diff
==============================================================================
--- geronimo/trunk/configs/j2ee-security/project.xml (original)
+++ geronimo/trunk/configs/j2ee-security/project.xml Thu Nov 3 12:07:18 2005
@@ -31,6 +31,9 @@
<artifactId>rmi-naming</artifactId>
<version>${geronimo_version}</version>
<type>car</type>
+ <properties>
+ <geronimo.import>true</geronimo.import>
+ </properties>
</dependency>
<dependency>
<groupId>geronimo</groupId>
@@ -110,6 +113,9 @@
<groupId>geronimo</groupId>
<artifactId>geronimo-jmxremoting</artifactId>
<version>${geronimo_version}</version>
+ <properties>
+ <geronimo.dependency>true</geronimo.dependency>
+ </properties>
</dependency>
<dependency>
<groupId>geronimo</groupId>
Modified: geronimo/trunk/configs/j2ee-security/src/plan/plan.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/configs/j2ee-security/src/plan/plan.xml?rev=330620&r1=330619&r2=330620&view=diff
==============================================================================
--- geronimo/trunk/configs/j2ee-security/src/plan/plan.xml (original)
+++ geronimo/trunk/configs/j2ee-security/src/plan/plan.xml Thu Nov 3 12:07:18 2005
@@ -20,19 +20,19 @@
<!--
Configuration for the security of a Geronimo server.
+ parentId="${pom.groupId}/cars/rmi-naming-${pom.currentVersion}.car"
-->
<configuration
xmlns="http://geronimo.apache.org/xml/ns/deployment-1.0"
configId="${pom.groupId}/cars/${pom.artifactId}-${pom.currentVersion}.car"
- parentId="${pom.groupId}/cars/rmi-naming-${pom.currentVersion}.car"
>
<!--runtime dependencies-->
- <dependency>
+ <!-- <dependency>
<uri>geronimo/jars/geronimo-jmxremoting-${geronimo_version}.jar</uri>
</dependency>
-
+-->
<gbean name="SecurityService" class="org.apache.geronimo.security.SecurityServiceImpl">
<reference name="ServerInfo"><module>geronimo/cars/j2ee-system-${pom.currentVersion}.car</module><name>ServerInfo</name></reference>
Modified: geronimo/trunk/configs/j2ee-server/project.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/configs/j2ee-server/project.xml?rev=330620&r1=330619&r2=330620&view=diff
==============================================================================
--- geronimo/trunk/configs/j2ee-server/project.xml (original)
+++ geronimo/trunk/configs/j2ee-server/project.xml Thu Nov 3 12:07:18 2005
@@ -31,99 +31,238 @@
<artifactId>rmi-naming</artifactId>
<version>${geronimo_version}</version>
<type>car</type>
+ <properties>
+ <geronimo.import>true</geronimo.import>
+ </properties>
</dependency>
<dependency>
<groupId>geronimo</groupId>
- <artifactId>geronimo-system</artifactId>
+ <artifactId>geronimo-core</artifactId>
<version>${geronimo_version}</version>
+ <properties>
+ <geronimo.dependency>true</geronimo.dependency>
+ </properties>
</dependency>
-
<dependency>
<groupId>geronimo</groupId>
- <artifactId>geronimo-gbean-deployer</artifactId>
+ <artifactId>geronimo-common</artifactId>
<version>${geronimo_version}</version>
- <type>car</type>
+ <properties>
+ <geronimo.dependency>true</geronimo.dependency>
+ </properties>
</dependency>
-
<dependency>
- <groupId>geronimo-spec</groupId>
- <artifactId>geronimo-spec-j2ee</artifactId>
- <version>${geronimo_spec_j2ee_version}</version>
+ <groupId>geronimo</groupId>
+ <artifactId>geronimo-connector</artifactId>
+ <version>${geronimo_version}</version>
+ <properties>
+ <geronimo.dependency>true</geronimo.dependency>
+ </properties>
</dependency>
-
<dependency>
<groupId>geronimo</groupId>
- <artifactId>geronimo-activation</artifactId>
+ <artifactId>geronimo-timer</artifactId>
<version>${geronimo_version}</version>
+ <properties>
+ <geronimo.dependency>true</geronimo.dependency>
+ </properties>
</dependency>
<dependency>
<groupId>geronimo</groupId>
- <artifactId>geronimo-management</artifactId>
+ <artifactId>geronimo-webservices</artifactId>
<version>${geronimo_version}</version>
+ <properties>
+ <geronimo.dependency>true</geronimo.dependency>
+ </properties>
</dependency>
<dependency>
<groupId>geronimo</groupId>
- <artifactId>geronimo-j2ee</artifactId>
+ <artifactId>geronimo-client</artifactId>
<version>${geronimo_version}</version>
+ <properties>
+ <geronimo.dependency>true</geronimo.dependency>
+ </properties>
</dependency>
<dependency>
<groupId>geronimo</groupId>
- <artifactId>geronimo-core</artifactId>
+ <artifactId>geronimo-axis</artifactId>
<version>${geronimo_version}</version>
+ <properties>
+ <geronimo.dependency>true</geronimo.dependency>
+ </properties>
</dependency>
<dependency>
<groupId>geronimo</groupId>
- <artifactId>geronimo-common</artifactId>
+ <artifactId>geronimo-servicemix</artifactId>
<version>${geronimo_version}</version>
+ <properties>
+ <geronimo.dependency>true</geronimo.dependency>
+ </properties>
+ </dependency>
+ <dependency>
+ <groupId>openejb</groupId>
+ <artifactId>openejb-core</artifactId>
+ <version>${openejb_version}</version>
+ <properties>
+ <geronimo.dependency>true</geronimo.dependency>
+ </properties>
</dependency>
<dependency>
+ <groupId>xstream</groupId>
+ <artifactId>xstream</artifactId>
+ <version>${xstream_version}</version>
+ <properties>
+ <geronimo.dependency>true</geronimo.dependency>
+ </properties>
+ </dependency>
+ <dependency>
+ <groupId>xpp3</groupId>
+ <artifactId>xpp3</artifactId>
+ <version>${xpp3_version}</version>
+ <properties>
+ <geronimo.dependency>true</geronimo.dependency>
+ </properties>
+ </dependency>
+ <dependency>
+ <groupId>asm</groupId>
+ <artifactId>asm</artifactId>
+ <version>${asm_version}</version>
+ <properties>
+ <geronimo.dependency>true</geronimo.dependency>
+ </properties>
+ </dependency>
+ <dependency>
+ <groupId>activemq</groupId>
+ <artifactId>activemq-gbean-management</artifactId>
+ <version>${activemq_version}</version>
+ <properties>
+ <geronimo.dependency>true</geronimo.dependency>
+ </properties>
+ </dependency>
+ <dependency>
+ <groupId>activeio</groupId>
+ <artifactId>activeio</artifactId>
+ <version>${activeio_version}</version>
+ <properties>
+ <geronimo.dependency>true</geronimo.dependency>
+ </properties>
+ </dependency>
+ <dependency>
+ <groupId>scout</groupId>
+ <artifactId>jaxr-api</artifactId>
+ <version>${scout_version}</version>
+ <properties>
+ <geronimo.dependency>true</geronimo.dependency>
+ </properties>
+ </dependency>
+
+ <dependency>
+ <groupId>scout</groupId>
+ <artifactId>scout</artifactId>
+ <version>${scout_version}</version>
+ <properties>
+ <geronimo.dependency>true</geronimo.dependency>
+ </properties>
+ </dependency>
+
+ <dependency>
+ <groupId>juddi</groupId>
+ <artifactId>juddi</artifactId>
+ <version>${juddi_version}</version>
+ <properties>
+ <geronimo.dependency>true</geronimo.dependency>
+ </properties>
+ </dependency>
+
+ <dependency>
+ <groupId>jdom</groupId>
+ <artifactId>jdom</artifactId>
+ <version>${jdom_version}</version>
+ <properties>
+ <geronimo.dependency>true</geronimo.dependency>
+ </properties>
+ </dependency>
+
+ <dependency>
<groupId>geronimo</groupId>
- <artifactId>geronimo-connector</artifactId>
- <version>${geronimo_version}</version>
+ <artifactId>geronimo-derby</artifactId>
+ <version>${pom.currentVersion}</version>
+ <properties>
+ <geronimo.dependency>true</geronimo.dependency>
+ </properties>
</dependency>
+
+ <dependency>
+ <groupId>org.apache.derby</groupId>
+ <artifactId>derby</artifactId>
+ <version>${derby_version}</version>
+ <properties>
+ <geronimo.dependency>true</geronimo.dependency>
+ </properties>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.derby</groupId>
+ <artifactId>derbynet</artifactId>
+ <version>${derby_version}</version>
+ <properties>
+ <geronimo.dependency>true</geronimo.dependency>
+ </properties>
+ </dependency>
+
+
<dependency>
<groupId>geronimo</groupId>
- <artifactId>geronimo-naming</artifactId>
+ <artifactId>geronimo-system</artifactId>
<version>${geronimo_version}</version>
</dependency>
+
<dependency>
<groupId>geronimo</groupId>
- <artifactId>geronimo-timer</artifactId>
+ <artifactId>geronimo-gbean-deployer</artifactId>
<version>${geronimo_version}</version>
+ <type>car</type>
</dependency>
+
+ <dependency>
+ <groupId>geronimo-spec</groupId>
+ <artifactId>geronimo-spec-j2ee</artifactId>
+ <version>${geronimo_spec_j2ee_version}</version>
+ </dependency>
+
<dependency>
<groupId>geronimo</groupId>
- <artifactId>geronimo-transaction</artifactId>
+ <artifactId>geronimo-activation</artifactId>
<version>${geronimo_version}</version>
</dependency>
<dependency>
<groupId>geronimo</groupId>
- <artifactId>geronimo-security</artifactId>
+ <artifactId>geronimo-management</artifactId>
<version>${geronimo_version}</version>
</dependency>
<dependency>
<groupId>geronimo</groupId>
- <artifactId>geronimo-webservices</artifactId>
+ <artifactId>geronimo-j2ee</artifactId>
<version>${geronimo_version}</version>
</dependency>
<dependency>
<groupId>geronimo</groupId>
- <artifactId>geronimo-jmxremoting</artifactId>
+ <artifactId>geronimo-naming</artifactId>
<version>${geronimo_version}</version>
</dependency>
<dependency>
<groupId>geronimo</groupId>
- <artifactId>geronimo-client</artifactId>
+ <artifactId>geronimo-transaction</artifactId>
<version>${geronimo_version}</version>
</dependency>
<dependency>
<groupId>geronimo</groupId>
- <artifactId>geronimo-axis</artifactId>
+ <artifactId>geronimo-security</artifactId>
<version>${geronimo_version}</version>
</dependency>
<dependency>
<groupId>geronimo</groupId>
- <artifactId>geronimo-servicemix</artifactId>
+ <artifactId>geronimo-jmxremoting</artifactId>
<version>${geronimo_version}</version>
</dependency>
<dependency>
@@ -143,11 +282,6 @@
<version>${tranql_version}</version>
</dependency>
<dependency>
- <groupId>openejb</groupId>
- <artifactId>openejb-core</artifactId>
- <version>${openejb_version}</version>
- </dependency>
- <dependency>
<groupId>howl</groupId>
<artifactId>howl-logger</artifactId>
<version>${howl_version}</version>
@@ -162,36 +296,17 @@
<artifactId>regexp</artifactId>
<version>${regexp_version}</version>
</dependency>
+
<dependency>
- <groupId>xstream</groupId>
- <artifactId>xstream</artifactId>
- <version>${xstream_version}</version>
- </dependency>
- <dependency>
- <groupId>xpp3</groupId>
- <artifactId>xpp3</artifactId>
- <version>${xpp3_version}</version>
- </dependency>
- <dependency>
- <groupId>asm</groupId>
- <artifactId>asm</artifactId>
- <version>${asm_version}</version>
- </dependency>
- <dependency>
- <groupId>activemq</groupId>
- <artifactId>activemq-gbean-management</artifactId>
- <version>${activemq_version}</version>
- </dependency>
- <dependency>
- <groupId>activeio</groupId>
- <artifactId>activeio</artifactId>
- <version>${activeio_version}</version>
+ <groupId>axis</groupId>
+ <artifactId>axis</artifactId>
+ <version>${axis_version}</version>
</dependency>
<dependency>
- <groupId>jetty</groupId>
- <artifactId>org.mortbay.jetty</artifactId>
- <version>${jetty_version}</version>
+ <groupId>commons-discovery</groupId>
+ <artifactId>commons-discovery</artifactId>
+ <version>${commons_discovery_version}</version>
</dependency>
</dependencies>
</project>
Modified: geronimo/trunk/configs/j2ee-server/src/plan/plan.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/configs/j2ee-server/src/plan/plan.xml?rev=330620&r1=330619&r2=330620&view=diff
==============================================================================
--- geronimo/trunk/configs/j2ee-server/src/plan/plan.xml (original)
+++ geronimo/trunk/configs/j2ee-server/src/plan/plan.xml Thu Nov 3 12:07:18 2005
@@ -23,109 +23,13 @@
This configuration should contain those services normally provided
by the server.
+ parentId="${pom.groupId}/cars/rmi-naming-${pom.currentVersion}.car"
+
-->
<configuration
xmlns="http://geronimo.apache.org/xml/ns/deployment-1.0"
configId="${pom.groupId}/cars/${pom.artifactId}-${pom.currentVersion}.car"
- parentId="${pom.groupId}/cars/rmi-naming-${pom.currentVersion}.car"
>
-
-
- <!--runtime dependencies-->
- <dependency>
- <uri>geronimo/jars/geronimo-core-${geronimo_version}.jar</uri>
- </dependency>
- <dependency>
- <uri>geronimo/jars/geronimo-connector-${geronimo_version}.jar</uri>
- </dependency>
- <dependency>
- <uri>concurrent/jars/concurrent-${concurrent_version}.jar</uri>
- </dependency>
- <dependency>
- <uri>geronimo/jars/geronimo-timer-${geronimo_version}.jar</uri>
- </dependency>
-<!-- <dependency>-->
-<!-- <uri>geronimo/jars/geronimo-security-${geronimo_version}.jar</uri>-->
-<!-- </dependency>-->
- <dependency>
- <uri>openejb/jars/openejb-core-${openejb_version}.jar</uri>
- </dependency>
- <dependency>
- <uri>geronimo/jars/geronimo-jmxremoting-${geronimo_version}.jar</uri>
- </dependency>
-
- <!-- required for rar 1.5 to load realms -->
- <dependency>
- <uri>regexp/jars/regexp-${regexp_version}.jar</uri>
- </dependency>
-
- <!-- for timer serialization implementation -->
- <dependency>
- <uri>xstream/jars/xstream-${xstream_version}.jar</uri>
- </dependency>
- <dependency>
- <uri>xpp3/jars/xpp3-${xpp3_version}.jar</uri>
- </dependency>
-
- <dependency>
- <uri>geronimo/jars/geronimo-common-${geronimo_version}.jar</uri>
- </dependency>
- <dependency>
- <uri>geronimo/jars/geronimo-client-${geronimo_version}.jar</uri>
- </dependency>
-
- <dependency>
- <uri>asm/jars/asm-${asm_version}.jar</uri>
- </dependency>
-
- <dependency>
- <uri>geronimo/jars/geronimo-axis-${geronimo_version}.jar</uri>
- </dependency>
-
- <dependency>
- <uri>geronimo/jars/geronimo-webservices-${geronimo_version}.jar</uri>
- </dependency>
-
- <!-- for JBI container -->
- <dependency>
- <uri>geronimo/jars/geronimo-servicemix-${geronimo_version}.jar</uri>
- </dependency>
-
- <dependency>
- <uri>activemq/jars/activemq-gbean-management-${activemq_version}.jar</uri>
- </dependency>
- <!-- remote login -->
- <dependency>
- <uri>activeio/jars/activeio-${activeio_version}.jar</uri>
- </dependency>
-
- <!--scout -->
- <dependency>
- <uri>scout/jars/jaxr-api-${scout_version}.jar</uri>
- </dependency>
-
- <dependency>
- <uri>scout/jars/scout-${scout_version}.jar</uri>
- </dependency>
-
- <dependency>
- <uri>juddi/jars/juddi-${juddi_version}.jar</uri>
- </dependency>
-
- <dependency>
- <uri>jdom/jars/jdom-1.0.jar</uri>
- </dependency>
-
- <!-- Derby classes must be loaded from a common classloader -->
- <dependency>
- <uri>org.apache.derby/jars/derby-${derby_version}.jar</uri>
- </dependency>
- <dependency>
- <uri>org.apache.derby/jars/derbynet-${derby_version}.jar</uri>
- </dependency>
- <dependency>
- <uri>geronimo/jars/geronimo-derby-${geronimo_version}.jar</uri>
- </dependency>
<gbean name="DefaultThreadPool" class="org.apache.geronimo.pool.ThreadPool">
<attribute name="keepAliveTime">5000</attribute>
Modified: geronimo/trunk/configs/jetty-deployer/project.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/configs/jetty-deployer/project.xml?rev=330620&r1=330619&r2=330620&view=diff
==============================================================================
--- geronimo/trunk/configs/jetty-deployer/project.xml (original)
+++ geronimo/trunk/configs/jetty-deployer/project.xml Thu Nov 3 12:07:18 2005
@@ -20,7 +20,10 @@
<project>
<pomVersion>3</pomVersion>
- <extend>../../etc/project.xml</extend>
+<!-- hack to get all the dependencies from j2ee-deployer in the classpath -->
+<!-- if we can avoid having the Forehead CL as parent this might not be necessary -->
+ <extend>../j2ee-deployer/project.xml</extend>
+<!-- <extend>../../etc/project.xml</extend>-->
<id>jetty-deployer</id>
<name>Jetty Deployer Configuration for the J2EE Server</name>
Modified: geronimo/trunk/configs/jetty-deployer/src/plan/plan.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/configs/jetty-deployer/src/plan/plan.xml?rev=330620&r1=330619&r2=330620&view=diff
==============================================================================
--- geronimo/trunk/configs/jetty-deployer/src/plan/plan.xml (original)
+++ geronimo/trunk/configs/jetty-deployer/src/plan/plan.xml Thu Nov 3 12:07:18 2005
@@ -33,19 +33,19 @@
</dependency>
<gbean name="JettyWebBuilder" class="org.apache.geronimo.jetty.deployment.JettyModuleBuilder">
- <attribute name="defaultParentId">org/apache/geronimo/Server,org/apache/geronimo/Jetty</attribute>
+ <attribute name="defaultParentId">${pom.groupId}/cars/j2ee-server-${pom.currentVersion}.car,${pom.groupId}/cars/jetty-${pom.currentVersion}.car</attribute>
<attribute name="defaultSessionTimeoutSeconds">1800</attribute>
<attribute name="defaultContextPriorityClassloader">false</attribute>
<attribute name="defaultWelcomeFiles">index.html,index.htm,index.jsp</attribute>
<attribute name="jettyContainerObjectName">geronimo.server:name=JettyWebContainer,*</attribute>
<reference name="DefaultServlets">
- <gbean-name>geronimo.server:j2eeType=DefaultServlet,J2EEModule=org/apache/geronimo/JettyRuntimeDeployer,*</gbean-name>
+ <gbean-name>geronimo.server:j2eeType=DefaultServlet,J2EEModule=${pom.groupId}/cars/${pom.artifactId}-${pom.currentVersion}.car,*</gbean-name>
</reference>
<reference name="PojoWebServiceTemplate">
- <gbean-name>geronimo.server:J2EEApplication=null,J2EEModule=org/apache/geronimo/JettyRuntimeDeployer,J2EEServer=geronimo,j2eeType=ServletWebServiceTemplate,name=POJOTemplate</gbean-name>
+ <gbean-name>geronimo.server:J2EEApplication=null,J2EEModule=${pom.groupId}/cars/${pom.artifactId}-${pom.currentVersion}.car,J2EEServer=geronimo,j2eeType=ServletWebServiceTemplate,name=POJOTemplate</gbean-name>
</reference>
<reference name="WebServiceBuilder">
- <module>org/apache/geronimo/RuntimeDeployer</module>
+ <module>${pom.groupId}/cars/j2ee-deployer-${pom.currentVersion}.car</module>
<name>WebServiceBuilder</name>
</reference>
<reference name="Repository">
Modified: geronimo/trunk/configs/rmi-naming/project.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/configs/rmi-naming/project.xml?rev=330620&r1=330619&r2=330620&view=diff
==============================================================================
--- geronimo/trunk/configs/rmi-naming/project.xml (original)
+++ geronimo/trunk/configs/rmi-naming/project.xml Thu Nov 3 12:07:18 2005
@@ -31,6 +31,9 @@
<artifactId>j2ee-system</artifactId>
<version>${geronimo_version}</version>
<type>car</type>
+ <properties>
+ <geronimo.import>true</geronimo.import>
+ </properties>
</dependency>
<dependency>
@@ -40,31 +43,47 @@
<type>car</type>
</dependency>
+ <!-- activation must come before spec-j2ee to override stock mailcap file in its javamail api -->
+ <dependency>
+ <groupId>geronimo</groupId>
+ <artifactId>geronimo-activation</artifactId>
+ <version>${geronimo_version}</version>
+ <properties>
+ <geronimo.dependency>true</geronimo.dependency>
+ </properties>
+ </dependency>
<dependency>
<groupId>geronimo-spec</groupId>
<artifactId>geronimo-spec-j2ee</artifactId>
<version>${geronimo_spec_j2ee_version}</version>
+ <properties>
+ <geronimo.dependency>true</geronimo.dependency>
+ </properties>
</dependency>
<dependency>
<groupId>geronimo</groupId>
- <artifactId>geronimo-activation</artifactId>
- <version>${geronimo_version}</version>
- </dependency>
- <dependency>
- <groupId>geronimo</groupId>
<artifactId>geronimo-management</artifactId>
<version>${geronimo_version}</version>
+ <properties>
+ <geronimo.dependency>true</geronimo.dependency>
+ </properties>
</dependency>
<dependency>
<groupId>geronimo</groupId>
<artifactId>geronimo-j2ee</artifactId>
<version>${geronimo_version}</version>
+ <properties>
+ <geronimo.dependency>true</geronimo.dependency>
+ </properties>
</dependency>
<dependency>
<groupId>geronimo</groupId>
<artifactId>geronimo-core</artifactId>
<version>${geronimo_version}</version>
+ <properties>
+ <geronimo.dependency>true</geronimo.dependency>
+ </properties>
</dependency>
<dependency>
<groupId>geronimo</groupId>
@@ -75,6 +94,9 @@
<groupId>geronimo</groupId>
<artifactId>geronimo-naming</artifactId>
<version>${geronimo_version}</version>
+ <properties>
+ <geronimo.dependency>true</geronimo.dependency>
+ </properties>
</dependency>
<dependency>
<groupId>geronimo</groupId>
@@ -85,16 +107,25 @@
<groupId>geronimo</groupId>
<artifactId>geronimo-transaction</artifactId>
<version>${geronimo_version}</version>
+ <properties>
+ <geronimo.dependency>true</geronimo.dependency>
+ </properties>
</dependency>
<dependency>
<groupId>geronimo</groupId>
<artifactId>geronimo-security</artifactId>
<version>${geronimo_version}</version>
+ <properties>
+ <geronimo.dependency>true</geronimo.dependency>
+ </properties>
</dependency>
<dependency>
<groupId>geronimo</groupId>
<artifactId>geronimo-webservices</artifactId>
<version>${geronimo_version}</version>
+ <properties>
+ <geronimo.dependency>true</geronimo.dependency>
+ </properties>
</dependency>
<dependency>
<groupId>geronimo</groupId>
@@ -126,11 +157,19 @@
<groupId>concurrent</groupId>
<artifactId>concurrent</artifactId>
<version>${concurrent_version}</version>
+ <properties>
+ <geronimo.dependency>true</geronimo.dependency>
+ </properties>
</dependency>
+ <!--transaction module requires tranql for cache class -->
+<!-- TODO this is false. tranql should not be needed here -->
<dependency>
<groupId>tranql</groupId>
<artifactId>tranql</artifactId>
<version>${tranql_version}</version>
+ <properties>
+ <geronimo.dependency>true</geronimo.dependency>
+ </properties>
</dependency>
<dependency>
<groupId>openejb</groupId>
@@ -141,11 +180,18 @@
<groupId>howl</groupId>
<artifactId>howl-logger</artifactId>
<version>${howl_version}</version>
+ <properties>
+ <geronimo.dependency>true</geronimo.dependency>
+ </properties>
</dependency>
+ <!-- tranql requires antlr -->
<dependency>
<groupId>antlr</groupId>
<artifactId>antlr</artifactId>
<version>${antlr_version}</version>
+ <properties>
+ <geronimo.dependency>true</geronimo.dependency>
+ </properties>
</dependency>
<dependency>
<groupId>regexp</groupId>
@@ -172,10 +218,14 @@
<artifactId>activemq-gbean-management</artifactId>
<version>${activemq_version}</version>
</dependency>
+ <!-- remote login -->
<dependency>
<groupId>activeio</groupId>
<artifactId>activeio</artifactId>
<version>${activeio_version}</version>
+ <properties>
+ <geronimo.dependency>true</geronimo.dependency>
+ </properties>
</dependency>
<dependency>
Modified: geronimo/trunk/configs/rmi-naming/src/plan/plan.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/configs/rmi-naming/src/plan/plan.xml?rev=330620&r1=330619&r2=330620&view=diff
==============================================================================
--- geronimo/trunk/configs/rmi-naming/src/plan/plan.xml (original)
+++ geronimo/trunk/configs/rmi-naming/src/plan/plan.xml Thu Nov 3 12:07:18 2005
@@ -21,13 +21,14 @@
<!--
Holds the RMI naming server configuration. This needs to be started
after the system GBeans but before the server GBeans.
+ parentId="${pom.groupId}/cars/j2ee-system-${pom.currentVersion}.car"
+
-->
<configuration
xmlns="http://geronimo.apache.org/xml/ns/deployment-1.0"
configId="${pom.groupId}/cars/${pom.artifactId}-${pom.currentVersion}.car"
- parentId="${pom.groupId}/cars/j2ee-system-${pom.currentVersion}.car"
>
-
+<!--
<dependency>
<uri>geronimo/jars/geronimo-management-${geronimo_version}.jar</uri>
</dependency>
@@ -37,7 +38,6 @@
<dependency>
<uri>geronimo/jars/geronimo-webservices-${geronimo_version}.jar</uri>
</dependency>
- <!-- activation must come before spec-j2ee to override stock mailcap file in its javamail api -->
<dependency>
<uri>geronimo/jars/geronimo-activation-${geronimo_version}.jar</uri>
</dependency>
@@ -50,11 +50,9 @@
<dependency>
<uri>howl/jars/howl-logger-${howl_version}.jar</uri>
</dependency>
- <!--transaction module requires tranql for cache class -->
<dependency>
<uri>tranql/jars/tranql-${tranql_version}.jar</uri>
</dependency>
- <!-- tranql requires antlr -->
<dependency>
<uri>antlr/jars/antlr-${antlr_version}.jar</uri>
</dependency>
@@ -67,14 +65,13 @@
<dependency>
<uri>geronimo/jars/geronimo-core-${geronimo_version}.jar</uri>
</dependency>
- <!-- remote login -->
<dependency>
<uri>activeio/jars/activeio-${activeio_version}.jar</uri>
</dependency>
<dependency>
<uri>geronimo/jars/geronimo-naming-${geronimo_version}.jar</uri>
</dependency>
-
+-->
<!-- RMI Registry -->
<gbean name="RMIRegistry" class="org.apache.geronimo.system.rmi.RMIRegistryService">
<attribute name="port">${PlanNamingPort}</attribute>
Modified: geronimo/trunk/configs/tomcat-deployer/project.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/configs/tomcat-deployer/project.xml?rev=330620&r1=330619&r2=330620&view=diff
==============================================================================
--- geronimo/trunk/configs/tomcat-deployer/project.xml (original)
+++ geronimo/trunk/configs/tomcat-deployer/project.xml Thu Nov 3 12:07:18 2005
@@ -20,7 +20,8 @@
<project>
<pomVersion>3</pomVersion>
- <extend>../../etc/project.xml</extend>
+ <extend>../j2ee-deployer/project.xml</extend>
+<!-- <extend>../../etc/project.xml</extend>-->
<id>tomcat-deployer</id>
<name>Tomcat Deployer Configuration for the J2EE Server</name>
Modified: geronimo/trunk/plugins/geronimo-packaging-plugin/plugin.jelly
URL: http://svn.apache.org/viewcvs/geronimo/trunk/plugins/geronimo-packaging-plugin/plugin.jelly?rev=330620&r1=330619&r2=330620&view=diff
==============================================================================
--- geronimo/trunk/plugins/geronimo-packaging-plugin/plugin.jelly (original)
+++ geronimo/trunk/plugins/geronimo-packaging-plugin/plugin.jelly Thu Nov 3 12:07:18 2005
@@ -28,13 +28,26 @@
<define:taglib uri="geronimo:packaging">
<define:jellybean name="package" className="org.apache.geronimo.plugin.packaging.PackageBuilder" method="execute"/>
<define:jellybean name="jmxDistribute" className="org.apache.geronimo.plugin.packaging.JMXDistributor" method="execute"/>
+ <define:jellybean name="dependencies" className="org.apache.geronimo.plugin.packaging.PlanProcessor" method="execute"/>
</define:taglib>
<goal name="car" description="Package a Geronimo Configuration" prereqs="car:package"/>
+<!--
<goal name="car:prepare-plan" description="Prepare a plan by processing with velocity">
<ant:mkdir dir="${geronimo.packaging.buildDir}"/>
<velocity:merge basedir="${geronimo.packaging.srcDir}" template="${geronimo.packaging.planFile}" name="${geronimo.packaging.buildFile}"/>
+ </goal>
+-->
+
+ <goal name="car:prepare-plan" description="Add dependencies to a plan and process with velocity">
+ <car:dependencies
+ artifacts="${pom.artifacts}"
+ targetDir="${geronimo.packaging.buildDir}"
+ sourceDir="${geronimo.packaging.srcDir}"
+ planFile="${geronimo.packaging.planFile}"
+ targetFile="${geronimo.packaging.buildFile}"
+ context="${context}"/>
</goal>
<goal name="car:package" prereqs="car:prepare-plan" description="Package a Geronimo Configuration">
Modified: geronimo/trunk/plugins/geronimo-packaging-plugin/project.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/plugins/geronimo-packaging-plugin/project.xml?rev=330620&r1=330619&r2=330620&view=diff
==============================================================================
--- geronimo/trunk/plugins/geronimo-packaging-plugin/project.xml (original)
+++ geronimo/trunk/plugins/geronimo-packaging-plugin/project.xml Thu Nov 3 12:07:18 2005
@@ -47,7 +47,35 @@
<version>3.0.1</version>
</dependency>
+ <!-- dependency addition -->
+ <dependency>
+ <groupId>geronimo</groupId>
+ <artifactId>geronimo-service-builder</artifactId>
+ <version>1.0-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>xmlbeans</groupId>
+ <artifactId>xbean</artifactId>
+ <version>2.0.0</version>
+ </dependency>
+ <dependency>
+ <groupId>stax</groupId>
+ <artifactId>stax-api</artifactId>
+ <version>1.0</version>
+ </dependency>
+ <dependency>
+ <groupId>maven</groupId>
+ <artifactId>maven</artifactId>
+ <version>1.0.2</version>
+ </dependency>
+
+
<!-- dependencies for velocity pre-processing -->
+ <dependency>
+ <groupId>commons-jelly</groupId>
+ <artifactId>commons-jelly</artifactId>
+ <version>1.0</version>
+ </dependency>
<dependency>
<groupId>commons-jelly</groupId>
<artifactId>commons-jelly-tags-velocity</artifactId>
Modified: geronimo/trunk/plugins/geronimo-packaging-plugin/src/java/org/apache/geronimo/plugin/packaging/PackageBuilder.java
URL: http://svn.apache.org/viewcvs/geronimo/trunk/plugins/geronimo-packaging-plugin/src/java/org/apache/geronimo/plugin/packaging/PackageBuilder.java?rev=330620&r1=330619&r2=330620&view=diff
==============================================================================
--- geronimo/trunk/plugins/geronimo-packaging-plugin/src/java/org/apache/geronimo/plugin/packaging/PackageBuilder.java (original)
+++ geronimo/trunk/plugins/geronimo-packaging-plugin/src/java/org/apache/geronimo/plugin/packaging/PackageBuilder.java Thu Nov 3 12:07:18 2005
@@ -30,6 +30,7 @@
import org.apache.geronimo.kernel.config.ConfigurationManager;
import org.apache.geronimo.kernel.config.ConfigurationManagerImpl;
import org.apache.geronimo.kernel.config.ConfigurationUtil;
+import org.apache.geronimo.kernel.config.InvalidConfigException;
/**
* JellyBean that builds a Geronimo Configuration using the local Mavem
@@ -228,7 +229,11 @@
List configs = configurationManager.loadRecursive(deploymentConfig);
for (int i = 0; i < configs.size(); i++) {
URI configName = (URI) configs.get(i);
- configurationManager.start(configName);
+ try {
+ configurationManager.start(configName);
+ } catch (Throwable e) {
+ throw new RuntimeException("Could not start configuration: " + configName, e);
+ }
}
}
} finally {
Added: geronimo/trunk/plugins/geronimo-packaging-plugin/src/java/org/apache/geronimo/plugin/packaging/PlanProcessor.java
URL: http://svn.apache.org/viewcvs/geronimo/trunk/plugins/geronimo-packaging-plugin/src/java/org/apache/geronimo/plugin/packaging/PlanProcessor.java?rev=330620&view=auto
==============================================================================
--- geronimo/trunk/plugins/geronimo-packaging-plugin/src/java/org/apache/geronimo/plugin/packaging/PlanProcessor.java (added)
+++ geronimo/trunk/plugins/geronimo-packaging-plugin/src/java/org/apache/geronimo/plugin/packaging/PlanProcessor.java Thu Nov 3 12:07:18 2005
@@ -0,0 +1,185 @@
+/**
+ *
+ * Copyright 2005 The Apache Software Foundation
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.geronimo.plugin.packaging;
+
+import java.io.File;
+import java.io.StringWriter;
+import java.util.Iterator;
+import java.util.List;
+import javax.xml.namespace.QName;
+
+import org.apache.commons.jelly.tags.velocity.JellyContextAdapter;
+import org.apache.commons.jelly.JellyContext;
+import org.apache.maven.project.Dependency;
+import org.apache.maven.repository.Artifact;
+import org.apache.velocity.Template;
+import org.apache.velocity.app.VelocityEngine;
+import org.apache.velocity.context.Context;
+import org.apache.xmlbeans.XmlCursor;
+import org.apache.xmlbeans.XmlException;
+import org.apache.xmlbeans.XmlObject;
+import org.apache.xmlbeans.XmlOptions;
+
+/**
+ * @version $Rev: $ $Date: $
+ */
+public class PlanProcessor {
+ private static final String IMPORT_PROPERTY = "geronimo.import";
+ private static final QName IMPORT_QNAME = new QName("http://geronimo.apache.org/xml/ns/deployment-1.0", "import");
+ private static final String INCLUDE_PROPERTY = "geronimo.include";
+ private static final QName INCLUDE_QNAME = new QName("http://geronimo.apache.org/xml/ns/deployment-1.0", "include");
+ private static final String DEPENDENCY_PROPERTY = "geronimo.dependency";
+ private static final QName DEPENDENCY_QNAME = new QName("http://geronimo.apache.org/xml/ns/deployment-1.0", "dependency");
+
+ private List artifacts;
+ private String sourceDir;
+ private String targetDir;
+ private String planFile;
+ private String targetFile;
+ private Context context;
+
+ public List getArtifacts() {
+ return artifacts;
+ }
+
+ public void setArtifacts(List artifacts) {
+ this.artifacts = artifacts;
+ }
+
+ public String getSourceDir() {
+ return sourceDir;
+ }
+
+ public void setSourceDir(String sourceDir) {
+ this.sourceDir = sourceDir;
+ }
+
+ public String getTargetDir() {
+ return targetDir;
+ }
+
+ public void setTargetDir(String targetDir) {
+ this.targetDir = targetDir;
+ }
+
+ public String getPlanFile() {
+ return planFile;
+ }
+
+ public void setPlanFile(String planFile) {
+ this.planFile = planFile;
+ }
+
+ public String getTargetFile() {
+ return targetFile;
+ }
+
+ public void setTargetFile(String targetFile) {
+ this.targetFile = targetFile;
+ }
+
+ public void setContext(JellyContext context) {
+ this.context = new JellyContextAdapter(context);
+ }
+
+ public void execute() throws Exception, XmlException {
+ if (artifacts == null) {
+ throw new RuntimeException("Artifacts not supplied");
+ }
+ if (targetDir == null) {
+ throw new RuntimeException("No target directory supplied");
+ }
+ if (planFile == null) {
+ throw new RuntimeException("No source plan supplied");
+ }
+ if (targetFile == null) {
+ throw new RuntimeException("No target plan supplied");
+ }
+
+ File sourceD = new File(sourceDir);
+ VelocityEngine velocity = new VelocityEngine();
+ velocity.setProperty(VelocityEngine.FILE_RESOURCE_LOADER_PATH, sourceD.getAbsolutePath());
+ velocity.init();
+ Template template = velocity.getTemplate(planFile);
+ StringWriter writer = new StringWriter();
+ template.merge(context, writer);
+
+ String plan = writer.toString();
+
+ XmlObject doc = XmlObject.Factory.parse(plan);
+ XmlCursor xmlCursor = doc.newCursor();
+ try {
+
+ xmlCursor.toFirstContentToken();
+ xmlCursor.toFirstChild();
+
+
+ insertPlanElements(xmlCursor, IMPORT_PROPERTY, IMPORT_QNAME);
+ insertPlanElements(xmlCursor, INCLUDE_PROPERTY, INCLUDE_QNAME);
+ insertPlanElements(xmlCursor, DEPENDENCY_PROPERTY, DEPENDENCY_QNAME);
+
+ File targetDir = new File(this.targetDir);
+ if (targetDir.exists()) {
+ if (!targetDir.isDirectory()) {
+ throw new RuntimeException("TargetDir: " + this.targetDir + " exists and is not a directory");
+ }
+ } else {
+ targetDir.mkdirs();
+ }
+ File output = new File(targetFile);
+ XmlOptions xmlOptions = new XmlOptions();
+ xmlOptions.setSavePrettyPrint();
+ doc.save(output, xmlOptions);
+ } finally {
+ xmlCursor.dispose();
+ }
+ }
+
+ private void insertPlanElements(XmlCursor xmlCursor, String artifactProperty, QName elementQName) {
+ if (xmlCursor.toNextSibling(elementQName)) {
+ while(xmlCursor.toNextSibling(elementQName));
+ xmlCursor.toEndToken();
+ xmlCursor.toNextToken();
+ }
+ for (Iterator iterator = artifacts.iterator(); iterator.hasNext();) {
+ Artifact artifact = (Artifact) iterator.next();
+ Dependency dependency = (Dependency) artifact.getDependency();
+ if ("true".equals(dependency.getProperty(artifactProperty))) {
+ String groupId = dependency.getGroupId();
+ String artifactId = dependency.getArtifactId();
+ String version = dependency.getVersion();
+ String type = dependency.getType();
+ org.apache.geronimo.deployment.xbeans.DependencyType dependencyType = org.apache.geronimo.deployment.xbeans.DependencyType.Factory.newInstance();
+ dependencyType.setGroupId(groupId);
+ dependencyType.setArtifactId(artifactId);
+ dependencyType.setVersion(version);
+ if (type != null && !"jar".equals(type)) {
+ dependencyType.setType(type);
+ }
+
+ xmlCursor.beginElement(elementQName);
+ XmlCursor element = dependencyType.newCursor();
+ try {
+ element.copyXmlContents(xmlCursor);
+ } finally {
+ element.dispose();
+ }
+ xmlCursor.toNextToken();
+ }
+ }
+ }
+}