geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From xiam...@apache.org
Subject svn commit: r1356637 - in /geronimo/daytrader/branches/3.0/plugins: ./ daytrader-db2-datasource/ daytrader-derby-datasource/src/main/history/ daytrader-informix-datasource/ daytrader-jetty/ daytrader-jetty/src/main/history/ daytrader-jetty/src/main/pla...
Date Tue, 03 Jul 2012 09:33:15 GMT
Author: xiaming
Date: Tue Jul  3 09:33:13 2012
New Revision: 1356637

URL: http://svn.apache.org/viewvc?rev=1356637&view=rev
Log:
Update versions to 3.0.0 for 3.0.0 release preparation

Modified:
    geronimo/daytrader/branches/3.0/plugins/daytrader-db2-datasource/pom.xml
    geronimo/daytrader/branches/3.0/plugins/daytrader-derby-datasource/src/main/history/dependencies.xml
    geronimo/daytrader/branches/3.0/plugins/daytrader-informix-datasource/pom.xml
    geronimo/daytrader/branches/3.0/plugins/daytrader-jetty/pom.xml
    geronimo/daytrader/branches/3.0/plugins/daytrader-jetty/src/main/history/dependencies.xml
    geronimo/daytrader/branches/3.0/plugins/daytrader-jetty/src/main/plan/plan.xml
    geronimo/daytrader/branches/3.0/plugins/daytrader-jms/src/main/history/dependencies.xml
    geronimo/daytrader/branches/3.0/plugins/daytrader-mysql-datasource/pom.xml
    geronimo/daytrader/branches/3.0/plugins/daytrader-oracle-datasource/pom.xml
    geronimo/daytrader/branches/3.0/plugins/daytrader-postgre-datasource/pom.xml
    geronimo/daytrader/branches/3.0/plugins/daytrader-sqlserver-datasource/pom.xml
    geronimo/daytrader/branches/3.0/plugins/daytrader-tomcat/pom.xml
    geronimo/daytrader/branches/3.0/plugins/daytrader-tomcat/src/main/history/dependencies.xml
    geronimo/daytrader/branches/3.0/plugins/daytrader-tomcat/src/main/plan/plan.xml
    geronimo/daytrader/branches/3.0/plugins/pom.xml

Modified: geronimo/daytrader/branches/3.0/plugins/daytrader-db2-datasource/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/daytrader/branches/3.0/plugins/daytrader-db2-datasource/pom.xml?rev=1356637&r1=1356636&r2=1356637&view=diff
==============================================================================
--- geronimo/daytrader/branches/3.0/plugins/daytrader-db2-datasource/pom.xml (original)
+++ geronimo/daytrader/branches/3.0/plugins/daytrader-db2-datasource/pom.xml Tue Jul  3 09:33:13
2012
@@ -21,7 +21,7 @@
     <parent>
         <groupId>org.apache.geronimo.daytrader</groupId>
         <artifactId>plugins</artifactId>
-        <version>3.0-beta-1-SNAPSHOT</version>
+        <version>3.0.0</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.apache.geronimo.daytrader.plugins</groupId>

Modified: geronimo/daytrader/branches/3.0/plugins/daytrader-derby-datasource/src/main/history/dependencies.xml
URL: http://svn.apache.org/viewvc/geronimo/daytrader/branches/3.0/plugins/daytrader-derby-datasource/src/main/history/dependencies.xml?rev=1356637&r1=1356636&r2=1356637&view=diff
==============================================================================
--- geronimo/daytrader/branches/3.0/plugins/daytrader-derby-datasource/src/main/history/dependencies.xml
(original)
+++ geronimo/daytrader/branches/3.0/plugins/daytrader-derby-datasource/src/main/history/dependencies.xml
Tue Jul  3 09:33:13 2012
@@ -3,7 +3,7 @@
     <module-id>
         <groupId>org.apache.geronimo.daytrader.plugins</groupId>
         <artifactId>daytrader-derby-datasource</artifactId>
