[jboss-svn-commits] JBL Code SVN: r26174 - labs/jbossesb/workspace/dbevenius/jbossas5/product/samples/quickstarts/helloworld_sql_action.

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

Author: beve
Date: 2009-04-21 06:41:04 -0400 (Tue, 21 Apr 2009)
New Revision: 26174

Modified:
   labs/jbossesb/workspace/dbevenius/jbossas5/product/samples/quickstarts/helloworld_sql_action/build.xml
   labs/jbossesb/workspace/dbevenius/jbossas5/product/samples/quickstarts/helloworld_sql_action/jbm-queue-service.xml
   labs/jbossesb/workspace/dbevenius/jbossas5/product/samples/quickstarts/helloworld_sql_action/jbmq-queue-service.xml
Log:
updated to make this quickstart run nicely with AS 5


Modified: labs/jbossesb/workspace/dbevenius/jbossas5/product/samples/quickstarts/helloworld_sql_action/build.xml
===================================================================
--- labs/jbossesb/workspace/dbevenius/jbossas5/product/samples/quickstarts/helloworld_sql_action/build.xml	2009-04-21 10:05:13 UTC (rev 26173)
+++ labs/jbossesb/workspace/dbevenius/jbossas5/product/samples/quickstarts/helloworld_sql_action/build.xml	2009-04-21 10:41:04 UTC (rev 26174)
@@ -12,27 +12,34 @@
 
 	<target name="quickstart-specific-assemblies" description="Quickstart specific assemblies">
 	</target>
-  
-	<target name="runtest" depends="dependencies" description="Insert row data into sql table polled by gateway">
-                <property name="hsqldb.jar"
-                        value="${org.jboss.esb.server.home}/server/${org.jboss.esb.server.config}/lib/hsqldb.jar"/>	
-				<echo>Insert row data into sql table polled by gateway</echo>
-                <sql
-                        driver="org.hsqldb.jdbcDriver"
-						url="jdbc:hsqldb:hsql://localhost:1704"
-                        userid="sa"	
-						autocommit="true"
-						password="">
-                        <classpath>
+
+	<target name="db.lib.dir">
+		<condition property="hsqldb.lib.dir" value="${org.jboss.esb.server.home}/common/lib" else="${org.jboss.esb.server.home}/server/${org.jboss.esb.server.config}/lib">	
+			<and>
+				<isset property="jbossas5"/>
+			</and>
+		</condition>
+	</target>
+
+	<target name="runtest" depends="dependencies, db.lib.dir" description="Insert row data into sql table polled by gateway">
+		<property name="hsqldb.jar" location="${hsqldb.lib.dir}/hsqldb.jar"/>	
+		<echo message="${hsqldb.jar}"/>
+		<echo>Insert row data into sql table polled by gateway</echo>
+		<sql
+			driver="org.hsqldb.jdbcDriver"
+			url="jdbc:hsqldb:hsql://localhost:1704"
+			userid="sa"	
+			autocommit="true"
+			password="">
+			<classpath>
 				<pathelement path="${hsqldb.jar}"/>
-                        </classpath>
+			</classpath>
 			<transaction src="populate.sql"/>
-			</sql>
+		</sql>
 	</target>  
 
-	<target name="select" depends="dependencies" description="select * from gateway_table">
-		<property name="hsqldb.jar" 
-			value="${org.jboss.esb.server.home}/server/${org.jboss.esb.server.config}/lib/hsqldb.jar"/>
+	<target name="select" depends="dependencies, db.lib.dir" description="select * from gateway_table">
+		<property name="hsqldb.jar" value="${hsqldb.lib.dir}/hsqldb.jar"/>	
 		<echo>Select * from gateway_table</echo>
 		<sql	
 			print="true"

Modified: labs/jbossesb/workspace/dbevenius/jbossas5/product/samples/quickstarts/helloworld_sql_action/jbm-queue-service.xml
===================================================================
--- labs/jbossesb/workspace/dbevenius/jbossas5/product/samples/quickstarts/helloworld_sql_action/jbm-queue-service.xml	2009-04-21 10:05:13 UTC (rev 26173)
+++ labs/jbossesb/workspace/dbevenius/jbossas5/product/samples/quickstarts/helloworld_sql_action/jbm-queue-service.xml	2009-04-21 10:41:04 UTC (rev 26174)
@@ -5,9 +5,6 @@
     xmbean-dd="xmdesc/Queue-xmbean.xml">
 	<depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends>
 	<depends>jboss.messaging:service=PostOffice</depends>
-	<!-- redelivery attempt delay in millis -->
-    <attribute name="RedeliveryDelay">1000</attribute>
-    <attribute name="MaxDeliveryAttempts">15</attribute>
   </mbean>
 
 </server>

Modified: labs/jbossesb/workspace/dbevenius/jbossas5/product/samples/quickstarts/helloworld_sql_action/jbmq-queue-service.xml
===================================================================
--- labs/jbossesb/workspace/dbevenius/jbossas5/product/samples/quickstarts/helloworld_sql_action/jbmq-queue-service.xml	2009-04-21 10:05:13 UTC (rev 26173)
+++ labs/jbossesb/workspace/dbevenius/jbossas5/product/samples/quickstarts/helloworld_sql_action/jbmq-queue-service.xml	2009-04-21 10:41:04 UTC (rev 26174)
@@ -4,7 +4,5 @@
     name="jboss.esb.quickstart.destination:service=Queue,name=quickstart_sql_action_Request_esb">
     <depends optional-attribute-name="DestinationManager">jboss.mq:service=DestinationManager</depends>
 	<depends optional-attribute-name="SecurityManager">jboss.mq:service=SecurityManager</depends>
-	<!-- redelivery attempt delay in millis -->
-    <attribute name="RedeliveryDelay">1000</attribute>
   </mbean>
 </server>