geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From xiam...@apache.org
Subject svn commit: r1038159 - in /geronimo/daytrader/branches/2.1: ./ daytrader-db2-datasource/ daytrader-derby-datasource/ daytrader-derby-datasource/src/main/plan/ daytrader-jetty/ daytrader-jms/ daytrader-oracle-datasource/ daytrader-tomcat/ modules/ modul...
Date Tue, 23 Nov 2010 15:17:15 GMT
Author: xiaming
Date: Tue Nov 23 15:17:14 2010
New Revision: 1038159

URL: http://svn.apache.org/viewvc?rev=1038159&view=rev
Log:
Updates to make daytrader 2.1 branch code work on G 2.1.7

Added:
    geronimo/daytrader/branches/2.1/modules/pom.xml   (with props)
Modified:
    geronimo/daytrader/branches/2.1/daytrader-db2-datasource/pom.xml
    geronimo/daytrader/branches/2.1/daytrader-derby-datasource/pom.xml
    geronimo/daytrader/branches/2.1/daytrader-derby-datasource/src/main/plan/plan.xml
    geronimo/daytrader/branches/2.1/daytrader-jetty/pom.xml
    geronimo/daytrader/branches/2.1/daytrader-jms/pom.xml
    geronimo/daytrader/branches/2.1/daytrader-oracle-datasource/pom.xml
    geronimo/daytrader/branches/2.1/daytrader-tomcat/pom.xml
    geronimo/daytrader/branches/2.1/modules/dojo-ui-ear/pom.xml
    geronimo/daytrader/branches/2.1/modules/dojo-ui-web/pom.xml
    geronimo/daytrader/branches/2.1/modules/ear/pom.xml
    geronimo/daytrader/branches/2.1/modules/ejb/pom.xml
    geronimo/daytrader/branches/2.1/modules/json-proxy/pom.xml
    geronimo/daytrader/branches/2.1/modules/streamer/pom.xml
    geronimo/daytrader/branches/2.1/modules/web/pom.xml
    geronimo/daytrader/branches/2.1/modules/wsappclient/pom.xml
    geronimo/daytrader/branches/2.1/plans/dayTrader-derby-plan.xml
    geronimo/daytrader/branches/2.1/pom.xml
    geronimo/daytrader/branches/2.1/repository/pom.xml

Modified: geronimo/daytrader/branches/2.1/daytrader-db2-datasource/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/daytrader/branches/2.1/daytrader-db2-datasource/pom.xml?rev=1038159&r1=1038158&r2=1038159&view=diff
==============================================================================
--- geronimo/daytrader/branches/2.1/daytrader-db2-datasource/pom.xml (original)
+++ geronimo/daytrader/branches/2.1/daytrader-db2-datasource/pom.xml Tue Nov 23 15:17:14 2010
@@ -25,7 +25,7 @@
     <parent>
         <artifactId>daytrader</artifactId>
         <groupId>org.apache.geronimo.daytrader</groupId>
-        <version>2.1.3</version>
+        <version>2.1.7-SNAPSHOT</version>
     </parent>
 
     <groupId>org.apache.geronimo.daytrader</groupId>

Modified: geronimo/daytrader/branches/2.1/daytrader-derby-datasource/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/daytrader/branches/2.1/daytrader-derby-datasource/pom.xml?rev=1038159&r1=1038158&r2=1038159&view=diff
==============================================================================
--- geronimo/daytrader/branches/2.1/daytrader-derby-datasource/pom.xml (original)
+++ geronimo/daytrader/branches/2.1/daytrader-derby-datasource/pom.xml Tue Nov 23 15:17:14
2010
@@ -25,10 +25,9 @@
     <parent>
         <artifactId>daytrader</artifactId>
         <groupId>org.apache.geronimo.daytrader</groupId>
-        <version>2.1.3</version>
+        <version>2.1.7-SNAPSHOT</version>
     </parent>
 
-    <groupId>org.apache.geronimo.daytrader</groupId>
     <artifactId>daytrader-derby-datasource</artifactId>
     <packaging>car</packaging>
     <name>Daytrader :: Derby DataSource</name>
