geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From djen...@apache.org
Subject svn commit: r355438 - in /geronimo/trunk: applications/daytrader/derby/ applications/daytrader/derby/src/ applications/daytrader/derby/src/sql/ configs/daytrader-jetty/ configs/daytrader-jetty/src/plan/ configs/daytrader-tomcat/ configs/daytrader-tomca...
Date Fri, 09 Dec 2005 10:25:17 GMT
Author: djencks
Date: Fri Dec  9 02:25:06 2005
New Revision: 355438

URL: http://svn.apache.org/viewcvs?rev=355438&view=rev
Log:
Add derby db for daytrader

Added:
    geronimo/trunk/applications/daytrader/derby/maven.xml
      - copied, changed from r355399, geronimo/trunk/applications/uddi-db/maven.xml
    geronimo/trunk/applications/daytrader/derby/project.properties
      - copied unchanged from r355399, geronimo/trunk/applications/uddi-db/project.properties
    geronimo/trunk/applications/daytrader/derby/project.xml
      - copied, changed from r355399, geronimo/trunk/applications/uddi-db/project.xml
    geronimo/trunk/applications/daytrader/derby/src/
    geronimo/trunk/applications/daytrader/derby/src/sql/
    geronimo/trunk/applications/daytrader/derby/src/sql/daytrader.sql
      - copied, changed from r355399, geronimo/trunk/applications/daytrader/derby/Table.ddl
Removed:
    geronimo/trunk/applications/daytrader/derby/Table.ddl
Modified:
    geronimo/trunk/configs/daytrader-jetty/project.xml
    geronimo/trunk/configs/daytrader-jetty/src/plan/plan.xml
    geronimo/trunk/configs/daytrader-tomcat/project.xml
    geronimo/trunk/configs/daytrader-tomcat/src/plan/plan.xml

Copied: geronimo/trunk/applications/daytrader/derby/maven.xml (from r355399, geronimo/trunk/applications/uddi-db/maven.xml)
URL: http://svn.apache.org/viewcvs/geronimo/trunk/applications/daytrader/derby/maven.xml?p2=geronimo/trunk/applications/daytrader/derby/maven.xml&p1=geronimo/trunk/applications/uddi-db/maven.xml&r1=355399&r2=355438&rev=355438&view=diff
==============================================================================
--- geronimo/trunk/applications/uddi-db/maven.xml (original)
+++ geronimo/trunk/applications/daytrader/derby/maven.xml Fri Dec  9 02:25:06 2005
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
 <!--
 
-    Copyright 2004 The Apache Software Foundation
+    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.
@@ -56,7 +56,7 @@
             <j:arg type="java.lang.String" value="true"/>
         </j:invokeStatic>
         <sql driver="org.apache.derby.jdbc.EmbeddedDriver"
-            url="jdbc:derby:UddiDatabase;create=true"
+            url="jdbc:derby:DaytraderDatabase;create=true"
             userid="" password=""
             autocommit="true"
             onerror="abort"

Copied: geronimo/trunk/applications/daytrader/derby/project.xml (from r355399, geronimo/trunk/applications/uddi-db/project.xml)
URL: http://svn.apache.org/viewcvs/geronimo/trunk/applications/daytrader/derby/project.xml?p2=geronimo/trunk/applications/daytrader/derby/project.xml&p1=geronimo/trunk/applications/uddi-db/project.xml&r1=355399&r2=355438&rev=355438&view=diff
==============================================================================
--- geronimo/trunk/applications/uddi-db/project.xml (original)
+++ geronimo/trunk/applications/daytrader/derby/project.xml Fri Dec  9 02:25:06 2005
@@ -20,16 +20,16 @@
 
 <project>
     <pomVersion>3</pomVersion>
-    <extend>../../etc/project.xml</extend>
+    <extend>../../../etc/project.xml</extend>
 
     <!-- ===================== -->
     <!-- Module Identification -->
     <!-- ===================== -->
 
-    <name>Geronimo :: UDDI-Server database</name>
-    <id>geronimo-uddi-db</id>
-    <shortDescription>Geronimo UDDI Server Database</shortDescription>
-    <description>Geronimo UDDI Server Database</description>
+    <name>Geronimo :: Daytrader Derby database</name>
+    <artifactId>geronimo-daytrader-derby-db</artifactId>
+    <shortDescription>Geronimo Daytrader Derby Database</shortDescription>
+    <description>Geronimo Daytrader Derby Database</description>
 
     <build>
 

