[jboss-svn-commits] JBL Code SVN: r30747 - in labs/jbossesb/branches/JBESB_4_7_CP/product/samples/quickstarts/spring_jpetstore: hsqldb and 2 other directories.

[jboss-svn-commits at lists.jboss.org]

Author: tcunning
Date: 2009-12-17 22:27:30 -0500 (Thu, 17 Dec 2009)
New Revision: 30747

Added:
   labs/jbossesb/branches/JBESB_4_7_CP/product/samples/quickstarts/spring_jpetstore/template/
   labs/jbossesb/branches/JBESB_4_7_CP/product/samples/quickstarts/spring_jpetstore/template/manager.bat
   labs/jbossesb/branches/JBESB_4_7_CP/product/samples/quickstarts/spring_jpetstore/template/manager.sh
   labs/jbossesb/branches/JBESB_4_7_CP/product/samples/quickstarts/spring_jpetstore/template/server.sh
Removed:
   labs/jbossesb/branches/JBESB_4_7_CP/product/samples/quickstarts/spring_jpetstore/hsqldb/manager.bat
   labs/jbossesb/branches/JBESB_4_7_CP/product/samples/quickstarts/spring_jpetstore/hsqldb/manager.sh
   labs/jbossesb/branches/JBESB_4_7_CP/product/samples/quickstarts/spring_jpetstore/hsqldb/server.bat
   labs/jbossesb/branches/JBESB_4_7_CP/product/samples/quickstarts/spring_jpetstore/hsqldb/server.sh
   labs/jbossesb/branches/JBESB_4_7_CP/product/samples/quickstarts/spring_jpetstore/lib/ext/
Modified:
   labs/jbossesb/branches/JBESB_4_7_CP/product/samples/quickstarts/spring_jpetstore/build.xml
   labs/jbossesb/branches/JBESB_4_7_CP/product/samples/quickstarts/spring_jpetstore/readme.txt
Log:
JBESB-3014
Remove hsqldb.jar from spring_jpetstore, add token replacement to scripts to
incorporate hsqldb.jar location.


Modified: labs/jbossesb/branches/JBESB_4_7_CP/product/samples/quickstarts/spring_jpetstore/build.xml
===================================================================
--- labs/jbossesb/branches/JBESB_4_7_CP/product/samples/quickstarts/spring_jpetstore/build.xml	2009-12-18 01:21:21 UTC (rev 30746)
+++ labs/jbossesb/branches/JBESB_4_7_CP/product/samples/quickstarts/spring_jpetstore/build.xml	2009-12-18 03:27:30 UTC (rev 30747)
@@ -38,4 +38,14 @@
 		</exec>
 	</target>
 
+	<target name="replace" depends="compile">
+		<copy todir="${basedir}/hsqldb" overwrite="true">
+			<fileset dir="${basedir}/template"/>
+			<filterset>
+				<filter token="hsqldb.dir" value="${org.jboss.esb.server.home}/server/${org.jboss.esb.server.config}/lib"/>
+			</filterset>
+		</copy>	
+			
+	</target>
+
 </project>

Deleted: labs/jbossesb/branches/JBESB_4_7_CP/product/samples/quickstarts/spring_jpetstore/hsqldb/manager.bat
===================================================================
--- labs/jbossesb/branches/JBESB_4_7_CP/product/samples/quickstarts/spring_jpetstore/hsqldb/manager.bat	2009-12-18 01:21:21 UTC (rev 30746)
+++ labs/jbossesb/branches/JBESB_4_7_CP/product/samples/quickstarts/spring_jpetstore/hsqldb/manager.bat	2009-12-18 03:27:30 UTC (rev 30747)
@@ -1,2 +0,0 @@
-"%JAVA_HOME%/bin/java" -classpath ..\lib\ext\hsqldb.jar org.hsqldb.util.DatabaseManager
-

Deleted: labs/jbossesb/branches/JBESB_4_7_CP/product/samples/quickstarts/spring_jpetstore/hsqldb/manager.sh
===================================================================
--- labs/jbossesb/branches/JBESB_4_7_CP/product/samples/quickstarts/spring_jpetstore/hsqldb/manager.sh	2009-12-18 01:21:21 UTC (rev 30746)
+++ labs/jbossesb/branches/JBESB_4_7_CP/product/samples/quickstarts/spring_jpetstore/hsqldb/manager.sh	2009-12-18 03:27:30 UTC (rev 30747)
@@ -1 +0,0 @@
-java -cp ../lib/ext/hsqldb.jar org.hsqldb.util.DatabaseManager

Deleted: labs/jbossesb/branches/JBESB_4_7_CP/product/samples/quickstarts/spring_jpetstore/hsqldb/server.bat
===================================================================
--- labs/jbossesb/branches/JBESB_4_7_CP/product/samples/quickstarts/spring_jpetstore/hsqldb/server.bat	2009-12-18 01:21:21 UTC (rev 30746)
+++ labs/jbossesb/branches/JBESB_4_7_CP/product/samples/quickstarts/spring_jpetstore/hsqldb/server.bat	2009-12-18 03:27:30 UTC (rev 30747)
@@ -1 +0,0 @@
-"%JAVA_HOME%/bin/java" -classpath ..\lib\ext\hsqldb.jar org.hsqldb.Server -database jpetstore