@@ -38,7 +37,6 @@
             <groupId>org.tranql</groupId>
             <artifactId>tranql-connector-derby-embed-xa</artifactId>
             <type>rar</type>
-            <version>1.4</version>
             <scope>provided</scope>
         </dependency>
         <dependency>

Modified: geronimo/daytrader/branches/2.1/daytrader-derby-datasource/src/main/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/daytrader/branches/2.1/daytrader-derby-datasource/src/main/plan/plan.xml?rev=1038159&r1=1038158&r2=1038159&view=diff
==============================================================================
--- geronimo/daytrader/branches/2.1/daytrader-derby-datasource/src/main/plan/plan.xml (original)
+++ geronimo/daytrader/branches/2.1/daytrader-derby-datasource/src/main/plan/plan.xml Tue
Nov 23 15:17:14 2010
@@ -25,8 +25,8 @@
                 <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="UserName">app</config-property-setting>
+                    <config-property-setting name="Password">app</config-property-setting>
                     <config-property-setting name="DatabaseName">DaytraderDatabase</config-property-setting>
                     <config-property-setting name="CreateDatabase">true</config-property-setting>
                     <connectionmanager>
@@ -44,8 +44,8 @@
                 </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="UserName">app</config-property-setting>
+                    <config-property-setting name="Password">app</config-property-setting>
                     <config-property-setting name="DatabaseName">DaytraderDatabase</config-property-setting>
                     <config-property-setting name="CreateDatabase">true</config-property-setting>
                     <connectionmanager>

Modified: geronimo/daytrader/branches/2.1/daytrader-jetty/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/daytrader/branches/2.1/daytrader-jetty/pom.xml?rev=1038159&r1=1038158&r2=1038159&view=diff
==============================================================================
--- geronimo/daytrader/branches/2.1/daytrader-jetty/pom.xml (original)
+++ geronimo/daytrader/branches/2.1/daytrader-jetty/pom.xml Tue Nov 23 15:17:14 2010
@@ -25,7 +25,7 @@
     <parent>
         <artifactId>daytrader</artifactId>
         <groupId>org.apache.geronimo.daytrader</groupId>
-        <version>2.1.3</version>
+        <version>2.1.7-SNAPSHOT</version>
     </parent>
 
     <groupId>org.apache.geronimo.daytrader</groupId>

Modified: geronimo/daytrader/branches/2.1/daytrader-jms/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/daytrader/branches/2.1/daytrader-jms/pom.xml?rev=1038159&r1=1038158&r2=1038159&view=diff
==============================================================================
--- geronimo/daytrader/branches/2.1/daytrader-jms/pom.xml (original)
+++ geronimo/daytrader/branches/2.1/daytrader-jms/pom.xml Tue Nov 23 15:17:14 2010
@@ -25,14 +25,14 @@
     <parent>
         <groupId>org.apache.geronimo.daytrader</groupId>
         <artifactId>daytrader</artifactId>
-        <version>2.1.3</version>
+        <version>2.1.7-SNAPSHOT</version>
     </parent>
 
     <groupId>org.apache.geronimo.daytrader</groupId>
     <artifactId>daytrader-jms</artifactId>
     <name>Daytrader :: JMS Resource</name>
     <packaging>car</packaging>
-    <version>2.1.3</version>
+    
 
     <dependencies>
         <dependency>

Modified: geronimo/daytrader/branches/2.1/daytrader-oracle-datasource/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/daytrader/branches/2.1/daytrader-oracle-datasource/pom.xml?rev=1038159&r1=1038158&r2=1038159&view=diff
==============================================================================
--- geronimo/daytrader/branches/2.1/daytrader-oracle-datasource/pom.xml (original)
+++ geronimo/daytrader/branches/2.1/daytrader-oracle-datasource/pom.xml Tue Nov 23 15:17:14
2010
@@ -25,7 +25,7 @@
     <parent>
         <artifactId>daytrader</artifactId>
         <groupId>org.apache.geronimo.daytrader</groupId>
