[overlord-commits] Overlord SVN: r229 - in cdl/trunk: runtime/jbossesb/src/main/java/org/jboss/soa/overlord/conversation and 25 other directories.

overlord-commits at lists.jboss.org overlord-commits at lists.jboss.org
Tue Aug 12 07:23:21 EDT 2008


Author: jeff.yuchang
Date: 2008-08-12 07:23:21 -0400 (Tue, 12 Aug 2008)
New Revision: 229

Added:
   cdl/trunk/samples/jbossesb/broker/src/main/java/org/jboss/soa/overlord/samples/jbossesb/loan/broker/QuoteManager.java
   cdl/trunk/samples/jbossesb/database/
   cdl/trunk/samples/jbossesb/database/build.xml
   cdl/trunk/samples/jbossesb/supplier/
   cdl/trunk/samples/jbossesb/supplier/pom.xml
   cdl/trunk/samples/jbossesb/supplier/src/
   cdl/trunk/samples/jbossesb/supplier/src/main/
   cdl/trunk/samples/jbossesb/supplier/src/main/java/
   cdl/trunk/samples/jbossesb/supplier/src/main/java/org/
   cdl/trunk/samples/jbossesb/supplier/src/main/java/org/jboss/
   cdl/trunk/samples/jbossesb/supplier/src/main/java/org/jboss/soa/
   cdl/trunk/samples/jbossesb/supplier/src/main/java/org/jboss/soa/overlord/
   cdl/trunk/samples/jbossesb/supplier/src/main/java/org/jboss/soa/overlord/samples/
   cdl/trunk/samples/jbossesb/supplier/src/main/java/org/jboss/soa/overlord/samples/jbossesb/
   cdl/trunk/samples/jbossesb/supplier/src/main/java/org/jboss/soa/overlord/samples/jbossesb/supplier/
   cdl/trunk/samples/jbossesb/supplier/src/main/java/org/jboss/soa/overlord/samples/jbossesb/supplier/SetOrderConfirmResponseAction.java
   cdl/trunk/samples/jbossesb/supplier/src/main/java/org/jboss/soa/overlord/samples/jbossesb/supplier/SetQuoteMessageAction.java
   cdl/trunk/samples/jbossesb/supplier/src/main/java/org/jboss/soa/overlord/samples/jbossesb/supplier/SupplierMain.java
   cdl/trunk/samples/jbossesb/supplier/src/main/resources/
   cdl/trunk/samples/jbossesb/supplier/src/main/resources/META-INF/
   cdl/trunk/samples/jbossesb/supplier/src/main/resources/META-INF/deployment.xml
   cdl/trunk/samples/jbossesb/supplier/src/main/resources/META-INF/jboss-esb.xml
   cdl/trunk/samples/jbossesb/supplier/src/main/resources/jbmq-queue-service.xml
   cdl/trunk/samples/jbossesb/supplier/src/main/resources/log4j.xml
Removed:
   cdl/trunk/samples/jbossesb/broker/build.xml
   cdl/trunk/samples/jbossesb/broker/src/main/java/org/jboss/soa/overlord/samples/jbossesb/loan/creditAgency/
   cdl/trunk/samples/jbossesb/broker/src/main/java/org/jboss/soa/overlord/samples/jbossesb/loan/supplier/
   cdl/trunk/samples/jbossesb/broker/src/main/resources/hibernate.cfg.xml
Modified:
   cdl/trunk/distribution/assembly/jbossesb/src/main/resources/cdl-ds.xml
   cdl/trunk/runtime/jbossesb/src/main/java/org/jboss/soa/overlord/conversation/Session.java
   cdl/trunk/runtime/jbossesb/src/main/java/org/jboss/soa/overlord/conversation/SessionManager.java
   cdl/trunk/runtime/jbossesb/src/main/java/org/jboss/soa/overlord/jbossesb/actions/ActionProperties.java
   cdl/trunk/runtime/jbossesb/src/main/java/org/jboss/soa/overlord/jbossesb/actions/PerformAction.java
   cdl/trunk/runtime/jbossesb/src/main/java/org/jboss/soa/overlord/jbossesb/actions/SetStateAction.java
   cdl/trunk/samples/jbossesb/README.txt
   cdl/trunk/samples/jbossesb/broker/pom.xml
   cdl/trunk/samples/jbossesb/broker/src/main/java/org/jboss/soa/overlord/samples/jbossesb/loan/broker/BrokerMain.java
   cdl/trunk/samples/jbossesb/broker/src/main/java/org/jboss/soa/overlord/samples/jbossesb/loan/broker/CompleteTransactionMain.java
   cdl/trunk/samples/jbossesb/broker/src/main/java/org/jboss/soa/overlord/samples/jbossesb/loan/broker/Confirmation.java
   cdl/trunk/samples/jbossesb/broker/src/main/java/org/jboss/soa/overlord/samples/jbossesb/loan/broker/Quote.java
   cdl/trunk/samples/jbossesb/broker/src/main/java/org/jboss/soa/overlord/samples/jbossesb/loan/broker/Request4QuoteMain.java
   cdl/trunk/samples/jbossesb/broker/src/main/java/org/jboss/soa/overlord/samples/jbossesb/loan/broker/SetCreditCheckRequestMessageAction.java
   cdl/trunk/samples/jbossesb/broker/src/main/java/org/jboss/soa/overlord/samples/jbossesb/loan/broker/Supplier.java
   cdl/trunk/samples/jbossesb/broker/src/main/resources/META-INF/deployment.xml
   cdl/trunk/samples/jbossesb/broker/src/main/resources/META-INF/jboss-esb.xml
   cdl/trunk/samples/jbossesb/broker/src/main/resources/jbmq-queue-service.xml
   cdl/trunk/samples/jbossesb/creditAgency/src/main/java/com/acme/services/creditAgency/SetCreditCheckInvalidMessageAction.java
   cdl/trunk/samples/jbossesb/creditAgency/src/main/java/com/acme/services/creditAgency/SetCreditCheckResponseMessageAction.java
   cdl/trunk/samples/jbossesb/creditAgency/src/main/resources/META-INF/jboss-esb.xml
   cdl/trunk/samples/jbossesb/purchasing/src/main/java/com/acme/services/broker/SetCreditCheckRequestMessageAction.java
   cdl/trunk/samples/jbossesb/purchasing/src/main/resources/META-INF/jboss-esb.xml
Log:
* [SOAG-29] continuing separating esb artifacts.
* Update the 'CreditInformation' to 'creditInformation' according to the cdl model file.



Modified: cdl/trunk/distribution/assembly/jbossesb/src/main/resources/cdl-ds.xml
===================================================================
--- cdl/trunk/distribution/assembly/jbossesb/src/main/resources/cdl-ds.xml	2008-08-08 19:01:37 UTC (rev 228)
+++ cdl/trunk/distribution/assembly/jbossesb/src/main/resources/cdl-ds.xml	2008-08-12 11:23:21 UTC (rev 229)
@@ -21,6 +21,7 @@
          <jndi-name>cdlDS</jndi-name>
          <connection-url>jdbc:h2:${jboss.server.data.dir}${/}h2${/}cdlDB;MVCC=TRUE</connection-url>
          <driver-class>org.h2.Driver</driver-class>
+         <!--connection-url>jdbc:hsqldb:hsql://localhost</connection-url-->
          <user-name>sa</user-name>
          <password/>
          <transaction-isolation>TRANSACTION_READ_COMMITTED</transaction-isolation>

Modified: cdl/trunk/runtime/jbossesb/src/main/java/org/jboss/soa/overlord/conversation/Session.java
===================================================================
--- cdl/trunk/runtime/jbossesb/src/main/java/org/jboss/soa/overlord/conversation/Session.java	2008-08-08 19:01:37 UTC (rev 228)
+++ cdl/trunk/runtime/jbossesb/src/main/java/org/jboss/soa/overlord/conversation/Session.java	2008-08-12 11:23:21 UTC (rev 229)
@@ -330,6 +330,14 @@
 	}
 
 	public Object getBusinessObject() {
+		ByteArrayInputStream bais = new ByteArrayInputStream(serializedObject);
+		try {
+			ObjectInputStream in = new ObjectInputStream(bais);
+			businessObject = in.readObject();
+			in.close();
+		} catch (Exception e) {
+			throw new RuntimeException("Error in reading Object", e);
+		}
 		return businessObject;
 	}
 
@@ -387,21 +395,13 @@
 
 	public void setSerializedObject(byte[] serializedObject) {
 		this.serializedObject = serializedObject;
-		
-		ByteArrayInputStream bais = new ByteArrayInputStream(serializedObject);
-		try {
-			ObjectInputStream in = new ObjectInputStream(bais);
-			this.businessObject = in.readObject();
-			in.close();
-		} catch (Exception e) {
-			throw new RuntimeException("Error in reading Object", e);
-		}
 	}
 
 	public String toString() {
 		StringBuffer sbuffer = new StringBuffer();
 		sbuffer.append("[ Session id: " + id);
 		sbuffer.append(" serviceName: " + serviceName);
+		sbuffer.append(" business state object: " + businessObject);
 		sbuffer.append("]");
 		return sbuffer.toString();
 	}

Modified: cdl/trunk/runtime/jbossesb/src/main/java/org/jboss/soa/overlord/conversation/SessionManager.java
===================================================================
--- cdl/trunk/runtime/jbossesb/src/main/java/org/jboss/soa/overlord/conversation/SessionManager.java	2008-08-08 19:01:37 UTC (rev 228)
+++ cdl/trunk/runtime/jbossesb/src/main/java/org/jboss/soa/overlord/conversation/SessionManager.java	2008-08-12 11:23:21 UTC (rev 229)
@@ -48,8 +48,7 @@
 		
 		Session conversationSession = new Session();
 		conversationSession.setPojoClass(sessionName);
-		conversationSession.setStatus(SessionStatus.Active);
-		
+		conversationSession.setStatus(SessionStatus.Active);	
 		conversationSession.setBusinessObject(businessState);
 		
 		Service service = pojoclass.getAnnotation(Service.class);
@@ -82,9 +81,8 @@
 		conversationSession.setPojoClass(sessionName);
 		conversationSession.setStatus(SessionStatus.Active);
 		conversationSession.setBusinessObject(businessState);
-		conversationSession.setParent(parentSession);
+		conversationSession.setParent(parentSession);		
 		
