[jboss-svn-commits] JBL Code SVN: r31058 - in labs/jbossesb/branches/JBESB_4_7_CP/product/samples/quickstarts: huge-split-enrich-transform-route/05_Database and 2 other directories.

jboss-svn-commits at lists.jboss.org jboss-svn-commits at lists.jboss.org
Wed Jan 13 09:19:33 EST 2010 

Author: tfennelly
Date: 2010-01-13 09:19:32 -0500 (Wed, 13 Jan 2010)
New Revision: 31058

Added:
   labs/jbossesb/branches/JBESB_4_7_CP/product/samples/quickstarts/huge-split-enrich-transform-route/05_Database/manager.bat
   labs/jbossesb/branches/JBESB_4_7_CP/product/samples/quickstarts/huge-split-enrich-transform-route/05_Database/manager.sh
   labs/jbossesb/branches/JBESB_4_7_CP/product/samples/quickstarts/huge-split-enrich-transform-route/05_Database/server.bat
   labs/jbossesb/branches/JBESB_4_7_CP/product/samples/quickstarts/huge-split-enrich-transform-route/05_Database/server.sh
   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
Removed:
   labs/jbossesb/branches/JBESB_4_7_CP/product/samples/quickstarts/huge-split-enrich-transform-route/template/
   labs/jbossesb/branches/JBESB_4_7_CP/product/samples/quickstarts/spring_jpetstore/template/
Modified:
   labs/jbossesb/branches/JBESB_4_7_CP/product/samples/quickstarts/huge-split-enrich-transform-route/README.html
   labs/jbossesb/branches/JBESB_4_7_CP/product/samples/quickstarts/huge-split-enrich-transform-route/build.xml
   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:
https://jira.jboss.org/jira/browse/JBESB-3099
spring_jpetstore quickstart sample - missing run scripts in hsqldb directory

Added: labs/jbossesb/branches/JBESB_4_7_CP/product/samples/quickstarts/huge-split-enrich-transform-route/05_Database/manager.bat
===================================================================
--- labs/jbossesb/branches/JBESB_4_7_CP/product/samples/quickstarts/huge-split-enrich-transform-route/05_Database/manager.bat	                        (rev 0)
+++ labs/jbossesb/branches/JBESB_4_7_CP/product/samples/quickstarts/huge-split-enrich-transform-route/05_Database/manager.bat	2010-01-13 14:19:32 UTC (rev 31058)
@@ -0,0 +1 @@
+ant -f ..\build.xml start-hsqldb-manager
\ No newline at end of file


Property changes on: labs/jbossesb/branches/JBESB_4_7_CP/product/samples/quickstarts/huge-split-enrich-transform-route/05_Database/manager.bat
___________________________________________________________________
Name: svn:executable
   + *

Added: labs/jbossesb/branches/JBESB_4_7_CP/product/samples/quickstarts/huge-split-enrich-transform-route/05_Database/manager.sh
===================================================================
--- labs/jbossesb/branches/JBESB_4_7_CP/product/samples/quickstarts/huge-split-enrich-transform-route/05_Database/manager.sh	                        (rev 0)
+++ labs/jbossesb/branches/JBESB_4_7_CP/product/samples/quickstarts/huge-split-enrich-transform-route/05_Database/manager.sh	2010-01-13 14:19:32 UTC (rev 31058)
@@ -0,0 +1 @@
+ant -f ../build.xml start-hsqldb-manager
\ No newline at end of file


Property changes on: labs/jbossesb/branches/JBESB_4_7_CP/product/samples/quickstarts/huge-split-enrich-transform-route/05_Database/manager.sh
___________________________________________________________________
Name: svn:executable
   + *

Added: labs/jbossesb/branches/JBESB_4_7_CP/product/samples/quickstarts/huge-split-enrich-transform-route/05_Database/server.bat
===================================================================
--- labs/jbossesb/branches/JBESB_4_7_CP/product/samples/quickstarts/huge-split-enrich-transform-route/05_Database/server.bat	                        (rev 0)
+++ labs/jbossesb/branches/JBESB_4_7_CP/product/samples/quickstarts/huge-split-enrich-transform-route/05_Database/server.bat	2010-01-13 14:19:32 UTC (rev 31058)
@@ -0,0 +1 @@
+ant -f ..\build.xml start-hsqldb-server
\ No newline at end of file


