Return-Path: 
 <scm-return-8488-apmail-geronimo-scm-archive=geronimo.apache.org@geronimo.apache.org>
Delivered-To: apmail-geronimo-scm-archive@www.apache.org
Received: (qmail 41404 invoked from network); 12 Nov 2005 23:39:56 -0000
Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199)
  by minotaur.apache.org with SMTP; 12 Nov 2005 23:39:56 -0000
Received: (qmail 91278 invoked by uid 500); 12 Nov 2005 23:39:56 -0000
Delivered-To: apmail-geronimo-scm-archive@geronimo.apache.org
Received: (qmail 91246 invoked by uid 500); 12 Nov 2005 23:39:55 -0000
Mailing-List: contact scm-help@geronimo.apache.org; run by ezmlm
Precedence: bulk
list-help: <mailto:scm-help@geronimo.apache.org>
list-unsubscribe: <mailto:scm-unsubscribe@geronimo.apache.org>
List-Post: <mailto:scm@geronimo.apache.org>
Reply-To: dev@geronimo.apache.org
List-Id: <scm.geronimo.apache.org>
Delivered-To: mailing list scm@geronimo.apache.org
Received: (qmail 91235 invoked by uid 99); 12 Nov 2005 23:39:55 -0000
Received: from asf.osuosl.org (HELO asf.osuosl.org) (140.211.166.49)
    by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 12 Nov 2005 15:39:55 -0800
X-ASF-Spam-Status: No, hits=-9.4 required=10.0
	tests=ALL_TRUSTED,NO_REAL_NAME
X-Spam-Check-By: apache.org
Received: from [209.237.227.194] (HELO minotaur.apache.org) (209.237.227.194)
    by apache.org (qpsmtpd/0.29) with SMTP; Sat, 12 Nov 2005 15:39:47 -0800
Received: (qmail 41332 invoked by uid 65534); 12 Nov 2005 23:39:34 -0000
Message-ID: <20051112233934.41331.qmail@minotaur.apache.org>
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r332860 [1/3] - in /geronimo/trunk/sandbox/petstore:
 maven.xml
 project.properties project.xml src/etc/petstore1.4.diff
 src/plan/petstore1.3.2-security-plan.xml
 src/plan/petstoreadmin1.4.ear-plan.xml
Date: Sat, 12 Nov 2005 23:39:32 -0000
To: scm@geronimo.apache.org
From: jlaskowski@apache.org
X-Mailer: svnmailer-1.0.5
X-Virus-Checked: Checked by ClamAV on apache.org
X-Spam-Rating: minotaur.apache.org 1.6.2 0/1000/N

Author: jlaskowski
Date: Sat Nov 12 15:39:12 2005
New Revision: 332860

URL: http://svn.apache.org/viewcvs?rev=332860&view=rev
Log:
Pet Store 1.4 deploys and runs successfully

Added:
    geronimo/trunk/sandbox/petstore/src/etc/petstore1.4.diff
    geronimo/trunk/sandbox/petstore/src/plan/petstoreadmin1.4.ear-plan.xml   (with props)
Modified:
    geronimo/trunk/sandbox/petstore/maven.xml
    geronimo/trunk/sandbox/petstore/project.properties
    geronimo/trunk/sandbox/petstore/project.xml
    geronimo/trunk/sandbox/petstore/src/plan/petstore1.3.2-security-plan.xml

Modified: geronimo/trunk/sandbox/petstore/maven.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/sandbox/petstore/maven.xml?rev=332860&r1=332859&r2=332860&view=diff
==============================================================================
--- geronimo/trunk/sandbox/petstore/maven.xml (original)
+++ geronimo/trunk/sandbox/petstore/maven.xml Sat Nov 12 15:39:12 2005
@@ -15,7 +15,9 @@
     See the License for the specific language governing permissions and
     limitations under the License.
 -->
+
 <!-- $Rev: 54661 $ $Date$ -->
+
 <project default="default"
     xmlns:j="jelly:core"
     xmlns:ant="jelly:ant"
@@ -29,115 +31,91 @@
         <attainGoal name="petstore:deploy"/>
     </goal>
 