-		
 		Service service = pojoclass.getAnnotation(Service.class);
 		if (service != null) {
 			conversationSession.setServiceName(service.name());
@@ -180,7 +178,7 @@
 			return null;
 		}
 		
-		Session session = (Session)hibernateSession.load(Session.class, theID.getSession().getId());
+		Session session = theID.getSession();
 		logger.debug("Get Session of " + session + " by using identity of " + id);
 		
 		return session;

Modified: cdl/trunk/runtime/jbossesb/src/main/java/org/jboss/soa/overlord/jbossesb/actions/ActionProperties.java
===================================================================
--- cdl/trunk/runtime/jbossesb/src/main/java/org/jboss/soa/overlord/jbossesb/actions/ActionProperties.java	2008-08-08 19:01:37 UTC (rev 228)
+++ cdl/trunk/runtime/jbossesb/src/main/java/org/jboss/soa/overlord/jbossesb/actions/ActionProperties.java	2008-08-12 11:23:21 UTC (rev 229)
@@ -40,6 +40,7 @@
 	public static final String SERVICE_NAME_PROPERTY = "serviceName";
 	public static final String SERVICE_CATEGORY_PROPERTY = "serviceCategory";
 	public static final String SERVICE_DESCRIPTION_NAME = "serviceDescriptionName";
+	public static final String PARENT_PROPERTY = "parentProperty";
 	
 	public static final String RESPONSE_SERVICE_NAME = "responseServiceName";
 	public static final String RESPONSE_SERVICE_CATEGORY = "responseServiceCategory";

Modified: cdl/trunk/runtime/jbossesb/src/main/java/org/jboss/soa/overlord/jbossesb/actions/PerformAction.java
===================================================================
--- cdl/trunk/runtime/jbossesb/src/main/java/org/jboss/soa/overlord/jbossesb/actions/PerformAction.java	2008-08-08 19:01:37 UTC (rev 228)
+++ cdl/trunk/runtime/jbossesb/src/main/java/org/jboss/soa/overlord/jbossesb/actions/PerformAction.java	2008-08-12 11:23:21 UTC (rev 229)
@@ -62,6 +62,12 @@
 			}
 		}
 		
+/*		String parentProperty = getConfig().getAttribute(ActionProperties.PARENT_PROPERTY);
+		if (parentProperty != null && !"".equals(parentProperty.trim())) {
+			bindingVal.put(parentProperty, session.getBusinessObject());
+			logger.info("Setting parent business state class to sub-session thru property of " + parentProperty);
+		}*/
+		
 		message.getProperties().setProperty(MessageProperties.BOUND_VARIABLE_KEY, bindingVal);
 		
 		session.schedule(serviceCategory, serviceName, message);

Modified: cdl/trunk/runtime/jbossesb/src/main/java/org/jboss/soa/overlord/jbossesb/actions/SetStateAction.java
===================================================================
--- cdl/trunk/runtime/jbossesb/src/main/java/org/jboss/soa/overlord/jbossesb/actions/SetStateAction.java	2008-08-08 19:01:37 UTC (rev 228)
+++ cdl/trunk/runtime/jbossesb/src/main/java/org/jboss/soa/overlord/jbossesb/actions/SetStateAction.java	2008-08-12 11:23:21 UTC (rev 229)
@@ -24,7 +24,6 @@
 import org.jboss.soa.esb.message.Message;
 import org.jboss.soa.overlord.conversation.Session;
 import org.jboss.soa.overlord.conversation.SessionManager;
-import org.jboss.soa.overlord.jbossesb.util.ClassLoaderUtil;
 import org.jboss.soa.overlord.jbossesb.util.XMLUtils;
 import org.mvel.MVEL;
 import org.w3c.dom.Element;
@@ -47,35 +46,35 @@
 		String variable = getConfig().getAttribute("variable");
 		String stateExpression = getConfig().getAttribute("stateExpression");
 		String messageExpression = getConfig().getAttribute("messageExpression");
+		String parentProperty = getConfig().getAttribute(ActionProperties.PARENT_PROPERTY);
 		
 		Session session = getSession(message);
 		Object bstate = session.getBusinessObject();
 		logger.info("Set value to the variable of " + variable);
 		
-		while (variable.startsWith("parent.")) {
-			variable = variable.substring(7);
-			session = session.getParent();
-/*			if (session.getPojoID() != 0) {
-				Class<?> pojoClass = ClassLoaderUtil.loadClass(session.getPojoClass());
-				Object pojo = SessionManager.getObject(session.getPojoID(), pojoClass);
-				session.setBusinessObject(pojo);
-			}*/
-		}
-		
 		if (stateExpression != null) {			
 			Object result = MVEL.eval(stateExpression, bstate);
-			MVEL.setProperty(session.getBusinessObject(), variable, result);
-			logger.info("The Variable is: " + variable + "; stateExpression is: " + stateExpression);
+			MVEL.setProperty(bstate, variable, result);
+			logger.info("populated from stateExpression of: " + stateExpression);
 		} else if (messageExpression != null) {
 			String xmlBody = (String) message.getBody().get();
 			Element element = (Element) XMLUtils.getNode(xmlBody);
 			String result = XMLUtils.executeXpath(element, messageExpression);
-			MVEL.setProperty(session.getBusinessObject(), variable, result);
-			logger.info("The Variable is: " + variable + "; messageExpression is: " + messageExpression);
+			MVEL.setProperty(bstate, variable, result);
+			logger.info("populated from messageExpression of: " + messageExpression);
+		} else if (parentProperty != null){
+			Session parentSession = session.getParent();
+			MVEL.setProperty(bstate, parentProperty, parentSession.getBusinessObject());	
+			MVEL.eval(variable, bstate);
+			Object updatedObject = MVEL.eval(parentProperty, bstate);
+			parentSession.setBusinessObject(updatedObject);
+			SessionManager.updateObject(parentSession);
+			logger.info("populated to parentProperty of: " + parentProperty);
 		}
-
-		SessionManager.updateObject(bstate);
 		
+		session.setBusinessObject(bstate);
+		SessionManager.updateObject(session);
+		
 		return message;
 	}
 	

Modified: cdl/trunk/samples/jbossesb/README.txt
===================================================================
--- cdl/trunk/samples/jbossesb/README.txt	2008-08-08 19:01:37 UTC (rev 228)
+++ cdl/trunk/samples/jbossesb/README.txt	2008-08-12 11:23:21 UTC (rev 229)
@@ -14,6 +14,7 @@
 - broker 
 - purchasing 
 - creditAgency
+- supplier
 
 Settings required to edit before running:
 ========================================

Deleted: cdl/trunk/samples/jbossesb/broker/build.xml
===================================================================
--- cdl/trunk/samples/jbossesb/broker/build.xml	2008-08-08 19:01:37 UTC (rev 228)
+++ cdl/trunk/samples/jbossesb/broker/build.xml	2008-08-12 11:23:21 UTC (rev 229)
@@ -1,38 +0,0 @@
-<project name="broker" default="startdb" basedir=".">
-	<property name="M2_REPO" value="/opt/m2/repo" />
-	<property name="database.dir" value="${basedir}/database" />
-        
-	<path id="database.classpath">
-      	 <fileset dir="${M2_REPO}" >
-		<include name="hsqldb/hsqldb/1.8.0.7/hsqldb-1.8.0.7.jar" />
-	 </fileset>
-	</path>
-
-    <!-- Start the HSQL DB server -->
-    <target name="startdb" description="Run HSQL database server with clean DB">
-        <!-- Delete database files -->
-        <delete dir="${database.dir}"/>
-        <java classname="org.hsqldb.Server"
-              fork="yes"
-              classpathref="database.classpath"
-              failonerror="true">
-            <arg value="-database.0"/>
-            <arg value="file:${database.dir}/db"/>
-        </java>
-    </target>
-
-    <!-- Start the HSQL DB browser tool -->
-    <target name="dbmanager" description="Start HSQL DB manager">
-        <java
-            classname="org.hsqldb.util.DatabaseManagerSwing"
-            fork="yes"
-            classpathref="database.classpath"
-            failonerror="true">
-            <arg value="-url"/>
-            <arg value="jdbc:hsqldb:hsql://localhost/"/>
-            <arg value="-driver"/>
-            <arg value="org.hsqldb.jdbcDriver"/>
-        </java>
-    </target>
-	
-</project>

Modified: cdl/trunk/samples/jbossesb/broker/pom.xml
===================================================================
--- cdl/trunk/samples/jbossesb/broker/pom.xml	2008-08-08 19:01:37 UTC (rev 228)
+++ cdl/trunk/samples/jbossesb/broker/pom.xml	2008-08-12 11:23:21 UTC (rev 229)
@@ -20,32 +20,14 @@
 				<groupId>log4j</groupId>
 				<artifactId>log4j</artifactId>
 				<version>1.2.14</version>
+				<scope>provided</scope>
 			</dependency>
 			<dependency>
 				<groupId>org.jboss.soa.overlord.cdl</groupId>
 				<artifactId>runtime-jbossesb</artifactId>
 				<version>1.0-SNAPSHOT</version>
-			</dependency>
-
-		    <dependency>
-			    <groupId>org.hibernate</groupId>
-			    <artifactId>hibernate-commons-annotations</artifactId>
-			    <version>${hibernate-commons-annotations}</version>
-		    </dependency>
-
-		    <dependency>
-			    <groupId>org.hibernate</groupId>
-			    <artifactId>hibernate-tools</artifactId>
-			    <version>${hibernate-tools-version}</version>
 				<scope>provided</scope>
-		    </dependency>
-
-			<dependency>
-			    <groupId>hsqldb</groupId>
-				<artifactId>hsqldb</artifactId>
-				<version>${hsqldb-version}</version>
 			</dependency>
-
 		</dependencies>
 
 		<build>
@@ -55,34 +37,6 @@
 			<groupId>org.apache.maven.plugins</groupId>
 			<artifactId>maven-antrun-plugin</artifactId>
 			<executions>
