geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From viol...@apache.org
Subject svn commit: r1148158 - in /geronimo/daytrader/trunk: javaee6/assemblies/daytrader-ear/pom.xml javaee6/modules/core/ javaee6/modules/pom.xml javaee6/modules/web/pom.xml pom.xml
Date Tue, 19 Jul 2011 04:49:35 GMT
Author: violalu
Date: Tue Jul 19 04:49:34 2011
New Revision: 1148158

URL: http://svn.apache.org/viewvc?rev=1148158&view=rev
Log:
refactor daytrader

Removed:
    geronimo/daytrader/trunk/javaee6/modules/core/
Modified:
    geronimo/daytrader/trunk/javaee6/assemblies/daytrader-ear/pom.xml
    geronimo/daytrader/trunk/javaee6/modules/pom.xml
    geronimo/daytrader/trunk/javaee6/modules/web/pom.xml
    geronimo/daytrader/trunk/pom.xml

Modified: geronimo/daytrader/trunk/javaee6/assemblies/daytrader-ear/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/daytrader/trunk/javaee6/assemblies/daytrader-ear/pom.xml?rev=1148158&r1=1148157&r2=1148158&view=diff
==============================================================================
--- geronimo/daytrader/trunk/javaee6/assemblies/daytrader-ear/pom.xml (original)
+++ geronimo/daytrader/trunk/javaee6/assemblies/daytrader-ear/pom.xml Tue Jul 19 04:49:34
2011
@@ -19,11 +19,7 @@
     <dependency>
             <groupId>org.apache.geronimo.daytrader.javaee6</groupId>
             <artifactId>utils</artifactId>            
-        </dependency>
-        <dependency>
-            <groupId>org.apache.geronimo.daytrader.javaee6</groupId>
-            <artifactId>core</artifactId>            
-        </dependency>
+        </dependency>       
         <dependency>
             <groupId>org.apache.geronimo.daytrader.javaee6</groupId>
             <artifactId>entities</artifactId>
@@ -31,7 +27,6 @@
            <dependency>
             <groupId>org.apache.geronimo.daytrader.javaee6</groupId>
             <artifactId>web</artifactId>
-            <version>${project.version}</version>    
             <type>war</type>
         </dependency>
         </dependencies>
@@ -48,20 +43,12 @@
                         <javaModule>
                             <groupId>org.apache.geronimo.daytrader.javaee6</groupId>
                             <artifactId>utils</artifactId>
-                            <bundleFileName>util.jar</bundleFileName>
-                            <includeInApplicationXml>false</includeInApplicationXml>
-                        </javaModule>
-                        <javaModule>
-                            <groupId>org.apache.geronimo.daytrader.javaee6</groupId>
-                            <artifactId>core</artifactId>
-                            <bundleFileName>core.jar</bundleFileName>
-                            <includeInApplicationXml>false</includeInApplicationXml>
-                        </javaModule>
+                             <uri>lib/utils.jar</uri>
+                        </javaModule>                       
                         <javaModule>
                             <groupId>org.apache.geronimo.daytrader.javaee6</groupId>
                             <artifactId>entities</artifactId>
-                            <bundleFileName>entities.jar</bundleFileName>
-                            <includeInApplicationXml>false</includeInApplicationXml>
+                             <uri>lib/entities.jar</uri>
                         </javaModule> 
                         <webModule>
                             <groupId>org.apache.geronimo.daytrader.javaee6</groupId>

Modified: geronimo/daytrader/trunk/javaee6/modules/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/daytrader/trunk/javaee6/modules/pom.xml?rev=1148158&r1=1148157&r2=1148158&view=diff
==============================================================================
--- geronimo/daytrader/trunk/javaee6/modules/pom.xml (original)
+++ geronimo/daytrader/trunk/javaee6/modules/pom.xml Tue Jul 19 04:49:34 2011
@@ -16,10 +16,8 @@
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
   </properties>
   <modules>
-    <module>entities</module>
-    <!--<module>ejb3</module>-->
-    <module>utils</module>
-    <module>core</module>
+    <module>entities</module>   
+    <module>utils</module>    
     <module>web</module>
   </modules>
 </project>
\ No newline at end of file

Modified: geronimo/daytrader/trunk/javaee6/modules/web/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/daytrader/trunk/javaee6/modules/web/pom.xml?rev=1148158&r1=1148157&r2=1148158&view=diff
==============================================================================
--- geronimo/daytrader/trunk/javaee6/modules/web/pom.xml (original)
+++ geronimo/daytrader/trunk/javaee6/modules/web/pom.xml Tue Jul 19 04:49:34 2011
@@ -23,20 +23,12 @@
         </dependency>
         <dependency>
             <groupId>org.apache.geronimo.daytrader.javaee6</groupId>
-            <artifactId>utils</artifactId>     
-            <version>${project.version}</version>  
+            <artifactId>utils</artifactId>            
              <scope>provided</scope>          
-        </dependency>
-        <dependency>
-            <groupId>org.apache.geronimo.daytrader.javaee6</groupId>
-            <artifactId>core</artifactId>
-            <version>${project.version}</version> 
-             <scope>provided</scope>    
-        </dependency>
+        </dependency>        
         <dependency>
             <groupId>org.apache.geronimo.daytrader.javaee6</groupId>
-            <artifactId>entities</artifactId>           
-            <version>${project.version}</version> 
+            <artifactId>entities</artifactId>            
              <scope>provided</scope>    
         </dependency>
                
@@ -101,12 +93,7 @@
         <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-war-plugin</artifactId>
-                <configuration>
-                    <archive>
-                        <manifestEntries>
-                            <Class-Path>util.jar core.jar entities.jar</Class-Path>
-                        </manifestEntries>
-                    </archive>
+                <configuration>                    
                     <resources>
                         <resource
                                 implementation="org.apache.maven.model.Resource">

Modified: geronimo/daytrader/trunk/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/daytrader/trunk/pom.xml?rev=1148158&r1=1148157&r2=1148158&view=diff
==============================================================================
--- geronimo/daytrader/trunk/pom.xml (original)
+++ geronimo/daytrader/trunk/pom.xml Tue Jul 19 04:49:34 2011
@@ -237,15 +237,6 @@
                     <version>${project.version}</version>
                     <scope>provided</scope>            
                 </dependency>
-                
-                <dependency>
-                        <groupId>org.apache.geronimo.daytrader.javaee6</groupId>
-                    <artifactId>core</artifactId>
-                    <version>${project.version}</version>            
-                    <scope>provided</scope>
-                </dependency>                
-               
-                
                 <dependency>
                         <groupId>org.apache.geronimo.daytrader.javaee6</groupId>
                     <artifactId>entities</artifactId>
@@ -255,8 +246,9 @@
                 
                 <dependency>
                         <groupId>org.apache.geronimo.daytrader.javaee6</groupId>
-                    <artifactId>web</artifactId>
-                    <version>${project.version}</version>        
+                    <artifactId>web</artifactId> 
+                    <version>${project.version}</version>
+                    <type>war</type>                     
                     <scope>provided</scope>            
                 </dependency>
                



Mime
View raw message