geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jb...@apache.org
Subject svn commit: r890485 - in /geronimo/sandbox/jbohn/daytrader-bp-new/assemblies/web: ./ daytrader-eba-jdbc/ daytrader-eba-jdbc/src/main/resources/META-INF/ daytrader-eba-jpa/ daytrader-eba-jpa/src/main/resources/META-INF/ daytrader-war/ daytrader-web-jdbc...
Date Mon, 14 Dec 2009 21:29:33 GMT
Author: jbohn
Date: Mon Dec 14 21:29:32 2009
New Revision: 890485

URL: http://svn.apache.org/viewvc?rev=890485&view=rev
Log:
eliminate war assemblies that are duplicate and unnecessary in this environment

Added:
    geronimo/sandbox/jbohn/daytrader-bp-new/assemblies/web/daytrader-war/
      - copied from r890476, geronimo/sandbox/jbohn/daytrader-bp-new/assemblies/web/daytrader-web-jdbc/
Removed:
    geronimo/sandbox/jbohn/daytrader-bp-new/assemblies/web/daytrader-web-jdbc/
    geronimo/sandbox/jbohn/daytrader-bp-new/assemblies/web/daytrader-web-jpa/
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/daytrader-war/pom.xml
    geronimo/sandbox/jbohn/daytrader-bp-new/assemblies/web/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=890485&r1=890484&r2=890485&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 Mon
Dec 14 21:29:32 2009
@@ -59,7 +59,7 @@
         </dependency>
         <dependency>
             <groupId>org.apache.geronimo.daytrader.assemblies.web</groupId>
-            <artifactId>daytrader-web-jdbc</artifactId>
+            <artifactId>daytrader-war</artifactId>
             <version>${version}</version>
             <type>war</type>
         </dependency>
@@ -107,7 +107,7 @@
                             </artifactItem>
                             <artifactItem>
                                 <groupId>org.apache.geronimo.daytrader.assemblies.web</groupId>
-                                <artifactId>daytrader-web-jdbc</artifactId>
+                                <artifactId>daytrader-war</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=890485&r1=890484&r2=890485&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
Mon Dec 14 21:29:32 2009
@@ -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-web-jdbc;version=1.0.0
+ daytrader-war;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=890485&r1=890484&r2=890485&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 Mon Dec
14 21:29:32 2009
@@ -64,7 +64,7 @@
         </dependency>
         <dependency>
             <groupId>org.apache.geronimo.daytrader.assemblies.web</groupId>
-            <artifactId>daytrader-web-jpa</artifactId>
+            <artifactId>daytrader-war</artifactId>
             <version>${version}</version>
             <type>war</type>
         </dependency>
@@ -117,7 +117,7 @@
                             </artifactItem>
                             <artifactItem>
                                 <groupId>org.apache.geronimo.daytrader.assemblies.web</groupId>
-                                <artifactId>daytrader-web-jpa</artifactId>
+                                <artifactId>daytrader-war</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=890485&r1=890484&r2=890485&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
Mon Dec 14 21:29:32 2009
@@ -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-web-jpa;version=1.0.0
+ daytrader-war;version=1.0.0
 

Modified: geronimo/sandbox/jbohn/daytrader-bp-new/assemblies/web/daytrader-war/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/jbohn/daytrader-bp-new/assemblies/web/daytrader-war/pom.xml?rev=890485&r1=890476&r2=890485&view=diff
==============================================================================
--- geronimo/sandbox/jbohn/daytrader-bp-new/assemblies/web/daytrader-war/pom.xml (original)
+++ geronimo/sandbox/jbohn/daytrader-bp-new/assemblies/web/daytrader-war/pom.xml Mon Dec 14
21:29:32 2009
@@ -26,9 +26,9 @@
     </parent>
     
     <groupId>org.apache.geronimo.daytrader.assemblies.web</groupId>
-    <artifactId>daytrader-web-jdbc</artifactId>    
+    <artifactId>daytrader-war</artifactId>    
     <packaging>war</packaging>
-    <name>DayTrader :: Assemblies - Web + Direct JDBC</name>
+    <name>DayTrader :: Assemblies - WAR file </name>
     <description>A version of Daytrader for basic Web constainers</description>
     
     <dependencies>

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=890485&r1=890484&r2=890485&view=diff
==============================================================================
--- geronimo/sandbox/jbohn/daytrader-bp-new/assemblies/web/pom.xml (original)
+++ geronimo/sandbox/jbohn/daytrader-bp-new/assemblies/web/pom.xml Mon Dec 14 21:29:32 2009
@@ -31,8 +31,7 @@
     <packaging>pom</packaging>
 
     <modules>
-        <module>daytrader-web-jdbc</module>
-        <module>daytrader-web-jpa</module>
+        <module>daytrader-war</module>
         <module>daytrader-eba-jdbc</module>
         <module>daytrader-eba-jpa</module>
     </modules>



Mime
View raw message