-        <version>2.1.3</version>
+        <version>2.1.7-SNAPSHOT</version>
     </parent>
 
     <groupId>org.apache.geronimo.daytrader</groupId>

Modified: geronimo/daytrader/branches/2.1/daytrader-tomcat/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/daytrader/branches/2.1/daytrader-tomcat/pom.xml?rev=1038159&r1=1038158&r2=1038159&view=diff
==============================================================================
--- geronimo/daytrader/branches/2.1/daytrader-tomcat/pom.xml (original)
+++ geronimo/daytrader/branches/2.1/daytrader-tomcat/pom.xml Tue Nov 23 15:17:14 2010
@@ -25,7 +25,7 @@
     <parent>
         <artifactId>daytrader</artifactId>
         <groupId>org.apache.geronimo.daytrader</groupId>
-        <version>2.1.3</version>
+        <version>2.1.7-SNAPSHOT</version>
     </parent>
 
     <groupId>org.apache.geronimo.daytrader</groupId>

Modified: geronimo/daytrader/branches/2.1/modules/dojo-ui-ear/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/daytrader/branches/2.1/modules/dojo-ui-ear/pom.xml?rev=1038159&r1=1038158&r2=1038159&view=diff
==============================================================================
--- geronimo/daytrader/branches/2.1/modules/dojo-ui-ear/pom.xml (original)
+++ geronimo/daytrader/branches/2.1/modules/dojo-ui-ear/pom.xml Tue Nov 23 15:17:14 2010
@@ -22,11 +22,11 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.apache.geronimo.daytrader</groupId>
-        <artifactId>daytrader</artifactId>
-        <version>2.1.3</version>
+        <artifactId>modules</artifactId>
+        <version>2.1.7-SNAPSHOT</version>
     </parent>
     <artifactId>dojo-ui-ear</artifactId>
-    <name>DayTrader :: Dojo Interface and Proxy Ear</name>
+    <name>DayTrader :: Modules :: Dojo Interface and Proxy Ear</name>
     <packaging>ear</packaging>
     <description>Daytrader EAR</description>
     <scm>
@@ -53,7 +53,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-ear-plugin</artifactId>
-                <version>2.3.1</version>
+                <!--<version>2.3.1</version>-->
                 <configuration>
                     <displayName>DayTrader Dojo UI</displayName>
                     <description>Dojo User Interface for Daytrader</description>

Modified: geronimo/daytrader/branches/2.1/modules/dojo-ui-web/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/daytrader/branches/2.1/modules/dojo-ui-web/pom.xml?rev=1038159&r1=1038158&r2=1038159&view=diff
==============================================================================
--- geronimo/daytrader/branches/2.1/modules/dojo-ui-web/pom.xml (original)
+++ geronimo/daytrader/branches/2.1/modules/dojo-ui-web/pom.xml Tue Nov 23 15:17:14 2010
@@ -22,11 +22,11 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.apache.geronimo.daytrader</groupId>
-        <artifactId>daytrader</artifactId>
-        <version>2.1.3</version>
+        <artifactId>modules</artifactId>
+        <version>2.1.7-SNAPSHOT</version>
     </parent>
     <artifactId>dojo-ui-web</artifactId>
-    <name>DayTrader :: Dojo User Interface</name>
+    <name>DayTrader :: Modules :: Dojo User Interface</name>
     <packaging>war</packaging>
     <description>Daytrader Dojo UI</description>
     <scm>
@@ -77,11 +77,11 @@
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-war-plugin</artifactId>
                 <configuration>
-                    <filters>
+                    <!--<filters>
                         <filter>
                             ${basedir}/src/main/webapp/WEB-INF/classes/build.properties
                         </filter>
-                    </filters>
+                    </filters>-->
                     <archive>
                         <manifestEntries>
                             <Class-Path/>