-        <version>3.0-SNAPSHOT</version>
+        <version>3.0.0</version>
         <type>car</type>
     </module-id>
     <dependency>

Modified: geronimo/daytrader/branches/3.0/plugins/daytrader-informix-datasource/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/daytrader/branches/3.0/plugins/daytrader-informix-datasource/pom.xml?rev=1356637&r1=1356636&r2=1356637&view=diff
==============================================================================
--- geronimo/daytrader/branches/3.0/plugins/daytrader-informix-datasource/pom.xml (original)
+++ geronimo/daytrader/branches/3.0/plugins/daytrader-informix-datasource/pom.xml Tue Jul
 3 09:33:13 2012
@@ -21,7 +21,7 @@
     <parent>
         <groupId>org.apache.geronimo.daytrader</groupId>
         <artifactId>plugins</artifactId>
-        <version>3.0-beta-1-SNAPSHOT</version>
+        <version>3.0.0</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.apache.geronimo.daytrader.plugins</groupId>

Modified: geronimo/daytrader/branches/3.0/plugins/daytrader-jetty/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/daytrader/branches/3.0/plugins/daytrader-jetty/pom.xml?rev=1356637&r1=1356636&r2=1356637&view=diff
==============================================================================
--- geronimo/daytrader/branches/3.0/plugins/daytrader-jetty/pom.xml (original)
+++ geronimo/daytrader/branches/3.0/plugins/daytrader-jetty/pom.xml Tue Jul  3 09:33:13 2012
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.geronimo.daytrader</groupId>
         <artifactId>plugins</artifactId>
-        <version>3.0-beta-1-SNAPSHOT</version>
+        <version>3.0.0</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.apache.geronimo.daytrader.plugins</groupId>

Modified: geronimo/daytrader/branches/3.0/plugins/daytrader-jetty/src/main/history/dependencies.xml
URL: http://svn.apache.org/viewvc/geronimo/daytrader/branches/3.0/plugins/daytrader-jetty/src/main/history/dependencies.xml?rev=1356637&r1=1356636&r2=1356637&view=diff
==============================================================================
--- geronimo/daytrader/branches/3.0/plugins/daytrader-jetty/src/main/history/dependencies.xml
(original)
+++ geronimo/daytrader/branches/3.0/plugins/daytrader-jetty/src/main/history/dependencies.xml
Tue Jul  3 09:33:13 2012
@@ -3,7 +3,7 @@
     <module-id>
         <groupId>org.apache.geronimo.daytrader.plugins</groupId>
         <artifactId>daytrader-jetty</artifactId>
-        <version>3.0-SNAPSHOT</version>
+        <version>3.0.0</version>
         <type>car</type>
     </module-id>
     <dependency>

Modified: geronimo/daytrader/branches/3.0/plugins/daytrader-jetty/src/main/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/daytrader/branches/3.0/plugins/daytrader-jetty/src/main/plan/plan.xml?rev=1356637&r1=1356636&r2=1356637&view=diff
==============================================================================
--- geronimo/daytrader/branches/3.0/plugins/daytrader-jetty/src/main/plan/plan.xml (original)
+++ geronimo/daytrader/branches/3.0/plugins/daytrader-jetty/src/main/plan/plan.xml Tue Jul
 3 09:33:13 2012
@@ -39,72 +39,6 @@
                 </port>
             </service-ref>
         </web-app>
