[jboss-svn-commits] JBL Code SVN: r34021 - in labs/jbossesb/trunk/product: install and 4 other directories.
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Mon Jul 19 07:38:59 EDT 2010
Author: tfennelly
Date: 2010-07-19 07:38:58 -0400 (Mon, 19 Jul 2010)
New Revision: 34021
Added:
labs/jbossesb/trunk/product/install/deployment-xml.xsl
labs/jbossesb/trunk/product/services/jbossesb/src/main/resources/hornetq-jms.xml
labs/jbossesb/trunk/product/services/jbossesb/src/main/resources/no-service.xml
labs/jbossesb/trunk/product/services/jbpm/src/main/resources/hornetq-jms.xml
Modified:
labs/jbossesb/trunk/product/.classpath
labs/jbossesb/trunk/product/install/build.xml
labs/jbossesb/trunk/product/services/jbossesb/src/main/resources/META-INF/deployment.xml
labs/jbossesb/trunk/product/services/jbpm/src/main/resources/META-INF/deployment.xml
Log:
https://jira.jboss.org/browse/JBESB-3332
Provide support for HornetQ in core ESB Services
Modified: labs/jbossesb/trunk/product/.classpath
===================================================================
--- labs/jbossesb/trunk/product/.classpath 2010-07-19 11:21:34 UTC (rev 34020)
+++ labs/jbossesb/trunk/product/.classpath 2010-07-19 11:38:58 UTC (rev 34021)
@@ -68,7 +68,7 @@
<classpathentry kind="lib" path="build/lib/jboss-deployers-core-spi-2.0.7.GA.jar"/>
<classpathentry kind="lib" path="build/lib/jboss-deployers-impl-2.0.7.GA.jar"/>
<classpathentry kind="lib" path="build/lib/jboss-deployers-spi-2.0.7.GA.jar"/>
- <classpathentry kind="lib" path="build/lib/jboss-deployers-structure-spi-2.0.7.GA.jar"/>
+ <classpathentry kind="lib" path="build/lib/jboss-deployers-structure-spi-2.0.7.GA.jar" sourcepath="/jboss-deployers-structure-spi"/>
<classpathentry kind="lib" path="build/lib/jboss-deployers-vfs-2.0.7.GA.jar"/>
<classpathentry kind="lib" path="build/lib/jboss-deployers-vfs-spi-2.0.7.GA.jar"/>
<classpathentry kind="lib" path="build/lib/jboss-kernel-2.0.6.GA.jar"/>
@@ -195,5 +195,12 @@
<classpathentry kind="lib" path="build/lib/sxc-xpath-0.7.3.jar"/>
<classpathentry kind="lib" path="build/lib/wstx-asl-3.2.0.jar"/>
<classpathentry kind="lib" path="build/lib/jaxen-1.1.jar"/>
+ <classpathentry combineaccessrules="false" kind="src" path="/jboss-deployers-core"/>
+ <classpathentry combineaccessrules="false" kind="src" path="/jboss-deployers-core-spi"/>
+ <classpathentry combineaccessrules="false" kind="src" path="/jboss-deployers-impl"/>
+ <classpathentry combineaccessrules="false" kind="src" path="/jboss-deployers-spi"/>
+ <classpathentry combineaccessrules="false" kind="src" path="/jboss-deployers-structure-spi"/>
+ <classpathentry combineaccessrules="false" kind="src" path="/jboss-deployers-vfs"/>
+ <classpathentry combineaccessrules="false" kind="src" path="/jboss-deployers-vfs-spi"/>
<classpathentry kind="output" path="bin"/>
</classpath>
Modified: labs/jbossesb/trunk/product/install/build.xml
===================================================================
--- labs/jbossesb/trunk/product/install/build.xml 2010-07-19 11:21:34 UTC (rev 34020)
+++ labs/jbossesb/trunk/product/install/build.xml 2010-07-19 11:38:58 UTC (rev 34021)
@@ -135,12 +135,15 @@
file="${deploy.dir}/jms/jbossmq-service.xml"/>
<available property="jbmq.present"
file="${hadeploy.dir}/jms/jbossmq-service.xml"/>
+ <available property="hornetq.present"
+ file="${deploy.dir}/hornetq"/>
<fail message="Could not determine JMS provider">
<condition>
<not>
<or>
<isset property="jbm.present"/>
<isset property="jbmq.present"/>
+ <isset property="hornetq.present"/>
</or>
</not>
</condition>
@@ -148,15 +151,23 @@
</target>
<target name="jbmq.config" if="jbmq.present">
- <property name="messaging.excludes" value="jbm-queue-service.xml"/>
+ <property name="messaging.excludes" value="jbm-queue-service.xml,hornetq-jms.xml,no-service.xml"/>
+ <property name="messaging.provider" value="jbmq"/>
</target>
<target name="jbm.config" if="jbm.present">
- <property name="messaging.excludes" value="jbmq-queue-service.xml"/>
+ <property name="messaging.excludes" value="jbmq-queue-service.xml,hornetq-jms.xml,no-service.xml"/>
+ <property name="messaging.provider" value="jbm"/>
</target>
- <target name="jms.config" depends="jms.config.check, jbmq.config, jbm.config"/>
+ <target name="hornetq.config" if="hornetq.present">
+ <!-- no-service.xml is included (not excluded) for hornetq because of https://jira.jboss.org/browse/JBAS-7438 -->
+ <property name="messaging.excludes" value="jbm-queue-service.xml,jbmq-queue-service.xml"/>
+ <property name="messaging.provider" value="hornetq"/>
+ </target>
+ <target name="jms.config" depends="jms.config.check, jbmq.config, jbm.config, hornetq.config"/>
+
<target name="check.deploy.props">
<condition property="esb.server.configured">
<and>
@@ -183,42 +194,8 @@
<fileset dir="${org.jboss.esb.dist.lib}/jbossesb-registry.sar" includes="esb.juddi.xml"/>
</copy>
- <!-- jbossesb.esb -->
- <copy todir="${deploy.dir}/jbossesb.esb">
- <fileset dir="${org.jboss.esb.dist.lib}/jbossesb.esb" excludes="${messaging.excludes}"/>
- </copy>
+ <antcall target="deployEsbModules" />
- <!-- jbpm.esb -->
- <copy todir="${deploy.dir}/jbpm.esb">
- <fileset dir="${org.jboss.esb.dist.lib}/jbpm.esb" excludes="${messaging.excludes}"/>
- </copy>
-
- <!-- jbrules.esb -->
- <copy todir="${deploy.dir}/jbrules.esb">
- <fileset dir="${org.jboss.esb.dist.lib}/jbrules.esb" excludes="${messaging.excludes}"/>
- </copy>
-
- <!-- smooks.esb -->
- <copy todir="${deploy.dir}/smooks.esb">
- <fileset dir="${org.jboss.esb.dist.lib}/smooks.esb" excludes="${messaging.excludes}"/>
- </copy>
-
- <!-- spring.esb -->
- <copy todir="${deploy.dir}/spring.esb">
- <fileset dir="${org.jboss.esb.dist.lib}/spring.esb" excludes="${messaging.excludes}"/>
- </copy>
-
- <!-- soap.esb -->
- <copy todir="${deploy.dir}/soap.esb">
- <fileset dir="${org.jboss.esb.dist.lib}/soap.esb" excludes="${messaging.excludes}, META-INF/jboss-structure.xml, ${wise.excludes}"/>
- <fileset dir="${client.dir}" includes="${wise.includes}"/>
- </copy>
-
- <!-- slsb.esb -->
- <copy todir="${deploy.dir}/slsb.esb">
- <fileset dir="${org.jboss.esb.dist.lib}/slsb.esb" excludes="${messaging.excludes}"/>
- </copy>
-
<!-- soapui-client.sar -->
<copy todir="${deploy.dir}/soapui-client.sar">
<fileset dir="${org.jboss.esb.dist.lib}/soapui-client.sar" excludes="${messaging.excludes}, META-INF/jboss-service-as5.xml"/>
@@ -242,7 +219,7 @@
<property name="org.jboss.esb.server.config" value="${org.jboss.esb.server.config}"/>
</ant>
</target>
-
+
<target name="internal.deploy.jbossas5" if="jbossas5" depends="check.deploy.props, dependencies, jms.config" description="Deploys Internal Services to the JBossAS5">
<echo message="Deploy to JBossAS5"/>
@@ -365,42 +342,8 @@
<copy tofile="${deploy.dir}/jbossesb-registry.sar/META-INF/jboss-service.xml" file="${basedir}/registry-jboss-service-jbossas5.xml" overwrite="true"/>
<copy tofile="${deploy.dir}/jbossesb-registry.sar/META-INF/jboss-structure.xml" file="${basedir}/registry-jboss-structure.xml" overwrite="true"/>
- <!-- jbossesb.esb -->
- <copy todir="${deploy.dir}/jbossesb.esb">
- <fileset dir="${org.jboss.esb.dist.lib}/jbossesb.esb" excludes="${messaging.excludes}"/>
- </copy>
+ <antcall target="deployEsbModules" />
- <!-- jbpm.esb -->
- <copy todir="${deploy.dir}/jbpm.esb">
- <fileset dir="${org.jboss.esb.dist.lib}/jbpm.esb" excludes="${messaging.excludes}"/>
- </copy>
-
- <!-- jbrules.esb -->
- <copy todir="${deploy.dir}/jbrules.esb">
- <fileset dir="${org.jboss.esb.dist.lib}/jbrules.esb" excludes="${messaging.excludes}"/>
- </copy>
-
- <!-- smooks.esb -->
- <copy todir="${deploy.dir}/smooks.esb">
- <fileset dir="${org.jboss.esb.dist.lib}/smooks.esb" excludes="${messaging.excludes}"/>
- </copy>
-
- <!-- spring.esb -->
- <copy todir="${deploy.dir}/spring.esb">
- <fileset dir="${org.jboss.esb.dist.lib}/spring.esb" excludes="${messaging.excludes}"/>
- </copy>
-
- <!-- soap.esb -->
- <copy todir="${deploy.dir}/soap.esb">
- <fileset dir="${org.jboss.esb.dist.lib}/soap.esb" excludes="${messaging.excludes}, ${wise.excludes}"/>
- <fileset dir="${client.dir}" includes="${wise.includes}"/>
- </copy>
-
- <!-- slsb.esb -->
- <copy todir="${deploy.dir}/slsb.esb">
- <fileset dir="${org.jboss.esb.dist.lib}/slsb.esb" excludes="${messaging.excludes}"/>
- </copy>
-
<!-- soapui-client.sar -->
<copy todir="${deploy.dir}/soapui-client.sar">
<fileset dir="${org.jboss.esb.dist.lib}/soapui-client.sar" excludes="${messaging.excludes} META-INF/jboss-service-as5.xml"/>
@@ -419,7 +362,59 @@
</ant>
</target>
+
+ <target name="deployEsbModules">
+ <!-- jbossesb.esb -->
+ <antcall target="deployEsbModule">
+ <param name="esbModuleName" value="jbossesb.esb" />
+ </antcall>
+
+ <!-- jbpm.esb -->
+ <antcall target="deployEsbModule">
+ <param name="esbModuleName" value="jbpm.esb" />
+ </antcall>
+ <!-- jbrules.esb -->
+ <antcall target="deployEsbModule">
+ <param name="esbModuleName" value="jbrules.esb" />
+ </antcall>
+
+ <!-- smooks.esb -->
+ <antcall target="deployEsbModule">
+ <param name="esbModuleName" value="smooks.esb" />
+ </antcall>
+
+ <!-- spring.esb -->
+ <antcall target="deployEsbModule">
+ <param name="esbModuleName" value="spring.esb" />
+ </antcall>
+
+ <!-- soap.esb -->
+ <antcall target="deployEsbModule">
+ <param name="esbModuleName" value="soap.esb" />
+ </antcall>
+
+ <!-- slsb.esb -->
+ <antcall target="deployEsbModule">
+ <param name="esbModuleName" value="slsb.esb" />
+ </antcall>
+ </target>
+
+ <target name="deployEsbModule">
+ <echo>Deploying ESB ${esbModuleName} to ${deploy.dir}</echo>
+
+ <copy todir="${deploy.dir}/${esbModuleName}">
+ <fileset dir="${org.jboss.esb.dist.lib}/${esbModuleName}" excludes="${messaging.excludes}"/>
+ </copy>
+
+ <xslt style="deployment-xml.xsl" in="${deploy.dir}/${esbModuleName}/META-INF/deployment.xml" out="${deploy.dir}/${esbModuleName}/META-INF/deployment.xml.transformed">
+ <param name="jmsProvider" expression="${messaging.provider}"/>
+ </xslt>
+
+ <delete file="${deploy.dir}/${esbModuleName}/META-INF/deployment.xml" failonerror="false" />
+ <move file="${deploy.dir}/${esbModuleName}/META-INF/deployment.xml.transformed" tofile="${deploy.dir}/${esbModuleName}/META-INF/deployment.xml" />
+ </target>
+
<target name="undeploy" depends="check.deploy.props, undeploy.bindings, undeploy.jbossas5" description="Undeploy ESB components.">
<delete dir="${deploy.dir}/jbossesb.sar" quiet="true"/>
<delete dir="${deploy.dir}/jbossesb-registry.sar" quiet="true"/>
Added: labs/jbossesb/trunk/product/install/deployment-xml.xsl
===================================================================
--- labs/jbossesb/trunk/product/install/deployment-xml.xsl (rev 0)
+++ labs/jbossesb/trunk/product/install/deployment-xml.xsl 2010-07-19 11:38:58 UTC (rev 34021)
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
+
+ <xsl:param name="jmsProvider" />
+
+ <xsl:template match="jmsQueue">
+ <xsl:choose>
+ <xsl:when test="$jmsProvider = 'hornetq'">
+ <depends>org.hornetq:module=JMS,type=Queue,name="<xsl:value-of select='.'/>"</depends>
+ </xsl:when>
+ <xsl:otherwise>
+ <depends>jboss.esb.destination:service=Queue,name=<xsl:value-of select='.'/></depends>
+ </xsl:otherwise>
+ </xsl:choose>
+ </xsl:template>
+
+ <xsl:template match="jmsTopic">
+ <xsl:choose>
+ <xsl:when test="$jmsProvider = 'hornetq'">
+ <depends>org.hornetq:module=JMS,type=Topic,name="<xsl:value-of select='.'/>"</depends>
+ </xsl:when>
+ <xsl:otherwise>
+ <depends>jboss.esb.destination:service=Topic,name=<xsl:value-of select='.'/></depends>
+ </xsl:otherwise>
+ </xsl:choose>
+ </xsl:template>
+
+ <!-- Copy everything else... -->
+ <xsl:template match="@*|node()">
+ <xsl:copy>
+ <xsl:apply-templates select="@*"/>
+ <xsl:apply-templates/>
+ </xsl:copy>
+ </xsl:template>
+</xsl:stylesheet>
\ No newline at end of file
Modified: labs/jbossesb/trunk/product/services/jbossesb/src/main/resources/META-INF/deployment.xml
===================================================================
--- labs/jbossesb/trunk/product/services/jbossesb/src/main/resources/META-INF/deployment.xml 2010-07-19 11:21:34 UTC (rev 34020)
+++ labs/jbossesb/trunk/product/services/jbossesb/src/main/resources/META-INF/deployment.xml 2010-07-19 11:38:58 UTC (rev 34021)
@@ -1,11 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
<jbossesb-deployment>
<depends>jboss.jca:service=DataSourceBinding,name=JBossESBDS</depends>
- <depends>jboss.esb.destination:service=Queue,name=DeadMessageQueue</depends>
<depends>jboss.esb:service=MessageStoreDatabaseInitializer</depends>
- <depends>jboss.esb.destination:service=Queue,name=DataCollectorQueue</depends>
- <depends>jboss.esb.destination:service=Queue,name=OperationsCollectorQueue</depends>
- <depends>jboss.esb.destination:service=Queue,name=OperationsResultCollectorQueue</depends>
+ <jmsQueue>DeadMessageQueue</jmsQueue>
+ <jmsQueue>DataCollectorQueue</jmsQueue>
+ <jmsQueue>OperationsCollectorQueue</jmsQueue>
+ <jmsQueue>OperationsResultCollectorQueue</jmsQueue>
<depends>jboss.esb:service=ESBRegistry</depends>
<depends>jboss.esb:service=InVM</depends>
<depends>jboss.esb:service=JuddiClient</depends>
Added: labs/jbossesb/trunk/product/services/jbossesb/src/main/resources/hornetq-jms.xml
===================================================================
--- labs/jbossesb/trunk/product/services/jbossesb/src/main/resources/hornetq-jms.xml (rev 0)
+++ labs/jbossesb/trunk/product/services/jbossesb/src/main/resources/hornetq-jms.xml 2010-07-19 11:38:58 UTC (rev 34021)
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<configuration xmlns="urn:hornetq"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="urn:hornetq /schema/hornetq-jms.xsd">
+
+ <queue name="DeadMessageQueue">
+ <entry name="queue/DeadMessageQueue"/>
+ </queue>
+
+ <queue name="DataCollectorQueue">
+ <entry name="queue/DataCollectorQueue"/>
+ </queue>
+
+ <queue name="OperationsCollectorQueue">
+ <entry name="queue/OperationsCollectorQueue"/>
+ </queue>
+
+ <queue name="OperationsResultCollectorQueue">
+ <entry name="queue/OperationsResultCollectorQueue"/>
+ </queue>
+
+</configuration>
\ No newline at end of file
Property changes on: labs/jbossesb/trunk/product/services/jbossesb/src/main/resources/hornetq-jms.xml
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: labs/jbossesb/trunk/product/services/jbossesb/src/main/resources/no-service.xml
===================================================================
--- labs/jbossesb/trunk/product/services/jbossesb/src/main/resources/no-service.xml (rev 0)
+++ labs/jbossesb/trunk/product/services/jbossesb/src/main/resources/no-service.xml 2010-07-19 11:38:58 UTC (rev 34021)
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<server></server>
\ No newline at end of file
Property changes on: labs/jbossesb/trunk/product/services/jbossesb/src/main/resources/no-service.xml
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Modified: labs/jbossesb/trunk/product/services/jbpm/src/main/resources/META-INF/deployment.xml
===================================================================
--- labs/jbossesb/trunk/product/services/jbpm/src/main/resources/META-INF/deployment.xml 2010-07-19 11:21:34 UTC (rev 34020)
+++ labs/jbossesb/trunk/product/services/jbpm/src/main/resources/META-INF/deployment.xml 2010-07-19 11:38:58 UTC (rev 34021)
@@ -2,5 +2,5 @@
<jbossesb-deployment>
<depends>jboss.esb:deployment=jbossesb.esb</depends>
<depends>jboss.esb:service=JbpmService</depends>
- <depends>jboss.esb.destination:service=Queue,name=CallbackQueue</depends>
+ <jmsQueue>CallbackQueue</jmsQueue>
</jbossesb-deployment>
Added: labs/jbossesb/trunk/product/services/jbpm/src/main/resources/hornetq-jms.xml
===================================================================
--- labs/jbossesb/trunk/product/services/jbpm/src/main/resources/hornetq-jms.xml (rev 0)
+++ labs/jbossesb/trunk/product/services/jbpm/src/main/resources/hornetq-jms.xml 2010-07-19 11:38:58 UTC (rev 34021)
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<configuration xmlns="urn:hornetq"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="urn:hornetq /schema/hornetq-jms.xsd">
+
+ <queue name="CallbackQueue">
+ <entry name="queue/CallbackQueue"/>
+ </queue>
+
+</configuration>
\ No newline at end of file
Property changes on: labs/jbossesb/trunk/product/services/jbpm/src/main/resources/hornetq-jms.xml
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
More information about the jboss-svn-commits
mailing list