geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jlaskow...@apache.org
Subject svn commit: r239354 - in /geronimo/trunk/sandbox/petstore: ./ maven.xml project.xml src/plan/opc1.3.2.ear-plan.xml src/plan/petstore1.3.2-jms-ra-plan.xml
Date Tue, 23 Aug 2005 05:49:10 GMT
Author: jlaskowski
Date: Mon Aug 22 22:48:59 2005
New Revision: 239354

URL: http://svn.apache.org/viewcvs?rev=239354&view=rev
Log:

- propset svn:ignore set
- version management improvements


Modified:
    geronimo/trunk/sandbox/petstore/   (props changed)
    geronimo/trunk/sandbox/petstore/maven.xml
    geronimo/trunk/sandbox/petstore/project.xml
    geronimo/trunk/sandbox/petstore/src/plan/opc1.3.2.ear-plan.xml
    geronimo/trunk/sandbox/petstore/src/plan/petstore1.3.2-jms-ra-plan.xml

Propchange: geronimo/trunk/sandbox/petstore/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Mon Aug 22 22:48:59 2005
@@ -0,0 +1,10 @@
+*.iml
+.project
+.classpath
+maven.log
+junit*.properties
+target
+velocity.log
+petstore1.3.2
+
+

Modified: geronimo/trunk/sandbox/petstore/maven.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/sandbox/petstore/maven.xml?rev=239354&r1=239353&r2=239354&view=diff
==============================================================================
--- geronimo/trunk/sandbox/petstore/maven.xml (original)
+++ geronimo/trunk/sandbox/petstore/maven.xml Mon Aug 22 22:48:59 2005
@@ -20,6 +20,7 @@
     xmlns:j="jelly:core"
     xmlns:ant="jelly:ant"
     xmlns:deploy="geronimo:deploy"
+    xmlns:velocity="jelly:velocity"
     >
 
     <j:set var="instDir" value="${maven.build.dir}/geronimo_${geronimo_version}"/>
@@ -41,6 +42,22 @@
             <ant:fileset dir="src/var"/>
         </ant:copy>
 
+		<fileScanner var="plans">
+            <fileset dir="${basedir}/src/plan">
+                <include name="*-plan.xml"/>
+            </fileset>
+        </fileScanner>
+
+        <ant:mkdir dir="${basedir}/target/plan"/>
+        <j:forEach var="plan" items="${plans.iterator()}">
+            <j:set var="planName" value="${plan.name}"/>
+            <echo>Preprocessing ${planName}</echo>
+            <velocity:merge
+                basedir="${basedir}/src/plan"
+                template="${planName}"
+                name="${basedir}/target/plan/${planName}"/>
+        </j:forEach>
+		
         <ant:echo>Building Security Configuration</ant:echo>
         <ant:java fork="true" jar="${instDir}/bin/deployer.jar" failonerror="true">
             <ant:jvmarg value="-ea"/>
@@ -49,7 +66,7 @@
             <ant:arg value="--password"/>
             <ant:arg value="manager"/>
             <ant:arg value="distribute"/>
-            <ant:arg value="src/plan/petstore1.3.2-security-plan.xml"/>
+            <ant:arg value="${basedir}/target/plan/petstore1.3.2-security-plan.xml"/>
         </ant:java>
 
         <ant:echo>Building JMS Configuration</ant:echo>
@@ -60,7 +77,7 @@
             <ant:arg value="--password"/>
             <ant:arg value="manager"/>
             <ant:arg value="distribute"/>
-            <ant:arg value="src/plan/petstore1.3.2-jms-ra-plan.xml"/>
+            <ant:arg value="${basedir}/target/plan/petstore1.3.2-jms-ra-plan.xml"/>
             <ant:arg value="${maven.repo.local}/activemq/rars/activemq-ra-${activemq_version}.rar"/>
         </ant:java>
 
@@ -72,7 +89,7 @@
             <ant:arg value="--password"/>
             <ant:arg value="manager"/>
             <ant:arg value="distribute"/>
-            <ant:arg value="src/plan/petstore1.3.2-db-ra-plan.xml"/>
+            <ant:arg value="${basedir}/target/plan/petstore1.3.2-db-ra-plan.xml"/>
             <ant:arg value="${maven.repo.local}/geronimo/rars/geronimo-derby-connector-${pom.currentVersion}.rar"/>
         </ant:java>
 
@@ -84,7 +101,7 @@
             <ant:arg value="--password"/>
             <ant:arg value="manager"/>
             <ant:arg value="distribute"/>
-            <ant:arg value="src/plan/petstore1.3.2.ear-plan.xml"/>
+            <ant:arg value="${basedir}/target/plan/petstore1.3.2.ear-plan.xml"/>
             <ant:arg value="${petstore.home}/src/apps/petstore/build/petstore.ear"/>
         </ant:java>
 
@@ -96,7 +113,7 @@
             <ant:arg value="--password"/>
             <ant:arg value="manager"/>
             <ant:arg value="distribute"/>