Modified: geronimo/daytrader/branches/2.1/modules/ear/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/daytrader/branches/2.1/modules/ear/pom.xml?rev=1038159&r1=1038158&r2=1038159&view=diff
==============================================================================
--- geronimo/daytrader/branches/2.1/modules/ear/pom.xml (original)
+++ geronimo/daytrader/branches/2.1/modules/ear/pom.xml Tue Nov 23 15:17:14 2010
@@ -22,11 +22,11 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.apache.geronimo.daytrader</groupId>
-        <artifactId>daytrader</artifactId>
-        <version>2.1.3</version>
+        <artifactId>modules</artifactId>
+        <version>2.1.7-SNAPSHOT</version>
     </parent>
     <artifactId>daytrader-ear</artifactId>
-    <name>DayTrader :: Enterprise Application</name>
+    <name>DayTrader :: Modules :: Enterprise Application</name>
     <packaging>ear</packaging>
     <description>Daytrader EAR</description>
     <scm>

Modified: geronimo/daytrader/branches/2.1/modules/ejb/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/daytrader/branches/2.1/modules/ejb/pom.xml?rev=1038159&r1=1038158&r2=1038159&view=diff
==============================================================================
--- geronimo/daytrader/branches/2.1/modules/ejb/pom.xml (original)
+++ geronimo/daytrader/branches/2.1/modules/ejb/pom.xml Tue Nov 23 15:17:14 2010
@@ -22,11 +22,11 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.apache.geronimo.daytrader</groupId>
-        <artifactId>daytrader</artifactId>
-        <version>2.1.3</version>
+        <artifactId>modules</artifactId>
+        <version>2.1.7-SNAPSHOT</version>
     </parent>
     <artifactId>daytrader-ejb</artifactId>
-    <name>DayTrader :: EJBs</name>
+    <name>DayTrader :: Modules :: EJBs</name>
     <packaging>ejb</packaging>
     <description>Daytrader EJBs</description>
     <scm>
@@ -54,7 +54,7 @@
         </dependency>
         <dependency>
             <groupId>org.apache.geronimo.specs</groupId>
-            <artifactId>geronimo-jpa_3.0_spec</artifactId>
+            <artifactId>geronimo-jpa_1.0_spec</artifactId>
             <scope>provided</scope>
         </dependency>
         <dependency>

Modified: geronimo/daytrader/branches/2.1/modules/json-proxy/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/daytrader/branches/2.1/modules/json-proxy/pom.xml?rev=1038159&r1=1038158&r2=1038159&view=diff
==============================================================================
--- geronimo/daytrader/branches/2.1/modules/json-proxy/pom.xml (original)
+++ geronimo/daytrader/branches/2.1/modules/json-proxy/pom.xml Tue Nov 23 15:17:14 2010
@@ -22,11 +22,11 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.apache.geronimo.daytrader</groupId>
-        <artifactId>daytrader</artifactId>
-        <version>2.1.3</version>
+        <artifactId>modules</artifactId>
+        <version>2.1.7-SNAPSHOT</version>
     </parent>
     <artifactId>json-proxy</artifactId>
-    <name>DayTrader :: JSON Proxy</name>
+    <name>DayTrader :: Modules :: JSON Proxy</name>
     <packaging>war</packaging>
     <description>DayTrader JSON Proxy</description>
     <scm>
@@ -63,11 +63,11 @@
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-war-plugin</artifactId>
                 <configuration>
-                    <filters>
+                    <!--<filters>
                         <filter>
                             ${basedir}/src/main/webapp/WEB-INF/classes/build.properties
                         </filter>
-                    </filters>
+                    </filters>-->
                     <archive>
                         <manifestEntries>
                             <Class-Path/>

