geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From djen...@apache.org
Subject svn commit: r355382 - in /geronimo/branches/1.0: applications/daytrader/ applications/daytrader/modules/core/ applications/daytrader/modules/ear/ applications/daytrader/modules/ejb/ applications/daytrader/modules/streamer/ applications/daytrader/module...
Date Fri, 09 Dec 2005 05:35:12 GMT
Author: djencks
Date: Thu Dec  8 21:34:57 2005
New Revision: 355382

URL: http://svn.apache.org/viewcvs?rev=355382&view=rev
Log:
Port daytrader changes from trunk revisions 355318 355333 355341 355367

Modified:
    geronimo/branches/1.0/applications/daytrader/modules/core/project.xml
    geronimo/branches/1.0/applications/daytrader/modules/ear/project.xml
    geronimo/branches/1.0/applications/daytrader/modules/ejb/project.properties
    geronimo/branches/1.0/applications/daytrader/modules/ejb/project.xml
    geronimo/branches/1.0/applications/daytrader/modules/streamer/project.xml
    geronimo/branches/1.0/applications/daytrader/modules/web/project.xml
    geronimo/branches/1.0/applications/daytrader/modules/wsappclient/project.xml
    geronimo/branches/1.0/applications/daytrader/project.xml
    geronimo/branches/1.0/assemblies/j2ee-jetty-server/project.xml
    geronimo/branches/1.0/assemblies/j2ee-jetty-server/src/var/config/config.xml
    geronimo/branches/1.0/assemblies/j2ee-tomcat-server/project.xml
    geronimo/branches/1.0/assemblies/j2ee-tomcat-server/src/var/config/config.xml
    geronimo/branches/1.0/configs/daytrader-jetty/project.properties
    geronimo/branches/1.0/configs/daytrader-tomcat/project.properties

Modified: geronimo/branches/1.0/applications/daytrader/modules/core/project.xml
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.0/applications/daytrader/modules/core/project.xml?rev=355382&r1=355381&r2=355382&view=diff
==============================================================================
--- geronimo/branches/1.0/applications/daytrader/modules/core/project.xml (original)
+++ geronimo/branches/1.0/applications/daytrader/modules/core/project.xml Thu Dec  8 21:34:57
2005
@@ -3,7 +3,7 @@
 <project>
   <extend>../../project.xml</extend>
   <pomVersion>3</pomVersion>
-  <id>daytrader-core</id>
+  <artifactId>daytrader-core</artifactId>
   <name>core</name>
   <package>org.apache.geronimo.samples.daytrader</package>
   <description>Common files for day Trader</description>

Modified: geronimo/branches/1.0/applications/daytrader/modules/ear/project.xml
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.0/applications/daytrader/modules/ear/project.xml?rev=355382&r1=355381&r2=355382&view=diff
==============================================================================
--- geronimo/branches/1.0/applications/daytrader/modules/ear/project.xml (original)
+++ geronimo/branches/1.0/applications/daytrader/modules/ear/project.xml Thu Dec  8 21:34:57
2005
@@ -3,13 +3,13 @@
 <project>
   <extend>../../project.xml</extend>
   <pomVersion>3</pomVersion>
-  <id>daytrader-ear</id>
+  <artifactId>daytrader-ear</artifactId>
   <name>DayTrader Enterprise Application</name>
   <package>org.apache.geronimo.samples.daytrader.ejb</package>
   <description>Day Trader Enterprise Archive</description>
   <dependencies>
     <dependency>
-      <groupId>daytrader</groupId>
+      <groupId>geronimo</groupId>
       <artifactId>daytrader-core</artifactId>
       <version>${pom.currentVersion}</version>
       <properties>
@@ -17,7 +17,7 @@
       </properties>
     </dependency>
     <dependency>
-      <groupId>daytrader</groupId>
+      <groupId>geronimo</groupId>
       <artifactId>daytrader-wsappclient</artifactId>
       <version>${pom.currentVersion}</version>
       <properties>
@@ -25,7 +25,7 @@
       </properties>
     </dependency>
     <dependency>
