Author: objectiser Date: 2012-07-12 06:29:37 -0400 (Thu, 12 Jul 2012) New Revision: 1574 Added: branches/RiftSaw-2.3.x/samples/esb/esb_helloworld/esbcontent/META-INF/hornetq-jms.xml branches/RiftSaw-2.3.x/samples/esb/esb_loan_fault/esbcontent/META-INF/hornetq-jms.xml branches/RiftSaw-2.3.x/samples/esb/invoke_esb_ebws/esbcontent/META-INF/hornetq-jms.xml branches/RiftSaw-2.3.x/samples/esb/simple_esb_proxy_invoke/esbcontent/META-INF/hornetq-jms.xml Modified: branches/RiftSaw-2.3.x/samples/esb/esb_helloworld/build.xml branches/RiftSaw-2.3.x/samples/esb/esb_helloworld/esbcontent/META-INF/deployment.xml branches/RiftSaw-2.3.x/samples/esb/esb_loan_fault/build.xml branches/RiftSaw-2.3.x/samples/esb/esb_loan_fault/esbcontent/META-INF/deployment.xml branches/RiftSaw-2.3.x/samples/esb/invoke_esb_ebws/build.xml branches/RiftSaw-2.3.x/samples/esb/invoke_esb_ebws/esbcontent/META-INF/deployment.xml branches/RiftSaw-2.3.x/samples/esb/simple_esb_proxy_invoke/build.xml branches/RiftSaw-2.3.x/samples/esb/simple_esb_proxy_invoke/esbcontent/META-INF/deployment.xml Log: Fix to support deploying the quickstarts with hornetq. Modified: branches/RiftSaw-2.3.x/samples/esb/esb_helloworld/build.xml =================================================================== --- branches/RiftSaw-2.3.x/samples/esb/esb_helloworld/build.xml 2012-06-14 01:52:38 UTC (rev 1573) +++ branches/RiftSaw-2.3.x/samples/esb/esb_helloworld/build.xml 2012-07-12 10:29:37 UTC (rev 1574) @@ -11,8 +11,17 @@ <property name="sample.esb.name" value="${ant.project.name}.esb" /> - <target name="deployesb" > - <jar basedir="esbcontent" destfile="${deploy.dir}/${sample.esb.name}" /> + <target name="deployesb" depends="dependencies"> + <mkdir dir="${build.dir}"/> + <condition property="jms.excludes" value="**/hornetq-jms.xml" else="**/jbm-queue-service.xml"> + <equals arg1="${jms.provider}" arg2="jbm"/> + </condition> + <copy todir="${build.dir}"> + <fileset dir="esbcontent" excludes="${jms.excludes}"/> + </copy> + <property name="deploymentXmlExists" value="true"/> + <antcall target="transformDeploymentXml" inheritAll="true"/> + <jar basedir="${build.dir}" destfile="${deploy.dir}/${sample.esb.name}"/> </target> <target name="undeployesb"> Modified: branches/RiftSaw-2.3.x/samples/esb/esb_helloworld/esbcontent/META-INF/deployment.xml =================================================================== --- branches/RiftSaw-2.3.x/samples/esb/esb_helloworld/esbcontent/META-INF/deployment.xml 2012-06-14 01:52:38 UTC (rev 1573) +++ branches/RiftSaw-2.3.x/samples/esb/esb_helloworld/esbcontent/META-INF/deployment.xml 2012-07-12 10:29:37 UTC (rev 1574) @@ -1,6 +1,6 @@ <jbossesb-deployment> <depends>jboss.bpel:service=BPELEngine</depends> - <depends>jboss.esb.quickstart.destination:service=Queue,name=quickstart_bpel_helloworld_Request_esb</depends> - <depends>jboss.esb.quickstart.destination:service=Queue,name=quickstart_bpel_helloworld_Request_esb_reply</depends> - <depends>jboss.esb.quickstart.destination:service=Queue,name=quickstart_bpel_helloworld_Request_gw</depends> + <jmsQueue>quickstart_bpel_helloworld_Request_esb</jmsQueue> + <jmsQueue>quickstart_bpel_helloworld_Request_esb_reply</jmsQueue> + <jmsQueue>quickstart_bpel_helloworld_Request_gw</jmsQueue> </jbossesb-deployment> Added: branches/RiftSaw-2.3.x/samples/esb/esb_helloworld/esbcontent/META-INF/hornetq-jms.xml =================================================================== (Binary files differ) Property changes on: branches/RiftSaw-2.3.x/samples/esb/esb_helloworld/esbcontent/META-INF/hornetq-jms.xml ___________________________________________________________________ Added: svn:mime-type + application/xml Modified: branches/RiftSaw-2.3.x/samples/esb/esb_loan_fault/build.xml =================================================================== --- branches/RiftSaw-2.3.x/samples/esb/esb_loan_fault/build.xml 2012-06-14 01:52:38 UTC (rev 1573) +++ branches/RiftSaw-2.3.x/samples/esb/esb_loan_fault/build.xml 2012-07-12 10:29:37 UTC (rev 1574) @@ -11,8 +11,17 @@ <property name="sample.esb.name" value="${ant.project.name}.esb" /> - <target name="deployesb" > - <jar basedir="esbcontent" destfile="${deploy.dir}/${sample.esb.name}" /> + <target name="deployesb" depends="dependencies"> + <mkdir dir="${build.dir}"/> + <condition property="jms.excludes" value="**/hornetq-jms.xml" else="**/jbm-queue-service.xml"> + <equals arg1="${jms.provider}" arg2="jbm"/> + </condition> + <copy todir="${build.dir}"> + <fileset dir="esbcontent" excludes="${jms.excludes}"/> + </copy> + <property name="deploymentXmlExists" value="true"/> + <antcall target="transformDeploymentXml" inheritAll="true"/> + <jar basedir="${build.dir}" destfile="${deploy.dir}/${sample.esb.name}"/> </target> <target name="undeployesb"> Modified: branches/RiftSaw-2.3.x/samples/esb/esb_loan_fault/esbcontent/META-INF/deployment.xml =================================================================== --- branches/RiftSaw-2.3.x/samples/esb/esb_loan_fault/esbcontent/META-INF/deployment.xml 2012-06-14 01:52:38 UTC (rev 1573) +++ branches/RiftSaw-2.3.x/samples/esb/esb_loan_fault/esbcontent/META-INF/deployment.xml 2012-07-12 10:29:37 UTC (rev 1574) @@ -1,6 +1,6 @@ <jbossesb-deployment> <depends>jboss.bpel:service=BPELEngine</depends> - <depends>jboss.esb.quickstart.destination:service=Queue,name=quickstart_bpel_loan_fault_Request_esb</depends> - <depends>jboss.esb.quickstart.destination:service=Queue,name=quickstart_bpel_loan_fault_Request_esb_reply</depends> - <depends>jboss.esb.quickstart.destination:service=Queue,name=quickstart_bpel_loan_fault_Request_gw</depends> + <jmsQueue>quickstart_bpel_loan_fault_Request_esb</jmsQueue> + <jmsQueue>quickstart_bpel_loan_fault_Request_esb_reply</jmsQueue> + <jmsQueue>quickstart_bpel_loan_fault_Request_gw</jmsQueue> </jbossesb-deployment> Added: branches/RiftSaw-2.3.x/samples/esb/esb_loan_fault/esbcontent/META-INF/hornetq-jms.xml =================================================================== (Binary files differ) Property changes on: branches/RiftSaw-2.3.x/samples/esb/esb_loan_fault/esbcontent/META-INF/hornetq-jms.xml ___________________________________________________________________ Added: svn:mime-type + application/xml Modified: branches/RiftSaw-2.3.x/samples/esb/invoke_esb_ebws/build.xml =================================================================== --- branches/RiftSaw-2.3.x/samples/esb/invoke_esb_ebws/build.xml 2012-06-14 01:52:38 UTC (rev 1573) +++ branches/RiftSaw-2.3.x/samples/esb/invoke_esb_ebws/build.xml 2012-07-12 10:29:37 UTC (rev 1574) @@ -12,8 +12,17 @@ <property name="sample.jar.name" value="${ant.project.name}-${version}.jar" /> <property name="sample.esb.name" value="CreditAgency.esb" /> - <target name="deployesb" > - <jar basedir="esbcontent" destfile="${deploy.dir}/${sample.esb.name}" /> + <target name="deployesb" depends="dependencies"> + <mkdir dir="${build.dir}"/> + <condition property="jms.excludes" value="**/hornetq-jms.xml" else="**/jbm-queue-service.xml"> + <equals arg1="${jms.provider}" arg2="jbm"/> + </condition> + <copy todir="${build.dir}"> + <fileset dir="esbcontent" excludes="${jms.excludes}"/> + </copy> + <property name="deploymentXmlExists" value="true"/> + <antcall target="transformDeploymentXml" inheritAll="true"/> + <jar basedir="${build.dir}" destfile="${deploy.dir}/${sample.esb.name}"/> </target> <target name="undeployesb"> Modified: branches/RiftSaw-2.3.x/samples/esb/invoke_esb_ebws/esbcontent/META-INF/deployment.xml =================================================================== --- branches/RiftSaw-2.3.x/samples/esb/invoke_esb_ebws/esbcontent/META-INF/deployment.xml 2012-06-14 01:52:38 UTC (rev 1573) +++ branches/RiftSaw-2.3.x/samples/esb/invoke_esb_ebws/esbcontent/META-INF/deployment.xml 2012-07-12 10:29:37 UTC (rev 1574) @@ -1,3 +1,4 @@ <jbossesb-deployment> - <depends>jboss.esb.quickstart.destination:service=Queue,name=CreditAgency_ESB</depends> + <jmsQueue>CreditAgency_ESB</jmsQueue> + <jmsQueue>CreditAgency_ESB_reply</jmsQueue> </jbossesb-deployment> Added: branches/RiftSaw-2.3.x/samples/esb/invoke_esb_ebws/esbcontent/META-INF/hornetq-jms.xml =================================================================== (Binary files differ) Property changes on: branches/RiftSaw-2.3.x/samples/esb/invoke_esb_ebws/esbcontent/META-INF/hornetq-jms.xml ___________________________________________________________________ Added: svn:mime-type + application/xml Modified: branches/RiftSaw-2.3.x/samples/esb/simple_esb_proxy_invoke/build.xml =================================================================== --- branches/RiftSaw-2.3.x/samples/esb/simple_esb_proxy_invoke/build.xml 2012-06-14 01:52:38 UTC (rev 1573) +++ branches/RiftSaw-2.3.x/samples/esb/simple_esb_proxy_invoke/build.xml 2012-07-12 10:29:37 UTC (rev 1574) @@ -12,7 +12,7 @@ <property name="sample.jar.name" value="${ant.project.name}-${version}.jar" /> <property name="sample.esb.name" value="SimpleESBProxyInvoke.esb" /> - <property name="war.build.dir" location="build/war/classes"/> + <property name="war.build.dir" location="${basedir}/buildwar"/> <path id="compile-classpath"> <fileset dir="${org.jboss.as.home}/client" includes="*.jar" /> @@ -22,20 +22,20 @@ <target name="makewar" description="make war"> <!-- Compile... --> - <mkdir dir="${war.build.dir}" /> - <javac srcdir="war/src" destdir="${war.build.dir}" debug="true"> + <mkdir dir="${war.build.dir}/classes" /> + <javac srcdir="war/src" destdir="${war.build.dir}/classes" debug="true"> <classpath> <path refid="compile-classpath" /> </classpath> </javac> <!-- War... --> - <war warfile="build/${ant.project.name}.war" + <war warfile="${war.build.dir}/${ant.project.name}.war" webxml="${basedir}/war/resources/WEB-INF/web.xml"> <webinf dir="${basedir}/war/resources/WEB-INF"> <include name="jboss-web.xml"/> </webinf> - <classes dir="${war.build.dir}" includes="**/*.class"/> + <classes dir="${war.build.dir}/classes" includes="**/*.class"/> <fileset dir="${basedir}/war/view"> <include name="**/*"/> </fileset> @@ -47,15 +47,24 @@ <target name="deploywar" depends="makewar" > <copy todir="${deploy.dir}" - file="build/${ant.project.name}.war"/> + file="${war.build.dir}/${ant.project.name}.war"/> </target> <target name="undeploywar"> <delete file="${deploy.dir}/${ant.project.name}.war"/> </target> - <target name="deployesb" > - <jar basedir="esbcontent" destfile="${deploy.dir}/${sample.esb.name}" /> + <target name="deployesb" depends="dependencies"> + <mkdir dir="${build.dir}"/> + <condition property="jms.excludes" value="**/hornetq-jms.xml" else="**/jbm-queue-service.xml"> + <equals arg1="${jms.provider}" arg2="jbm"/> + </condition> + <copy todir="${build.dir}"> + <fileset dir="esbcontent" excludes="${jms.excludes}"/> + </copy> + <property name="deploymentXmlExists" value="true"/> + <antcall target="transformDeploymentXml" inheritAll="true"/> + <jar basedir="${build.dir}" destfile="${deploy.dir}/${sample.esb.name}"/> </target> <target name="undeployesb"> @@ -67,7 +76,7 @@ <jar basedir="bpelContent" destfile="${deploy.dir}/${sample.jar.name}" /> </target> - <target name="undeploy" depends="undeploywar,undeploywar" > + <target name="undeploy" depends="undeploywar,undeployesb" > <echo>Undeploy ${ant.project.name}</echo> <delete file="${deploy.dir}/${sample.jar.name}" /> </target> Modified: branches/RiftSaw-2.3.x/samples/esb/simple_esb_proxy_invoke/esbcontent/META-INF/deployment.xml =================================================================== --- branches/RiftSaw-2.3.x/samples/esb/simple_esb_proxy_invoke/esbcontent/META-INF/deployment.xml 2012-06-14 01:52:38 UTC (rev 1573) +++ branches/RiftSaw-2.3.x/samples/esb/simple_esb_proxy_invoke/esbcontent/META-INF/deployment.xml 2012-07-12 10:29:37 UTC (rev 1574) @@ -1,7 +1,6 @@ <jbossesb-deployment> <depends>jboss.esb:deployment=soap.esb</depends> - <depends>jboss.esb.quickstart.destination:service=Queue,name=quickstart_simple_esb_proxy_invoke_gw</depends> - <depends>jboss.esb.quickstart.destination:service=Queue,name=quickstart_simple_esb_proxy_invoke_esb</depends> - <depends>jboss.esb.quickstart.destination:service=Queue,name=quickstart_simple_esb_proxy_invoke_esb_reply - </depends> + <jmsQueue>quickstart_simple_esb_proxy_invoke_gw</jmsQueue> + <jmsQueue>quickstart_simple_esb_proxy_invoke_esb</jmsQueue> + <jmsQueue>quickstart_simple_esb_proxy_invoke_esb_reply</jmsQueue> </jbossesb-deployment> Added: branches/RiftSaw-2.3.x/samples/esb/simple_esb_proxy_invoke/esbcontent/META-INF/hornetq-jms.xml =================================================================== (Binary files differ) Property changes on: branches/RiftSaw-2.3.x/samples/esb/simple_esb_proxy_invoke/esbcontent/META-INF/hornetq-jms.xml ___________________________________________________________________ Added: svn:mime-type + application/xml