Property changes on: labs/jbossesb/branches/JBESB_4_7_CP/product/samples/quickstarts/huge-split-enrich-transform-route/05_Database/server.bat
___________________________________________________________________
Name: svn:executable
   + *

Added: labs/jbossesb/branches/JBESB_4_7_CP/product/samples/quickstarts/huge-split-enrich-transform-route/05_Database/server.sh
===================================================================
--- labs/jbossesb/branches/JBESB_4_7_CP/product/samples/quickstarts/huge-split-enrich-transform-route/05_Database/server.sh	                        (rev 0)
+++ labs/jbossesb/branches/JBESB_4_7_CP/product/samples/quickstarts/huge-split-enrich-transform-route/05_Database/server.sh	2010-01-13 14:19:32 UTC (rev 31058)
@@ -0,0 +1 @@
+ant -f ../build.xml start-hsqldb-server


Property changes on: labs/jbossesb/branches/JBESB_4_7_CP/product/samples/quickstarts/huge-split-enrich-transform-route/05_Database/server.sh
___________________________________________________________________
Name: svn:executable
   + *

Modified: labs/jbossesb/branches/JBESB_4_7_CP/product/samples/quickstarts/huge-split-enrich-transform-route/README.html
===================================================================
--- labs/jbossesb/branches/JBESB_4_7_CP/product/samples/quickstarts/huge-split-enrich-transform-route/README.html	2010-01-13 14:16:54 UTC (rev 31057)
+++ labs/jbossesb/branches/JBESB_4_7_CP/product/samples/quickstarts/huge-split-enrich-transform-route/README.html	2010-01-13 14:19:32 UTC (rev 31058)
@@ -128,8 +128,7 @@
         <li>Open 6 command shell windows in the root folder of this quickstart.</li>
         <li>In one of the command shell windows, start your JBoss ESB/Application Server instance.</li>
         <li>In one of the command shell windows, type "ant deploy-jms-dests" to deploy the JMS Queues.</li>
-        <li>In one of the command shell windows, type "ant replace", and then change directory into the "05_Database" folder and
-            type "server.bat" or "server.sh", depending on your OS.</li>
+        <li>In one of the command shell windows, type "ant start-hsqldb-server".</li>
         <li>In the remaining command shell windows, type the following commands in seperate windows:
             <ul>
                 <li>"ant 01_split_enrich_transform_route"</li>

Modified: labs/jbossesb/branches/JBESB_4_7_CP/product/samples/quickstarts/huge-split-enrich-transform-route/build.xml
===================================================================
--- labs/jbossesb/branches/JBESB_4_7_CP/product/samples/quickstarts/huge-split-enrich-transform-route/build.xml	2010-01-13 14:16:54 UTC (rev 31057)
+++ labs/jbossesb/branches/JBESB_4_7_CP/product/samples/quickstarts/huge-split-enrich-transform-route/build.xml	2010-01-13 14:19:32 UTC (rev 31058)
@@ -16,15 +16,20 @@
         <echo message="This target is not used by this Quickstart.  Please read the 'README.html' file." />
     </target>
 
-   <target name="replace" depends="compile">
-	<copy todir="${basedir}/05_Database" 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>
+	<target name="start-hsqldb-server" depends="classpath-dependencies-as4, classpath-dependencies-as5">
+		<java classname="org.hsqldb.Server" dir="05_Database" fork="true">
+			<arg value="-database" />
+			<arg value="db" />
+			<classpath refid="exec-classpath" />
+		</java>
+	</target>
 