-      <groupId>daytrader</groupId>
+      <groupId>geronimo</groupId>
       <artifactId>daytrader-web</artifactId>
       <version>${pom.currentVersion}</version>
       <type>war</type>
@@ -35,7 +35,7 @@
       </properties>
     </dependency>
     <dependency>
-      <groupId>daytrader</groupId>
+      <groupId>geronimo</groupId>
       <artifactId>daytrader-ejb</artifactId>
       <version>${pom.currentVersion}</version>
       <type>ejb</type>
@@ -44,7 +44,7 @@
       </properties>
     </dependency>
     <dependency>
-      <groupId>daytrader</groupId>
+      <groupId>geronimo</groupId>
       <artifactId>daytrader-streamer</artifactId>
       <version>${pom.currentVersion}</version>
       <properties>

Modified: geronimo/branches/1.0/applications/daytrader/modules/ejb/project.properties
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.0/applications/daytrader/modules/ejb/project.properties?rev=355382&r1=355381&r2=355382&view=diff
==============================================================================
--- geronimo/branches/1.0/applications/daytrader/modules/ejb/project.properties (original)
+++ geronimo/branches/1.0/applications/daytrader/modules/ejb/project.properties Thu Dec  8
21:34:57 2005
@@ -1 +1 @@
-maven.multiproject.properties=ejb
+maven.multiproject.type=ejb

Modified: geronimo/branches/1.0/applications/daytrader/modules/ejb/project.xml
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.0/applications/daytrader/modules/ejb/project.xml?rev=355382&r1=355381&r2=355382&view=diff
==============================================================================
--- geronimo/branches/1.0/applications/daytrader/modules/ejb/project.xml (original)
+++ geronimo/branches/1.0/applications/daytrader/modules/ejb/project.xml Thu Dec  8 21:34:57
2005
@@ -3,18 +3,18 @@
 <project>
   <extend>../../project.xml</extend>
   <pomVersion>3</pomVersion>
-  <id>daytrader-ejb</id>
+  <artifactId>daytrader-ejb</artifactId>
   <name>DayTrader EJBs</name>
   <package>org.apache.geronimo.samples.daytrader.ejb</package>
   <description>Day Trader EJBs</description>
   <dependencies>
     <dependency>
-      <groupId>daytrader</groupId>
+      <groupId>geronimo</groupId>
       <artifactId>daytrader-core</artifactId>
       <version>${pom.currentVersion}</version>
     </dependency>
     <dependency>
-      <groupId>daytrader</groupId>
+      <groupId>geronimo</groupId>
       <artifactId>daytrader-wsappclient</artifactId>
       <version>${pom.currentVersion}</version>
     </dependency>

Modified: geronimo/branches/1.0/applications/daytrader/modules/streamer/project.xml
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.0/applications/daytrader/modules/streamer/project.xml?rev=355382&r1=355381&r2=355382&view=diff
==============================================================================
--- geronimo/branches/1.0/applications/daytrader/modules/streamer/project.xml (original)
+++ geronimo/branches/1.0/applications/daytrader/modules/streamer/project.xml Thu Dec  8 21:34:57
2005
@@ -3,7 +3,7 @@
 <project>
   <extend>../../project.xml</extend>
   <pomVersion>3</pomVersion>
-  <id>daytrader-streamer</id>
+  <artifactId>daytrader-streamer</artifactId>
   <name>streamer</name>
   <package>org.apache.geronimo.samples.daytrader.client</package>
   <description>Streamer Application for Day Trader</description>
@@ -14,7 +14,7 @@
     </dependency>
     
      <dependency>
-      <groupId>daytrader</groupId>
+      <groupId>geronimo</groupId>
       <artifactId>daytrader-ejb</artifactId>
       <version>${pom.currentVersion}</version>
      <type>ejb</type>