Added: geronimo/daytrader/branches/2.1/modules/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/daytrader/branches/2.1/modules/pom.xml?rev=1038159&view=auto
==============================================================================
--- geronimo/daytrader/branches/2.1/modules/pom.xml (added)
+++ geronimo/daytrader/branches/2.1/modules/pom.xml Tue Nov 23 15:17:14 2010
@@ -0,0 +1,48 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you 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
+    
+     http://www.apache.org/licenses/LICENSE-2.0
+    
+    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.
+-->
+<!-- $Rev: 1037990 $ $Date: 2010-11-23 12:14:20 +0800 (周二, 23 十一月
2010) $ -->
+
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+    <parent>
+        <groupId>org.apache.geronimo.daytrader</groupId>
+    		<artifactId>daytrader</artifactId>
+        <version>2.1.7-SNAPSHOT</version>
+    </parent>
+    <artifactId>modules</artifactId>
+    <name>DayTrader :: Modules</name>
+    <packaging>pom</packaging>
+    <description>
+        Java EE 5.0 Performance Benchmark Sample Application
+    </description>
+
+    <modules>
+    		<module>wsappclient</module>
+    		<module>ejb</module>    		
+    		<module>streamer</module>
+    		<module>web</module>
+    		<module>ear</module>
+    		<!-- incomplete function -->
+    		<!--<module>json-proxy</module>
+    		<module>dojo-ui-web</module>    
+        <module>dojo-ui-ear</module>-->
+    </modules>
+    
+</project>

Propchange: geronimo/daytrader/branches/2.1/modules/pom.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: geronimo/daytrader/branches/2.1/modules/streamer/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/daytrader/branches/2.1/modules/streamer/pom.xml?rev=1038159&r1=1038158&r2=1038159&view=diff
==============================================================================
--- geronimo/daytrader/branches/2.1/modules/streamer/pom.xml (original)
+++ geronimo/daytrader/branches/2.1/modules/streamer/pom.xml Tue Nov 23 15:17:14 2010
@@ -23,12 +23,12 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.apache.geronimo.daytrader</groupId>
-        <artifactId>daytrader</artifactId>
-        <version>2.1.3</version>
+        <artifactId>modules</artifactId>
+        <version>2.1.7-SNAPSHOT</version>
     </parent>
 
     <artifactId>daytrader-streamer</artifactId>
-    <name>DayTrader :: Quote Streamer</name>
+    <name>DayTrader :: Modules :: Quote Streamer</name>
     <packaging>jar</packaging>
     <description>Streamer Application for Day Trader</description>
     <scm>
@@ -52,7 +52,7 @@
         </dependency>
         <dependency>
             <groupId>org.apache.geronimo.specs</groupId>
-            <artifactId>geronimo-jpa_3.0_spec</artifactId>
+            <artifactId>geronimo-jpa_1.0_spec</artifactId>
             <scope>provided</scope>
         </dependency>
         <dependency>

Modified: geronimo/daytrader/branches/2.1/modules/web/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/daytrader/branches/2.1/modules/web/pom.xml?rev=1038159&r1=1038158&r2=1038159&view=diff
==============================================================================
--- geronimo/daytrader/branches/2.1/modules/web/pom.xml (original)
+++ geronimo/daytrader/branches/2.1/modules/web/pom.xml Tue Nov 23 15:17:14 2010
@@ -22,11 +22,11 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.apache.geronimo.daytrader</groupId>
-        <artifactId>daytrader</artifactId>
-        <version>2.1.3</version>
+        <artifactId>modules</artifactId>
+        <version>2.1.7-SNAPSHOT</version>
     </parent>
     <artifactId>daytrader-web</artifactId>
-    <name>DayTrader :: Web Application</name>
+    <name>DayTrader :: Modules :: Web Application</name>
     <packaging>war</packaging>
     <description>Daytrader Web</description>
     <scm>
@@ -65,7 +65,7 @@
         </dependency>
         <dependency>
             <groupId>org.apache.geronimo.specs</groupId>
-            <artifactId>geronimo-jpa_3.0_spec</artifactId>
+            <artifactId>geronimo-jpa_1.0_spec</artifactId>
             <scope>provided</scope>
         </dependency>
         <dependency>

Modified: geronimo/daytrader/branches/2.1/modules/wsappclient/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/daytrader/branches/2.1/modules/wsappclient/pom.xml?rev=1038159&r1=1038158&r2=1038159&view=diff
==============================================================================
--- geronimo/daytrader/branches/2.1/modules/wsappclient/pom.xml (original)
+++ geronimo/daytrader/branches/2.1/modules/wsappclient/pom.xml Tue Nov 23 15:17:14 2010
@@ -23,11 +23,11 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.apache.geronimo.daytrader</groupId>
-        <artifactId>daytrader</artifactId>
-        <version>2.1.3</version>
+        <artifactId>modules</artifactId>
+        <version>2.1.7-SNAPSHOT</version>
     </parent>
     <artifactId>daytrader-wsappclient</artifactId>