-    <goal name="petstore:deploy" description="Deploys PetStore">
-        <ant:delete dir="${instDir}"/>
-
-        <ant:echo>Unpacking Geronimo Server at: ${instDir}</ant:echo>
+    <goal name="petstore:deploy" description="Deploys PetStore" prereqs="clean">
         <deploy:unpackServer
             geronimoVersion="${geronimo_version}"
-            geronimoName="geronimo"
-            targetDir="${instDir}"/>
+            geronimoName="geronimo"/>
 
         <ant:copy todir="${instDir}/var">
             <ant:fileset dir="src/var"/>
         </ant:copy>
 
-		<fileScanner var="plans">
+        <fileScanner var="plans">
             <fileset dir="${basedir}/src/plan">
                 <include name="*-plan.xml"/>
             </fileset>
         </fileScanner>
 
-        <ant:mkdir dir="${basedir}/target/plan"/>
+        <ant:mkdir dir="${maven.build.dir}/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}"/>
+                name="${maven.build.dir}/plan/${planName}"/>
         </j:forEach>
-		
+
         <ant:echo>Building Security Configuration</ant:echo>
+        <ant:echo>${instDir}</ant:echo>
         <ant:java fork="true" jar="${instDir}/bin/deployer.jar" failonerror="true">
             <ant:jvmarg value="-ea"/>
-            <ant:arg value="--user"/>
-            <ant:arg value="system"/>
-            <ant:arg value="--password"/>
-            <ant:arg value="manager"/>
+            <ant:arg value="--offline"/>
             <ant:arg value="distribute"/>
-            <ant:arg value="${basedir}/target/plan/petstore1.3.2-security-plan.xml"/>
+            <ant:arg value="${maven.build.dir}/plan/petstore1.3.2-security-plan.xml"/>
         </ant:java>
 
         <ant:echo>Building JMS Configuration</ant:echo>
         <ant:java fork="true" jar="${instDir}/bin/deployer.jar" failonerror="true">
             <ant:jvmarg value="-ea"/>
-            <ant:arg value="--user"/>
-            <ant:arg value="system"/>
-            <ant:arg value="--password"/>
-            <ant:arg value="manager"/>
+            <ant:arg value="--offline"/>
             <ant:arg value="distribute"/>
-            <ant:arg value="${basedir}/target/plan/petstore1.3.2-jms-ra-plan.xml"/>
+            <ant:arg value="${maven.build.dir}/plan/petstore1.3.2-jms-ra-plan.xml"/>
             <ant:arg value="${maven.repo.local}/activemq/rars/activemq-ra-${activemq_version}.rar"/>
         </ant:java>
 
         <ant:echo>Building Database Configuration</ant:echo>
         <ant:java fork="true" jar="${instDir}/bin/deployer.jar" failonerror="true">
             <ant:jvmarg value="-ea"/>
-            <ant:arg value="--user"/>
-            <ant:arg value="system"/>
-            <ant:arg value="--password"/>
-            <ant:arg value="manager"/>
+            <ant:arg value="--offline"/>
             <ant:arg value="distribute"/>
-            <ant:arg value="${basedir}/target/plan/petstore1.3.2-db-ra-plan.xml"/>
+            <ant:arg value="${maven.build.dir}/plan/petstore1.3.2-db-ra-plan.xml"/>
             <ant:arg value="${maven.repo.local}/tranql/rars/tranql-connector-derby-embed-xa-${tranql_vendors_version}.rar"/>
         </ant:java>
 
     <ant:echo>Distributing Java Pet Store Application</ant:echo>
         <ant:java fork="true" jar="${instDir}/bin/deployer.jar" failonerror="true">
             <ant:jvmarg value="-ea"/>
-            <ant:arg value="--user"/>
-            <ant:arg value="system"/>
-            <ant:arg value="--password"/>
-            <ant:arg value="manager"/>
+            <ant:arg value="--offline"/>
             <ant:arg value="distribute"/>
