geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dwo...@apache.org
Subject svn commit: r808905 - in /geronimo/daytrader/trunk: ./ daytrader-db2-datasource/ daytrader-derby-datasource/ daytrader-jetty/ daytrader-jms/ daytrader-oracle-datasource/ daytrader-tomcat/ modules/core/ modules/core/src/main/java/org/apache/geronimo/sam...
Date Fri, 28 Aug 2009 14:43:23 GMT
Author: dwoods
Date: Fri Aug 28 14:43:22 2009
New Revision: 808905

URL: http://svn.apache.org/viewvc?rev=808905&view=rev
Log:
reorg - Part 1

Added:
    geronimo/daytrader/trunk/modules/core/
      - copied from r808577, geronimo/daytrader/trunk/modules/ejb/
    geronimo/daytrader/trunk/plugins/
    geronimo/daytrader/trunk/plugins/daytrader-db2-datasource/
      - copied from r808577, geronimo/daytrader/trunk/daytrader-db2-datasource/
    geronimo/daytrader/trunk/plugins/daytrader-derby-datasource/
      - copied from r808577, geronimo/daytrader/trunk/daytrader-derby-datasource/
    geronimo/daytrader/trunk/plugins/daytrader-jetty/
      - copied from r808577, geronimo/daytrader/trunk/daytrader-jetty/
    geronimo/daytrader/trunk/plugins/daytrader-jms/
      - copied from r808577, geronimo/daytrader/trunk/daytrader-jms/
    geronimo/daytrader/trunk/plugins/daytrader-oracle-datasource/
      - copied from r808577, geronimo/daytrader/trunk/daytrader-oracle-datasource/
    geronimo/daytrader/trunk/plugins/daytrader-tomcat/
      - copied from r808577, geronimo/daytrader/trunk/daytrader-tomcat/
Removed:
    geronimo/daytrader/trunk/daytrader-db2-datasource/
    geronimo/daytrader/trunk/daytrader-derby-datasource/
    geronimo/daytrader/trunk/daytrader-jetty/
    geronimo/daytrader/trunk/daytrader-jms/
    geronimo/daytrader/trunk/daytrader-oracle-datasource/
    geronimo/daytrader/trunk/daytrader-tomcat/
    geronimo/daytrader/trunk/modules/ejb/
Modified:
    geronimo/daytrader/trunk/modules/core/src/main/java/org/apache/geronimo/samples/daytrader/TradeConfig.java
    geronimo/daytrader/trunk/plugins/daytrader-db2-datasource/pom.xml
    geronimo/daytrader/trunk/plugins/daytrader-derby-datasource/pom.xml
    geronimo/daytrader/trunk/plugins/daytrader-jetty/pom.xml
    geronimo/daytrader/trunk/plugins/daytrader-jms/pom.xml
    geronimo/daytrader/trunk/plugins/daytrader-oracle-datasource/pom.xml
    geronimo/daytrader/trunk/plugins/daytrader-tomcat/pom.xml
    geronimo/daytrader/trunk/pom.xml

Modified: geronimo/daytrader/trunk/modules/core/src/main/java/org/apache/geronimo/samples/daytrader/TradeConfig.java
URL: http://svn.apache.org/viewvc/geronimo/daytrader/trunk/modules/core/src/main/java/org/apache/geronimo/samples/daytrader/TradeConfig.java?rev=808905&r1=808577&r2=808905&view=diff
==============================================================================
--- geronimo/daytrader/trunk/modules/core/src/main/java/org/apache/geronimo/samples/daytrader/TradeConfig.java
(original)
+++ geronimo/daytrader/trunk/modules/core/src/main/java/org/apache/geronimo/samples/daytrader/TradeConfig.java
Fri Aug 28 14:43:22 2009
@@ -25,7 +25,7 @@
 
 /**
  * TradeConfig is a JavaBean holding all configuration and runtime parameters for the Trade
application
- * TradeConfig sets runtime parameters such as the RunTimeMode (EJB, JDBC, EJB_ALT)
+ * TradeConfig sets runtime parameters such as the RunTimeMode (EJB3, DIRECT, SESSION3, JPA)
  *
  */
 
@@ -34,11 +34,12 @@
 	/* Trade Runtime Configuration Parameters */
 
 	/* Trade Runtime Mode parameters */
