[overlord-commits] Overlord SVN: r340 - in cdl/trunk: samples/jbossesb and 5 other directories.

Author: objectiser Date: 2008-09-23 11:10:06 -0400 (Tue, 23 Sep 2008) New Revision: 340 Modified: cdl/trunk/distribution/src/main/release/samples/jbossesb/common/creditAgency/.project cdl/trunk/samples/jbossesb/SamplesGuide.odt cdl/trunk/samples/jbossesb/SamplesGuide.pdf cdl/trunk/samples/jbossesb/brokerage/broker/src/main/resources/META-INF/deployment.xml cdl/trunk/samples/jbossesb/brokerage/supplier/src/main/resources/META-INF/deployment.xml cdl/trunk/samples/jbossesb/client/build.xml cdl/trunk/samples/jbossesb/common/creditAgency/src/main/resources/META-INF/deployment.xml cdl/trunk/samples/jbossesb/common/creditAgency/src/main/resources/META-INF/jboss-esb.xml cdl/trunk/samples/jbossesb/purchasing/store/src/main/resources/META-INF/deployment.xml Log: Updated various configuration files, after finding errors when trying to run the purchasing example. Have also made minor changes to make the use of both examples hopefully clearer. Updated the SamplesGuide with more information related to running the examples. Modified: cdl/trunk/distribution/src/main/release/samples/jbossesb/common/creditAgency/.project =================================================================== --- cdl/trunk/distribution/src/main/release/samples/jbossesb/common/creditAgency/.project 2008-09-22 16:38:29 UTC (rev 339) +++ cdl/trunk/distribution/src/main/release/samples/jbossesb/common/creditAgency/.project 2008-09-23 15:10:06 UTC (rev 340) @@ -3,6 +3,8 @@ <name>common-creditAgency</name> <comment></comment> <projects> + <project>purchasing-models</project> + <project>brokerage-models</project> </projects> <buildSpec> <buildCommand> Modified: cdl/trunk/samples/jbossesb/SamplesGuide.odt =================================================================== (Binary files differ) Modified: cdl/trunk/samples/jbossesb/SamplesGuide.pdf =================================================================== (Binary files differ) Modified: cdl/trunk/samples/jbossesb/brokerage/broker/src/main/resources/META-INF/deployment.xml =================================================================== --- cdl/trunk/samples/jbossesb/brokerage/broker/src/main/resources/META-INF/deployment.xml 2008-09-22 16:38:29 UTC (rev 339) +++ cdl/trunk/samples/jbossesb/brokerage/broker/src/main/resources/META-INF/deployment.xml 2008-09-23 15:10:06 UTC (rev 340) @@ -1,5 +1,5 @@ <jbossesb-deployment> - <depends>jboss.esb:deployment=overlord-cdl-jbossesb.esb</depends> + <depends>jboss.esb:deployment=overlord-cdl-runtime.esb</depends> <depends>jboss.esb.sample.broker.destination:service=Queue,name=esb-loan-broker</depends> <depends>jboss.esb.sample.broker.destination:service=Queue,name=esb-loan-broker_reply</depends> <depends>jboss.esb.sample.broker.destination:service=Queue,name=esb-loan-broker1</depends> Modified: cdl/trunk/samples/jbossesb/brokerage/supplier/src/main/resources/META-INF/deployment.xml =================================================================== --- cdl/trunk/samples/jbossesb/brokerage/supplier/src/main/resources/META-INF/deployment.xml 2008-09-22 16:38:29 UTC (rev 339) +++ cdl/trunk/samples/jbossesb/brokerage/supplier/src/main/resources/META-INF/deployment.xml 2008-09-23 15:10:06 UTC (rev 340) @@ -1,5 +1,5 @@ <jbossesb-deployment> - <depends>jboss.esb:deployment=overlord-cdl-jbossesb.esb</depends> + <depends>jboss.esb:deployment=overlord-cdl-runtime.esb</depends> <depends>jboss.esb.sample.broker.destination:service=Queue,name=esb-loan-supplier1</depends> <depends>jboss.esb.sample.broker.destination:service=Queue,name=esb-loan-supplier11</depends> <depends>jboss.esb.sample.broker.destination:service=Queue,name=esb-loan-supplier12</depends> Modified: cdl/trunk/samples/jbossesb/client/build.xml =================================================================== --- cdl/trunk/samples/jbossesb/client/build.xml 2008-09-22 16:38:29 UTC (rev 339) +++ cdl/trunk/samples/jbossesb/client/build.xml 2008-09-23 15:10:06 UTC (rev 340) @@ -1,48 +1,48 @@ -<project name="client" default="runClient" basedir="."> - - <property name="lib.dir" value="${basedir}/lib" /> - <property name="classes.dir" value="${basedir}/target/classes" /> - <property name="src.dir" value="${basedir}/src" /> - - <path id="project.classpath"> - <fileset dir="${lib.dir}"> - <include name="**/*.jar" /> - </fileset> - </path> - - - <!-- Clean up --> - <target name="clean"> - <delete dir="${classes.dir}"/> - <mkdir dir="${classes.dir}" /> - </target> - - - <!-- Compile Java source --> - <target name="compile" depends="clean"> - <javac srcdir="${src.dir}" destdir="${classes.dir}" debug="true"> - <classpath refid="project.classpath"/> - </javac> - <copy todir="${classes.dir}"> - <fileset dir="${src.dir}"> - <include name="*.xml"/> - <include name="*.properties" /> - </fileset> - </copy> - </target> - - <target name="runClient" depends="compile"> - <java fork="yes" classname="com.acme.services.buyer.BuyerClient"> - <classpath refid="project.classpath" /> - <classpath location="${classes.dir}" /> - </java> - </target> - - <target name="runBrokerClient" depends="compile"> - <java fork="yes" classname="com.acme.services.buyer.BrokerClient"> - <classpath refid="project.classpath" /> - <classpath location="${classes.dir}" /> - </java> - </target> - -</project> +<project name="client" default="runClient" basedir="."> + + <property name="lib.dir" value="${basedir}/lib" /> + <property name="classes.dir" value="${basedir}/target/classes" /> + <property name="src.dir" value="${basedir}/src" /> + + <path id="project.classpath"> + <fileset dir="${lib.dir}"> + <include name="**/*.jar" /> + </fileset> + </path> + + + <!-- Clean up --> + <target name="clean"> + <delete dir="${classes.dir}"/> + <mkdir dir="${classes.dir}" /> + </target> + + + <!-- Compile Java source --> + <target name="compile" depends="clean"> + <javac srcdir="${src.dir}" destdir="${classes.dir}" debug="true"> + <classpath refid="project.classpath"/> + </javac> + <copy todir="${classes.dir}"> + <fileset dir="${src.dir}"> + <include name="*.xml"/> + <include name="*.properties" /> + </fileset> + </copy> + </target> + + <target name="runPurchasingClient" depends="compile"> + <java fork="yes" classname="com.acme.services.buyer.BuyerClient"> + <classpath refid="project.classpath" /> + <classpath location="${classes.dir}" /> + </java> + </target> + + <target name="runBrokerageClient" depends="compile"> + <java fork="yes" classname="com.acme.services.buyer.BrokerClient"> + <classpath refid="project.classpath" /> + <classpath location="${classes.dir}" /> + </java> + </target> + +</project> Modified: cdl/trunk/samples/jbossesb/common/creditAgency/src/main/resources/META-INF/deployment.xml =================================================================== --- cdl/trunk/samples/jbossesb/common/creditAgency/src/main/resources/META-INF/deployment.xml 2008-09-22 16:38:29 UTC (rev 339) +++ cdl/trunk/samples/jbossesb/common/creditAgency/src/main/resources/META-INF/deployment.xml 2008-09-23 15:10:06 UTC (rev 340) @@ -1,5 +1,5 @@ <jbossesb-deployment> - <depends>jboss.esb:deployment=overlord-cdl-jbossesb.esb</depends> + <depends>jboss.esb:deployment=overlord-cdl-runtime.esb</depends> <depends>jboss.esb.gen.destination:service=Queue,name=esb-creditAgency</depends> <depends>jboss.esb.gen.destination:service=Queue,name=esb-creditAgency1</depends> <depends>jboss.esb.gen.destination:service=Queue,name=esb-creditAgency2</depends> Modified: cdl/trunk/samples/jbossesb/common/creditAgency/src/main/resources/META-INF/jboss-esb.xml =================================================================== --- cdl/trunk/samples/jbossesb/common/creditAgency/src/main/resources/META-INF/jboss-esb.xml 2008-09-22 16:38:29 UTC (rev 339) +++ cdl/trunk/samples/jbossesb/common/creditAgency/src/main/resources/META-INF/jboss-esb.xml 2008-09-23 15:10:06 UTC (rev 340) @@ -1,129 +1,83 @@ -<?xml version = "1.0" encoding = "UTF-8"?> -<!-- - 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, ---> -<jbossesb xmlns="http://anonsvn.labs.jboss.com/labs/jbossesb/trunk/product/etc... - parameterReloadSecs="5000"> - - <providers> - <jms-provider name="JBossMQ" connection-factory="ConnectionFactory" - jndi-context-factory="org.jnp.interfaces.NamingContextFactory" - jndi-URL="localhost"> - <jms-bus busid="CreditAgencyService"> - <jms-message-filter dest-type="QUEUE" dest-name="queue/esb-creditAgency" /> - </jms-bus> - <jms-bus busid="CreditAgencyService1"> - <jms-message-filter dest-type="QUEUE" dest-name="queue/esb-creditAgency1" /> - </jms-bus> - <jms-bus busid="CreditAgencyService2"> - <jms-message-filter dest-type="QUEUE" dest-name="queue/esb-creditAgency2" /> - </jms-bus> - </jms-provider> - - </providers> - <services> - <service category="PurchaseGoods.CreditAgency" name="CreditAgency.main" description=""> - <listeners> - <jms-listener name="CreditAgencyServiceListener" - busidref="CreditAgencyService" - maxThreads="1"/> - </listeners> - <actions mep="OneWay"> - <action class="org.jboss.soa.overlord.jbossesb.actions.CreateSessionAction" - process="process" name="c1"> - <property name="session" value="com.acme.services.creditAgency.CreditAgencyPurchase" /> - </action> - <action class="org.jboss.soa.overlord.jbossesb.actions.ReceiveMessageAction" - process="process" name="c2"> - <property name="operation" value="checkCredit" /> - <property name="messageType" value="creditInformation" /> - <property name="clientEPR" value="broker" /> - <property name="identities" > - <identity type="primary" > - <token name="id" locator="//@id" /> - </identity> - </property> - </action> - <action class="org.jboss.soa.overlord.jbossesb.actions.IfAction" - process="process" name="c3"> - <property name="paths"> - <if decision-method="isCreditValid" - service-category="PurchaseGoods.CreditAgency" - service-name="CreditAgency.decision1" - immediate="true" /> - <else service-category="PurchaseGoods.CreditAgency" - service-name="CreditAgency.decision2" - immediate="true" /> - </property> - </action> - </actions> - </service> - - <service category="PurchaseGoods.CreditAgency" name="CreditAgency.decision1" description=""> - <listeners> - <jms-listener name="CreditAgencyServiceListener1" - busidref="CreditAgencyService1" - maxThreads="1"/> - </listeners> - <actions mep="OneWay"> - <action class="com.acme.services.creditAgency.SetCreditCheckResponseMessageAction" - process="process" name="d2"> - </action> - <action class="org.jboss.soa.overlord.jbossesb.actions.SendMessageAction" - process="process" name="d3"> - <property name="session" value="com.acme.services.creditAgency.CreditAgencyPurchase" /> - <property name="operation" value="checkCredit" /> - <property name="messageType" value="creditValid" /> - <property name="clientEPR" value="broker" /> - <property name="identities" > - <identity type="primary" > - <token name="id" locator="//@id" /> - </identity> - </property> - </action> - </actions> - </service> - - <service category="PurchaseGoods.CreditAgency" name="CreditAgency.decision2" description=""> - <listeners> - <jms-listener name="CreditAgencyServiceListener" - busidref="CreditAgencyService2" - maxThreads="1"/> - </listeners> - <actions mep="OneWay"> - <action class="com.acme.services.creditAgency.SetCreditCheckInvalidMessageAction" - process="process" name="e2"> - </action> - <action class="org.jboss.soa.overlord.jbossesb.actions.SendMessageAction" - process="process" name="e3"> - <property name="session" value="com.acme.services.creditAgency.CreditAgencyPurchase" /> - <property name="operation" value="checkCredit" /> - <property name="messageType" value="creditInvalid" /> - <property name="clientEPR" value="broker" /> - <property name="identities" > - <identity type="primary" > - <token name="id" locator="//@id" /> - </identity> - </property> - </action> - </actions> - </service> - </services> - -</jbossesb> +<jbossesb xmlns="http://anonsvn.labs.jboss.com/labs/jbossesb/trunk/product/etc... parameterReloadSecs="5000"> + <providers> + <jms-provider connection-factory="ConnectionFactory" jndi-URL="localhost" jndi-context-factory="org.jnp.interfaces.NamingContextFactory" name="JBossMQ"> + <jms-bus busid="CreditAgencyService"> + <jms-message-filter dest-name="queue/esb-creditAgency" dest-type="QUEUE"/> + </jms-bus> + <jms-bus busid="CreditAgencyService1"> + <jms-message-filter dest-name="queue/esb-creditAgency1" dest-type="QUEUE"/> + </jms-bus> + <jms-bus busid="CreditAgencyService2"> + <jms-message-filter dest-name="queue/esb-creditAgency2" dest-type="QUEUE"/> + </jms-bus> + </jms-provider> + </providers> + <services> + <service category="PurchaseGoods.CreditAgency" description="" name="CreditAgency.main"> + <listeners> + <jms-listener busidref="CreditAgencyService" maxThreads="1" name="CreditAgencyServiceListener"/> + </listeners> + <actions mep="OneWay"> + <action class="org.jboss.soa.overlord.jbossesb.actions.CreateSessionAction" name="c1" process="process"> + <property name="session" value="com.acme.services.creditAgency.CreditAgencyPurchase"/> + </action> + <action class="org.jboss.soa.overlord.jbossesb.actions.ReceiveMessageAction" name="c2" process="process"> + <property name="operation" value="checkCredit"/> + <property name="messageType" value="CreditCheckRequest"/> + <property name="clientEPR" value="broker"/> + <property name="identities"> + <identity type="primary"> + <token locator="//@id" name="id"/> + </identity> + </property> + </action> + <action class="org.jboss.soa.overlord.jbossesb.actions.IfAction" name="c3" process="process"> + <property name="paths"> + <if decision-method="isCreditValid" immediate="true" service-category="PurchaseGoods.CreditAgency" service-name="CreditAgency.decision1"/> + <else immediate="true" service-category="PurchaseGoods.CreditAgency" service-name="CreditAgency.decision2"/> + </property> + </action> + </actions> + </service> + <service category="PurchaseGoods.CreditAgency" description="" name="CreditAgency.decision1"> + <listeners> + <jms-listener busidref="CreditAgencyService1" maxThreads="1" name="CreditAgencyServiceListener1"/> + </listeners> + <actions mep="OneWay"> + <action class="com.acme.services.creditAgency.SetCreditCheckResponseMessageAction" name="d2" process="process"> + </action> + <action class="org.jboss.soa.overlord.jbossesb.actions.SendMessageAction" name="d3" process="process"> + <property name="session" value="com.acme.services.creditAgency.CreditAgencyPurchase"/> + <property name="operation" value="checkCredit"/> + <property name="messageType" value="CreditCheckOk"/> + <property name="clientEPR" value="broker"/> + <property name="identities"> + <identity type="primary"> + <token locator="//@id" name="id"/> + </identity> + </property> + </action> + </actions> + </service> + <service category="PurchaseGoods.CreditAgency" description="" name="CreditAgency.decision2"> + <listeners> + <jms-listener busidref="CreditAgencyService2" maxThreads="1" name="CreditAgencyServiceListener"/> + </listeners> + <actions mep="OneWay"> + <action class="com.acme.services.creditAgency.SetCreditCheckInvalidMessageAction" name="e2" process="process"> + </action> + <action class="org.jboss.soa.overlord.jbossesb.actions.SendMessageAction" name="e3" process="process"> + <property name="session" value="com.acme.services.creditAgency.CreditAgencyPurchase"/> + <property name="operation" value="checkCredit"/> + <property name="messageType" value="CreditCheckInvalid"/> + <property name="clientEPR" value="broker"/> + <property name="identities"> + <identity type="primary"> + <token locator="//@id" name="id"/> + </identity> + </property> + </action> + </actions> + </service> + </services> +</jbossesb> Modified: cdl/trunk/samples/jbossesb/purchasing/store/src/main/resources/META-INF/deployment.xml =================================================================== --- cdl/trunk/samples/jbossesb/purchasing/store/src/main/resources/META-INF/deployment.xml 2008-09-22 16:38:29 UTC (rev 339) +++ cdl/trunk/samples/jbossesb/purchasing/store/src/main/resources/META-INF/deployment.xml 2008-09-23 15:10:06 UTC (rev 340) @@ -1,5 +1,5 @@ <jbossesb-deployment> - <depends>jboss.esb:deployment=overlord-cdl-jbossesb.esb</depends> + <depends>jboss.esb:deployment=overlord-cdl-runtime.esb</depends> <depends>jboss.esb.gen.destination:service=Queue,name=esb-broker</depends> <depends>jboss.esb.gen.destination:service=Queue,name=esb-broker_reply</depends> <depends>jboss.esb.gen.destination:service=Queue,name=esb-broker1</depends>