You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by jb...@apache.org on 2010/01/07 20:18:04 UTC

svn commit: r896971 - in /geronimo/sandbox/jbohn/daytrader-bp-new: assemblies/web/ assemblies/web/daytrader-eba-jdbc/ assemblies/web/daytrader-eba-jdbc/src/main/resources/META-INF/ assemblies/web/daytrader-eba-jpa/ assemblies/web/daytrader-eba-jpa/src/...

Author: jbohn
Date: Thu Jan  7 19:18:03 2010
New Revision: 896971

URL: http://svn.apache.org/viewvc?rev=896971&view=rev
Log:
move war from assemblies to modules and rename

Added:
    geronimo/sandbox/jbohn/daytrader-bp-new/modules/daytrader-web/
      - copied from r896957, geronimo/sandbox/jbohn/daytrader-bp-new/assemblies/web/daytrader-war/
Removed:
    geronimo/sandbox/jbohn/daytrader-bp-new/assemblies/web/daytrader-war/
Modified:
    geronimo/sandbox/jbohn/daytrader-bp-new/assemblies/web/daytrader-eba-jdbc/pom.xml
    geronimo/sandbox/jbohn/daytrader-bp-new/assemblies/web/daytrader-eba-jdbc/src/main/resources/META-INF/APPLICATION.MF
    geronimo/sandbox/jbohn/daytrader-bp-new/assemblies/web/daytrader-eba-jpa/pom.xml
    geronimo/sandbox/jbohn/daytrader-bp-new/assemblies/web/daytrader-eba-jpa/src/main/resources/META-INF/APPLICATION.MF
    geronimo/sandbox/jbohn/daytrader-bp-new/assemblies/web/pom.xml
    geronimo/sandbox/jbohn/daytrader-bp-new/modules/daytrader-web/pom.xml
    geronimo/sandbox/jbohn/daytrader-bp-new/modules/pom.xml

Modified: geronimo/sandbox/jbohn/daytrader-bp-new/assemblies/web/daytrader-eba-jdbc/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/jbohn/daytrader-bp-new/assemblies/web/daytrader-eba-jdbc/pom.xml?rev=896971&r1=896970&r2=896971&view=diff
==============================================================================
--- geronimo/sandbox/jbohn/daytrader-bp-new/assemblies/web/daytrader-eba-jdbc/pom.xml (original)
+++ geronimo/sandbox/jbohn/daytrader-bp-new/assemblies/web/daytrader-eba-jdbc/pom.xml Thu Jan  7 19:18:03 2010
@@ -58,8 +58,8 @@
             <version>${version}</version>
         </dependency>
         <dependency>
-            <groupId>org.apache.geronimo.daytrader.assemblies.web</groupId>
-            <artifactId>daytrader-war</artifactId>
+            <groupId>org.apache.geronimo.daytrader.modules</groupId>
+            <artifactId>daytrader-web</artifactId>
             <version>${version}</version>
             <type>war</type>
         </dependency>
@@ -106,8 +106,8 @@
                               <outputDirectory>${project.build.directory}/eba-jars</outputDirectory>
                             </artifactItem>
                             <artifactItem>
-                                <groupId>org.apache.geronimo.daytrader.assemblies.web</groupId>
-                                <artifactId>daytrader-war</artifactId>
+                                <groupId>org.apache.geronimo.daytrader.modules</groupId>
+                                <artifactId>daytrader-web</artifactId>
                                 <type>war</type>
                                 <outputDirectory>${project.build.directory}/eba-jars</outputDirectory>
                             </artifactItem>

Modified: geronimo/sandbox/jbohn/daytrader-bp-new/assemblies/web/daytrader-eba-jdbc/src/main/resources/META-INF/APPLICATION.MF
URL: http://svn.apache.org/viewvc/geronimo/sandbox/jbohn/daytrader-bp-new/assemblies/web/daytrader-eba-jdbc/src/main/resources/META-INF/APPLICATION.MF?rev=896971&r1=896970&r2=896971&view=diff
==============================================================================
--- geronimo/sandbox/jbohn/daytrader-bp-new/assemblies/web/daytrader-eba-jdbc/src/main/resources/META-INF/APPLICATION.MF (original)
+++ geronimo/sandbox/jbohn/daytrader-bp-new/assemblies/web/daytrader-eba-jdbc/src/main/resources/META-INF/APPLICATION.MF Thu Jan  7 19:18:03 2010
@@ -7,5 +7,5 @@
  org.apache.geronimo.daytrader.modules.daytrader-entities;version=1.0.0,
  org.apache.geronimo.daytrader.modules.daytrader-core;version=1.0.0,
  org.apache.geronimo.daytrader.modules.daytrader-persist-jdbc;version=1.0.0,
- daytrader-war;version=1.0.0
+ daytrader-web;version=1.0.0
 

Modified: geronimo/sandbox/jbohn/daytrader-bp-new/assemblies/web/daytrader-eba-jpa/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/jbohn/daytrader-bp-new/assemblies/web/daytrader-eba-jpa/pom.xml?rev=896971&r1=896970&r2=896971&view=diff
==============================================================================
--- geronimo/sandbox/jbohn/daytrader-bp-new/assemblies/web/daytrader-eba-jpa/pom.xml (original)
+++ geronimo/sandbox/jbohn/daytrader-bp-new/assemblies/web/daytrader-eba-jpa/pom.xml Thu Jan  7 19:18:03 2010
@@ -63,8 +63,8 @@
             <version>${version}</version>
         </dependency>
         <dependency>
