geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dwo...@apache.org
Subject svn commit: r907211 - in /geronimo/daytrader/branches/2.1.3: ./ daytrader-db2-datasource/ daytrader-derby-datasource/ daytrader-jetty/ daytrader-jms/ daytrader-oracle-datasource/ daytrader-tomcat/
Date Sat, 06 Feb 2010 13:26:55 GMT
Author: dwoods
Date: Sat Feb  6 13:26:55 2010
New Revision: 907211

URL: http://svn.apache.org/viewvc?rev=907211&view=rev
Log:
upgrade plugins to install on 2.1.4 and 2.1.5-SNAPSHOT

Modified:
    geronimo/daytrader/branches/2.1.3/README
    geronimo/daytrader/branches/2.1.3/README.jboss
    geronimo/daytrader/branches/2.1.3/README.jboss5
    geronimo/daytrader/branches/2.1.3/daytrader-db2-datasource/pom.xml
    geronimo/daytrader/branches/2.1.3/daytrader-derby-datasource/pom.xml
    geronimo/daytrader/branches/2.1.3/daytrader-jetty/pom.xml
    geronimo/daytrader/branches/2.1.3/daytrader-jms/pom.xml
    geronimo/daytrader/branches/2.1.3/daytrader-oracle-datasource/pom.xml
    geronimo/daytrader/branches/2.1.3/daytrader-tomcat/pom.xml

Modified: geronimo/daytrader/branches/2.1.3/README
URL: http://svn.apache.org/viewvc/geronimo/daytrader/branches/2.1.3/README?rev=907211&r1=907210&r2=907211&view=diff
==============================================================================
--- geronimo/daytrader/branches/2.1.3/README (original)
+++ geronimo/daytrader/branches/2.1.3/README Sat Feb  6 13:26:55 2010
@@ -1,4 +1,4 @@
-(C) Copyright 2006,2008 The Apache Software Foundation.
+(C) Copyright 2006-2010 The Apache Software Foundation.
 ----------------------------------------------------------------------
 
 The code in this directory contains the code for the benchmark sample called

Modified: geronimo/daytrader/branches/2.1.3/README.jboss
URL: http://svn.apache.org/viewvc/geronimo/daytrader/branches/2.1.3/README.jboss?rev=907211&r1=907210&r2=907211&view=diff
==============================================================================
--- geronimo/daytrader/branches/2.1.3/README.jboss (original)
+++ geronimo/daytrader/branches/2.1.3/README.jboss Sat Feb  6 13:26:55 2010
@@ -1,4 +1,4 @@
-(C) Copyright 2006,2008 The Apache Software Foundation.
+(C) Copyright 2006-2010 The Apache Software Foundation.
 ----------------------------------------------------------------------
 
 These are instructions for building and useing daytrader with JBoss:

Modified: geronimo/daytrader/branches/2.1.3/README.jboss5
URL: http://svn.apache.org/viewvc/geronimo/daytrader/branches/2.1.3/README.jboss5?rev=907211&r1=907210&r2=907211&view=diff
==============================================================================
--- geronimo/daytrader/branches/2.1.3/README.jboss5 (original)
+++ geronimo/daytrader/branches/2.1.3/README.jboss5 Sat Feb  6 13:26:55 2010
@@ -1,4 +1,4 @@
-(C) Copyright 2009 The Apache Software Foundation.
+(C) Copyright 2009-2010 The Apache Software Foundation.
 ----------------------------------------------------------------------
 
 These are instructions for building and using daytrader with JBoss 5 standard configuration:

Modified: geronimo/daytrader/branches/2.1.3/daytrader-db2-datasource/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/daytrader/branches/2.1.3/daytrader-db2-datasource/pom.xml?rev=907211&r1=907210&r2=907211&view=diff
==============================================================================
--- geronimo/daytrader/branches/2.1.3/daytrader-db2-datasource/pom.xml (original)
+++ geronimo/daytrader/branches/2.1.3/daytrader-db2-datasource/pom.xml Sat Feb  6 13:26:55
2010
@@ -63,12 +63,14 @@
             <artifactId>db2jcc</artifactId>
             <version>9.0</version>
             <type>jar</type>
