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/12/09 05:47:48 UTC
svn commit: r355367 - in /geronimo/trunk: assemblies/j2ee-jetty-server/
assemblies/j2ee-jetty-server/src/var/config/ assemblies/j2ee-tomcat-server/
assemblies/j2ee-tomcat-server/src/var/config/ configs/daytrader-jetty/
configs/daytrader-tomcat/
Author: djencks
Date: Thu Dec 8 20:47:45 2005
New Revision: 355367
URL: http://svn.apache.org/viewcvs?rev=355367&view=rev
Log:
more daytrader build fixes and include in assemblies
Modified:
geronimo/trunk/assemblies/j2ee-jetty-server/project.xml
geronimo/trunk/assemblies/j2ee-jetty-server/src/var/config/config.xml
geronimo/trunk/assemblies/j2ee-tomcat-server/project.xml
geronimo/trunk/assemblies/j2ee-tomcat-server/src/var/config/config.xml
geronimo/trunk/configs/daytrader-jetty/project.properties
geronimo/trunk/configs/daytrader-tomcat/project.properties
Modified: geronimo/trunk/assemblies/j2ee-jetty-server/project.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/assemblies/j2ee-jetty-server/project.xml?rev=355367&r1=355366&r2=355367&view=diff
==============================================================================
--- geronimo/trunk/assemblies/j2ee-jetty-server/project.xml (original)
+++ geronimo/trunk/assemblies/j2ee-jetty-server/project.xml Thu Dec 8 20:47:45 2005
@@ -125,18 +125,20 @@
<geronimo.assemble>install</geronimo.assemble>
</properties>
</dependency>
+<!-- client -->
<dependency>
<groupId>geronimo</groupId>
- <artifactId>geronimo-gbean-deployer</artifactId>
+ <artifactId>client-system</artifactId>
<type>car</type>
<version>${pom.currentVersion}</version>
<properties>
<geronimo.assemble>install</geronimo.assemble>
+ <geronimo.assemble.executable>bin/client.jar</geronimo.assemble.executable>
</properties>
</dependency>
<dependency>
<groupId>geronimo</groupId>
- <artifactId>j2ee-deployer</artifactId>
+ <artifactId>client</artifactId>
<type>car</type>
<version>${pom.currentVersion}</version>
<properties>
@@ -145,7 +147,7 @@
</dependency>
<dependency>
<groupId>geronimo</groupId>
- <artifactId>hot-deployer</artifactId>
+ <artifactId>client-security</artifactId>
<type>car</type>
<version>${pom.currentVersion}</version>
<properties>
@@ -154,16 +156,17 @@
</dependency>
<dependency>
<groupId>geronimo</groupId>
- <artifactId>jetty-deployer</artifactId>
+ <artifactId>client-corba</artifactId>
<type>car</type>
<version>${pom.currentVersion}</version>
<properties>
<geronimo.assemble>install</geronimo.assemble>
</properties>
</dependency>
+<!-- deployers -->
<dependency>
<groupId>geronimo</groupId>
- <artifactId>welcome-jetty</artifactId>
+ <artifactId>geronimo-gbean-deployer</artifactId>
<type>car</type>
<version>${pom.currentVersion}</version>
<properties>
@@ -172,7 +175,7 @@
</dependency>
<dependency>
<groupId>geronimo</groupId>
- <artifactId>servlets-examples-jetty</artifactId>
+ <artifactId>j2ee-deployer</artifactId>
<type>car</type>
<version>${pom.currentVersion}</version>
<properties>
@@ -181,7 +184,7 @@
</dependency>
<dependency>
<groupId>geronimo</groupId>
- <artifactId>jsp-examples-jetty</artifactId>
+ <artifactId>hot-deployer</artifactId>
<type>car</type>
<version>${pom.currentVersion}</version>
<properties>
@@ -190,16 +193,17 @@
</dependency>
<dependency>
<groupId>geronimo</groupId>
- <artifactId>webconsole-jetty</artifactId>
+ <artifactId>jetty-deployer</artifactId>
<type>car</type>
<version>${pom.currentVersion}</version>
<properties>
<geronimo.assemble>install</geronimo.assemble>
</properties>
</dependency>
+<!-- applications -->
<dependency>
<groupId>geronimo</groupId>
- <artifactId>uddi-jetty</artifactId>
+ <artifactId>welcome-jetty</artifactId>
<type>car</type>
<version>${pom.currentVersion}</version>
<properties>
@@ -208,17 +212,16 @@
</dependency>
<dependency>
<groupId>geronimo</groupId>
- <artifactId>client-system</artifactId>
+ <artifactId>servlets-examples-jetty</artifactId>
<type>car</type>
<version>${pom.currentVersion}</version>
<properties>
<geronimo.assemble>install</geronimo.assemble>
- <geronimo.assemble.executable>bin/client.jar</geronimo.assemble.executable>
</properties>
</dependency>
<dependency>
<groupId>geronimo</groupId>
- <artifactId>client</artifactId>
+ <artifactId>jsp-examples-jetty</artifactId>
<type>car</type>
<version>${pom.currentVersion}</version>
<properties>
@@ -227,7 +230,7 @@
</dependency>
<dependency>
<groupId>geronimo</groupId>
- <artifactId>client-security</artifactId>
+ <artifactId>webconsole-jetty</artifactId>
<type>car</type>
<version>${pom.currentVersion}</version>
<properties>
@@ -236,7 +239,25 @@
</dependency>
<dependency>
<groupId>geronimo</groupId>
- <artifactId>client-corba</artifactId>
+ <artifactId>uddi-jetty</artifactId>
+ <type>car</type>
+ <version>${pom.currentVersion}</version>
+ <properties>
+ <geronimo.assemble>install</geronimo.assemble>
+ </properties>
+ </dependency>
+ <dependency>
+ <groupId>geronimo</groupId>
+ <artifactId>daytrader-derby-jetty</artifactId>
+ <type>car</type>
+ <version>${pom.currentVersion}</version>
+ <properties>
+ <geronimo.assemble>install</geronimo.assemble>
+ </properties>
+ </dependency>
+ <dependency>
+ <groupId>geronimo</groupId>
+ <artifactId>daytrader-derby-jetty-streamer-client</artifactId>
<type>car</type>
<version>${pom.currentVersion}</version>
<properties>
Modified: geronimo/trunk/assemblies/j2ee-jetty-server/src/var/config/config.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/assemblies/j2ee-jetty-server/src/var/config/config.xml?rev=355367&r1=355366&r2=355367&view=diff
==============================================================================
--- geronimo/trunk/assemblies/j2ee-jetty-server/src/var/config/config.xml (original)
+++ geronimo/trunk/assemblies/j2ee-jetty-server/src/var/config/config.xml Thu Dec 8 20:47:45 2005
@@ -88,4 +88,5 @@
<configuration name="geronimo/jsp-examples-jetty/${pom.currentVersion}/car"/>
<configuration name="geronimo/webconsole-jetty/${pom.currentVersion}/car"/>
<configuration name="geronimo/uddi-jetty/${pom.currentVersion}/car"/>
+ <configuration name="geronimo/daytrader-derby-jetty/${pom.currentVersion}/car"/>
</attributes>
Modified: geronimo/trunk/assemblies/j2ee-tomcat-server/project.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/assemblies/j2ee-tomcat-server/project.xml?rev=355367&r1=355366&r2=355367&view=diff
==============================================================================
--- geronimo/trunk/assemblies/j2ee-tomcat-server/project.xml (original)
+++ geronimo/trunk/assemblies/j2ee-tomcat-server/project.xml Thu Dec 8 20:47:45 2005
@@ -125,18 +125,20 @@
<geronimo.assemble>install</geronimo.assemble>
</properties>
</dependency>
+<!--client-->
<dependency>
<groupId>geronimo</groupId>
- <artifactId>geronimo-gbean-deployer</artifactId>
+ <artifactId>client-system</artifactId>
<type>car</type>
<version>${pom.currentVersion}</version>
<properties>
<geronimo.assemble>install</geronimo.assemble>
+ <geronimo.assemble.executable>bin/client.jar</geronimo.assemble.executable>
</properties>
</dependency>
<dependency>
<groupId>geronimo</groupId>
- <artifactId>hot-deployer</artifactId>
+ <artifactId>client</artifactId>
<type>car</type>
<version>${pom.currentVersion}</version>
<properties>
@@ -145,7 +147,7 @@
</dependency>
<dependency>
<groupId>geronimo</groupId>
- <artifactId>j2ee-deployer</artifactId>
+ <artifactId>client-security</artifactId>
<type>car</type>
<version>${pom.currentVersion}</version>
<properties>
@@ -154,16 +156,17 @@
</dependency>
<dependency>
<groupId>geronimo</groupId>
- <artifactId>tomcat-deployer</artifactId>
+ <artifactId>client-corba</artifactId>
<type>car</type>
<version>${pom.currentVersion}</version>
<properties>
<geronimo.assemble>install</geronimo.assemble>
</properties>
</dependency>
+<!--deployers-->
<dependency>
<groupId>geronimo</groupId>
- <artifactId>welcome-tomcat</artifactId>
+ <artifactId>geronimo-gbean-deployer</artifactId>
<type>car</type>
<version>${pom.currentVersion}</version>
<properties>
@@ -172,7 +175,7 @@
</dependency>
<dependency>
<groupId>geronimo</groupId>
- <artifactId>servlets-examples-tomcat</artifactId>
+ <artifactId>hot-deployer</artifactId>
<type>car</type>
<version>${pom.currentVersion}</version>
<properties>
@@ -181,7 +184,7 @@
</dependency>
<dependency>
<groupId>geronimo</groupId>
- <artifactId>jsp-examples-tomcat</artifactId>
+ <artifactId>j2ee-deployer</artifactId>
<type>car</type>
<version>${pom.currentVersion}</version>
<properties>
@@ -190,16 +193,17 @@
</dependency>
<dependency>
<groupId>geronimo</groupId>
- <artifactId>webconsole-tomcat</artifactId>
+ <artifactId>tomcat-deployer</artifactId>
<type>car</type>
<version>${pom.currentVersion}</version>
<properties>
<geronimo.assemble>install</geronimo.assemble>
</properties>
</dependency>
+<!--applications-->
<dependency>
<groupId>geronimo</groupId>
- <artifactId>uddi-tomcat</artifactId>
+ <artifactId>welcome-tomcat</artifactId>
<type>car</type>
<version>${pom.currentVersion}</version>
<properties>
@@ -208,17 +212,16 @@
</dependency>
<dependency>
<groupId>geronimo</groupId>
- <artifactId>client-system</artifactId>
+ <artifactId>servlets-examples-tomcat</artifactId>
<type>car</type>
<version>${pom.currentVersion}</version>
<properties>
<geronimo.assemble>install</geronimo.assemble>
- <geronimo.assemble.executable>bin/client.jar</geronimo.assemble.executable>
</properties>
</dependency>
<dependency>
<groupId>geronimo</groupId>
- <artifactId>client</artifactId>
+ <artifactId>jsp-examples-tomcat</artifactId>
<type>car</type>
<version>${pom.currentVersion}</version>
<properties>
@@ -227,7 +230,7 @@
</dependency>
<dependency>
<groupId>geronimo</groupId>
- <artifactId>client-security</artifactId>
+ <artifactId>webconsole-tomcat</artifactId>
<type>car</type>
<version>${pom.currentVersion}</version>
<properties>
@@ -236,7 +239,25 @@
</dependency>
<dependency>
<groupId>geronimo</groupId>
- <artifactId>client-corba</artifactId>
+ <artifactId>uddi-tomcat</artifactId>
+ <type>car</type>
+ <version>${pom.currentVersion}</version>
+ <properties>
+ <geronimo.assemble>install</geronimo.assemble>
+ </properties>
+ </dependency>
+ <dependency>
+ <groupId>geronimo</groupId>
+ <artifactId>daytrader-derby-tomcat</artifactId>
+ <type>car</type>
+ <version>${pom.currentVersion}</version>
+ <properties>
+ <geronimo.assemble>install</geronimo.assemble>
+ </properties>
+ </dependency>
+ <dependency>
+ <groupId>geronimo</groupId>
+ <artifactId>daytrader-derby-tomcat-streamer-client</artifactId>
<type>car</type>
<version>${pom.currentVersion}</version>
<properties>
@@ -832,11 +853,6 @@
<version>${jdom_version}</version>
</dependency>
- <dependency>
- <groupId>jetty</groupId>
- <artifactId>org.mortbay.jetty</artifactId>
- <version>${jetty_version}</version>
- </dependency>
<dependency>
<groupId>juddi</groupId>
Modified: geronimo/trunk/assemblies/j2ee-tomcat-server/src/var/config/config.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/assemblies/j2ee-tomcat-server/src/var/config/config.xml?rev=355367&r1=355366&r2=355367&view=diff
==============================================================================
--- geronimo/trunk/assemblies/j2ee-tomcat-server/src/var/config/config.xml (original)
+++ geronimo/trunk/assemblies/j2ee-tomcat-server/src/var/config/config.xml Thu Dec 8 20:47:45 2005
@@ -94,4 +94,5 @@
<configuration name="geronimo/jsp-examples-tomcat/${pom.currentVersion}/car"/>
<configuration name="geronimo/webconsole-tomcat/${pom.currentVersion}/car"/>
<configuration name="geronimo/uddi-tomcat/${pom.currentVersion}/car"/>
+ <configuration name="geronimo/daytrader-derby-tomcat/${pom.currentVersion}/car"/>
</attributes>
Modified: geronimo/trunk/configs/daytrader-jetty/project.properties
URL: http://svn.apache.org/viewcvs/geronimo/trunk/configs/daytrader-jetty/project.properties?rev=355367&r1=355366&r2=355367&view=diff
==============================================================================
--- geronimo/trunk/configs/daytrader-jetty/project.properties (original)
+++ geronimo/trunk/configs/daytrader-jetty/project.properties Thu Dec 8 20:47:45 2005
@@ -23,5 +23,5 @@
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}/daytrader/ears/daytrader-ear-${geronimo_version}.ear
+geronimo.packaging.moduleFile=${maven.repo.local}/geronimo/ears/daytrader-ear-${pom.currentVersion}.ear
Modified: geronimo/trunk/configs/daytrader-tomcat/project.properties
URL: http://svn.apache.org/viewcvs/geronimo/trunk/configs/daytrader-tomcat/project.properties?rev=355367&r1=355366&r2=355367&view=diff
==============================================================================
--- geronimo/trunk/configs/daytrader-tomcat/project.properties (original)
+++ geronimo/trunk/configs/daytrader-tomcat/project.properties Thu Dec 8 20:47:45 2005
@@ -23,5 +23,5 @@
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}/daytrader/ears/daytrader-ear-${geronimo_version}.ear
+geronimo.packaging.moduleFile=${maven.repo.local}/geronimo/ears/daytrader-ear-${pom.currentVersion}.ear