geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From pra...@apache.org
Subject svn commit: r508080 - in /geronimo/samples/trunk/geronimo-samples-archetype/src/main/resources/archetype-resources: sample-ear/pom.xml sample-ejb/pom.xml sample-war/pom.xml
Date Thu, 15 Feb 2007 19:06:57 GMT
Author: prasad
Date: Thu Feb 15 11:06:57 2007
New Revision: 508080

URL: http://svn.apache.org/viewvc?view=rev&rev=508080
Log:
* fix errors in ${artifactId} resolution

Modified:
    geronimo/samples/trunk/geronimo-samples-archetype/src/main/resources/archetype-resources/sample-ear/pom.xml
    geronimo/samples/trunk/geronimo-samples-archetype/src/main/resources/archetype-resources/sample-ejb/pom.xml
    geronimo/samples/trunk/geronimo-samples-archetype/src/main/resources/archetype-resources/sample-war/pom.xml

Modified: geronimo/samples/trunk/geronimo-samples-archetype/src/main/resources/archetype-resources/sample-ear/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/geronimo-samples-archetype/src/main/resources/archetype-resources/sample-ear/pom.xml?view=diff&rev=508080&r1=508079&r2=508080
==============================================================================
--- geronimo/samples/trunk/geronimo-samples-archetype/src/main/resources/archetype-resources/sample-ear/pom.xml
(original)
+++ geronimo/samples/trunk/geronimo-samples-archetype/src/main/resources/archetype-resources/sample-ear/pom.xml
Thu Feb 15 11:06:57 2007
@@ -38,18 +38,18 @@
     <description>Geronimo Samples. EAR Module</description>
 
     <dependencies>
-        <dependency>
-            <groupId>${pom.groupId}</groupId>
-            <artifactId>${pom.artifactId}-ejb</artifactId>
+      <dependency>
+            <groupId>${groupId}</groupId>
+            <artifactId>${artifactId}-war</artifactId>
             <version>${version}</version>
-            <type>ejb</type>
+            <type>war</type>
         </dependency>
-        
+
         <dependency>
-            <groupId>${pom.groupId}</groupId>
-            <artifactId>$(pom.artifactId}-war</artifactId>
-            <version>${pom.version}</version>
-            <type>war</type>
+            <groupId>${groupId}</groupId>
+            <artifactId>${artifactId}-ejb</artifactId>
+            <version>${version}</version>
+            <type>ejb</type>
         </dependency>
     </dependencies>
 
@@ -62,18 +62,18 @@
                     <description>Geronimo Sample EAR for Stateless Session</description>
                     <version>5</version>
                     <modules>
+                      <ejbModule>
+                            <groupId>${groupId}</groupId>
+                            <artifactId>${artifactId}-ejb</artifactId>
+                            <bundleFileName>${artifactId}-ejb-${version}.jar</bundleFileName>
+                        </ejbModule>
+
                         <webModule>
-                            <groupId>${pom.groupId}</groupId>
-                            <artifactId>$(pom.artifactId}-war</artifactId>
+                            <groupId>${groupId}</groupId>
+                            <artifactId>${artifactId}-war</artifactId>
                             <contextRoot>/${artifactId}</contextRoot>
-                            <bundleFileName>$(pom.artifactId}-war-${pom.version}.war</bundleFileName>
+                            <bundleFileName>${artifactId}-war-${version}.war</bundleFileName>
                         </webModule>
-
-                        <ejbModule>
-                            <groupId>${pom.groupId}</groupId>
-                            <artifactId>${pom.artifactId}-ejb</artifactId>
-                            <bundleFileName>${pom.artifactId}-ejb-${pom.version}.jar</bundleFileName>
-                        </ejbModule>
                     </modules>
                 </configuration>
             </plugin>

Modified: geronimo/samples/trunk/geronimo-samples-archetype/src/main/resources/archetype-resources/sample-ejb/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/geronimo-samples-archetype/src/main/resources/archetype-resources/sample-ejb/pom.xml?view=diff&rev=508080&r1=508079&r2=508080
==============================================================================
--- geronimo/samples/trunk/geronimo-samples-archetype/src/main/resources/archetype-resources/sample-ejb/pom.xml
(original)
+++ geronimo/samples/trunk/geronimo-samples-archetype/src/main/resources/archetype-resources/sample-ejb/pom.xml
Thu Feb 15 11:06:57 2007
@@ -32,7 +32,7 @@
     </parent>
 
     <artifactId>${artifactId}-ejb</artifactId>
-    <name>Geronimo Samples :: ${artifactId} :: EJB JAR</name>
+    <name>Geronimo Samples :: ${artifactId} :: EJB</name>
     <packaging>jar</packaging>
 
     <description>Geronimo Samples. EJB Module</description>

Modified: geronimo/samples/trunk/geronimo-samples-archetype/src/main/resources/archetype-resources/sample-war/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/geronimo-samples-archetype/src/main/resources/archetype-resources/sample-war/pom.xml?view=diff&rev=508080&r1=508079&r2=508080
==============================================================================
--- geronimo/samples/trunk/geronimo-samples-archetype/src/main/resources/archetype-resources/sample-war/pom.xml
(original)
+++ geronimo/samples/trunk/geronimo-samples-archetype/src/main/resources/archetype-resources/sample-war/pom.xml
Thu Feb 15 11:06:57 2007
@@ -32,16 +32,16 @@
     </parent>
 
     <artifactId>${artifactId}-war</artifactId>
-    <name>Geronimo Samples :: ${artifactId} :: Samples WAR</name>
+    <name>Geronimo Samples :: ${artifactId} :: WAR</name>
     <packaging>war</packaging>
 
     <description>Geronimo Samples. WEB Module</description>
 
     <dependencies>
         <dependency>
-            <groupId>${pom.groupId}</groupId>
-            <artifactId>${pom.artifactId}-ejb</artifactId>
-            <version>${pom.version}</version>
+            <groupId>${groupId}</groupId>
+            <artifactId>${artifactId}-ejb</artifactId>
+            <version>${version}</version>
             <scope>provided</scope>
         </dependency>
     </dependencies>
@@ -61,7 +61,7 @@
                         <configuration>
                             <tasks>
                               <echo>Copying site directory from parent</echo>
-                                <copy todir="${project.build.directory}/${pom.artifactId}-${pom.version}"
failonerror="false" overwrite="true">
+                                <copy todir="${project.build.directory}/${pom.artifactId}-${version}"
failonerror="false" overwrite="true">
                                     <fileset dir="${pom.basedir}/../target/site"/>
                                 </copy>
                             </tasks>



Mime
View raw message