Deleted: labs/jbossesb/branches/JBESB_4_7_CP/product/samples/quickstarts/spring_jpetstore/hsqldb/server.sh
===================================================================
--- labs/jbossesb/branches/JBESB_4_7_CP/product/samples/quickstarts/spring_jpetstore/hsqldb/server.sh	2009-12-18 01:21:21 UTC (rev 30746)
+++ labs/jbossesb/branches/JBESB_4_7_CP/product/samples/quickstarts/spring_jpetstore/hsqldb/server.sh	2009-12-18 03:27:30 UTC (rev 30747)
@@ -1 +0,0 @@
-java -classpath ../lib/ext/hsqldb.jar org.hsqldb.Server -database jpetstore

Modified: labs/jbossesb/branches/JBESB_4_7_CP/product/samples/quickstarts/spring_jpetstore/readme.txt
===================================================================
--- labs/jbossesb/branches/JBESB_4_7_CP/product/samples/quickstarts/spring_jpetstore/readme.txt	2009-12-18 01:21:21 UTC (rev 30746)
+++ labs/jbossesb/branches/JBESB_4_7_CP/product/samples/quickstarts/spring_jpetstore/readme.txt	2009-12-18 03:27:30 UTC (rev 30747)
@@ -22,10 +22,12 @@
   2. In "Window1", change directory to the "hsqldb" directory and run the 
      server.sh/server.bat script.
   3. In a command terminal window in this folder ("Window1"), type 'ant deploy'.
-  4. In "Window2", type 'ant runtest'.
-  5. Switch back to Application Server console to see the output from the ESB
-  6. Interrupt the database ("Window1") using Ctrl-C.
-  7. In this folder ("Window1"), type 'ant undeploy'.
+  4. In "Window2", type 'ant replace', which will insert the correct locations
+for the hsqldb.jar in the hsqldb directory scripts..
+  5. In "Window2", type 'ant runtest'.
+  6. Switch back to Application Server console to see the output from the ESB
+  7. Interrupt the database ("Window1") using Ctrl-C.
+  8. In this folder ("Window1"), type 'ant undeploy'.
 
 Project file descriptions:
 ==========================

Added: labs/jbossesb/branches/JBESB_4_7_CP/product/samples/quickstarts/spring_jpetstore/template/manager.bat
===================================================================
--- labs/jbossesb/branches/JBESB_4_7_CP/product/samples/quickstarts/spring_jpetstore/template/manager.bat	                        (rev 0)
+++ labs/jbossesb/branches/JBESB_4_7_CP/product/samples/quickstarts/spring_jpetstore/template/manager.bat	2009-12-18 03:27:30 UTC (rev 30747)
@@ -0,0 +1,2 @@
+"%JAVA_HOME%/bin/java" -classpath @hsqldb.dir@\hsqldb.jar org.hsqldb.util.DatabaseManager
+


Property changes on: labs/jbossesb/branches/JBESB_4_7_CP/product/samples/quickstarts/spring_jpetstore/template/manager.bat
___________________________________________________________________
Name: svn:executable
   + *

Added: labs/jbossesb/branches/JBESB_4_7_CP/product/samples/quickstarts/spring_jpetstore/template/manager.sh
===================================================================
--- labs/jbossesb/branches/JBESB_4_7_CP/product/samples/quickstarts/spring_jpetstore/template/manager.sh	                        (rev 0)
+++ labs/jbossesb/branches/JBESB_4_7_CP/product/samples/quickstarts/spring_jpetstore/template/manager.sh	2009-12-18 03:27:30 UTC (rev 30747)
@@ -0,0 +1 @@
+java -cp @hsqldb.dir@/hsqldb.jar org.hsqldb.util.DatabaseManager


Property changes on: labs/jbossesb/branches/JBESB_4_7_CP/product/samples/quickstarts/spring_jpetstore/template/manager.sh
___________________________________________________________________
Name: svn:executable
   + *

Added: labs/jbossesb/branches/JBESB_4_7_CP/product/samples/quickstarts/spring_jpetstore/template/server.sh
===================================================================
--- labs/jbossesb/branches/JBESB_4_7_CP/product/samples/quickstarts/spring_jpetstore/template/server.sh	                        (rev 0)
+++ labs/jbossesb/branches/JBESB_4_7_CP/product/samples/quickstarts/spring_jpetstore/template/server.sh	2009-12-18 03:27:30 UTC (rev 30747)
@@ -0,0 +1 @@
+java -classpath @hsqldb.dir@/hsqldb.jar org.hsqldb.Server -database jpetstore


Property changes on: labs/jbossesb/branches/JBESB_4_7_CP/product/samples/quickstarts/spring_jpetstore/template/server.sh
___________________________________________________________________
Name: svn:executable
   + *