Modified: geronimo/branches/1.0/applications/daytrader/modules/web/project.xml
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.0/applications/daytrader/modules/web/project.xml?rev=355382&r1=355381&r2=355382&view=diff
==============================================================================
--- geronimo/branches/1.0/applications/daytrader/modules/web/project.xml (original)
+++ geronimo/branches/1.0/applications/daytrader/modules/web/project.xml Thu Dec  8 21:34:57
2005
@@ -3,13 +3,13 @@
 <project>
   <extend>../../project.xml</extend>
   <pomVersion>3</pomVersion>
-  <id>daytrader-web</id>
+  <artifactId>daytrader-web</artifactId>
   <name>Web Application</name>
   <package>org.apache.geronimo.samples.daytrader.web</package>
   <description>This is the web application.</description>
   <dependencies>
     <dependency>
-      <groupId>daytrader</groupId>
+      <groupId>geronimo</groupId>
       <artifactId>daytrader-ejb</artifactId>
       <version>${pom.currentVersion}</version>
       <type>ejb</type>

Modified: geronimo/branches/1.0/applications/daytrader/modules/wsappclient/project.xml
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.0/applications/daytrader/modules/wsappclient/project.xml?rev=355382&r1=355381&r2=355382&view=diff
==============================================================================
--- geronimo/branches/1.0/applications/daytrader/modules/wsappclient/project.xml (original)
+++ geronimo/branches/1.0/applications/daytrader/modules/wsappclient/project.xml Thu Dec 
8 21:34:57 2005
@@ -3,7 +3,7 @@
 <project>
   <extend>../../project.xml</extend>
   <pomVersion>3</pomVersion>
-  <id>daytrader-wsappclient</id>
+  <artifactId>daytrader-wsappclient</artifactId>
   <name>daytrader-wsappclient</name>
   <package>org.apache.geronimo.samples.daytrader</package>
   <description>Common files for day Trader</description>

Modified: geronimo/branches/1.0/applications/daytrader/project.xml
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.0/applications/daytrader/project.xml?rev=355382&r1=355381&r2=355382&view=diff
==============================================================================
--- geronimo/branches/1.0/applications/daytrader/project.xml (original)
+++ geronimo/branches/1.0/applications/daytrader/project.xml Thu Dec  8 21:34:57 2005
@@ -1,66 +1,28 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!--
 
-<project>
-  <!-- the version of maven's project object model -->
+    Copyright 2004 The Apache Software Foundation
 
-  <pomVersion>3</pomVersion>
-  <!-- a unique name for this project -->
+    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
 
-  <id>daytrader</id>
-  <groupId>daytrader</groupId>
-  <!-- a short but descriptive name for the project -->
-
-  <name>Apache Geronimo Day Trader Performance Benchmark Sample</name>
-  <!-- The version of the project under development, e.g.
-       1.1, 1.2, 2.0-SNAPSHOT -->
-
-  <currentVersion>1.0</currentVersion>
-  <!-- details about the organization that 'owns' the project -->
-
-  <organization>
-    <name>Apache Software Foundation</name>
-    <url>http://www.apache.org/</url>
-    <logo>http://maven.apache.org/images/jakarta-logo-blue.gif</logo>
-  </organization>
-  <!-- the year the project started -->
-
-  <inceptionYear>2002</inceptionYear>
-  <package>org.apache.geronimo.samples.daytrader</package>
-  <logo>http://maven.apache.org/images/maven.jpg</logo>
-  <description>This is an example of an application with a complex architecture that
uses XDoclet, EJB, EAR and servlets that can be used as a basis for your applications.</description>
+       http://www.apache.org/licenses/LICENSE-2.0
 
-  <!-- a short description of what the project does -->
-  <shortDescription>How to use maven in different situations</shortDescription>
+    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.
+-->
 
-  <!-- the project home page -->
-  <url>http://maven.apache.org/reference/plugins/examples/</url>
+<!-- $Rev: 355318 $ $Date: 2005-12-08 18:18:07 -0800 (Thu, 08 Dec 2005) $ -->
 