-                          <!--export schemas to database -->
-			  <execution>
-			    <id>schemaexport</id>
-			    <phase>compile</phase>
-			    <configuration>
-			      <tasks>
-				<taskdef name="hibernatetool" classname="org.hibernate.tool.ant.HibernateToolTask" 
-					 classpathref="maven.compile.classpath"/>
-                                <hibernatetool destdir=".">
-				<classpath>
-					<pathelement path="maven.compile.classpath" />
-				</classpath>
-				<annotationconfiguration configurationfile="target/classes/hibernate.cfg.xml" />
-				<hbm2ddl
-					create="true"
-					drop="true"
-					export="true"
-					outputfilename="broker-ddl.sql"
-					delimiter=";"
-					format="true"/>
-				</hibernatetool>
-			      </tasks>
-			    </configuration>
-			    <goals>
-			      <goal>run</goal>
-			    </goals>
-			  </execution>
-
 			  <!--Deploy esb artifact to JBoss AS/ESB -->
 			  <execution>
 			    <id>deploy</id>
@@ -101,15 +55,6 @@
 		      </plugin>		      
 		    </plugins>
 		</build>
-	
-	<reporting>
-		<plugins>
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-surefire-report-plugin</artifactId>
-			</plugin>
-	    </plugins>
-	</reporting>
-	
+		
 </project>
 

Modified: cdl/trunk/samples/jbossesb/broker/src/main/java/org/jboss/soa/overlord/samples/jbossesb/loan/broker/BrokerMain.java
===================================================================
--- cdl/trunk/samples/jbossesb/broker/src/main/java/org/jboss/soa/overlord/samples/jbossesb/loan/broker/BrokerMain.java	2008-08-08 19:01:37 UTC (rev 228)
+++ cdl/trunk/samples/jbossesb/broker/src/main/java/org/jboss/soa/overlord/samples/jbossesb/loan/broker/BrokerMain.java	2008-08-12 11:23:21 UTC (rev 229)
@@ -19,64 +19,34 @@
  */
 package org.jboss.soa.overlord.samples.jbossesb.loan.broker;
 
+import java.io.Serializable;
 import java.util.ArrayList;
 import java.util.List;
 
-import javax.persistence.CascadeType;
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
-import javax.persistence.Id;
-import javax.persistence.JoinColumn;
-import javax.persistence.OneToMany;
-import javax.persistence.Table;
-
 import org.apache.log4j.Logger;
-import org.jboss.soa.overlord.conversation.HibernateObject;
 import org.jboss.soa.overlord.jbossesb.actions.Service;
 
 @Service(name="{http://www.jboss.org/overlord/loanBroker}Broker", conversationType="jboss.overlord.samples.LoanBroker at Broker", root=true)
- at Entity
- at Table(name="T_BROKER")
-public class BrokerMain implements HibernateObject{
+public class BrokerMain implements Serializable, QuoteManager{
 	
 	private static final long serialVersionUID = 11114L;
 	
 	private static Logger logger = Logger.getLogger(BrokerMain.class);
 	
-	@Id @GeneratedValue
-	@Column(name="ID")
-	private long id;
-	
-	@OneToMany(cascade={CascadeType.ALL})
-	@JoinColumn(name="broker_ID")
 	private List<Supplier> suppliers = new ArrayList<Supplier>();
 	
-	@OneToMany
-	@JoinColumn(name="quote_ID")
 	private List<Quote> quotes = new ArrayList<Quote>();
 	
-	@Column(name="supplier_index")
 	private int supplierIndex = 0;
 	
-	@Column(name="selected_quote")
 	private String selectedQuoteValue ;
 	
-	@Column(name="selected_supplier")
 	private String selectedSupplierDesc;;
 	
 	public BrokerMain() {
 		initSuppliers();
 	}
-	
-	public long getId() {
-		return this.id;
-	}
 
-	public void setId(long id) {
-		this.id = id;
-	}
-
 	public List<Supplier> getSuppliers() {
 		return suppliers;
 	}
@@ -111,7 +81,6 @@
 			supplier.setServiceCategory("ESBBroker.Suppliers");
 			supplier.setServiceName("supplier" + i + ".main");
 			supplier.setServiceDescription("{http://www.jboss.org/overlord/loanBroker}Supplier" + i);
-			supplier.setBroker(this);
 			suppliers.add(supplier);
 		}
 	}
@@ -131,12 +100,6 @@
 	public void setQuotes(List<Quote> quotes) {
 		this.quotes = quotes;
 	}