+	<target name="start-hsqldb-manager" depends="classpath-dependencies-as4, classpath-dependencies-as5">
+		<java classname="org.hsqldb.util.DatabaseManager" dir="05_Database" fork="true">
+			<classpath refid="exec-classpath" />
+		</java>
+	</target>
+
     <target name="01_split_enrich_transform_route" depends="compile,compile_high_price_model" description="run split_transform_route Service">
         <echo>Split Enrich Transform Route Service:</echo>
         <java fork="yes" classname="org.jboss.soa.esb.listeners.StandAloneBootStrapper" failonerror="true">

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	2010-01-13 14:16:54 UTC (rev 31057)
+++ labs/jbossesb/branches/JBESB_4_7_CP/product/samples/quickstarts/spring_jpetstore/build.xml	2010-01-13 14:19:32 UTC (rev 31058)
@@ -26,26 +26,18 @@
 		</java>
 	</target>
 
-	<target name="start-hsqldb">
-		<exec os="Linux" executable="/bin/sh" dir="./hsqldb">
-			<arg value="server.sh" />
-		</exec>
-		<exec os="Windows" executable="cmd.exe" dir="./hsqldb">
-			<arg value="server.bat" />
-		</exec>
-		<exec os="Mac OS X" executable="/bin/sh" dir="./hsqldb">
-			<arg value="server.sh" />
-		</exec>
+	<target name="start-hsqldb-server" depends="classpath-dependencies-as4, classpath-dependencies-as5">
+		<java classname="org.hsqldb.Server" dir="hsqldb" fork="true">
+			<arg value="-database" />
+			<arg value="jpetstore" />
+			<classpath refid="exec-classpath" />
+		</java>
 	</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 name="start-hsqldb-manager" depends="classpath-dependencies-as4, classpath-dependencies-as5">
+		<java classname="org.hsqldb.util.DatabaseManager" dir="hsqldb" fork="true">
+			<classpath refid="exec-classpath" />
+		</java>
 	</target>
 
 </project>

Added: 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	                        (rev 0)
+++ labs/jbossesb/branches/JBESB_4_7_CP/product/samples/quickstarts/spring_jpetstore/hsqldb/manager.bat	2010-01-13 14:19:32 UTC (rev 31058)
@@ -0,0 +1 @@
+ant -f ..\build.xml start-hsqldb-manager
\ No newline at end of file


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

Added: 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	                        (rev 0)
+++ labs/jbossesb/branches/JBESB_4_7_CP/product/samples/quickstarts/spring_jpetstore/hsqldb/manager.sh	2010-01-13 14:19:32 UTC (rev 31058)
@@ -0,0 +1 @@
+ant -f ../build.xml start-hsqldb-manager
\ No newline at end of file


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

Added: 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	                        (rev 0)
+++ labs/jbossesb/branches/JBESB_4_7_CP/product/samples/quickstarts/spring_jpetstore/hsqldb/server.bat	2010-01-13 14:19:32 UTC (rev 31058)
@@ -0,0 +1 @@
+ant -f ..\build.xml start-hsqldb-server
\ No newline at end of file


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

Added: 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	                        (rev 0)
+++ labs/jbossesb/branches/JBESB_4_7_CP/product/samples/quickstarts/spring_jpetstore/hsqldb/server.sh	2010-01-13 14:19:32 UTC (rev 31058)
@@ -0,0 +1 @@
+ant -f ../build.xml start-hsqldb-server


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

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	2010-01-13 14:16:54 UTC (rev 31057)
+++ labs/jbossesb/branches/JBESB_4_7_CP/product/samples/quickstarts/spring_jpetstore/readme.txt	2010-01-13 14:19:32 UTC (rev 31058)
@@ -18,12 +18,10 @@
 
 To Run:
 ===========================
-  1. Open another command terminal window in this folder ("Window2").
-  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 replace', which will insert the correct locations
-for the hsqldb.jar in the hsqldb directory scripts..
+  1. Open a command terminal window in this folder ("Window1").
+  2. In "Window1", type 'ant start-hsqldb-server'.
+  3. Open another command terminal window in this folder ("Window2").
+  4. In "Window2", type 'ant clean deploy'.
   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.

More information about the jboss-svn-commits mailing list