+            <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>com.ibm.db2</groupId>
             <artifactId>db2jcc_license_cu</artifactId>
             <version>9.0</version>
             <type>jar</type>
+            <scope>provided</scope>
         </dependency>
     </dependencies>
     <build>
@@ -101,6 +103,8 @@
                     <commonInstance>
                         <plugin-artifact>
                             <geronimo-version>${geronimoVersion}</geronimo-version>
+                            <geronimo-version>2.1.4</geronimo-version>
+                            <geronimo-version>2.1.5-SNAPSHOT</geronimo-version>
                             <jvm-version>1.5</jvm-version>
                             <jvm-version>1.6</jvm-version>
                             <source-repository>~/.m2/repository/</source-repository>

Modified: geronimo/daytrader/branches/2.1.3/daytrader-derby-datasource/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/daytrader/branches/2.1.3/daytrader-derby-datasource/pom.xml?rev=907211&r1=907210&r2=907211&view=diff
==============================================================================
--- geronimo/daytrader/branches/2.1.3/daytrader-derby-datasource/pom.xml (original)
+++ geronimo/daytrader/branches/2.1.3/daytrader-derby-datasource/pom.xml Sat Feb  6 13:26:55
2010
@@ -63,6 +63,7 @@
             <artifactId>system-database</artifactId>
             <type>car</type>
             <version>${geronimoVersion}</version>
+            <scope>provided</scope>
         </dependency>
     </dependencies>
     <build>
@@ -95,6 +96,8 @@
                     <commonInstance>
                         <plugin-artifact>
                             <geronimo-version>${geronimoVersion}</geronimo-version>
+                            <geronimo-version>2.1.4</geronimo-version>
+                            <geronimo-version>2.1.5-SNAPSHOT</geronimo-version>
                             <jvm-version>1.5</jvm-version>
                             <jvm-version>1.6</jvm-version>
                             <source-repository>~/.m2/repository/</source-repository>

Modified: geronimo/daytrader/branches/2.1.3/daytrader-jetty/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/daytrader/branches/2.1.3/daytrader-jetty/pom.xml?rev=907211&r1=907210&r2=907211&view=diff
==============================================================================
--- geronimo/daytrader/branches/2.1.3/daytrader-jetty/pom.xml (original)
+++ geronimo/daytrader/branches/2.1.3/daytrader-jetty/pom.xml Sat Feb  6 13:26:55 2010
@@ -102,6 +102,7 @@
             <artifactId>jetty6</artifactId>
             <version>${geronimoVersion}</version>
             <type>car</type>
+            <scope>provided</scope>
         </dependency>
 
         <dependency>
@@ -109,18 +110,21 @@
             <artifactId>jasper</artifactId>
             <version>${geronimoVersion}</version>
             <type>car</type>
+            <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
             <artifactId>openejb</artifactId>
             <version>${geronimoVersion}</version>
             <type>car</type>
+            <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
             <artifactId>openjpa</artifactId>
             <version>${geronimoVersion}</version>
             <type>car</type>
+            <scope>provided</scope>
         </dependency>
         <!-- external rar for client -->
         <dependency>
@@ -135,11 +139,13 @@
             <artifactId>axis</artifactId>
             <version>${geronimoVersion}</version>
             <type>car</type>
+            <scope>provided</scope>
         </dependency>
-        <!-- needed because maven repo doesn't let our classloader see incide packed car
files -->
+        <!-- needed because maven repo doesn't let our classloader see inside packed car
files -->
         <dependency>
             <groupId>org.apache.activemq</groupId>
             <artifactId>activemq-ra</artifactId>
+            <scope>provided</scope>
         </dependency>
 
     </dependencies>
@@ -179,6 +185,8 @@
                     <commonInstance>
                         <plugin-artifact>
                             <geronimo-version>${geronimoVersion}</geronimo-version>
+                            <geronimo-version>2.1.4</geronimo-version>
+                            <geronimo-version>2.1.5-SNAPSHOT</geronimo-version>
                             <jvm-version>1.5</jvm-version>
                             <jvm-version>1.6</jvm-version>
                             <source-repository>~/.m2/repository/</source-repository>

