geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From djen...@apache.org
Subject svn commit: r660735 - in /geronimo/daytrader/trunk: ./ daytrader-db2-datasource/ daytrader-db2-datasource/src/main/plan/ daytrader-oracle-datasource/ daytrader-oracle-datasource/src/main/plan/
Date Tue, 27 May 2008 21:54:58 GMT
Author: djencks
Date: Tue May 27 14:54:57 2008
New Revision: 660735

URL: http://svn.apache.org/viewvc?rev=660735&view=rev
Log:
DAYTRADER-59 provide db2 and oracle plugins, untested.  Since these require proprietary jars
for db2 and oracle, they are built via db2 and oracle profiles.  Former oracle and db2 profiles
that I don't understand are renamed jboss-db2 and jboss-oracle

Added:
    geronimo/daytrader/trunk/daytrader-db2-datasource/
      - copied from r660715, geronimo/daytrader/trunk/daytrader-derby-datasource/
    geronimo/daytrader/trunk/daytrader-oracle-datasource/
      - copied from r660715, geronimo/daytrader/trunk/daytrader-derby-datasource/
Removed:
    geronimo/daytrader/trunk/daytrader-db2-datasource/pom.sample.xml
    geronimo/daytrader/trunk/daytrader-oracle-datasource/pom.sample.xml
Modified:
    geronimo/daytrader/trunk/daytrader-db2-datasource/pom.xml
    geronimo/daytrader/trunk/daytrader-db2-datasource/src/main/plan/plan.xml
    geronimo/daytrader/trunk/daytrader-oracle-datasource/pom.xml
    geronimo/daytrader/trunk/daytrader-oracle-datasource/src/main/plan/plan.xml
    geronimo/daytrader/trunk/pom.xml

Modified: geronimo/daytrader/trunk/daytrader-db2-datasource/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/daytrader/trunk/daytrader-db2-datasource/pom.xml?rev=660735&r1=660715&r2=660735&view=diff
==============================================================================
--- geronimo/daytrader/trunk/daytrader-db2-datasource/pom.xml (original)
+++ geronimo/daytrader/trunk/daytrader-db2-datasource/pom.xml Tue May 27 14:54:57 2008
@@ -25,15 +25,15 @@
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.apache.geronimo.daytrader</groupId>
-    <artifactId>daytrader-derby-datasource</artifactId>
+    <artifactId>daytrader-db2-datasource</artifactId>
     <packaging>car</packaging>
 
     <dependencies>
         <dependency>
             <groupId>org.tranql</groupId>
-            <artifactId>tranql-connector-derby-embed-xa</artifactId>
+            <artifactId>tranql-connector-db2-xa</artifactId>
             <type>rar</type>
-            <version>1.4</version>
+            <version>1.2</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
@@ -58,10 +58,16 @@
             <scope>provided</scope>
         </dependency>
         <dependency>
-            <groupId>org.apache.geronimo.configs</groupId>
-            <artifactId>system-database</artifactId>
-            <type>car</type>
-            <version>${geronimoVersion}</version>
+            <groupId>com.ibm.db2</groupId>
+            <artifactId>db2jcc</artifactId>
+            <version>9.0</version>
+            <type>jar</type>
+        </dependency>
+        <dependency>
+            <groupId>com.ibm.db2</groupId>
+            <artifactId>db2jcc_license_cu</artifactId>
+            <version>9.0</version>
+            <type>jar</type>
         </dependency>
     </dependencies>
     <build>
@@ -77,7 +83,7 @@
                     </deploymentConfigs>
                     <module>
                         <groupId>org.tranql</groupId>
-                        <artifactId>tranql-connector-derby-embed-xa</artifactId>
+                        <artifactId>tranql-connector-db2-xa</artifactId>
                         <type>rar</type>
                     </module>
                     <useMavenDependencies>
@@ -85,7 +91,9 @@
                         <includeVersion>true</includeVersion>
                     </useMavenDependencies>
                     <instance>
-                        <plugin-artifact></plugin-artifact>
+                        <plugin-artifact>
+                            <artifact-alias key="org.apache.geronimo.daytrader/daytrader-derby-database/${version}/car">org.apache.geronimo.daytrader/daytrader-db2-database/${version}/car</artifact-alias>
+                        </plugin-artifact>
                     </instance>
                 </configuration>
             </plugin>

