geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jb...@apache.org
Subject svn commit: r890821 - in /geronimo/sandbox/jbohn/daytrader-bp-new/assemblies/web/daytrader-war: pom.xml src/main/java/org/ src/main/webapp/WEB-INF/geronimo-web.xml
Date Tue, 15 Dec 2009 15:15:54 GMT
Author: jbohn
Date: Tue Dec 15 15:15:51 2009
New Revision: 890821

URL: http://svn.apache.org/viewvc?rev=890821&view=rev
Log:
move web java parts back into the war itself instead of the contained jar to prepare to eliminate
the daytrader-web module - part 2

Added:
    geronimo/sandbox/jbohn/daytrader-bp-new/assemblies/web/daytrader-war/src/main/java/org/
      - copied from r890485, geronimo/sandbox/jbohn/daytrader-bp-new/modules/daytrader-web/src/main/java/org/
Modified:
    geronimo/sandbox/jbohn/daytrader-bp-new/assemblies/web/daytrader-war/pom.xml
    geronimo/sandbox/jbohn/daytrader-bp-new/assemblies/web/daytrader-war/src/main/webapp/WEB-INF/geronimo-web.xml

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=890821&r1=890820&r2=890821&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 Tue Dec 15
15:15:51 2009
@@ -57,11 +57,30 @@
             <scope>provided</scope>
         </dependency>
         <dependency>
-            <groupId>org.apache.geronimo.daytrader.modules</groupId>
-            <artifactId>daytrader-web</artifactId>
-            <version>${version}</version>
+            <groupId>org.apache.geronimo.specs</groupId>
+            <artifactId>geronimo-jpa_1.0_spec</artifactId>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.geronimo.specs</groupId>
+            <artifactId>geronimo-ejb_3.0_spec</artifactId>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.geronimo.specs</groupId>
+            <artifactId>geronimo-jta_1.1_spec</artifactId>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.geronimo.specs</groupId>
+            <artifactId>geronimo-jms_1.1_spec</artifactId>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.geronimo.specs</groupId>
+            <artifactId>geronimo-annotation_1.0_spec</artifactId>
+            <scope>provided</scope>
         </dependency>
-
         <!-- web container provided specs -->
         <dependency>
             <groupId>org.apache.geronimo.specs</groupId>
@@ -78,7 +97,6 @@
             <artifactId>jstl</artifactId>
             <scope>provided</scope>
         </dependency>
-
         <!-- test depends -->
         <dependency>
             <groupId>junit</groupId>

Modified: geronimo/sandbox/jbohn/daytrader-bp-new/assemblies/web/daytrader-war/src/main/webapp/WEB-INF/geronimo-web.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/jbohn/daytrader-bp-new/assemblies/web/daytrader-war/src/main/webapp/WEB-INF/geronimo-web.xml?rev=890821&r1=890820&r2=890821&view=diff
==============================================================================
--- geronimo/sandbox/jbohn/daytrader-bp-new/assemblies/web/daytrader-war/src/main/webapp/WEB-INF/geronimo-web.xml
(original)
+++ geronimo/sandbox/jbohn/daytrader-bp-new/assemblies/web/daytrader-war/src/main/webapp/WEB-INF/geronimo-web.xml
Tue Dec 15 15:15:51 2009
@@ -24,8 +24,8 @@
         <sys:environment>
             <sys:moduleId>
                 <sys:groupId>org.apache.geronimo.daytrader.assemblies.web</sys:groupId>
-                <sys:artifactId>daytrader-web-jdbc</sys:artifactId>
-                <sys:version>2.2</sys:version>
+                <sys:artifactId>daytrader-war</sys:artifactId>
+                <sys:version>1.0.0</sys:version>
                 <sys:type>war</sys:type>
             </sys:moduleId>
         



Mime
View raw message