Modified: geronimo/daytrader/branches/2.1.3/daytrader-jms/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/daytrader/branches/2.1.3/daytrader-jms/pom.xml?rev=907211&r1=907210&r2=907211&view=diff
==============================================================================
--- geronimo/daytrader/branches/2.1.3/daytrader-jms/pom.xml (original)
+++ geronimo/daytrader/branches/2.1.3/daytrader-jms/pom.xml Sat Feb  6 13:26:55 2010
@@ -67,6 +67,7 @@
             <artifactId>activemq-broker</artifactId>
             <type>car</type>
             <version>${geronimoVersion}</version>
+            <scope>provided</scope>
         </dependency>
     </dependencies>
     <build>
@@ -99,6 +100,8 @@
                     <commonInstance>
                         <plugin-artifact>
                             <geronimo-version>${geronimoVersion}</geronimo-version>
+                            <geronimo-version>2.1.4</geronimo-version>
+                            <geronimo-version>2.1.5-SNAPSHOT</geronimo-version>
                             <jvm-version>1.5</jvm-version>
                             <jvm-version>1.6</jvm-version>
                             <source-repository>~/.m2/repository/</source-repository>

Modified: geronimo/daytrader/branches/2.1.3/daytrader-oracle-datasource/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/daytrader/branches/2.1.3/daytrader-oracle-datasource/pom.xml?rev=907211&r1=907210&r2=907211&view=diff
==============================================================================
--- geronimo/daytrader/branches/2.1.3/daytrader-oracle-datasource/pom.xml (original)
+++ geronimo/daytrader/branches/2.1.3/daytrader-oracle-datasource/pom.xml Sat Feb  6 13:26:55
2010
@@ -63,6 +63,7 @@
             <artifactId>ojdbc14</artifactId>
             <version>10g</version>
             <type>jar</type>
+            <scope>provided</scope>
           </dependency>
     </dependencies>
     <build>
@@ -95,6 +96,8 @@
                     <commonInstance>
                         <plugin-artifact>
                             <geronimo-version>${geronimoVersion}</geronimo-version>
+                            <geronimo-version>2.1.4</geronimo-version>
+                            <geronimo-version>2.1.5-SNAPSHOT</geronimo-version>
                             <jvm-version>1.5</jvm-version>
                             <jvm-version>1.6</jvm-version>
                             <source-repository>~/.m2/repository/</source-repository>

Modified: geronimo/daytrader/branches/2.1.3/daytrader-tomcat/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/daytrader/branches/2.1.3/daytrader-tomcat/pom.xml?rev=907211&r1=907210&r2=907211&view=diff
==============================================================================
--- geronimo/daytrader/branches/2.1.3/daytrader-tomcat/pom.xml (original)
+++ geronimo/daytrader/branches/2.1.3/daytrader-tomcat/pom.xml Sat Feb  6 13:26:55 2010
@@ -101,6 +101,7 @@
             <artifactId>tomcat6</artifactId>
             <version>${geronimoVersion}</version>
             <type>car</type>
+            <scope>provided</scope>
         </dependency>
 
         <dependency>
@@ -108,18 +109,21 @@
             <artifactId>jasper</artifactId>
             <version>${geronimoVersion}</version>
             <type>car</type>
+            <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
             <artifactId>openejb</artifactId>
             <version>${geronimoVersion}</version>
             <type>car</type>
+            <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
             <artifactId>openjpa</artifactId>
             <version>${geronimoVersion}</version>
             <type>car</type>
+            <scope>provided</scope>
         </dependency>
         <!-- external rar for client -->
         <dependency>
@@ -134,6 +138,7 @@
             <artifactId>axis</artifactId>
             <version>${geronimoVersion}</version>
             <type>car</type>
+            <scope>provided</scope>
         </dependency>
         <!-- needed because maven repo doesn't let our classloader see incide packed car
files -->
         <dependency>
@@ -177,6 +182,8 @@
                     <commonInstance>
                         <plugin-artifact>
                             <geronimo-version>${geronimoVersion}</geronimo-version>
+                            <geronimo-version>2.1.4</geronimo-version>
+                            <geronimo-version>2.1.5-SNAPSHOT</geronimo-version>
                             <jvm-version>1.5</jvm-version>
                             <jvm-version>1.6</jvm-version>
                             <source-repository>~/.m2/repository/</source-repository>



Mime
View raw message