-    <name>DayTrader :: WS Application Client</name>
+    <name>DayTrader :: Modules :: WS Application Client</name>
     <packaging>jar</packaging>
     <description>Client demonstrating Web Services</description>
     <scm>

Modified: geronimo/daytrader/branches/2.1/plans/dayTrader-derby-plan.xml
URL: http://svn.apache.org/viewvc/geronimo/daytrader/branches/2.1/plans/dayTrader-derby-plan.xml?rev=1038159&r1=1038158&r2=1038159&view=diff
==============================================================================
--- geronimo/daytrader/branches/2.1/plans/dayTrader-derby-plan.xml (original)
+++ geronimo/daytrader/branches/2.1/plans/dayTrader-derby-plan.xml Tue Nov 23 15:17:14 2010
@@ -226,8 +226,8 @@
                         <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="UserName">app</config-property-setting>
+                            <config-property-setting name="Password">app</config-property-setting>
                             <config-property-setting name="DatabaseName">DaytraderDatabase</config-property-setting>
                             <config-property-setting name="CreateDatabase">true</config-property-setting>
                             <connectionmanager>
@@ -245,8 +245,8 @@
                         </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="UserName">app</config-property-setting>
+                            <config-property-setting name="Password">app</config-property-setting>
                             <config-property-setting name="DatabaseName">DaytraderDatabase</config-property-setting>
                             <config-property-setting name="CreateDatabase">true</config-property-setting>
                             <connectionmanager>

Modified: geronimo/daytrader/branches/2.1/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/daytrader/branches/2.1/pom.xml?rev=1038159&r1=1038158&r2=1038159&view=diff
==============================================================================
--- geronimo/daytrader/branches/2.1/pom.xml (original)
+++ geronimo/daytrader/branches/2.1/pom.xml Tue Nov 23 15:17:14 2010
@@ -20,21 +20,21 @@
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
-        <groupId>org.apache.geronimo.genesis.config</groupId>
-        <artifactId>project-config</artifactId>
-        <version>1.5</version>
-    </parent>
+        <groupId>org.apache.geronimo.genesis</groupId>
+        <artifactId>genesis-java5-flava</artifactId>
+        <version>2.0</version>
+    </parent> 
 
     <groupId>org.apache.geronimo.daytrader</groupId>
     <artifactId>daytrader</artifactId>
     <packaging>pom</packaging>
-    <version>2.1.3</version>
+    <version>2.1.7-SNAPSHOT</version>
     <name>DayTrader :: Performance Benchmark Sample</name>
     <description>Java EE 5.0 Performance Benchmark Sample Application</description>
 
     <properties>
         <!-- This property is required by the car:package mojo -->
-        <geronimoVersion>2.1.3</geronimoVersion>
+        <geronimoVersion>2.1.7</geronimoVersion>
 
         <!-- set siteId to artifactId for any "top level" project rooting a website -->
         <siteId>daytrader</siteId>
@@ -57,7 +57,7 @@
 
     <issueManagement>
         <system>jira</system>
-        <url>http://issues.apache.org/jira/browse/GERONIMO</url>
+        <url>http://issues.apache.org/jira/browse/DAYTRADER</url>
     </issueManagement>
     <ciManagement>
         <system>continuum</system>
@@ -128,12 +128,19 @@
             </roles>
             <timezone>-5</timezone>
         </contributor>
+        <contributor>
+            <name>Ming (Forrest) Xia</name>
+            <roles>
+                <role>Maintainer</role>
+            </roles>
+            <timezone>+8</timezone>
+        </contributor>
     </contributors>
     <dependencies/>
     <scm>