Copied: geronimo/trunk/applications/daytrader/derby/src/sql/daytrader.sql (from r355399, geronimo/trunk/applications/daytrader/derby/Table.ddl)
URL: http://svn.apache.org/viewcvs/geronimo/trunk/applications/daytrader/derby/src/sql/daytrader.sql?p2=geronimo/trunk/applications/daytrader/derby/src/sql/daytrader.sql&p1=geronimo/trunk/applications/daytrader/derby/Table.ddl&r1=355399&r2=355438&rev=355438&view=diff
==============================================================================
--- geronimo/trunk/applications/daytrader/derby/Table.ddl (original)
+++ geronimo/trunk/applications/daytrader/derby/src/sql/daytrader.sql Fri Dec  9 02:25:06
2005
@@ -1,9 +1,9 @@
-DROP TABLE HOLDINGEJB;
-DROP TABLE ACCOUNTPROFILEEJB;
-DROP TABLE QUOTEEJB;
-DROP TABLE KEYGENEJB;
-DROP TABLE ACCOUNTEJB;
-DROP TABLE ORDEREJB;
+--DROP TABLE HOLDINGEJB;
+--DROP TABLE ACCOUNTPROFILEEJB;
+--DROP TABLE QUOTEEJB;
+--DROP TABLE KEYGENEJB;
+--DROP TABLE ACCOUNTEJB;
+--DROP TABLE ORDEREJB;
 
 CREATE TABLE HOLDINGEJB
   (PURCHASEPRICE DECIMAL(10, 2),

Modified: geronimo/trunk/configs/daytrader-jetty/project.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/configs/daytrader-jetty/project.xml?rev=355438&r1=355437&r2=355438&view=diff
==============================================================================
--- geronimo/trunk/configs/daytrader-jetty/project.xml (original)
+++ geronimo/trunk/configs/daytrader-jetty/project.xml Fri Dec  9 02:25:06 2005
@@ -61,145 +61,23 @@
              </properties>
         </dependency>
 
-
-<!--            <dependency>
-                <uri>org.apache.derby/jars/derby-10.1.1.0.jar</uri>
-            </dependency>
-            <dependency>
-                <uri>org.apache.derby/jars/derbynet-10.1.1.0.jar</uri>
-            </dependency>
--->
-<!--    <dependency>
-        <groupId>portlet-api</groupId>
-        <artifactId>portlet-api</artifactId>
-        <version>${portlet_api_version}</version>
-            <properties>
-                 <geronimo.dependency>true</geronimo.dependency>
-             </properties>
-    </dependency>
-    <dependency>
-        <groupId>org.apache.pluto</groupId>
-        <artifactId>pluto</artifactId>
-        <version>${pluto_version}</version>
-            <properties>
-                 <geronimo.dependency>true</geronimo.dependency>
-             </properties>
-    </dependency>
     <dependency>
         <groupId>geronimo</groupId>
-        <artifactId>geronimo-console-core</artifactId>
-        <version>${geronimo_version}</version>
+        <artifactId>geronimo-daytrader-derby-db</artifactId>
+        <version>${pom.currentVersion}</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-test-ddbean</artifactId>
-        <version>${geronimo_version}</version>
-        <properties>
-            <geronimo.dependency>true</geronimo.dependency>
-        </properties>
-    </dependency>
-    <dependency>
-        <groupId>geronimo</groupId>
-        <artifactId>geronimo-deploy-jsr88</artifactId>
-        <version>${geronimo_version}</version>
-        <properties>
-            <geronimo.dependency>true</geronimo.dependency>
-        </properties>
-    </dependency>
-    <dependency>
-        <groupId>geronimo</groupId>
-        <artifactId>geronimo-deploy-config</artifactId>
-        <version>${geronimo_version}</version>
-        <properties>
-            <geronimo.dependency>true</geronimo.dependency>
-        </properties>
-    </dependency>
-    <dependency>
-        <groupId>geronimo</groupId>
-        <artifactId>geronimo-service-builder</artifactId>
-        <version>${geronimo_version}</version>
-        <properties>
-            <geronimo.dependency>true</geronimo.dependency>
-        </properties>
+        <artifactId>daytrader-ear</artifactId>
+        <version>${pom.currentVersion}</version>
+            <type>ear</type>
     </dependency>
-    <dependency>
-        <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-security-builder</artifactId>
-        <version>${geronimo_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>xmlbeans</groupId>
-        <artifactId>xbean</artifactId>
-        <version>${xmlbeans_version}</version>
-        <properties>
-            <geronimo.dependency>true</geronimo.dependency>
-        </properties>
-    </dependency>
-    <dependency>
-        <groupId>stax</groupId>
-        <artifactId>stax-api</artifactId>
-        <version>${stax_api_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>geronimo</groupId>
-        <artifactId>geronimo-converter</artifactId>
-        <version>${geronimo_version}</version>
-        <properties>
-            <geronimo.dependency>true</geronimo.dependency>
-        </properties>
-    </dependency>
--->
-    <!-- Keystore dependency -->
- <!--   <dependency>
-        <groupId>geronimo</groupId>
-        <artifactId>geronimo-util</artifactId>
-        <version>${geronimo_version}</version>
-            <properties>
-                 <geronimo.dependency>true</geronimo.dependency>
-             </properties>
-    </dependency>
--->
+
+
+<!--inessentials -->
         <dependency>
             <groupId>geronimo</groupId>
             <artifactId>geronimo-system</artifactId>

Modified: geronimo/trunk/configs/daytrader-jetty/src/plan/plan.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/configs/daytrader-jetty/src/plan/plan.xml?rev=355438&r1=355437&r2=355438&view=diff
==============================================================================
--- geronimo/trunk/configs/daytrader-jetty/src/plan/plan.xml (original)
+++ geronimo/trunk/configs/daytrader-jetty/src/plan/plan.xml Fri Dec  9 02:25:06 2005
@@ -579,8 +579,8 @@
                             <name>jdbc/TradeDataSource</name>
                             <config-property-setting name="UserName"></config-property-setting>
                             <config-property-setting name="Password"></config-property-setting>
-                            <config-property-setting name="DatabaseName">tradedb</config-property-setting>
-                            <config-property-setting name="CreateDatabase">true</config-property-setting>
+                            <config-property-setting name="DatabaseName">DaytraderDatabase</config-property-setting>
+                            <config-property-setting name="CreateDatabase">false</config-property-setting>
                             <connectionmanager>
                                 <xa-transaction>
                                     <transaction-caching/>
@@ -684,4 +684,16 @@
 
         </connector>
     </ext-module>
+
+            <gbean name="DaytraderResources" class="org.apache.geronimo.system.util.DirectoryInitializationGBean">
+                <!-- copies daytrader derby db files into specified location -->
+                <attribute name="prefix">META-INF/geronimo-daytrader-derby-db</attribute>
+                <attribute name="path">var/derby</attribute>
+                <reference name="ServerInfo">
+                    <application>null</application>
+                    <moduleType>J2EEModule</moduleType>
+                    <module>geronimo/j2ee-system/${pom.currentVersion}/car</module>
+                    <name>ServerInfo</name>
+                </reference>
+            </gbean>
 </application>

Modified: geronimo/trunk/configs/daytrader-tomcat/project.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/configs/daytrader-tomcat/project.xml?rev=355438&r1=355437&r2=355438&view=diff
==============================================================================
--- geronimo/trunk/configs/daytrader-tomcat/project.xml (original)
+++ geronimo/trunk/configs/daytrader-tomcat/project.xml Fri Dec  9 02:25:06 2005
@@ -62,144 +62,24 @@
         </dependency>
 
 
-<!--            <dependency>
-                <uri>org.apache.derby/jars/derby-10.1.1.0.jar</uri>
-            </dependency>
-            <dependency>
-                <uri>org.apache.derby/jars/derbynet-10.1.1.0.jar</uri>
-            </dependency>
--->
-<!--    <dependency>
-        <groupId>portlet-api</groupId>
-        <artifactId>portlet-api</artifactId>
-        <version>${portlet_api_version}</version>
-            <properties>
-                 <geronimo.dependency>true</geronimo.dependency>
-             </properties>
-    </dependency>
-    <dependency>
-        <groupId>org.apache.pluto</groupId>
-        <artifactId>pluto</artifactId>
-        <version>${pluto_version}</version>
-            <properties>
-                 <geronimo.dependency>true</geronimo.dependency>
-             </properties>
-    </dependency>
-    <dependency>
-        <groupId>geronimo</groupId>
-        <artifactId>geronimo-console-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>
+        <artifactId>geronimo-daytrader-derby-db</artifactId>
+        <version>${pom.currentVersion}</version>
             <properties>
                  <geronimo.dependency>true</geronimo.dependency>
              </properties>
     </dependency>
     <dependency>
         <groupId>geronimo</groupId>
-        <artifactId>geronimo-test-ddbean</artifactId>
-        <version>${geronimo_version}</version>
-        <properties>
-            <geronimo.dependency>true</geronimo.dependency>
-        </properties>
-    </dependency>
-    <dependency>
-        <groupId>geronimo</groupId>
-        <artifactId>geronimo-deploy-jsr88</artifactId>
-        <version>${geronimo_version}</version>
-        <properties>
-            <geronimo.dependency>true</geronimo.dependency>
-        </properties>
-    </dependency>
-    <dependency>
-        <groupId>geronimo</groupId>
-        <artifactId>geronimo-deploy-config</artifactId>
-        <version>${geronimo_version}</version>
-        <properties>
-            <geronimo.dependency>true</geronimo.dependency>
-        </properties>
-    </dependency>
-    <dependency>
-        <groupId>geronimo</groupId>
-        <artifactId>geronimo-service-builder</artifactId>
-        <version>${geronimo_version}</version>
-        <properties>
-            <geronimo.dependency>true</geronimo.dependency>
-        </properties>
-    </dependency>
-    <dependency>
-        <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-security-builder</artifactId>
-        <version>${geronimo_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>xmlbeans</groupId>
-        <artifactId>xbean</artifactId>
-        <version>${xmlbeans_version}</version>
-        <properties>
-            <geronimo.dependency>true</geronimo.dependency>
-        </properties>
-    </dependency>
-    <dependency>
-        <groupId>stax</groupId>
-        <artifactId>stax-api</artifactId>
-        <version>${stax_api_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>geronimo</groupId>
-        <artifactId>geronimo-converter</artifactId>
-        <version>${geronimo_version}</version>
-        <properties>
-            <geronimo.dependency>true</geronimo.dependency>
-        </properties>
-    </dependency>
--->
-    <!-- Keystore dependency -->
- <!--   <dependency>
-        <groupId>geronimo</groupId>
-        <artifactId>geronimo-util</artifactId>
-        <version>${geronimo_version}</version>
-            <properties>
-                 <geronimo.dependency>true</geronimo.dependency>
-             </properties>
-    </dependency>
--->
+        <artifactId>daytrader-ear</artifactId>
+        <version>${pom.currentVersion}</version>
+            <type>ear</type>
+    </dependency>
+
+
+<!--inessentials -->
         <dependency>
             <groupId>geronimo</groupId>
             <artifactId>geronimo-system</artifactId>

Modified: geronimo/trunk/configs/daytrader-tomcat/src/plan/plan.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/configs/daytrader-tomcat/src/plan/plan.xml?rev=355438&r1=355437&r2=355438&view=diff
==============================================================================
--- geronimo/trunk/configs/daytrader-tomcat/src/plan/plan.xml (original)
+++ geronimo/trunk/configs/daytrader-tomcat/src/plan/plan.xml Fri Dec  9 02:25:06 2005
@@ -579,8 +579,8 @@
                             <name>jdbc/TradeDataSource</name>
                             <config-property-setting name="UserName"></config-property-setting>
                             <config-property-setting name="Password"></config-property-setting>
-                            <config-property-setting name="DatabaseName">tradedb</config-property-setting>
-                            <config-property-setting name="CreateDatabase">true</config-property-setting>
+                            <config-property-setting name="DatabaseName">DaytraderDatabase</config-property-setting>
+                            <config-property-setting name="CreateDatabase">false</config-property-setting>
                             <connectionmanager>
                                 <xa-transaction>
                                     <transaction-caching/>
@@ -684,4 +684,15 @@
 
         </connector>
     </ext-module>
+            <gbean name="DaytraderResources" class="org.apache.geronimo.system.util.DirectoryInitializationGBean">
+                <!-- copies daytrader derby db files into specified location -->
+                <attribute name="prefix">META-INF/geronimo-daytrader-derby-db</attribute>
+                <attribute name="path">var/derby</attribute>
+                <reference name="ServerInfo">
+                    <application>null</application>
+                    <moduleType>J2EEModule</moduleType>
+                    <module>geronimo/j2ee-system/${pom.currentVersion}/car</module>
+                    <name>ServerInfo</name>
+                </reference>
+            </gbean>
 </application>



Mime
View raw message