-    public static String[] runTimeModeNames = {"Full EJB3", "Direct (JDBC)", "Session (EJB3)
To Direct"};
+    public static String[] runTimeModeNames = {"Full EJB3", "Direct (JDBC)", "Session (EJB3)
To Direct", "Direct (JPA)"};
     public static final int EJB3 = 0;
     public static final int DIRECT = 1;
     public static final int SESSION3 = 2;
-	public static int runTimeMode = DIRECT;
+    public static final int JPA = 3;
+    public static int runTimeMode = DIRECT;
 	
     /* Trade JPA Layer parameters */
 	public static String[] jpaLayerNames = {"OpenJPA", "Hibernate"};

Modified: geronimo/daytrader/trunk/plugins/daytrader-db2-datasource/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/daytrader/trunk/plugins/daytrader-db2-datasource/pom.xml?rev=808905&r1=808577&r2=808905&view=diff
==============================================================================
--- geronimo/daytrader/trunk/plugins/daytrader-db2-datasource/pom.xml (original)
+++ geronimo/daytrader/trunk/plugins/daytrader-db2-datasource/pom.xml Fri Aug 28 14:43:22
2009
@@ -19,12 +19,12 @@
 <!-- $Rev$ $Date$ -->
 <project>
     <parent>
-        <artifactId>daytrader</artifactId>
         <groupId>org.apache.geronimo.daytrader</groupId>
+        <artifactId>plugins</artifactId>
         <version>2.2-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
-    <groupId>org.apache.geronimo.daytrader</groupId>
+    <groupId>org.apache.geronimo.daytrader.plugins</groupId>
     <artifactId>daytrader-db2-datasource</artifactId>
     <packaging>car</packaging>
     <name>Daytrader :: DB2 DataSource</name>
@@ -109,11 +109,13 @@
                     </commonInstance>
                     <instance>
                         <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>
+                            <artifact-alias key="org.apache.geronimo.daytrader.plugins/daytrader-derby-database/${version}/car">org.apache.geronimo.daytrader.plugins/daytrader-db2-database/${version}/car</artifact-alias>
                             <!-- The following doesn't work with c-m-p in 2.1.3
                             <obsoletes>org.apache.geronimo.daytrader/daytrader//car</obsoletes>
                             <obsoletes>org.apache.geronimo.daytrader/daytrader-derby-datasource//car</obsoletes>
+                            <obsoletes>org.apache.geronimo.daytrader.plugins/daytrader-derby-datasource//car</obsoletes>
                             <obsoletes>org.apache.geronimo.daytrader/daytrader-db2-datasource//car</obsoletes>
+                            <obsoletes>org.apache.geronimo.daytrader.plugins/daytrader-db2-datasource//car</obsoletes>
                             -->
                         </plugin-artifact>
                     </instance>

Modified: geronimo/daytrader/trunk/plugins/daytrader-derby-datasource/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/daytrader/trunk/plugins/daytrader-derby-datasource/pom.xml?rev=808905&r1=808577&r2=808905&view=diff
==============================================================================
--- geronimo/daytrader/trunk/plugins/daytrader-derby-datasource/pom.xml (original)
+++ geronimo/daytrader/trunk/plugins/daytrader-derby-datasource/pom.xml Fri Aug 28 14:43:22
2009
@@ -19,12 +19,12 @@
 <!-- $Rev$ $Date$ -->
 <project>
     <parent>
-        <artifactId>daytrader</artifactId>
         <groupId>org.apache.geronimo.daytrader</groupId>
+        <artifactId>plugins</artifactId>
         <version>2.2-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
-    <groupId>org.apache.geronimo.daytrader</groupId>
+    <groupId>org.apache.geronimo.daytrader.plugins</groupId>
     <artifactId>daytrader-derby-datasource</artifactId>
     <packaging>car</packaging>
     <name>Daytrader :: Derby DataSource</name>
@@ -106,6 +106,7 @@
                             <!-- The following doesn't work with c-m-p in 2.1.3
                             <obsoletes>org.apache.geronimo.daytrader/daytrader//car</obsoletes>
                             <obsoletes>org.apache.geronimo.daytrader/daytrader-derby-datasource//car</obsoletes>
+                            <obsoletes>org.apache.geronimo.daytrader.plugins/daytrader-derby-datasource//car</obsoletes>
                             -->
                         </plugin-artifact>
                     </instance>

Modified: geronimo/daytrader/trunk/plugins/daytrader-jetty/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/daytrader/trunk/plugins/daytrader-jetty/pom.xml?rev=808905&r1=808577&r2=808905&view=diff
==============================================================================
--- geronimo/daytrader/trunk/plugins/daytrader-jetty/pom.xml (original)
+++ geronimo/daytrader/trunk/plugins/daytrader-jetty/pom.xml Fri Aug 28 14:43:22 2009
@@ -19,12 +19,12 @@
 <!-- $Rev$ $Date$ -->
 <project>
     <parent>
-        <artifactId>daytrader</artifactId>
         <groupId>org.apache.geronimo.daytrader</groupId>
+        <artifactId>plugins</artifactId>
         <version>2.2-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
-    <groupId>org.apache.geronimo.daytrader</groupId>
+    <groupId>org.apache.geronimo.daytrader.plugins</groupId>
     <artifactId>daytrader-jetty</artifactId>
     <packaging>car</packaging>
     <name>Daytrader :: Jetty</name>
@@ -39,13 +39,13 @@
             <scope>provided</scope>
         </dependency>
         <dependency>
-            <groupId>org.apache.geronimo.daytrader</groupId>
+            <groupId>org.apache.geronimo.daytrader.plugins</groupId>
             <artifactId>daytrader-derby-datasource</artifactId>
             <version>${version}</version>
             <type>car</type>
         </dependency>
         <dependency>
-            <groupId>org.apache.geronimo.daytrader</groupId>
+            <groupId>org.apache.geronimo.daytrader.plugins</groupId>
             <artifactId>daytrader-jms</artifactId>
             <version>${version}</version>
             <type>car</type>
@@ -53,7 +53,7 @@
 
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
-            <artifactId>jetty6-deployer</artifactId>
+            <artifactId>jetty7-deployer</artifactId>
             <version>${geronimoVersion}</version>
             <type>car</type>
             <scope>provided</scope>
@@ -99,7 +99,7 @@
 
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
-            <artifactId>jetty6</artifactId>
+            <artifactId>jetty7</artifactId>
             <version>${geronimoVersion}</version>
             <type>car</type>
         </dependency>
@@ -136,7 +136,7 @@
             <version>${geronimoVersion}</version>
             <type>car</type>
         </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>
@@ -164,7 +164,7 @@
                     <deploymentConfigs>
                         <deploymentConfig>${gbeanDeployer}</deploymentConfig>
                         <deploymentConfig>${j2eeDeployer}</deploymentConfig>
-                        <deploymentConfig>${jetty6Deployer}</deploymentConfig>
+                        <deploymentConfig>${jetty7Deployer}</deploymentConfig>
                         <deploymentConfig>${jasperDeployer}</deploymentConfig>
                         <deploymentConfig>${openejbDeployer}</deploymentConfig>
                         <deploymentConfig>${jpaDeployer}</deploymentConfig>
@@ -190,6 +190,7 @@
                             <!-- The following doesn't work with c-m-p in 2.1.3
                             <obsoletes>org.apache.geronimo.daytrader/daytrader//car</obsoletes>
                             <obsoletes>org.apache.geronimo.daytrader/daytrader-jetty//car</obsoletes>
+                            <obsoletes>org.apache.geronimo.daytrader.plugins/daytrader-jetty//car</obsoletes>
                             -->
                        </plugin-artifact>
                     </instance>

Modified: geronimo/daytrader/trunk/plugins/daytrader-jms/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/daytrader/trunk/plugins/daytrader-jms/pom.xml?rev=808905&r1=808577&r2=808905&view=diff
==============================================================================
--- geronimo/daytrader/trunk/plugins/daytrader-jms/pom.xml (original)
+++ geronimo/daytrader/trunk/plugins/daytrader-jms/pom.xml Fri Aug 28 14:43:22 2009
@@ -23,13 +23,13 @@
 
     <parent>
         <groupId>org.apache.geronimo.daytrader</groupId>
-        <artifactId>daytrader</artifactId>
+        <artifactId>plugins</artifactId>
         <version>2.2-SNAPSHOT</version>
     </parent>
 
-  <groupId>org.apache.geronimo.daytrader</groupId>
-  <artifactId>daytrader-jms</artifactId>
-  <name>Daytrader :: JMS Resource</name>
+    <groupId>org.apache.geronimo.daytrader.plugins</groupId>
+    <artifactId>daytrader-jms</artifactId>
+    <name>Daytrader :: JMS Resource</name>
     <packaging>car</packaging>
     <version>2.2-SNAPSHOT</version>
 
@@ -70,17 +70,17 @@
         </dependency>
     </dependencies>
   <build>
-    <plugins>
-      <plugin>
-        <groupId>org.apache.geronimo.buildsupport</groupId>
-        <artifactId>car-maven-plugin</artifactId>
-                <!-- Install as extention to allow 'car' packaging to be used. -->
-                <extensions>true</extensions>
-          <configuration>
-                    <archive>
-                        <!-- Do not include META-INF/maven to avoid long file problems
on windows -->
-                        <addMavenDescriptor>false</addMavenDescriptor>
-                    </archive>
+      <plugins>
+          <plugin>
+              <groupId>org.apache.geronimo.buildsupport</groupId>
+              <artifactId>car-maven-plugin</artifactId>
+              <!-- Install as extention to allow 'car' packaging to be used. -->
+              <extensions>true</extensions>
+              <configuration>
+                  <archive>
+                      <!-- Do not include META-INF/maven to avoid long file problems on
windows -->
+                       <addMavenDescriptor>false</addMavenDescriptor>
+                   </archive>
                     <osiApproved>true</osiApproved>
                     <useMavenDependencies>
                         <value>true</value>
@@ -110,6 +110,7 @@
                             <!-- The following doesn't work with c-m-p in 2.1.3
                             <obsoletes>org.apache.geronimo.daytrader/daytrader//car</obsoletes>
                             <obsoletes>org.apache.geronimo.daytrader/daytrader-jms//car</obsoletes>
+                            <obsoletes>org.apache.geronimo.daytrader.plugins/daytrader-jms//car</obsoletes>
                             -->
                         </plugin-artifact>
               </instance>

Modified: geronimo/daytrader/trunk/plugins/daytrader-oracle-datasource/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/daytrader/trunk/plugins/daytrader-oracle-datasource/pom.xml?rev=808905&r1=808577&r2=808905&view=diff
==============================================================================
--- geronimo/daytrader/trunk/plugins/daytrader-oracle-datasource/pom.xml (original)
+++ geronimo/daytrader/trunk/plugins/daytrader-oracle-datasource/pom.xml Fri Aug 28 14:43:22
2009
@@ -19,12 +19,12 @@
 <!-- $Rev$ $Date$ -->
 <project>
     <parent>
-        <artifactId>daytrader</artifactId>
         <groupId>org.apache.geronimo.daytrader</groupId>
+        <artifactId>plugins</artifactId>
         <version>2.2-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
-    <groupId>org.apache.geronimo.daytrader</groupId>
+    <groupId>org.apache.geronimo.daytrader.plugins</groupId>
     <artifactId>daytrader-oracle-datasource</artifactId>
     <packaging>car</packaging>
     <name>Daytrader :: Oracle DataSource</name>
@@ -103,11 +103,13 @@
                     </commonInstance>
                     <instance>
                         <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>
+                            <artifact-alias key="org.apache.geronimo.daytrader.plugins/daytrader-derby-database/${version}/car">org.apache.geronimo.daytrader.plugins/daytrader-oracle-database/${version}/car</artifact-alias>
                             <!-- The following doesn't work with c-m-p in 2.1.3
                             <obsoletes>org.apache.geronimo.daytrader/daytrader//car</obsoletes>
                             <obsoletes>org.apache.geronimo.daytrader/daytrader-derby-datasource//car</obsoletes>
+                            <obsoletes>org.apache.geronimo.daytrader.plugins/daytrader-derby-datasource//car</obsoletes>
                             <obsoletes>org.apache.geronimo.daytrader/daytrader-oracle-datasource//car</obsoletes>
+                            <obsoletes>org.apache.geronimo.daytrader.plugins/daytrader-oracle-datasource//car</obsoletes>
                             -->
                         </plugin-artifact>
                     </instance>

Modified: geronimo/daytrader/trunk/plugins/daytrader-tomcat/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/daytrader/trunk/plugins/daytrader-tomcat/pom.xml?rev=808905&r1=808577&r2=808905&view=diff
==============================================================================
--- geronimo/daytrader/trunk/plugins/daytrader-tomcat/pom.xml (original)
+++ geronimo/daytrader/trunk/plugins/daytrader-tomcat/pom.xml Fri Aug 28 14:43:22 2009
@@ -19,12 +19,12 @@
 <!-- $Rev$ $Date$ -->
 <project>
     <parent>
-        <artifactId>daytrader</artifactId>
         <groupId>org.apache.geronimo.daytrader</groupId>
+        <artifactId>plugins</artifactId>
         <version>2.2-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
-    <groupId>org.apache.geronimo.daytrader</groupId>
+    <groupId>org.apache.geronimo.daytrader.plugins</groupId>
     <artifactId>daytrader-tomcat</artifactId>
     <packaging>car</packaging>
     <name>Daytrader :: Tomcat</name>
@@ -38,13 +38,13 @@
             <scope>provided</scope>
         </dependency>
         <dependency>
-            <groupId>org.apache.geronimo.daytrader</groupId>
+            <groupId>org.apache.geronimo.daytrader.plugins</groupId>
             <artifactId>daytrader-derby-datasource</artifactId>
             <version>${version}</version>
             <type>car</type>
         </dependency>
         <dependency>
-            <groupId>org.apache.geronimo.daytrader</groupId>
+            <groupId>org.apache.geronimo.daytrader.plugins</groupId>
             <artifactId>daytrader-jms</artifactId>
             <version>${version}</version>
             <type>car</type>
@@ -135,7 +135,7 @@
             <version>${geronimoVersion}</version>
             <type>car</type>
         </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>
@@ -188,6 +188,7 @@
                             <!-- The following doesn't work with c-m-p in 2.1.3
                             <obsoletes>org.apache.geronimo.daytrader/daytrader//car</obsoletes>
                             <obsoletes>org.apache.geronimo.daytrader/daytrader-tomcat//car</obsoletes>
+                            <obsoletes>org.apache.geronimo.daytrader.plugins/daytrader-tomcat//car</obsoletes>
                             -->
                         </plugin-artifact>
                     </instance>

Modified: geronimo/daytrader/trunk/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/daytrader/trunk/pom.xml?rev=808905&r1=808904&r2=808905&view=diff
==============================================================================
--- geronimo/daytrader/trunk/pom.xml (original)
+++ geronimo/daytrader/trunk/pom.xml Fri Aug 28 14:43:22 2009
@@ -26,7 +26,7 @@
     </parent>
 
     <groupId>org.apache.geronimo.daytrader</groupId>
-    <artifactId>daytrader</artifactId>
+    <artifactId>daytrader-parent</artifactId>
     <name>DayTrader :: Performance Benchmark Sample</name>
     <packaging>pom</packaging>
     <version>2.2-SNAPSHOT</version>
@@ -50,7 +50,7 @@
         <cxfDeployer>org.apache.geronimo.configs/cxf-deployer/${geronimoVersion}/car</cxfDeployer>
         <axis2Deployer>org.apache.geronimo.configs/axis2-deployer/${geronimoVersion}/car</axis2Deployer>
         <tomcatDeployer>org.apache.geronimo.configs/tomcat6-deployer/${geronimoVersion}/car</tomcatDeployer>
-        <jetty6Deployer>org.apache.geronimo.configs/jetty6-deployer/${geronimoVersion}/car</jetty6Deployer>
+        <jetty7Deployer>org.apache.geronimo.configs/jetty7-deployer/${geronimoVersion}/car</jetty7Deployer>
         <jasperDeployer>org.apache.geronimo.configs/jasper-deployer/${geronimoVersion}/car</jasperDeployer>
         <jpaDeployer>org.apache.geronimo.configs/persistence-jpa10-deployer/${geronimoVersion}/car</jpaDeployer>
     </properties>
@@ -141,14 +141,7 @@
     </organization>
 
     <modules>
-        <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>modules</module>
         <!-- c-m-p built plugins -->
         <module>daytrader-derby-datasource</module>
         <!-- see profiles -->
@@ -208,7 +201,7 @@
                             <assembly>
                                 <id>jetty</id>
                                 <groupId>org.apache.geronimo.assemblies</groupId>
-                                <artifactId>geronimo-jetty6-javaee5</artifactId>
+                                <artifactId>geronimo-jetty7-javaee5</artifactId>
                                 <version>${geronimoVersion}</version>
                                 <classifier>bin</classifier>
                                 <type>zip</type>
@@ -217,7 +210,7 @@
                             <assembly>
                                 <id>jetty-minimal</id>
                                 <groupId>org.apache.geronimo.assemblies</groupId>
-                                <artifactId>geronimo-jetty6-minimal</artifactId>
+                                <artifactId>geronimo-jetty7-minimal</artifactId>
                                 <version>${geronimoVersion}</version>
                                 <classifier>bin</classifier>
                                 <type>zip</type>



Mime
View raw message