[jboss-svn-commits] JBL Code SVN: r20100 - in labs/jbossesb/trunk/product/samples/quickstarts: helloworld_sql_action and 2 other directories.
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Wed May 21 08:36:55 EDT 2008
Author: kevin.conner at jboss.com
Date: 2008-05-21 08:36:55 -0400 (Wed, 21 May 2008)
New Revision: 20100
Added:
labs/jbossesb/trunk/product/samples/quickstarts/helloworld_hibernate_action/deployment.xml
labs/jbossesb/trunk/product/samples/quickstarts/helloworld_hibernate_action/jbm-queue-service.xml
labs/jbossesb/trunk/product/samples/quickstarts/helloworld_hibernate_action/jbmq-queue-service.xml
labs/jbossesb/trunk/product/samples/quickstarts/helloworld_sql_action/deployment.xml
labs/jbossesb/trunk/product/samples/quickstarts/helloworld_sql_action/jbm-queue-service.xml
labs/jbossesb/trunk/product/samples/quickstarts/helloworld_sql_action/jbmq-queue-service.xml
Modified:
labs/jbossesb/trunk/product/samples/quickstarts/helloworld_hibernate_action/build.xml
labs/jbossesb/trunk/product/samples/quickstarts/helloworld_hibernate_action/jboss-esb.xml
labs/jbossesb/trunk/product/samples/quickstarts/helloworld_hibernate_action/jbossesb-service.xml
labs/jbossesb/trunk/product/samples/quickstarts/helloworld_hibernate_action/quickstart-ds.xml
labs/jbossesb/trunk/product/samples/quickstarts/helloworld_sql_action/build.xml
labs/jbossesb/trunk/product/samples/quickstarts/helloworld_sql_action/jboss-esb.xml
labs/jbossesb/trunk/product/samples/quickstarts/helloworld_sql_action/jbossesb-service.xml
labs/jbossesb/trunk/product/samples/quickstarts/helloworld_sql_action/quickstart-ds.xml
labs/jbossesb/trunk/product/samples/quickstarts/helloworld_tx_sql_action/build.xml
labs/jbossesb/trunk/product/samples/quickstarts/helloworld_tx_sql_action/deployment.xml
labs/jbossesb/trunk/product/samples/quickstarts/helloworld_tx_sql_action/jboss-esb.xml
labs/jbossesb/trunk/product/samples/quickstarts/helloworld_tx_sql_action/jbossesb-service.xml
labs/jbossesb/trunk/product/samples/quickstarts/helloworld_tx_sql_action/quickstart-ds.xml
labs/jbossesb/trunk/product/samples/quickstarts/jms_transacted/build.xml
labs/jbossesb/trunk/product/samples/quickstarts/jms_transacted/deployment.xml
labs/jbossesb/trunk/product/samples/quickstarts/jms_transacted/jboss-esb.xml
labs/jbossesb/trunk/product/samples/quickstarts/jms_transacted/jbossesb-service.xml
labs/jbossesb/trunk/product/samples/quickstarts/jms_transacted/quickstart-ds.xml
Log:
Updated QSes to remove conflicted configuration: JBESB-1762
Modified: labs/jbossesb/trunk/product/samples/quickstarts/helloworld_hibernate_action/build.xml
===================================================================
--- labs/jbossesb/trunk/product/samples/quickstarts/helloworld_hibernate_action/build.xml 2008-05-21 10:50:09 UTC (rev 20099)
+++ labs/jbossesb/trunk/product/samples/quickstarts/helloworld_hibernate_action/build.xml 2008-05-21 12:36:55 UTC (rev 20100)
@@ -6,7 +6,7 @@
${line.separator}
</description>
- <property name="additional.deploys" value="jbossesb-service.xml" />
+ <property name="additional.deploys" value="jbossesb-service.xml quickstart-ds.xml" />
<!-- Import the base Ant build script... -->
<import file="../conf/base-build.xml"/>
@@ -28,7 +28,6 @@
<target name="undeploy" depends="dependencies">
<delete file="${org.jboss.esb.server.deploy.dir}/${ant.project.name}.esb"/>
- <delete file="${org.jboss.esb.server.deploy.dir}/quickstart-ds.xml"/>
</target>
<target name="config" depends="compile">
@@ -69,6 +68,7 @@
we are packaging it within an .ear -->
<mkdir dir="${build.dir}/META-INF"/>
<copy file="jboss-esb.xml" todir="${build.dir}/META-INF"/>
+ <copy file="deployment.xml" todir="${build.dir}/META-INF"/>
<delete file="${build.dir}/${ant.project.name}.esb"/>
<jar destfile="${build.dir}/${ant.project.name}.esb">
<fileset dir="${build.dir}">
@@ -76,9 +76,10 @@
<include name="*.war"/>
<include name="action.jar"/>
</fileset>
- <fileset dir="${basedir}">
- <include name="quickstart-ds.xml"/>
+ <fileset dir="${basedir}/src">
+ <include name="**/*.sql"/>
</fileset>
+ <fileset dir="${basedir}" includes="${additional.deploys} ${jms.service.file}"/>
</jar>
</target>
Added: labs/jbossesb/trunk/product/samples/quickstarts/helloworld_hibernate_action/deployment.xml
===================================================================
--- labs/jbossesb/trunk/product/samples/quickstarts/helloworld_hibernate_action/deployment.xml (rev 0)
+++ labs/jbossesb/trunk/product/samples/quickstarts/helloworld_hibernate_action/deployment.xml 2008-05-21 12:36:55 UTC (rev 20100)
@@ -0,0 +1,3 @@
+<jbossesb-deployment>
+ <depends>jboss.esb:service=HelloworldHibernateDatabaseInitializer</depends>
+</jbossesb-deployment>
Property changes on: labs/jbossesb/trunk/product/samples/quickstarts/helloworld_hibernate_action/deployment.xml
___________________________________________________________________
Name: svn:mime-type
+ text/xml
Name: svn:keywords
+ Rev Date
Name: svn:eol-style
+ native
Added: labs/jbossesb/trunk/product/samples/quickstarts/helloworld_hibernate_action/jbm-queue-service.xml
===================================================================
--- labs/jbossesb/trunk/product/samples/quickstarts/helloworld_hibernate_action/jbm-queue-service.xml (rev 0)
+++ labs/jbossesb/trunk/product/samples/quickstarts/helloworld_hibernate_action/jbm-queue-service.xml 2008-05-21 12:36:55 UTC (rev 20100)
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<server>
+ <mbean code="org.jboss.jms.server.destination.QueueService"
+ name="jboss.esb.quickstart.destination:service=Queue,name=quickstart_hibernate_action_Request_esb"
+ 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>
Property changes on: labs/jbossesb/trunk/product/samples/quickstarts/helloworld_hibernate_action/jbm-queue-service.xml
___________________________________________________________________
Name: svn:mime-type
+ text/xml
Name: svn:keywords
+ Rev Date
Name: svn:eol-style
+ native
Added: labs/jbossesb/trunk/product/samples/quickstarts/helloworld_hibernate_action/jbmq-queue-service.xml
===================================================================
--- labs/jbossesb/trunk/product/samples/quickstarts/helloworld_hibernate_action/jbmq-queue-service.xml (rev 0)
+++ labs/jbossesb/trunk/product/samples/quickstarts/helloworld_hibernate_action/jbmq-queue-service.xml 2008-05-21 12:36:55 UTC (rev 20100)
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<server>
+ <mbean code="org.jboss.mq.server.jmx.Queue"
+ name="jboss.esb.quickstart.destination:service=Queue,name=quickstart_hibernate_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>
Property changes on: labs/jbossesb/trunk/product/samples/quickstarts/helloworld_hibernate_action/jbmq-queue-service.xml
___________________________________________________________________
Name: svn:mime-type
+ text/xml
Name: svn:keywords
+ Rev Date
Name: svn:eol-style
+ native
Modified: labs/jbossesb/trunk/product/samples/quickstarts/helloworld_hibernate_action/jboss-esb.xml
===================================================================
--- labs/jbossesb/trunk/product/samples/quickstarts/helloworld_hibernate_action/jboss-esb.xml 2008-05-21 10:50:09 UTC (rev 20099)
+++ labs/jbossesb/trunk/product/samples/quickstarts/helloworld_hibernate_action/jboss-esb.xml 2008-05-21 12:36:55 UTC (rev 20100)
@@ -16,7 +16,7 @@
<jms-bus busid="quickstartEsbChannel">
<jms-message-filter
dest-type="QUEUE"
- dest-name="queue/A"
+ dest-name="queue/quickstart_hibernate_action_Request_esb"
selector="source='fromHelloworldHibernateAction'"
/>
</jms-bus>
@@ -28,7 +28,7 @@
<services>
<service
category="myCategory"
- name="myJmsListener"
+ name="myHibernateListener"
description="Hello World Hibernate Action (esb hibernate listener)">
<listeners>
<hibernate-listener name="HibernateGateway"
Modified: labs/jbossesb/trunk/product/samples/quickstarts/helloworld_hibernate_action/jbossesb-service.xml
===================================================================
--- labs/jbossesb/trunk/product/samples/quickstarts/helloworld_hibernate_action/jbossesb-service.xml 2008-05-21 10:50:09 UTC (rev 20099)
+++ labs/jbossesb/trunk/product/samples/quickstarts/helloworld_hibernate_action/jbossesb-service.xml 2008-05-21 12:36:55 UTC (rev 20100)
@@ -2,12 +2,12 @@
<server>
<mbean code="org.jboss.internal.soa.esb.dependencies.DatabaseInitializer"
- name="jboss.esb:service=QuickstartDatabaseInitializer">
- <attribute name="Datasource">java:/QuickstartDB</attribute>
+ name="jboss.esb:service=HelloworldHibernateDatabaseInitializer">
+ <attribute name="Datasource">java:/HelloworldHibernateDB</attribute>
<attribute name="ExistsSql">select * from orders</attribute>
<attribute name="SqlFiles">
hsqldb/create.sql
</attribute>
- <depends>jboss.jca:name=QuickstartDB,service=DataSourceBinding</depends>
+ <depends>jboss.jca:name=HelloworldHibernateDB,service=DataSourceBinding</depends>
</mbean>
</server>
Modified: labs/jbossesb/trunk/product/samples/quickstarts/helloworld_hibernate_action/quickstart-ds.xml
===================================================================
--- labs/jbossesb/trunk/product/samples/quickstarts/helloworld_hibernate_action/quickstart-ds.xml 2008-05-21 10:50:09 UTC (rev 20099)
+++ labs/jbossesb/trunk/product/samples/quickstarts/helloworld_hibernate_action/quickstart-ds.xml 2008-05-21 12:36:55 UTC (rev 20100)
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<datasources>
<local-tx-datasource>
- <jndi-name>QuickstartDB</jndi-name>
+ <jndi-name>HelloworldHibernateDB</jndi-name>
<connection-url>jdbc:hsqldb:hsql://${jboss.bind.address}:1703</connection-url>
<driver-class>org.hsqldb.jdbcDriver</driver-class>
<user-name>sa</user-name>
@@ -9,16 +9,15 @@
<min-pool-size>5</min-pool-size>
<max-pool-size>20</max-pool-size>
<idle-timeout-minutes>0</idle-timeout-minutes>
- <depends>jboss:service=Hypersonic</depends>
+ <depends>jboss:service=HelloworldHibernateDB</depends>
<prepared-statement-cache-size>32</prepared-statement-cache-size>
</local-tx-datasource>
- <!-- For hsqldb accessed from jboss only, in-process (standalone) mode -->
- <mbean code="org.jboss.jdbc.HypersonicDatabase"
- name="jboss:service=Hypersonic">
+ <mbean code="org.jboss.internal.soa.esb.dependencies.HypersonicDatabase"
+ name="jboss:service=HelloworldHibernateDB">
<attribute name="Port">1703</attribute>
<attribute name="BindAddress">${jboss.bind.address}</attribute>
- <attribute name="Database">quickstartDB</attribute>
+ <attribute name="Database">HelloworldHibernateDB</attribute>
<attribute name="Silent">true</attribute>
<attribute name="Trace">false</attribute>
<attribute name="No_system_exit">true</attribute>
Modified: labs/jbossesb/trunk/product/samples/quickstarts/helloworld_sql_action/build.xml
===================================================================
--- labs/jbossesb/trunk/product/samples/quickstarts/helloworld_sql_action/build.xml 2008-05-21 10:50:09 UTC (rev 20099)
+++ labs/jbossesb/trunk/product/samples/quickstarts/helloworld_sql_action/build.xml 2008-05-21 12:36:55 UTC (rev 20100)
@@ -5,19 +5,13 @@
${line.separator}
</description>
- <property name="additional.deploys" value="jbossesb-service.xml" />
+ <property name="additional.deploys" value="jbossesb-service.xml quickstart-ds.xml" />
<!-- Import the base Ant build script... -->
<import file="../conf/base-build.xml"/>
<target name="quickstart-specific-assemblies" description="Quickstart specific assemblies">
</target>
-
- <target name="quickstart-specific-deploys" description="Quickstart specific deploys">
- <copy file="quickstart-ds.xml"
- todir="${org.jboss.esb.server.deploy.dir}"
- overwrite="false"/>
- </target>
<target name="runtest" depends="dependencies" description="Insert row data into sql table polled by gateway">
<property name="hsqldb.jar"
@@ -25,7 +19,7 @@
<echo>Insert row data into sql table polled by gateway</echo>
<sql
driver="org.hsqldb.jdbcDriver"
- url="jdbc:hsqldb:hsql://localhost:1703"
+ url="jdbc:hsqldb:hsql://localhost:1704"
userid="sa"
autocommit="true"
password="">
@@ -43,7 +37,7 @@
<sql
print="true"
driver="org.hsqldb.jdbcDriver"
- url="jdbc:hsqldb:hsql://localhost:1703"
+ url="jdbc:hsqldb:hsql://localhost:1704"
userid="sa"
autocommit="true"
password="">
Added: labs/jbossesb/trunk/product/samples/quickstarts/helloworld_sql_action/deployment.xml
===================================================================
--- labs/jbossesb/trunk/product/samples/quickstarts/helloworld_sql_action/deployment.xml (rev 0)
+++ labs/jbossesb/trunk/product/samples/quickstarts/helloworld_sql_action/deployment.xml 2008-05-21 12:36:55 UTC (rev 20100)
@@ -0,0 +1,3 @@
+<jbossesb-deployment>
+ <depends>jboss.esb:service=HelloworldSqlDatabaseInitializer</depends>
+</jbossesb-deployment>
Property changes on: labs/jbossesb/trunk/product/samples/quickstarts/helloworld_sql_action/deployment.xml
___________________________________________________________________
Name: svn:mime-type
+ text/xml
Name: svn:keywords
+ Rev Date
Name: svn:eol-style
+ native
Added: labs/jbossesb/trunk/product/samples/quickstarts/helloworld_sql_action/jbm-queue-service.xml
===================================================================
--- labs/jbossesb/trunk/product/samples/quickstarts/helloworld_sql_action/jbm-queue-service.xml (rev 0)
+++ labs/jbossesb/trunk/product/samples/quickstarts/helloworld_sql_action/jbm-queue-service.xml 2008-05-21 12:36:55 UTC (rev 20100)
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<server>
+ <mbean code="org.jboss.jms.server.destination.QueueService"
+ name="jboss.esb.quickstart.destination:service=Queue,name=quickstart_sql_action_Request_esb"
+ 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>
Property changes on: labs/jbossesb/trunk/product/samples/quickstarts/helloworld_sql_action/jbm-queue-service.xml
___________________________________________________________________
Name: svn:mime-type
+ text/xml
Name: svn:keywords
+ Rev Date
Name: svn:eol-style
+ native
Added: labs/jbossesb/trunk/product/samples/quickstarts/helloworld_sql_action/jbmq-queue-service.xml
===================================================================
--- labs/jbossesb/trunk/product/samples/quickstarts/helloworld_sql_action/jbmq-queue-service.xml (rev 0)
+++ labs/jbossesb/trunk/product/samples/quickstarts/helloworld_sql_action/jbmq-queue-service.xml 2008-05-21 12:36:55 UTC (rev 20100)
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<server>
+ <mbean code="org.jboss.mq.server.jmx.Queue"
+ 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>
Property changes on: labs/jbossesb/trunk/product/samples/quickstarts/helloworld_sql_action/jbmq-queue-service.xml
___________________________________________________________________
Name: svn:mime-type
+ text/xml
Name: svn:keywords
+ Rev Date
Name: svn:eol-style
+ native
Modified: labs/jbossesb/trunk/product/samples/quickstarts/helloworld_sql_action/jboss-esb.xml
===================================================================
--- labs/jbossesb/trunk/product/samples/quickstarts/helloworld_sql_action/jboss-esb.xml 2008-05-21 10:50:09 UTC (rev 20099)
+++ labs/jbossesb/trunk/product/samples/quickstarts/helloworld_sql_action/jboss-esb.xml 2008-05-21 12:36:55 UTC (rev 20100)
@@ -3,7 +3,7 @@
<providers>
<sql-provider name="SQLprovider"
- url="jdbc:hsqldb:hsql://localhost:1703"
+ url="jdbc:hsqldb:hsql://localhost:1704"
driver="org.hsqldb.jdbcDriver"
username="sa"
password="">
@@ -25,7 +25,7 @@
<jms-bus busid="quickstartEsbChannel">
<jms-message-filter
dest-type="QUEUE"
- dest-name="queue/A"
+ dest-name="queue/quickstart_sql_action_Request_esb"
selector="source='fromHelloworldSQLAction'"
/>
</jms-bus>
@@ -37,7 +37,7 @@
<services>
<service
category="myCategory"
- name="myJmsListener"
+ name="mySqlListener"
description="Hello World SQL Action (esb jdbc listener)">
<listeners>
<sql-listener name="SqlGateway"
Modified: labs/jbossesb/trunk/product/samples/quickstarts/helloworld_sql_action/jbossesb-service.xml
===================================================================
--- labs/jbossesb/trunk/product/samples/quickstarts/helloworld_sql_action/jbossesb-service.xml 2008-05-21 10:50:09 UTC (rev 20099)
+++ labs/jbossesb/trunk/product/samples/quickstarts/helloworld_sql_action/jbossesb-service.xml 2008-05-21 12:36:55 UTC (rev 20100)
@@ -2,12 +2,12 @@
<server>
<mbean code="org.jboss.internal.soa.esb.dependencies.DatabaseInitializer"
- name="jboss.esb:service=QuickstartDatabaseInitializer">
- <attribute name="Datasource">java:/QuickstartDB</attribute>
+ name="jboss.esb:service=HelloworldSqlDatabaseInitializer">
+ <attribute name="Datasource">java:/HelloworldSqlDB</attribute>
<attribute name="ExistsSql">select * from gateway_table</attribute>
<attribute name="SqlFiles">
hsqldb/create.sql
</attribute>
- <depends>jboss.jca:name=QuickstartDB,service=DataSourceBinding</depends>
+ <depends>jboss.jca:name=HelloworldSqlDB,service=DataSourceBinding</depends>
</mbean>
</server>
Modified: labs/jbossesb/trunk/product/samples/quickstarts/helloworld_sql_action/quickstart-ds.xml
===================================================================
--- labs/jbossesb/trunk/product/samples/quickstarts/helloworld_sql_action/quickstart-ds.xml 2008-05-21 10:50:09 UTC (rev 20099)
+++ labs/jbossesb/trunk/product/samples/quickstarts/helloworld_sql_action/quickstart-ds.xml 2008-05-21 12:36:55 UTC (rev 20100)
@@ -1,24 +1,23 @@
<?xml version="1.0" encoding="UTF-8"?>
<datasources>
<local-tx-datasource>
- <jndi-name>QuickstartDB</jndi-name>
- <connection-url>jdbc:hsqldb:hsql://${jboss.bind.address}:1703</connection-url>
+ <jndi-name>HelloworldSqlDB</jndi-name>
+ <connection-url>jdbc:hsqldb:hsql://${jboss.bind.address}:1704</connection-url>
<driver-class>org.hsqldb.jdbcDriver</driver-class>
<user-name>sa</user-name>
<password></password>
<min-pool-size>5</min-pool-size>
<max-pool-size>20</max-pool-size>
<idle-timeout-minutes>0</idle-timeout-minutes>
- <depends>jboss:service=Hypersonic</depends>
+ <depends>jboss:service=HelloworldSqlDB</depends>
<prepared-statement-cache-size>32</prepared-statement-cache-size>
</local-tx-datasource>
- <!-- For hsqldb accessed from jboss only, in-process (standalone) mode -->
- <mbean code="org.jboss.jdbc.HypersonicDatabase"
- name="jboss:service=Hypersonic">
- <attribute name="Port">1703</attribute>
+ <mbean code="org.jboss.internal.soa.esb.dependencies.HypersonicDatabase"
+ name="jboss:service=HelloworldSqlDB">
+ <attribute name="Port">1704</attribute>
<attribute name="BindAddress">${jboss.bind.address}</attribute>
- <attribute name="Database">quickstartDB</attribute>
+ <attribute name="Database">HelloworldSqlDB</attribute>
<attribute name="Silent">true</attribute>
<attribute name="Trace">false</attribute>
<attribute name="No_system_exit">true</attribute>
Modified: labs/jbossesb/trunk/product/samples/quickstarts/helloworld_tx_sql_action/build.xml
===================================================================
--- labs/jbossesb/trunk/product/samples/quickstarts/helloworld_tx_sql_action/build.xml 2008-05-21 10:50:09 UTC (rev 20099)
+++ labs/jbossesb/trunk/product/samples/quickstarts/helloworld_tx_sql_action/build.xml 2008-05-21 12:36:55 UTC (rev 20100)
@@ -5,7 +5,7 @@
${line.separator}
</description>
- <property name="additional.deploys" value="jbossesb-service.xml" />
+ <property name="additional.deploys" value="jbossesb-service.xml quickstart-ds.xml" />
<!-- Import the base Ant build script... -->
<import file="../conf/base-build.xml"/>
@@ -13,19 +13,13 @@
<target name="quickstart-specific-assemblies" description="Quickstart specific assemblies">
</target>
- <target name="quickstart-specific-deploys" description="Quickstart specific deploys">
- <copy file="quickstart-ds.xml"
- todir="${org.jboss.esb.server.deploy.dir}"
- overwrite="false"/>
- </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:1703"
+ url="jdbc:hsqldb:hsql://localhost:1705"
userid="sa"
autocommit="true"
password="">
@@ -43,7 +37,7 @@
<sql
print="true"
driver="org.hsqldb.jdbcDriver"
- url="jdbc:hsqldb:hsql://localhost:1703"
+ url="jdbc:hsqldb:hsql://localhost:1705"
userid="sa"
autocommit="true"
password="">
@@ -64,7 +58,7 @@
<sql
print="true"
driver="org.hsqldb.jdbcDriver"
- url="jdbc:hsqldb:hsql://localhost:1703"
+ url="jdbc:hsqldb:hsql://localhost:1705"
userid="sa"
autocommit="true"
password="">
@@ -85,7 +79,7 @@
<sql
print="true"
driver="org.hsqldb.jdbcDriver"
- url="jdbc:hsqldb:hsql://localhost:1703"
+ url="jdbc:hsqldb:hsql://localhost:1705"
userid="sa"
autocommit="true"
password="">
@@ -106,7 +100,7 @@
<sql
print="true"
driver="org.hsqldb.jdbcDriver"
- url="jdbc:hsqldb:hsql://localhost:1703"
+ url="jdbc:hsqldb:hsql://localhost:1705"
userid="sa"
autocommit="true"
password="">
@@ -120,7 +114,7 @@
<sql
print="true"
driver="org.hsqldb.jdbcDriver"
- url="jdbc:hsqldb:hsql://localhost:1703"
+ url="jdbc:hsqldb:hsql://localhost:1705"
userid="sa"
autocommit="true"
password="">
Modified: labs/jbossesb/trunk/product/samples/quickstarts/helloworld_tx_sql_action/deployment.xml
===================================================================
--- labs/jbossesb/trunk/product/samples/quickstarts/helloworld_tx_sql_action/deployment.xml 2008-05-21 10:50:09 UTC (rev 20099)
+++ labs/jbossesb/trunk/product/samples/quickstarts/helloworld_tx_sql_action/deployment.xml 2008-05-21 12:36:55 UTC (rev 20100)
@@ -1,3 +1,3 @@
<jbossesb-deployment>
- <depends>jboss.esb:service=QuickstartDatabaseInitializer</depends>
+ <depends>jboss.esb:service=HelloworldTxSqlDatabaseInitializer</depends>
</jbossesb-deployment>
Modified: labs/jbossesb/trunk/product/samples/quickstarts/helloworld_tx_sql_action/jboss-esb.xml
===================================================================
--- labs/jbossesb/trunk/product/samples/quickstarts/helloworld_tx_sql_action/jboss-esb.xml 2008-05-21 10:50:09 UTC (rev 20099)
+++ labs/jbossesb/trunk/product/samples/quickstarts/helloworld_tx_sql_action/jboss-esb.xml 2008-05-21 12:36:55 UTC (rev 20100)
@@ -3,7 +3,7 @@
<providers>
<sql-provider name="GatewaySQLprovider"
- url="jdbc:hsqldb:hsql://localhost:1703"
+ url="jdbc:hsqldb:hsql://localhost:1705"
driver="org.hsqldb.jdbcDriver"
username="sa"
password="">
@@ -21,8 +21,8 @@
</sql-provider>
<sql-provider name="SQLprovider"
- url="jdbc:hsqldb:hsql://localhost:1703"
- datasource="java:/QuickstartDB">
+ url="jdbc:hsqldb:hsql://localhost:1705"
+ datasource="java:/HelloworldTxSqlDB">
<sql-bus busid="TxHelloSQLChannel" >
<sql-message-filter
tablename="TX_ESB_MESSAGES"
Modified: labs/jbossesb/trunk/product/samples/quickstarts/helloworld_tx_sql_action/jbossesb-service.xml
===================================================================
--- labs/jbossesb/trunk/product/samples/quickstarts/helloworld_tx_sql_action/jbossesb-service.xml 2008-05-21 10:50:09 UTC (rev 20099)
+++ labs/jbossesb/trunk/product/samples/quickstarts/helloworld_tx_sql_action/jbossesb-service.xml 2008-05-21 12:36:55 UTC (rev 20100)
@@ -2,12 +2,12 @@
<server>
<mbean code="org.jboss.internal.soa.esb.dependencies.DatabaseInitializer"
- name="jboss.esb:service=QuickstartDatabaseInitializer">
- <attribute name="Datasource">java:/QuickstartDB</attribute>
+ name="jboss.esb:service=HelloworldTxSqlDatabaseInitializer">
+ <attribute name="Datasource">java:/HelloworldTxSqlDB</attribute>
<attribute name="ExistsSql">select * from gateway_table</attribute>
<attribute name="SqlFiles">
hsqldb/create.sql
</attribute>
- <depends>jboss.jca:name=QuickstartDB,service=DataSourceBinding</depends>
+ <depends>jboss.jca:name=HelloworldTxSqlDB,service=DataSourceBinding</depends>
</mbean>
</server>
Modified: labs/jbossesb/trunk/product/samples/quickstarts/helloworld_tx_sql_action/quickstart-ds.xml
===================================================================
--- labs/jbossesb/trunk/product/samples/quickstarts/helloworld_tx_sql_action/quickstart-ds.xml 2008-05-21 10:50:09 UTC (rev 20099)
+++ labs/jbossesb/trunk/product/samples/quickstarts/helloworld_tx_sql_action/quickstart-ds.xml 2008-05-21 12:36:55 UTC (rev 20100)
@@ -1,24 +1,23 @@
<?xml version="1.0" encoding="UTF-8"?>
<datasources>
<local-tx-datasource>
- <jndi-name>QuickstartDB</jndi-name>
- <connection-url>jdbc:hsqldb:hsql://${jboss.bind.address}:1703</connection-url>
+ <jndi-name>HelloworldTxSqlDB</jndi-name>
+ <connection-url>jdbc:hsqldb:hsql://${jboss.bind.address}:1705</connection-url>
<driver-class>org.hsqldb.jdbcDriver</driver-class>
<user-name>sa</user-name>
<password></password>
<min-pool-size>5</min-pool-size>
<max-pool-size>20</max-pool-size>
<idle-timeout-minutes>0</idle-timeout-minutes>
- <depends>jboss:service=Hypersonic</depends>
+ <depends>jboss:service=HelloworldTxSqlDB</depends>
<prepared-statement-cache-size>32</prepared-statement-cache-size>
</local-tx-datasource>
- <!-- For hsqldb accessed from jboss only, in-process (standalone) mode -->
- <mbean code="org.jboss.jdbc.HypersonicDatabase"
- name="jboss:service=Hypersonic">
- <attribute name="Port">1703</attribute>
+ <mbean code="org.jboss.internal.soa.esb.dependencies.HypersonicDatabase"
+ name="jboss:service=HelloworldTxSqlDB">
+ <attribute name="Port">1705</attribute>
<attribute name="BindAddress">${jboss.bind.address}</attribute>
- <attribute name="Database">QuickstartDB</attribute>
+ <attribute name="Database">HelloworldTxSqlDB</attribute>
<attribute name="Silent">true</attribute>
<attribute name="Trace">false</attribute>
<attribute name="No_system_exit">true</attribute>
Modified: labs/jbossesb/trunk/product/samples/quickstarts/jms_transacted/build.xml
===================================================================
--- labs/jbossesb/trunk/product/samples/quickstarts/jms_transacted/build.xml 2008-05-21 10:50:09 UTC (rev 20099)
+++ labs/jbossesb/trunk/product/samples/quickstarts/jms_transacted/build.xml 2008-05-21 12:36:55 UTC (rev 20100)
@@ -5,21 +5,11 @@
${line.separator}
</description>
- <property name="additional.deploys" value="jbossesb-service.xml" />
+ <property name="additional.deploys" value="jbossesb-service.xml quickstart-ds.xml" />
<!-- Import the base Ant build script... -->
<import file="../conf/base-build.xml"/>
- <target name="quickstart-specific-deploys">
- <copy file="quickstart-ds.xml"
- todir="${org.jboss.esb.server.deploy.dir}"
- overwrite="false"/>
- </target>
-
- <target name="quickstart-specific-undeploys">
- <delete file="${org.jboss.esb.server.deploy.dir}/quickstart-ds.xml"/>
- </target>
-
<target name="runtest" depends="compile"
description="sends a JMS message to queue/quickstart_jms_transacted_Request_gw">
<echo>Runs Test JMS Sender</echo>
@@ -39,7 +29,7 @@
<sql
print="true"
driver="org.hsqldb.jdbcDriver"
- url="jdbc:hsqldb:hsql://localhost:1703"
+ url="jdbc:hsqldb:hsql://localhost:1706"
userid="sa"
autocommit="true"
password="">
@@ -60,7 +50,7 @@
<sql
print="true"
driver="org.hsqldb.jdbcDriver"
- url="jdbc:hsqldb:hsql://localhost:1703"
+ url="jdbc:hsqldb:hsql://localhost:1706"
userid="sa"
autocommit="true"
password="">
Modified: labs/jbossesb/trunk/product/samples/quickstarts/jms_transacted/deployment.xml
===================================================================
--- labs/jbossesb/trunk/product/samples/quickstarts/jms_transacted/deployment.xml 2008-05-21 10:50:09 UTC (rev 20099)
+++ labs/jbossesb/trunk/product/samples/quickstarts/jms_transacted/deployment.xml 2008-05-21 12:36:55 UTC (rev 20100)
@@ -1,4 +1,5 @@
<jbossesb-deployment>
<depends>jboss.esb.quickstart.destination:service=Queue,name=quickstart_jms_transacted_Request_esb</depends>
<depends>jboss.esb.quickstart.destination:service=Queue,name=quickstart_jms_transacted_Request_gw</depends>
+ <depends>jboss.esb:service=JmsTransactedDatabaseInitializer</depends>
</jbossesb-deployment>
Modified: labs/jbossesb/trunk/product/samples/quickstarts/jms_transacted/jboss-esb.xml
===================================================================
--- labs/jbossesb/trunk/product/samples/quickstarts/jms_transacted/jboss-esb.xml 2008-05-21 10:50:09 UTC (rev 20099)
+++ labs/jbossesb/trunk/product/samples/quickstarts/jms_transacted/jboss-esb.xml 2008-05-21 12:36:55 UTC (rev 20100)
@@ -50,7 +50,7 @@
</action>
<action name="insertDBAction" class="org.jboss.soa.esb.samples.quickstart.jmstransacted.test.DBInsertAction">
- <property name="datasource-name" value="java:QuickstartDS"/>
+ <property name="datasource-name" value="java:JmsTransactedDB"/>
<property name="db-insert-sql" value="insert into jms_transacted_table(data_column) values(?)"/>
</action>
Modified: labs/jbossesb/trunk/product/samples/quickstarts/jms_transacted/jbossesb-service.xml
===================================================================
--- labs/jbossesb/trunk/product/samples/quickstarts/jms_transacted/jbossesb-service.xml 2008-05-21 10:50:09 UTC (rev 20099)
+++ labs/jbossesb/trunk/product/samples/quickstarts/jms_transacted/jbossesb-service.xml 2008-05-21 12:36:55 UTC (rev 20100)
@@ -2,12 +2,12 @@
<server>
<mbean code="org.jboss.internal.soa.esb.dependencies.DatabaseInitializer"
- name="jboss.esb:service=QuickstartDatabaseInitializer">
- <attribute name="Datasource">java:/QuickstartDS</attribute>
+ name="jboss.esb:service=JmsTransactedDatabaseInitializer">
+ <attribute name="Datasource">java:/JmsTransactedDB</attribute>
<attribute name="ExistsSql">select * from jms_transacted_table</attribute>
<attribute name="SqlFiles">
hsqldb/create.sql
</attribute>
- <depends>jboss.jca:name=QuickstartDS,service=DataSourceBinding</depends>
+ <depends>jboss.jca:name=JmsTransactedDB,service=DataSourceBinding</depends>
</mbean>
</server>
Modified: labs/jbossesb/trunk/product/samples/quickstarts/jms_transacted/quickstart-ds.xml
===================================================================
--- labs/jbossesb/trunk/product/samples/quickstarts/jms_transacted/quickstart-ds.xml 2008-05-21 10:50:09 UTC (rev 20099)
+++ labs/jbossesb/trunk/product/samples/quickstarts/jms_transacted/quickstart-ds.xml 2008-05-21 12:36:55 UTC (rev 20100)
@@ -1,24 +1,23 @@
<?xml version="1.0" encoding="UTF-8"?>
<datasources>
<local-tx-datasource>
- <jndi-name>QuickstartDS</jndi-name>
- <connection-url>jdbc:hsqldb:hsql://${jboss.bind.address}:1703</connection-url>
+ <jndi-name>JmsTransactedDB</jndi-name>
+ <connection-url>jdbc:hsqldb:hsql://${jboss.bind.address}:1706</connection-url>
<driver-class>org.hsqldb.jdbcDriver</driver-class>
<user-name>sa</user-name>
<password></password>
<min-pool-size>5</min-pool-size>
<max-pool-size>20</max-pool-size>
<idle-timeout-minutes>0</idle-timeout-minutes>
- <depends>jboss:service=Hypersonic</depends>
+ <depends>jboss:service=JmsTransactedDB</depends>
<prepared-statement-cache-size>32</prepared-statement-cache-size>
</local-tx-datasource>
- <!-- For hsqldb accessed from jboss only, in-process (standalone) mode -->
- <mbean code="org.jboss.jdbc.HypersonicDatabase"
- name="jboss:service=Hypersonic">
- <attribute name="Port">1703</attribute>
+ <mbean code="org.jboss.internal.soa.esb.dependencies.HypersonicDatabase"
+ name="jboss:service=JmsTransactedDB">
+ <attribute name="Port">1706</attribute>
<attribute name="BindAddress">${jboss.bind.address}</attribute>
- <attribute name="Database">QuickstartDB</attribute>
+ <attribute name="Database">JmsTransactedDB</attribute>
<attribute name="Silent">true</attribute>
<attribute name="Trace">false</attribute>
<attribute name="No_system_exit">true</attribute>
More information about the jboss-svn-commits
mailing list