-    </module>
-
-
-    <!--
-     **
-     **  DayTrader EJB Jar Module Definition
-     **
-   
-    <module>
-        <ejb>dt-ejb.jar</ejb>
-        <openejb-jar xmlns="http://openejb.apache.org/xml/ns/openejb-jar-2.2">
-
-            <enterprise-beans>
-                <message-driven>
-                    <ejb-name>DTBroker3MDB</ejb-name>
-                    <resource-adapter>
-                        <resource-link>TradeJMSResources</resource-link>
-                    </resource-adapter>
-                </message-driven>
-                <message-driven>
-                    <ejb-name>DTStreamer3MDB</ejb-name>
-                    <resource-adapter>
-                        <resource-link>TradeJMSResources</resource-link>
-                    </resource-adapter>
-                </message-driven>
-            </enterprise-beans> -->
-
-            <!--
-             **
-             ** The following section can be used to override the settings in the
-             ** persistence.xml file. For instance, if you choose to deploy DayTrader
-             ** against a DB2 database, the DBDictionary can be specified here.
-             **
-            -->
-
-            <!--<persistence xmlns="http://java.sun.com/xml/ns/persistence" version="1.0">
-                <persistence-unit name="daytrader">
-                    <properties>
-                        <property name="openjpa.jdbc.DBDictionary" value="db2" />
-                        <property name="openjpa.jdbc.DBDictionary" value="derby" />
-                    </properties>
-                </persistence-unit>
-            </persistence>
-        </openejb-jar>
     </module>    
 
-    <module>
-        <java>wsappclient.jar</java>
-        <application-client xmlns="http://geronimo.apache.org/xml/ns/j2ee/application-client-2.0">
-            <client-environment xmlns="http://geronimo.apache.org/xml/ns/deployment-1.2">
-                <moduleId>
-                    <groupId>org.apache.geronimo.daytrader</groupId>
-                    <artifactId>daytrader-ws-client</artifactId>
-                    <version>2.2.1-SNAPSHOT</version>
-                    <type>car</type>
-                </moduleId>
-            </client-environment>
-            <server-environment xmlns="http://geronimo.apache.org/xml/ns/deployment-1.2">
-                <moduleId>
-                    <groupId>org.apache.geronimo.daytrader</groupId>
-                    <artifactId>daytrader-ws-client-server</artifactId>
-                    <version>2.2.1-SNAPSHOT</version>
-                    <type>car</type>
-                </moduleId>
-            </server-environment>
-        </application-client>
-    </module>-->
-
 </application>

Modified: geronimo/daytrader/branches/3.0/plugins/daytrader-jms/src/main/history/dependencies.xml
URL: http://svn.apache.org/viewvc/geronimo/daytrader/branches/3.0/plugins/daytrader-jms/src/main/history/dependencies.xml?rev=1356637&r1=1356636&r2=1356637&view=diff
==============================================================================
--- geronimo/daytrader/branches/3.0/plugins/daytrader-jms/src/main/history/dependencies.xml
(original)
+++ geronimo/daytrader/branches/3.0/plugins/daytrader-jms/src/main/history/dependencies.xml
Tue Jul  3 09:33:13 2012
@@ -3,7 +3,7 @@
     <module-id>
         <groupId>org.apache.geronimo.daytrader.plugins</groupId>
         <artifactId>daytrader-jms</artifactId>
-        <version>3.0-SNAPSHOT</version>
+        <version>3.0.0</version>
         <type>car</type>
     </module-id>
     <dependency>

Modified: geronimo/daytrader/branches/3.0/plugins/daytrader-mysql-datasource/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/daytrader/branches/3.0/plugins/daytrader-mysql-datasource/pom.xml?rev=1356637&r1=1356636&r2=1356637&view=diff
==============================================================================
--- geronimo/daytrader/branches/3.0/plugins/daytrader-mysql-datasource/pom.xml (original)
+++ geronimo/daytrader/branches/3.0/plugins/daytrader-mysql-datasource/pom.xml Tue Jul  3
09:33:13 2012
@@ -21,7 +21,7 @@
     <parent>
         <groupId>org.apache.geronimo.daytrader</groupId>
         <artifactId>plugins</artifactId>
-        <version>3.0-beta-1-SNAPSHOT</version>
+        <version>3.0.0</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.apache.geronimo.daytrader.plugins</groupId>