-            <ant:arg value="${basedir}/target/plan/petstore1.3.2.ear-plan.xml"/>
+            <ant:arg value="${maven.build.dir}/plan/petstore1.3.2.ear-plan.xml"/>
             <ant:arg value="${petstore.home}/src/apps/petstore/build/petstore.ear"/>
         </ant:java>
 
         <ant:echo>Distributing Java Pet Store Supplier Application</ant:echo>
         <ant:java fork="true" jar="${instDir}/bin/deployer.jar" failonerror="true">
             <ant:jvmarg value="-ea"/>
-            <ant:arg value="--user"/>
-            <ant:arg value="system"/>
-            <ant:arg value="--password"/>
-            <ant:arg value="manager"/>
+            <ant:arg value="--offline"/>
             <ant:arg value="distribute"/>
-            <ant:arg value="${basedir}/target/plan/supplier1.3.2.ear-plan.xml"/>
+            <ant:arg value="${maven.build.dir}/plan/supplier1.3.2.ear-plan.xml"/>
             <ant:arg value="${petstore.home}/src/apps/supplier/build/supplier.ear"/>
         </ant:java>
 
         <ant:echo>Distributing Java Pet Store OPC Application</ant:echo>
         <ant:java fork="true" jar="${instDir}/bin/deployer.jar" failonerror="true">
             <ant:jvmarg value="-ea"/>
-            <ant:arg value="--user"/>
-            <ant:arg value="system"/>
-            <ant:arg value="--password"/>
-            <ant:arg value="manager"/>
+            <ant:arg value="--offline"/>
             <ant:arg value="distribute"/>
-            <ant:arg value="${basedir}/target/plan/opc1.3.2.ear-plan.xml"/>
+            <ant:arg value="${maven.build.dir}/plan/opc1.3.2.ear-plan.xml"/>
             <ant:arg value="${petstore.home}/src/apps/opc/build/opc.ear"/>
         </ant:java>
 
         <ant:echo>Distributing Java Pet Store Admin Application</ant:echo>
         <ant:java fork="true" jar="${instDir}/bin/deployer.jar" failonerror="true">
             <ant:jvmarg value="-ea"/>
-            <ant:arg value="--user"/>
-            <ant:arg value="system"/>
-            <ant:arg value="--password"/>
-            <ant:arg value="manager"/>
+            <ant:arg value="--offline"/>
             <ant:arg value="distribute"/>
-            <ant:arg value="${basedir}/target/plan/petstoreadmin1.3.2.ear-plan.xml"/>
+            <ant:arg value="${maven.build.dir}/plan/petstoreadmin1.4.ear-plan.xml"/>
             <ant:arg value="${petstore.home}/src/apps/admin/build/petstoreadmin.ear"/>
         </ant:java>
 

Modified: geronimo/trunk/sandbox/petstore/project.properties
URL: http://svn.apache.org/viewcvs/geronimo/trunk/sandbox/petstore/project.properties?rev=332860&r1=332859&r2=332860&view=diff
==============================================================================
--- geronimo/trunk/sandbox/petstore/project.properties (original)
+++ geronimo/trunk/sandbox/petstore/project.properties Sat Nov 12 15:39:12 2005
@@ -17,4 +17,4 @@
 
 ##
 ## $Rev: 151530 $ $Date$
-petstore.home=petstore1.3.2
+petstore.home=petstore1.4

Modified: geronimo/trunk/sandbox/petstore/project.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/sandbox/petstore/project.xml?rev=332860&r1=332859&r2=332860&view=diff
==============================================================================
--- geronimo/trunk/sandbox/petstore/project.xml (original)
+++ geronimo/trunk/sandbox/petstore/project.xml Sat Nov 12 15:39:12 2005
@@ -42,13 +42,23 @@
     <dependency>
       <groupId>activemq</groupId>
       <artifactId>activemq-ra</artifactId>
-	  <version>${activemq_version}</version>
-	  <type>rar</type>
-	</dependency>
+      <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>
+    <dependency>
+        <groupId>jstl</groupId>
+        <artifactId>jstl</artifactId>
+        <version>${jstl_version}</version>
+    </dependency>
+    <dependency>
+        <groupId>taglibs</groupId>
+        <artifactId>standard</artifactId>
+        <version>${standard_taglibs_version}</version>
     </dependency>
   </dependencies>
   <build>