-            <ant:arg value="src/plan/supplier1.3.2.ear-plan.xml"/>
+            <ant:arg value="${basedir}/target/plan/supplier1.3.2.ear-plan.xml"/>
             <ant:arg value="${petstore.home}/src/apps/supplier/build/supplier.ear"/>
         </ant:java>
 
@@ -108,7 +125,7 @@
             <ant:arg value="--password"/>
             <ant:arg value="manager"/>
             <ant:arg value="distribute"/>
-            <ant:arg value="src/plan/opc1.3.2.ear-plan.xml"/>
+            <ant:arg value="${basedir}/target/plan/opc1.3.2.ear-plan.xml"/>
             <ant:arg value="${petstore.home}/src/apps/opc/build/opc.ear"/>
         </ant:java>
 
@@ -120,7 +137,7 @@
             <ant:arg value="--password"/>
             <ant:arg value="manager"/>
             <ant:arg value="distribute"/>
-            <ant:arg value="src/plan/petstoreadmin1.3.2.ear-plan.xml"/>
+            <ant:arg value="${basedir}/target/plan/petstoreadmin1.3.2.ear-plan.xml"/>
             <ant:arg value="${petstore.home}/src/apps/admin/build/petstoreadmin.ear"/>
         </ant:java>
 

Modified: geronimo/trunk/sandbox/petstore/project.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/sandbox/petstore/project.xml?rev=239354&r1=239353&r2=239354&view=diff
==============================================================================
--- geronimo/trunk/sandbox/petstore/project.xml (original)
+++ geronimo/trunk/sandbox/petstore/project.xml Mon Aug 22 22:48:59 2005
@@ -32,12 +32,23 @@
     <dependency>
       <groupId>geronimo</groupId>
       <artifactId>geronimo-derby</artifactId>
-      <version>1.0-SNAPSHOT</version>
+      <version>${pom.currentVersion}</version>
     </dependency>
     <dependency>
       <groupId>org.apache.derby</groupId>
       <artifactId>derby</artifactId>
-      <version>10.1.1.0</version>
+      <version>${derby_version}</version>
+    </dependency>
+    <dependency>
+      <groupId>activemq</groupId>
+      <artifactId>activemq-ra</artifactId>
+	  <version>${activemq_version}</version>
+	  <type>rar</type>
+	</dependency>
+    <dependency>
+        <groupId>geronimo-spec</groupId>
+        <artifactId>geronimo-spec-javamail</artifactId>
+        <version>${geronimo_spec_javamail_version}</version>
     </dependency>
   </dependencies>
   <build>

Modified: geronimo/trunk/sandbox/petstore/src/plan/opc1.3.2.ear-plan.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/sandbox/petstore/src/plan/opc1.3.2.ear-plan.xml?rev=239354&r1=239353&r2=239354&view=diff
==============================================================================
--- geronimo/trunk/sandbox/petstore/src/plan/opc1.3.2.ear-plan.xml (original)
+++ geronimo/trunk/sandbox/petstore/src/plan/opc1.3.2.ear-plan.xml Mon Aug 22 22:48:59 2005
@@ -21,16 +21,16 @@
     configId="org/apache/geronimo/OPC1.3.2">
 
     <dependency>
-        <uri>geronimo/jars/geronimo-common-1.0-SNAPSHOT.jar</uri>
+        <uri>geronimo/jars/geronimo-common-${pom.currentVersion}.jar</uri>
     </dependency>
     <dependency>
-        <uri>geronimo/jars/geronimo-mail-1.0-SNAPSHOT.jar</uri>
+        <uri>geronimo/jars/geronimo-mail-${pom.currentVersion}.jar</uri>
     </dependency>
     <dependency>
-        <uri>geronimo-spec/jars/geronimo-spec-activation-1.0.2-rc4.jar</uri>
+        <uri>geronimo-spec/jars/geronimo-spec-activation-${geronimo_spec_activation_version}.jar</uri>
     </dependency>
     <dependency>
-        <uri>geronimo-spec/jars/geronimo-spec-javamail-1.3.1-rc5.jar</uri>
+        <uri>geronimo-spec/jars/geronimo-spec-javamail-${geronimo_spec_javamail_version}.jar</uri>
     </dependency>
 
     <module>

Modified: geronimo/trunk/sandbox/petstore/src/plan/petstore1.3.2-jms-ra-plan.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/sandbox/petstore/src/plan/petstore1.3.2-jms-ra-plan.xml?rev=239354&r1=239353&r2=239354&view=diff
==============================================================================
--- geronimo/trunk/sandbox/petstore/src/plan/petstore1.3.2-jms-ra-plan.xml (original)
+++ geronimo/trunk/sandbox/petstore/src/plan/petstore1.3.2-jms-ra-plan.xml Mon Aug 22 22:48:59
2005
@@ -21,10 +21,6 @@
     parentId="org/apache/geronimo/SystemJMS" 
     configId="org/apache/geronimo/PetStoreJMS1.3.2">
 
-    <dependency>
-        <uri>activemq/jars/activemq-core-3.1-M5.jar</uri>
-    </dependency>
-    
     <resourceadapter>
         <resourceadapter-instance>
           <resourceadapter-name>PetStore JMS Resources</resourceadapter-name>



Mime
View raw message