geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From djen...@apache.org
Subject svn commit: r355441 - in /geronimo/branches/1.0: applications/daytrader/derby/ applications/daytrader/derby/src/ applications/daytrader/derby/src/sql/ configs/daytrader-jetty/ configs/daytrader-jetty/src/plan/ configs/daytrader-tomcat/ configs/daytrade...
Date Fri, 09 Dec 2005 10:29:33 GMT
Author: djencks
Date: Fri Dec  9 02:29:04 2005
New Revision: 355441

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

Added:
    geronimo/branches/1.0/applications/daytrader/derby/maven.xml   (props changed)
      - copied unchanged from r355438, geronimo/trunk/applications/daytrader/derby/maven.xml
    geronimo/branches/1.0/applications/daytrader/derby/project.properties   (props changed)
      - copied unchanged from r355438, geronimo/trunk/applications/daytrader/derby/project.properties
    geronimo/branches/1.0/applications/daytrader/derby/project.xml   (props changed)
      - copied unchanged from r355438, geronimo/trunk/applications/daytrader/derby/project.xml
    geronimo/branches/1.0/applications/daytrader/derby/src/
      - copied from r355438, geronimo/trunk/applications/daytrader/derby/src/
    geronimo/branches/1.0/applications/daytrader/derby/src/sql/
      - copied from r355438, geronimo/trunk/applications/daytrader/derby/src/sql/
    geronimo/branches/1.0/applications/daytrader/derby/src/sql/daytrader.sql   (props changed)
      - copied unchanged from r355438, geronimo/trunk/applications/daytrader/derby/src/sql/daytrader.sql
Removed:
    geronimo/branches/1.0/applications/daytrader/derby/Table.ddl
Modified:
    geronimo/branches/1.0/configs/daytrader-jetty/project.xml
    geronimo/branches/1.0/configs/daytrader-jetty/src/plan/plan.xml
    geronimo/branches/1.0/configs/daytrader-tomcat/project.xml
    geronimo/branches/1.0/configs/daytrader-tomcat/src/plan/plan.xml

Propchange: geronimo/branches/1.0/applications/daytrader/derby/maven.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/branches/1.0/applications/daytrader/derby/maven.xml
------------------------------------------------------------------------------
    svn:keywords = Rev,Date

Propchange: geronimo/branches/1.0/applications/daytrader/derby/project.properties
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/branches/1.0/applications/daytrader/derby/project.properties
------------------------------------------------------------------------------
    svn:keywords = Rev,Date

Propchange: geronimo/branches/1.0/applications/daytrader/derby/project.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/branches/1.0/applications/daytrader/derby/project.xml
------------------------------------------------------------------------------
    svn:keywords = Rev,Date

Propchange: geronimo/branches/1.0/applications/daytrader/derby/src/sql/daytrader.sql
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Modified: geronimo/branches/1.0/configs/daytrader-jetty/project.xml
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.0/configs/daytrader-jetty/project.xml?rev=355441&r1=355440&r2=355441&view=diff
==============================================================================
--- geronimo/branches/1.0/configs/daytrader-jetty/project.xml (original)
+++ geronimo/branches/1.0/configs/daytrader-jetty/project.xml Fri Dec  9 02:29:04 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/branches/1.0/configs/daytrader-jetty/src/plan/plan.xml
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.0/configs/daytrader-jetty/src/plan/plan.xml?rev=355441&r1=355440&r2=355441&view=diff
==============================================================================
--- geronimo/branches/1.0/configs/daytrader-jetty/src/plan/plan.xml (original)
+++ geronimo/branches/1.0/configs/daytrader-jetty/src/plan/plan.xml Fri Dec  9 02:29:04 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/branches/1.0/configs/daytrader-tomcat/project.xml
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.0/configs/daytrader-tomcat/project.xml?rev=355441&r1=355440&r2=355441&view=diff
==============================================================================
--- geronimo/branches/1.0/configs/daytrader-tomcat/project.xml (original)
+++ geronimo/branches/1.0/configs/daytrader-tomcat/project.xml Fri Dec  9 02:29:04 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/branches/1.0/configs/daytrader-tomcat/src/plan/plan.xml
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.0/configs/daytrader-tomcat/src/plan/plan.xml?rev=355441&r1=355440&r2=355441&view=diff
==============================================================================
--- geronimo/branches/1.0/configs/daytrader-tomcat/src/plan/plan.xml (original)
+++ geronimo/branches/1.0/configs/daytrader-tomcat/src/plan/plan.xml Fri Dec  9 02:29:04 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