-  <issueTrackingUrl>http://nagoya.apache.org/scarab/servlet/scarab/</issueTrackingUrl>
-  <siteAddress>jakarta.apache.org</siteAddress>
-  <siteDirectory>/www/maven.apache.org/reference/plugins/examples/</siteDirectory>
-  <distributionDirectory>/www/maven.apache.org/builds/</distributionDirectory>
-  <!-- the version control repository and http url for online access
-       the connection element has the form:
-       scm:<system>:<system specific connection string> -->
-
-  <repository>
-    <connection>scm:cvs:pserver:anoncvs@cvs.apache.org:/home/cvspublic:maven-plugins/examples</connection>
-    <url>http://cvs.apache.org/viewcvs/maven-plugins/examples/</url>
-  </repository>
-  <!-- any mailing lists for the project -->
-
-  <mailingLists/>
-  <!-- who the developers are for the project -->
-
-  <developers/>
-  <!-- jar files the project is dependent on -->
-
-  <dependencies/>
-  <!-- build information for the project -->
-
-  <reports>
-    <report>maven-changelog-plugin</report>
-    <report>maven-developer-activity-plugin</report>
-    <report>maven-file-activity-plugin</report>
-  </reports>
+<project>
+  <pomVersion>3</pomVersion>
+  <extend>../../etc/project.xml</extend>
+
+  <name>Geronimo :: Day Trader Performance Benchmark Sample</name>
+  <artifactId>daytrader</artifactId>
+  <description>This is an example of an application with a complex architecture that
uses XDoclet, EJB, EAR and servlets that can be used as a basis for your applications.</description>
 </project>

Modified: geronimo/branches/1.0/assemblies/j2ee-jetty-server/project.xml
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.0/assemblies/j2ee-jetty-server/project.xml?rev=355382&r1=355381&r2=355382&view=diff
==============================================================================
--- geronimo/branches/1.0/assemblies/j2ee-jetty-server/project.xml (original)
+++ geronimo/branches/1.0/assemblies/j2ee-jetty-server/project.xml Thu Dec  8 21:34:57 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/branches/1.0/assemblies/j2ee-jetty-server/src/var/config/config.xml
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.0/assemblies/j2ee-jetty-server/src/var/config/config.xml?rev=355382&r1=355381&r2=355382&view=diff
==============================================================================
--- geronimo/branches/1.0/assemblies/j2ee-jetty-server/src/var/config/config.xml (original)
+++ geronimo/branches/1.0/assemblies/j2ee-jetty-server/src/var/config/config.xml Thu Dec 
8 21:34:57 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/branches/1.0/assemblies/j2ee-tomcat-server/project.xml
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.0/assemblies/j2ee-tomcat-server/project.xml?rev=355382&r1=355381&r2=355382&view=diff
==============================================================================
--- geronimo/branches/1.0/assemblies/j2ee-tomcat-server/project.xml (original)
+++ geronimo/branches/1.0/assemblies/j2ee-tomcat-server/project.xml Thu Dec  8 21:34:57 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/branches/1.0/assemblies/j2ee-tomcat-server/src/var/config/config.xml
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.0/assemblies/j2ee-tomcat-server/src/var/config/config.xml?rev=355382&r1=355381&r2=355382&view=diff
==============================================================================
--- geronimo/branches/1.0/assemblies/j2ee-tomcat-server/src/var/config/config.xml (original)
+++ geronimo/branches/1.0/assemblies/j2ee-tomcat-server/src/var/config/config.xml Thu Dec
 8 21:34:57 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/branches/1.0/configs/daytrader-jetty/project.properties
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.0/configs/daytrader-jetty/project.properties?rev=355382&r1=355381&r2=355382&view=diff
==============================================================================
--- geronimo/branches/1.0/configs/daytrader-jetty/project.properties (original)
+++ geronimo/branches/1.0/configs/daytrader-jetty/project.properties Thu Dec  8 21:34:57 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/branches/1.0/configs/daytrader-tomcat/project.properties
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.0/configs/daytrader-tomcat/project.properties?rev=355382&r1=355381&r2=355382&view=diff
==============================================================================
--- geronimo/branches/1.0/configs/daytrader-tomcat/project.properties (original)
+++ geronimo/branches/1.0/configs/daytrader-tomcat/project.properties Thu Dec  8 21:34:57
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
 



Mime
View raw message