Overlord SVN: r554 - in cdl/trunk: distribution/src/main/release/samples/jbossesb and 10 other directories.
by overlord-commits＠lists.jboss.org
Author: jeff.yuchang
Date: 2009-03-27 02:41:35 -0400 (Fri, 27 Mar 2009)
New Revision: 554
Added:
cdl/trunk/distribution/src/main/release/samples/jbossesb/common/creditAgency/stateful/
cdl/trunk/distribution/src/main/release/samples/jbossesb/common/creditAgency/stateful/build.xml
cdl/trunk/distribution/src/main/release/samples/jbossesb/common/creditAgency/stateless/
cdl/trunk/distribution/src/main/release/samples/jbossesb/common/creditAgency/stateless/build.xml
cdl/trunk/distribution/src/main/release/samples/jbossesb/purchasing/store/stateful/
cdl/trunk/distribution/src/main/release/samples/jbossesb/purchasing/store/stateful/build.xml
cdl/trunk/distribution/src/main/release/samples/jbossesb/purchasing/store/stateless/
cdl/trunk/distribution/src/main/release/samples/jbossesb/purchasing/store/stateless/build.xml
cdl/trunk/samples/jbossesb/brokerage/broker/stateful/src/main/resources/jbm-queue-service.xml
cdl/trunk/samples/jbossesb/brokerage/supplier/stateful/src/main/resources/jbm-queue-service.xml
cdl/trunk/samples/jbossesb/common/creditAgency/stateful/src/main/resources/jbm-queue-service.xml
cdl/trunk/samples/jbossesb/purchasing/store/stateful/src/main/resources/jbm-queue-service.xml
Removed:
cdl/trunk/distribution/src/main/release/samples/jbossesb/common/creditAgency/build.xml
cdl/trunk/distribution/src/main/release/samples/jbossesb/purchasing/store/build.xml
Modified:
cdl/trunk/distribution/src/main/assembly/bin.xml
cdl/trunk/distribution/src/main/release/samples/jbossesb/common_build.xml
Log:
[SOAG-101] Add jbm-queue-service.xml for samples.
update the common_build.xml to deploy the correct queue file according to jms provider.
Modified: cdl/trunk/distribution/src/main/assembly/bin.xml
===================================================================
--- cdl/trunk/distribution/src/main/assembly/bin.xml 2009-03-27 04:38:52 UTC (rev 553)
+++ cdl/trunk/distribution/src/main/assembly/bin.xml 2009-03-27 06:41:35 UTC (rev 554)
@@ -110,15 +110,6 @@
</fileSets>
<dependencySets>
- <dependencySet>
- <outputDirectory>samples/libs</outputDirectory>
- <includes>
- <include>org.jboss.soa.overlord.cdl.runtime:cdl-runtime-jbossesb</include>
- <include>org.jboss.jbossesb:rosetta</include>
- <include>log4j:log4j</include>
- </includes>
- </dependencySet>
-
<!-- Need to copy libraries into each of the samples Eclipse projects
as the jars must be referenced locally within each project. The
versions have been removed from the jars, as the Eclipse projects
Deleted: cdl/trunk/distribution/src/main/release/samples/jbossesb/common/creditAgency/build.xml
===================================================================
--- cdl/trunk/distribution/src/main/release/samples/jbossesb/common/creditAgency/build.xml 2009-03-27 04:38:52 UTC (rev 553)
+++ cdl/trunk/distribution/src/main/release/samples/jbossesb/common/creditAgency/build.xml 2009-03-27 06:41:35 UTC (rev 554)
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<project name="creditAgency" default="esbjar" basedir=".">
-
- <import file="../../common_build.xml"/>
-
-</project>
Copied: cdl/trunk/distribution/src/main/release/samples/jbossesb/common/creditAgency/stateful/build.xml (from rev 552, cdl/trunk/distribution/src/main/release/samples/jbossesb/common/creditAgency/build.xml)
===================================================================
--- cdl/trunk/distribution/src/main/release/samples/jbossesb/common/creditAgency/stateful/build.xml (rev 0)
+++ cdl/trunk/distribution/src/main/release/samples/jbossesb/common/creditAgency/stateful/build.xml 2009-03-27 06:41:35 UTC (rev 554)
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<project name="creditAgency-stateful" default="esbjar" basedir=".">
+
+ <import file="../../../common_build.xml"/>
+
+</project>
Property changes on: cdl/trunk/distribution/src/main/release/samples/jbossesb/common/creditAgency/stateful/build.xml
___________________________________________________________________
Name: svn:mergeinfo
+
Added: cdl/trunk/distribution/src/main/release/samples/jbossesb/common/creditAgency/stateless/build.xml
===================================================================
--- cdl/trunk/distribution/src/main/release/samples/jbossesb/common/creditAgency/stateless/build.xml (rev 0)
+++ cdl/trunk/distribution/src/main/release/samples/jbossesb/common/creditAgency/stateless/build.xml 2009-03-27 06:41:35 UTC (rev 554)
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<project name="creditAgency-stateless" default="esbjar" basedir=".">
+
+ <import file="../../../common_build.xml"/>
+
+</project>
Modified: cdl/trunk/distribution/src/main/release/samples/jbossesb/common_build.xml
===================================================================
--- cdl/trunk/distribution/src/main/release/samples/jbossesb/common_build.xml 2009-03-27 04:38:52 UTC (rev 553)
+++ cdl/trunk/distribution/src/main/release/samples/jbossesb/common_build.xml 2009-03-27 06:41:35 UTC (rev 554)
@@ -4,7 +4,7 @@
<property name="build.dir" value="${basedir}/target" />
<property name="classes" value="${build.dir}/classes" />
- <property name="libs" value="../../libs" />
+ <property name="libs" value="../lib" />
<property name="src" value="src" />
<property name="server.dir" value="${org.jboss.esb.server.home}/server/${org.jboss.esb.server.config}"/>
@@ -66,13 +66,13 @@
</copy>
</target>
- <target name="esbjar" depends="compile">
+ <target name="esbjar" depends="compile,messaging-dependencies,jbossmq-dependencies">
<mkdir dir="lib"/>
<jar destfile="${build.dir}/${ant.project.name}.esb">
- <fileset dir="${classes}" />
+ <fileset dir="${classes}" excludes="*.xml" />
<fileset dir="${build.dir}" includes="*.jar,*.war"/>
<fileset dir="${classes}" includes="deployment.xml"/>
- <fileset dir="${classes}" includes="${jms.service.file}" />
+ <fileset dir="${classes}" includes="${jms.service.file}" />
<fileset dir="${classes}" includes="META-INF/**" />
<fileset dir="${basedir}/lib" includes="*.jar"/>
</jar>
Deleted: cdl/trunk/distribution/src/main/release/samples/jbossesb/purchasing/store/build.xml
===================================================================
--- cdl/trunk/distribution/src/main/release/samples/jbossesb/purchasing/store/build.xml 2009-03-27 04:38:52 UTC (rev 553)
+++ cdl/trunk/distribution/src/main/release/samples/jbossesb/purchasing/store/build.xml 2009-03-27 06:41:35 UTC (rev 554)
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<project name="purchasing-store" default="esbjar" basedir=".">
-
- <import file="../../common_build.xml"/>
-
-</project>
Copied: cdl/trunk/distribution/src/main/release/samples/jbossesb/purchasing/store/stateful/build.xml (from rev 552, cdl/trunk/distribution/src/main/release/samples/jbossesb/purchasing/store/build.xml)
===================================================================
--- cdl/trunk/distribution/src/main/release/samples/jbossesb/purchasing/store/stateful/build.xml (rev 0)
+++ cdl/trunk/distribution/src/main/release/samples/jbossesb/purchasing/store/stateful/build.xml 2009-03-27 06:41:35 UTC (rev 554)
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<project name="purchasing-store-stateful" default="esbjar" basedir=".">
+
+ <import file="../../../common_build.xml"/>
+
+</project>
Property changes on: cdl/trunk/distribution/src/main/release/samples/jbossesb/purchasing/store/stateful/build.xml
___________________________________________________________________
Name: svn:mergeinfo
+
Added: cdl/trunk/distribution/src/main/release/samples/jbossesb/purchasing/store/stateless/build.xml
===================================================================
--- cdl/trunk/distribution/src/main/release/samples/jbossesb/purchasing/store/stateless/build.xml (rev 0)
+++ cdl/trunk/distribution/src/main/release/samples/jbossesb/purchasing/store/stateless/build.xml 2009-03-27 06:41:35 UTC (rev 554)
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<project name="purchasing-store-stateless" default="esbjar" basedir=".">
+
+ <import file="../../../common_build.xml"/>
+
+</project>
Added: cdl/trunk/samples/jbossesb/brokerage/broker/stateful/src/main/resources/jbm-queue-service.xml
===================================================================
--- cdl/trunk/samples/jbossesb/brokerage/broker/stateful/src/main/resources/jbm-queue-service.xml (rev 0)
+++ cdl/trunk/samples/jbossesb/brokerage/broker/stateful/src/main/resources/jbm-queue-service.xml 2009-03-27 06:41:35 UTC (rev 554)
@@ -0,0 +1,117 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<server>
+ <mbean code="org.jboss.jms.server.destination.QueueService"
+ name="jboss.esb.sample.broker.destination:service=Queue,name=esb-loan-broker"
+ xmbean-dd="xmdesc/Queue-xmbean.xml">
+ <depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends>
+ <depends>jboss.messaging:service=PostOffice</depends>
+ </mbean>
+ <mbean code="org.jboss.jms.server.destination.QueueService"
+ name="jboss.esb.sample.broker.destination:service=Queue,name=esb-loan-broker_reply"
+ xmbean-dd="xmdesc/Queue-xmbean.xml">
+ <depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends>
+ <depends>jboss.messaging:service=PostOffice</depends>
+ </mbean>
+ <mbean code="org.jboss.jms.server.destination.QueueService"
+ name="jboss.esb.sample.broker.destination:service=Queue,name=esb-loan-broker1"
+ xmbean-dd="xmdesc/Queue-xmbean.xml">
+ <depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends>
+ <depends>jboss.messaging:service=PostOffice</depends>
+ </mbean>
+ <mbean code="org.jboss.jms.server.destination.QueueService"
+ name="jboss.esb.sample.broker.destination:service=Queue,name=esb-loan-broker2"
+ xmbean-dd="xmdesc/Queue-xmbean.xml">
+ <depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends>
+ <depends>jboss.messaging:service=PostOffice</depends>
+ </mbean>
+ <mbean code="org.jboss.jms.server.destination.QueueService"
+ name="jboss.esb.sample.broker.destination:service=Queue,name=esb-loan-broker3"
+ xmbean-dd="xmdesc/Queue-xmbean.xml">
+ <depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends>
+ <depends>jboss.messaging:service=PostOffice</depends>
+ </mbean>
+ <mbean code="org.jboss.jms.server.destination.QueueService"
+ name="jboss.esb.sample.broker.destination:service=Queue,name=esb-loan-broker4"
+ xmbean-dd="xmdesc/Queue-xmbean.xml">
+ <depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends>
+ <depends>jboss.messaging:service=PostOffice</depends>
+ </mbean>
+ <mbean code="org.jboss.jms.server.destination.QueueService"
+ name="jboss.esb.sample.broker.destination:service=Queue,name=esb-loan-broker5"
+ xmbean-dd="xmdesc/Queue-xmbean.xml">
+ <depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends>
+ <depends>jboss.messaging:service=PostOffice</depends>
+ </mbean>
+ <mbean code="org.jboss.jms.server.destination.QueueService"
+ name="jboss.esb.sample.broker.destination:service=Queue,name=esb-loan-broker6"
+ xmbean-dd="xmdesc/Queue-xmbean.xml">
+ <depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends>
+ <depends>jboss.messaging:service=PostOffice</depends>
+ </mbean>
+ <mbean code="org.jboss.jms.server.destination.QueueService"
+ name="jboss.esb.sample.broker.destination:service=Queue,name=esb-loan-broker7"
+ xmbean-dd="xmdesc/Queue-xmbean.xml">
+ <depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends>
+ <depends>jboss.messaging:service=PostOffice</depends>
+ </mbean>
+ <mbean code="org.jboss.jms.server.destination.QueueService"
+ name="jboss.esb.sample.broker.destination:service=Queue,name=esb-loan-broker8"
+ xmbean-dd="xmdesc/Queue-xmbean.xml">
+ <depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends>
+ <depends>jboss.messaging:service=PostOffice</depends>
+ </mbean>
+ <mbean code="org.jboss.jms.server.destination.QueueService"
+ name="jboss.esb.sample.broker.destination:service=Queue,name=esb-loan-broker9"
+ xmbean-dd="xmdesc/Queue-xmbean.xml">
+ <depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends>
+ <depends>jboss.messaging:service=PostOffice</depends>
+ </mbean>
+ <mbean code="org.jboss.jms.server.destination.QueueService"
+ name="jboss.esb.sample.broker.destination:service=Queue,name=esb-loan-broker10"
+ xmbean-dd="xmdesc/Queue-xmbean.xml">
+ <depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends>
+ <depends>jboss.messaging:service=PostOffice</depends>
+ </mbean>
+ <mbean code="org.jboss.jms.server.destination.QueueService"
+ name="jboss.esb.sample.broker.destination:service=Queue,name=esb-loan-broker11"
+ xmbean-dd="xmdesc/Queue-xmbean.xml">
+ <depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends>
+ <depends>jboss.messaging:service=PostOffice</depends>
+ </mbean>
+ <mbean code="org.jboss.jms.server.destination.QueueService"
+ name="jboss.esb.sample.broker.destination:service=Queue,name=esb-loan-broker12"
+ xmbean-dd="xmdesc/Queue-xmbean.xml">
+ <depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends>
+ <depends>jboss.messaging:service=PostOffice</depends>
+ </mbean>
+ <mbean code="org.jboss.jms.server.destination.QueueService"
+ name="jboss.esb.sample.broker.destination:service=Queue,name=esb-loan-broker13"
+ xmbean-dd="xmdesc/Queue-xmbean.xml">
+ <depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends>
+ <depends>jboss.messaging:service=PostOffice</depends>
+ </mbean>
+ <mbean code="org.jboss.jms.server.destination.QueueService"
+ name="jboss.esb.sample.broker.destination:service=Queue,name=esb-loan-broker14"
+ xmbean-dd="xmdesc/Queue-xmbean.xml">
+ <depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends>
+ <depends>jboss.messaging:service=PostOffice</depends>
+ </mbean>
+ <mbean code="org.jboss.jms.server.destination.QueueService"
+ name="jboss.esb.sample.broker.destination:service=Queue,name=esb-loan-broker15"
+ xmbean-dd="xmdesc/Queue-xmbean.xml">
+ <depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends>
+ <depends>jboss.messaging:service=PostOffice</depends>
+ </mbean>
+ <mbean code="org.jboss.jms.server.destination.QueueService"
+ name="jboss.esb.sample.broker.destination:service=Queue,name=esb-loan-broker16"
+ xmbean-dd="xmdesc/Queue-xmbean.xml">
+ <depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends>
+ <depends>jboss.messaging:service=PostOffice</depends>
+ </mbean>
+ <mbean code="org.jboss.jms.server.destination.QueueService"
+ name="jboss.esb.sample.broker.destination:service=Queue,name=esb-loan-broker17"
+ xmbean-dd="xmdesc/Queue-xmbean.xml">
+ <depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends>
+ <depends>jboss.messaging:service=PostOffice</depends>
+ </mbean>
+</server>
Added: cdl/trunk/samples/jbossesb/brokerage/supplier/stateful/src/main/resources/jbm-queue-service.xml
===================================================================
--- cdl/trunk/samples/jbossesb/brokerage/supplier/stateful/src/main/resources/jbm-queue-service.xml (rev 0)
+++ cdl/trunk/samples/jbossesb/brokerage/supplier/stateful/src/main/resources/jbm-queue-service.xml 2009-03-27 06:41:35 UTC (rev 554)
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<server>
+ <mbean code="org.jboss.jms.server.destination.QueueService"
+ name="jboss.esb.sample.broker.destination:service=Queue,name=esb-loan-supplier1"
+ xmbean-dd="xmdesc/Queue-xmbean.xml">
+ <depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends>
+ <depends>jboss.messaging:service=PostOffice</depends>
+ </mbean>
+ <mbean code="org.jboss.jms.server.destination.QueueService"
+ name="jboss.esb.sample.broker.destination:service=Queue,name=esb-loan-supplier11"
+ xmbean-dd="xmdesc/Queue-xmbean.xml">
+ <depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends>
+ <depends>jboss.messaging:service=PostOffice</depends>
+ </mbean>
+ <mbean code="org.jboss.jms.server.destination.QueueService"
+ name="jboss.esb.sample.broker.destination:service=Queue,name=esb-loan-supplier12"
+ xmbean-dd="xmdesc/Queue-xmbean.xml">
+ <depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends>
+ <depends>jboss.messaging:service=PostOffice</depends>
+ </mbean>
+</server>
Added: cdl/trunk/samples/jbossesb/common/creditAgency/stateful/src/main/resources/jbm-queue-service.xml
===================================================================
--- cdl/trunk/samples/jbossesb/common/creditAgency/stateful/src/main/resources/jbm-queue-service.xml (rev 0)
+++ cdl/trunk/samples/jbossesb/common/creditAgency/stateful/src/main/resources/jbm-queue-service.xml 2009-03-27 06:41:35 UTC (rev 554)
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<server>
+ <mbean code="org.jboss.jms.server.destination.QueueService"
+ name="jboss.esb.gen.destination:service=Queue,name=esb-creditAgency"
+ xmbean-dd="xmdesc/Queue-xmbean.xml">
+ <depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends>
+ <depends>jboss.messaging:service=PostOffice</depends>
+ </mbean>
+ <mbean code="org.jboss.jms.server.destination.QueueService"
+ name="jboss.esb.gen.destination:service=Queue,name=esb-creditAgency1"
+ xmbean-dd="xmdesc/Queue-xmbean.xml">
+ <depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends>
+ <depends>jboss.messaging:service=PostOffice</depends>
+ </mbean>
+ <mbean code="org.jboss.jms.server.destination.QueueService"
+ name="jboss.esb.gen.destination:service=Queue,name=esb-creditAgency2"
+ xmbean-dd="xmdesc/Queue-xmbean.xml">
+ <depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends>
+ <depends>jboss.messaging:service=PostOffice</depends>
+ </mbean>
+</server>
Added: cdl/trunk/samples/jbossesb/purchasing/store/stateful/src/main/resources/jbm-queue-service.xml
===================================================================
--- cdl/trunk/samples/jbossesb/purchasing/store/stateful/src/main/resources/jbm-queue-service.xml (rev 0)
+++ cdl/trunk/samples/jbossesb/purchasing/store/stateful/src/main/resources/jbm-queue-service.xml 2009-03-27 06:41:35 UTC (rev 554)
@@ -0,0 +1,57 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<server>
+ <mbean code="org.jboss.jms.server.destination.QueueService"
+ name="jboss.esb.gen.destination:service=Queue,name=esb-store"
+ xmbean-dd="xmdesc/Queue-xmbean.xml">
+ <depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends>
+ <depends>jboss.messaging:service=PostOffice</depends>
+ </mbean>
+ <mbean code="org.jboss.jms.server.destination.QueueService"
+ name="jboss.esb.gen.destination:service=Queue,name=esb-store_reply"
+ xmbean-dd="xmdesc/Queue-xmbean.xml">
+ <depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends>
+ <depends>jboss.messaging:service=PostOffice</depends>
+ </mbean>
+ <mbean code="org.jboss.jms.server.destination.QueueService"
+ name="jboss.esb.gen.destination:service=Queue,name=esb-store1"
+ xmbean-dd="xmdesc/Queue-xmbean.xml">
+ <depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends>
+ <depends>jboss.messaging:service=PostOffice</depends>
+ </mbean>
+ <mbean code="org.jboss.jms.server.destination.QueueService"
+ name="jboss.esb.gen.destination:service=Queue,name=esb-store2"
+ xmbean-dd="xmdesc/Queue-xmbean.xml">
+ <depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends>
+ <depends>jboss.messaging:service=PostOffice</depends>
+ </mbean>
+ <mbean code="org.jboss.jms.server.destination.QueueService"
+ name="jboss.esb.gen.destination:service=Queue,name=esb-store3"
+ xmbean-dd="xmdesc/Queue-xmbean.xml">
+ <depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends>
+ <depends>jboss.messaging:service=PostOffice</depends>
+ </mbean>
+ <mbean code="org.jboss.jms.server.destination.QueueService"
+ name="jboss.esb.gen.destination:service=Queue,name=esb-store4"
+ xmbean-dd="xmdesc/Queue-xmbean.xml">
+ <depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends>
+ <depends>jboss.messaging:service=PostOffice</depends>
+ </mbean>
+ <mbean code="org.jboss.jms.server.destination.QueueService"
+ name="jboss.esb.gen.destination:service=Queue,name=esb-store5"
+ xmbean-dd="xmdesc/Queue-xmbean.xml">
+ <depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends>
+ <depends>jboss.messaging:service=PostOffice</depends>
+ </mbean>
+ <mbean code="org.jboss.jms.server.destination.QueueService"
+ name="jboss.esb.gen.destination:service=Queue,name=esb-store6"
+ xmbean-dd="xmdesc/Queue-xmbean.xml">
+ <depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends>
+ <depends>jboss.messaging:service=PostOffice</depends>
+ </mbean>
+ <mbean code="org.jboss.jms.server.destination.QueueService"
+ name="jboss.esb.gen.destination:service=Queue,name=esb-store7"
+ xmbean-dd="xmdesc/Queue-xmbean.xml">
+ <depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends>
+ <depends>jboss.messaging:service=PostOffice</depends>
+ </mbean>
+</server>
17 years, 4 months
- 1
- 0
Overlord SVN: r553 - in cdl/trunk/distribution/src/main/release/samples/jbossesb: brokerage/broker and 5 other directories.
by overlord-commits＠lists.jboss.org
Author: jeff.yuchang
Date: 2009-03-27 00:38:52 -0400 (Fri, 27 Mar 2009)
New Revision: 553
Added:
cdl/trunk/distribution/src/main/release/samples/jbossesb/brokerage/broker/stateful/
cdl/trunk/distribution/src/main/release/samples/jbossesb/brokerage/broker/stateful/build.xml
cdl/trunk/distribution/src/main/release/samples/jbossesb/brokerage/broker/stateless/
cdl/trunk/distribution/src/main/release/samples/jbossesb/brokerage/broker/stateless/build.xml
cdl/trunk/distribution/src/main/release/samples/jbossesb/brokerage/supplier/stateful/
cdl/trunk/distribution/src/main/release/samples/jbossesb/brokerage/supplier/stateful/build.xml
cdl/trunk/distribution/src/main/release/samples/jbossesb/brokerage/supplier/stateless/
cdl/trunk/distribution/src/main/release/samples/jbossesb/brokerage/supplier/stateless/build.xml
Removed:
cdl/trunk/distribution/src/main/release/samples/jbossesb/brokerage/broker/build.xml
cdl/trunk/distribution/src/main/release/samples/jbossesb/brokerage/supplier/build.xml
Modified:
cdl/trunk/distribution/src/main/release/samples/jbossesb/common_build.xml
Log:
[SOAG-101] Add folder and build.xml for stateful, stateless sample.
Deleted: cdl/trunk/distribution/src/main/release/samples/jbossesb/brokerage/broker/build.xml
===================================================================
--- cdl/trunk/distribution/src/main/release/samples/jbossesb/brokerage/broker/build.xml 2009-03-26 21:11:17 UTC (rev 552)
+++ cdl/trunk/distribution/src/main/release/samples/jbossesb/brokerage/broker/build.xml 2009-03-27 04:38:52 UTC (rev 553)
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<project name="broker" default="esbjar" basedir=".">
-
- <import file="../../common_build.xml"/>
-
-</project>
Copied: cdl/trunk/distribution/src/main/release/samples/jbossesb/brokerage/broker/stateful/build.xml (from rev 552, cdl/trunk/distribution/src/main/release/samples/jbossesb/brokerage/broker/build.xml)
===================================================================
--- cdl/trunk/distribution/src/main/release/samples/jbossesb/brokerage/broker/stateful/build.xml (rev 0)
+++ cdl/trunk/distribution/src/main/release/samples/jbossesb/brokerage/broker/stateful/build.xml 2009-03-27 04:38:52 UTC (rev 553)
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<project name="broker-stateful" default="esbjar" basedir=".">
+
+ <import file="../../../common_build.xml"/>
+
+</project>
Property changes on: cdl/trunk/distribution/src/main/release/samples/jbossesb/brokerage/broker/stateful/build.xml
___________________________________________________________________
Name: svn:mergeinfo
+
Added: cdl/trunk/distribution/src/main/release/samples/jbossesb/brokerage/broker/stateless/build.xml
===================================================================
--- cdl/trunk/distribution/src/main/release/samples/jbossesb/brokerage/broker/stateless/build.xml (rev 0)
+++ cdl/trunk/distribution/src/main/release/samples/jbossesb/brokerage/broker/stateless/build.xml 2009-03-27 04:38:52 UTC (rev 553)
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<project name="broker-stateless" default="esbjar" basedir=".">
+
+ <import file="../../../common_build.xml"/>
+
+</project>
Deleted: cdl/trunk/distribution/src/main/release/samples/jbossesb/brokerage/supplier/build.xml
===================================================================
--- cdl/trunk/distribution/src/main/release/samples/jbossesb/brokerage/supplier/build.xml 2009-03-26 21:11:17 UTC (rev 552)
+++ cdl/trunk/distribution/src/main/release/samples/jbossesb/brokerage/supplier/build.xml 2009-03-27 04:38:52 UTC (rev 553)
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<project name="supplier" default="esbjar" basedir=".">
-
- <import file="../../common_build.xml"/>
-
-</project>
Copied: cdl/trunk/distribution/src/main/release/samples/jbossesb/brokerage/supplier/stateful/build.xml (from rev 552, cdl/trunk/distribution/src/main/release/samples/jbossesb/brokerage/supplier/build.xml)
===================================================================
--- cdl/trunk/distribution/src/main/release/samples/jbossesb/brokerage/supplier/stateful/build.xml (rev 0)
+++ cdl/trunk/distribution/src/main/release/samples/jbossesb/brokerage/supplier/stateful/build.xml 2009-03-27 04:38:52 UTC (rev 553)
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<project name="supplier-stateful" default="esbjar" basedir=".">
+
+ <import file="../../../common_build.xml"/>
+
+</project>
Property changes on: cdl/trunk/distribution/src/main/release/samples/jbossesb/brokerage/supplier/stateful/build.xml
___________________________________________________________________
Name: svn:mergeinfo
+
Added: cdl/trunk/distribution/src/main/release/samples/jbossesb/brokerage/supplier/stateless/build.xml
===================================================================
--- cdl/trunk/distribution/src/main/release/samples/jbossesb/brokerage/supplier/stateless/build.xml (rev 0)
+++ cdl/trunk/distribution/src/main/release/samples/jbossesb/brokerage/supplier/stateless/build.xml 2009-03-27 04:38:52 UTC (rev 553)
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<project name="supplier-stateless" default="esbjar" basedir=".">
+
+ <import file="../../../common_build.xml"/>
+
+</project>
Modified: cdl/trunk/distribution/src/main/release/samples/jbossesb/common_build.xml
===================================================================
--- cdl/trunk/distribution/src/main/release/samples/jbossesb/common_build.xml 2009-03-26 21:11:17 UTC (rev 552)
+++ cdl/trunk/distribution/src/main/release/samples/jbossesb/common_build.xml 2009-03-27 04:38:52 UTC (rev 553)
@@ -1,6 +1,6 @@
<project name="base-build" basedir=".">
- <property file="../../../install/deployment.properties" />
+ <property file="../../../../install/deployment.properties" />
<property name="build.dir" value="${basedir}/target" />
<property name="classes" value="${build.dir}/classes" />
@@ -21,6 +21,41 @@
<delete dir="${build.dir}" />
</target>
+<!-- ==================================================================== -->
+<!-- This section handles the discovery of the messaging platform. -->
+<!-- ==================================================================== -->
+
+ <target name="messaging-config">
+ <condition property="messaging.present">
+ <available file="${server.dir}/jboss-messaging"/>
+ </condition>
+ <condition property="messaging.present">
+ <available file="${server.dir}/jboss-messaging.sar"/>
+ </condition>
+
+ <condition property="jbossmq.present">
+ <not>
+ <isset property="messaging.present"/>
+ </not>
+ </condition>
+ </target>
+
+ <!-- dependencies specific to JBoss Messaging -->
+ <target name="messaging-dependencies" if="messaging.present" depends="messaging-config">
+ <property name="jms.service.file" value="jbm-queue-service.xml"/>
+ <property name="jms.description" value="JBoss Messaging"/>
+ </target>
+
+ <!-- dependencies specific to JBoss MQ -->
+ <target name="jbossmq-dependencies" if="jbossmq.present" depends="messaging-config">
+ <property name="jms.service.file" value="jbmq-queue-service.xml"/>
+ <property name="jms.description" value="JBoss MQ"/>
+ </target>
+
+<!-- ==================================================================== -->
+<!-- This section provides compile and deployment -->
+<!-- ==================================================================== -->
+
<target name="compile" depends="init">
<mkdir dir="${classes}" />
<javac srcdir="${src}" destdir="${classes}" debug="true" deprecation="true">
@@ -37,6 +72,7 @@
<fileset dir="${classes}" />
<fileset dir="${build.dir}" includes="*.jar,*.war"/>
<fileset dir="${classes}" includes="deployment.xml"/>
+ <fileset dir="${classes}" includes="${jms.service.file}" />
<fileset dir="${classes}" includes="META-INF/**" />
<fileset dir="${basedir}/lib" includes="*.jar"/>
</jar>
17 years, 4 months
- 1
- 0
Overlord SVN: r552 - in cdl/trunk: distribution/eclipse/features and 3 other directories.
by overlord-commits＠lists.jboss.org
Author: objectiser
Date: 2009-03-26 17:11:17 -0400 (Thu, 26 Mar 2009)
New Revision: 552
Added:
cdl/trunk/distribution/eclipse/features/org.jboss.tools.overlord.cdl.jbossesb.feature_1.0.0.200903261709.jar
cdl/trunk/distribution/eclipse/features/org.scribble.conversation.feature_0.1.0.200903261709.jar
cdl/trunk/distribution/eclipse/features/org.scribble.experimental.feature_0.1.0.200903261709.jar
cdl/trunk/distribution/eclipse/features/org.scribble.feature_0.1.0.200903261709.jar
cdl/trunk/distribution/eclipse/features/org.scribble.java.feature_0.1.0.200903261709.jar
cdl/trunk/distribution/eclipse/features/org.scribble.protocol.feature_0.1.0.200903261709.jar
cdl/trunk/distribution/eclipse/plugins/org.jboss.tools.overlord.cdl.runtime.jbossesb_1.0.0.200903261709.jar
cdl/trunk/distribution/eclipse/plugins/org.jboss.tools.overlord.cdl.validator.jbossesb_1.0.0.200903261709.jar
cdl/trunk/distribution/eclipse/plugins/org.scribble.conformance_0.1.0.200903261709.jar
cdl/trunk/distribution/eclipse/plugins/org.scribble.conversation.comparator_0.1.0.200903261709.jar
cdl/trunk/distribution/eclipse/plugins/org.scribble.conversation.export.text_0.1.0.200903261709.jar
cdl/trunk/distribution/eclipse/plugins/org.scribble.conversation.model_0.1.0.200903261709.jar
cdl/trunk/distribution/eclipse/plugins/org.scribble.conversation.parser_0.1.0.200903261709.jar
cdl/trunk/distribution/eclipse/plugins/org.scribble.conversation.projector_0.1.0.200903261709.jar
cdl/trunk/distribution/eclipse/plugins/org.scribble.conversation.validation_0.1.0.200903261709.jar
cdl/trunk/distribution/eclipse/plugins/org.scribble.core_0.1.0.200903261709.jar
cdl/trunk/distribution/eclipse/plugins/org.scribble.designer_0.1.0.200903261709.jar
cdl/trunk/distribution/eclipse/plugins/org.scribble.expression.xpath_0.1.0.200903261709.jar
cdl/trunk/distribution/eclipse/plugins/org.scribble.lang.comparator_0.1.0.200903261709.jar
cdl/trunk/distribution/eclipse/plugins/org.scribble.lang.java.parser_0.1.0.200903261709.jar
cdl/trunk/distribution/eclipse/plugins/org.scribble.lang.model_0.1.0.200903261709.jar
cdl/trunk/distribution/eclipse/plugins/org.scribble.osgi_0.1.0.200903261709.jar
cdl/trunk/distribution/eclipse/plugins/org.scribble.protocol.comparator_0.1.0.200903261709.jar
cdl/trunk/distribution/eclipse/plugins/org.scribble.protocol.export.text_0.1.0.200903261709.jar
cdl/trunk/distribution/eclipse/plugins/org.scribble.protocol.model_0.1.0.200903261709.jar
cdl/trunk/distribution/eclipse/plugins/org.scribble.protocol.parser_0.1.0.200903261709.jar
cdl/trunk/distribution/eclipse/plugins/org.scribble.protocol.projector_0.1.0.200903261709.jar
cdl/trunk/distribution/eclipse/plugins/org.scribble.protocol.validation_0.1.0.200903261709.jar
cdl/trunk/distribution/eclipse/plugins/org.scribble.type.java_0.1.0.200903261709.jar
Removed:
cdl/trunk/distribution/eclipse/features/org.jboss.tools.overlord.cdl.jbossesb.feature_1.0.0.200903160851.jar
cdl/trunk/distribution/eclipse/features/org.scribble.conversation.feature_0.1.0.200903160851.jar
cdl/trunk/distribution/eclipse/features/org.scribble.experimental.feature_0.1.0.200903160851.jar
cdl/trunk/distribution/eclipse/features/org.scribble.feature_0.1.0.200903160851.jar
cdl/trunk/distribution/eclipse/features/org.scribble.java.feature_0.1.0.200903160851.jar
cdl/trunk/distribution/eclipse/features/org.scribble.protocol.feature_0.1.0.200903160851.jar
cdl/trunk/distribution/eclipse/plugins/org.jboss.tools.overlord.cdl.runtime.jbossesb_1.0.0.200903160851.jar
cdl/trunk/distribution/eclipse/plugins/org.jboss.tools.overlord.cdl.validator.jbossesb_1.0.0.200903160851.jar
cdl/trunk/distribution/eclipse/plugins/org.scribble.conformance_0.1.0.200903160851.jar
cdl/trunk/distribution/eclipse/plugins/org.scribble.conversation.comparator_0.1.0.200903160851.jar
cdl/trunk/distribution/eclipse/plugins/org.scribble.conversation.export.text_0.1.0.200903160851.jar
cdl/trunk/distribution/eclipse/plugins/org.scribble.conversation.model_0.1.0.200903160851.jar
cdl/trunk/distribution/eclipse/plugins/org.scribble.conversation.parser_0.1.0.200903160851.jar
cdl/trunk/distribution/eclipse/plugins/org.scribble.conversation.projector_0.1.0.200903160851.jar
cdl/trunk/distribution/eclipse/plugins/org.scribble.conversation.validation_0.1.0.200903160851.jar
cdl/trunk/distribution/eclipse/plugins/org.scribble.core_0.1.0.200903160851.jar
cdl/trunk/distribution/eclipse/plugins/org.scribble.designer_0.1.0.200903160851.jar
cdl/trunk/distribution/eclipse/plugins/org.scribble.expression.xpath_0.1.0.200903160851.jar
cdl/trunk/distribution/eclipse/plugins/org.scribble.lang.comparator_0.1.0.200903160851.jar
cdl/trunk/distribution/eclipse/plugins/org.scribble.lang.java.parser_0.1.0.200903160851.jar
cdl/trunk/distribution/eclipse/plugins/org.scribble.lang.model_0.1.0.200903160851.jar
cdl/trunk/distribution/eclipse/plugins/org.scribble.osgi_0.1.0.200903160851.jar
cdl/trunk/distribution/eclipse/plugins/org.scribble.protocol.comparator_0.1.0.200903160851.jar
cdl/trunk/distribution/eclipse/plugins/org.scribble.protocol.export.text_0.1.0.200903160851.jar
cdl/trunk/distribution/eclipse/plugins/org.scribble.protocol.model_0.1.0.200903160851.jar
cdl/trunk/distribution/eclipse/plugins/org.scribble.protocol.parser_0.1.0.200903160851.jar
cdl/trunk/distribution/eclipse/plugins/org.scribble.protocol.projector_0.1.0.200903160851.jar
cdl/trunk/distribution/eclipse/plugins/org.scribble.protocol.validation_0.1.0.200903160851.jar
cdl/trunk/distribution/eclipse/plugins/org.scribble.type.java_0.1.0.200903160851.jar
Modified:
cdl/trunk/distribution/eclipse/site.xml
cdl/trunk/docs/docbook/gettingstartedguide/src/main/images/GenerateESBServicesDialog.jpg
cdl/trunk/docs/docbook/gettingstartedguide/src/main/module/soagwithcdl.xml
Log:
Updated plugins, and documents to describe configuration of messaging system when generating an ESB service.
Deleted: cdl/trunk/distribution/eclipse/features/org.jboss.tools.overlord.cdl.jbossesb.feature_1.0.0.200903160851.jar
===================================================================
(Binary files differ)
Added: cdl/trunk/distribution/eclipse/features/org.jboss.tools.overlord.cdl.jbossesb.feature_1.0.0.200903261709.jar
===================================================================
(Binary files differ)
Property changes on: cdl/trunk/distribution/eclipse/features/org.jboss.tools.overlord.cdl.jbossesb.feature_1.0.0.200903261709.jar
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Deleted: cdl/trunk/distribution/eclipse/features/org.scribble.conversation.feature_0.1.0.200903160851.jar
===================================================================
(Binary files differ)
Added: cdl/trunk/distribution/eclipse/features/org.scribble.conversation.feature_0.1.0.200903261709.jar
===================================================================
(Binary files differ)
Property changes on: cdl/trunk/distribution/eclipse/features/org.scribble.conversation.feature_0.1.0.200903261709.jar
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Deleted: cdl/trunk/distribution/eclipse/features/org.scribble.experimental.feature_0.1.0.200903160851.jar
===================================================================
(Binary files differ)
Added: cdl/trunk/distribution/eclipse/features/org.scribble.experimental.feature_0.1.0.200903261709.jar
===================================================================
(Binary files differ)
Property changes on: cdl/trunk/distribution/eclipse/features/org.scribble.experimental.feature_0.1.0.200903261709.jar
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Deleted: cdl/trunk/distribution/eclipse/features/org.scribble.feature_0.1.0.200903160851.jar
===================================================================
(Binary files differ)
Added: cdl/trunk/distribution/eclipse/features/org.scribble.feature_0.1.0.200903261709.jar
===================================================================
(Binary files differ)
Property changes on: cdl/trunk/distribution/eclipse/features/org.scribble.feature_0.1.0.200903261709.jar
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Deleted: cdl/trunk/distribution/eclipse/features/org.scribble.java.feature_0.1.0.200903160851.jar
===================================================================
(Binary files differ)
Added: cdl/trunk/distribution/eclipse/features/org.scribble.java.feature_0.1.0.200903261709.jar
===================================================================
(Binary files differ)
Property changes on: cdl/trunk/distribution/eclipse/features/org.scribble.java.feature_0.1.0.200903261709.jar
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Deleted: cdl/trunk/distribution/eclipse/features/org.scribble.protocol.feature_0.1.0.200903160851.jar
===================================================================
(Binary files differ)
Added: cdl/trunk/distribution/eclipse/features/org.scribble.protocol.feature_0.1.0.200903261709.jar
===================================================================
(Binary files differ)
Property changes on: cdl/trunk/distribution/eclipse/features/org.scribble.protocol.feature_0.1.0.200903261709.jar
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Deleted: cdl/trunk/distribution/eclipse/plugins/org.jboss.tools.overlord.cdl.runtime.jbossesb_1.0.0.200903160851.jar
===================================================================
(Binary files differ)
Added: cdl/trunk/distribution/eclipse/plugins/org.jboss.tools.overlord.cdl.runtime.jbossesb_1.0.0.200903261709.jar
===================================================================
(Binary files differ)
Property changes on: cdl/trunk/distribution/eclipse/plugins/org.jboss.tools.overlord.cdl.runtime.jbossesb_1.0.0.200903261709.jar
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Deleted: cdl/trunk/distribution/eclipse/plugins/org.jboss.tools.overlord.cdl.validator.jbossesb_1.0.0.200903160851.jar
===================================================================
(Binary files differ)
Added: cdl/trunk/distribution/eclipse/plugins/org.jboss.tools.overlord.cdl.validator.jbossesb_1.0.0.200903261709.jar
===================================================================
(Binary files differ)
Property changes on: cdl/trunk/distribution/eclipse/plugins/org.jboss.tools.overlord.cdl.validator.jbossesb_1.0.0.200903261709.jar
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Deleted: cdl/trunk/distribution/eclipse/plugins/org.scribble.conformance_0.1.0.200903160851.jar
===================================================================
(Binary files differ)
Added: cdl/trunk/distribution/eclipse/plugins/org.scribble.conformance_0.1.0.200903261709.jar
===================================================================
(Binary files differ)
Property changes on: cdl/trunk/distribution/eclipse/plugins/org.scribble.conformance_0.1.0.200903261709.jar
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Deleted: cdl/trunk/distribution/eclipse/plugins/org.scribble.conversation.comparator_0.1.0.200903160851.jar
===================================================================
(Binary files differ)
Added: cdl/trunk/distribution/eclipse/plugins/org.scribble.conversation.comparator_0.1.0.200903261709.jar
===================================================================
(Binary files differ)
Property changes on: cdl/trunk/distribution/eclipse/plugins/org.scribble.conversation.comparator_0.1.0.200903261709.jar
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Deleted: cdl/trunk/distribution/eclipse/plugins/org.scribble.conversation.export.text_0.1.0.200903160851.jar
===================================================================
(Binary files differ)
Added: cdl/trunk/distribution/eclipse/plugins/org.scribble.conversation.export.text_0.1.0.200903261709.jar
===================================================================
(Binary files differ)
Property changes on: cdl/trunk/distribution/eclipse/plugins/org.scribble.conversation.export.text_0.1.0.200903261709.jar
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Deleted: cdl/trunk/distribution/eclipse/plugins/org.scribble.conversation.model_0.1.0.200903160851.jar
===================================================================
(Binary files differ)
Added: cdl/trunk/distribution/eclipse/plugins/org.scribble.conversation.model_0.1.0.200903261709.jar
===================================================================
(Binary files differ)
Property changes on: cdl/trunk/distribution/eclipse/plugins/org.scribble.conversation.model_0.1.0.200903261709.jar
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Deleted: cdl/trunk/distribution/eclipse/plugins/org.scribble.conversation.parser_0.1.0.200903160851.jar
===================================================================
(Binary files differ)
Added: cdl/trunk/distribution/eclipse/plugins/org.scribble.conversation.parser_0.1.0.200903261709.jar
===================================================================
(Binary files differ)
Property changes on: cdl/trunk/distribution/eclipse/plugins/org.scribble.conversation.parser_0.1.0.200903261709.jar
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Deleted: cdl/trunk/distribution/eclipse/plugins/org.scribble.conversation.projector_0.1.0.200903160851.jar
===================================================================
(Binary files differ)
Added: cdl/trunk/distribution/eclipse/plugins/org.scribble.conversation.projector_0.1.0.200903261709.jar
===================================================================
(Binary files differ)
Property changes on: cdl/trunk/distribution/eclipse/plugins/org.scribble.conversation.projector_0.1.0.200903261709.jar
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Deleted: cdl/trunk/distribution/eclipse/plugins/org.scribble.conversation.validation_0.1.0.200903160851.jar
===================================================================
(Binary files differ)
Added: cdl/trunk/distribution/eclipse/plugins/org.scribble.conversation.validation_0.1.0.200903261709.jar
===================================================================
(Binary files differ)
Property changes on: cdl/trunk/distribution/eclipse/plugins/org.scribble.conversation.validation_0.1.0.200903261709.jar
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Deleted: cdl/trunk/distribution/eclipse/plugins/org.scribble.core_0.1.0.200903160851.jar
===================================================================
(Binary files differ)
Added: cdl/trunk/distribution/eclipse/plugins/org.scribble.core_0.1.0.200903261709.jar
===================================================================
(Binary files differ)
Property changes on: cdl/trunk/distribution/eclipse/plugins/org.scribble.core_0.1.0.200903261709.jar
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Deleted: cdl/trunk/distribution/eclipse/plugins/org.scribble.designer_0.1.0.200903160851.jar
===================================================================
(Binary files differ)
Added: cdl/trunk/distribution/eclipse/plugins/org.scribble.designer_0.1.0.200903261709.jar
===================================================================
(Binary files differ)
Property changes on: cdl/trunk/distribution/eclipse/plugins/org.scribble.designer_0.1.0.200903261709.jar
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Deleted: cdl/trunk/distribution/eclipse/plugins/org.scribble.expression.xpath_0.1.0.200903160851.jar
===================================================================
(Binary files differ)
Added: cdl/trunk/distribution/eclipse/plugins/org.scribble.expression.xpath_0.1.0.200903261709.jar
===================================================================
(Binary files differ)
Property changes on: cdl/trunk/distribution/eclipse/plugins/org.scribble.expression.xpath_0.1.0.200903261709.jar
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Deleted: cdl/trunk/distribution/eclipse/plugins/org.scribble.lang.comparator_0.1.0.200903160851.jar
===================================================================
(Binary files differ)
Added: cdl/trunk/distribution/eclipse/plugins/org.scribble.lang.comparator_0.1.0.200903261709.jar
===================================================================
(Binary files differ)
Property changes on: cdl/trunk/distribution/eclipse/plugins/org.scribble.lang.comparator_0.1.0.200903261709.jar
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Deleted: cdl/trunk/distribution/eclipse/plugins/org.scribble.lang.java.parser_0.1.0.200903160851.jar
===================================================================
(Binary files differ)
Added: cdl/trunk/distribution/eclipse/plugins/org.scribble.lang.java.parser_0.1.0.200903261709.jar
===================================================================
(Binary files differ)
Property changes on: cdl/trunk/distribution/eclipse/plugins/org.scribble.lang.java.parser_0.1.0.200903261709.jar
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Deleted: cdl/trunk/distribution/eclipse/plugins/org.scribble.lang.model_0.1.0.200903160851.jar
===================================================================
(Binary files differ)
Added: cdl/trunk/distribution/eclipse/plugins/org.scribble.lang.model_0.1.0.200903261709.jar
===================================================================
(Binary files differ)
Property changes on: cdl/trunk/distribution/eclipse/plugins/org.scribble.lang.model_0.1.0.200903261709.jar
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Deleted: cdl/trunk/distribution/eclipse/plugins/org.scribble.osgi_0.1.0.200903160851.jar
===================================================================
(Binary files differ)
Added: cdl/trunk/distribution/eclipse/plugins/org.scribble.osgi_0.1.0.200903261709.jar
===================================================================
(Binary files differ)
Property changes on: cdl/trunk/distribution/eclipse/plugins/org.scribble.osgi_0.1.0.200903261709.jar
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Deleted: cdl/trunk/distribution/eclipse/plugins/org.scribble.protocol.comparator_0.1.0.200903160851.jar
===================================================================
(Binary files differ)
Added: cdl/trunk/distribution/eclipse/plugins/org.scribble.protocol.comparator_0.1.0.200903261709.jar
===================================================================
(Binary files differ)
Property changes on: cdl/trunk/distribution/eclipse/plugins/org.scribble.protocol.comparator_0.1.0.200903261709.jar
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Deleted: cdl/trunk/distribution/eclipse/plugins/org.scribble.protocol.export.text_0.1.0.200903160851.jar
===================================================================
(Binary files differ)
Added: cdl/trunk/distribution/eclipse/plugins/org.scribble.protocol.export.text_0.1.0.200903261709.jar
===================================================================
(Binary files differ)
Property changes on: cdl/trunk/distribution/eclipse/plugins/org.scribble.protocol.export.text_0.1.0.200903261709.jar
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Deleted: cdl/trunk/distribution/eclipse/plugins/org.scribble.protocol.model_0.1.0.200903160851.jar
===================================================================
(Binary files differ)
Added: cdl/trunk/distribution/eclipse/plugins/org.scribble.protocol.model_0.1.0.200903261709.jar
===================================================================
(Binary files differ)
Property changes on: cdl/trunk/distribution/eclipse/plugins/org.scribble.protocol.model_0.1.0.200903261709.jar
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Deleted: cdl/trunk/distribution/eclipse/plugins/org.scribble.protocol.parser_0.1.0.200903160851.jar
===================================================================
(Binary files differ)
Added: cdl/trunk/distribution/eclipse/plugins/org.scribble.protocol.parser_0.1.0.200903261709.jar
===================================================================
(Binary files differ)
Property changes on: cdl/trunk/distribution/eclipse/plugins/org.scribble.protocol.parser_0.1.0.200903261709.jar
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Deleted: cdl/trunk/distribution/eclipse/plugins/org.scribble.protocol.projector_0.1.0.200903160851.jar
===================================================================
(Binary files differ)
Added: cdl/trunk/distribution/eclipse/plugins/org.scribble.protocol.projector_0.1.0.200903261709.jar
===================================================================
(Binary files differ)
Property changes on: cdl/trunk/distribution/eclipse/plugins/org.scribble.protocol.projector_0.1.0.200903261709.jar
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Deleted: cdl/trunk/distribution/eclipse/plugins/org.scribble.protocol.validation_0.1.0.200903160851.jar
===================================================================
(Binary files differ)
Added: cdl/trunk/distribution/eclipse/plugins/org.scribble.protocol.validation_0.1.0.200903261709.jar
===================================================================
(Binary files differ)
Property changes on: cdl/trunk/distribution/eclipse/plugins/org.scribble.protocol.validation_0.1.0.200903261709.jar
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Deleted: cdl/trunk/distribution/eclipse/plugins/org.scribble.type.java_0.1.0.200903160851.jar
===================================================================
(Binary files differ)
Added: cdl/trunk/distribution/eclipse/plugins/org.scribble.type.java_0.1.0.200903261709.jar
===================================================================
(Binary files differ)
Property changes on: cdl/trunk/distribution/eclipse/plugins/org.scribble.type.java_0.1.0.200903261709.jar
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Modified: cdl/trunk/distribution/eclipse/site.xml
===================================================================
--- cdl/trunk/distribution/eclipse/site.xml 2009-03-26 08:07:41 UTC (rev 551)
+++ cdl/trunk/distribution/eclipse/site.xml 2009-03-26 21:11:17 UTC (rev 552)
@@ -1,21 +1,21 @@
<?xml version="1.0" encoding="UTF-8"?>
<site>
- <feature url="features/org.scribble.conversation.feature_0.1.0.200903160851.jar" id="org.scribble.conversation.feature" version="0.1.0.200903160851">
+ <feature url="features/org.scribble.conversation.feature_0.1.0.200903261709.jar" id="org.scribble.conversation.feature" version="0.1.0.200903261709">
<category name="Common"/>
</feature>
- <feature url="features/org.scribble.experimental.feature_0.1.0.200903160851.jar" id="org.scribble.experimental.feature" version="0.1.0.200903160851">
+ <feature url="features/org.scribble.experimental.feature_0.1.0.200903261709.jar" id="org.scribble.experimental.feature" version="0.1.0.200903261709">
<category name="Common"/>
</feature>
- <feature url="features/org.scribble.feature_0.1.0.200903160851.jar" id="org.scribble.feature" version="0.1.0.200903160851">
+ <feature url="features/org.scribble.feature_0.1.0.200903261709.jar" id="org.scribble.feature" version="0.1.0.200903261709">
<category name="Common"/>
</feature>
- <feature url="features/org.scribble.java.feature_0.1.0.200903160851.jar" id="org.scribble.java.feature" version="0.1.0.200903160851">
+ <feature url="features/org.scribble.java.feature_0.1.0.200903261709.jar" id="org.scribble.java.feature" version="0.1.0.200903261709">
<category name="Common"/>
</feature>
- <feature url="features/org.scribble.protocol.feature_0.1.0.200903160851.jar" id="org.scribble.protocol.feature" version="0.1.0.200903160851">
+ <feature url="features/org.scribble.protocol.feature_0.1.0.200903261709.jar" id="org.scribble.protocol.feature" version="0.1.0.200903261709">
<category name="Common"/>
</feature>
- <feature url="features/org.jboss.tools.overlord.cdl.jbossesb.feature_1.0.0.200903160851.jar" id="org.jboss.tools.overlord.cdl.jbossesb.feature" version="1.0.0.200903160851">
+ <feature url="features/org.jboss.tools.overlord.cdl.jbossesb.feature_1.0.0.200903261709.jar" id="org.jboss.tools.overlord.cdl.jbossesb.feature" version="1.0.0.200903261709">
<category name="JBossESB"/>
</feature>
<category-def name="JBossESB" label="JBossESB">
Modified: cdl/trunk/docs/docbook/gettingstartedguide/src/main/images/GenerateESBServicesDialog.jpg
===================================================================
(Binary files differ)
Modified: cdl/trunk/docs/docbook/gettingstartedguide/src/main/module/soagwithcdl.xml
===================================================================
--- cdl/trunk/docs/docbook/gettingstartedguide/src/main/module/soagwithcdl.xml 2009-03-26 08:07:41 UTC (rev 551)
+++ cdl/trunk/docs/docbook/gettingstartedguide/src/main/module/soagwithcdl.xml 2009-03-26 21:11:17 UTC (rev 552)
@@ -117,9 +117,17 @@
</imageobject>
<para>
-To test out this feature, uncheck the <emphasis>Buyer</emphasis> and <emphasis>CreditAgency</emphasis> participants, leave the build system as <emphasis>Ant</emphasis> and press the 'Ok' button. This will create a single new project for the <emphasis>Store</emphasis> participant.
+To test out this feature, uncheck the <emphasis>Buyer</emphasis> and <emphasis>CreditAgency</emphasis> participants, leave the build system as <emphasis>Ant</emphasis>, select the messaging system appropriate for your target environment and press the 'Ok' button. This will create a single new project for the <emphasis>Store</emphasis> participant.
</para>
+ <para>
+Depending upon the value of the 'stateless' checkbox, the generated ESB service artefact (jboss-esb.xml) will either use a
+stateful or stateless approach for encoding the behaviour of the service. The difference relates to whether the Overlord infrastructure
+explicitly maintains state information about session instances, to help police the behaviour of individual transactions, or whether
+this is implicitly performed using other capabilities (such as the Conversation Validation mechanism described in the following
+section, which can be used as an external monitor to ensure the service behaves as expected).
+ </para>
+
<imageobject>
<imagedata fileref="images/GenerateESBServicesNav.jpg" align="center" width="2in" />
</imageobject>
17 years, 4 months
- 1
- 0
Overlord SVN: r551 - cdl/trunk/runtime/jbossesb-assembly.
by overlord-commits＠lists.jboss.org
Author: jeff.yuchang
Date: 2009-03-26 04:07:41 -0400 (Thu, 26 Mar 2009)
New Revision: 551
Modified:
cdl/trunk/runtime/jbossesb-assembly/pom.xml
Log:
[SOAG-98] Remove all of unncessary libraries that will be included in JBossAS and ESB.
Modified: cdl/trunk/runtime/jbossesb-assembly/pom.xml
===================================================================
--- cdl/trunk/runtime/jbossesb-assembly/pom.xml 2009-03-25 11:47:57 UTC (rev 550)
+++ cdl/trunk/runtime/jbossesb-assembly/pom.xml 2009-03-26 08:07:41 UTC (rev 551)
@@ -31,19 +31,21 @@
<groupId>org.hibernate</groupId>
<artifactId>hibernate-commons-annotations</artifactId>
<version>${hibernate-commons-annotations}</version>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>org.hibernate</groupId>
<artifactId>hibernate-tools</artifactId>
<version>${hibernate-tools-version}</version>
- <scope>provided</scope>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>hsqldb</groupId>
<artifactId>hsqldb</artifactId>
<version>${hsqldb-version}</version>
+ <scope>provided</scope>
</dependency>
<dependency>
@@ -96,23 +98,32 @@
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>jboss-packaging-maven-plugin</artifactId>
- <version>2.0-20080130.110241-9</version>
+ <version>2.0-beta-1</version>
<extensions>true</extensions>
+ <configuration>
+ <excludes>
+ <exclude>org.hibernate:hibernate-annotations</exclude>
+ <exclude>org.hibernate:hibernate</exclude>
+ <exclude>net.sf.ehcache:ehcache</exclude>
+ <exclude>commons-logging:commons-logging</exclude>
+ <exclude>commons-collections:commons-collections</exclude>
+ <exclude>javax.transaction:jta</exclude>
+ <exclude>asm:asm-attrs</exclude>
+ <exclude>dom4j:dom4j</exclude>
+ <exclude>antlr:antlr</exclude>
+ <exclude>cglib:cglib</exclude>
+ <exclude>asm:asm</exclude>
+ <exclude>org.hibernate:hibernate-annotations</exclude>
+ <exclude>javax.persistence:persistence-api</exclude>
+ <exclude>org.hibernate:ejb3-persistence</exclude>
+ <exclude>c3p0:c3p0</exclude>
+ <exclude>log4j:log4j</exclude>
+ <exclude>org.jboss.jbossesb:rosetta</exclude>
+ </excludes>
+ </configuration>
</plugin>
</plugins>
</build>
-
- <pluginRepositories>
- <pluginRepository>
- <releases>
- <enabled>false</enabled>
- </releases>
- <snapshots/>
- <id>jboss-plugin-snapshots</id>
- <name>JBoss Snapshot Plugin Repository</name>
- <url>http://snapshots.repository.codehaus.org</url>
- </pluginRepository>
- </pluginRepositories>
</project>
17 years, 4 months
- 1
- 0
Overlord SVN: r550 - cdl/trunk/distribution/validator/jbossesb.
by overlord-commits＠lists.jboss.org
Author: objectiser
Date: 2009-03-25 07:47:57 -0400 (Wed, 25 Mar 2009)
New Revision: 550
Modified:
cdl/trunk/distribution/validator/jbossesb/build.xml
Log:
Fixed path for searching for deployed messaging system.
Modified: cdl/trunk/distribution/validator/jbossesb/build.xml
===================================================================
--- cdl/trunk/distribution/validator/jbossesb/build.xml 2009-03-25 11:36:27 UTC (rev 549)
+++ cdl/trunk/distribution/validator/jbossesb/build.xml 2009-03-25 11:47:57 UTC (rev 550)
@@ -8,7 +8,7 @@
<target name="messaging-config" >
<property name="org.jboss.esb.server.deploy.dir"
- value="${org.jboss.esb.server.server}/deploy"/>
+ value="${target-server}/deploy"/>
<condition property="messaging.present">
<available file="${org.jboss.esb.server.deploy.dir}/jboss-messaging"/>
17 years, 4 months
- 1
- 0
Overlord SVN: r549 - in cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.runtime.jbossesb/src/java/org/jboss/tools/overlord/cdl/runtime/jbossesb: generator and 1 other directory.
by overlord-commits＠lists.jboss.org
Author: objectiser
Date: 2009-03-25 07:36:27 -0400 (Wed, 25 Mar 2009)
New Revision: 549
Added:
cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.runtime.jbossesb/src/java/org/jboss/tools/overlord/cdl/runtime/jbossesb/generator/BuildSystem.java
cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.runtime.jbossesb/src/java/org/jboss/tools/overlord/cdl/runtime/jbossesb/generator/JBMMessagingSystem.java
cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.runtime.jbossesb/src/java/org/jboss/tools/overlord/cdl/runtime/jbossesb/generator/JBossMQMessagingSystem.java
cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.runtime.jbossesb/src/java/org/jboss/tools/overlord/cdl/runtime/jbossesb/generator/MessagingConfigurationGenerator.java
cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.runtime.jbossesb/src/java/org/jboss/tools/overlord/cdl/runtime/jbossesb/generator/MessagingSystem.java
Removed:
cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.runtime.jbossesb/src/java/org/jboss/tools/overlord/cdl/runtime/jbossesb/generator/AbstractBuildSystem.java
cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.runtime.jbossesb/src/java/org/jboss/tools/overlord/cdl/runtime/jbossesb/generator/BuildSystem.java
cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.runtime.jbossesb/src/java/org/jboss/tools/overlord/cdl/runtime/jbossesb/generator/JBMConfigurationGenerator.java
cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.runtime.jbossesb/src/java/org/jboss/tools/overlord/cdl/runtime/jbossesb/generator/JBMQConfigurationGenerator.java
Modified:
cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.runtime.jbossesb/src/java/org/jboss/tools/overlord/cdl/runtime/jbossesb/dialogs/GenerateDialog.java
cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.runtime.jbossesb/src/java/org/jboss/tools/overlord/cdl/runtime/jbossesb/generator/AntBuildSystem.java
cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.runtime.jbossesb/src/java/org/jboss/tools/overlord/cdl/runtime/jbossesb/generator/Generator.java
cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.runtime.jbossesb/src/java/org/jboss/tools/overlord/cdl/runtime/jbossesb/generator/GeneratorContext.java
cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.runtime.jbossesb/src/java/org/jboss/tools/overlord/cdl/runtime/jbossesb/generator/MavenBuildSystem.java
Log:
SOAG-99 Updated ESB service generator to enable the messaging system (JBoss Messaging or JBossMQ) to be selected.
Modified: cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.runtime.jbossesb/src/java/org/jboss/tools/overlord/cdl/runtime/jbossesb/dialogs/GenerateDialog.java
===================================================================
--- cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.runtime.jbossesb/src/java/org/jboss/tools/overlord/cdl/runtime/jbossesb/dialogs/GenerateDialog.java 2009-03-24 17:52:23 UTC (rev 548)
+++ cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.runtime.jbossesb/src/java/org/jboss/tools/overlord/cdl/runtime/jbossesb/dialogs/GenerateDialog.java 2009-03-25 11:36:27 UTC (rev 549)
@@ -52,6 +52,9 @@
m_buildSystems.add(new AntBuildSystem());
m_buildSystems.add(new MavenBuildSystem());
+ m_messagingSystems.add(new JBMMessagingSystem());
+ m_messagingSystems.add(new JBossMQMessagingSystem());
+
initialize(m_file);
}
@@ -282,6 +285,19 @@
gd.widthHint = 100;
m_build.setLayoutData(gd);
+ m_messaging=new Combo(group, SWT.DROP_DOWN);
+
+ for (int i=0; i < m_messagingSystems.size(); i++) {
+ m_messaging.add(m_messagingSystems.get(i).getName());
+ }
+
+ m_messaging.select(0);
+
+ gd = new GridData();
+ gd.horizontalSpan = 1;
+ gd.widthHint = 100;
+ m_messaging.setLayoutData(gd);
+
return(composite);
}
@@ -358,7 +374,8 @@
public void okPressed() {
try {
- GeneratorContext context=new GeneratorContext(getSelectedBuildSystem());
+ GeneratorContext context=new GeneratorContext(getSelectedBuildSystem(),
+ getSelectedMessagingSystem());
Generator generator=new Generator(m_file,
context);
@@ -382,6 +399,10 @@
return(m_buildSystems.get(m_build.getSelectionIndex()));
}
+ protected MessagingSystem getSelectedMessagingSystem() {
+ return(m_messagingSystems.get(m_messaging.getSelectionIndex()));
+ }
+
/**
* This method is used to report an error.
*
@@ -409,5 +430,9 @@
private java.util.List<Button> m_statelessButtons=new java.util.Vector<Button>();
private java.util.List<Text> m_projectNames=new java.util.Vector<Text>();
private Combo m_build=null;
- private java.util.List<BuildSystem> m_buildSystems=new java.util.Vector<BuildSystem>();
+ private java.util.List<BuildSystem> m_buildSystems=
+ new java.util.Vector<BuildSystem>();
+ private Combo m_messaging=null;
+ private java.util.List<MessagingSystem> m_messagingSystems=
+ new java.util.Vector<MessagingSystem>();
}
Deleted: cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.runtime.jbossesb/src/java/org/jboss/tools/overlord/cdl/runtime/jbossesb/generator/AbstractBuildSystem.java
===================================================================
--- cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.runtime.jbossesb/src/java/org/jboss/tools/overlord/cdl/runtime/jbossesb/generator/AbstractBuildSystem.java 2009-03-24 17:52:23 UTC (rev 548)
+++ cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.runtime.jbossesb/src/java/org/jboss/tools/overlord/cdl/runtime/jbossesb/generator/AbstractBuildSystem.java 2009-03-25 11:36:27 UTC (rev 549)
@@ -1,58 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2008, Red Hat Middleware LLC, and others contributors as indicated
- * by the @authors tag. All rights reserved.
- * See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU Lesser General Public License, v. 2.1.
- * This program is distributed in the hope that it will be useful, but WITHOUT A
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- * PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details.
- * You should have received a copy of the GNU Lesser General Public License,
- * v.2.1 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA 02110-1301, USA.
- */
-package org.jboss.tools.overlord.cdl.runtime.jbossesb.generator;
-
-/**
- * This class represents an abstract build system.
- */
-public abstract class AbstractBuildSystem implements BuildSystem {
-
- private static final String TEMPLATE_SUFFIX = ".template";
- private static final String TEMPLATE_PREFIX = "template/";
-
- /**
- * This method returns the contents for the build
- * configuration file.
- *
- * @param projectName The project name
- * @return The build file contents
- */
- public String getBuildFileContents(String projectName) {
- String ret=null;
-
- java.io.InputStream is=
- AbstractBuildSystem.class.getResourceAsStream(
- TEMPLATE_PREFIX+getName()+TEMPLATE_SUFFIX);
-
- if (is != null) {
-
- try {
- byte[] b=new byte[is.available()];
- is.read(b);
-
- ret = new String(b);
-
- ret = ret.replaceAll("%PROJECT%", projectName);
- } catch(Exception e) {
- e.printStackTrace();
- }
- }
-
- return(ret);
- }
-}
Modified: cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.runtime.jbossesb/src/java/org/jboss/tools/overlord/cdl/runtime/jbossesb/generator/AntBuildSystem.java
===================================================================
--- cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.runtime.jbossesb/src/java/org/jboss/tools/overlord/cdl/runtime/jbossesb/generator/AntBuildSystem.java 2009-03-24 17:52:23 UTC (rev 548)
+++ cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.runtime.jbossesb/src/java/org/jboss/tools/overlord/cdl/runtime/jbossesb/generator/AntBuildSystem.java 2009-03-25 11:36:27 UTC (rev 549)
@@ -20,25 +20,21 @@
/**
* This class represents the Ant build system.
*/
-public class AntBuildSystem extends AbstractBuildSystem {
+public class AntBuildSystem extends BuildSystem {
private static final String BUILD_FILE = "build.xml";
private static final String ANT = "Ant";
private static final String ESB_CONFIG_PATH = "src/conf/jboss-esb.xml";
private static final String DEPLOYMENT_PATH = "src/conf/deployment.xml";
- private static final String JBOSSMQ_CONFIG_PATH = "src/conf/jbmq-queue-service.xml";
- private static final String JBM_CONFIG_PATH = "src/conf/jbm-queue-service.xml";
+ private static final String MESSAGING_CONFIG_PATH = "src/conf";
private static final String JAVA_SOURCE_PATH = "src/java";
private static final String LIBRARY_PATH = "src/lib";
/**
- * This method represents the name of the build
- * system.
- *
- * @return The name
+ * This is the default constructor for the Ant build system.
*/
- public String getName() {
- return(ANT);
+ public AntBuildSystem() {
+ super(ANT);
}
/**
@@ -72,26 +68,16 @@
}
/**
- * This method returns the JBossMQ configuration file
+ * This method returns the messaging configuration
* path.
*
- * @return The JBossMQ configuration file path
+ * @return The messaging configuration path
*/
- public String getJBossMQConfigFilePath() {
- return(JBOSSMQ_CONFIG_PATH);
+ public String getMessagingConfigPath() {
+ return(MESSAGING_CONFIG_PATH);
}
/**
- * This method returns the JBM configuration file
- * path.
- *
- * @return The JBM configuration file path
- */
- public String getJBMConfigFilePath() {
- return(JBM_CONFIG_PATH);
- }
-
- /**
* This method returns the Java source path.
*
* @return The Java source path
Deleted: cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.runtime.jbossesb/src/java/org/jboss/tools/overlord/cdl/runtime/jbossesb/generator/BuildSystem.java
===================================================================
--- cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.runtime.jbossesb/src/java/org/jboss/tools/overlord/cdl/runtime/jbossesb/generator/BuildSystem.java 2009-03-24 17:52:23 UTC (rev 548)
+++ cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.runtime.jbossesb/src/java/org/jboss/tools/overlord/cdl/runtime/jbossesb/generator/BuildSystem.java 2009-03-25 11:36:27 UTC (rev 549)
@@ -1,97 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2008, Red Hat Middleware LLC, and others contributors as indicated
- * by the @authors tag. All rights reserved.
- * See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU Lesser General Public License, v. 2.1.
- * This program is distributed in the hope that it will be useful, but WITHOUT A
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- * PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details.
- * You should have received a copy of the GNU Lesser General Public License,
- * v.2.1 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA 02110-1301, USA.
- */
-package org.jboss.tools.overlord.cdl.runtime.jbossesb.generator;
-
-/**
- * This interface represents a build system used when
- * generating the ESB projects.
- */
-public interface BuildSystem {
-
- /**
- * This method represents the name of the build
- * system.
- *
- * @return The name
- */
- public String getName();
-
- /**
- * This method returns the build configuration file
- * path.
- *
- * @return The build configuration file path
- */
- public String getBuildFilePath();
-
- /**
- * This method returns the contents for the build
- * configuration file.
- *
- * @param projectName The project name
- * @return The build file contents
- */
- public String getBuildFileContents(String projectName);
-
- /**
- * This method returns the ESB configuration file
- * path.
- *
- * @return The ESB configuration file path
- */
- public String getESBConfigFilePath();
-
- /**
- * This method returns the deployment file
- * path.
- *
- * @return The deployment file path
- */
- public String getDeploymentFilePath();
-
- /**
- * This method returns the JBossMQ configuration file
- * path.
- *
- * @return The JBossMQ configuration file path
- */
- public String getJBossMQConfigFilePath();
-
- /**
- * This method returns the JBM configuration file
- * path.
- *
- * @return The JBM configuration file path
- */
- public String getJBMConfigFilePath();
-
- /**
- * This method returns the Java source path.
- *
- * @return The Java source path
- */
- public String getJavaSourcePath();
-
- /**
- * This method returns the library path.
- *
- * @return The library path, or null if not required
- */
- public String getLibraryPath();
-
-}
Copied: cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.runtime.jbossesb/src/java/org/jboss/tools/overlord/cdl/runtime/jbossesb/generator/BuildSystem.java (from rev 531, cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.runtime.jbossesb/src/java/org/jboss/tools/overlord/cdl/runtime/jbossesb/generator/AbstractBuildSystem.java)
===================================================================
--- cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.runtime.jbossesb/src/java/org/jboss/tools/overlord/cdl/runtime/jbossesb/generator/BuildSystem.java (rev 0)
+++ cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.runtime.jbossesb/src/java/org/jboss/tools/overlord/cdl/runtime/jbossesb/generator/BuildSystem.java 2009-03-25 11:36:27 UTC (rev 549)
@@ -0,0 +1,124 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2008, Red Hat Middleware LLC, and others contributors as indicated
+ * by the @authors tag. All rights reserved.
+ * See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ * This copyrighted material is made available to anyone wishing to use,
+ * modify, copy, or redistribute it subject to the terms and conditions
+ * of the GNU Lesser General Public License, v. 2.1.
+ * This program is distributed in the hope that it will be useful, but WITHOUT A
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+ * PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details.
+ * You should have received a copy of the GNU Lesser General Public License,
+ * v.2.1 along with this distribution; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA 02110-1301, USA.
+ */
+package org.jboss.tools.overlord.cdl.runtime.jbossesb.generator;
+
+/**
+ * This class represents an abstract build system.
+ */
+public abstract class BuildSystem {
+
+ private static final String TEMPLATE_SUFFIX = ".template";
+ private static final String TEMPLATE_PREFIX = "template/";
+
+ /**
+ * This is the constructor for the build system.
+ *
+ * @param name The name of the build system
+ */
+ public BuildSystem(String name) {
+ m_name = name;
+ }
+ /**
+ * This method represents the name of the build
+ * system.
+ *
+ * @return The name
+ */
+ public String getName() {
+ return(m_name);
+ }
+
+ /**
+ * This method returns the build configuration file
+ * path.
+ *
+ * @return The build configuration file path
+ */
+ public abstract String getBuildFilePath();
+
+ /**
+ * This method returns the ESB configuration file
+ * path.
+ *
+ * @return The ESB configuration file path
+ */
+ public abstract String getESBConfigFilePath();
+
+ /**
+ * This method returns the deployment file
+ * path.
+ *
+ * @return The deployment file path
+ */
+ public abstract String getDeploymentFilePath();
+
+ /**
+ * This method returns the messaging configuration
+ * path.
+ *
+ * @return The messaging configuration path
+ */
+ public abstract String getMessagingConfigPath();
+
+ /**
+ * This method returns the Java source path.
+ *
+ * @return The Java source path
+ */
+ public abstract String getJavaSourcePath();
+
+ /**
+ * This method returns the library path.
+ *
+ * @return The library path, or null if not required
+ */
+ public abstract String getLibraryPath();
+
+ /**
+ * This method returns the contents for the build
+ * configuration file.
+ *
+ * @param projectName The project name
+ * @return The build file contents
+ */
+ public String getBuildFileContents(String projectName) {
+ String ret=null;
+
+ java.io.InputStream is=
+ BuildSystem.class.getResourceAsStream(
+ TEMPLATE_PREFIX+getName()+TEMPLATE_SUFFIX);
+
+ if (is != null) {
+
+ try {
+ byte[] b=new byte[is.available()];
+ is.read(b);
+
+ ret = new String(b);
+
+ ret = ret.replaceAll("%PROJECT%", projectName);
+ } catch(Exception e) {
+ e.printStackTrace();
+ }
+ }
+
+ return(ret);
+ }
+
+ private String m_name=null;
+}
Modified: cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.runtime.jbossesb/src/java/org/jboss/tools/overlord/cdl/runtime/jbossesb/generator/Generator.java
===================================================================
--- cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.runtime.jbossesb/src/java/org/jboss/tools/overlord/cdl/runtime/jbossesb/generator/Generator.java 2009-03-24 17:52:23 UTC (rev 548)
+++ cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.runtime.jbossesb/src/java/org/jboss/tools/overlord/cdl/runtime/jbossesb/generator/Generator.java 2009-03-25 11:36:27 UTC (rev 549)
@@ -74,7 +74,7 @@
m_conversationBasedGen.add(new BusinessObjectTypeGenerator());
m_modelBasedGen.add(new BuildConfigurationGenerator());
- m_modelBasedGen.add(new JBMQConfigurationGenerator());
+ m_modelBasedGen.add(new MessagingConfigurationGenerator());
m_modelBasedGen.add(new DeploymentFileGenerator());
// Initialize the model
Modified: cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.runtime.jbossesb/src/java/org/jboss/tools/overlord/cdl/runtime/jbossesb/generator/GeneratorContext.java
===================================================================
--- cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.runtime.jbossesb/src/java/org/jboss/tools/overlord/cdl/runtime/jbossesb/generator/GeneratorContext.java 2009-03-24 17:52:23 UTC (rev 548)
+++ cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.runtime.jbossesb/src/java/org/jboss/tools/overlord/cdl/runtime/jbossesb/generator/GeneratorContext.java 2009-03-25 11:36:27 UTC (rev 549)
@@ -27,9 +27,12 @@
* This is the constructor for the generator context.
*
* @param buildSystem The build system
+ * @param messagingSystem The messaging system
*/
- public GeneratorContext(BuildSystem buildSystem) {
+ public GeneratorContext(BuildSystem buildSystem,
+ MessagingSystem messagingSystem) {
m_buildSystem = buildSystem;
+ m_messagingSystem = messagingSystem;
}
/**
@@ -41,5 +44,10 @@
return(m_buildSystem);
}
+ public MessagingSystem getMessagingSystem() {
+ return(m_messagingSystem);
+ }
+
private BuildSystem m_buildSystem=null;
+ private MessagingSystem m_messagingSystem=null;
}
Deleted: cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.runtime.jbossesb/src/java/org/jboss/tools/overlord/cdl/runtime/jbossesb/generator/JBMConfigurationGenerator.java
===================================================================
--- cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.runtime.jbossesb/src/java/org/jboss/tools/overlord/cdl/runtime/jbossesb/generator/JBMConfigurationGenerator.java 2009-03-24 17:52:23 UTC (rev 548)
+++ cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.runtime.jbossesb/src/java/org/jboss/tools/overlord/cdl/runtime/jbossesb/generator/JBMConfigurationGenerator.java 2009-03-25 11:36:27 UTC (rev 549)
@@ -1,93 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2008, Red Hat Middleware LLC, and others contributors as indicated
- * by the @authors tag. All rights reserved.
- * See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU Lesser General Public License, v. 2.1.
- * This program is distributed in the hope that it will be useful, but WITHOUT A
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- * PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details.
- * You should have received a copy of the GNU Lesser General Public License,
- * v.2.1 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA 02110-1301, USA.
- */
-package org.jboss.tools.overlord.cdl.runtime.jbossesb.generator;
-
-import java.util.logging.Logger;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.jdt.core.IJavaProject;
-import org.jboss.tools.overlord.cdl.runtime.jbossesb.model.ESBLanguageModel;
-import org.jboss.tools.overlord.cdl.runtime.jbossesb.model.ESBService;
-
-/**
- * This class implements the model based generator to generate
- * the JBMQ configuration.
- */
-public class JBMConfigurationGenerator implements ModelBasedGenerator {
-
- /**
- * This method generates the relevant artefacts based on
- * the supplied model, within the specified Java project.
- *
- * @param jproj The Java project
- * @param model The model
- * @param context The generator context
- * @throws GeneratorException Failed to generate
- */
- public void generate(IJavaProject jproj,
- ESBLanguageModel model, GeneratorContext context)
- throws GeneratorException {
- IPath buildConfigPath=jproj.getPath().append(
- new Path(context.getBuildSystem().getJBMConfigFilePath()));
-
- IFile jbmqConfigFile=jproj.getProject().getWorkspace().getRoot().getFile(buildConfigPath);
- GeneratorUtil.createParentFolder(jbmqConfigFile);
-
- try {
- jbmqConfigFile.create(null, true,
- new org.eclipse.core.runtime.NullProgressMonitor());
-
- StringBuffer buf=new StringBuffer();
- buf.append("<server>\r\n");
-
- java.util.Iterator<ESBService> iter=model.getServices().iterator();
-
- while (iter.hasNext()) {
- ESBService service=iter.next();
-
- String dest=model.getJMSDefinition(service.getJMSBusIdRef());
-
- if (dest != null) {
- buf.append("\t<mbean code=\"org.jboss.jms.server.destination.QueueService\"\r\n");
- buf.append("\t\t\tname=\""+service.getCategory()+".destination:service=Queue,name="+dest+"\"\r\n");
- buf.append("\t\t\txmbean-dd=\"xmdesc/Queue-xmbean.xml\">\r\n");
- buf.append("\t\t<depends optional-attribute-name=\"ServerPeer\">\r\n");
- buf.append("\t\t\tjboss.messaging:service=ServerPeer\r\n");
- buf.append("\t\t</depends>\r\n");
- buf.append("\t\t<depends>jboss.messaging:service=PostOffice</depends>\r\n");
- buf.append("\t</mbean>\r\n");
- } else {
- logger.severe("Failed to find destination for JMS bus id '"+
- service.getJMSBusIdRef()+"'");
- }
- }
-
- buf.append("</server>\r\n");
-
- jbmqConfigFile.setContents(new java.io.ByteArrayInputStream(
- buf.toString().getBytes()), true, false,
- new org.eclipse.core.runtime.NullProgressMonitor());
- } catch(Exception e) {
- throw new GeneratorException("Failed to save JBM configuration", e);
- }
- }
-
- private static Logger logger = Logger.getLogger("org.jboss.tools.overlord.cdl.runtime.jbossesb.generator");
-}
Copied: cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.runtime.jbossesb/src/java/org/jboss/tools/overlord/cdl/runtime/jbossesb/generator/JBMMessagingSystem.java (from rev 548, cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.runtime.jbossesb/src/java/org/jboss/tools/overlord/cdl/runtime/jbossesb/generator/JBMConfigurationGenerator.java)
===================================================================
--- cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.runtime.jbossesb/src/java/org/jboss/tools/overlord/cdl/runtime/jbossesb/generator/JBMMessagingSystem.java (rev 0)
+++ cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.runtime.jbossesb/src/java/org/jboss/tools/overlord/cdl/runtime/jbossesb/generator/JBMMessagingSystem.java 2009-03-25 11:36:27 UTC (rev 549)
@@ -0,0 +1,82 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2008, Red Hat Middleware LLC, and others contributors as indicated
+ * by the @authors tag. All rights reserved.
+ * See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ * This copyrighted material is made available to anyone wishing to use,
+ * modify, copy, or redistribute it subject to the terms and conditions
+ * of the GNU Lesser General Public License, v. 2.1.
+ * This program is distributed in the hope that it will be useful, but WITHOUT A
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+ * PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details.
+ * You should have received a copy of the GNU Lesser General Public License,
+ * v.2.1 along with this distribution; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA 02110-1301, USA.
+ */
+package org.jboss.tools.overlord.cdl.runtime.jbossesb.generator;
+
+import java.util.logging.Logger;
+
+import org.jboss.tools.overlord.cdl.runtime.jbossesb.model.ESBLanguageModel;
+import org.jboss.tools.overlord.cdl.runtime.jbossesb.model.ESBService;
+
+/**
+ * This class provides the information related to the JBM
+ * messaging system.
+ */
+public class JBMMessagingSystem extends MessagingSystem {
+
+ private static final String JBOSS_MESSAGING = "JBoss Messaging";
+ private static final String JBM_CONFIG_FILE = "jbm-queue-service.xml";
+
+ /**
+ * The default constructor.
+ */
+ public JBMMessagingSystem() {
+ super(JBOSS_MESSAGING);
+ }
+
+ /**
+ * This method returns the configuration filename.
+ *
+ * @return The configuration filename
+ */
+ public String getConfigFileName() {
+ return(JBM_CONFIG_FILE);
+ }
+
+ /**
+ * This method returns the messaging configuration for the
+ * supplied service.
+ *
+ * @param model The model
+ * @param service The service
+ * @return The messaging configuration
+ */
+ protected String getServiceConfig(ESBLanguageModel model,
+ ESBService service) {
+ StringBuffer buf=new StringBuffer();
+
+ String dest=model.getJMSDefinition(service.getJMSBusIdRef());
+
+ if (dest != null) {
+ buf.append("\t<mbean code=\"org.jboss.jms.server.destination.QueueService\"\r\n");
+ buf.append("\t\t\tname=\""+service.getCategory()+".destination:service=Queue,name="+dest+"\"\r\n");
+ buf.append("\t\t\txmbean-dd=\"xmdesc/Queue-xmbean.xml\">\r\n");
+ buf.append("\t\t<depends optional-attribute-name=\"ServerPeer\">\r\n");
+ buf.append("\t\t\tjboss.messaging:service=ServerPeer\r\n");
+ buf.append("\t\t</depends>\r\n");
+ buf.append("\t\t<depends>jboss.messaging:service=PostOffice</depends>\r\n");
+ buf.append("\t</mbean>\r\n");
+ } else {
+ logger.severe("Failed to find destination for JMS bus id '"+
+ service.getJMSBusIdRef()+"'");
+ }
+
+ return(buf.toString());
+ }
+
+ private static Logger logger = Logger.getLogger("org.jboss.tools.overlord.cdl.runtime.jbossesb.generator");
+}
Property changes on: cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.runtime.jbossesb/src/java/org/jboss/tools/overlord/cdl/runtime/jbossesb/generator/JBMMessagingSystem.java
___________________________________________________________________
Name: svn:mergeinfo
+
Deleted: cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.runtime.jbossesb/src/java/org/jboss/tools/overlord/cdl/runtime/jbossesb/generator/JBMQConfigurationGenerator.java
===================================================================
--- cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.runtime.jbossesb/src/java/org/jboss/tools/overlord/cdl/runtime/jbossesb/generator/JBMQConfigurationGenerator.java 2009-03-24 17:52:23 UTC (rev 548)
+++ cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.runtime.jbossesb/src/java/org/jboss/tools/overlord/cdl/runtime/jbossesb/generator/JBMQConfigurationGenerator.java 2009-03-25 11:36:27 UTC (rev 549)
@@ -1,91 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2008, Red Hat Middleware LLC, and others contributors as indicated
- * by the @authors tag. All rights reserved.
- * See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU Lesser General Public License, v. 2.1.
- * This program is distributed in the hope that it will be useful, but WITHOUT A
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- * PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details.
- * You should have received a copy of the GNU Lesser General Public License,
- * v.2.1 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA 02110-1301, USA.
- */
-package org.jboss.tools.overlord.cdl.runtime.jbossesb.generator;
-
-import java.util.logging.Logger;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.jdt.core.IJavaProject;
-import org.jboss.tools.overlord.cdl.runtime.jbossesb.model.ESBLanguageModel;
-import org.jboss.tools.overlord.cdl.runtime.jbossesb.model.ESBService;
-
-/**
- * This class implements the model based generator to generate
- * the JBMQ configuration.
- */
-public class JBMQConfigurationGenerator implements ModelBasedGenerator {
-
- /**
- * This method generates the relevant artefacts based on
- * the supplied model, within the specified Java project.
- *
- * @param jproj The Java project
- * @param model The model
- * @param context The generator context
- * @throws GeneratorException Failed to generate
- */
- public void generate(IJavaProject jproj,
- ESBLanguageModel model, GeneratorContext context)
- throws GeneratorException {
- IPath buildConfigPath=jproj.getPath().append(
- new Path(context.getBuildSystem().getJBossMQConfigFilePath()));
-
- IFile jbmqConfigFile=jproj.getProject().getWorkspace().getRoot().getFile(buildConfigPath);
- GeneratorUtil.createParentFolder(jbmqConfigFile);
-
- try {
- jbmqConfigFile.create(null, true,
- new org.eclipse.core.runtime.NullProgressMonitor());
-
- StringBuffer buf=new StringBuffer();
- buf.append("<server>\r\n");
-
- java.util.Iterator<ESBService> iter=model.getServices().iterator();
-
- while (iter.hasNext()) {
- ESBService service=iter.next();
-
- String dest=model.getJMSDefinition(service.getJMSBusIdRef());
-
- if (dest != null) {
- buf.append("\t<mbean code=\"org.jboss.mq.server.jmx.Queue\"\r\n");
- buf.append("\t\t\tname=\""+service.getCategory()+".destination:service=Queue,name="+dest+"\">\r\n");
- buf.append("\t\t<depends optional-attribute-name=\"DestinationManager\">\r\n");
- buf.append("\t\t\tjboss.mq:service=DestinationManager\r\n");
- buf.append("\t\t</depends>\r\n");
- buf.append("\t</mbean>\r\n");
- } else {
- logger.severe("Failed to find destination for JMS bus id '"+
- service.getJMSBusIdRef()+"'");
- }
- }
-
- buf.append("</server>\r\n");
-
- jbmqConfigFile.setContents(new java.io.ByteArrayInputStream(
- buf.toString().getBytes()), true, false,
- new org.eclipse.core.runtime.NullProgressMonitor());
- } catch(Exception e) {
- throw new GeneratorException("Failed to save JBossMQ configuration", e);
- }
- }
-
- private static Logger logger = Logger.getLogger("org.jboss.tools.overlord.cdl.runtime.jbossesb.generator");
-}
Copied: cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.runtime.jbossesb/src/java/org/jboss/tools/overlord/cdl/runtime/jbossesb/generator/JBossMQMessagingSystem.java (from rev 548, cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.runtime.jbossesb/src/java/org/jboss/tools/overlord/cdl/runtime/jbossesb/generator/JBMQConfigurationGenerator.java)
===================================================================
--- cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.runtime.jbossesb/src/java/org/jboss/tools/overlord/cdl/runtime/jbossesb/generator/JBossMQMessagingSystem.java (rev 0)
+++ cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.runtime.jbossesb/src/java/org/jboss/tools/overlord/cdl/runtime/jbossesb/generator/JBossMQMessagingSystem.java 2009-03-25 11:36:27 UTC (rev 549)
@@ -0,0 +1,84 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2008, Red Hat Middleware LLC, and others contributors as indicated
+ * by the @authors tag. All rights reserved.
+ * See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ * This copyrighted material is made available to anyone wishing to use,
+ * modify, copy, or redistribute it subject to the terms and conditions
+ * of the GNU Lesser General Public License, v. 2.1.
+ * This program is distributed in the hope that it will be useful, but WITHOUT A
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+ * PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details.
+ * You should have received a copy of the GNU Lesser General Public License,
+ * v.2.1 along with this distribution; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA 02110-1301, USA.
+ */
+package org.jboss.tools.overlord.cdl.runtime.jbossesb.generator;
+
+import java.util.logging.Logger;
+
+import org.eclipse.core.resources.IFile;
+import org.eclipse.core.runtime.IPath;
+import org.eclipse.core.runtime.Path;
+import org.eclipse.jdt.core.IJavaProject;
+import org.jboss.tools.overlord.cdl.runtime.jbossesb.model.ESBLanguageModel;
+import org.jboss.tools.overlord.cdl.runtime.jbossesb.model.ESBService;
+
+/**
+ * This class provides the information related to the JBossMQ
+ * messaging system.
+ */
+public class JBossMQMessagingSystem extends MessagingSystem {
+
+ private static final String JBOSSMQ_MESSAGING = "JBossMQ";
+ private static final String JBOSSMQ_CONFIG_FILE = "jbmq-queue-service.xml";
+
+ /**
+ * The default constructor.
+ */
+ public JBossMQMessagingSystem() {
+ super(JBOSSMQ_MESSAGING);
+ }
+
+ /**
+ * This method returns the configuration filename.
+ *
+ * @return The configuration filename
+ */
+ public String getConfigFileName() {
+ return(JBOSSMQ_CONFIG_FILE);
+ }
+
+ /**
+ * This method returns the messaging configuration for the
+ * supplied service.
+ *
+ * @param model The model
+ * @param service The service
+ * @return The messaging configuration
+ */
+ protected String getServiceConfig(ESBLanguageModel model,
+ ESBService service) {
+ StringBuffer buf=new StringBuffer();
+
+ String dest=model.getJMSDefinition(service.getJMSBusIdRef());
+
+ if (dest != null) {
+ buf.append("\t<mbean code=\"org.jboss.mq.server.jmx.Queue\"\r\n");
+ buf.append("\t\t\tname=\""+service.getCategory()+".destination:service=Queue,name="+dest+"\">\r\n");
+ buf.append("\t\t<depends optional-attribute-name=\"DestinationManager\">\r\n");
+ buf.append("\t\t\tjboss.mq:service=DestinationManager\r\n");
+ buf.append("\t\t</depends>\r\n");
+ buf.append("\t</mbean>\r\n");
+ } else {
+ logger.severe("Failed to find destination for JMS bus id '"+
+ service.getJMSBusIdRef()+"'");
+ }
+
+ return(buf.toString());
+ }
+
+ private static Logger logger = Logger.getLogger("org.jboss.tools.overlord.cdl.runtime.jbossesb.generator");
+}
Modified: cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.runtime.jbossesb/src/java/org/jboss/tools/overlord/cdl/runtime/jbossesb/generator/MavenBuildSystem.java
===================================================================
--- cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.runtime.jbossesb/src/java/org/jboss/tools/overlord/cdl/runtime/jbossesb/generator/MavenBuildSystem.java 2009-03-24 17:52:23 UTC (rev 548)
+++ cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.runtime.jbossesb/src/java/org/jboss/tools/overlord/cdl/runtime/jbossesb/generator/MavenBuildSystem.java 2009-03-25 11:36:27 UTC (rev 549)
@@ -20,25 +20,22 @@
/**
* This class represents the Ant build system.
*/
-public class MavenBuildSystem extends AbstractBuildSystem {
+public class MavenBuildSystem extends BuildSystem {
private static final String BUILD_FILE = "pom.xml";
private static final String MAVEN = "Maven";
private static final String ESB_CONFIG_PATH = "src/main/resources/META-INF/jboss-esb.xml";
private static final String DEPLOYMENT_PATH = "src/main/resources/META-INF/deployment.xml";
- private static final String JBOSSMQ_CONFIG_PATH = "src/main/resources/jbmq-queue-service.xml";
- private static final String JBM_CONFIG_PATH = "src/main/resources/jbm-queue-service.xml";
+ private static final String MESSAGING_CONFIG_PATH = "src/main/resources";
private static final String JAVA_SOURCE_PATH = "src/main/java";
private static final String LIBRARY_PATH = null;
/**
- * This method represents the name of the build
- * system.
- *
- * @return The name
+ * This is the default constructor for the Maven build
+ * system.
*/
- public String getName() {
- return(MAVEN);
+ public MavenBuildSystem() {
+ super(MAVEN);
}
/**
@@ -72,26 +69,16 @@
}
/**
- * This method returns the JBossMQ configuration file
+ * This method returns the messaging configuration
* path.
*
- * @return The JBossMQ configuration file path
+ * @return The messaging configuration path
*/
- public String getJBossMQConfigFilePath() {
- return(JBOSSMQ_CONFIG_PATH);
+ public String getMessagingConfigPath() {
+ return(MESSAGING_CONFIG_PATH);
}
/**
- * This method returns the JBM configuration file
- * path.
- *
- * @return The JBM configuration file path
- */
- public String getJBMConfigFilePath() {
- return(JBM_CONFIG_PATH);
- }
-
- /**
* This method returns the Java source path.
*
* @return The Java source path
Added: cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.runtime.jbossesb/src/java/org/jboss/tools/overlord/cdl/runtime/jbossesb/generator/MessagingConfigurationGenerator.java
===================================================================
--- cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.runtime.jbossesb/src/java/org/jboss/tools/overlord/cdl/runtime/jbossesb/generator/MessagingConfigurationGenerator.java (rev 0)
+++ cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.runtime.jbossesb/src/java/org/jboss/tools/overlord/cdl/runtime/jbossesb/generator/MessagingConfigurationGenerator.java 2009-03-25 11:36:27 UTC (rev 549)
@@ -0,0 +1,67 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2008, Red Hat Middleware LLC, and others contributors as indicated
+ * by the @authors tag. All rights reserved.
+ * See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ * This copyrighted material is made available to anyone wishing to use,
+ * modify, copy, or redistribute it subject to the terms and conditions
+ * of the GNU Lesser General Public License, v. 2.1.
+ * This program is distributed in the hope that it will be useful, but WITHOUT A
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+ * PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details.
+ * You should have received a copy of the GNU Lesser General Public License,
+ * v.2.1 along with this distribution; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA 02110-1301, USA.
+ */
+package org.jboss.tools.overlord.cdl.runtime.jbossesb.generator;
+
+import org.eclipse.core.resources.IFile;
+import org.eclipse.core.runtime.IPath;
+import org.eclipse.jdt.core.IJavaProject;
+import org.jboss.tools.overlord.cdl.runtime.jbossesb.model.ESBLanguageModel;
+
+/**
+ * This class implements the model based generator to generate
+ * the JBMQ configuration.
+ */
+public class MessagingConfigurationGenerator implements ModelBasedGenerator {
+
+ /**
+ * This method generates the relevant artefacts based on
+ * the supplied model, within the specified Java project.
+ *
+ * @param jproj The Java project
+ * @param model The model
+ * @param context The generator context
+ * @throws GeneratorException Failed to generate
+ */
+ public void generate(IJavaProject jproj,
+ ESBLanguageModel model, GeneratorContext context)
+ throws GeneratorException {
+ IPath buildConfigPath=jproj.getPath().append(
+ context.getBuildSystem().getMessagingConfigPath());
+
+ buildConfigPath = buildConfigPath.append(java.io.File.separator);
+ buildConfigPath = buildConfigPath.append(context.getMessagingSystem().getConfigFileName());
+
+ IFile configFile=jproj.getProject().getWorkspace().getRoot().getFile(buildConfigPath);
+ GeneratorUtil.createParentFolder(configFile);
+
+ try {
+ configFile.create(null, true,
+ new org.eclipse.core.runtime.NullProgressMonitor());
+
+ String config=context.getMessagingSystem().getFileContents(model);
+
+ if (config != null) {
+ configFile.setContents(new java.io.ByteArrayInputStream(
+ config.getBytes()), true, false,
+ new org.eclipse.core.runtime.NullProgressMonitor());
+ }
+ } catch(Exception e) {
+ throw new GeneratorException("Failed to save messaging configuration", e);
+ }
+ }
+}
Added: cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.runtime.jbossesb/src/java/org/jboss/tools/overlord/cdl/runtime/jbossesb/generator/MessagingSystem.java
===================================================================
--- cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.runtime.jbossesb/src/java/org/jboss/tools/overlord/cdl/runtime/jbossesb/generator/MessagingSystem.java (rev 0)
+++ cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.runtime.jbossesb/src/java/org/jboss/tools/overlord/cdl/runtime/jbossesb/generator/MessagingSystem.java 2009-03-25 11:36:27 UTC (rev 549)
@@ -0,0 +1,94 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2008, Red Hat Middleware LLC, and others contributors as indicated
+ * by the @authors tag. All rights reserved.
+ * See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ * This copyrighted material is made available to anyone wishing to use,
+ * modify, copy, or redistribute it subject to the terms and conditions
+ * of the GNU Lesser General Public License, v. 2.1.
+ * This program is distributed in the hope that it will be useful, but WITHOUT A
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+ * PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details.
+ * You should have received a copy of the GNU Lesser General Public License,
+ * v.2.1 along with this distribution; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA 02110-1301, USA.
+ */
+package org.jboss.tools.overlord.cdl.runtime.jbossesb.generator;
+
+import org.jboss.tools.overlord.cdl.runtime.jbossesb.model.ESBLanguageModel;
+import org.jboss.tools.overlord.cdl.runtime.jbossesb.model.ESBService;
+
+/**
+ * This class represents an abstract messaging system.
+ */
+public abstract class MessagingSystem {
+
+ /**
+ * This is the constructor for the messaging system.
+ *
+ * @param name The name of the messaging system
+ */
+ public MessagingSystem(String name) {
+ m_name = name;
+ }
+ /**
+ * This method represents the name of the messaging
+ * system.
+ *
+ * @return The name
+ */
+ public String getName() {
+ return(m_name);
+ }
+
+ /**
+ * This method returns the configuration filename.
+ *
+ * @return The configuration filename
+ */
+ public abstract String getConfigFileName();
+
+ /**
+ * This method returns the contents for the messaging
+ * configuration file.
+ *
+ * @param jproj The Java project
+ * @param model The model
+ * @return The file contents
+ */
+ public String getFileContents(ESBLanguageModel model) {
+ StringBuffer buf=new StringBuffer();
+ buf.append("<server>\r\n");
+
+ java.util.Iterator<ESBService> iter=model.getServices().iterator();
+
+ while (iter.hasNext()) {
+ ESBService service=iter.next();
+
+ String serviceConfig=getServiceConfig(model, service);
+
+ if (serviceConfig != null) {
+ buf.append(serviceConfig);
+ }
+ }
+
+ buf.append("</server>\r\n");
+
+ return(buf.toString());
+ }
+
+ /**
+ * This method returns the messaging configuration for the
+ * supplied service.
+ *
+ * @param model The model
+ * @param service The service
+ * @return The messaging configuration
+ */
+ protected abstract String getServiceConfig(ESBLanguageModel model,
+ ESBService service);
+
+ private String m_name=null;
+}
17 years, 4 months
- 1
- 0
Overlord SVN: r548 - in cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.runtime.jbossesb/src/java/org/jboss/tools/overlord/cdl/runtime/jbossesb: generator and 1 other directory.
by overlord-commits＠lists.jboss.org
Author: objectiser
Date: 2009-03-24 13:52:23 -0400 (Tue, 24 Mar 2009)
New Revision: 548
Added:
cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.runtime.jbossesb/src/java/org/jboss/tools/overlord/cdl/runtime/jbossesb/generator/GeneratorContext.java
cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.runtime.jbossesb/src/java/org/jboss/tools/overlord/cdl/runtime/jbossesb/generator/JBMConfigurationGenerator.java
Modified:
cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.runtime.jbossesb/src/java/org/jboss/tools/overlord/cdl/runtime/jbossesb/dialogs/GenerateDialog.java
cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.runtime.jbossesb/src/java/org/jboss/tools/overlord/cdl/runtime/jbossesb/generator/AntBuildSystem.java
cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.runtime.jbossesb/src/java/org/jboss/tools/overlord/cdl/runtime/jbossesb/generator/BuildConfigurationGenerator.java
cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.runtime.jbossesb/src/java/org/jboss/tools/overlord/cdl/runtime/jbossesb/generator/BuildSystem.java
cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.runtime.jbossesb/src/java/org/jboss/tools/overlord/cdl/runtime/jbossesb/generator/BusinessObjectTypeGenerator.java
cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.runtime.jbossesb/src/java/org/jboss/tools/overlord/cdl/runtime/jbossesb/generator/ConversationBasedGenerator.java
cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.runtime.jbossesb/src/java/org/jboss/tools/overlord/cdl/runtime/jbossesb/generator/DeploymentFileGenerator.java
cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.runtime.jbossesb/src/java/org/jboss/tools/overlord/cdl/runtime/jbossesb/generator/Generator.java
cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.runtime.jbossesb/src/java/org/jboss/tools/overlord/cdl/runtime/jbossesb/generator/JBMQConfigurationGenerator.java
cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.runtime.jbossesb/src/java/org/jboss/tools/overlord/cdl/runtime/jbossesb/generator/MavenBuildSystem.java
cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.runtime.jbossesb/src/java/org/jboss/tools/overlord/cdl/runtime/jbossesb/generator/ModelBasedGenerator.java
Log:
Partial implementation of the generation of the JMS configuration for JBoss Messaging.
Modified: cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.runtime.jbossesb/src/java/org/jboss/tools/overlord/cdl/runtime/jbossesb/dialogs/GenerateDialog.java
===================================================================
--- cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.runtime.jbossesb/src/java/org/jboss/tools/overlord/cdl/runtime/jbossesb/dialogs/GenerateDialog.java 2009-03-24 12:37:18 UTC (rev 547)
+++ cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.runtime.jbossesb/src/java/org/jboss/tools/overlord/cdl/runtime/jbossesb/dialogs/GenerateDialog.java 2009-03-24 17:52:23 UTC (rev 548)
@@ -358,8 +358,10 @@
public void okPressed() {
try {
+ GeneratorContext context=new GeneratorContext(getSelectedBuildSystem());
+
Generator generator=new Generator(m_file,
- getSelectedBuildSystem());
+ context);
for (int i=0; i < m_roles.size(); i++) {
Modified: cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.runtime.jbossesb/src/java/org/jboss/tools/overlord/cdl/runtime/jbossesb/generator/AntBuildSystem.java
===================================================================
--- cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.runtime.jbossesb/src/java/org/jboss/tools/overlord/cdl/runtime/jbossesb/generator/AntBuildSystem.java 2009-03-24 12:37:18 UTC (rev 547)
+++ cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.runtime.jbossesb/src/java/org/jboss/tools/overlord/cdl/runtime/jbossesb/generator/AntBuildSystem.java 2009-03-24 17:52:23 UTC (rev 548)
@@ -26,7 +26,8 @@
private static final String ANT = "Ant";
private static final String ESB_CONFIG_PATH = "src/conf/jboss-esb.xml";
private static final String DEPLOYMENT_PATH = "src/conf/deployment.xml";
- private static final String JBMQ_CONFIG_PATH = "src/conf/jbmq-queue-service.xml";
+ private static final String JBOSSMQ_CONFIG_PATH = "src/conf/jbmq-queue-service.xml";
+ private static final String JBM_CONFIG_PATH = "src/conf/jbm-queue-service.xml";
private static final String JAVA_SOURCE_PATH = "src/java";
private static final String LIBRARY_PATH = "src/lib";
@@ -71,16 +72,26 @@
}
/**
- * This method returns the JBMQ configuration file
+ * This method returns the JBossMQ configuration file
* path.
*
- * @return The JBMQ configuration file path
+ * @return The JBossMQ configuration file path
*/
- public String getJBMQConfigFilePath() {
- return(JBMQ_CONFIG_PATH);
+ public String getJBossMQConfigFilePath() {
+ return(JBOSSMQ_CONFIG_PATH);
}
/**
+ * This method returns the JBM configuration file
+ * path.
+ *
+ * @return The JBM configuration file path
+ */
+ public String getJBMConfigFilePath() {
+ return(JBM_CONFIG_PATH);
+ }
+
+ /**
* This method returns the Java source path.
*
* @return The Java source path
Modified: cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.runtime.jbossesb/src/java/org/jboss/tools/overlord/cdl/runtime/jbossesb/generator/BuildConfigurationGenerator.java
===================================================================
--- cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.runtime.jbossesb/src/java/org/jboss/tools/overlord/cdl/runtime/jbossesb/generator/BuildConfigurationGenerator.java 2009-03-24 12:37:18 UTC (rev 547)
+++ cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.runtime.jbossesb/src/java/org/jboss/tools/overlord/cdl/runtime/jbossesb/generator/BuildConfigurationGenerator.java 2009-03-24 17:52:23 UTC (rev 548)
@@ -35,15 +35,15 @@
*
* @param jproj The Java project
* @param model The model
- * @param buildSystem The build system to use
+ * @param context The generator context
* @throws GeneratorException Failed to generate
*/
public void generate(IJavaProject jproj,
- ESBLanguageModel model, BuildSystem buildSystem)
+ ESBLanguageModel model, GeneratorContext context)
throws GeneratorException {
IPath buildConfigPath=jproj.getPath().append(
- new Path(buildSystem.getBuildFilePath()));
+ new Path(context.getBuildSystem().getBuildFilePath()));
IFile buildConfigFile=jproj.getProject().getWorkspace().getRoot().getFile(buildConfigPath);
@@ -53,7 +53,7 @@
buildConfigFile.create(null, true,
new org.eclipse.core.runtime.NullProgressMonitor());
- String config=buildSystem.getBuildFileContents(jproj.getProject().getName());
+ String config=context.getBuildSystem().getBuildFileContents(jproj.getProject().getName());
if (config != null) {
buildConfigFile.setContents(new java.io.ByteArrayInputStream(
Modified: cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.runtime.jbossesb/src/java/org/jboss/tools/overlord/cdl/runtime/jbossesb/generator/BuildSystem.java
===================================================================
--- cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.runtime.jbossesb/src/java/org/jboss/tools/overlord/cdl/runtime/jbossesb/generator/BuildSystem.java 2009-03-24 12:37:18 UTC (rev 547)
+++ cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.runtime.jbossesb/src/java/org/jboss/tools/overlord/cdl/runtime/jbossesb/generator/BuildSystem.java 2009-03-24 17:52:23 UTC (rev 548)
@@ -65,14 +65,22 @@
public String getDeploymentFilePath();
/**
- * This method returns the JBMQ configuration file
+ * This method returns the JBossMQ configuration file
* path.
*
- * @return The JBMQ configuration file path
+ * @return The JBossMQ configuration file path
*/
- public String getJBMQConfigFilePath();
+ public String getJBossMQConfigFilePath();
/**
+ * This method returns the JBM configuration file
+ * path.
+ *
+ * @return The JBM configuration file path
+ */
+ public String getJBMConfigFilePath();
+
+ /**
* This method returns the Java source path.
*
* @return The Java source path
Modified: cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.runtime.jbossesb/src/java/org/jboss/tools/overlord/cdl/runtime/jbossesb/generator/BusinessObjectTypeGenerator.java
===================================================================
--- cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.runtime.jbossesb/src/java/org/jboss/tools/overlord/cdl/runtime/jbossesb/generator/BusinessObjectTypeGenerator.java 2009-03-24 12:37:18 UTC (rev 547)
+++ cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.runtime.jbossesb/src/java/org/jboss/tools/overlord/cdl/runtime/jbossesb/generator/BusinessObjectTypeGenerator.java 2009-03-24 17:52:23 UTC (rev 548)
@@ -65,14 +65,14 @@
*
* @param jproj The Java project
* @param conversation The conversation
- * @param buildSystem The build system to use
+ * @param context The generator context
* @throws GeneratorException Failed to generate
*/
public void generate(IJavaProject jproj,
- Conversation conversation, BuildSystem buildSystem)
+ Conversation conversation, GeneratorContext context)
throws GeneratorException {
IPath sourceLocation=jproj.getPath().append(
- new Path(buildSystem.getJavaSourcePath()));
+ new Path(context.getBuildSystem().getJavaSourcePath()));
String javaClass=ConversationUtil.getBusinessObjectType(conversation);
Modified: cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.runtime.jbossesb/src/java/org/jboss/tools/overlord/cdl/runtime/jbossesb/generator/ConversationBasedGenerator.java
===================================================================
--- cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.runtime.jbossesb/src/java/org/jboss/tools/overlord/cdl/runtime/jbossesb/generator/ConversationBasedGenerator.java 2009-03-24 12:37:18 UTC (rev 547)
+++ cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.runtime.jbossesb/src/java/org/jboss/tools/overlord/cdl/runtime/jbossesb/generator/ConversationBasedGenerator.java 2009-03-24 17:52:23 UTC (rev 548)
@@ -32,11 +32,11 @@
*
* @param jproj The Java project
* @param conversation The conversation
- * @param buildSystem The build system to use
+ * @param context The generator context
* @throws GeneratorException Failed to generate
*/
public void generate(IJavaProject jproj,
- Conversation conversation, BuildSystem buildSystem)
+ Conversation conversation, GeneratorContext context)
throws GeneratorException;
}
Modified: cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.runtime.jbossesb/src/java/org/jboss/tools/overlord/cdl/runtime/jbossesb/generator/DeploymentFileGenerator.java
===================================================================
--- cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.runtime.jbossesb/src/java/org/jboss/tools/overlord/cdl/runtime/jbossesb/generator/DeploymentFileGenerator.java 2009-03-24 12:37:18 UTC (rev 547)
+++ cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.runtime.jbossesb/src/java/org/jboss/tools/overlord/cdl/runtime/jbossesb/generator/DeploymentFileGenerator.java 2009-03-24 17:52:23 UTC (rev 548)
@@ -38,16 +38,16 @@
*
* @param jproj The Java project
* @param model The model
- * @param buildSystem The build system to use
+ * @param context The generator context
* @throws GeneratorException Failed to generate
*/
public void generate(IJavaProject jproj,
- ESBLanguageModel model, BuildSystem buildSystem)
+ ESBLanguageModel model, GeneratorContext context)
throws GeneratorException {
try {
IPath deploymentPath=jproj.getPath().append(
- new Path(buildSystem.getDeploymentFilePath()));
+ new Path(context.getBuildSystem().getDeploymentFilePath()));
IFile deploymentFile=jproj.getProject().getWorkspace().getRoot().getFile(deploymentPath);
GeneratorUtil.createParentFolder(deploymentFile);
Modified: cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.runtime.jbossesb/src/java/org/jboss/tools/overlord/cdl/runtime/jbossesb/generator/Generator.java
===================================================================
--- cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.runtime.jbossesb/src/java/org/jboss/tools/overlord/cdl/runtime/jbossesb/generator/Generator.java 2009-03-24 12:37:18 UTC (rev 547)
+++ cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.runtime.jbossesb/src/java/org/jboss/tools/overlord/cdl/runtime/jbossesb/generator/Generator.java 2009-03-24 17:52:23 UTC (rev 548)
@@ -55,9 +55,9 @@
* This is the constructor for the generator.
*
*/
- public Generator(IFile file, BuildSystem buildSystem) {
+ public Generator(IFile file, GeneratorContext context) {
m_file = file;
- m_buildSystem = buildSystem;
+ m_context = context;
initialize(m_file);
}
@@ -241,7 +241,7 @@
for (int i=0; i < m_conversationBasedGen.size(); i++) {
try {
m_conversationBasedGen.get(i).generate(jproj,
- (Conversation)obj, getBuildSystem());
+ (Conversation)obj, getContext());
} catch(GeneratorException e) {
logger.log(java.util.logging.Level.SEVERE,
"Failed to generate conversation based artefact",
@@ -256,7 +256,7 @@
// Store ESB configuration
IPath esbConfigPath=jproj.getPath().append(
- new Path(getBuildSystem().getESBConfigFilePath()));
+ new Path(getContext().getBuildSystem().getESBConfigFilePath()));
IFile esbConfigFile=jproj.getProject().getWorkspace().getRoot().getFile(esbConfigPath);
GeneratorUtil.createParentFolder(esbConfigFile);
@@ -274,7 +274,7 @@
for (int i=0; i < m_modelBasedGen.size(); i++) {
try {
m_modelBasedGen.get(i).generate(jproj, model,
- getBuildSystem());
+ getContext());
} catch(GeneratorException e) {
logger.log(java.util.logging.Level.SEVERE,
"Failed to generate model based artefact",
@@ -318,11 +318,12 @@
IPath outputLocation=jproj.getPath().append(new Path(OUTPUT_LOCATION));
IPath classpathLocation=jproj.getPath().append(new Path(CLASSPATH_FILENAME));
IPath sourceLocation=jproj.getPath().append(
- new Path(getBuildSystem().getJavaSourcePath()));
+ new Path(getContext().getBuildSystem().getJavaSourcePath()));
IPath libLocation=null;
- if (getBuildSystem().getLibraryPath() != null) {
- libLocation=jproj.getPath().append(new Path(getBuildSystem().getLibraryPath()));
+ if (getContext().getBuildSystem().getLibraryPath() != null) {
+ libLocation=jproj.getPath().append(
+ new Path(getContext().getBuildSystem().getLibraryPath()));
}
// create and set the output and source paths first
@@ -499,8 +500,8 @@
return(ret);
}
- public BuildSystem getBuildSystem() {
- return(m_buildSystem);
+ public GeneratorContext getContext() {
+ return(m_context);
}
private static Logger logger = Logger.getLogger("org.jboss.tools.overlord.cdl.runtime.jbossesb.generator");
@@ -508,7 +509,7 @@
private IFile m_file=null;
private java.util.List<Role> m_roles=null;
private ConversationModel m_conversationModel=null;
- private BuildSystem m_buildSystem=null;
+ private GeneratorContext m_context=null;
private java.util.List<ConversationBasedGenerator> m_conversationBasedGen=
new java.util.Vector<ConversationBasedGenerator>();
private java.util.List<ModelBasedGenerator> m_modelBasedGen=
Added: cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.runtime.jbossesb/src/java/org/jboss/tools/overlord/cdl/runtime/jbossesb/generator/GeneratorContext.java
===================================================================
--- cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.runtime.jbossesb/src/java/org/jboss/tools/overlord/cdl/runtime/jbossesb/generator/GeneratorContext.java (rev 0)
+++ cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.runtime.jbossesb/src/java/org/jboss/tools/overlord/cdl/runtime/jbossesb/generator/GeneratorContext.java 2009-03-24 17:52:23 UTC (rev 548)
@@ -0,0 +1,45 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2008, Red Hat Middleware LLC, and others contributors as indicated
+ * by the @authors tag. All rights reserved.
+ * See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ * This copyrighted material is made available to anyone wishing to use,
+ * modify, copy, or redistribute it subject to the terms and conditions
+ * of the GNU Lesser General Public License, v. 2.1.
+ * This program is distributed in the hope that it will be useful, but WITHOUT A
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+ * PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details.
+ * You should have received a copy of the GNU Lesser General Public License,
+ * v.2.1 along with this distribution; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA 02110-1301, USA.
+ */
+package org.jboss.tools.overlord.cdl.runtime.jbossesb.generator;
+
+/**
+ * This class provides context information used by the
+ * generator.
+ */
+public class GeneratorContext {
+
+ /**
+ * This is the constructor for the generator context.
+ *
+ * @param buildSystem The build system
+ */
+ public GeneratorContext(BuildSystem buildSystem) {
+ m_buildSystem = buildSystem;
+ }
+
+ /**
+ * This method returns the build system.
+ *
+ * @return The build system
+ */
+ public BuildSystem getBuildSystem() {
+ return(m_buildSystem);
+ }
+
+ private BuildSystem m_buildSystem=null;
+}
Added: cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.runtime.jbossesb/src/java/org/jboss/tools/overlord/cdl/runtime/jbossesb/generator/JBMConfigurationGenerator.java
===================================================================
--- cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.runtime.jbossesb/src/java/org/jboss/tools/overlord/cdl/runtime/jbossesb/generator/JBMConfigurationGenerator.java (rev 0)
+++ cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.runtime.jbossesb/src/java/org/jboss/tools/overlord/cdl/runtime/jbossesb/generator/JBMConfigurationGenerator.java 2009-03-24 17:52:23 UTC (rev 548)
@@ -0,0 +1,93 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2008, Red Hat Middleware LLC, and others contributors as indicated
+ * by the @authors tag. All rights reserved.
+ * See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ * This copyrighted material is made available to anyone wishing to use,
+ * modify, copy, or redistribute it subject to the terms and conditions
+ * of the GNU Lesser General Public License, v. 2.1.
+ * This program is distributed in the hope that it will be useful, but WITHOUT A
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+ * PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details.
+ * You should have received a copy of the GNU Lesser General Public License,
+ * v.2.1 along with this distribution; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA 02110-1301, USA.
+ */
+package org.jboss.tools.overlord.cdl.runtime.jbossesb.generator;
+
+import java.util.logging.Logger;
+
+import org.eclipse.core.resources.IFile;
+import org.eclipse.core.runtime.IPath;
+import org.eclipse.core.runtime.Path;
+import org.eclipse.jdt.core.IJavaProject;
+import org.jboss.tools.overlord.cdl.runtime.jbossesb.model.ESBLanguageModel;
+import org.jboss.tools.overlord.cdl.runtime.jbossesb.model.ESBService;
+
+/**
+ * This class implements the model based generator to generate
+ * the JBMQ configuration.
+ */
+public class JBMConfigurationGenerator implements ModelBasedGenerator {
+
+ /**
+ * This method generates the relevant artefacts based on
+ * the supplied model, within the specified Java project.
+ *
+ * @param jproj The Java project
+ * @param model The model
+ * @param context The generator context
+ * @throws GeneratorException Failed to generate
+ */
+ public void generate(IJavaProject jproj,
+ ESBLanguageModel model, GeneratorContext context)
+ throws GeneratorException {
+ IPath buildConfigPath=jproj.getPath().append(
+ new Path(context.getBuildSystem().getJBMConfigFilePath()));
+
+ IFile jbmqConfigFile=jproj.getProject().getWorkspace().getRoot().getFile(buildConfigPath);
+ GeneratorUtil.createParentFolder(jbmqConfigFile);
+
+ try {
+ jbmqConfigFile.create(null, true,
+ new org.eclipse.core.runtime.NullProgressMonitor());
+
+ StringBuffer buf=new StringBuffer();
+ buf.append("<server>\r\n");
+
+ java.util.Iterator<ESBService> iter=model.getServices().iterator();
+
+ while (iter.hasNext()) {
+ ESBService service=iter.next();
+
+ String dest=model.getJMSDefinition(service.getJMSBusIdRef());
+
+ if (dest != null) {
+ buf.append("\t<mbean code=\"org.jboss.jms.server.destination.QueueService\"\r\n");
+ buf.append("\t\t\tname=\""+service.getCategory()+".destination:service=Queue,name="+dest+"\"\r\n");
+ buf.append("\t\t\txmbean-dd=\"xmdesc/Queue-xmbean.xml\">\r\n");
+ buf.append("\t\t<depends optional-attribute-name=\"ServerPeer\">\r\n");
+ buf.append("\t\t\tjboss.messaging:service=ServerPeer\r\n");
+ buf.append("\t\t</depends>\r\n");
+ buf.append("\t\t<depends>jboss.messaging:service=PostOffice</depends>\r\n");
+ buf.append("\t</mbean>\r\n");
+ } else {
+ logger.severe("Failed to find destination for JMS bus id '"+
+ service.getJMSBusIdRef()+"'");
+ }
+ }
+
+ buf.append("</server>\r\n");
+
+ jbmqConfigFile.setContents(new java.io.ByteArrayInputStream(
+ buf.toString().getBytes()), true, false,
+ new org.eclipse.core.runtime.NullProgressMonitor());
+ } catch(Exception e) {
+ throw new GeneratorException("Failed to save JBM configuration", e);
+ }
+ }
+
+ private static Logger logger = Logger.getLogger("org.jboss.tools.overlord.cdl.runtime.jbossesb.generator");
+}
Modified: cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.runtime.jbossesb/src/java/org/jboss/tools/overlord/cdl/runtime/jbossesb/generator/JBMQConfigurationGenerator.java
===================================================================
--- cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.runtime.jbossesb/src/java/org/jboss/tools/overlord/cdl/runtime/jbossesb/generator/JBMQConfigurationGenerator.java 2009-03-24 12:37:18 UTC (rev 547)
+++ cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.runtime.jbossesb/src/java/org/jboss/tools/overlord/cdl/runtime/jbossesb/generator/JBMQConfigurationGenerator.java 2009-03-24 17:52:23 UTC (rev 548)
@@ -38,14 +38,14 @@
*
* @param jproj The Java project
* @param model The model
- * @param buildSystem The build system to use
+ * @param context The generator context
* @throws GeneratorException Failed to generate
*/
public void generate(IJavaProject jproj,
- ESBLanguageModel model, BuildSystem buildSystem)
+ ESBLanguageModel model, GeneratorContext context)
throws GeneratorException {
IPath buildConfigPath=jproj.getPath().append(
- new Path(buildSystem.getJBMQConfigFilePath()));
+ new Path(context.getBuildSystem().getJBossMQConfigFilePath()));
IFile jbmqConfigFile=jproj.getProject().getWorkspace().getRoot().getFile(buildConfigPath);
GeneratorUtil.createParentFolder(jbmqConfigFile);
@@ -83,7 +83,7 @@
buf.toString().getBytes()), true, false,
new org.eclipse.core.runtime.NullProgressMonitor());
} catch(Exception e) {
- throw new GeneratorException("Failed to save JBMQ configuration", e);
+ throw new GeneratorException("Failed to save JBossMQ configuration", e);
}
}
Modified: cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.runtime.jbossesb/src/java/org/jboss/tools/overlord/cdl/runtime/jbossesb/generator/MavenBuildSystem.java
===================================================================
--- cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.runtime.jbossesb/src/java/org/jboss/tools/overlord/cdl/runtime/jbossesb/generator/MavenBuildSystem.java 2009-03-24 12:37:18 UTC (rev 547)
+++ cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.runtime.jbossesb/src/java/org/jboss/tools/overlord/cdl/runtime/jbossesb/generator/MavenBuildSystem.java 2009-03-24 17:52:23 UTC (rev 548)
@@ -26,7 +26,8 @@
private static final String MAVEN = "Maven";
private static final String ESB_CONFIG_PATH = "src/main/resources/META-INF/jboss-esb.xml";
private static final String DEPLOYMENT_PATH = "src/main/resources/META-INF/deployment.xml";
- private static final String JBMQ_CONFIG_PATH = "src/main/resources/jbmq-queue-service.xml";
+ private static final String JBOSSMQ_CONFIG_PATH = "src/main/resources/jbmq-queue-service.xml";
+ private static final String JBM_CONFIG_PATH = "src/main/resources/jbm-queue-service.xml";
private static final String JAVA_SOURCE_PATH = "src/main/java";
private static final String LIBRARY_PATH = null;
@@ -71,16 +72,26 @@
}
/**
- * This method returns the JBMQ configuration file
+ * This method returns the JBossMQ configuration file
* path.
*
- * @return The JBMQ configuration file path
+ * @return The JBossMQ configuration file path
*/
- public String getJBMQConfigFilePath() {
- return(JBMQ_CONFIG_PATH);
+ public String getJBossMQConfigFilePath() {
+ return(JBOSSMQ_CONFIG_PATH);
}
/**
+ * This method returns the JBM configuration file
+ * path.
+ *
+ * @return The JBM configuration file path
+ */
+ public String getJBMConfigFilePath() {
+ return(JBM_CONFIG_PATH);
+ }
+
+ /**
* This method returns the Java source path.
*
* @return The Java source path
Modified: cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.runtime.jbossesb/src/java/org/jboss/tools/overlord/cdl/runtime/jbossesb/generator/ModelBasedGenerator.java
===================================================================
--- cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.runtime.jbossesb/src/java/org/jboss/tools/overlord/cdl/runtime/jbossesb/generator/ModelBasedGenerator.java 2009-03-24 12:37:18 UTC (rev 547)
+++ cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.runtime.jbossesb/src/java/org/jboss/tools/overlord/cdl/runtime/jbossesb/generator/ModelBasedGenerator.java 2009-03-24 17:52:23 UTC (rev 548)
@@ -32,11 +32,11 @@
*
* @param jproj The Java project
* @param model The model
- * @param buildSystem The build system to use
+ * @param context The generator context
* @throws GeneratorException Failed to generate
*/
public void generate(IJavaProject jproj,
- ESBLanguageModel model, BuildSystem buildSystem)
+ ESBLanguageModel model, GeneratorContext context)
throws GeneratorException;
}
17 years, 4 months
- 1
- 0
Overlord SVN: r547 - in cdl/trunk/distribution/validator/jbossesb: pi4soa.sar and 2 other directories.
by overlord-commits＠lists.jboss.org
Author: objectiser
Date: 2009-03-24 08:37:18 -0400 (Tue, 24 Mar 2009)
New Revision: 547
Added:
cdl/trunk/distribution/validator/jbossesb/pi4soa.sar/jms/
cdl/trunk/distribution/validator/jbossesb/pi4soa.sar/jms/jbm-queue-service.xml
cdl/trunk/distribution/validator/jbossesb/pi4soa.sar/jms/jbmq-queue-service.xml
Modified:
cdl/trunk/distribution/validator/jbossesb/build.xml
cdl/trunk/distribution/validator/jbossesb/pi4soa.sar/META-INF/jboss-service.xml
Log:
SOAG-99 First step implemented, to make the deployment of pi4soa.sar dependent upon the type of messaging system that is configured in the target environment.
Modified: cdl/trunk/distribution/validator/jbossesb/build.xml
===================================================================
--- cdl/trunk/distribution/validator/jbossesb/build.xml 2009-03-21 17:11:43 UTC (rev 546)
+++ cdl/trunk/distribution/validator/jbossesb/build.xml 2009-03-24 12:37:18 UTC (rev 547)
@@ -2,11 +2,53 @@
<property name="target-server" value="${org.jboss.esb.server.home}/server/${org.jboss.esb.server.config}" />
- <target name="deploy" depends="register-validator-filter">
+<!-- ==================================================================== -->
+<!-- This section handles the discovery of the messaging platform. -->
+<!-- ==================================================================== -->
+
+ <target name="messaging-config" >
+ <property name="org.jboss.esb.server.deploy.dir"
+ value="${org.jboss.esb.server.server}/deploy"/>
+
+ <condition property="messaging.present">
+ <available file="${org.jboss.esb.server.deploy.dir}/jboss-messaging"/>
+ </condition>
+ <condition property="messaging.present">
+ <available file="${org.jboss.esb.server.deploy.dir}/jboss-messaging.sar"/>
+ </condition>
+
+ <condition property="jbossmq.present">
+ <not>
+ <isset property="messaging.present"/>
+ </not>
+ </condition>
+ </target>
+
+ <!-- dependencies specific to JBoss Messaging -->
+ <target name="messaging-dependencies" if="messaging.present" depends="messaging-config">
+ <property name="jms.service.file" value="jbm-queue-service.xml"/>
+ <property name="jms.description" value="JBoss Messaging"/>
+ </target>
+
+ <!-- dependencies specific to JBoss MQ -->
+ <target name="jbossmq-dependencies" if="jbossmq.present" depends="messaging-config">
+ <property name="jms.service.file" value="jbmq-queue-service.xml"/>
+ <property name="jms.description" value="JBoss MQ"/>
+ </target>
+
+<!-- ==================================================================== -->
+<!-- This section handles the deploy and undeploy targets. -->
+<!-- ==================================================================== -->
+
+ <target name="deploy" depends="register-validator-filter,messaging-dependencies,jbossmq-dependencies">
<echo message="Deploy pi4soa.sar, overlord-cdl-validator-jbossesb.esb files to the target server '${target-server}'." />
<copy todir="${target-server}/deploy/pi4soa.sar">
- <fileset dir="${basedir}/pi4soa.sar"/>
+ <fileset dir="${basedir}/pi4soa.sar">
+ <exclude name="jms/**" />
+ </fileset>
</copy>
+ <copy todir="${target-server}/deploy/pi4soa.sar"
+ file="${basedir}/pi4soa.sar/jms/${jms.service.file}" />
<copy todir="${target-server}/deploy/overlord-cdl-validator.esb">
<fileset dir="${basedir}/overlord-cdl-validator.esb" />
</copy>
Modified: cdl/trunk/distribution/validator/jbossesb/pi4soa.sar/META-INF/jboss-service.xml
===================================================================
--- cdl/trunk/distribution/validator/jbossesb/pi4soa.sar/META-INF/jboss-service.xml 2009-03-21 17:11:43 UTC (rev 546)
+++ cdl/trunk/distribution/validator/jbossesb/pi4soa.sar/META-INF/jboss-service.xml 2009-03-24 12:37:18 UTC (rev 547)
@@ -3,8 +3,4 @@
<mbean code="org.pi4soa.jboss.service.Pi4SOAService"
name="pi4soa:service=pi4soa">
</mbean>
- <mbean code="org.jboss.mq.server.jmx.Topic"
- name="jboss.mq.destination:service=Topic,name=tracker">
- <depends optional-attribute-name="DestinationManager">jboss.mq:service=DestinationManager</depends>
- </mbean>
</service>
Added: cdl/trunk/distribution/validator/jbossesb/pi4soa.sar/jms/jbm-queue-service.xml
===================================================================
--- cdl/trunk/distribution/validator/jbossesb/pi4soa.sar/jms/jbm-queue-service.xml (rev 0)
+++ cdl/trunk/distribution/validator/jbossesb/pi4soa.sar/jms/jbm-queue-service.xml 2009-03-24 12:37:18 UTC (rev 547)
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<server>
+
+ <mbean code="org.jboss.jms.server.destination.TopicService"
+ name="jboss.messaging.destination:service=Topic,name=tracker"
+ xmbean-dd="xmdesc/Topic-xmbean.xml">
+ <depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends>
+ <depends>jboss.messaging:service=PostOffice</depends>
+ </mbean>
+
+</server>
Added: cdl/trunk/distribution/validator/jbossesb/pi4soa.sar/jms/jbmq-queue-service.xml
===================================================================
--- cdl/trunk/distribution/validator/jbossesb/pi4soa.sar/jms/jbmq-queue-service.xml (rev 0)
+++ cdl/trunk/distribution/validator/jbossesb/pi4soa.sar/jms/jbmq-queue-service.xml 2009-03-24 12:37:18 UTC (rev 547)
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<server>
+ <mbean code="org.jboss.mq.server.jmx.Topic"
+ name="jboss.mq.destination:service=Topic,name=tracker">
+ <depends optional-attribute-name="DestinationManager">jboss.mq:service=DestinationManager</depends>
+ </mbean>
+</server>
17 years, 4 months
- 1
- 0
Overlord SVN: r546 - in cdl/trunk/samples/jbossesb/brokerage: broker/stateless/src/main/resources/META-INF and 2 other directories.
by overlord-commits＠lists.jboss.org
Author: jeff.yuchang
Date: 2009-03-21 13:11:43 -0400 (Sat, 21 Mar 2009)
New Revision: 546
Added:
cdl/trunk/samples/jbossesb/brokerage/broker/stateless/src/main/java/org/jboss/soa/overlord/samples/jbossesb/loan/broker/MemoryEPRStorage.java
cdl/trunk/samples/jbossesb/brokerage/broker/stateless/src/main/java/org/jboss/soa/overlord/samples/jbossesb/loan/broker/MemoryStore.java
cdl/trunk/samples/jbossesb/brokerage/broker/stateless/src/main/java/org/jboss/soa/overlord/samples/jbossesb/loan/broker/SendReqForQuoteDecision.java
cdl/trunk/samples/jbossesb/brokerage/broker/stateless/src/main/java/org/jboss/soa/overlord/samples/jbossesb/loan/broker/SetQuoteAction.java
cdl/trunk/samples/jbossesb/brokerage/supplier/stateless/src/main/java/org/jboss/soa/overlord/samples/jbossesb/supplier/MemoryEPRStorage.java
Modified:
cdl/trunk/samples/jbossesb/brokerage/broker/stateless/src/main/resources/META-INF/jboss-esb.xml
cdl/trunk/samples/jbossesb/brokerage/supplier/stateless/src/main/resources/META-INF/jboss-esb.xml
Log:
[SOAG-93] Finished broker stateless example.
Added: cdl/trunk/samples/jbossesb/brokerage/broker/stateless/src/main/java/org/jboss/soa/overlord/samples/jbossesb/loan/broker/MemoryEPRStorage.java
===================================================================
--- cdl/trunk/samples/jbossesb/brokerage/broker/stateless/src/main/java/org/jboss/soa/overlord/samples/jbossesb/loan/broker/MemoryEPRStorage.java (rev 0)
+++ cdl/trunk/samples/jbossesb/brokerage/broker/stateless/src/main/java/org/jboss/soa/overlord/samples/jbossesb/loan/broker/MemoryEPRStorage.java 2009-03-21 17:11:43 UTC (rev 546)
@@ -0,0 +1,46 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2008, JBoss Inc., and others contributors as indicated
+ * by the @authors tag. All rights reserved.
+ * See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ * This copyrighted material is made available to anyone wishing to use,
+ * modify, copy, or redistribute it subject to the terms and conditions
+ * of the GNU Lesser General Public License, v. 2.1.
+ * This program is distributed in the hope that it will be useful, but WITHOUT A
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+ * PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details.
+ * You should have received a copy of the GNU Lesser General Public License,
+ * v.2.1 along with this distribution; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA 02110-1301, USA.
+ *
+ * (C) 2008,
+ */
+package org.jboss.soa.overlord.samples.jbossesb.loan.broker;
+
+import java.util.HashMap;
+import java.util.Map;
+
+import org.jboss.soa.esb.addressing.EPR;
+import org.jboss.soa.esb.message.Message;
+import org.jboss.soa.overlord.jbossesb.EPRStorage;
+
+/**
+ * @author <a href="mailto:cyu@redhat.com">Jeff Yu</a>
+ *
+ */
+public class MemoryEPRStorage implements EPRStorage {
+
+ private static final Map<String, EPR> storage = new HashMap<String, EPR>();
+
+ public EPR getEPRByRole(String roleName, Message message) {
+ return storage.get(roleName);
+ }
+
+ public void registerRole(String roleName, Message message) {
+ EPR epr = message.getHeader().getCall().getReplyTo();
+ storage.put(roleName, epr);
+ }
+
+}
Added: cdl/trunk/samples/jbossesb/brokerage/broker/stateless/src/main/java/org/jboss/soa/overlord/samples/jbossesb/loan/broker/MemoryStore.java
===================================================================
--- cdl/trunk/samples/jbossesb/brokerage/broker/stateless/src/main/java/org/jboss/soa/overlord/samples/jbossesb/loan/broker/MemoryStore.java (rev 0)
+++ cdl/trunk/samples/jbossesb/brokerage/broker/stateless/src/main/java/org/jboss/soa/overlord/samples/jbossesb/loan/broker/MemoryStore.java 2009-03-21 17:11:43 UTC (rev 546)
@@ -0,0 +1,42 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2008, JBoss Inc., and others contributors as indicated
+ * by the @authors tag. All rights reserved.
+ * See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ * This copyrighted material is made available to anyone wishing to use,
+ * modify, copy, or redistribute it subject to the terms and conditions
+ * of the GNU Lesser General Public License, v. 2.1.
+ * This program is distributed in the hope that it will be useful, but WITHOUT A
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+ * PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details.
+ * You should have received a copy of the GNU Lesser General Public License,
+ * v.2.1 along with this distribution; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA 02110-1301, USA.
+ *
+ * (C) 2008,
+ */
+package org.jboss.soa.overlord.samples.jbossesb.loan.broker;
+
+/**
+ * @author <a href="mailto:cyu@redhat.com">Jeff Yu</a>
+ *
+ */
+public class MemoryStore {
+
+ private static int counter = 0;
+
+ public static void increaseCounter() {
+ counter = counter + 1;
+ }
+
+ public static void decreaseCounter() {
+ counter = counter - 1;
+ }
+
+ public static int getCounter() {
+ return counter;
+ }
+
+}
Added: cdl/trunk/samples/jbossesb/brokerage/broker/stateless/src/main/java/org/jboss/soa/overlord/samples/jbossesb/loan/broker/SendReqForQuoteDecision.java
===================================================================
--- cdl/trunk/samples/jbossesb/brokerage/broker/stateless/src/main/java/org/jboss/soa/overlord/samples/jbossesb/loan/broker/SendReqForQuoteDecision.java (rev 0)
+++ cdl/trunk/samples/jbossesb/brokerage/broker/stateless/src/main/java/org/jboss/soa/overlord/samples/jbossesb/loan/broker/SendReqForQuoteDecision.java 2009-03-21 17:11:43 UTC (rev 546)
@@ -0,0 +1,48 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2008, JBoss Inc., and others contributors as indicated
+ * by the @authors tag. All rights reserved.
+ * See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ * This copyrighted material is made available to anyone wishing to use,
+ * modify, copy, or redistribute it subject to the terms and conditions
+ * of the GNU Lesser General Public License, v. 2.1.
+ * This program is distributed in the hope that it will be useful, but WITHOUT A
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+ * PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details.
+ * You should have received a copy of the GNU Lesser General Public License,
+ * v.2.1 along with this distribution; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA 02110-1301, USA.
+ *
+ * (C) 2008,
+ */
+package org.jboss.soa.overlord.samples.jbossesb.loan.broker;
+
+import org.apache.log4j.Logger;
+import org.jboss.soa.esb.message.Message;
+import org.jboss.soa.overlord.jbossesb.Decision;
+
+/**
+ * @author <a href="mailto:cyu@redhat.com">Jeff Yu</a>
+ *
+ */
+public class SendReqForQuoteDecision implements Decision {
+
+ private final int DEFAULT = 1;
+
+ private Logger logger = Logger.getLogger(SendReqForQuoteDecision.class);
+
+ /* (non-Javadoc)
+ * @see org.jboss.soa.overlord.jbossesb.Decision#executeDecision(org.jboss.soa.esb.message.Message)
+ */
+ public boolean executeDecision(Message message) {
+ if (DEFAULT > MemoryStore.getCounter()) {
+ logger.info("The decision is true");
+ return true;
+ }
+ logger.info("The decision is false");
+ return false;
+ }
+
+}
Added: cdl/trunk/samples/jbossesb/brokerage/broker/stateless/src/main/java/org/jboss/soa/overlord/samples/jbossesb/loan/broker/SetQuoteAction.java
===================================================================
--- cdl/trunk/samples/jbossesb/brokerage/broker/stateless/src/main/java/org/jboss/soa/overlord/samples/jbossesb/loan/broker/SetQuoteAction.java (rev 0)
+++ cdl/trunk/samples/jbossesb/brokerage/broker/stateless/src/main/java/org/jboss/soa/overlord/samples/jbossesb/loan/broker/SetQuoteAction.java 2009-03-21 17:11:43 UTC (rev 546)
@@ -0,0 +1,73 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2008, JBoss Inc., and others contributors as indicated
+ * by the @authors tag. All rights reserved.
+ * See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ * This copyrighted material is made available to anyone wishing to use,
+ * modify, copy, or redistribute it subject to the terms and conditions
+ * of the GNU Lesser General Public License, v. 2.1.
+ * This program is distributed in the hope that it will be useful, but WITHOUT A
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+ * PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details.
+ * You should have received a copy of the GNU Lesser General Public License,
+ * v.2.1 along with this distribution; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA 02110-1301, USA.
+ *
+ * (C) 2008,
+ */
+package org.jboss.soa.overlord.samples.jbossesb.loan.broker;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.apache.log4j.Logger;
+import org.jboss.soa.esb.actions.AbstractActionLifecycle;
+import org.jboss.soa.esb.helpers.ConfigTree;
+import org.jboss.soa.esb.message.Message;
+import org.jboss.soa.overlord.jbossesb.XMLUtils;
+import org.w3c.dom.Node;
+
+/**
+ *
+ * @author <a href="mailto:cyu@redhat.com">Jeff Yu</a>
+ *
+ */
+public class SetQuoteAction extends AbstractActionLifecycle {
+
+ private Logger logger = Logger.getLogger(SetQuoteAction.class);
+
+ private ConfigTree config;
+
+ public SetQuoteAction(ConfigTree config) {
+ this.config = config;
+ }
+
+ public Message process(Message message) throws Exception {
+
+ Node node = XMLUtils.getNode((String)message.getBody().get());
+ String quoteValue = node.getTextContent();
+ String desc = node.getAttributes().getNamedItem("supplierDesc").getNodeValue();
+
+ List<Quote> quotes = (List<Quote>)message.getProperties().getProperty("quotes");
+ if (quotes == null) {
+ quotes = new ArrayList<Quote>();
+ }
+
+ Quote quote = new Quote();
+ quote.setServiceDescription(desc);
+ quote.setValue(quoteValue);
+
+ quotes.add(quote);
+
+ message.getProperties().setProperty("quotes", quotes);
+
+ MemoryStore.increaseCounter();
+
+ logger.info("set quote message :[" + node + "]");
+
+ return message;
+ }
+
+}
Modified: cdl/trunk/samples/jbossesb/brokerage/broker/stateless/src/main/resources/META-INF/jboss-esb.xml
===================================================================
--- cdl/trunk/samples/jbossesb/brokerage/broker/stateless/src/main/resources/META-INF/jboss-esb.xml 2009-03-20 16:48:05 UTC (rev 545)
+++ cdl/trunk/samples/jbossesb/brokerage/broker/stateless/src/main/resources/META-INF/jboss-esb.xml 2009-03-21 17:11:43 UTC (rev 546)
@@ -79,6 +79,8 @@
<action class="org.jboss.soa.overlord.jbossesb.stateless.actions.ReceiveMessageAction" name="ESBBrokerProcess_Broker__1_action_1" process="process">
<property name="operation" value="makeEnquiry"/>
<property name="messageType" value="enquiry"/>
+ <property name="clientRole" value="Buyer"/>
+ <property name="storageClass" value="org.jboss.soa.overlord.samples.jbossesb.loan.broker.MemoryEPRStorage" />
</action>
<action class="org.jboss.soa.overlord.jbossesb.stateless.actions.IfAction" name="ESBBrokerProcess_Broker__1_action_2" process="process">
<property name="paths">
@@ -168,6 +170,7 @@
<property name="operation" value="makeEnquiry"/>
<property name="messageType" value="quoteList"/>
<property name="clientRole" value="Buyer"/>
+ <property name="storageClass" value="org.jboss.soa.overlord.samples.jbossesb.loan.broker.MemoryEPRStorage" />
</action>
</actions>
</service>
@@ -179,7 +182,11 @@
<action class="org.jboss.soa.overlord.jbossesb.stateless.actions.ReceiveMessageAction" name="ESBBrokerProcess_Broker__8_action_1" process="process">
<property name="operation" value="buy"/>
<property name="messageType" value="buy"/>
+ <property name="clientRole" value="Buyer"/>
+ <property name="storageClass" value="org.jboss.soa.overlord.samples.jbossesb.loan.broker.MemoryEPRStorage" />
</action>
+ <action name="creditCheck-Request" class="org.jboss.soa.overlord.samples.jbossesb.loan.broker.SetCreditCheckRequestMessageAction" >
+ </action>
<action class="org.jboss.soa.overlord.jbossesb.stateless.actions.SendMessageAction" name="ESBBrokerProcess_Broker__8_action_2" process="process">
<property name="operation" value="checkCredit"/>
<property name="messageType" value="CreditCheckRequest"/>
@@ -199,6 +206,8 @@
<property name="operation" value="checkCredit"/>
<property name="messageType" value="CreditCheckOk"/>
</action>
+ <action name="set-orderConfirm" class="org.jboss.soa.overlord.samples.jbossesb.loan.broker.SetOrderConfirmRequestAction">
+ </action>
<action class="org.jboss.soa.overlord.jbossesb.stateless.actions.SendMessageAction" name="ESBBrokerProcess_Broker__9_action_2" process="process">
<property name="operation" value="confirm"/>
<property name="messageType" value="orderConfirmed"/>
@@ -222,6 +231,7 @@
<property name="operation" value="buy"/>
<property name="messageType" value="bookingReference"/>
<property name="clientRole" value="Buyer"/>
+ <property name="storageClass" value="org.jboss.soa.overlord.samples.jbossesb.loan.broker.MemoryEPRStorage" />
</action>
</actions>
</service>
@@ -234,10 +244,12 @@
<property name="operation" value="checkCredit"/>
<property name="messageType" value="CreditCheckInvalid"/>
</action>
+ <action name="set-orderRejected" class="org.jboss.soa.overlord.samples.jbossesb.loan.broker.SetOrderRejectMessageAction"></action>
<action class="org.jboss.soa.overlord.jbossesb.stateless.actions.SendMessageAction" name="ESBBrokerProcess_Broker__11_action_2" process="process">
<property name="operation" value="buy"/>
<property name="messageType" value="orderRejected"/>
- <property name="clientRole" value="Buyer"/>
+ <property name="clientRole" value="Buyer"/>
+ <property name="storageClass" value="org.jboss.soa.overlord.samples.jbossesb.loan.broker.MemoryEPRStorage" />
</action>
</actions>
</service>
Added: cdl/trunk/samples/jbossesb/brokerage/supplier/stateless/src/main/java/org/jboss/soa/overlord/samples/jbossesb/supplier/MemoryEPRStorage.java
===================================================================
--- cdl/trunk/samples/jbossesb/brokerage/supplier/stateless/src/main/java/org/jboss/soa/overlord/samples/jbossesb/supplier/MemoryEPRStorage.java (rev 0)
+++ cdl/trunk/samples/jbossesb/brokerage/supplier/stateless/src/main/java/org/jboss/soa/overlord/samples/jbossesb/supplier/MemoryEPRStorage.java 2009-03-21 17:11:43 UTC (rev 546)
@@ -0,0 +1,46 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2008, JBoss Inc., and others contributors as indicated
+ * by the @authors tag. All rights reserved.
+ * See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ * This copyrighted material is made available to anyone wishing to use,
+ * modify, copy, or redistribute it subject to the terms and conditions
+ * of the GNU Lesser General Public License, v. 2.1.
+ * This program is distributed in the hope that it will be useful, but WITHOUT A
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+ * PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details.
+ * You should have received a copy of the GNU Lesser General Public License,
+ * v.2.1 along with this distribution; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA 02110-1301, USA.
+ *
+ * (C) 2008,
+ */
+package org.jboss.soa.overlord.samples.jbossesb.supplier;
+
+import java.util.HashMap;
+import java.util.Map;
+
+import org.jboss.soa.esb.addressing.EPR;
+import org.jboss.soa.esb.message.Message;
+import org.jboss.soa.overlord.jbossesb.EPRStorage;
+
+/**
+ * @author <a href="mailto:cyu@redhat.com">Jeff Yu</a>
+ *
+ */
+public class MemoryEPRStorage implements EPRStorage {
+
+ private static final Map<String, EPR> storage = new HashMap<String, EPR>();
+
+ public EPR getEPRByRole(String roleName, Message message) {
+ return storage.get(roleName);
+ }
+
+ public void registerRole(String roleName, Message message) {
+ EPR epr = message.getHeader().getCall().getReplyTo();
+ storage.put(roleName, epr);
+ }
+
+}
Modified: cdl/trunk/samples/jbossesb/brokerage/supplier/stateless/src/main/resources/META-INF/jboss-esb.xml
===================================================================
--- cdl/trunk/samples/jbossesb/brokerage/supplier/stateless/src/main/resources/META-INF/jboss-esb.xml 2009-03-20 16:48:05 UTC (rev 545)
+++ cdl/trunk/samples/jbossesb/brokerage/supplier/stateless/src/main/resources/META-INF/jboss-esb.xml 2009-03-21 17:11:43 UTC (rev 546)
@@ -40,6 +40,8 @@
<action class="org.jboss.soa.overlord.jbossesb.stateless.actions.ReceiveMessageAction" name="ESBBrokerProcess_SupplierTxnProcessor__1_action_1" process="process">
<property name="operation" value="confirm"/>
<property name="messageType" value="orderConfirmed"/>
+ <property name="clientRole" value="Broker" />
+ <property name="storageClass" value="org.jboss.soa.overlord.samples.jbossesb.supplier.MemoryEPRStorage" />
</action>
<action class="org.jboss.soa.overlord.samples.jbossesb.supplier.SetOrderConfirmResponseAction" name="su-1">
</action>
@@ -47,6 +49,7 @@
<property name="operation" value="confirm"/>
<property name="messageType" value="bookingReference"/>
<property name="clientRole" value="Broker"/>
+ <property name="storageClass" value="org.jboss.soa.overlord.samples.jbossesb.supplier.MemoryEPRStorage" />
</action>
</actions>
</service>
@@ -74,6 +77,8 @@
<action class="org.jboss.soa.overlord.jbossesb.stateless.actions.ReceiveMessageAction" name="ESBBrokerProcess_SupplierQuoteEngine__1_action_1" process="process">
<property name="operation" value="getQuote"/>
<property name="messageType" value="requestForQuote"/>
+ <property name="clientRole" value="Broker"/>
+ <property name="storageClass" value="org.jboss.soa.overlord.samples.jbossesb.supplier.MemoryEPRStorage" />
</action>
<action class="org.jboss.soa.overlord.samples.jbossesb.supplier.SetQuoteMessageAction" name="su1-2">
</action>
@@ -81,6 +86,7 @@
<property name="operation" value="getQuote"/>
<property name="messageType" value="quote"/>
<property name="clientRole" value="Broker"/>
+ <property name="storageClass" value="org.jboss.soa.overlord.samples.jbossesb.supplier.MemoryEPRStorage" />
</action>
</actions>
</service>
17 years, 4 months
- 1
- 0
Overlord SVN: r545 - in cdl/trunk: runtime/jbossesb/src/main/java/org/jboss/soa/overlord/jbossesb/stateless/actions and 9 other directories.
by overlord-commits＠lists.jboss.org
Author: jeff.yuchang
Date: 2009-03-20 12:48:05 -0400 (Fri, 20 Mar 2009)
New Revision: 545
Added:
cdl/trunk/runtime/jbossesb/src/main/java/org/jboss/soa/overlord/jbossesb/EPRStorage.java
cdl/trunk/samples/jbossesb/common/creditAgency/stateless/src/main/java/com/acme/services/creditAgency/MemoryEPRStorage.java
cdl/trunk/samples/jbossesb/purchasing/store/stateless/src/main/java/com/acme/services/broker/MemoryEPRStorage.java
Removed:
cdl/trunk/samples/jbossesb/purchasing/store/stateless/src/main/java/com/acme/services/broker/PurchaseGoods.java
Modified:
cdl/trunk/runtime/jbossesb/src/main/java/org/jboss/soa/overlord/jbossesb/stateless/actions/ReceiveMessageAction.java
cdl/trunk/runtime/jbossesb/src/main/java/org/jboss/soa/overlord/jbossesb/stateless/actions/SendMessageAction.java
cdl/trunk/samples/jbossesb/brokerage/broker/stateless/src/main/resources/META-INF/deployment.xml
cdl/trunk/samples/jbossesb/brokerage/broker/stateless/src/main/resources/META-INF/jboss-esb.xml
cdl/trunk/samples/jbossesb/brokerage/broker/stateless/src/main/resources/jbmq-queue-service.xml
cdl/trunk/samples/jbossesb/brokerage/supplier/stateless/src/main/resources/META-INF/deployment.xml
cdl/trunk/samples/jbossesb/brokerage/supplier/stateless/src/main/resources/META-INF/jboss-esb.xml
cdl/trunk/samples/jbossesb/brokerage/supplier/stateless/src/main/resources/jbmq-queue-service.xml
cdl/trunk/samples/jbossesb/client/src/com/acme/services/buyer/BrokerClient.java
cdl/trunk/samples/jbossesb/common/creditAgency/stateless/src/main/resources/META-INF/jboss-esb.xml
cdl/trunk/samples/jbossesb/purchasing/store/stateless/src/main/resources/META-INF/jboss-esb.xml
Log:
* Update the purchasing example.
* Add the EPRStorage interface for getting ERP from client Role name.
Added: cdl/trunk/runtime/jbossesb/src/main/java/org/jboss/soa/overlord/jbossesb/EPRStorage.java
===================================================================
--- cdl/trunk/runtime/jbossesb/src/main/java/org/jboss/soa/overlord/jbossesb/EPRStorage.java (rev 0)
+++ cdl/trunk/runtime/jbossesb/src/main/java/org/jboss/soa/overlord/jbossesb/EPRStorage.java 2009-03-20 16:48:05 UTC (rev 545)
@@ -0,0 +1,35 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2008, JBoss Inc., and others contributors as indicated
+ * by the @authors tag. All rights reserved.
+ * See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ * This copyrighted material is made available to anyone wishing to use,
+ * modify, copy, or redistribute it subject to the terms and conditions
+ * of the GNU Lesser General Public License, v. 2.1.
+ * This program is distributed in the hope that it will be useful, but WITHOUT A
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+ * PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details.
+ * You should have received a copy of the GNU Lesser General Public License,
+ * v.2.1 along with this distribution; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA 02110-1301, USA.
+ *
+ * (C) 2008,
+ */
+package org.jboss.soa.overlord.jbossesb;
+
+import org.jboss.soa.esb.addressing.EPR;
+import org.jboss.soa.esb.message.Message;
+
+/**
+ * @author <a href="mailto:cyu@redhat.com">Jeff Yu</a>
+ *
+ */
+public interface EPRStorage {
+
+ void registerRole(String roleName, Message message);
+
+ EPR getEPRByRole(String roleName, Message message);
+
+}
Modified: cdl/trunk/runtime/jbossesb/src/main/java/org/jboss/soa/overlord/jbossesb/stateless/actions/ReceiveMessageAction.java
===================================================================
--- cdl/trunk/runtime/jbossesb/src/main/java/org/jboss/soa/overlord/jbossesb/stateless/actions/ReceiveMessageAction.java 2009-03-18 16:43:08 UTC (rev 544)
+++ cdl/trunk/runtime/jbossesb/src/main/java/org/jboss/soa/overlord/jbossesb/stateless/actions/ReceiveMessageAction.java 2009-03-20 16:48:05 UTC (rev 545)
@@ -23,6 +23,8 @@
import org.jboss.soa.esb.actions.AbstractActionLifecycle;
import org.jboss.soa.esb.helpers.ConfigTree;
import org.jboss.soa.esb.message.Message;
+import org.jboss.soa.overlord.jbossesb.ClassLoaderUtil;
+import org.jboss.soa.overlord.jbossesb.EPRStorage;
import org.jboss.soa.overlord.jbossesb.MessageUtil;
import org.jboss.soa.overlord.jbossesb.StringUtils;
@@ -34,6 +36,7 @@
* {@literal
<action class="org.jboss.soa.overlord.jbossesb.stateless.actions.ReceiveMessageAction" name="c2" process="process">
<property name="messageType" value="CreditCheckRequest"/>
+ <property name="clientRole" value="Buyer" />
</action>
* }
* </pre>
@@ -52,6 +55,10 @@
public static final String MESSAGE_TYPE = "messageType";
+ public static final String CLIENT_ROLE = "clientRole";
+
+ public static final String STORAGE_CLASS = "storageClass";
+
private static Logger logger = Logger.getLogger(ReceiveMessageAction.class);
private ConfigTree config;
@@ -77,7 +84,24 @@
throw new Exception ("Unexpected message type= "+ receivedMessageType + ", but expecting type="+ expected);
}
+ String roleName = config.getAttribute(CLIENT_ROLE);
+ String store = config.getAttribute(STORAGE_CLASS);
+
+ if (StringUtils.isNotNull(roleName) && StringUtils.isNotNull(store)) {
+ registerEPRwithRoleName(roleName, store, message);
+ }
+
return message;
}
+
+ private void registerEPRwithRoleName(String roleName, String storageClass, Message message) throws Exception {
+ Class<?> storageClz = ClassLoaderUtil.loadClass(storageClass);
+ if (!EPRStorage.class.isAssignableFrom(storageClz)){
+ throw new Exception("The storageClass of " + storageClass + " doesn't implement the EPRStorage Interface.");
+ }
+
+ EPRStorage storage = (EPRStorage)storageClz.newInstance();
+ storage.registerRole(roleName, message);
+ }
}
Modified: cdl/trunk/runtime/jbossesb/src/main/java/org/jboss/soa/overlord/jbossesb/stateless/actions/SendMessageAction.java
===================================================================
--- cdl/trunk/runtime/jbossesb/src/main/java/org/jboss/soa/overlord/jbossesb/stateless/actions/SendMessageAction.java 2009-03-18 16:43:08 UTC (rev 544)
+++ cdl/trunk/runtime/jbossesb/src/main/java/org/jboss/soa/overlord/jbossesb/stateless/actions/SendMessageAction.java 2009-03-20 16:48:05 UTC (rev 545)
@@ -19,6 +19,8 @@
*/
package org.jboss.soa.overlord.jbossesb.stateless.actions;
+import org.apache.log4j.Logger;
+import org.jboss.internal.soa.esb.addressing.helpers.EPRHelper;
import org.jboss.soa.esb.actions.AbstractActionLifecycle;
import org.jboss.soa.esb.addressing.EPR;
import org.jboss.soa.esb.addressing.eprs.LogicalEPR;
@@ -29,6 +31,8 @@
import org.jboss.soa.esb.message.Message;
import org.jboss.soa.esb.message.format.MessageFactory;
import org.jboss.soa.esb.message.format.MessageType;
+import org.jboss.soa.overlord.jbossesb.ClassLoaderUtil;
+import org.jboss.soa.overlord.jbossesb.EPRStorage;
import org.jboss.soa.overlord.jbossesb.LogicalCourier;
import org.jboss.soa.overlord.jbossesb.MessageUtil;
import org.jboss.soa.overlord.jbossesb.StringUtils;
@@ -62,6 +66,7 @@
process="process" name="s4-3">
<property name="messageType" value="quoteList" />
<property name="clientRole" value="buyer" />
+ <property name="storageClass" value="orgization.your.impl.EPRStorageImpl" />
</action>
* }
* </pre>
@@ -87,6 +92,7 @@
* <li><i>serviceCategory</i> - Mapped to JBossESB service-category.</li>
* <li><i>responseServiceName</i> - The service-name of the responded message.</li>
* <li><i>responseServiceCategory</i> - The service-category of the responded message.</li>
+ * <li><i>storageClass</i> - The class that is responsible for registering, getting EPR from roleName. </li>
* </ul>
*
*
@@ -109,8 +115,12 @@
public static final String CLIENT_ROLE = "clientRole";
+ public static final String STORAGE_CLASS = "storageClass";
+
private ConfigTree config;
+ private Logger logger = Logger.getLogger(SendMessageAction.class);
+
public SendMessageAction(ConfigTree config) {
this.config = config;
}
@@ -136,6 +146,7 @@
String category = config.getAttribute(SERVICE_CATEGORY);
String serviceName = config.getAttribute(SERVICE_NAME);
String clientRole = config.getAttribute(CLIENT_ROLE);
+ String storageClass = config.getAttribute(STORAGE_CLASS);
if (StringUtils.isNotNull(category) && StringUtils.isNotNull(serviceName)
&& StringUtils.isNotNull(clientRole)) {
@@ -145,8 +156,11 @@
if (StringUtils.isNotNull(category) && StringUtils.isNotNull(serviceName)){
ServiceInvoker invoker = new ServiceInvoker(category, serviceName);
invoker.deliverAsync(deliverMessage);
- } else if (StringUtils.isNotNull(clientRole)) {
- deliverMessageFromEPR(message, deliverMessage);
+ logger.info("Send Message to [" + category + "/" + serviceName + "]" );
+ } else if (StringUtils.isNotNull(clientRole) && StringUtils.isNotNull(storageClass)) {
+
+ deliverMessageToRole(clientRole, storageClass, deliverMessage, message);
+ logger.info("Send Message to [" + clientRole + "]" );
} else {
throw new Exception ("Failed to send message, because can't find [serivceCategory/serviceName]," +
"nor clientRole.");
@@ -171,8 +185,17 @@
return deliverMessage;
}
- private void deliverMessageFromEPR(Message message, Message deliverMessage) throws Exception {
- EPR epr = message.getHeader().getCall().getReplyTo();
+ private void deliverMessageToRole(String roleName, String storageClass,
+ Message deliverMessage, Message message) throws Exception {
+ Class<?> storageClz = ClassLoaderUtil.loadClass(storageClass);
+ if (!EPRStorage.class.isAssignableFrom(storageClz)){
+ throw new Exception("The storageClass of " + storageClass + " doesn't implement the EPRStorage Interface.");
+ }
+
+ EPRStorage storage = (EPRStorage)storageClz.newInstance();
+ EPR epr = storage.getEPRByRole(roleName, message);
+ logger.debug("The reply EPR is: " + EPRHelper.toXMLString(epr));
+
Courier courier = null;
// Workaround, as CourierFactory currently does not support logical EPRs.
if (epr instanceof LogicalEPR) {
Modified: cdl/trunk/samples/jbossesb/brokerage/broker/stateless/src/main/resources/META-INF/deployment.xml
===================================================================
--- cdl/trunk/samples/jbossesb/brokerage/broker/stateless/src/main/resources/META-INF/deployment.xml 2009-03-18 16:43:08 UTC (rev 544)
+++ cdl/trunk/samples/jbossesb/brokerage/broker/stateless/src/main/resources/META-INF/deployment.xml 2009-03-20 16:48:05 UTC (rev 545)
@@ -1,4 +1,5 @@
<jbossesb-deployment>
+ <depends>jboss.esb:deployment=overlord-cdl-runtime.esb</depends>
<depends>org.pi4soa.esbbroker.esbbroker.destination:service=Queue,name=org_pi4soa_esbbroker_esbbroker_ESBBrokerProcess_Broker__2</depends>
<depends>org.pi4soa.esbbroker.esbbroker.destination:service=Queue,name=org_pi4soa_esbbroker_esbbroker_ESBBrokerProcess_Broker__1</depends>
<depends>org.pi4soa.esbbroker.esbbroker.destination:service=Queue,name=org_pi4soa_esbbroker_esbbroker_ESBBrokerProcess_Broker__12</depends>
Modified: cdl/trunk/samples/jbossesb/brokerage/broker/stateless/src/main/resources/META-INF/jboss-esb.xml
===================================================================
--- cdl/trunk/samples/jbossesb/brokerage/broker/stateless/src/main/resources/META-INF/jboss-esb.xml 2009-03-18 16:43:08 UTC (rev 544)
+++ cdl/trunk/samples/jbossesb/brokerage/broker/stateless/src/main/resources/META-INF/jboss-esb.xml 2009-03-20 16:48:05 UTC (rev 545)
@@ -50,7 +50,7 @@
<listeners>
<jms-listener busidref="busId1" maxThreads="1" name="org.pi4soa.esbbroker.esbbroker-ESBBrokerProcess_Broker"/>
</listeners>
- <actions>
+ <actions mep="OneWay">
<action class="org.jboss.soa.overlord.jbossesb.stateless.actions.SwitchAction" name="ESBBrokerProcess_Broker_action_1" process="process">
<property name="serviceDescriptionName" value="{org.pi4soa.esbbroker.esbbroker}ESBBrokerProcess-Broker"/>
<property name="conversationType" value="overlord.cdl.samples.LoanBroker@Broker"/>
@@ -75,14 +75,14 @@
<listeners>
<jms-listener busidref="busId2" maxThreads="1" name="org.pi4soa.esbbroker.esbbroker-ESBBrokerProcess_Broker__1"/>
</listeners>
- <actions>
+ <actions mep="OneWay">
<action class="org.jboss.soa.overlord.jbossesb.stateless.actions.ReceiveMessageAction" name="ESBBrokerProcess_Broker__1_action_1" process="process">
<property name="operation" value="makeEnquiry"/>
<property name="messageType" value="enquiry"/>
</action>
<action class="org.jboss.soa.overlord.jbossesb.stateless.actions.IfAction" name="ESBBrokerProcess_Broker__1_action_2" process="process">
<property name="paths">
- <if service-category="org.pi4soa.esbbroker.esbbroker" service-name="ESBBrokerProcess_Broker__2"/>
+ <if service-category="org.pi4soa.esbbroker.esbbroker" service-name="ESBBrokerProcess_Broker__2" decision-class="org.jboss.soa.overlord.samples.jbossesb.loan.broker.SendReqForQuoteDecision"/>
<else service-category="org.pi4soa.esbbroker.esbbroker" service-name="ESBBrokerProcess_Broker__3"/>
</property>
</action>
@@ -92,7 +92,9 @@
<listeners>
<jms-listener busidref="busId3" maxThreads="1" name="org.pi4soa.esbbroker.esbbroker-ESBBrokerProcess_Broker__2"/>
</listeners>
- <actions>
+ <actions mep="OneWay">
+ <action class="org.jboss.soa.overlord.samples.jbossesb.loan.broker.SetRequestQuoteMessageAction" name="b-1" process="process">
+ </action>
<action class="org.jboss.soa.overlord.jbossesb.stateless.actions.SendMessageAction" name="ESBBrokerProcess_Broker__2_action_1" process="process">
<property name="operation" value="getQuote"/>
<property name="messageType" value="requestForQuote"/>
@@ -107,21 +109,26 @@
<listeners>
<jms-listener busidref="busId4" maxThreads="1" name="org.pi4soa.esbbroker.esbbroker-ESBBrokerProcess_Broker__3"/>
</listeners>
- <actions/>
+ <actions mep="OneWay">
+ <action class="org.jboss.soa.overlord.samples.jbossesb.loan.broker.SetRequestQuoteMessageAction" name="b-13" process="process">
+ </action>
+ </actions>
</service>
<service category="org.pi4soa.esbbroker.esbbroker" description="" name="getQuote">
<listeners>
<jms-listener busidref="busId5" maxThreads="1" name="org.pi4soa.esbbroker.esbbroker-ESBBrokerProcess_Broker__4"/>
</listeners>
- <actions>
+ <actions mep="OneWay">
<action class="org.jboss.soa.overlord.jbossesb.stateless.actions.ReceiveMessageAction" name="ESBBrokerProcess_Broker__4_action_1" process="process">
<property name="operation" value="getQuote"/>
<property name="messageType" value="quote"/>
</action>
+ <action class="org.jboss.soa.overlord.samples.jbossesb.loan.broker.SetQuoteAction" name="b-2" process="process">
+ </action>
<action class="org.jboss.soa.overlord.jbossesb.stateless.actions.IfAction" name="ESBBrokerProcess_Broker__4_action_2" process="process">
<property name="paths">
- <if service-category="org.pi4soa.esbbroker.esbbroker" service-name="ESBBrokerProcess_Broker__5"/>
- <else service-category="org.pi4soa.esbbroker.esbbroker" service-name="ESBBrokerProcess_Broker__6"/>
+ <if service-category="org.pi4soa.esbbroker.esbbroker" service-name="ESBBrokerProcess_Broker__5" decision-class="org.jboss.soa.overlord.samples.jbossesb.loan.broker.SendReqForQuoteDecision"/>
+ <else service-category="org.pi4soa.esbbroker.esbbroker" service-name="ESBBrokerProcess_Broker__7"/>
</property>
</action>
</actions>
@@ -130,7 +137,7 @@
<listeners>
<jms-listener busidref="busId6" maxThreads="1" name="org.pi4soa.esbbroker.esbbroker-ESBBrokerProcess_Broker__5"/>
</listeners>
- <actions>
+ <actions mep="OneWay">
<action class="org.jboss.soa.overlord.jbossesb.stateless.actions.SendMessageAction" name="ESBBrokerProcess_Broker__5_action_1" process="process">
<property name="operation" value="getQuote"/>
<property name="messageType" value="requestForQuote"/>
@@ -145,13 +152,18 @@
<listeners>
<jms-listener busidref="busId7" maxThreads="1" name="org.pi4soa.esbbroker.esbbroker-ESBBrokerProcess_Broker__6"/>
</listeners>
- <actions/>
+ <actions mep="OneWay">
+ <action class="org.jboss.soa.overlord.samples.jbossesb.loan.broker.SetRequestQuoteMessageAction" name="b-1" process="process">
+ </action>
+ </actions>
</service>
<service category="org.pi4soa.esbbroker.esbbroker" description="" name="ESBBrokerProcess_Broker__7">
<listeners>
<jms-listener busidref="busId8" maxThreads="1" name="org.pi4soa.esbbroker.esbbroker-ESBBrokerProcess_Broker__7"/>
</listeners>
- <actions>
+ <actions mep="OneWay">
+ <action class="org.jboss.soa.overlord.samples.jbossesb.loan.broker.SetQuotesListAction" name="b-3" process="process">
+ </action>
<action class="org.jboss.soa.overlord.jbossesb.stateless.actions.SendMessageAction" name="ESBBrokerProcess_Broker__7_action_1" process="process">
<property name="operation" value="makeEnquiry"/>
<property name="messageType" value="quoteList"/>
@@ -163,7 +175,7 @@
<listeners>
<jms-listener busidref="busId9" maxThreads="1" name="org.pi4soa.esbbroker.esbbroker-ESBBrokerProcess_Broker__8"/>
</listeners>
- <actions>
+ <actions mep="OneWay">
<action class="org.jboss.soa.overlord.jbossesb.stateless.actions.ReceiveMessageAction" name="ESBBrokerProcess_Broker__8_action_1" process="process">
<property name="operation" value="buy"/>
<property name="messageType" value="buy"/>
@@ -182,7 +194,7 @@
<listeners>
<jms-listener busidref="busId10" maxThreads="1" name="org.pi4soa.esbbroker.esbbroker-ESBBrokerProcess_Broker__9"/>
</listeners>
- <actions>
+ <actions mep="OneWay">
<action class="org.jboss.soa.overlord.jbossesb.stateless.actions.ReceiveMessageAction" name="ESBBrokerProcess_Broker__9_action_1" process="process">
<property name="operation" value="checkCredit"/>
<property name="messageType" value="CreditCheckOk"/>
@@ -201,7 +213,7 @@
<listeners>
<jms-listener busidref="busId11" maxThreads="1" name="org.pi4soa.esbbroker.esbbroker-ESBBrokerProcess_Broker__10"/>
</listeners>
- <actions>
+ <actions mep="OneWay">
<action class="org.jboss.soa.overlord.jbossesb.stateless.actions.ReceiveMessageAction" name="ESBBrokerProcess_Broker__10_action_1" process="process">
<property name="operation" value="confirm"/>
<property name="messageType" value="bookingReference"/>
@@ -217,7 +229,7 @@
<listeners>
<jms-listener busidref="busId12" maxThreads="1" name="org.pi4soa.esbbroker.esbbroker-ESBBrokerProcess_Broker__11"/>
</listeners>
- <actions>
+ <actions mep="OneWay">
<action class="org.jboss.soa.overlord.jbossesb.stateless.actions.ReceiveMessageAction" name="ESBBrokerProcess_Broker__11_action_1" process="process">
<property name="operation" value="checkCredit"/>
<property name="messageType" value="CreditCheckInvalid"/>
@@ -233,7 +245,7 @@
<listeners>
<jms-listener busidref="busId13" maxThreads="1" name="org.pi4soa.esbbroker.esbbroker-ESBBrokerProcess_Broker__12"/>
</listeners>
- <actions>
+ <actions mep="OneWay">
<action class="org.jboss.soa.overlord.jbossesb.stateless.actions.ReceiveMessageAction" name="ESBBrokerProcess_Broker__12_action_1" process="process">
<property name="operation" value="cancel"/>
<property name="messageType" value="cancel"/>
@@ -244,7 +256,7 @@
<listeners>
<jms-listener busidref="busId14" maxThreads="1" name="org.pi4soa.esbbroker.esbbroker-checkCredit"/>
</listeners>
- <actions>
+ <actions mep="OneWay">
<action class="org.jboss.soa.overlord.jbossesb.stateless.actions.SwitchAction" name="checkCredit_action_1" process="process">
<property name="paths">
<case service-category="org.pi4soa.esbbroker.esbbroker" service-name="ESBBrokerProcess_Broker__9">
Modified: cdl/trunk/samples/jbossesb/brokerage/broker/stateless/src/main/resources/jbmq-queue-service.xml
===================================================================
--- cdl/trunk/samples/jbossesb/brokerage/broker/stateless/src/main/resources/jbmq-queue-service.xml 2009-03-18 16:43:08 UTC (rev 544)
+++ cdl/trunk/samples/jbossesb/brokerage/broker/stateless/src/main/resources/jbmq-queue-service.xml 2009-03-20 16:48:05 UTC (rev 545)
@@ -54,6 +54,12 @@
</depends>
</mbean>
<mbean code="org.jboss.mq.server.jmx.Queue"
+ name="org.pi4soa.esbbroker.esbbroker.destination:service=Queue,name=org_pi4soa_esbbroker_esbbroker_ESBBrokerProcess_Broker_reply">
+ <depends optional-attribute-name="DestinationManager">
+ jboss.mq:service=DestinationManager
+ </depends>
+ </mbean>
+ <mbean code="org.jboss.mq.server.jmx.Queue"
name="org.pi4soa.esbbroker.esbbroker.destination:service=Queue,name=org_pi4soa_esbbroker_esbbroker_ESBBrokerProcess_Broker__7">
<depends optional-attribute-name="DestinationManager">
jboss.mq:service=DestinationManager
Modified: cdl/trunk/samples/jbossesb/brokerage/supplier/stateless/src/main/resources/META-INF/deployment.xml
===================================================================
--- cdl/trunk/samples/jbossesb/brokerage/supplier/stateless/src/main/resources/META-INF/deployment.xml 2009-03-18 16:43:08 UTC (rev 544)
+++ cdl/trunk/samples/jbossesb/brokerage/supplier/stateless/src/main/resources/META-INF/deployment.xml 2009-03-20 16:48:05 UTC (rev 545)
@@ -1,4 +1,5 @@
<jbossesb-deployment>
+ <depends>jboss.esb:deployment=overlord-cdl-runtime.esb</depends>
<depends>org.pi4soa.esbbroker.esbbroker.destination:service=Queue,name=org_pi4soa_esbbroker_esbbroker_ESBBrokerProcess_SupplierTxnProcessor</depends>
<depends>org.pi4soa.esbbroker.esbbroker.destination:service=Queue,name=org_pi4soa_esbbroker_esbbroker_ESBBrokerProcess_SupplierTxnProcessor__1</depends>
<depends>org.pi4soa.esbbroker.esbbroker.destination:service=Queue,name=org_pi4soa_esbbroker_esbbroker_ESBBrokerProcess_SupplierQuoteEngine</depends>
Modified: cdl/trunk/samples/jbossesb/brokerage/supplier/stateless/src/main/resources/META-INF/jboss-esb.xml
===================================================================
--- cdl/trunk/samples/jbossesb/brokerage/supplier/stateless/src/main/resources/META-INF/jboss-esb.xml 2009-03-18 16:43:08 UTC (rev 544)
+++ cdl/trunk/samples/jbossesb/brokerage/supplier/stateless/src/main/resources/META-INF/jboss-esb.xml 2009-03-20 16:48:05 UTC (rev 545)
@@ -14,14 +14,13 @@
<jms-message-filter dest-name="queue/org_pi4soa_esbbroker_esbbroker_ESBBrokerProcess_SupplierQuoteEngine__1" dest-type="QUEUE"/>
</jms-bus>
</jms-provider>
- </jms-provider>
</providers>
<services>
<service category="org.pi4soa.esbbroker.esbbroker" description="" name="ESBBrokerProcess_SupplierTxnProcessor">
<listeners>
<jms-listener busidref="busId1" maxThreads="1" name="org.pi4soa.esbbroker.esbbroker-ESBBrokerProcess_SupplierTxnProcessor"/>
</listeners>
- <actions>
+ <actions mep="OneWay">
<action class="org.jboss.soa.overlord.jbossesb.stateless.actions.SwitchAction" name="ESBBrokerProcess_SupplierTxnProcessor_action_1" process="process">
<property name="serviceDescriptionName" value="{org.pi4soa.esbbroker.esbbroker}ESBBrokerProcess-SupplierTxnProcessor"/>
<property name="conversationType" value="overlord.cdl.samples.LoanBroker@SupplierTxnProcessor"/>
@@ -37,7 +36,7 @@
<listeners>
<jms-listener busidref="busId2" maxThreads="1" name="org.pi4soa.esbbroker.esbbroker-ESBBrokerProcess_SupplierTxnProcessor__1"/>
</listeners>
- <actions>
+ <actions mep="OneWay">
<action class="org.jboss.soa.overlord.jbossesb.stateless.actions.ReceiveMessageAction" name="ESBBrokerProcess_SupplierTxnProcessor__1_action_1" process="process">
<property name="operation" value="confirm"/>
<property name="messageType" value="orderConfirmed"/>
@@ -55,7 +54,7 @@
<listeners>
<jms-listener busidref="busId3" maxThreads="1" name="org.pi4soa.esbbroker.esbbroker-ESBBrokerProcess_SupplierQuoteEngine"/>
</listeners>
- <actions>
+ <actions mep="OneWay">
<action class="org.jboss.soa.overlord.jbossesb.stateless.actions.SwitchAction" name="ESBBrokerProcess_SupplierQuoteEngine_action_1" process="process">
<property name="serviceDescriptionName" value="{org.pi4soa.esbbroker.esbbroker}ESBBrokerProcess-SupplierQuoteEngine"/>
<property name="conversationType" value="overlord.cdl.samples.LoanBroker@SupplierQuoteEngine"/>
@@ -71,7 +70,7 @@
<listeners>
<jms-listener busidref="busId4" maxThreads="1" name="org.pi4soa.esbbroker.esbbroker-ESBBrokerProcess_SupplierQuoteEngine__1"/>
</listeners>
- <actions>
+ <actions mep="OneWay">
<action class="org.jboss.soa.overlord.jbossesb.stateless.actions.ReceiveMessageAction" name="ESBBrokerProcess_SupplierQuoteEngine__1_action_1" process="process">
<property name="operation" value="getQuote"/>
<property name="messageType" value="requestForQuote"/>
Modified: cdl/trunk/samples/jbossesb/brokerage/supplier/stateless/src/main/resources/jbmq-queue-service.xml
===================================================================
--- cdl/trunk/samples/jbossesb/brokerage/supplier/stateless/src/main/resources/jbmq-queue-service.xml 2009-03-18 16:43:08 UTC (rev 544)
+++ cdl/trunk/samples/jbossesb/brokerage/supplier/stateless/src/main/resources/jbmq-queue-service.xml 2009-03-20 16:48:05 UTC (rev 545)
@@ -5,6 +5,12 @@
jboss.mq:service=DestinationManager
</depends>
</mbean>
+ <mbean code="org.jboss.mq.server.jmx.Queue"
+ name="org.pi4soa.esbbroker.esbbroker.destination:service=Queue,name=org_pi4soa_esbbroker_esbbroker_ESBBrokerProcess_SupplierTxnProcessor_reply">
+ <depends optional-attribute-name="DestinationManager">
+ jboss.mq:service=DestinationManager
+ </depends>
+ </mbean>
<mbean code="org.jboss.mq.server.jmx.Queue"
name="org.pi4soa.esbbroker.esbbroker.destination:service=Queue,name=org_pi4soa_esbbroker_esbbroker_ESBBrokerProcess_SupplierTxnProcessor__1">
<depends optional-attribute-name="DestinationManager">
@@ -18,6 +24,12 @@
</depends>
</mbean>
<mbean code="org.jboss.mq.server.jmx.Queue"
+ name="org.pi4soa.esbbroker.esbbroker.destination:service=Queue,name=org_pi4soa_esbbroker_esbbroker_ESBBrokerProcess_SupplierQuoteEngine_reply">
+ <depends optional-attribute-name="DestinationManager">
+ jboss.mq:service=DestinationManager
+ </depends>
+ </mbean>
+ <mbean code="org.jboss.mq.server.jmx.Queue"
name="org.pi4soa.esbbroker.esbbroker.destination:service=Queue,name=org_pi4soa_esbbroker_esbbroker_ESBBrokerProcess_SupplierQuoteEngine__1">
<depends optional-attribute-name="DestinationManager">
jboss.mq:service=DestinationManager
Modified: cdl/trunk/samples/jbossesb/client/src/com/acme/services/buyer/BrokerClient.java
===================================================================
--- cdl/trunk/samples/jbossesb/client/src/com/acme/services/buyer/BrokerClient.java 2009-03-18 16:43:08 UTC (rev 544)
+++ cdl/trunk/samples/jbossesb/client/src/com/acme/services/buyer/BrokerClient.java 2009-03-20 16:48:05 UTC (rev 545)
@@ -42,7 +42,7 @@
System.setProperty("javax.xml.registry.ConnectionFactoryClass",regClass);
try {
- brokerInvoker = new ServiceInvoker("ESBBroker.BrokerParticipant", "ESBBrokerProcess");
+ brokerInvoker = new ServiceInvoker("org.pi4soa.esbbroker.esbbroker", "ESBBrokerProcess_Broker");
} catch (Exception e) {
throw new RuntimeException("Failed to create ServiceInvoker", e);
}
Added: cdl/trunk/samples/jbossesb/common/creditAgency/stateless/src/main/java/com/acme/services/creditAgency/MemoryEPRStorage.java
===================================================================
--- cdl/trunk/samples/jbossesb/common/creditAgency/stateless/src/main/java/com/acme/services/creditAgency/MemoryEPRStorage.java (rev 0)
+++ cdl/trunk/samples/jbossesb/common/creditAgency/stateless/src/main/java/com/acme/services/creditAgency/MemoryEPRStorage.java 2009-03-20 16:48:05 UTC (rev 545)
@@ -0,0 +1,46 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2008, JBoss Inc., and others contributors as indicated
+ * by the @authors tag. All rights reserved.
+ * See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ * This copyrighted material is made available to anyone wishing to use,
+ * modify, copy, or redistribute it subject to the terms and conditions
+ * of the GNU Lesser General Public License, v. 2.1.
+ * This program is distributed in the hope that it will be useful, but WITHOUT A
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+ * PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details.
+ * You should have received a copy of the GNU Lesser General Public License,
+ * v.2.1 along with this distribution; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA 02110-1301, USA.
+ *
+ * (C) 2008,
+ */
+package com.acme.services.creditAgency;
+
+import java.util.HashMap;
+import java.util.Map;
+
+import org.jboss.soa.esb.addressing.EPR;
+import org.jboss.soa.esb.message.Message;
+import org.jboss.soa.overlord.jbossesb.EPRStorage;
+
+/**
+ * @author <a href="mailto:cyu@redhat.com">Jeff Yu</a>
+ *
+ */
+public class MemoryEPRStorage implements EPRStorage {
+
+ private static final Map<String, EPR> storage = new HashMap<String, EPR>();
+
+ public EPR getEPRByRole(String roleName, Message message) {
+ return storage.get(roleName);
+ }
+
+ public void registerRole(String roleName, Message message) {
+ EPR epr = message.getHeader().getCall().getReplyTo();
+ storage.put(roleName, epr);
+ }
+
+}
Modified: cdl/trunk/samples/jbossesb/common/creditAgency/stateless/src/main/resources/META-INF/jboss-esb.xml
===================================================================
--- cdl/trunk/samples/jbossesb/common/creditAgency/stateless/src/main/resources/META-INF/jboss-esb.xml 2009-03-18 16:43:08 UTC (rev 544)
+++ cdl/trunk/samples/jbossesb/common/creditAgency/stateless/src/main/resources/META-INF/jboss-esb.xml 2009-03-20 16:48:05 UTC (rev 545)
@@ -20,7 +20,7 @@
<listeners>
<jms-listener busidref="busId1" maxThreads="1" name="esb-stateless-creditAgency"/>
</listeners>
- <actions>
+ <actions mep="OneWay">
<action name="c1" process="process" class="org.jboss.soa.overlord.jbossesb.stateless.actions.SwitchAction">
<property name="serviceDescriptionName" value="{org.pi4soa.purchase.purchasegoods}PurchaseGoodsProcess-CreditAgency"/>
<property name="conversationType" value="overlord.cdl.samples.Common@CreditAgency"/>
@@ -36,10 +36,12 @@
<listeners>
<jms-listener busidref="busId2" maxThreads="1" name="esb-stateless-creditAgency1"/>
</listeners>
- <actions>
+ <actions mep="OneWay">
<action name="c2" process="process" class="org.jboss.soa.overlord.jbossesb.stateless.actions.ReceiveMessageAction">
<property name="operation" value="checkCredit"/>
<property name="messageType" value="CreditCheckRequest"/>
+ <property name="clientRole" value="Store" />
+ <property name="storageClass" value="com.acme.services.creditAgency.MemoryEPRStorage" />
</action>
<action name="c3" process="process" class="org.jboss.soa.overlord.jbossesb.stateless.actions.IfAction">
<property name="paths">
@@ -53,11 +55,14 @@
<listeners>
<jms-listener busidref="busId3" maxThreads="1" name="esb-stateless-creditAgency2"/>
</listeners>
- <actions>
+ <actions mep="OneWay">
+ <action name="custom-1" process="process" class="com.acme.services.creditAgency.SetCreditCheckResponseMessageAction">
+ </action>
<action name="c4" process="process" class="org.jboss.soa.overlord.jbossesb.stateless.actions.SendMessageAction">
<property name="operation" value="checkCredit"/>
<property name="messageType" value="CreditCheckOk"/>
<property name="clientRole" value="Store"/>
+ <property name="storageClass" value="com.acme.services.creditAgency.MemoryEPRStorage" />
</action>
</actions>
</service>
@@ -65,11 +70,14 @@
<listeners>
<jms-listener busidref="busId4" maxThreads="1" name="esb-stateless-creditAgency3"/>
</listeners>
- <actions>
+ <actions mep="OneWay">
+ <action name="custom-2" process="process" class="com.acme.services.creditAgency.SetCreditCheckInvalidMessageAction">
+ </action>
<action name="c5" process="process" class="org.jboss.soa.overlord.jbossesb.stateless.actions.SendMessageAction">
<property name="operation" value="checkCredit"/>
<property name="messageType" value="CreditCheckInvalid"/>
<property name="clientRole" value="Store"/>
+ <property name="storageClass" value="com.acme.services.creditAgency.MemoryEPRStorage" />
</action>
</actions>
</service>
Added: cdl/trunk/samples/jbossesb/purchasing/store/stateless/src/main/java/com/acme/services/broker/MemoryEPRStorage.java
===================================================================
--- cdl/trunk/samples/jbossesb/purchasing/store/stateless/src/main/java/com/acme/services/broker/MemoryEPRStorage.java (rev 0)
+++ cdl/trunk/samples/jbossesb/purchasing/store/stateless/src/main/java/com/acme/services/broker/MemoryEPRStorage.java 2009-03-20 16:48:05 UTC (rev 545)
@@ -0,0 +1,46 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2008, JBoss Inc., and others contributors as indicated
+ * by the @authors tag. All rights reserved.
+ * See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ * This copyrighted material is made available to anyone wishing to use,
+ * modify, copy, or redistribute it subject to the terms and conditions
+ * of the GNU Lesser General Public License, v. 2.1.
+ * This program is distributed in the hope that it will be useful, but WITHOUT A
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+ * PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details.
+ * You should have received a copy of the GNU Lesser General Public License,
+ * v.2.1 along with this distribution; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA 02110-1301, USA.
+ *
+ * (C) 2008,
+ */
+package com.acme.services.broker;
+
+import java.util.HashMap;
+import java.util.Map;
+
+import org.jboss.soa.esb.addressing.EPR;
+import org.jboss.soa.esb.message.Message;
+import org.jboss.soa.overlord.jbossesb.EPRStorage;
+
+/**
+ * @author <a href="mailto:cyu@redhat.com">Jeff Yu</a>
+ *
+ */
+public class MemoryEPRStorage implements EPRStorage {
+
+ private static final Map<String, EPR> storage = new HashMap<String, EPR>();
+
+ public EPR getEPRByRole(String roleName, Message message) {
+ return storage.get(roleName);
+ }
+
+ public void registerRole(String roleName, Message message) {
+ EPR epr = message.getHeader().getCall().getReplyTo();
+ storage.put(roleName, epr);
+ }
+
+}
Deleted: cdl/trunk/samples/jbossesb/purchasing/store/stateless/src/main/java/com/acme/services/broker/PurchaseGoods.java
===================================================================
--- cdl/trunk/samples/jbossesb/purchasing/store/stateless/src/main/java/com/acme/services/broker/PurchaseGoods.java 2009-03-18 16:43:08 UTC (rev 544)
+++ cdl/trunk/samples/jbossesb/purchasing/store/stateless/src/main/java/com/acme/services/broker/PurchaseGoods.java 2009-03-20 16:48:05 UTC (rev 545)
@@ -1,42 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2008, JBoss Inc., and others contributors as indicated
- * by the @authors tag. All rights reserved.
- * See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU Lesser General Public License, v. 2.1.
- * This program is distributed in the hope that it will be useful, but WITHOUT A
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- * PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details.
- * You should have received a copy of the GNU Lesser General Public License,
- * v.2.1 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA 02110-1301, USA.
- *
- * (C) 2008,
- */
-package com.acme.services.broker;
-
-import java.io.Serializable;
-
-import org.jboss.soa.overlord.jbossesb.stateful.actions.Service;
-
-
-@Service(name="{http://www.jboss.org/overlord/purchase}Store", conversationType="overlord.cdl.samples.Purchasing@Store", root=true)
-public class PurchaseGoods implements Serializable{
-
- private long id;
-
- public long getId() {
- return id;
- }
-
- public void setId(long id) {
- this.id = id;
- }
-
-
-
-}
Modified: cdl/trunk/samples/jbossesb/purchasing/store/stateless/src/main/resources/META-INF/jboss-esb.xml
===================================================================
--- cdl/trunk/samples/jbossesb/purchasing/store/stateless/src/main/resources/META-INF/jboss-esb.xml 2009-03-18 16:43:08 UTC (rev 544)
+++ cdl/trunk/samples/jbossesb/purchasing/store/stateless/src/main/resources/META-INF/jboss-esb.xml 2009-03-20 16:48:05 UTC (rev 545)
@@ -23,7 +23,7 @@
<listeners>
<jms-listener busidref="busId1" maxThreads="1" name="org.pi4soa.purchase.purchasegoods-PurchaseGoodsProcess_Store"/>
</listeners>
- <actions>
+ <actions mep="OneWay">
<action name="s1" process="process" class="org.jboss.soa.overlord.jbossesb.stateless.actions.SwitchAction">
<property name="serviceDescriptionName" value="{org.pi4soa.purchase.purchasegoods}PurchaseGoodsProcess-Store"/>
<property name="conversationType" value="overlord.cdl.samples.Purchasing@Store"/>
@@ -39,12 +39,16 @@
<listeners>
<jms-listener busidref="busId2" maxThreads="1" name="org.pi4soa.purchase.purchasegoods-PurchaseGoodsProcess_Store__1"/>
</listeners>
- <actions>
+ <actions mep="OneWay">
<action name="s2" process="process" class="org.jboss.soa.overlord.jbossesb.stateless.actions.ReceiveMessageAction">
<property name="operation" value="buy"/>
<property name="messageType" value="BuyRequest"/>
+ <property name="clientRole" value="Buyer" />
+ <property name="storageClass" value="com.acme.services.broker.MemoryEPRStorage" />
</action>
- <action name="s3" process="process" class="org.jboss.soa.overlord.jbossesb.stateless.actions.SendMessageAction">
+ <action name="s3" process="process" class="com.acme.services.broker.SetCreditCheckRequestMessageAction">
+ </action>
+ <action name="s4" process="process" class="org.jboss.soa.overlord.jbossesb.stateless.actions.SendMessageAction">
<property name="operation" value="checkCredit"/>
<property name="messageType" value="CreditCheckRequest"/>
<property name="serviceCategory" value="org.pi4soa.purchase.purchasegoods"/>
@@ -58,15 +62,18 @@
<listeners>
<jms-listener busidref="busId3" maxThreads="1" name="org.pi4soa.purchase.purchasegoods-PurchaseGoodsProcess_Store__2"/>
</listeners>
- <actions>
- <action name="s4" process="process" class="org.jboss.soa.overlord.jbossesb.stateless.actions.ReceiveMessageAction">
+ <actions mep="OneWay">
+ <action name="s5" process="process" class="org.jboss.soa.overlord.jbossesb.stateless.actions.ReceiveMessageAction">
<property name="operation" value="checkCredit"/>
<property name="messageType" value="CreditCheckOk"/>
</action>
- <action name="s5" process="process" class="org.jboss.soa.overlord.jbossesb.stateless.actions.SendMessageAction">
+ <action name="purchasing-success" class="com.acme.services.broker.SetBuyResponseMessageAction">
+ </action>
+ <action name="s6" process="process" class="org.jboss.soa.overlord.jbossesb.stateless.actions.SendMessageAction">
<property name="operation" value="buy"/>
<property name="messageType" value="BuyConfirmed"/>
<property name="clientRole" value="Buyer"/>
+ <property name="storageClass" value="com.acme.services.broker.MemoryEPRStorage" />
</action>
</actions>
</service>
@@ -74,15 +81,17 @@
<listeners>
<jms-listener busidref="busId4" maxThreads="1" name="org.pi4soa.purchase.purchasegoods-PurchaseGoodsProcess_Store__3"/>
</listeners>
- <actions>
- <action name="s6" process="process" class="org.jboss.soa.overlord.jbossesb.stateless.actions.ReceiveMessageAction">
+ <actions mep="OneWay">
+ <action name="s7" process="process" class="org.jboss.soa.overlord.jbossesb.stateless.actions.ReceiveMessageAction">
<property name="operation" value="checkCredit"/>
<property name="messageType" value="CreditCheckInvalid"/>
</action>
- <action name="s7" process="process" class="org.jboss.soa.overlord.jbossesb.stateless.actions.SendMessageAction">
+ <action name="purchasing-failed" class="com.acme.services.broker.SetBuyFailedMessageAction"></action>
+ <action name="s8" process="process" class="org.jboss.soa.overlord.jbossesb.stateless.actions.SendMessageAction">
<property name="operation" value="buy"/>
<property name="messageType" value="BuyFailed"/>
<property name="clientRole" value="Buyer"/>
+ <property name="storageClass" value="com.acme.services.broker.MemoryEPRStorage" />
</action>
</actions>
</service>
@@ -90,8 +99,8 @@
<listeners>
<jms-listener busidref="busId5" maxThreads="1" name="org.pi4soa.purchase.purchasegoods-checkCredit"/>
</listeners>
- <actions>
- <action name="s8" process="process" class="org.jboss.soa.overlord.jbossesb.stateless.actions.SwitchAction">
+ <actions mep="OneWay">
+ <action name="s9" process="process" class="org.jboss.soa.overlord.jbossesb.stateless.actions.SwitchAction">
<property name="paths">
<case service-category="org.pi4soa.purchase.purchasegoods" service-name="PurchaseGoodsProcess_Store__2">
<message type="CreditCheckOk"/>
17 years, 4 months
- 1
- 0