-            <groupId>org.apache.geronimo.daytrader.assemblies.web</groupId>
-            <artifactId>daytrader-war</artifactId>
+            <groupId>org.apache.geronimo.daytrader.modules</groupId>
+            <artifactId>daytrader-web</artifactId>
             <version>${version}</version>
             <type>war</type>
         </dependency>
@@ -116,8 +116,8 @@
                               <outputDirectory>${project.build.directory}/eba-jars</outputDirectory>
                             </artifactItem>
                             <artifactItem>
-                                <groupId>org.apache.geronimo.daytrader.assemblies.web</groupId>
-                                <artifactId>daytrader-war</artifactId>
+                                <groupId>org.apache.geronimo.daytrader.modules</groupId>
+                                <artifactId>daytrader-web</artifactId>
                                 <type>war</type>
                                 <outputDirectory>${project.build.directory}/eba-jars</outputDirectory>
                             </artifactItem>

Modified: geronimo/sandbox/jbohn/daytrader-bp-new/assemblies/web/daytrader-eba-jpa/src/main/resources/META-INF/APPLICATION.MF
URL: http://svn.apache.org/viewvc/geronimo/sandbox/jbohn/daytrader-bp-new/assemblies/web/daytrader-eba-jpa/src/main/resources/META-INF/APPLICATION.MF?rev=896971&r1=896970&r2=896971&view=diff
==============================================================================
--- geronimo/sandbox/jbohn/daytrader-bp-new/assemblies/web/daytrader-eba-jpa/src/main/resources/META-INF/APPLICATION.MF (original)
+++ geronimo/sandbox/jbohn/daytrader-bp-new/assemblies/web/daytrader-eba-jpa/src/main/resources/META-INF/APPLICATION.MF Thu Jan  7 19:18:03 2010
@@ -8,5 +8,5 @@
  org.apache.geronimo.daytrader.modules.daytrader-core;version=1.0.0,
  org.apache.geronimo.daytrader.modules.daytrader-persist-jdbc;version=1.0.0,
  org.apache.geronimo.daytrader.modules.daytrader-persist-jpa;version=1.0.0,
- daytrader-war;version=1.0.0
+ daytrader-web;version=1.0.0
 

Modified: geronimo/sandbox/jbohn/daytrader-bp-new/assemblies/web/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/jbohn/daytrader-bp-new/assemblies/web/pom.xml?rev=896971&r1=896970&r2=896971&view=diff
==============================================================================
--- geronimo/sandbox/jbohn/daytrader-bp-new/assemblies/web/pom.xml (original)
+++ geronimo/sandbox/jbohn/daytrader-bp-new/assemblies/web/pom.xml Thu Jan  7 19:18:03 2010
@@ -31,7 +31,6 @@
     <packaging>pom</packaging>
 
     <modules>
-        <module>daytrader-war</module>
         <module>daytrader-eba-jdbc</module>
         <module>daytrader-eba-jpa</module>
     </modules>

Modified: geronimo/sandbox/jbohn/daytrader-bp-new/modules/daytrader-web/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/jbohn/daytrader-bp-new/modules/daytrader-web/pom.xml?rev=896971&r1=896957&r2=896971&view=diff
==============================================================================
--- geronimo/sandbox/jbohn/daytrader-bp-new/modules/daytrader-web/pom.xml (original)
+++ geronimo/sandbox/jbohn/daytrader-bp-new/modules/daytrader-web/pom.xml Thu Jan  7 19:18:03 2010
@@ -20,16 +20,16 @@
     <modelVersion>4.0.0</modelVersion>
     
     <parent>
-        <groupId>org.apache.geronimo.daytrader.assemblies</groupId>
-        <artifactId>web</artifactId>
+        <groupId>org.apache.geronimo.daytrader</groupId>
+        <artifactId>modules</artifactId>
         <version>1.0.0</version>
     </parent>
     
-    <groupId>org.apache.geronimo.daytrader.assemblies.web</groupId>
-    <artifactId>daytrader-war</artifactId>    
+    <groupId>org.apache.geronimo.daytrader.modules</groupId>
+    <artifactId>daytrader-web</artifactId>    
     <packaging>war</packaging>
-    <name>DayTrader :: Assemblies - WAR file </name>
-    <description>A version of Daytrader for basic Web constainers</description>
+    <name>DayTrader :: Modules - Web </name>
+    <description>A version of Daytrader for basic Web containers</description>
     
     <dependencies>
         <dependency>

Modified: geronimo/sandbox/jbohn/daytrader-bp-new/modules/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/jbohn/daytrader-bp-new/modules/pom.xml?rev=896971&r1=896970&r2=896971&view=diff
==============================================================================
--- geronimo/sandbox/jbohn/daytrader-bp-new/modules/pom.xml (original)
+++ geronimo/sandbox/jbohn/daytrader-bp-new/modules/pom.xml Thu Jan  7 19:18:03 2010
@@ -38,6 +38,7 @@
         <module>daytrader-core</module>
         <module>daytrader-persist-jdbc</module>
         <module>daytrader-persist-jpa</module>
+        <module>daytrader-web</module>
     </modules>
 
 </project>