-        <connection>scm:svn:http://svn.apache.org/repos/asf/geronimo/daytrader/tags/2.1.3/</connection>
-        <developerConnection>scm:svn:http://svn.apache.org/repos/asf/geronimo/daytrader/tags/2.1.3/</developerConnection>
-        <url>http://svn.apache.org/viewcvs.cgi/geronimo/daytrader/tags/2.1.3/</url>
+        <connection>scm:svn:http://svn.apache.org/repos/asf/geronimo/daytrader/branches/2.1/</connection>
+        <developerConnection>scm:svn:http://svn.apache.org/repos/asf/geronimo/daytrader/branches/2.1/</developerConnection>
+        <url>http://svn.apache.org/viewcvs.cgi/geronimo/daytrader/branches/2.1/</url>
     </scm>
     <organization>
         <name>Apache Software Foundation</name>
@@ -141,15 +148,8 @@
     </organization>
 
     <modules>
-        <module>repository</module>
-        <module>modules/ejb</module>
-        <module>modules/web</module>
-        <module>modules/streamer</module>
-        <module>modules/wsappclient</module>
-        <module>modules/ear</module>
-        <module>modules/json-proxy</module>
-        <module>modules/dojo-ui-web</module>
-        <module>modules/dojo-ui-ear</module>
+        <!--<module>repository</module>-->	
+        <module>modules</module>        
         <!-- c-m-p built plugins -->
         <module>daytrader-derby-datasource</module>
         <!-- see profiles -->
@@ -169,7 +169,7 @@
                 <type>pom</type>
                 <scope>import</scope>
             </dependency>
-            <dependency>
+            <!--<dependency>
                 <groupId>commons-logging</groupId>
                 <artifactId>commons-logging</artifactId>
                 <version>1.0.4</version>
@@ -206,7 +206,7 @@
                         <artifactId>commons-logging</artifactId>
                     </exclusion>
                 </exclusions>
-            </dependency>
+            </dependency>-->
         </dependencies>
     </dependencyManagement>
 
@@ -232,10 +232,10 @@
                         <commonInstance>
                             <plugin-artifact>
                                 <geronimo-version>${geronimoVersion}</geronimo-version>
-                                <geronimo-version>2.1.3</geronimo-version>
+                                <!--<geronimo-version>2.1.3</geronimo-version>
                                 <geronimo-version>2.1.4</geronimo-version>
                                 <geronimo-version>2.1.5</geronimo-version>
-                                <geronimo-version>2.1.6-SNAPSHOT</geronimo-version>
+                                <geronimo-version>2.1.6-SNAPSHOT</geronimo-version>-->
                                 <jvm-version>1.5</jvm-version>
                                 <jvm-version>1.6</jvm-version>
                                 <source-repository>~/.m2/repository/</source-repository>
@@ -296,7 +296,7 @@
                             </assembly>
                         </assemblies>
 
-                        <defaultAssemblyId>framework</defaultAssemblyId>
+                        <defaultAssemblyId>tomcat</defaultAssemblyId>
 
                         <optionSets>
                             <optionSet>
@@ -426,7 +426,7 @@
     </build>
 
     <repositories>
-        <repository>
+        <!--<repository>
             <id>java.net</id>
             <url>http://download.java.net/maven/1/</url>
             <layout>legacy</layout>
@@ -436,7 +436,7 @@
             <releases>
                 <enabled>true</enabled>
             </releases>
-        </repository>
+        </repository>-->
     </repositories>
 
     <profiles>

Modified: geronimo/daytrader/branches/2.1/repository/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/daytrader/branches/2.1/repository/pom.xml?rev=1038159&r1=1038158&r2=1038159&view=diff
==============================================================================
--- geronimo/daytrader/branches/2.1/repository/pom.xml (original)
+++ geronimo/daytrader/branches/2.1/repository/pom.xml Tue Nov 23 15:17:14 2010
@@ -25,7 +25,7 @@
     <parent>
         <groupId>org.apache.geronimo.daytrader</groupId>
         <artifactId>daytrader</artifactId>
-        <version>2.1.3</version>
+        <version>2.1.7-SNAPSHOT</version>
     </parent>
 
     <artifactId>repository</artifactId>



Mime
View raw message