Modified: geronimo/daytrader/trunk/daytrader-db2-datasource/src/main/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/daytrader/trunk/daytrader-db2-datasource/src/main/plan/plan.xml?rev=660735&r1=660715&r2=660735&view=diff
==============================================================================
--- geronimo/daytrader/trunk/daytrader-db2-datasource/src/main/plan/plan.xml (original)
+++ geronimo/daytrader/trunk/daytrader-db2-datasource/src/main/plan/plan.xml Tue May 27 14:54:57
2008
@@ -25,10 +25,12 @@
                 <connectionfactory-interface>javax.sql.DataSource</connectionfactory-interface>
                 <connectiondefinition-instance>
                     <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">DaytraderDatabase</config-property-setting>
-                    <config-property-setting name="CreateDatabase">true</config-property-setting>
+                    <config-property-setting name="UserName">trade</config-property-setting>
+                    <config-property-setting name="Password">trade</config-property-setting>
+                    <config-property-setting name="PortNumber">50001</config-property-setting>
+                    <config-property-setting name="ServerName">localhost</config-property-setting>
+                    <config-property-setting name="DatabaseName">tradedb</config-property-setting>
+                    <config-property-setting name="DriverType">4</config-property-setting>
                     <connectionmanager>
                         <xa-transaction>
                             <transaction-caching/>
@@ -44,12 +46,16 @@
                 </connectiondefinition-instance>
                 <connectiondefinition-instance>
                     <name>jdbc/NoTxTradeDataSource</name>
-                    <config-property-setting name="UserName"></config-property-setting>
-                    <config-property-setting name="Password"></config-property-setting>
-                    <config-property-setting name="DatabaseName">DaytraderDatabase</config-property-setting>
-                    <config-property-setting name="CreateDatabase">true</config-property-setting>
+                    <config-property-setting name="UserName">trade</config-property-setting>
+                    <config-property-setting name="Password">trade</config-property-setting>
+                    <config-property-setting name="PortNumber">50001</config-property-setting>
+                    <config-property-setting name="ServerName">localhost</config-property-setting>
+                    <config-property-setting name="DatabaseName">tradedb</config-property-setting>
+                    <config-property-setting name="DriverType">4</config-property-setting>
                     <connectionmanager>
-                        <no-transaction/>
+                        <xa-transaction>
+                            <transaction-caching/>
+                        </xa-transaction>
                         <single-pool>
                             <max-size>10</max-size>
                             <min-size>0</min-size>

Modified: geronimo/daytrader/trunk/daytrader-oracle-datasource/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/daytrader/trunk/daytrader-oracle-datasource/pom.xml?rev=660735&r1=660715&r2=660735&view=diff
==============================================================================
--- geronimo/daytrader/trunk/daytrader-oracle-datasource/pom.xml (original)
+++ geronimo/daytrader/trunk/daytrader-oracle-datasource/pom.xml Tue May 27 14:54:57 2008
@@ -25,15 +25,15 @@
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.apache.geronimo.daytrader</groupId>
-    <artifactId>daytrader-derby-datasource</artifactId>
+    <artifactId>daytrader-oracle-datasource</artifactId>
     <packaging>car</packaging>
 
     <dependencies>
         <dependency>
             <groupId>org.tranql</groupId>
-            <artifactId>tranql-connector-derby-embed-xa</artifactId>
+            <artifactId>tranql-connector-oracle-xa</artifactId>
             <type>rar</type>
-            <version>1.4</version>
+            <version>1.3</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
@@ -58,11 +58,11 @@
             <scope>provided</scope>
         </dependency>
         <dependency>
-            <groupId>org.apache.geronimo.configs</groupId>
-            <artifactId>system-database</artifactId>
-            <type>car</type>
-            <version>${geronimoVersion}</version>
-        </dependency>
+            <groupId>oracle</groupId>
+            <artifactId>ojdbc14</artifactId>
+            <version>10g</version>
+            <type>jar</type>
+          </dependency>
     </dependencies>
     <build>
         <plugins>
@@ -77,7 +77,7 @@
                     </deploymentConfigs>
                     <module>
                         <groupId>org.tranql</groupId>
-                        <artifactId>tranql-connector-derby-embed-xa</artifactId>
+                        <artifactId>tranql-connector-oracle-xa</artifactId>
                         <type>rar</type>
                     </module>
                     <useMavenDependencies>
@@ -85,7 +85,9 @@
                         <includeVersion>true</includeVersion>
                     </useMavenDependencies>
                     <instance>
-                        <plugin-artifact></plugin-artifact>
+                        <plugin-artifact>
+                            <artifact-alias key="org.apache.geronimo.daytrader/daytrader-derby-database/${version}/car">org.apache.geronimo.daytrader/daytrader-oracle-database/${version}/car</artifact-alias>
+                        </plugin-artifact>
                     </instance>
                 </configuration>
             </plugin>