Modified: geronimo/daytrader/branches/3.0/plugins/daytrader-oracle-datasource/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/daytrader/branches/3.0/plugins/daytrader-oracle-datasource/pom.xml?rev=1356637&r1=1356636&r2=1356637&view=diff
==============================================================================
--- geronimo/daytrader/branches/3.0/plugins/daytrader-oracle-datasource/pom.xml (original)
+++ geronimo/daytrader/branches/3.0/plugins/daytrader-oracle-datasource/pom.xml Tue Jul  3
09:33:13 2012
@@ -21,7 +21,7 @@
     <parent>
         <groupId>org.apache.geronimo.daytrader</groupId>
         <artifactId>plugins</artifactId>
-        <version>3.0-beta-1-SNAPSHOT</version>
+        <version>3.0.0</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.apache.geronimo.daytrader.plugins</groupId>

Modified: geronimo/daytrader/branches/3.0/plugins/daytrader-postgre-datasource/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/daytrader/branches/3.0/plugins/daytrader-postgre-datasource/pom.xml?rev=1356637&r1=1356636&r2=1356637&view=diff
==============================================================================
--- geronimo/daytrader/branches/3.0/plugins/daytrader-postgre-datasource/pom.xml (original)
+++ geronimo/daytrader/branches/3.0/plugins/daytrader-postgre-datasource/pom.xml Tue Jul 
3 09:33:13 2012
@@ -21,7 +21,7 @@
     <parent>
         <groupId>org.apache.geronimo.daytrader</groupId>
         <artifactId>plugins</artifactId>
-        <version>3.0-beta-1-SNAPSHOT</version>
+        <version>3.0.0</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.apache.geronimo.daytrader.plugins</groupId>

Modified: geronimo/daytrader/branches/3.0/plugins/daytrader-sqlserver-datasource/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/daytrader/branches/3.0/plugins/daytrader-sqlserver-datasource/pom.xml?rev=1356637&r1=1356636&r2=1356637&view=diff
==============================================================================
--- geronimo/daytrader/branches/3.0/plugins/daytrader-sqlserver-datasource/pom.xml (original)
+++ geronimo/daytrader/branches/3.0/plugins/daytrader-sqlserver-datasource/pom.xml Tue Jul
 3 09:33:13 2012
@@ -21,7 +21,7 @@
     <parent>
         <groupId>org.apache.geronimo.daytrader</groupId>
         <artifactId>plugins</artifactId>
-        <version>3.0-beta-1-SNAPSHOT</version>
+        <version>3.0.0</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.apache.geronimo.daytrader.plugins</groupId>

Modified: geronimo/daytrader/branches/3.0/plugins/daytrader-tomcat/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/daytrader/branches/3.0/plugins/daytrader-tomcat/pom.xml?rev=1356637&r1=1356636&r2=1356637&view=diff
==============================================================================
--- geronimo/daytrader/branches/3.0/plugins/daytrader-tomcat/pom.xml (original)
+++ geronimo/daytrader/branches/3.0/plugins/daytrader-tomcat/pom.xml Tue Jul  3 09:33:13 2012
@@ -21,7 +21,7 @@
     <parent>
         <groupId>org.apache.geronimo.daytrader</groupId>
         <artifactId>plugins</artifactId>
-        <version>3.0-beta-1-SNAPSHOT</version>
+        <version>3.0.0</version>
     </parent>
     
     <modelVersion>4.0.0</modelVersion>

Modified: geronimo/daytrader/branches/3.0/plugins/daytrader-tomcat/src/main/history/dependencies.xml
URL: http://svn.apache.org/viewvc/geronimo/daytrader/branches/3.0/plugins/daytrader-tomcat/src/main/history/dependencies.xml?rev=1356637&r1=1356636&r2=1356637&view=diff
==============================================================================
--- geronimo/daytrader/branches/3.0/plugins/daytrader-tomcat/src/main/history/dependencies.xml
(original)
+++ geronimo/daytrader/branches/3.0/plugins/daytrader-tomcat/src/main/history/dependencies.xml
Tue Jul  3 09:33:13 2012
@@ -19,7 +19,7 @@
     <module-id>
         <groupId>org.apache.geronimo.daytrader.plugins</groupId>
         <artifactId>daytrader-tomcat</artifactId>