-	
-	public void setQuote(Quote quote) {
-		this.quotes.add(quote);
-		logger.info("add the quote value : " + quote);
-	}
-	
 
 	public String getSelectedQuoteValue() {
 		return selectedQuoteValue;

Modified: cdl/trunk/samples/jbossesb/broker/src/main/java/org/jboss/soa/overlord/samples/jbossesb/loan/broker/CompleteTransactionMain.java
===================================================================
--- cdl/trunk/samples/jbossesb/broker/src/main/java/org/jboss/soa/overlord/samples/jbossesb/loan/broker/CompleteTransactionMain.java	2008-08-08 19:01:37 UTC (rev 228)
+++ cdl/trunk/samples/jbossesb/broker/src/main/java/org/jboss/soa/overlord/samples/jbossesb/loan/broker/CompleteTransactionMain.java	2008-08-12 11:23:21 UTC (rev 229)
@@ -19,49 +19,22 @@
  */
 package org.jboss.soa.overlord.samples.jbossesb.loan.broker;
 
-import javax.persistence.CascadeType;
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
-import javax.persistence.Id;
-import javax.persistence.JoinColumn;
-import javax.persistence.OneToOne;
-import javax.persistence.Table;
+import java.io.Serializable;
 
-import org.jboss.soa.overlord.conversation.HibernateObject;
 import org.jboss.soa.overlord.jbossesb.actions.Service;
 
- at Entity
- at Table(name="T_COMPLETE_TRANSACTION")
 @Service(name="{http://www.jboss.org/overlord/loanBroker}CompleteTransaction", conversationType="CompleteTransaction", root=false)
-public class CompleteTransactionMain implements HibernateObject {
+public class CompleteTransactionMain implements Serializable {
 	
 	private static final long serialVersionUID = 111313L;
 	
-	@Id @GeneratedValue
-	@Column(name="ID")
-	private long id;
-	
-	@OneToOne(cascade={CascadeType.ALL})
-	@JoinColumn(name="Confirmation_ID")
 	private Confirmation confirmation = new Confirmation();
 	
-	@OneToOne
-	@JoinColumn(name="quote_ID")
 	private Quote quote;
 	
-	@OneToOne
-	@JoinColumn(name="complete_supplier_ID")
 	private Supplier supplier;
 	
-	public long getId() {
-		return this.id;
-	}
-
-	public void setId(long id) {
-		this.id = id;
-	}
-
+	
 	public Supplier getSupplier() {
 		return supplier;
 	}

Modified: cdl/trunk/samples/jbossesb/broker/src/main/java/org/jboss/soa/overlord/samples/jbossesb/loan/broker/Confirmation.java
===================================================================
--- cdl/trunk/samples/jbossesb/broker/src/main/java/org/jboss/soa/overlord/samples/jbossesb/loan/broker/Confirmation.java	2008-08-08 19:01:37 UTC (rev 228)
+++ cdl/trunk/samples/jbossesb/broker/src/main/java/org/jboss/soa/overlord/samples/jbossesb/loan/broker/Confirmation.java	2008-08-12 11:23:21 UTC (rev 229)
@@ -19,38 +19,18 @@
  */
 package org.jboss.soa.overlord.samples.jbossesb.loan.broker;
 
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
-import javax.persistence.Id;
-import javax.persistence.Table;
+import java.io.Serializable;
 
-import org.jboss.soa.overlord.conversation.HibernateObject;
 
 /**
  * @author jeffyu
  *
  */
- at Entity
- at Table(name="T_CONFIRMATION")
-public class Confirmation implements HibernateObject {
+public class Confirmation implements Serializable{
+		
+	private static final long serialVersionUID = 5205407509866157971L;
 	
-	private static final long serialVersionUID = 115L;
-	
-	@Id @GeneratedValue
-	@Column(name="ID")
-	private long id;
-	
-	@Column(name="DETAIL")
 	private String detail;
-	
-	public long getId() {
-		return this.id;
-	}
-	
-	public void setId(long id) {
-		this.id = id;
-	}
 
 	public String getDetail() {
 		return detail;

Modified: cdl/trunk/samples/jbossesb/broker/src/main/java/org/jboss/soa/overlord/samples/jbossesb/loan/broker/Quote.java
===================================================================
--- cdl/trunk/samples/jbossesb/broker/src/main/java/org/jboss/soa/overlord/samples/jbossesb/loan/broker/Quote.java	2008-08-08 19:01:37 UTC (rev 228)
+++ cdl/trunk/samples/jbossesb/broker/src/main/java/org/jboss/soa/overlord/samples/jbossesb/loan/broker/Quote.java	2008-08-12 11:23:21 UTC (rev 229)
@@ -19,38 +19,18 @@
  */
 package org.jboss.soa.overlord.samples.jbossesb.loan.broker;
 
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
-import javax.persistence.Id;
-import javax.persistence.Table;
+import java.io.Serializable;
 
-import org.jboss.soa.overlord.conversation.HibernateObject;
 
- at Entity
- at Table(name="T_QUOTE")
-public class Quote implements HibernateObject {
-	
-	private static final long serialVersionUID = 12333L;
 
-	@Id @GeneratedValue
-	@Column(name="ID")
-	private long id;
+public class Quote implements Serializable {
 	
-	@Column(name="VALUE")
+	private static final long serialVersionUID = 3234324947672128469L;
+
 	private String value;
 	
-	@Column(name="SERVICE_DESC")
 	private String serviceDescription;
-	
-	public long getId() {
-		return this.id;
-	}
 
-	public void setId(long id) {
-		this.id = id;
-	}
-
 	public String getServiceDescription() {
 		return serviceDescription;
 	}

Added: cdl/trunk/samples/jbossesb/broker/src/main/java/org/jboss/soa/overlord/samples/jbossesb/loan/broker/QuoteManager.java
===================================================================
--- cdl/trunk/samples/jbossesb/broker/src/main/java/org/jboss/soa/overlord/samples/jbossesb/loan/broker/QuoteManager.java	                        (rev 0)
+++ cdl/trunk/samples/jbossesb/broker/src/main/java/org/jboss/soa/overlord/samples/jbossesb/loan/broker/QuoteManager.java	2008-08-12 11:23:21 UTC (rev 229)
@@ -0,0 +1,32 @@
+/*
+ * 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.List;
+
+/**
+ * @author jeffyu
+ *
+ */
+public interface QuoteManager {
+	
+	List<Quote> getQuotes();
+	
+}

Modified: cdl/trunk/samples/jbossesb/broker/src/main/java/org/jboss/soa/overlord/samples/jbossesb/loan/broker/Request4QuoteMain.java
===================================================================
--- cdl/trunk/samples/jbossesb/broker/src/main/java/org/jboss/soa/overlord/samples/jbossesb/loan/broker/Request4QuoteMain.java	2008-08-08 19:01:37 UTC (rev 228)
+++ cdl/trunk/samples/jbossesb/broker/src/main/java/org/jboss/soa/overlord/samples/jbossesb/loan/broker/Request4QuoteMain.java	2008-08-12 11:23:21 UTC (rev 229)
@@ -19,47 +19,21 @@
  */
 package org.jboss.soa.overlord.samples.jbossesb.loan.broker;
 
-import javax.persistence.CascadeType;
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.FetchType;
-import javax.persistence.GeneratedValue;
-import javax.persistence.Id;
-import javax.persistence.JoinColumn;
-import javax.persistence.OneToOne;
-import javax.persistence.Table;
+import java.io.Serializable;
 
-import org.jboss.soa.overlord.conversation.HibernateObject;
-
 /**
  * @author jeffyu
  *
  */
- at Entity
- at Table(name="T_REQUEST_QUOTE")
-public class Request4QuoteMain implements HibernateObject {
+public class Request4QuoteMain implements Serializable {
 	
 	private static final long serialVersionUID = -6269132071760540966L;
 	
-	@Id @GeneratedValue
-	@Column(name="ID")
-	private long id;
-	
-	@OneToOne
-	@JoinColumn(name="supplier_ID")
 	private Supplier supplier;
 	
-	@OneToOne(fetch = FetchType.EAGER ,cascade={CascadeType.ALL})
-	@JoinColumn(name="quote_ID")
-	private Quote quote = new Quote();
+	private QuoteManager quoteManager;
 	
-	public long getId() {
-		return id;
-	}
-	
-	public void setId(long id) {
-		this.id = id;
-	}
+	private Quote quote = new Quote();
 
 	public Supplier getSupplier() {
 		return supplier;
@@ -77,5 +51,17 @@
 		this.quote = quote;
 	}
 	
+	public void addToQuoteManager() {
+		quoteManager.getQuotes().add(quote);
+	}
 
+	public QuoteManager getQuoteManager() {
+		return quoteManager;
+	}
+
+	public void setQuoteManager(QuoteManager quoteManager) {
+		this.quoteManager = quoteManager;
+	}
+	
+
 }

Modified: cdl/trunk/samples/jbossesb/broker/src/main/java/org/jboss/soa/overlord/samples/jbossesb/loan/broker/SetCreditCheckRequestMessageAction.java
===================================================================
--- cdl/trunk/samples/jbossesb/broker/src/main/java/org/jboss/soa/overlord/samples/jbossesb/loan/broker/SetCreditCheckRequestMessageAction.java	2008-08-08 19:01:37 UTC (rev 228)
+++ cdl/trunk/samples/jbossesb/broker/src/main/java/org/jboss/soa/overlord/samples/jbossesb/loan/broker/SetCreditCheckRequestMessageAction.java	2008-08-12 11:23:21 UTC (rev 229)
@@ -40,7 +40,7 @@
 		
 		Node node = XMLUtils.getNode((String)message.getBody().get());
 		String idValue = node.getAttributes().getNamedItem("id").getNodeValue();
-		message.getBody().add("<creditInformation id=\"" + idValue +"\"></creditInformation>");
+		message.getBody().add("<CreditInformation id=\"" + idValue +"\"></CreditInformation>");
 		
 		logger.info("Updated credit check request message: "+message.getBody().get());
 		

Modified: cdl/trunk/samples/jbossesb/broker/src/main/java/org/jboss/soa/overlord/samples/jbossesb/loan/broker/Supplier.java
===================================================================
--- cdl/trunk/samples/jbossesb/broker/src/main/java/org/jboss/soa/overlord/samples/jbossesb/loan/broker/Supplier.java	2008-08-08 19:01:37 UTC (rev 228)
+++ cdl/trunk/samples/jbossesb/broker/src/main/java/org/jboss/soa/overlord/samples/jbossesb/loan/broker/Supplier.java	2008-08-12 11:23:21 UTC (rev 229)
@@ -19,50 +19,21 @@
  */
 package org.jboss.soa.overlord.samples.jbossesb.loan.broker;
 
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
-import javax.persistence.Id;
-import javax.persistence.JoinColumn;
-import javax.persistence.ManyToOne;
-import javax.persistence.Table;
+import java.io.Serializable;
 
-import org.jboss.soa.overlord.conversation.HibernateObject;
 
 /**
  * @author jeffyu
  *
  */
- at Entity
- at Table(name="T_SUPPLIER")
-public class Supplier implements HibernateObject {
+public class Supplier implements Serializable{
 	
-	private static final long serialVersionUID = 14L;
-	
-	@Id @GeneratedValue
-	@Column(name="ID")
-	private long id;
-	
-	@Column(name="SERVICE_CATEGORY")
 	private String serviceCategory;
 	
-	@Column(name="SERVICE_NAME")
 	private String serviceName;
 	
-	@Column(name="SERVICE_DESCRIPTION")
 	private String serviceDescription;
 	
-	@ManyToOne
-	@JoinColumn(name="BROKER_ID")
-	private BrokerMain broker;
-	
-	public long getId() {
-		return this.id;
-	}
-	
-	public void setId(long id) {
-		this.id = id;
-	}
 
 	public String getServiceCategory() {
 		return serviceCategory;
@@ -80,14 +51,6 @@
 		this.serviceName = serviceName;
 	}
 
-	public BrokerMain getBroker() {
-		return broker;
-	}
-
-	public void setBroker(BrokerMain broker) {
-		this.broker = broker;
-	}
-
 	public String getServiceDescription() {
 		return serviceDescription;
 	}

Modified: cdl/trunk/samples/jbossesb/broker/src/main/resources/META-INF/deployment.xml
===================================================================
--- cdl/trunk/samples/jbossesb/broker/src/main/resources/META-INF/deployment.xml	2008-08-08 19:01:37 UTC (rev 228)
+++ cdl/trunk/samples/jbossesb/broker/src/main/resources/META-INF/deployment.xml	2008-08-12 11:23:21 UTC (rev 229)
@@ -1,4 +1,5 @@
 <jbossesb-deployment>
+  <depends>jboss.esb:deployment=cdl-jbossesb.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>
@@ -18,10 +19,4 @@
   <depends>jboss.esb.sample.broker.destination:service=Queue,name=esb-loan-broker15</depends>
   <depends>jboss.esb.sample.broker.destination:service=Queue,name=esb-loan-broker16</depends>
   <depends>jboss.esb.sample.broker.destination:service=Queue,name=esb-loan-broker17</depends>
-  <depends>jboss.esb.sample.broker.destination:service=Queue,name=esb-loan-creditAgency</depends>
-  <depends>jboss.esb.sample.broker.destination:service=Queue,name=esb-loan-creditAgency1</depends>
-  <depends>jboss.esb.sample.broker.destination:service=Queue,name=esb-loan-creditAgency2</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>
 </jbossesb-deployment>

Modified: cdl/trunk/samples/jbossesb/broker/src/main/resources/META-INF/jboss-esb.xml
===================================================================
--- cdl/trunk/samples/jbossesb/broker/src/main/resources/META-INF/jboss-esb.xml	2008-08-08 19:01:37 UTC (rev 228)
+++ cdl/trunk/samples/jbossesb/broker/src/main/resources/META-INF/jboss-esb.xml	2008-08-12 11:23:21 UTC (rev 229)
@@ -60,24 +60,6 @@
 			<jms-bus busid="BrokerService17">
 				<jms-message-filter dest-type="QUEUE" dest-name="queue/esb-loan-broker17"/>
 			</jms-bus>
-			<jms-bus busid="SupplierService1">
-				<jms-message-filter dest-type="QUEUE" dest-name="queue/esb-loan-supplier1" />
-			</jms-bus>
-			<jms-bus busid="SupplierService11">
-				<jms-message-filter dest-type="QUEUE" dest-name="queue/esb-loan-supplier11" />
-			</jms-bus>
-			<jms-bus busid="SupplierService12">
-				<jms-message-filter dest-type="QUEUE" dest-name="queue/esb-loan-supplier12" />
-			</jms-bus>
-			<jms-bus busid="CAService">
-				<jms-message-filter dest-type="QUEUE" dest-name="queue/esb-loan-creditAgency" />
-			</jms-bus>
-			<jms-bus busid="CAService1">
-				<jms-message-filter dest-type="QUEUE" dest-name="queue/esb-loan-creditAgency1" />
-			</jms-bus>
-			<jms-bus busid="CAService2">
-				<jms-message-filter dest-type="QUEUE" dest-name="queue/esb-loan-creditAgency2" />
-			</jms-bus>
 		</jms-provider>
 
 	</providers>
@@ -415,8 +397,7 @@
 				</action>
 			</actions>
 		</service>
-
-		
+	
 		<service category="ESBBroker.BrokerParticipant" name="RequestForQuote.main.1" description="">
 			<listeners>
 				<jms-listener name="BrokerServiceListener11"
@@ -450,8 +431,8 @@
 				</action>
 				<action class="org.jboss.soa.overlord.jbossesb.actions.SetStateAction" 
 							process="process" name="s9-4">
-					<property name="variable" value="parent.quote" />
-					<property name="stateExpression" value="quote" />
+					<property name="variable" value="addToQuoteManager()" />
+					<property name="parentProperty" value="quoteManager" />
 				</action>				
 			</actions>
 		</service>
@@ -485,8 +466,8 @@
 							process="process" name="s10-4">
 					<property name="operation" value="checkCredit" />
 					<property name="messageType" value="creditInformation" />
-					<property name="serviceName" value="CreditAgency.Main" />
-					<property name="serviceCategory" value="ESBBroker.CreditAgency" />
+					<property name="serviceName" value="CreditAgency.main" />
+					<property name="serviceCategory" value="PurchaseGoods.CreditAgency" />
 					<property name="responseServiceName" value="CompleteTransaction.main.1" />
 					<property name="responseServiceCategory" value="ESBBroker.BrokerParticipant" />
 					<property name="identities" >
@@ -655,202 +636,6 @@
 				</action>
 			</actions>
 		</service>
-		
-				<service category="ESBBroker.Suppliers" name="Supplier1.main" description="">
-			<listeners>
-				<jms-listener name="SupplierServiceListener1"
-							  busidref="SupplierService1"
-							  maxThreads="1"/>							  
-			</listeners>
-			<actions mep="OneWay">
-				<action class="org.jboss.soa.overlord.jbossesb.actions.MessageRouterAction"
-							process="process" name="su-1">
-					<property name="paths">
-						<route  service-category="ESBBroker.Suppliers"
-								service-name="Supplier1.main.1" 
-								initiate="true">
-							<identity type="primary" >
-								<token name="id" locator="//@id" />
-								<token name="supplierDesc" locator="//@supplierDesc" />
-							</identity>
-							<message type="requestForQuote" />
-						</route>
-						<route  service-category="ESBBroker.Suppliers"
-								service-name="Supplier1.main.2" 
-								initiate="true">
-							<identity type="primary" >
-								<token name="id" locator="//@id" />
-								<token name="supplierDesc" locator="//@supplierDesc" />
-							</identity>
-							<message type="orderConfirmed" />
-						</route>
-					</property>				
-				</action>
-			</actions>
-		</service>
-		
-		<service category="ESBBroker.Suppliers" name="Supplier1.main.1" description="">
-			<listeners>
-				<jms-listener name="SupplierServiceListener11"
-							  busidref="SupplierService11"
-							  maxThreads="1"/>							  
-			</listeners>
-			<actions mep="OneWay">
-				<action class="org.jboss.soa.overlord.jbossesb.actions.CreateSessionAction"
-							process="process" name="su11-1">
-					<property name="session" value="org.jboss.soa.overlord.samples.jbossesb.loan.supplier.SupplierMain" />
-				</action>
-				<action class="org.jboss.soa.overlord.jbossesb.actions.ReceiveMessageAction"
-							process="process" name="su11-2">
-					<property name="messageType" value="requestForQuote" />
-					<property name="clientEPR" value="broker" />
-					<property name="identities" >
-						<identity type="primary" >
-							<token name="id" locator="//@id" />
-							<token name="supplierDesc" locator="//@supplierDesc" />
-						</identity>
-					</property>
-				</action>
-				<action class="org.jboss.soa.overlord.samples.jbossesb.loan.supplier.SetQuoteMessageAction" name="su11-3">
-				</action>			
-				<action class="org.jboss.soa.overlord.jbossesb.actions.SendMessageAction"
-							process="process" name="su11-4">
-					<property name="messageType" value="quote" />
-					<property name="clientEPR" value="broker" />
-					<property name="identities" >
-						<identity type="primary" >
-							<token name="id" locator="//@id" />
-							<token name="supplierDesc" locator="//@supplierDesc" />
-						</identity>
-					</property>			
-				</action>				
-			</actions>
-		</service>
-		
-		<service category="ESBBroker.Suppliers" name="Supplier1.main.2" description="">
-			<listeners>
-				<jms-listener name="SupplierServiceListener12"
-							  busidref="SupplierService12"
-							  maxThreads="1"/>							  
-			</listeners>
-			<actions mep="OneWay">
-				<action class="org.jboss.soa.overlord.jbossesb.actions.CreateSessionAction"
-							process="process" name="su12-1">
-					<property name="session" value="org.jboss.soa.overlord.samples.jbossesb.loan.supplier.SupplierMain" />
-				</action>
-				<action class="org.jboss.soa.overlord.jbossesb.actions.ReceiveMessageAction"
-							process="process" name="su12-2">
-					<property name="messageType" value="orderConfirmed" />
-					<property name="clientEPR" value="broker" />
-					<property name="identities" >
-						<identity type="primary" >
-							<token name="id" locator="//@id" />
-							<token name="supplierDesc" locator="//@supplierDesc" />
-						</identity>
-					</property>
-				</action>
-				<action class="org.jboss.soa.overlord.samples.jbossesb.loan.supplier.SetOrderConfirmResponseAction" name="su12-3">
-				</action>			
-				<action class="org.jboss.soa.overlord.jbossesb.actions.SendMessageAction"
-							process="process" name="su12-4">
-					<property name="messageType" value="bookingReference" />
-					<property name="clientEPR" value="broker" />
-					<property name="identities" >
-						<identity type="primary" >
-							<token name="id" locator="//@id" />
-							<token name="supplierDesc" locator="//@supplierDesc" />
-						</identity>
-					</property>			
-				</action>				
-			</actions>
-		</service>
 			
-		<service category="ESBBroker.CreditAgency" name="CreditAgency.Main" description="">
-			<listeners>
-				<jms-listener name="CAListener"
-							  busidref="CAService"
-							  maxThreads="1"/>							  
-			</listeners>
-			<actions mep="OneWay">
-				<action class="org.jboss.soa.overlord.jbossesb.actions.CreateSessionAction"
-							process="process" name="c1">
-					<property name="session" value="org.jboss.soa.overlord.samples.jbossesb.loan.creditAgency.CreditAgency" />
-				</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="ESBBroker.CreditAgency"
-								service-name="CreditAgency.decision1"
-								immediate="true" />
-						<else service-category="ESBBroker.CreditAgency"
-								service-name="CreditAgency.decision2"
-								immediate="true" />
-					</property>				
-				</action>
-			</actions>
-		</service>
-		
-		<service category="ESBBroker.CreditAgency" name="CreditAgency.decision1" description="">
-			<listeners>
-				<jms-listener name="CAListener1"
-							  busidref="CAService1"
-							  maxThreads="1"/>							  
-			</listeners>
-			<actions mep="OneWay">
-				<action class="org.jboss.soa.overlord.samples.jbossesb.loan.creditAgency.SetCreditCheckResponseMessageAction"
-							process="process" name="d2">
-				</action>
-				<action class="org.jboss.soa.overlord.jbossesb.actions.SendMessageAction"
-							process="process" name="d3">
-					<property name="session" value="org.jboss.soa.overlord.samples.jbossesb.loan.creditAgency.CreditAgency" />
-					<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="ESBBroker.CreditAgency" name="CreditAgency.decision2" description="">
-			<listeners>
-				<jms-listener name="CAListener2"
-							  busidref="CAService2"
-							  maxThreads="1"/>							  
-			</listeners>
-			<actions mep="OneWay">
-				<action class="org.jboss.soa.overlord.samples.jbossesb.loan.creditAgency.SetCreditCheckInvalidMessageAction"
-							process="process" name="e2">
-				</action>
-				<action class="org.jboss.soa.overlord.jbossesb.actions.SendMessageAction"
-							process="process" name="e3">
-					<property name="session" value="org.jboss.soa.overlord.samples.jbossesb.loan.creditAgency.CreditAgency" />
-					<property name="operation" value="checkCredit" />
-					<property name="messageType" value="CreditCheckInvalid" />
-					<property name="clientEPR" value="broker" />
-					<property name="identities" >
-						<identity type="primary" >
-							<token name="id" locator="//@id" />
-						</identity>
-					</property>
-				</action>
-			</actions>
-		</service>	
-			
 	</services>		
 </jbossesb>

Deleted: cdl/trunk/samples/jbossesb/broker/src/main/resources/hibernate.cfg.xml
===================================================================
--- cdl/trunk/samples/jbossesb/broker/src/main/resources/hibernate.cfg.xml	2008-08-08 19:01:37 UTC (rev 228)
+++ cdl/trunk/samples/jbossesb/broker/src/main/resources/hibernate.cfg.xml	2008-08-12 11:23:21 UTC (rev 229)
@@ -1,71 +0,0 @@
-<!DOCTYPE hibernate-configuration SYSTEM
-"http://hibernate.sourceforge.net/hibernate-configuration-3.0.dtd">
-<!--
-  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,
-  @author JBoss Inc.
--->
-<hibernate-configuration>
-	<session-factory>
-		<property name="hibernate.connection.driver_class">
-			org.hsqldb.jdbcDriver
-		</property>
-		<property name="hibernate.connection.url">
-			jdbc:hsqldb:hsql://localhost
-		</property>
-		<property name="hibernate.connection.username">
-			sa
-		</property>
-		<property name="hibernate.dialect">
-			org.hibernate.dialect.HSQLDialect
-		</property>
-		
-		<!-- Use the C3P0 connection pool provider -->
-		<property name="hibernate.c3p0.min_size">5</property>
-		<property name="hibernate.c3p0.max_size">20</property>
-		<property name="hibernate.c3p0.timeout">300</property>
-		<property name="hibernate.c3p0.max_statements">50</property>
-		<property name="hibernate.c3p0.idle_test_period">3000</property>
-		
-		<property name="current_session_context_class">thread</property>
-		<property name="hibernate.connection.isolation">4</property>
-		
-		<!-- Show and print nice SQL on stdout -->
-		<property name="show_sql">false</property>
-		<property name="format_sql">true</property>
-		
-		<!-- List of annotationed classes (Internal conversation class)-->
-		<mapping class="org.jboss.soa.overlord.conversation.Session" />
-		<mapping class="org.jboss.soa.overlord.conversation.ScheduleItem"/>
-		<mapping class="org.jboss.soa.overlord.conversation.JoinState"/>
-		<mapping class="org.jboss.soa.overlord.conversation.Identity"/>
-		<mapping class="org.jboss.soa.overlord.conversation.EPRWrapper"/>
-		
-		<!-- List of Business State class -->
-		<mapping class="org.jboss.soa.overlord.samples.jbossesb.loan.broker.Supplier" />
-		<mapping class="org.jboss.soa.overlord.samples.jbossesb.loan.broker.BrokerMain" />
-		<mapping class="org.jboss.soa.overlord.samples.jbossesb.loan.broker.CompleteTransactionMain" />
-		<mapping class="org.jboss.soa.overlord.samples.jbossesb.loan.broker.Confirmation" />
-		<mapping class="org.jboss.soa.overlord.samples.jbossesb.loan.broker.Quote" />
-		<mapping class="org.jboss.soa.overlord.samples.jbossesb.loan.broker.Request4QuoteMain" />
-		
-		<mapping class="org.jboss.soa.overlord.samples.jbossesb.loan.supplier.SupplierMain" />
-		<mapping class="org.jboss.soa.overlord.samples.jbossesb.loan.creditAgency.CreditAgency" />
-		
-	</session-factory>
-</hibernate-configuration>

Modified: cdl/trunk/samples/jbossesb/broker/src/main/resources/jbmq-queue-service.xml
===================================================================
--- cdl/trunk/samples/jbossesb/broker/src/main/resources/jbmq-queue-service.xml	2008-08-08 19:01:37 UTC (rev 228)
+++ cdl/trunk/samples/jbossesb/broker/src/main/resources/jbmq-queue-service.xml	2008-08-12 11:23:21 UTC (rev 229)
@@ -116,43 +116,5 @@
   	jboss.mq:service=DestinationManager
   </depends>
 </mbean>
-<mbean code="org.jboss.mq.server.jmx.Queue"
-	 name="jboss.esb.sample.broker.destination:service=Queue,name=esb-loan-creditAgency">
-  <depends optional-attribute-name="DestinationManager">
-  	jboss.mq:service=DestinationManager
-  </depends>
-</mbean>
-<mbean code="org.jboss.mq.server.jmx.Queue"
-	 name="jboss.esb.sample.broker.destination:service=Queue,name=esb-loan-creditAgency1">
-  <depends optional-attribute-name="DestinationManager">
-  	jboss.mq:service=DestinationManager
-  </depends>
-</mbean>
-<mbean code="org.jboss.mq.server.jmx.Queue"
-	 name="jboss.esb.sample.broker.destination:service=Queue,name=esb-loan-creditAgency2">
-  <depends optional-attribute-name="DestinationManager">
-  	jboss.mq:service=DestinationManager
-  </depends>
-</mbean>
-<mbean code="org.jboss.mq.server.jmx.Queue"
-	 name="jboss.esb.sample.broker.destination:service=Queue,name=esb-loan-supplier1">
-  <depends optional-attribute-name="DestinationManager">
-  	jboss.mq:service=DestinationManager
-  </depends>
-</mbean>
-
-<mbean code="org.jboss.mq.server.jmx.Queue"
-	 name="jboss.esb.sample.broker.destination:service=Queue,name=esb-loan-supplier11">
-  <depends optional-attribute-name="DestinationManager">
-  	jboss.mq:service=DestinationManager
-  </depends>
-</mbean>
 	
-<mbean code="org.jboss.mq.server.jmx.Queue"
-	 name="jboss.esb.sample.broker.destination:service=Queue,name=esb-loan-supplier12">
-  <depends optional-attribute-name="DestinationManager">
-  	jboss.mq:service=DestinationManager
-  </depends>
-</mbean>
-	
 </server>

Modified: cdl/trunk/samples/jbossesb/creditAgency/src/main/java/com/acme/services/creditAgency/SetCreditCheckInvalidMessageAction.java
===================================================================
--- cdl/trunk/samples/jbossesb/creditAgency/src/main/java/com/acme/services/creditAgency/SetCreditCheckInvalidMessageAction.java	2008-08-08 19:01:37 UTC (rev 228)
+++ cdl/trunk/samples/jbossesb/creditAgency/src/main/java/com/acme/services/creditAgency/SetCreditCheckInvalidMessageAction.java	2008-08-12 11:23:21 UTC (rev 229)
@@ -40,7 +40,7 @@
 		
 		Node node = XMLUtils.getNode((String)message.getBody().get());
 		String idValue = node.getAttributes().getNamedItem("id").getNodeValue();
-		message.getBody().add("<CreditInvalid id=\"" + idValue +"\"></CreditInvalid>");
+		message.getBody().add("<creditInvalid id=\"" + idValue +"\"></creditInvalid>");
 
 		logger.info("Updated credit message: "+message);
 

Modified: cdl/trunk/samples/jbossesb/creditAgency/src/main/java/com/acme/services/creditAgency/SetCreditCheckResponseMessageAction.java
===================================================================
--- cdl/trunk/samples/jbossesb/creditAgency/src/main/java/com/acme/services/creditAgency/SetCreditCheckResponseMessageAction.java	2008-08-08 19:01:37 UTC (rev 228)
+++ cdl/trunk/samples/jbossesb/creditAgency/src/main/java/com/acme/services/creditAgency/SetCreditCheckResponseMessageAction.java	2008-08-12 11:23:21 UTC (rev 229)
@@ -40,7 +40,7 @@
 		
 		Node node = XMLUtils.getNode((String)message.getBody().get());
 		String idValue = node.getAttributes().getNamedItem("id").getNodeValue();
-		message.getBody().add("<CreditValid id=\"" + idValue +"\"></CreditValid>");
+		message.getBody().add("<creditValid id=\"" + idValue +"\"></creditValid>");
 		
 		logger.info("Updated credit message: "+message.getBody().get() +"' by thread of " + Thread.currentThread().getName());
 

Modified: cdl/trunk/samples/jbossesb/creditAgency/src/main/resources/META-INF/jboss-esb.xml
===================================================================
--- cdl/trunk/samples/jbossesb/creditAgency/src/main/resources/META-INF/jboss-esb.xml	2008-08-08 19:01:37 UTC (rev 228)
+++ cdl/trunk/samples/jbossesb/creditAgency/src/main/resources/META-INF/jboss-esb.xml	2008-08-12 11:23:21 UTC (rev 229)
@@ -52,7 +52,7 @@
 				<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="messageType" value="creditInformation" />
 					<property name="clientEPR" value="broker" />
 					<property name="identities" >
 						<identity type="primary" >
@@ -89,7 +89,7 @@
 							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="messageType" value="creditValid" />
 					<property name="clientEPR" value="broker" />
 					<property name="identities" >
 						<identity type="primary" >
@@ -114,7 +114,7 @@
 							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="messageType" value="creditInvalid" />
 					<property name="clientEPR" value="broker" />
 					<property name="identities" >
 						<identity type="primary" >

Added: cdl/trunk/samples/jbossesb/database/build.xml
===================================================================
--- cdl/trunk/samples/jbossesb/database/build.xml	                        (rev 0)
+++ cdl/trunk/samples/jbossesb/database/build.xml	2008-08-12 11:23:21 UTC (rev 229)
@@ -0,0 +1,38 @@
+<project name="broker" default="startdb" basedir=".">
+	<property name="M2_REPO" value="/opt/m2/repo" />
+	<property name="database.dir" value="${basedir}/data" />
+        
+	<path id="database.classpath">
+      	 <fileset dir="${M2_REPO}" >
+		<include name="hsqldb/hsqldb/1.8.0.7/hsqldb-1.8.0.7.jar" />
+	 </fileset>
+	</path>
+
+    <!-- Start the HSQL DB server -->
+    <target name="startdb" description="Run HSQL database server with clean DB">
+        <!-- Delete database files -->
+        <delete dir="${database.dir}"/>
+        <java classname="org.hsqldb.Server"
+              fork="yes"
+              classpathref="database.classpath"
+              failonerror="true">
+            <arg value="-database.0"/>
+            <arg value="file:${database.dir}/db"/>
+        </java>
+    </target>
+
+    <!-- Start the HSQL DB browser tool -->
+    <target name="dbmanager" description="Start HSQL DB manager">
+        <java
+            classname="org.hsqldb.util.DatabaseManagerSwing"
+            fork="yes"
+            classpathref="database.classpath"
+            failonerror="true">
+            <arg value="-url"/>
+            <arg value="jdbc:hsqldb:hsql://localhost/"/>
+            <arg value="-driver"/>
+            <arg value="org.hsqldb.jdbcDriver"/>
+        </java>
+    </target>
+	
+</project>

Modified: cdl/trunk/samples/jbossesb/purchasing/src/main/java/com/acme/services/broker/SetCreditCheckRequestMessageAction.java
===================================================================
--- cdl/trunk/samples/jbossesb/purchasing/src/main/java/com/acme/services/broker/SetCreditCheckRequestMessageAction.java	2008-08-08 19:01:37 UTC (rev 228)
+++ cdl/trunk/samples/jbossesb/purchasing/src/main/java/com/acme/services/broker/SetCreditCheckRequestMessageAction.java	2008-08-12 11:23:21 UTC (rev 229)
@@ -40,7 +40,7 @@
 		
 		Node node = XMLUtils.getNode((String)message.getBody().get());
 		String idValue = node.getAttributes().getNamedItem("id").getNodeValue();
-		message.getBody().add("<CreditInformation id=\"" + idValue +"\"></CreditInformation>");
+		message.getBody().add("<creditInformation id=\"" + idValue +"\"></creditInformation>");
 		
 		logger.info("Updated credit check request message: "+message);
 		

Modified: cdl/trunk/samples/jbossesb/purchasing/src/main/resources/META-INF/jboss-esb.xml
===================================================================
--- cdl/trunk/samples/jbossesb/purchasing/src/main/resources/META-INF/jboss-esb.xml	2008-08-08 19:01:37 UTC (rev 228)
+++ cdl/trunk/samples/jbossesb/purchasing/src/main/resources/META-INF/jboss-esb.xml	2008-08-12 11:23:21 UTC (rev 229)
@@ -82,7 +82,7 @@
 				<action class="org.jboss.soa.overlord.jbossesb.actions.SendMessageAction"
 							process="process" name="a4">
 					<property name="operation" value="checkCredit" />
-					<property name="messageType" value="CreditInformation" />
+					<property name="messageType" value="creditInformation" />
 					<property name="serviceName" value="CreditAgency.main" />
 					<property name="serviceCategory" value="PurchaseGoods.CreditAgency" />
 					<property name="responseServiceName" value="CreditResponse" />
@@ -118,11 +118,11 @@
 					<property name="paths">
 						<case service-category="PurchaseGoods.Broker"
 								service-name="CreditResponse1" >
-							<message type="CreditValid" />
+							<message type="creditValid" />
 						</case>
 						<case service-category="PurchaseGoods.Broker"
 								service-name="CreditResponse2" >
-							<message type="CreditInvalid" />
+							<message type="creditInvalid" />
 						</case>
 					</property>				
 				</action>
@@ -140,7 +140,7 @@
 							process="process" name="b4">
 					<property name="session" value="com.acme.services.broker.PurchaseGoods" />
 					<property name="operation" value="checkCredit" />
-					<property name="messageType" value="CreditValid" />
+					<property name="messageType" value="creditValid" />
 					<property name="serviceDescriptionName" value="{http://www.jboss.org/overlord/purchase}Broker" />
 					<property name="identities" >
 						<identity type="primary" >
@@ -234,7 +234,7 @@
 							process="process" name="b14">
 					<property name="session" value="com.acme.services.broker.PurchaseGoods" />
 					<property name="operation" value="checkCredit" />
-					<property name="messageType" value="CreditInvalid" />
+					<property name="messageType" value="creditInvalid" />
 					<property name="serviceDescriptionName" value="{http://www.jboss.org/overlord/purchase}Broker" />
 					<property name="identities" >
 						<identity type="primary" >

Added: cdl/trunk/samples/jbossesb/supplier/pom.xml
===================================================================
--- cdl/trunk/samples/jbossesb/supplier/pom.xml	                        (rev 0)
+++ cdl/trunk/samples/jbossesb/supplier/pom.xml	2008-08-12 11:23:21 UTC (rev 229)
@@ -0,0 +1,60 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" 
+	 xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+	<modelVersion>4.0.0</modelVersion>
+	<groupId>org.jboss.soa.overlord.cdl.samples</groupId>
+	<artifactId>jbossesb-supplier</artifactId>
+	<version>1.0-SNAPSHOT</version>
+	<packaging>jboss-esb</packaging>
+	<name>Overlord::CDL::Samples::Supplier</name>
+	<url>http://www.jboss.org/overlord</url>
+	
+	<parent>
+		<groupId>org.jboss.soa.overlord.cdl</groupId>
+		<artifactId>samples</artifactId>
+		<version>1.0-SNAPSHOT</version>
+	</parent>
+
+		<dependencies>	
+			<dependency>
+				<groupId>log4j</groupId>
+				<artifactId>log4j</artifactId>
+				<version>1.2.14</version>
+				<scope>provided</scope>
+			</dependency>
+			<dependency>
+				<groupId>org.jboss.soa.overlord.cdl</groupId>
+				<artifactId>runtime-jbossesb</artifactId>
+				<version>1.0-SNAPSHOT</version>
+				<scope>provided</scope>
+			</dependency>
+
+		</dependencies>
+
+		<build>
+		    <finalName>supplier</finalName>
+		    <plugins>
+			<plugin>
+			<groupId>org.apache.maven.plugins</groupId>
+		    <artifactId>maven-antrun-plugin</artifactId>
+			 <executions>
+			  <!--Deploy esb artifact to JBoss AS/ESB -->
+			  <execution>
+			    <id>deploy</id>
+			    <phase>install</phase>
+			    <configuration>
+			      <tasks>
+				   <copy file="target/supplier.esb" todir="${deploy.dir}" overwrite="true" />
+			      </tasks>
+			    </configuration>
+			    <goals>
+			      <goal>run</goal>
+			    </goals>
+			  </execution>
+			  </executions>
+		     </plugin>		      
+		    </plugins>
+		</build>
+	
+</project>
+

Added: cdl/trunk/samples/jbossesb/supplier/src/main/java/org/jboss/soa/overlord/samples/jbossesb/supplier/SetOrderConfirmResponseAction.java
===================================================================
--- cdl/trunk/samples/jbossesb/supplier/src/main/java/org/jboss/soa/overlord/samples/jbossesb/supplier/SetOrderConfirmResponseAction.java	                        (rev 0)
+++ cdl/trunk/samples/jbossesb/supplier/src/main/java/org/jboss/soa/overlord/samples/jbossesb/supplier/SetOrderConfirmResponseAction.java	2008-08-12 11:23:21 UTC (rev 229)
@@ -0,0 +1,43 @@
+package org.jboss.soa.overlord.samples.jbossesb.supplier;
+
+
+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.util.XMLUtils;
+import org.w3c.dom.Node;
+
+/**
+ * @author jeffyu
+ *
+ */
+public class SetOrderConfirmResponseAction extends AbstractActionLifecycle {
+	
+	private Logger logger = Logger.getLogger(SetOrderConfirmResponseAction.class);
+	
+	private ConfigTree config;
+	
+	public SetOrderConfirmResponseAction(ConfigTree config) {
+		this.config = config;
+	}
+	
+	public Message process(Message message) throws Exception {
+		Node node = XMLUtils.getNode((String)message.getBody().get());
+		
+		String idValue = node.getAttributes().getNamedItem("id").getNodeValue();
+		String quoteValue = node.getAttributes().getNamedItem("quoteValue").getNodeValue();
+		
+		String supplierDesc = "{http://www.jboss.org/overlord/loanBroker}Supplier1";
+		String confirmation = "The quote of " + quoteValue + " has been confirmed.";
+		
+		String body = "<bookingReference id=\"" + idValue + "\" supplierDesc = \"" 
+							+ supplierDesc+ "\">"+confirmation +"</bookingReference>";
+		
+		message.getBody().add(body);
+		
+		logger.info("set 'bookingReference' of [" + body + "]");
+		return message;
+	}
+	
+}

Added: cdl/trunk/samples/jbossesb/supplier/src/main/java/org/jboss/soa/overlord/samples/jbossesb/supplier/SetQuoteMessageAction.java
===================================================================
--- cdl/trunk/samples/jbossesb/supplier/src/main/java/org/jboss/soa/overlord/samples/jbossesb/supplier/SetQuoteMessageAction.java	                        (rev 0)
+++ cdl/trunk/samples/jbossesb/supplier/src/main/java/org/jboss/soa/overlord/samples/jbossesb/supplier/SetQuoteMessageAction.java	2008-08-12 11:23:21 UTC (rev 229)
@@ -0,0 +1,40 @@
+package org.jboss.soa.overlord.samples.jbossesb.supplier;
+
+
+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.util.XMLUtils;
+import org.w3c.dom.Node;
+
+/**
+ * @author jeffyu
+ *
+ */
+public class SetQuoteMessageAction extends AbstractActionLifecycle {
+	
+	private Logger logger = Logger.getLogger(SetQuoteMessageAction.class);
+	
+	private ConfigTree config;
+	
+	public SetQuoteMessageAction(ConfigTree config) {
+		this.config = config;
+	}
+	
+	public Message process(Message message) throws Exception {
+		Node node = XMLUtils.getNode((String)message.getBody().get());
+		
+		String idValue = node.getAttributes().getNamedItem("id").getNodeValue();
+		String supplierDesc = "{http://www.jboss.org/overlord/loanBroker}Supplier1";
+		
+		String body = "<quote id=\"" + idValue + "\" supplierDesc = \"" 
+							+ supplierDesc+ "\">10</quote>";
+		
+		message.getBody().add(body);
+		
+		logger.info("set 'quote' of [" + body + "]");
+		return message;
+	}
+	
+}

Added: cdl/trunk/samples/jbossesb/supplier/src/main/java/org/jboss/soa/overlord/samples/jbossesb/supplier/SupplierMain.java
===================================================================
--- cdl/trunk/samples/jbossesb/supplier/src/main/java/org/jboss/soa/overlord/samples/jbossesb/supplier/SupplierMain.java	                        (rev 0)
+++ cdl/trunk/samples/jbossesb/supplier/src/main/java/org/jboss/soa/overlord/samples/jbossesb/supplier/SupplierMain.java	2008-08-12 11:23:21 UTC (rev 229)
@@ -0,0 +1,28 @@
+package org.jboss.soa.overlord.samples.jbossesb.supplier;
+
+import java.io.Serializable;
+
+import org.jboss.soa.overlord.jbossesb.actions.Service;
+
+/**
+ * @author jeffyu
+ * 
+ */
+ at Service(name="{http://www.jboss.org/overlord/loanBroker}Supplier1", conversationType="overlord.cdl.samples.supplier at Supplier", root=true)
+
+public class SupplierMain implements Serializable {
+	
+	private static final long serialVersionUID = -3956749311779109550L;
+	
+	private long id;
+	
+	public long getId() {
+		return this.id;
+	}
+
+	
+	public void setId(long id) {
+		this.id = id;
+	}
+
+}

Added: cdl/trunk/samples/jbossesb/supplier/src/main/resources/META-INF/deployment.xml
===================================================================
--- cdl/trunk/samples/jbossesb/supplier/src/main/resources/META-INF/deployment.xml	                        (rev 0)
+++ cdl/trunk/samples/jbossesb/supplier/src/main/resources/META-INF/deployment.xml	2008-08-12 11:23:21 UTC (rev 229)
@@ -0,0 +1,6 @@
+<jbossesb-deployment>
+  <depends>jboss.esb:deployment=cdl-jbossesb.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>
+</jbossesb-deployment>

Added: cdl/trunk/samples/jbossesb/supplier/src/main/resources/META-INF/jboss-esb.xml
===================================================================
--- cdl/trunk/samples/jbossesb/supplier/src/main/resources/META-INF/jboss-esb.xml	                        (rev 0)
+++ cdl/trunk/samples/jbossesb/supplier/src/main/resources/META-INF/jboss-esb.xml	2008-08-12 11:23:21 UTC (rev 229)
@@ -0,0 +1,133 @@
+<?xml version = "1.0" encoding = "UTF-8"?>
+<jbossesb xmlns="http://anonsvn.labs.jboss.com/labs/jbossesb/trunk/product/etc/schemas/xml/jbossesb-1.0.1.xsd" 
+	parameterReloadSecs="5000">
+
+	<providers>
+		<jms-provider name="JBossMQ" connection-factory="ConnectionFactory" 
+					jndi-context-factory="org.jnp.interfaces.NamingContextFactory"
+					jndi-URL="localhost">
+			<jms-bus busid="SupplierService1">
+				<jms-message-filter dest-type="QUEUE" dest-name="queue/esb-loan-supplier1" />
+			</jms-bus>
+			<jms-bus busid="SupplierService11">
+				<jms-message-filter dest-type="QUEUE" dest-name="queue/esb-loan-supplier11" />
+			</jms-bus>
+			<jms-bus busid="SupplierService12">
+				<jms-message-filter dest-type="QUEUE" dest-name="queue/esb-loan-supplier12" />
+			</jms-bus>
+		</jms-provider>
+
+	</providers>
+	
+	<services>    
+		<service category="ESBBroker.Suppliers" name="Supplier1.main" description="">
+			<listeners>
+				<jms-listener name="SupplierServiceListener1"
+							  busidref="SupplierService1"
+							  maxThreads="1"/>							  
+			</listeners>
+			<actions mep="OneWay">
+				<action class="org.jboss.soa.overlord.jbossesb.actions.MessageRouterAction"
+							process="process" name="su-1">
+					<property name="paths">
+						<route  service-category="ESBBroker.Suppliers"
+								service-name="Supplier1.main.1" 
+								initiate="true">
+							<identity type="primary" >
+								<token name="id" locator="//@id" />
+								<token name="supplierDesc" locator="//@supplierDesc" />
+							</identity>
+							<message type="requestForQuote" />
+						</route>
+						<route  service-category="ESBBroker.Suppliers"
+								service-name="Supplier1.main.2" 
+								initiate="true">
+							<identity type="primary" >
+								<token name="id" locator="//@id" />
+								<token name="supplierDesc" locator="//@supplierDesc" />
+							</identity>
+							<message type="orderConfirmed" />
+						</route>
+					</property>				
+				</action>
+			</actions>
+		</service>
+		
+		<service category="ESBBroker.Suppliers" name="Supplier1.main.1" description="">
+			<listeners>
+				<jms-listener name="SupplierServiceListener11"
+							  busidref="SupplierService11"
+							  maxThreads="1"/>							  
+			</listeners>
+			<actions mep="OneWay">
+				<action class="org.jboss.soa.overlord.jbossesb.actions.CreateSessionAction"
+							process="process" name="su11-1">
+					<property name="session" value="org.jboss.soa.overlord.samples.jbossesb.supplier.SupplierMain" />
+				</action>
+				<action class="org.jboss.soa.overlord.jbossesb.actions.ReceiveMessageAction"
+							process="process" name="su11-2">
+					<property name="messageType" value="requestForQuote" />
+					<property name="clientEPR" value="broker" />
+					<property name="identities" >
+						<identity type="primary" >
+							<token name="id" locator="//@id" />
+							<token name="supplierDesc" locator="//@supplierDesc" />
+						</identity>
+					</property>
+				</action>
+				<action class="org.jboss.soa.overlord.samples.jbossesb.supplier.SetQuoteMessageAction" name="su11-3">
+				</action>			
+				<action class="org.jboss.soa.overlord.jbossesb.actions.SendMessageAction"
+							process="process" name="su11-4">
+					<property name="messageType" value="quote" />
+					<property name="clientEPR" value="broker" />
+					<property name="identities" >
+						<identity type="primary" >
+							<token name="id" locator="//@id" />
+							<token name="supplierDesc" locator="//@supplierDesc" />
+						</identity>
+					</property>			
+				</action>				
+			</actions>
+		</service>
+		
+		<service category="ESBBroker.Suppliers" name="Supplier1.main.2" description="">
+			<listeners>
+				<jms-listener name="SupplierServiceListener12"
+							  busidref="SupplierService12"
+							  maxThreads="1"/>							  
+			</listeners>
+			<actions mep="OneWay">
+				<action class="org.jboss.soa.overlord.jbossesb.actions.CreateSessionAction"
+							process="process" name="su12-1">
+					<property name="session" value="org.jboss.soa.overlord.samples.jbossesb.supplier.SupplierMain" />
+				</action>
+				<action class="org.jboss.soa.overlord.jbossesb.actions.ReceiveMessageAction"
+							process="process" name="su12-2">
+					<property name="messageType" value="orderConfirmed" />
+					<property name="clientEPR" value="broker" />
+					<property name="identities" >
+						<identity type="primary" >
+							<token name="id" locator="//@id" />
+							<token name="supplierDesc" locator="//@supplierDesc" />
+						</identity>
+					</property>
+				</action>
+				<action class="org.jboss.soa.overlord.samples.jbossesb.supplier.SetOrderConfirmResponseAction" name="su12-3">
+				</action>			
+				<action class="org.jboss.soa.overlord.jbossesb.actions.SendMessageAction"
+							process="process" name="su12-4">
+					<property name="messageType" value="bookingReference" />
+					<property name="clientEPR" value="broker" />
+					<property name="identities" >
+						<identity type="primary" >
+							<token name="id" locator="//@id" />
+							<token name="supplierDesc" locator="//@supplierDesc" />
+						</identity>
+					</property>			
+				</action>				
+			</actions>
+		</service>
+		
+	</services>		
+</jbossesb>

Added: cdl/trunk/samples/jbossesb/supplier/src/main/resources/jbmq-queue-service.xml
===================================================================
--- cdl/trunk/samples/jbossesb/supplier/src/main/resources/jbmq-queue-service.xml	                        (rev 0)
+++ cdl/trunk/samples/jbossesb/supplier/src/main/resources/jbmq-queue-service.xml	2008-08-12 11:23:21 UTC (rev 229)
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<server>
+
+<mbean code="org.jboss.mq.server.jmx.Queue"
+	 name="jboss.esb.sample.broker.destination:service=Queue,name=esb-loan-supplier1">
+  <depends optional-attribute-name="DestinationManager">
+  	jboss.mq:service=DestinationManager
+  </depends>
+</mbean>
+
+<mbean code="org.jboss.mq.server.jmx.Queue"
+	 name="jboss.esb.sample.broker.destination:service=Queue,name=esb-loan-supplier11">
+  <depends optional-attribute-name="DestinationManager">
+  	jboss.mq:service=DestinationManager
+  </depends>
+</mbean>
+	
+<mbean code="org.jboss.mq.server.jmx.Queue"
+	 name="jboss.esb.sample.broker.destination:service=Queue,name=esb-loan-supplier12">
+  <depends optional-attribute-name="DestinationManager">
+  	jboss.mq:service=DestinationManager
+  </depends>
+</mbean>
+	
+</server>

Added: cdl/trunk/samples/jbossesb/supplier/src/main/resources/log4j.xml
===================================================================
--- cdl/trunk/samples/jbossesb/supplier/src/main/resources/log4j.xml	                        (rev 0)
+++ cdl/trunk/samples/jbossesb/supplier/src/main/resources/log4j.xml	2008-08-12 11:23:21 UTC (rev 229)
@@ -0,0 +1,126 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE log4j:configuration SYSTEM "log4j.dtd">
+
+<!-- ===================================================================== -->
+<!--                                                                       -->
+<!--  Log4j Configuration                                                  -->
+<!--                                                                       -->
+<!-- ===================================================================== -->
+
+<!--
+   | For more configuration infromation and examples see the Jakarta Log4j
+   | owebsite: http://jakarta.apache.org/log4j
+ -->
+
+<log4j:configuration xmlns:log4j="http://jakarta.apache.org/log4j/" debug="false">
+
+   <!-- ================================= -->
+   <!-- Preserve messages in a local file -->
+   <!-- ================================= -->
+
+   <!-- A time/date based rolling appender -->
+   <appender name="FILE" class="org.apache.log4j.FileAppender">
+      <!--errorHandler class="org.jboss.logging.util.OnlyOnceErrorHandler"/-->
+      <param name="File" value="./supplier.log"/>
+      <param name="Append" value="false"/>
+
+      <!-- Rollover at midnight each day -->
+      <param name="DatePattern" value="'.'yyyy-MM-dd"/>
+
+      <!-- Rollover at the top of each hour
+      <param name="DatePattern" value="'.'yyyy-MM-dd-HH"/>
+      -->
+
+      <layout class="org.apache.log4j.PatternLayout">
+         <!-- The default pattern: Date Priority [Category] Message\n -->
+         <param name="ConversionPattern" value="%d %-5p [%c] %m%n"/>
+
+         <!-- The full pattern: Date MS Priority [Category] (Thread:NDC) Message\n
+         <param name="ConversionPattern" value="%d %-5r %-5p [%c] (%t:%x) %m%n"/>
+          -->
+      </layout>
+   </appender>
+
+
+   <!-- ============================== -->
+   <!-- Append messages to the console -->
+   <!-- ============================== -->
+
+   <appender name="CONSOLE" class="org.apache.log4j.ConsoleAppender">
+      <!--errorHandler class="org.jboss.logging.util.OnlyOnceErrorHandler"/-->
+      <param name="Target" value="System.out"/>
+
+      <layout class="org.apache.log4j.PatternLayout">
+         <!-- The default pattern: Date Priority [Category] Message\n -->
+         <param name="ConversionPattern" value="%d{ABSOLUTE} %-5p [%c{1}] %m%n"/>
+      </layout>
+   </appender>
+
+   
+   <!-- ================ -->
+   <!-- Limit categories -->
+   <!-- ================ -->
+
+   <!-- Limit the org.apache category to INFO as its DEBUG is verbose -->
+   <category name="org.apache">
+      <priority value="INFO"/>
+   </category>
+
+   <!-- Limit the org.jboss.serial (jboss-serialization) to INFO as its DEBUG is verbose -->
+   <category name="org.jboss.serial">
+      <priority value="INFO"/>
+   </category>
+
+   <!-- Limit the org.jgroups category to WARN as its INFO is verbose -->
+   <category name="org.jgroups">
+      <priority value="WARN"/>
+   </category>
+
+   <!-- Limit the jacorb category to WARN as its INFO is verbose -->
+   <category name="jacorb">
+      <priority value="WARN"/>
+   </category>
+   
+
+   <!-- Limit the JSR77 categories -->
+   <category name="org.jboss.management">
+      <priority value="INFO"/>
+   </category>
+
+   <!-- Limit Axis based webservice category -->
+   <category name="org.jboss.webservice">
+      <priority value="DEBUG"/>
+   </category>
+   <category name="org.jboss.axis">
+      <priority value="INFO"/>
+   </category>
+
+   <category name="org.milyn">
+      <priority value="INFO"/>
+   </category>
+   <category name="org.milyn.delivery.SmooksXML">
+      <priority value="INFO"/>
+   </category>
+   <category name="org.milyn.delivery.serialize.Serializer">
+      <priority value="INFO"/>
+   </category>
+   <category name="org.milyn.cdr.XMLConfigDigester">
+      <priority value="INFO"/>
+   </category>
+	
+	<category name="org.jboss.soa.overlord">
+		<priority value="DEBUG" />
+	</category>
+
+   <!-- ======================= -->
+   <!-- Setup the Root category -->
+   <!-- ======================= -->
+
+   <root>
+      <priority value="INFO" />
+      <appender-ref ref="CONSOLE"/>
+      <appender-ref ref="FILE"/>
+   </root>
+
+
+</log4j:configuration>




More information about the overlord-commits mailing list