Modified: geronimo/daytrader/trunk/daytrader-oracle-datasource/src/main/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/daytrader/trunk/daytrader-oracle-datasource/src/main/plan/plan.xml?rev=660735&r1=660715&r2=660735&view=diff
==============================================================================
--- geronimo/daytrader/trunk/daytrader-oracle-datasource/src/main/plan/plan.xml (original)
+++ geronimo/daytrader/trunk/daytrader-oracle-datasource/src/main/plan/plan.xml Tue May 27
14:54:57 2008
@@ -25,10 +25,13 @@
                 <connectionfactory-interface>javax.sql.DataSource</connectionfactory-interface>
                 <connectiondefinition-instance>
                     <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">DaytraderDatabase</config-property-setting>
-                    <config-property-setting name="CreateDatabase">true</config-property-setting>
+                    <config-property-setting name="UserName">trade</config-property-setting>
+                    <config-property-setting name="Password">trade</config-property-setting>
+                    <config-property-setting name="DatabaseName">tradedb</config-property-setting>
+                    <config-property-setting name="DataSourceName">TradeDataSource</config-property-setting>
+                    <config-property-setting name="ServerName">localhost</config-property-setting>
+                    <config-property-setting name="PortNumber">1160</config-property-setting>
+                    <config-property-setting name="DriverType">thin</config-property-setting>
                     <connectionmanager>
                         <xa-transaction>
                             <transaction-caching/>
@@ -44,12 +47,17 @@
                 </connectiondefinition-instance>
                 <connectiondefinition-instance>
                     <name>jdbc/NoTxTradeDataSource</name>
-                    <config-property-setting name="UserName"></config-property-setting>
-                    <config-property-setting name="Password"></config-property-setting>
-                    <config-property-setting name="DatabaseName">DaytraderDatabase</config-property-setting>
-                    <config-property-setting name="CreateDatabase">true</config-property-setting>
+                    <config-property-setting name="UserName">trade</config-property-setting>
+                    <config-property-setting name="Password">trade</config-property-setting>
+                    <config-property-setting name="DatabaseName">tradedb</config-property-setting>
+                    <config-property-setting name="DataSourceName">TradeDataSource</config-property-setting>
+                    <config-property-setting name="ServerName">localhost</config-property-setting>
+                    <config-property-setting name="PortNumber">1160</config-property-setting>
+                    <config-property-setting name="DriverType">thin</config-property-setting>
                     <connectionmanager>
-                        <no-transaction/>
+                        <xa-transaction>
+                            <transaction-caching/>
+                        </xa-transaction>
                         <single-pool>
                             <max-size>10</max-size>
                             <min-size>0</min-size>

Modified: geronimo/daytrader/trunk/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/daytrader/trunk/pom.xml?rev=660735&r1=660734&r2=660735&view=diff
==============================================================================
--- geronimo/daytrader/trunk/pom.xml (original)
+++ geronimo/daytrader/trunk/pom.xml Tue May 27 14:54:57 2008
@@ -146,6 +146,9 @@
         <module>modules/dojo-ui-web</module>
         <module>modules/dojo-ui-ear</module>
         <module>daytrader-derby-datasource</module>
+        <!-- see profiles -->
+        <!--<module>daytrader-db2-datasource</module>-->
+        <!--<module>daytrader-oracle-datasource</module>-->
         <module>daytrader-jms</module>
         <module>daytrader-jetty</module>
         <module>daytrader-tomcat</module>
@@ -385,7 +388,7 @@
     <profiles>
 
         <profile>
-            <id>db2</id>
+            <id>jboss-db2</id>
             <activation>
                 <activeByDefault>true</activeByDefault>
                 <property>
@@ -399,7 +402,7 @@
         </profile>
 
         <profile>
-            <id>mysql</id>
+            <id>jboss-mysql</id>
             <activation>
                 <property>
                     <name>database</name>
@@ -417,5 +420,18 @@
                 <module>functional-tests</module>
             </modules>
         </profile>
+
+        <profile>
+            <id>db2</id>
+            <modules>
+                <module>daytrader-db2-datasource</module>
+            </modules>
+        </profile>
+        <profile>
+            <id>oracle</id>
+            <modules>
+                <module>daytrader-oracle-datasource</module>
+            </modules>
+        </profile>
     </profiles>
 </project>
\ No newline at end of file



Mime
View raw message