-        <version>3.0-SNAPSHOT</version>
+        <version>3.0.0</version>
         <type>car</type>
     </module-id>
     <dependency>

Modified: geronimo/daytrader/branches/3.0/plugins/daytrader-tomcat/src/main/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/daytrader/branches/3.0/plugins/daytrader-tomcat/src/main/plan/plan.xml?rev=1356637&r1=1356636&r2=1356637&view=diff
==============================================================================
--- geronimo/daytrader/branches/3.0/plugins/daytrader-tomcat/src/main/plan/plan.xml (original)
+++ geronimo/daytrader/branches/3.0/plugins/daytrader-tomcat/src/main/plan/plan.xml Tue Jul
 3 09:33:13 2012
@@ -39,144 +39,6 @@
                 </port>
             </service-ref>
         </web-app>
-    </module>
-
-
-    <!--
-     **
-     **  DayTrader EJB Jar Module Definition
-     **
-    
-    <module>
-        <ejb>dt-ejb.jar</ejb>
-        <openejb-jar xmlns="http://openejb.apache.org/xml/ns/openejb-jar-2.2">
-
-            <enterprise-beans>
-                <message-driven>
-                    <ejb-name>DTBroker3MDB</ejb-name>
-                    <resource-adapter>
-                        <resource-link>TradeJMSResources</resource-link>
-                    </resource-adapter>
-                </message-driven>
-                <message-driven>
-                    <ejb-name>DTStreamer3MDB</ejb-name>
-                    <resource-adapter>
-                        <resource-link>TradeJMSResources</resource-link>
-                    </resource-adapter>
-                </message-driven>
-            </enterprise-beans>-->
-
-            <!--
-             **
-             ** The following section can be used to override the settings in the
-             ** persistence.xml file. For instance, if you choose to deploy DayTrader
-             ** against a DB2 database, the DBDictionary can be specified here.
-             **
-            -->
-
-            <!--<persistence xmlns="http://java.sun.com/xml/ns/persistence" version="1.0">
-                <persistence-unit name="daytrader">
-                    <properties>
-                        <property name="openjpa.jdbc.DBDictionary" value="db2" />
-                        <property name="openjpa.jdbc.DBDictionary" value="derby" />
-                    </properties>
-                </persistence-unit>
-            </persistence>
-        </openejb-jar>
-    </module>-->
-
-
-    <!--<module>
-        <java>streamer.jar</java>
-        <application-client xmlns="http://geronimo.apache.org/xml/ns/j2ee/application-client-2.0">
-            <client-environment xmlns="http://geronimo.apache.org/xml/ns/deployment-1.2">
-                <moduleId>
-                    <groupId>org.apache.geronimo.daytrader</groupId>
-                    <artifactId>daytrader-streamer-client</artifactId>
-                    <version>2.2.1-SNAPSHOT</version>
-                    <type>car</type>
-                </moduleId>
-            </client-environment>
-            <server-environment xmlns="http://geronimo.apache.org/xml/ns/deployment-1.2">
-                <moduleId>
-                    <groupId>org.apache.geronimo.daytrader</groupId>
-                    <artifactId>daytrader-streamer-client-server</artifactId>
-                    <version>2.2.1-SNAPSHOT</version>
-                    <type>car</type>
-                </moduleId>
-            </server-environment>
-            <resource>
-                <external-rar xmlns:dep="http://geronimo.apache.org/xml/ns/deployment-1.2">
-                    <dep:groupId>org.apache.geronimo.modules</dep:groupId>
-                    <dep:artifactId>geronimo-activemq-ra</dep:artifactId>
-                    <dep:type>rar</dep:type>
-                </external-rar>
-                <connector xmlns="http://geronimo.apache.org/xml/ns/j2ee/connector-1.2">
-                    <resourceadapter>
-                        <resourceadapter-instance>
-                            <resourceadapter-name>ActiveMQ RA</resourceadapter-name>
-                            <config-property-setting name="ServerUrl">tcp://localhost:61616</config-property-setting>
-                            <config-property-setting name="UserName">geronimo</config-property-setting>
-                            <config-property-setting name="Password">geronimo</config-property-setting>
-                            <workmanager>
-                                <gbean-link>DefaultWorkManager</gbean-link>
-                            </workmanager>
-                        </resourceadapter-instance>
-                        <outbound-resourceadapter>
-                            <connection-definition>
-                                <connectionfactory-interface>javax.jms.ConnectionFactory</connectionfactory-interface>
-                                <connectiondefinition-instance>
-                                    <name>jms/TopicConnectionFactory</name>
-                                    <implemented-interface>javax.jms.QueueConnectionFactory</implemented-interface>
-                                    <implemented-interface>javax.jms.TopicConnectionFactory</implemented-interface>
-                                    <connectionmanager>
-                                        <xa-transaction>
-                                            <transaction-caching/>
-                                        </xa-transaction>
-                                        <single-pool>
-                                            <max-size>10</max-size>
-                                            <blocking-timeout-milliseconds>5000</blocking-timeout-milliseconds>
-                                            <match-one/>
-                                        </single-pool>
-                                    </connectionmanager>
-                                </connectiondefinition-instance>
-                            </connection-definition>
-                        </outbound-resourceadapter>
-                    </resourceadapter>
-
-                    <adminobject>
-                        <adminobject-interface>javax.jms.Topic</adminobject-interface>
-                        <adminobject-class>org.activemq.message.ActiveMQTopic</adminobject-class>
-                        <adminobject-instance>
-                            <message-destination-name>jms/TradeStreamerTopic</message-destination-name>
-                            <config-property-setting name="PhysicalName">TradeStreamerTopic</config-property-setting>
-                        </adminobject-instance>
-                    </adminobject>
-                </connector>
-            </resource>
-        </application-client>
-    </module>
-
-    <module>
-        <java>wsappclient.jar</java>
-        <application-client xmlns="http://geronimo.apache.org/xml/ns/j2ee/application-client-2.0">
-            <client-environment xmlns="http://geronimo.apache.org/xml/ns/deployment-1.2">
-                <moduleId>
-                    <groupId>org.apache.geronimo.daytrader</groupId>
-                    <artifactId>daytrader-ws-client</artifactId>
-                    <version>2.2.1-SNAPSHOT</version>
-                    <type>car</type>
-                </moduleId>
-            </client-environment>
-            <server-environment xmlns="http://geronimo.apache.org/xml/ns/deployment-1.2">
-                <moduleId>
-                    <groupId>org.apache.geronimo.daytrader</groupId>
-                    <artifactId>daytrader-ws-client-server</artifactId>
-                    <version>2.2.1-SNAPSHOT</version>
-                    <type>car</type>
-                </moduleId>
-            </server-environment>
-        </application-client>
-    </module>-->
+    </module>    
 
 </application>

Modified: geronimo/daytrader/branches/3.0/plugins/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/daytrader/branches/3.0/plugins/pom.xml?rev=1356637&r1=1356636&r2=1356637&view=diff
==============================================================================
--- geronimo/daytrader/branches/3.0/plugins/pom.xml (original)
+++ geronimo/daytrader/branches/3.0/plugins/pom.xml Tue Jul  3 09:33:13 2012
@@ -120,9 +120,7 @@
                     </deploymentConfigs>
                     <commonInstance>
                         <plugin-artifact>
-                        <geronimo-version>${geronimoVersion}</geronimo-version>
-                            <!--<geronimo-version>2.2</geronimo-version>
-                            <geronimo-version>2.2.1-SNAPSHOT</geronimo-version>-->
+                            <geronimo-version>${geronimoVersion}</geronimo-version>
                             <jvm-version>1.5</jvm-version>
                             <jvm-version>1.6</jvm-version>
                             <source-repository>~/.m2/repository/</source-repository>



Mime
View raw message