[overlord-commits] Overlord SVN: r793 - in cdl/trunk/samples/jbossesb: brokerage/broker/src and 23 other directories.

overlord-commits at lists.jboss.org overlord-commits at lists.jboss.org
Fri Aug 21 06:10:52 EDT 2009


Author: jeff.yuchang
Date: 2009-08-21 06:10:51 -0400 (Fri, 21 Aug 2009)
New Revision: 793

Added:
   cdl/trunk/samples/jbossesb/brokerage/broker/src/main/java/org/jboss/savara/examples/
   cdl/trunk/samples/jbossesb/brokerage/broker/src/main/java/org/jboss/savara/examples/broker/
   cdl/trunk/samples/jbossesb/brokerage/broker/src/main/java/org/jboss/savara/examples/broker/MemoryEPRStorage.java
   cdl/trunk/samples/jbossesb/brokerage/broker/src/main/java/org/jboss/savara/examples/broker/MemoryStore.java
   cdl/trunk/samples/jbossesb/brokerage/broker/src/main/java/org/jboss/savara/examples/broker/Quote.java
   cdl/trunk/samples/jbossesb/brokerage/broker/src/main/java/org/jboss/savara/examples/broker/ResetMemoryStoreAction.java
   cdl/trunk/samples/jbossesb/brokerage/broker/src/main/java/org/jboss/savara/examples/broker/SendReqForQuoteDecision.java
   cdl/trunk/samples/jbossesb/brokerage/broker/src/main/java/org/jboss/savara/examples/broker/SetCreditCheckRequestMessageAction.java
   cdl/trunk/samples/jbossesb/brokerage/broker/src/main/java/org/jboss/savara/examples/broker/SetOrderConfirmRequestAction.java
   cdl/trunk/samples/jbossesb/brokerage/broker/src/main/java/org/jboss/savara/examples/broker/SetOrderRejectMessageAction.java
   cdl/trunk/samples/jbossesb/brokerage/broker/src/main/java/org/jboss/savara/examples/broker/SetQuoteAction.java
   cdl/trunk/samples/jbossesb/brokerage/broker/src/main/java/org/jboss/savara/examples/broker/SetQuotesListAction.java
   cdl/trunk/samples/jbossesb/brokerage/broker/src/main/java/org/jboss/savara/examples/broker/SetRequestQuoteMessageAction.java
   cdl/trunk/samples/jbossesb/brokerage/broker/src/scripts/
   cdl/trunk/samples/jbossesb/brokerage/broker/src/scripts/esb-assembly.xml
   cdl/trunk/samples/jbossesb/brokerage/supplier/src/main/java/org/jboss/savara/examples/
   cdl/trunk/samples/jbossesb/brokerage/supplier/src/main/java/org/jboss/savara/examples/supplier/
   cdl/trunk/samples/jbossesb/brokerage/supplier/src/main/java/org/jboss/savara/examples/supplier/MemoryEPRStorage.java
   cdl/trunk/samples/jbossesb/brokerage/supplier/src/main/java/org/jboss/savara/examples/supplier/SetOrderConfirmResponseAction.java
   cdl/trunk/samples/jbossesb/brokerage/supplier/src/main/java/org/jboss/savara/examples/supplier/SetQuoteMessageAction.java
   cdl/trunk/samples/jbossesb/brokerage/supplier/src/scripts/
   cdl/trunk/samples/jbossesb/brokerage/supplier/src/scripts/esb-assembly.xml
   cdl/trunk/samples/jbossesb/common/creditAgency/src/main/java/org/jboss/savara/examples/purchasegoods/
   cdl/trunk/samples/jbossesb/common/creditAgency/src/main/java/org/jboss/savara/examples/purchasegoods/PurchaseGoodsProcess.java
Removed:
   cdl/trunk/samples/jbossesb/brokerage/broker/src/main/java/org/jboss/savara/samples/
   cdl/trunk/samples/jbossesb/brokerage/broker/src/main/java/org/jboss/soa/
   cdl/trunk/samples/jbossesb/brokerage/supplier/src/main/java/org/jboss/savara/samples/
   cdl/trunk/samples/jbossesb/brokerage/supplier/src/main/java/org/jboss/soa/
Modified:
   cdl/trunk/samples/jbossesb/brokerage/broker/pom.xml
   cdl/trunk/samples/jbossesb/brokerage/broker/src/main/resources/META-INF/deployment.xml
   cdl/trunk/samples/jbossesb/brokerage/broker/src/main/resources/META-INF/jboss-esb.xml
   cdl/trunk/samples/jbossesb/brokerage/broker/src/main/resources/jbm-queue-service.xml
   cdl/trunk/samples/jbossesb/brokerage/broker/src/main/resources/jbmq-queue-service.xml
   cdl/trunk/samples/jbossesb/brokerage/models/ESBBroker.cdm
   cdl/trunk/samples/jbossesb/brokerage/supplier/pom.xml
   cdl/trunk/samples/jbossesb/brokerage/supplier/src/main/resources/META-INF/deployment.xml
   cdl/trunk/samples/jbossesb/brokerage/supplier/src/main/resources/META-INF/jboss-esb.xml
   cdl/trunk/samples/jbossesb/brokerage/supplier/src/main/resources/jbm-queue-service.xml
   cdl/trunk/samples/jbossesb/brokerage/supplier/src/main/resources/jbmq-queue-service.xml
   cdl/trunk/samples/jbossesb/client/src/org/jboss/savara/examples/client/BuyerClient.java
   cdl/trunk/samples/jbossesb/common/creditAgency/src/main/java/org/jboss/savara/examples/wsdl/CreditAgencyService.java
   cdl/trunk/samples/jbossesb/common/creditAgency/src/main/resources/META-INF/jboss-esb.xml
   cdl/trunk/samples/jbossesb/purchasing/store/src/main/java/org/jboss/savara/examples/store/SetBuyFailedMessageAction.java
   cdl/trunk/samples/jbossesb/purchasing/store/src/main/java/org/jboss/savara/examples/store/SetBuyResponseMessageAction.java
   cdl/trunk/samples/jbossesb/purchasing/store/src/main/java/org/jboss/savara/examples/store/SetCreditCheckRequestMessageAction.java
Log:
* SOAG-114


Modified: cdl/trunk/samples/jbossesb/brokerage/broker/pom.xml
===================================================================
--- cdl/trunk/samples/jbossesb/brokerage/broker/pom.xml	2009-08-21 07:55:37 UTC (rev 792)
+++ cdl/trunk/samples/jbossesb/brokerage/broker/pom.xml	2009-08-21 10:10:51 UTC (rev 793)
@@ -4,7 +4,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>org.jboss.savara.samples</groupId>
 	<artifactId>jbossesb-broker</artifactId>
-	<packaging>jboss-esb</packaging>
+	<packaging>jar</packaging>
 	<name>Savara::Samples::Broker</name>
 	<url>http://www.jboss.org/overlord</url>
 	
@@ -18,13 +18,11 @@
 			<dependency>
 				<groupId>log4j</groupId>
 				<artifactId>log4j</artifactId>
-				<version>${log4j.version}</version>
 				<scope>provided</scope>
 			</dependency>
 			<dependency>
-				<groupId>org.jboss.savara.runtime</groupId>
-				<artifactId>jbossesb</artifactId>
-				<version>${project.version}</version>
+				<groupId>org.jboss.savara</groupId>
+				<artifactId>savara-runtime-jbossesb</artifactId>
 				<scope>provided</scope>
 			</dependency>
 		</dependencies>
@@ -32,26 +30,25 @@
 		<build>
 		    <finalName>broker</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/broker-stateless.esb" todir="${deploy.dir}" overwrite="true" /-->
-			      </tasks>
-			    </configuration>
-			    <goals>
-			      <goal>run</goal>
-			    </goals>
-			  </execution>
-
-			</executions>
-		      </plugin>		      
+		    <plugin>
+		        <artifactId>maven-assembly-plugin</artifactId>
+		         <executions> 
+		          <execution>
+		            <id>esb</id>
+		            <phase>package</phase>
+		            <goals>
+		              <goal>single</goal>
+		            </goals>
+		            <configuration>
+		              <finalName>broker.esb</finalName>
+		              <appendAssemblyId>false</appendAssemblyId>
+		              <descriptors>
+		                <descriptor>src/scripts/esb-assembly.xml</descriptor>
+		              </descriptors>
+		            </configuration>
+		          </execution>		          
+		         </executions>
+	         </plugin>		      
 		    </plugins>
 		</build>
 		

Added: cdl/trunk/samples/jbossesb/brokerage/broker/src/main/java/org/jboss/savara/examples/broker/MemoryEPRStorage.java
===================================================================
--- cdl/trunk/samples/jbossesb/brokerage/broker/src/main/java/org/jboss/savara/examples/broker/MemoryEPRStorage.java	                        (rev 0)
+++ cdl/trunk/samples/jbossesb/brokerage/broker/src/main/java/org/jboss/savara/examples/broker/MemoryEPRStorage.java	2009-08-21 10:10:51 UTC (rev 793)
@@ -0,0 +1,47 @@
+/*
+ * 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.savara.examples.broker;
+
+import java.util.HashMap;
+import java.util.Map;
+
+import org.jboss.savara.jbossesb.EPRStore;
+import org.jboss.soa.esb.addressing.EPR;
+import org.jboss.soa.esb.message.Message;
+
+
+/**
+ * @author <a href="mailto:cyu at redhat.com">Jeff Yu</a>
+ *
+ */
+public class MemoryEPRStorage implements EPRStore {
+	
+	private static final Map<String, EPR> storage = new HashMap<String, EPR>();
+	
+	public EPR getEPRByRole(String roleName, Message message) {
+		return storage.get(roleName);
+	}
+
+	public void registerRole(String roleName, Message message) {
+		EPR epr = message.getHeader().getCall().getReplyTo();
+		storage.put(roleName, epr);
+	}
+
+}

Added: cdl/trunk/samples/jbossesb/brokerage/broker/src/main/java/org/jboss/savara/examples/broker/MemoryStore.java
===================================================================
--- cdl/trunk/samples/jbossesb/brokerage/broker/src/main/java/org/jboss/savara/examples/broker/MemoryStore.java	                        (rev 0)
+++ cdl/trunk/samples/jbossesb/brokerage/broker/src/main/java/org/jboss/savara/examples/broker/MemoryStore.java	2009-08-21 10:10:51 UTC (rev 793)
@@ -0,0 +1,46 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2008, JBoss Inc., and others contributors as indicated 
+ * by the @authors tag. All rights reserved. 
+ * See the copyright.txt in the distribution for a
+ * full listing of individual contributors. 
+ * This copyrighted material is made available to anyone wishing to use,
+ * modify, copy, or redistribute it subject to the terms and conditions
+ * of the GNU Lesser General Public License, v. 2.1.
+ * This program is distributed in the hope that it will be useful, but WITHOUT A 
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A 
+ * PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
+ * You should have received a copy of the GNU Lesser General Public License,
+ * v.2.1 along with this distribution; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, 
+ * MA  02110-1301, USA.
+ * 
+ * (C) 2008,
+ */
+package org.jboss.savara.examples.broker;
+
+/**
+ * @author <a href="mailto:cyu at redhat.com">Jeff Yu</a>
+ *
+ */
+public class MemoryStore {
+	
+	private static int counter = 0;
+	
+	public static void increaseCounter() {
+		counter = counter + 1;
+	}
+	
+	public static void decreaseCounter() {
+		counter = counter - 1;
+	}
+	
+	public static int getCounter() {
+		return counter;
+	}
+	
+	public static void reset() {
+		counter = 0;
+	}
+
+}

Added: cdl/trunk/samples/jbossesb/brokerage/broker/src/main/java/org/jboss/savara/examples/broker/Quote.java
===================================================================
--- cdl/trunk/samples/jbossesb/brokerage/broker/src/main/java/org/jboss/savara/examples/broker/Quote.java	                        (rev 0)
+++ cdl/trunk/samples/jbossesb/brokerage/broker/src/main/java/org/jboss/savara/examples/broker/Quote.java	2009-08-21 10:10:51 UTC (rev 793)
@@ -0,0 +1,50 @@
+/*
+ * 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.savara.examples.broker;
+
+import java.io.Serializable;
+
+
+
+public class Quote implements Serializable {
+	
+	private static final long serialVersionUID = 3234324947672128469L;
+
+	private String value;
+	
+	private String serviceDescription;
+
+	public String getServiceDescription() {
+		return serviceDescription;
+	}
+
+	public void setServiceDescription(String serviceDescription) {
+		this.serviceDescription = serviceDescription;
+	}
+
+	public String getValue() {
+		return value;
+	}
+
+	public void setValue(String value) {
+		this.value = value;
+	}
+	
+}

Added: cdl/trunk/samples/jbossesb/brokerage/broker/src/main/java/org/jboss/savara/examples/broker/ResetMemoryStoreAction.java
===================================================================
--- cdl/trunk/samples/jbossesb/brokerage/broker/src/main/java/org/jboss/savara/examples/broker/ResetMemoryStoreAction.java	                        (rev 0)
+++ cdl/trunk/samples/jbossesb/brokerage/broker/src/main/java/org/jboss/savara/examples/broker/ResetMemoryStoreAction.java	2009-08-21 10:10:51 UTC (rev 793)
@@ -0,0 +1,43 @@
+/*
+ * 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.savara.examples.broker;
+
+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;
+
+public class ResetMemoryStoreAction extends AbstractActionLifecycle {
+	
+	private static Logger logger = Logger.getLogger(ResetMemoryStoreAction.class);
+	
+	private ConfigTree config;
+	
+	public ResetMemoryStoreAction(ConfigTree config) {
+		this.config = config;
+	}
+	
+	public Message process(Message message) throws Exception{
+		MemoryStore.reset();
+		logger.info("Reseting the memory store counter to 0");
+		return(message);
+	}
+	
+}
\ No newline at end of file

Added: cdl/trunk/samples/jbossesb/brokerage/broker/src/main/java/org/jboss/savara/examples/broker/SendReqForQuoteDecision.java
===================================================================
--- cdl/trunk/samples/jbossesb/brokerage/broker/src/main/java/org/jboss/savara/examples/broker/SendReqForQuoteDecision.java	                        (rev 0)
+++ cdl/trunk/samples/jbossesb/brokerage/broker/src/main/java/org/jboss/savara/examples/broker/SendReqForQuoteDecision.java	2009-08-21 10:10:51 UTC (rev 793)
@@ -0,0 +1,48 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2008, JBoss Inc., and others contributors as indicated 
+ * by the @authors tag. All rights reserved. 
+ * See the copyright.txt in the distribution for a
+ * full listing of individual contributors. 
+ * This copyrighted material is made available to anyone wishing to use,
+ * modify, copy, or redistribute it subject to the terms and conditions
+ * of the GNU Lesser General Public License, v. 2.1.
+ * This program is distributed in the hope that it will be useful, but WITHOUT A 
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A 
+ * PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
+ * You should have received a copy of the GNU Lesser General Public License,
+ * v.2.1 along with this distribution; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, 
+ * MA  02110-1301, USA.
+ * 
+ * (C) 2008,
+ */
+package org.jboss.savara.examples.broker;
+
+import org.apache.log4j.Logger;
+import org.jboss.savara.jbossesb.Decision;
+import org.jboss.soa.esb.message.Message;
+
+/**
+ * @author <a href="mailto:cyu at redhat.com">Jeff Yu</a>
+ *
+ */
+public class SendReqForQuoteDecision implements Decision {
+	
+	private final int DEFAULT = 1;
+	
+	private Logger logger = Logger.getLogger(SendReqForQuoteDecision.class);
+	
+	/* (non-Javadoc)
+	 * @see org.jboss.soa.overlord.jbossesb.Decision#executeDecision(org.jboss.soa.esb.message.Message)
+	 */
+	public boolean executeDecision(Message message) {
+		if (DEFAULT > MemoryStore.getCounter()) {
+			logger.info("The decision is true");
+			return true;
+		}
+		logger.info("The decision is false");
+		return false;
+	}
+
+}

Added: cdl/trunk/samples/jbossesb/brokerage/broker/src/main/java/org/jboss/savara/examples/broker/SetCreditCheckRequestMessageAction.java
===================================================================
--- cdl/trunk/samples/jbossesb/brokerage/broker/src/main/java/org/jboss/savara/examples/broker/SetCreditCheckRequestMessageAction.java	                        (rev 0)
+++ cdl/trunk/samples/jbossesb/brokerage/broker/src/main/java/org/jboss/savara/examples/broker/SetCreditCheckRequestMessageAction.java	2009-08-21 10:10:51 UTC (rev 793)
@@ -0,0 +1,50 @@
+/*
+ * 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.savara.examples.broker;
+
+import org.apache.log4j.Logger;
+import org.jboss.savara.internal.jbossesb.utils.XMLUtils;
+import org.jboss.soa.esb.actions.AbstractActionLifecycle;
+import org.jboss.soa.esb.helpers.ConfigTree;
+import org.jboss.soa.esb.message.Message;
+import org.w3c.dom.Node;
+
+public class SetCreditCheckRequestMessageAction extends AbstractActionLifecycle {
+	
+	private static Logger logger = Logger.getLogger(SetCreditCheckRequestMessageAction.class);
+	
+	private ConfigTree config;
+	
+	public SetCreditCheckRequestMessageAction(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();
+		message.getBody().add("<CreditCheckRequest id=\"" + idValue +"\"></CreditCheckRequest>");
+		
+		logger.info("Updated credit check request message: "+message.getBody().get());
+		
+		return(message);
+	}
+	
+}
\ No newline at end of file

Added: cdl/trunk/samples/jbossesb/brokerage/broker/src/main/java/org/jboss/savara/examples/broker/SetOrderConfirmRequestAction.java
===================================================================
--- cdl/trunk/samples/jbossesb/brokerage/broker/src/main/java/org/jboss/savara/examples/broker/SetOrderConfirmRequestAction.java	                        (rev 0)
+++ cdl/trunk/samples/jbossesb/brokerage/broker/src/main/java/org/jboss/savara/examples/broker/SetOrderConfirmRequestAction.java	2009-08-21 10:10:51 UTC (rev 793)
@@ -0,0 +1,55 @@
+/*
+ * 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.savara.examples.broker;
+
+import org.apache.log4j.Logger;
+import org.jboss.savara.internal.jbossesb.utils.XMLUtils;
+import org.jboss.soa.esb.actions.AbstractActionLifecycle;
+import org.jboss.soa.esb.helpers.ConfigTree;
+import org.jboss.soa.esb.message.Message;
+import org.w3c.dom.Node;
+
+/**
+ * @author jeffyu
+ *
+ */
+public class SetOrderConfirmRequestAction extends AbstractActionLifecycle {
+	
+	public static Logger logger = Logger.getLogger(SetOrderConfirmRequestAction.class);
+	
+	private ConfigTree config;
+	
+	public SetOrderConfirmRequestAction(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();
+		
+		message.getBody().add("<orderConfirmed id=\"" + idValue +"\" supplierDesc=\"{http://www.jboss.org/overlord/loanBroker}Supplier1\" quoteValue=\"10\">" +
+				"</orderConfirmed>");
+		
+		logger.info(message.getBody().get());
+		
+		return message;
+	}
+
+}

Added: cdl/trunk/samples/jbossesb/brokerage/broker/src/main/java/org/jboss/savara/examples/broker/SetOrderRejectMessageAction.java
===================================================================
--- cdl/trunk/samples/jbossesb/brokerage/broker/src/main/java/org/jboss/savara/examples/broker/SetOrderRejectMessageAction.java	                        (rev 0)
+++ cdl/trunk/samples/jbossesb/brokerage/broker/src/main/java/org/jboss/savara/examples/broker/SetOrderRejectMessageAction.java	2009-08-21 10:10:51 UTC (rev 793)
@@ -0,0 +1,54 @@
+/*
+ * 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.savara.examples.broker;
+
+import org.apache.log4j.Logger;
+import org.jboss.savara.internal.jbossesb.utils.XMLUtils;
+import org.jboss.soa.esb.actions.AbstractActionLifecycle;
+import org.jboss.soa.esb.helpers.ConfigTree;
+import org.jboss.soa.esb.message.Message;
+import org.w3c.dom.Node;
+
+/**
+ * @author jeffyu
+ *
+ */
+public class SetOrderRejectMessageAction extends AbstractActionLifecycle {
+	
+	public static Logger logger = Logger.getLogger(SetOrderRejectMessageAction.class);
+	
+	private ConfigTree config;
+	
+	public SetOrderRejectMessageAction(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();
+		
+		message.getBody().add("<orderRejected id=\"" + idValue + "\">Credit Card is invalid!</orderRejected>");
+		
+		logger.info(message.getBody().get());
+		
+		return message;
+	}
+
+}

Added: cdl/trunk/samples/jbossesb/brokerage/broker/src/main/java/org/jboss/savara/examples/broker/SetQuoteAction.java
===================================================================
--- cdl/trunk/samples/jbossesb/brokerage/broker/src/main/java/org/jboss/savara/examples/broker/SetQuoteAction.java	                        (rev 0)
+++ cdl/trunk/samples/jbossesb/brokerage/broker/src/main/java/org/jboss/savara/examples/broker/SetQuoteAction.java	2009-08-21 10:10:51 UTC (rev 793)
@@ -0,0 +1,73 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2008, JBoss Inc., and others contributors as indicated 
+ * by the @authors tag. All rights reserved. 
+ * See the copyright.txt in the distribution for a
+ * full listing of individual contributors. 
+ * This copyrighted material is made available to anyone wishing to use,
+ * modify, copy, or redistribute it subject to the terms and conditions
+ * of the GNU Lesser General Public License, v. 2.1.
+ * This program is distributed in the hope that it will be useful, but WITHOUT A 
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A 
+ * PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
+ * You should have received a copy of the GNU Lesser General Public License,
+ * v.2.1 along with this distribution; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, 
+ * MA  02110-1301, USA.
+ * 
+ * (C) 2008,
+ */
+package org.jboss.savara.examples.broker;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.apache.log4j.Logger;
+import org.jboss.savara.internal.jbossesb.utils.XMLUtils;
+import org.jboss.soa.esb.actions.AbstractActionLifecycle;
+import org.jboss.soa.esb.helpers.ConfigTree;
+import org.jboss.soa.esb.message.Message;
+import org.w3c.dom.Node;
+
+/**
+ * 
+ * @author <a href="mailto:cyu at redhat.com">Jeff Yu</a>
+ *
+ */
+public class SetQuoteAction extends AbstractActionLifecycle {
+	
+	private Logger logger = Logger.getLogger(SetQuoteAction.class);
+	
+	private ConfigTree config;
+	
+	public SetQuoteAction(ConfigTree config) {
+		this.config = config;
+	}
+	
+	public Message process(Message message) throws Exception {
+		
+		Node node = XMLUtils.getNode((String)message.getBody().get());
+		String quoteValue = node.getTextContent();
+		String desc = node.getAttributes().getNamedItem("supplierDesc").getNodeValue();
+	
+		List<Quote> quotes = (List<Quote>)message.getProperties().getProperty("quotes");
+		if (quotes == null) {
+			quotes = new ArrayList<Quote>();
+		}
+		
+		Quote quote = new Quote();
+		quote.setServiceDescription(desc);
+		quote.setValue(quoteValue);
+		
+		quotes.add(quote);
+		
+		message.getProperties().setProperty("quotes", quotes);
+		
+		MemoryStore.increaseCounter();
+		
+		logger.info("set quote message :[" + node + "]");
+		
+		return message;
+	}
+	
+}

Added: cdl/trunk/samples/jbossesb/brokerage/broker/src/main/java/org/jboss/savara/examples/broker/SetQuotesListAction.java
===================================================================
--- cdl/trunk/samples/jbossesb/brokerage/broker/src/main/java/org/jboss/savara/examples/broker/SetQuotesListAction.java	                        (rev 0)
+++ cdl/trunk/samples/jbossesb/brokerage/broker/src/main/java/org/jboss/savara/examples/broker/SetQuotesListAction.java	2009-08-21 10:10:51 UTC (rev 793)
@@ -0,0 +1,70 @@
+/*
+ * 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.savara.examples.broker;
+
+import java.util.List;
+
+import org.apache.log4j.Logger;
+import org.jboss.savara.internal.jbossesb.utils.XMLUtils;
+import org.jboss.soa.esb.actions.AbstractActionLifecycle;
+import org.jboss.soa.esb.helpers.ConfigTree;
+import org.jboss.soa.esb.message.Message;
+import org.w3c.dom.Node;
+
+/**
+ * @author jeffyu
+ *
+ */
+public class SetQuotesListAction extends AbstractActionLifecycle {
+	
+	private Logger logger = Logger.getLogger(SetQuotesListAction.class);
+	
+	private ConfigTree config;
+	
+	public SetQuotesListAction(ConfigTree config) {
+		this.config = config;
+	}
+	
+	public Message process(Message message) throws Exception {
+		
+		List<Quote> quotes = (List<Quote>)message.getProperties().getProperty("quotes");
+		
+		Node node = XMLUtils.getNode((String)message.getBody().get());
+		String idValue = node.getAttributes().getNamedItem("id").getNodeValue();
+		
+		StringBuffer sbuffer = new StringBuffer();
+		sbuffer.append("<quoteList id=\"" + idValue + "\">");
+		
+		for(Quote quote : quotes) {
+			sbuffer.append("<quote supplierDesc=\"" + quote.getServiceDescription() + "\">");
+			sbuffer.append(quote.getValue());
+			sbuffer.append("</quote>");
+		}
+		
+		sbuffer.append("</quoteList>");
+		
+		message.getBody().add(sbuffer.toString());
+		
+		logger.info("set quote list message :[" + sbuffer.toString() + "]");
+		
+		return message;
+	}
+	
+}

Added: cdl/trunk/samples/jbossesb/brokerage/broker/src/main/java/org/jboss/savara/examples/broker/SetRequestQuoteMessageAction.java
===================================================================
--- cdl/trunk/samples/jbossesb/brokerage/broker/src/main/java/org/jboss/savara/examples/broker/SetRequestQuoteMessageAction.java	                        (rev 0)
+++ cdl/trunk/samples/jbossesb/brokerage/broker/src/main/java/org/jboss/savara/examples/broker/SetRequestQuoteMessageAction.java	2009-08-21 10:10:51 UTC (rev 793)
@@ -0,0 +1,56 @@
+/*
+ * 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.savara.examples.broker;
+
+import org.apache.log4j.Logger;
+import org.jboss.savara.internal.jbossesb.utils.XMLUtils;
+import org.jboss.soa.esb.actions.AbstractActionLifecycle;
+import org.jboss.soa.esb.helpers.ConfigTree;
+import org.jboss.soa.esb.message.Message;
+import org.w3c.dom.Node;
+
+/**
+ * @author jeffyu
+ *
+ */
+public class SetRequestQuoteMessageAction extends AbstractActionLifecycle {
+	
+	public static Logger logger = Logger.getLogger(SetRequestQuoteMessageAction.class);
+	
+	private ConfigTree config;
+	
+	public SetRequestQuoteMessageAction(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 serviceDescription = (String)message.getProperties().getProperty("serviceDescriptionName");
+		
+		message.getBody().add("<requestForQuote id=\"" + idValue +"\" supplierDesc=\"" + serviceDescription+ "\" ></requestForQuote>");
+		
+		logger.info("Set 'requestForQuote' : " + message.getBody().get());
+		
+		return message;
+	}
+
+}

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	2009-08-21 07:55:37 UTC (rev 792)
+++ cdl/trunk/samples/jbossesb/brokerage/broker/src/main/resources/META-INF/deployment.xml	2009-08-21 10:10:51 UTC (rev 793)
@@ -1,17 +1,18 @@
 <jbossesb-deployment>
-	<depends>jboss.esb:deployment=overlord-cdl-runtime.esb</depends>
-	<depends>org.pi4soa.esbbroker.esbbroker.destination:service=Queue,name=org_pi4soa_esbbroker_esbbroker_ESBBrokerProcess_Broker__2</depends>
-	<depends>org.pi4soa.esbbroker.esbbroker.destination:service=Queue,name=org_pi4soa_esbbroker_esbbroker_ESBBrokerProcess_Broker__1</depends>
-	<depends>org.pi4soa.esbbroker.esbbroker.destination:service=Queue,name=org_pi4soa_esbbroker_esbbroker_ESBBrokerProcess_Broker__12</depends>
-	<depends>org.pi4soa.esbbroker.esbbroker.destination:service=Queue,name=org_pi4soa_esbbroker_esbbroker_checkCredit</depends>
-	<depends>org.pi4soa.esbbroker.esbbroker.destination:service=Queue,name=org_pi4soa_esbbroker_esbbroker_ESBBrokerProcess_Broker__11</depends>
-	<depends>org.pi4soa.esbbroker.esbbroker.destination:service=Queue,name=org_pi4soa_esbbroker_esbbroker_ESBBrokerProcess_Broker__10</depends>
-	<depends>org.pi4soa.esbbroker.esbbroker.destination:service=Queue,name=org_pi4soa_esbbroker_esbbroker_ESBBrokerProcess_Broker__9</depends>
-	<depends>org.pi4soa.esbbroker.esbbroker.destination:service=Queue,name=org_pi4soa_esbbroker_esbbroker_ESBBrokerProcess_Broker__8</depends>
-	<depends>org.pi4soa.esbbroker.esbbroker.destination:service=Queue,name=org_pi4soa_esbbroker_esbbroker_ESBBrokerProcess_Broker</depends>
-	<depends>org.pi4soa.esbbroker.esbbroker.destination:service=Queue,name=org_pi4soa_esbbroker_esbbroker_ESBBrokerProcess_Broker__7</depends>
-	<depends>org.pi4soa.esbbroker.esbbroker.destination:service=Queue,name=org_pi4soa_esbbroker_esbbroker_ESBBrokerProcess_Broker__6</depends>
-	<depends>org.pi4soa.esbbroker.esbbroker.destination:service=Queue,name=org_pi4soa_esbbroker_esbbroker_ESBBrokerProcess_Broker__5</depends>
-	<depends>org.pi4soa.esbbroker.esbbroker.destination:service=Queue,name=org_pi4soa_esbbroker_esbbroker_ESBBrokerProcess_Broker__4</depends>
-	<depends>org.pi4soa.esbbroker.esbbroker.destination:service=Queue,name=org_pi4soa_esbbroker_esbbroker_ESBBrokerProcess_Broker__3</depends>
+	<depends>jboss.esb:deployment=savara-runtime-jbossesb.esb</depends>
+	<depends>org.jboss.savara.examples.esbbroker.destination:service=Queue,name=org_jboss_savara_examples_esbbroker_ESBBrokerProcess_Broker__10</depends>
+	<depends>org.jboss.savara.examples.esbbroker.destination:service=Queue,name=org_jboss_savara_examples_esbbroker_ESBBrokerProcess_Broker__9</depends>
+	<depends>org.jboss.savara.examples.esbbroker.destination:service=Queue,name=org_jboss_savara_examples_esbbroker_ESBBrokerProcess_Broker__8</depends>
+	<depends>org.jboss.savara.examples.esbbroker.destination:service=Queue,name=org_jboss_savara_examples_esbbroker_ESBBrokerProcess_Broker__7</depends>
+	<depends>org.jboss.savara.examples.esbbroker.destination:service=Queue,name=org_jboss_savara_examples_esbbroker_ESBBrokerProcess_Broker__6</depends>
+	<depends>org.jboss.savara.examples.esbbroker.destination:service=Queue,name=org_jboss_savara_examples_esbbroker_ESBBrokerProcess_Broker__5</depends>
+	<depends>org.jboss.savara.examples.esbbroker.destination:service=Queue,name=org_jboss_savara_examples_esbbroker_ESBBrokerProcess_Broker__4</depends>
+	<depends>org.jboss.savara.examples.esbbroker.destination:service=Queue,name=org_jboss_savara_examples_esbbroker_ESBBrokerProcess_Broker__3</depends>
+	<depends>org.jboss.savara.examples.esbbroker.destination:service=Queue,name=org_jboss_savara_examples_esbbroker_ESBBrokerProcess_Broker__2</depends>
+	<depends>org.jboss.savara.examples.esbbroker.destination:service=Queue,name=org_jboss_savara_examples_esbbroker_ESBBrokerProcess_Broker__1</depends>
+	<depends>org.jboss.savara.examples.esbbroker.destination:service=Queue,name=org_jboss_savara_examples_esbbroker_checkCredit</depends>
+	<depends>org.jboss.savara.examples.esbbroker.destination:service=Queue,name=org_jboss_savara_examples_esbbroker_ESBBrokerProcess_Broker</depends>
+	<depends>org.jboss.savara.examples.esbbroker.destination:service=Queue,name=org_jboss_savara_examples_esbbroker_ESBBrokerProcess_Broker_reply</depends>
+	<depends>org.jboss.savara.examples.esbbroker.destination:service=Queue,name=org_jboss_savara_examples_esbbroker_ESBBrokerProcess_Broker__12</depends>
+	<depends>org.jboss.savara.examples.esbbroker.destination:service=Queue,name=org_jboss_savara_examples_esbbroker_ESBBrokerProcess_Broker__11</depends>
 </jbossesb-deployment>

Modified: cdl/trunk/samples/jbossesb/brokerage/broker/src/main/resources/META-INF/jboss-esb.xml
===================================================================
--- cdl/trunk/samples/jbossesb/brokerage/broker/src/main/resources/META-INF/jboss-esb.xml	2009-08-21 07:55:37 UTC (rev 792)
+++ cdl/trunk/samples/jbossesb/brokerage/broker/src/main/resources/META-INF/jboss-esb.xml	2009-08-21 10:10:51 UTC (rev 793)
@@ -2,229 +2,225 @@
     <providers>
         <jms-provider connection-factory="ConnectionFactory" jndi-URL="localhost" jndi-context-factory="org.jnp.interfaces.NamingContextFactory" name="JBossMQ">
             <jms-bus busid="busId1">
-                <jms-message-filter dest-name="queue/org_pi4soa_esbbroker_esbbroker_ESBBrokerProcess_Broker" dest-type="QUEUE"/>
+                <jms-message-filter dest-name="queue/org_jboss_savara_examples_esbbroker_ESBBrokerProcess_Broker" dest-type="QUEUE"/>
             </jms-bus>
             <jms-bus busid="busId2">
-                <jms-message-filter dest-name="queue/org_pi4soa_esbbroker_esbbroker_ESBBrokerProcess_Broker__1" dest-type="QUEUE"/>
+                <jms-message-filter dest-name="queue/org_jboss_savara_examples_esbbroker_ESBBrokerProcess_Broker__1" dest-type="QUEUE"/>
             </jms-bus>
             <jms-bus busid="busId3">
-                <jms-message-filter dest-name="queue/org_pi4soa_esbbroker_esbbroker_ESBBrokerProcess_Broker__2" dest-type="QUEUE"/>
+                <jms-message-filter dest-name="queue/org_jboss_savara_examples_esbbroker_ESBBrokerProcess_Broker__2" dest-type="QUEUE"/>
             </jms-bus>
             <jms-bus busid="busId4">
-                <jms-message-filter dest-name="queue/org_pi4soa_esbbroker_esbbroker_ESBBrokerProcess_Broker__3" dest-type="QUEUE"/>
+                <jms-message-filter dest-name="queue/org_jboss_savara_examples_esbbroker_ESBBrokerProcess_Broker__3" dest-type="QUEUE"/>
             </jms-bus>
             <jms-bus busid="busId5">
-                <jms-message-filter dest-name="queue/org_pi4soa_esbbroker_esbbroker_ESBBrokerProcess_Broker__4" dest-type="QUEUE"/>
+                <jms-message-filter dest-name="queue/org_jboss_savara_examples_esbbroker_ESBBrokerProcess_Broker__4" dest-type="QUEUE"/>
             </jms-bus>
             <jms-bus busid="busId6">
-                <jms-message-filter dest-name="queue/org_pi4soa_esbbroker_esbbroker_ESBBrokerProcess_Broker__5" dest-type="QUEUE"/>
+                <jms-message-filter dest-name="queue/org_jboss_savara_examples_esbbroker_ESBBrokerProcess_Broker__5" dest-type="QUEUE"/>
             </jms-bus>
             <jms-bus busid="busId7">
-                <jms-message-filter dest-name="queue/org_pi4soa_esbbroker_esbbroker_ESBBrokerProcess_Broker__6" dest-type="QUEUE"/>
+                <jms-message-filter dest-name="queue/org_jboss_savara_examples_esbbroker_ESBBrokerProcess_Broker__6" dest-type="QUEUE"/>
             </jms-bus>
             <jms-bus busid="busId8">
-                <jms-message-filter dest-name="queue/org_pi4soa_esbbroker_esbbroker_ESBBrokerProcess_Broker__7" dest-type="QUEUE"/>
+                <jms-message-filter dest-name="queue/org_jboss_savara_examples_esbbroker_ESBBrokerProcess_Broker__7" dest-type="QUEUE"/>
             </jms-bus>
             <jms-bus busid="busId9">
-                <jms-message-filter dest-name="queue/org_pi4soa_esbbroker_esbbroker_ESBBrokerProcess_Broker__8" dest-type="QUEUE"/>
+                <jms-message-filter dest-name="queue/org_jboss_savara_examples_esbbroker_ESBBrokerProcess_Broker__8" dest-type="QUEUE"/>
             </jms-bus>
             <jms-bus busid="busId10">
-                <jms-message-filter dest-name="queue/org_pi4soa_esbbroker_esbbroker_ESBBrokerProcess_Broker__9" dest-type="QUEUE"/>
+                <jms-message-filter dest-name="queue/org_jboss_savara_examples_esbbroker_ESBBrokerProcess_Broker__9" dest-type="QUEUE"/>
             </jms-bus>
             <jms-bus busid="busId11">
-                <jms-message-filter dest-name="queue/org_pi4soa_esbbroker_esbbroker_ESBBrokerProcess_Broker__10" dest-type="QUEUE"/>
+                <jms-message-filter dest-name="queue/org_jboss_savara_examples_esbbroker_ESBBrokerProcess_Broker__10" dest-type="QUEUE"/>
             </jms-bus>
             <jms-bus busid="busId12">
-                <jms-message-filter dest-name="queue/org_pi4soa_esbbroker_esbbroker_ESBBrokerProcess_Broker__11" dest-type="QUEUE"/>
+                <jms-message-filter dest-name="queue/org_jboss_savara_examples_esbbroker_ESBBrokerProcess_Broker__11" dest-type="QUEUE"/>
             </jms-bus>
             <jms-bus busid="busId13">
-                <jms-message-filter dest-name="queue/org_pi4soa_esbbroker_esbbroker_ESBBrokerProcess_Broker__12" dest-type="QUEUE"/>
+                <jms-message-filter dest-name="queue/org_jboss_savara_examples_esbbroker_ESBBrokerProcess_Broker__12" dest-type="QUEUE"/>
             </jms-bus>
             <jms-bus busid="busId14">
-                <jms-message-filter dest-name="queue/org_pi4soa_esbbroker_esbbroker_checkCredit" dest-type="QUEUE"/>
+                <jms-message-filter dest-name="queue/org_jboss_savara_examples_esbbroker_checkCredit" dest-type="QUEUE"/>
             </jms-bus>
         </jms-provider>
     </providers>
-    <services>
-        <service category="org.pi4soa.esbbroker.esbbroker" description="" name="ESBBrokerProcess_Broker">
+    <services>    
+        <service category="org.jboss.savara.examples.esbbroker" description="" name="ESBBrokerProcess_Broker">
             <listeners>
-                <jms-listener busidref="busId1" maxThreads="1" name="org.pi4soa.esbbroker.esbbroker-ESBBrokerProcess_Broker"/>
+                <jms-listener busidref="busId1" maxThreads="1" name="org.jboss.savara.examples.esbbroker-ESBBrokerProcess_Broker"/>
             </listeners>
-            <actions mep="OneWay">
+            <actions>
                 <action class="org.jboss.savara.jbossesb.actions.SwitchAction" name="ESBBrokerProcess_Broker_action_1" process="process">
-                    <property name="serviceDescriptionName" value="{org.pi4soa.esbbroker.esbbroker}ESBBrokerProcess-Broker"/>
-                    <property name="conversationType" value="overlord.cdl.samples.LoanBroker at Broker"/>
+                    <property name="serviceDescriptionName" value="{org.jboss.savara.examples.esbbroker}ESBBrokerProcess-Broker"/>
+                    <property name="conversationType" value="savara.samples.LoanBroker at Broker"/>
                     <property name="paths">
-                        <case service-category="org.pi4soa.esbbroker.esbbroker" service-name="ESBBrokerProcess_Broker__1">
+                        <case service-category="org.jboss.savara.examples.esbbroker" service-name="ESBBrokerProcess_Broker__1">
                             <message type="enquiry"/>
                         </case>
-                        <case service-category="org.pi4soa.esbbroker.esbbroker" service-name="ESBBrokerProcess_Broker__7">
+                        <case service-category="org.jboss.savara.examples.esbbroker" service-name="ESBBrokerProcess_Broker__7">
                             <event description="Event trigger to send quoteList message type(s)"/>
                         </case>
-                        <case service-category="org.pi4soa.esbbroker.esbbroker" service-name="ESBBrokerProcess_Broker__8">
+                        <case service-category="org.jboss.savara.examples.esbbroker" service-name="ESBBrokerProcess_Broker__8">
                             <message type="buy"/>
                         </case>
-                        <case service-category="org.pi4soa.esbbroker.esbbroker" service-name="ESBBrokerProcess_Broker__12">
+                        <case service-category="org.jboss.savara.examples.esbbroker" service-name="ESBBrokerProcess_Broker__12">
                             <message type="cancel"/>
                         </case>
                     </property>
                 </action>
             </actions>
         </service>
-        <service category="org.pi4soa.esbbroker.esbbroker" description="" name="ESBBrokerProcess_Broker__1">
+        <service category="org.jboss.savara.examples.esbbroker" description="" name="ESBBrokerProcess_Broker__1">
             <listeners>
-                <jms-listener busidref="busId2" maxThreads="1" name="org.pi4soa.esbbroker.esbbroker-ESBBrokerProcess_Broker__1"/>
+                <jms-listener busidref="busId2" maxThreads="1" name="org.jboss.savara.examples.esbbroker-ESBBrokerProcess_Broker__1"/>
             </listeners>
-            <actions mep="OneWay">
+            <actions>
                 <action class="org.jboss.savara.jbossesb.actions.ReceiveMessageAction" name="ESBBrokerProcess_Broker__1_action_1" process="process">
                     <property name="operation" value="makeEnquiry"/>
                     <property name="messageType" value="enquiry"/>
                     <property name="clientRole" value="Buyer"/>
-                    <property name="eprStore" value="org.jboss.savara.samples.jbossesb.loan.broker.MemoryEPRStorage" />
+                    <property name="eprStore" value="org.jboss.savara.examples.broker.MemoryEPRStorage" />                    
                 </action>
-                <action class="org.jboss.savara.samples.jbossesb.loan.broker.ResetMemoryStoreAction" name="resetMemoryStore" process="process">
+                <action class="org.jboss.savara.examples.broker.ResetMemoryStoreAction" name="resetMemoryStore" process="process">
                 </action>
                 <action class="org.jboss.savara.jbossesb.actions.IfAction" name="ESBBrokerProcess_Broker__1_action_2" process="process">
                     <property name="paths">
-                        <if service-category="org.pi4soa.esbbroker.esbbroker" service-name="ESBBrokerProcess_Broker__2" decision-class="org.jboss.savara.samples.jbossesb.loan.broker.SendReqForQuoteDecision"/>
-                        <else service-category="org.pi4soa.esbbroker.esbbroker" service-name="ESBBrokerProcess_Broker__3"/>
+                        <if service-category="org.jboss.savara.examples.esbbroker" service-name="ESBBrokerProcess_Broker__2" decision-class="org.jboss.savara.examples.broker.SendReqForQuoteDecision"/>
+                        <else service-category="org.jboss.savara.examples.esbbroker" service-name="ESBBrokerProcess_Broker__3"/>
                     </property>
                 </action>
             </actions>
         </service>
-        <service category="org.pi4soa.esbbroker.esbbroker" description="" name="ESBBrokerProcess_Broker__2">
+        <service category="org.jboss.savara.examples.esbbroker" description="" name="ESBBrokerProcess_Broker__2">
             <listeners>
-                <jms-listener busidref="busId3" maxThreads="1" name="org.pi4soa.esbbroker.esbbroker-ESBBrokerProcess_Broker__2"/>
+                <jms-listener busidref="busId3" maxThreads="1" name="org.jboss.savara.examples.esbbroker-ESBBrokerProcess_Broker__2"/>
             </listeners>
-            <actions mep="OneWay">
-                <action class="org.jboss.savara.samples.jbossesb.loan.broker.SetRequestQuoteMessageAction" name="b-1" process="process">
-                </action>
+            <actions>
                 <action class="org.jboss.savara.jbossesb.actions.SendMessageAction" name="ESBBrokerProcess_Broker__2_action_1" process="process">
                     <property name="operation" value="getQuote"/>
                     <property name="messageType" value="requestForQuote"/>
-                    <property name="serviceCategory" value="org.pi4soa.esbbroker.esbbroker"/>
+                    <property name="serviceCategory" value="org.jboss.savara.examples.esbbroker"/>
                     <property name="serviceName" value="ESBBrokerProcess_SupplierQuoteEngine"/>
-                    <property name="responseServiceCategory" value="org.pi4soa.esbbroker.esbbroker"/>
+                    <property name="responseServiceCategory" value="org.jboss.savara.examples.esbbroker"/>
                     <property name="responseServiceName" value="getQuote"/>
                 </action>
             </actions>
         </service>
-        <service category="org.pi4soa.esbbroker.esbbroker" description="" name="ESBBrokerProcess_Broker__3">
+        <service category="org.jboss.savara.examples.esbbroker" description="" name="ESBBrokerProcess_Broker__3">
             <listeners>
-                <jms-listener busidref="busId4" maxThreads="1" name="org.pi4soa.esbbroker.esbbroker-ESBBrokerProcess_Broker__3"/>
+                <jms-listener busidref="busId4" maxThreads="1" name="org.jboss.savara.examples.esbbroker-ESBBrokerProcess_Broker__3"/>
             </listeners>
-            <actions mep="OneWay">
-                <action class="org.jboss.savara.samples.jbossesb.loan.broker.SetRequestQuoteMessageAction" name="b-13" process="process">
+            <actions>
+                <action class="org.jboss.savara.examples.broker.SetRequestQuoteMessageAction" name="b-13" process="process">
                 </action>
             </actions>
         </service>
-        <service category="org.pi4soa.esbbroker.esbbroker" description="" name="getQuote">
+        <service category="org.jboss.savara.examples.esbbroker" description="" name="getQuote">
             <listeners>
-                <jms-listener busidref="busId5" maxThreads="1" name="org.pi4soa.esbbroker.esbbroker-ESBBrokerProcess_Broker__4"/>
+                <jms-listener busidref="busId5" maxThreads="1" name="org.jboss.savara.examples.esbbroker-ESBBrokerProcess_Broker__4"/>
             </listeners>
-            <actions mep="OneWay">
+            <actions>
                 <action class="org.jboss.savara.jbossesb.actions.ReceiveMessageAction" name="ESBBrokerProcess_Broker__4_action_1" process="process">
                     <property name="operation" value="getQuote"/>
                     <property name="messageType" value="quote"/>
                 </action>
-                <action class="org.jboss.savara.samples.jbossesb.loan.broker.SetQuoteAction" name="b-2" process="process">
+                <action class="org.jboss.savara.examples.broker.SetQuoteAction" name="b-2" process="process">
                 </action>
                 <action class="org.jboss.savara.jbossesb.actions.IfAction" name="ESBBrokerProcess_Broker__4_action_2" process="process">
                     <property name="paths">
-                        <if service-category="org.pi4soa.esbbroker.esbbroker" service-name="ESBBrokerProcess_Broker__5" decision-class="org.jboss.savara.samples.jbossesb.loan.broker.SendReqForQuoteDecision"/>
-                        <else service-category="org.pi4soa.esbbroker.esbbroker" service-name="ESBBrokerProcess_Broker__7"/>
+                        <if service-category="org.jboss.savara.examples.esbbroker" service-name="ESBBrokerProcess_Broker__5" decision-class="org.jboss.savara.examples.broker.SendReqForQuoteDecision"/>
+                        <else service-category="org.jboss.savara.examples.esbbroker" service-name="ESBBrokerProcess_Broker__6"/>
                     </property>
                 </action>
             </actions>
         </service>
-        <service category="org.pi4soa.esbbroker.esbbroker" description="" name="ESBBrokerProcess_Broker__5">
+        <service category="org.jboss.savara.examples.esbbroker" description="" name="ESBBrokerProcess_Broker__5">
             <listeners>
-                <jms-listener busidref="busId6" maxThreads="1" name="org.pi4soa.esbbroker.esbbroker-ESBBrokerProcess_Broker__5"/>
+                <jms-listener busidref="busId6" maxThreads="1" name="org.jboss.savara.examples.esbbroker-ESBBrokerProcess_Broker__5"/>
             </listeners>
-            <actions mep="OneWay">
+            <actions>
                 <action class="org.jboss.savara.jbossesb.actions.SendMessageAction" name="ESBBrokerProcess_Broker__5_action_1" process="process">
                     <property name="operation" value="getQuote"/>
                     <property name="messageType" value="requestForQuote"/>
-                    <property name="serviceCategory" value="org.pi4soa.esbbroker.esbbroker"/>
+                    <property name="serviceCategory" value="org.jboss.savara.examples.esbbroker"/>
                     <property name="serviceName" value="ESBBrokerProcess_SupplierQuoteEngine"/>
-                    <property name="responseServiceCategory" value="org.pi4soa.esbbroker.esbbroker"/>
+                    <property name="responseServiceCategory" value="org.jboss.savara.examples.esbbroker"/>
                     <property name="responseServiceName" value="getQuote"/>
                 </action>
             </actions>
         </service>
-        <service category="org.pi4soa.esbbroker.esbbroker" description="" name="ESBBrokerProcess_Broker__6">
+        <service category="org.jboss.savara.examples.esbbroker" description="" name="ESBBrokerProcess_Broker__6">
             <listeners>
-                <jms-listener busidref="busId7" maxThreads="1" name="org.pi4soa.esbbroker.esbbroker-ESBBrokerProcess_Broker__6"/>
+                <jms-listener busidref="busId7" maxThreads="1" name="org.jboss.savara.examples.esbbroker-ESBBrokerProcess_Broker__6"/>
             </listeners>
             <actions mep="OneWay">
-                <action class="org.jboss.savara.samples.jbossesb.loan.broker.SetRequestQuoteMessageAction" name="b-1" process="process">
+                <action class="org.jboss.savara.examples.broker.SetRequestQuoteMessageAction" name="b-1" process="process">
                 </action>
             </actions>
         </service>
-        <service category="org.pi4soa.esbbroker.esbbroker" description="" name="ESBBrokerProcess_Broker__7">
+        <service category="org.jboss.savara.examples.esbbroker" description="" name="ESBBrokerProcess_Broker__7">
             <listeners>
-                <jms-listener busidref="busId8" maxThreads="1" name="org.pi4soa.esbbroker.esbbroker-ESBBrokerProcess_Broker__7"/>
+                <jms-listener busidref="busId8" maxThreads="1" name="org.jboss.savara.examples.esbbroker-ESBBrokerProcess_Broker__7"/>
             </listeners>
-            <actions mep="OneWay">
-                <action class="org.jboss.savara.samples.jbossesb.loan.broker.SetQuotesListAction" name="b-3" process="process">
-                </action>
+            <actions>
                 <action class="org.jboss.savara.jbossesb.actions.SendMessageAction" name="ESBBrokerProcess_Broker__7_action_1" process="process">
                     <property name="operation" value="makeEnquiry"/>
                     <property name="messageType" value="quoteList"/>
                     <property name="clientRole" value="Buyer"/>
-                    <property name="eprStore" value="org.jboss.savara.samples.jbossesb.loan.broker.MemoryEPRStorage" />
+                    <property name="eprStore" value="org.jboss.savara.examples.broker.MemoryEPRStorage" />
                 </action>
             </actions>
         </service>
-        <service category="org.pi4soa.esbbroker.esbbroker" description="" name="ESBBrokerProcess_Broker__8">
+        <service category="org.jboss.savara.examples.esbbroker" description="" name="ESBBrokerProcess_Broker__8">
             <listeners>
-                <jms-listener busidref="busId9" maxThreads="1" name="org.pi4soa.esbbroker.esbbroker-ESBBrokerProcess_Broker__8"/>
+                <jms-listener busidref="busId9" maxThreads="1" name="org.jboss.savara.examples.esbbroker-ESBBrokerProcess_Broker__8"/>
             </listeners>
-            <actions mep="OneWay">
+            <actions>
                 <action class="org.jboss.savara.jbossesb.actions.ReceiveMessageAction" name="ESBBrokerProcess_Broker__8_action_1" process="process">
                     <property name="operation" value="buy"/>
                     <property name="messageType" value="buy"/>
                     <property name="clientRole" value="Buyer"/>
-                    <property name="eprStore" value="org.jboss.savara.samples.jbossesb.loan.broker.MemoryEPRStorage" />
+                    <property name="eprStore" value="org.jboss.savara.examples.broker.MemoryEPRStorage" />
                 </action>
-                <action name="creditCheck-Request" class="org.jboss.savara.samples.jbossesb.loan.broker.SetCreditCheckRequestMessageAction" >
+                <action name="creditCheck-Request" class="org.jboss.savara.examples.broker.SetCreditCheckRequestMessageAction" >
                 </action>
                 <action class="org.jboss.savara.jbossesb.actions.SendMessageAction" name="ESBBrokerProcess_Broker__8_action_2" process="process">
                     <property name="operation" value="checkCredit"/>
                     <property name="messageType" value="CreditCheckRequest"/>
-                    <property name="serviceCategory" value="org.pi4soa.purchase.purchasegoods"/>
+                    <property name="serviceCategory" value="org.jboss.savara.examples.purchasegoods"/>
                     <property name="serviceName" value="PurchaseGoodsProcess_CreditAgency"/>
-                    <property name="responseServiceCategory" value="org.pi4soa.esbbroker.esbbroker"/>
+                    <property name="responseServiceCategory" value="org.jboss.savara.examples.esbbroker"/>
                     <property name="responseServiceName" value="checkCredit"/>
                 </action>
             </actions>
         </service>
-        <service category="org.pi4soa.esbbroker.esbbroker" description="" name="ESBBrokerProcess_Broker__9">
+        <service category="org.jboss.savara.examples.esbbroker" description="" name="ESBBrokerProcess_Broker__9">
             <listeners>
-                <jms-listener busidref="busId10" maxThreads="1" name="org.pi4soa.esbbroker.esbbroker-ESBBrokerProcess_Broker__9"/>
+                <jms-listener busidref="busId10" maxThreads="1" name="org.jboss.savara.examples.esbbroker-ESBBrokerProcess_Broker__9"/>
             </listeners>
-            <actions mep="OneWay">
+            <actions>
                 <action class="org.jboss.savara.jbossesb.actions.ReceiveMessageAction" name="ESBBrokerProcess_Broker__9_action_1" process="process">
                     <property name="operation" value="checkCredit"/>
                     <property name="messageType" value="CreditCheckOk"/>
                 </action>
-                <action name="set-orderConfirm" class="org.jboss.savara.samples.jbossesb.loan.broker.SetOrderConfirmRequestAction">
+                <action name="set-orderConfirm" class="org.jboss.savara.examples.broker.SetOrderConfirmRequestAction">
                 </action>
                 <action class="org.jboss.savara.jbossesb.actions.SendMessageAction" name="ESBBrokerProcess_Broker__9_action_2" process="process">
                     <property name="operation" value="confirm"/>
                     <property name="messageType" value="orderConfirmed"/>
-                    <property name="serviceCategory" value="org.pi4soa.esbbroker.esbbroker"/>
+                    <property name="serviceCategory" value="org.jboss.savara.examples.esbbroker"/>
                     <property name="serviceName" value="ESBBrokerProcess_SupplierTxnProcessor"/>
-                    <property name="responseServiceCategory" value="org.pi4soa.esbbroker.esbbroker"/>
+                    <property name="responseServiceCategory" value="org.jboss.savara.examples.esbbroker"/>
                     <property name="responseServiceName" value="confirm"/>
                 </action>
             </actions>
         </service>
-        <service category="org.pi4soa.esbbroker.esbbroker" description="" name="confirm">
+        <service category="org.jboss.savara.examples.esbbroker" description="" name="confirm">
             <listeners>
-                <jms-listener busidref="busId11" maxThreads="1" name="org.pi4soa.esbbroker.esbbroker-ESBBrokerProcess_Broker__10"/>
+                <jms-listener busidref="busId11" maxThreads="1" name="org.jboss.savara.examples.esbbroker-ESBBrokerProcess_Broker__10"/>
             </listeners>
-            <actions mep="OneWay">
+            <actions>
                 <action class="org.jboss.savara.jbossesb.actions.ReceiveMessageAction" name="ESBBrokerProcess_Broker__10_action_1" process="process">
                     <property name="operation" value="confirm"/>
                     <property name="messageType" value="bookingReference"/>
@@ -233,55 +229,54 @@
                     <property name="operation" value="buy"/>
                     <property name="messageType" value="bookingReference"/>
                     <property name="clientRole" value="Buyer"/>
-                    <property name="eprStore" value="org.jboss.savara.samples.jbossesb.loan.broker.MemoryEPRStorage" />
+                    <property name="eprStore" value="org.jboss.savara.examples.broker.MemoryEPRStorage" />
                 </action>
             </actions>
         </service>
-        <service category="org.pi4soa.esbbroker.esbbroker" description="" name="ESBBrokerProcess_Broker__11">
+        <service category="org.jboss.savara.examples.esbbroker" description="" name="ESBBrokerProcess_Broker__11">
             <listeners>
-                <jms-listener busidref="busId12" maxThreads="1" name="org.pi4soa.esbbroker.esbbroker-ESBBrokerProcess_Broker__11"/>
+                <jms-listener busidref="busId12" maxThreads="1" name="org.jboss.savara.examples.esbbroker-ESBBrokerProcess_Broker__11"/>
             </listeners>
-            <actions mep="OneWay">
+            <actions>
                 <action class="org.jboss.savara.jbossesb.actions.ReceiveMessageAction" name="ESBBrokerProcess_Broker__11_action_1" process="process">
                     <property name="operation" value="checkCredit"/>
                     <property name="messageType" value="CreditCheckInvalid"/>
                 </action>
-                <action name="set-orderRejected" class="org.jboss.savara.samples.jbossesb.loan.broker.SetOrderRejectMessageAction"></action>
                 <action class="org.jboss.savara.jbossesb.actions.SendMessageAction" name="ESBBrokerProcess_Broker__11_action_2" process="process">
                     <property name="operation" value="buy"/>
                     <property name="messageType" value="orderRejected"/>
-					<property name="clientRole" value="Buyer"/>
-                    <property name="eprStore" value="org.jboss.savara.samples.jbossesb.loan.broker.MemoryEPRStorage" />
+                    <property name="clientRole" value="Buyer"/>
+                    <property name="eprStore" value="org.jboss.savara.examples.broker.MemoryEPRStorage" />
                 </action>
             </actions>
         </service>
-        <service category="org.pi4soa.esbbroker.esbbroker" description="" name="ESBBrokerProcess_Broker__12">
+        <service category="org.jboss.savara.examples.esbbroker" description="" name="ESBBrokerProcess_Broker__12">
             <listeners>
-                <jms-listener busidref="busId13" maxThreads="1" name="org.pi4soa.esbbroker.esbbroker-ESBBrokerProcess_Broker__12"/>
+                <jms-listener busidref="busId13" maxThreads="1" name="org.jboss.savara.examples.esbbroker-ESBBrokerProcess_Broker__12"/>
             </listeners>
-            <actions mep="OneWay">
+            <actions>
                 <action class="org.jboss.savara.jbossesb.actions.ReceiveMessageAction" name="ESBBrokerProcess_Broker__12_action_1" process="process">
                     <property name="operation" value="cancel"/>
                     <property name="messageType" value="cancel"/>
                 </action>
             </actions>
         </service>
-        <service category="org.pi4soa.esbbroker.esbbroker" description="" name="checkCredit">
+        <service category="org.jboss.savara.examples.esbbroker" description="" name="checkCredit">
             <listeners>
-                <jms-listener busidref="busId14" maxThreads="1" name="org.pi4soa.esbbroker.esbbroker-checkCredit"/>
+                <jms-listener busidref="busId14" maxThreads="1" name="org.jboss.savara.examples.esbbroker-checkCredit"/>
             </listeners>
-            <actions mep="OneWay">
+            <actions>
                 <action class="org.jboss.savara.jbossesb.actions.SwitchAction" name="checkCredit_action_1" process="process">
                     <property name="paths">
-                        <case service-category="org.pi4soa.esbbroker.esbbroker" service-name="ESBBrokerProcess_Broker__9">
+                        <case service-category="org.jboss.savara.examples.esbbroker" service-name="ESBBrokerProcess_Broker__9">
                             <message type="CreditCheckOk"/>
                         </case>
-                        <case service-category="org.pi4soa.esbbroker.esbbroker" service-name="ESBBrokerProcess_Broker__11">
+                        <case service-category="org.jboss.savara.examples.esbbroker" service-name="ESBBrokerProcess_Broker__11">
                             <message type="CreditCheckInvalid"/>
                         </case>
                     </property>
                 </action>
             </actions>
-        </service>
+        </service>    
     </services>
 </jbossesb>

Modified: cdl/trunk/samples/jbossesb/brokerage/broker/src/main/resources/jbm-queue-service.xml
===================================================================
--- cdl/trunk/samples/jbossesb/brokerage/broker/src/main/resources/jbm-queue-service.xml	2009-08-21 07:55:37 UTC (rev 792)
+++ cdl/trunk/samples/jbossesb/brokerage/broker/src/main/resources/jbm-queue-service.xml	2009-08-21 10:10:51 UTC (rev 793)
@@ -1,91 +1,91 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <server>
   <mbean code="org.jboss.jms.server.destination.QueueService"
-    name="org.pi4soa.esbbroker.esbbroker.destination:service=Queue,name=org_pi4soa_esbbroker_esbbroker_ESBBrokerProcess_Broker__2"
+    name="org.jboss.savara.examples.esbbroker.destination:service=Queue,name=org_jboss_savara_examples_esbbroker_ESBBrokerProcess_Broker__1"
     xmbean-dd="xmdesc/Queue-xmbean.xml">
 	<depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends>
 	<depends>jboss.messaging:service=PostOffice</depends>
   </mbean>
   <mbean code="org.jboss.jms.server.destination.QueueService"
-    name="org.pi4soa.esbbroker.esbbroker.destination:service=Queue,name=org_pi4soa_esbbroker_esbbroker_ESBBrokerProcess_Broker__1"
+    name="org.jboss.savara.examples.esbbroker.destination:service=Queue,name=org_jboss_savara_examples_esbbroker_ESBBrokerProcess_Broker__2"
     xmbean-dd="xmdesc/Queue-xmbean.xml">
 	<depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends>
 	<depends>jboss.messaging:service=PostOffice</depends>
   </mbean>
   <mbean code="org.jboss.jms.server.destination.QueueService"
-    name="org.pi4soa.esbbroker.esbbroker.destination:service=Queue,name=org_pi4soa_esbbroker_esbbroker_ESBBrokerProcess_Broker__12"
+    name="org.jboss.savara.examples.esbbroker.destination:service=Queue,name=org_jboss_savara_examples_esbbroker_ESBBrokerProcess_Broker__3"
     xmbean-dd="xmdesc/Queue-xmbean.xml">
 	<depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends>
 	<depends>jboss.messaging:service=PostOffice</depends>
   </mbean>
   <mbean code="org.jboss.jms.server.destination.QueueService"
-    name="org.pi4soa.esbbroker.esbbroker.destination:service=Queue,name=org_pi4soa_esbbroker_esbbroker_checkCredit"
+    name="org.jboss.savara.examples.esbbroker.destination:service=Queue,name=org_jboss_savara_examples_esbbroker_ESBBrokerProcess_Broker__4"
     xmbean-dd="xmdesc/Queue-xmbean.xml">
 	<depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends>
 	<depends>jboss.messaging:service=PostOffice</depends>
   </mbean>
   <mbean code="org.jboss.jms.server.destination.QueueService"
-    name="org.pi4soa.esbbroker.esbbroker.destination:service=Queue,name=org_pi4soa_esbbroker_esbbroker_ESBBrokerProcess_Broker__11"
+    name="org.jboss.savara.examples.esbbroker.destination:service=Queue,name=org_jboss_savara_examples_esbbroker_ESBBrokerProcess_Broker__5"
     xmbean-dd="xmdesc/Queue-xmbean.xml">
 	<depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends>
 	<depends>jboss.messaging:service=PostOffice</depends>
   </mbean>
   <mbean code="org.jboss.jms.server.destination.QueueService"
-    name="org.pi4soa.esbbroker.esbbroker.destination:service=Queue,name=org_pi4soa_esbbroker_esbbroker_ESBBrokerProcess_Broker__10"
+    name="org.jboss.savara.examples.esbbroker.destination:service=Queue,name=org_jboss_savara_examples_esbbroker_ESBBrokerProcess_Broker__6"
     xmbean-dd="xmdesc/Queue-xmbean.xml">
 	<depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends>
 	<depends>jboss.messaging:service=PostOffice</depends>
   </mbean>
   <mbean code="org.jboss.jms.server.destination.QueueService"
-    name="org.pi4soa.esbbroker.esbbroker.destination:service=Queue,name=org_pi4soa_esbbroker_esbbroker_ESBBrokerProcess_Broker__9"
+    name="org.jboss.savara.examples.esbbroker.destination:service=Queue,name=org_jboss_savara_examples_esbbroker_ESBBrokerProcess_Broker__7"
     xmbean-dd="xmdesc/Queue-xmbean.xml">
 	<depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends>
 	<depends>jboss.messaging:service=PostOffice</depends>
   </mbean>
   <mbean code="org.jboss.jms.server.destination.QueueService"
-    name="org.pi4soa.esbbroker.esbbroker.destination:service=Queue,name=org_pi4soa_esbbroker_esbbroker_ESBBrokerProcess_Broker__8"
+    name="org.jboss.savara.examples.esbbroker.destination:service=Queue,name=org_jboss_savara_examples_esbbroker_ESBBrokerProcess_Broker__8"
     xmbean-dd="xmdesc/Queue-xmbean.xml">
 	<depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends>
 	<depends>jboss.messaging:service=PostOffice</depends>
   </mbean>
   <mbean code="org.jboss.jms.server.destination.QueueService"
-    name="org.pi4soa.esbbroker.esbbroker.destination:service=Queue,name=org_pi4soa_esbbroker_esbbroker_ESBBrokerProcess_Broker__7"
+    name="org.jboss.savara.examples.esbbroker.destination:service=Queue,name=org_jboss_savara_examples_esbbroker_ESBBrokerProcess_Broker__9"
     xmbean-dd="xmdesc/Queue-xmbean.xml">
 	<depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends>
 	<depends>jboss.messaging:service=PostOffice</depends>
   </mbean>
   <mbean code="org.jboss.jms.server.destination.QueueService"
-    name="org.pi4soa.esbbroker.esbbroker.destination:service=Queue,name=org_pi4soa_esbbroker_esbbroker_ESBBrokerProcess_Broker__6"
+    name="org.jboss.savara.examples.esbbroker.destination:service=Queue,name=org_jboss_savara_examples_esbbroker_ESBBrokerProcess_Broker__10"
     xmbean-dd="xmdesc/Queue-xmbean.xml">
 	<depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends>
 	<depends>jboss.messaging:service=PostOffice</depends>
   </mbean>
   <mbean code="org.jboss.jms.server.destination.QueueService"
-    name="org.pi4soa.esbbroker.esbbroker.destination:service=Queue,name=org_pi4soa_esbbroker_esbbroker_ESBBrokerProcess_Broker__5"
+    name="org.jboss.savara.examples.esbbroker.destination:service=Queue,name=org_jboss_savara_examples_esbbroker_ESBBrokerProcess_Broker__11"
     xmbean-dd="xmdesc/Queue-xmbean.xml">
 	<depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends>
 	<depends>jboss.messaging:service=PostOffice</depends>
   </mbean>
   <mbean code="org.jboss.jms.server.destination.QueueService"
-    name="org.pi4soa.esbbroker.esbbroker.destination:service=Queue,name=org_pi4soa_esbbroker_esbbroker_ESBBrokerProcess_Broker__4"
+    name="org.jboss.savara.examples.esbbroker.destination:service=Queue,name=org_jboss_savara_examples_esbbroker_ESBBrokerProcess_Broker__12"
     xmbean-dd="xmdesc/Queue-xmbean.xml">
 	<depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends>
 	<depends>jboss.messaging:service=PostOffice</depends>
   </mbean>
   <mbean code="org.jboss.jms.server.destination.QueueService"
-    name="org.pi4soa.esbbroker.esbbroker.destination:service=Queue,name=org_pi4soa_esbbroker_esbbroker_ESBBrokerProcess_Broker__3"
+    name="org.jboss.savara.examples.esbbroker.destination:service=Queue,name=org_jboss_savara_examples_esbbroker_checkCredit"
     xmbean-dd="xmdesc/Queue-xmbean.xml">
 	<depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends>
 	<depends>jboss.messaging:service=PostOffice</depends>
   </mbean>
   <mbean code="org.jboss.jms.server.destination.QueueService"
-    name="org.pi4soa.esbbroker.esbbroker.destination:service=Queue,name=org_pi4soa_esbbroker_esbbroker_ESBBrokerProcess_Broker"
+    name="org.jboss.savara.examples.esbbroker.destination:service=Queue,name=org_jboss_savara_examples_esbbroker_ESBBrokerProcess_Broker"
     xmbean-dd="xmdesc/Queue-xmbean.xml">
 	<depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends>
 	<depends>jboss.messaging:service=PostOffice</depends>
   </mbean>
   <mbean code="org.jboss.jms.server.destination.QueueService"
-    name="org.pi4soa.esbbroker.esbbroker.destination:service=Queue,name=org_pi4soa_esbbroker_esbbroker_ESBBrokerProcess_Broker_reply"
+    name="org.jboss.savara.examples.esbbroker.destination:service=Queue,name=org_jboss_savara_examples_esbbroker_ESBBrokerProcess_Broker_reply"
     xmbean-dd="xmdesc/Queue-xmbean.xml">
 	<depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends>
 	<depends>jboss.messaging:service=PostOffice</depends>

Modified: cdl/trunk/samples/jbossesb/brokerage/broker/src/main/resources/jbmq-queue-service.xml
===================================================================
--- cdl/trunk/samples/jbossesb/brokerage/broker/src/main/resources/jbmq-queue-service.xml	2009-08-21 07:55:37 UTC (rev 792)
+++ cdl/trunk/samples/jbossesb/brokerage/broker/src/main/resources/jbmq-queue-service.xml	2009-08-21 10:10:51 UTC (rev 793)
@@ -1,90 +1,90 @@
 <server>
 	<mbean code="org.jboss.mq.server.jmx.Queue"
-			name="org.pi4soa.esbbroker.esbbroker.destination:service=Queue,name=org_pi4soa_esbbroker_esbbroker_ESBBrokerProcess_Broker__2">
+			name="org.jboss.savara.examples.esbbroker.destination:service=Queue,name=org_jboss_savara_examples_esbbroker_ESBBrokerProcess_Broker__10">
 		<depends optional-attribute-name="DestinationManager">
 			jboss.mq:service=DestinationManager
 		</depends>
 	</mbean>
 	<mbean code="org.jboss.mq.server.jmx.Queue"
-			name="org.pi4soa.esbbroker.esbbroker.destination:service=Queue,name=org_pi4soa_esbbroker_esbbroker_ESBBrokerProcess_Broker__1">
+			name="org.jboss.savara.examples.esbbroker.destination:service=Queue,name=org_jboss_savara_examples_esbbroker_ESBBrokerProcess_Broker__9">
 		<depends optional-attribute-name="DestinationManager">
 			jboss.mq:service=DestinationManager
 		</depends>
 	</mbean>
 	<mbean code="org.jboss.mq.server.jmx.Queue"
-			name="org.pi4soa.esbbroker.esbbroker.destination:service=Queue,name=org_pi4soa_esbbroker_esbbroker_ESBBrokerProcess_Broker__12">
+			name="org.jboss.savara.examples.esbbroker.destination:service=Queue,name=org_jboss_savara_examples_esbbroker_ESBBrokerProcess_Broker__8">
 		<depends optional-attribute-name="DestinationManager">
 			jboss.mq:service=DestinationManager
 		</depends>
 	</mbean>
 	<mbean code="org.jboss.mq.server.jmx.Queue"
-			name="org.pi4soa.esbbroker.esbbroker.destination:service=Queue,name=org_pi4soa_esbbroker_esbbroker_checkCredit">
+			name="org.jboss.savara.examples.esbbroker.destination:service=Queue,name=org_jboss_savara_examples_esbbroker_ESBBrokerProcess_Broker__7">
 		<depends optional-attribute-name="DestinationManager">
 			jboss.mq:service=DestinationManager
 		</depends>
 	</mbean>
 	<mbean code="org.jboss.mq.server.jmx.Queue"
-			name="org.pi4soa.esbbroker.esbbroker.destination:service=Queue,name=org_pi4soa_esbbroker_esbbroker_ESBBrokerProcess_Broker__11">
+			name="org.jboss.savara.examples.esbbroker.destination:service=Queue,name=org_jboss_savara_examples_esbbroker_ESBBrokerProcess_Broker__6">
 		<depends optional-attribute-name="DestinationManager">
 			jboss.mq:service=DestinationManager
 		</depends>
 	</mbean>
 	<mbean code="org.jboss.mq.server.jmx.Queue"
-			name="org.pi4soa.esbbroker.esbbroker.destination:service=Queue,name=org_pi4soa_esbbroker_esbbroker_ESBBrokerProcess_Broker__10">
+			name="org.jboss.savara.examples.esbbroker.destination:service=Queue,name=org_jboss_savara_examples_esbbroker_ESBBrokerProcess_Broker__5">
 		<depends optional-attribute-name="DestinationManager">
 			jboss.mq:service=DestinationManager
 		</depends>
 	</mbean>
 	<mbean code="org.jboss.mq.server.jmx.Queue"
-			name="org.pi4soa.esbbroker.esbbroker.destination:service=Queue,name=org_pi4soa_esbbroker_esbbroker_ESBBrokerProcess_Broker__9">
+			name="org.jboss.savara.examples.esbbroker.destination:service=Queue,name=org_jboss_savara_examples_esbbroker_ESBBrokerProcess_Broker__4">
 		<depends optional-attribute-name="DestinationManager">
 			jboss.mq:service=DestinationManager
 		</depends>
 	</mbean>
 	<mbean code="org.jboss.mq.server.jmx.Queue"
-			name="org.pi4soa.esbbroker.esbbroker.destination:service=Queue,name=org_pi4soa_esbbroker_esbbroker_ESBBrokerProcess_Broker__8">
+			name="org.jboss.savara.examples.esbbroker.destination:service=Queue,name=org_jboss_savara_examples_esbbroker_ESBBrokerProcess_Broker__3">
 		<depends optional-attribute-name="DestinationManager">
 			jboss.mq:service=DestinationManager
 		</depends>
 	</mbean>
 	<mbean code="org.jboss.mq.server.jmx.Queue"
-			name="org.pi4soa.esbbroker.esbbroker.destination:service=Queue,name=org_pi4soa_esbbroker_esbbroker_ESBBrokerProcess_Broker">
+			name="org.jboss.savara.examples.esbbroker.destination:service=Queue,name=org_jboss_savara_examples_esbbroker_ESBBrokerProcess_Broker__2">
 		<depends optional-attribute-name="DestinationManager">
 			jboss.mq:service=DestinationManager
 		</depends>
 	</mbean>
 	<mbean code="org.jboss.mq.server.jmx.Queue"
-			name="org.pi4soa.esbbroker.esbbroker.destination:service=Queue,name=org_pi4soa_esbbroker_esbbroker_ESBBrokerProcess_Broker_reply">
+			name="org.jboss.savara.examples.esbbroker.destination:service=Queue,name=org_jboss_savara_examples_esbbroker_ESBBrokerProcess_Broker__1">
 		<depends optional-attribute-name="DestinationManager">
 			jboss.mq:service=DestinationManager
-	</depends>
+		</depends>
 	</mbean>
 	<mbean code="org.jboss.mq.server.jmx.Queue"
-			name="org.pi4soa.esbbroker.esbbroker.destination:service=Queue,name=org_pi4soa_esbbroker_esbbroker_ESBBrokerProcess_Broker__7">
+			name="org.jboss.savara.examples.esbbroker.destination:service=Queue,name=org_jboss_savara_examples_esbbroker_checkCredit">
 		<depends optional-attribute-name="DestinationManager">
 			jboss.mq:service=DestinationManager
 		</depends>
 	</mbean>
 	<mbean code="org.jboss.mq.server.jmx.Queue"
-			name="org.pi4soa.esbbroker.esbbroker.destination:service=Queue,name=org_pi4soa_esbbroker_esbbroker_ESBBrokerProcess_Broker__6">
+			name="org.jboss.savara.examples.esbbroker.destination:service=Queue,name=org_jboss_savara_examples_esbbroker_ESBBrokerProcess_Broker">
 		<depends optional-attribute-name="DestinationManager">
 			jboss.mq:service=DestinationManager
 		</depends>
 	</mbean>
 	<mbean code="org.jboss.mq.server.jmx.Queue"
-			name="org.pi4soa.esbbroker.esbbroker.destination:service=Queue,name=org_pi4soa_esbbroker_esbbroker_ESBBrokerProcess_Broker__5">
+			name="org.jboss.savara.examples.esbbroker.destination:service=Queue,name=org_jboss_savara_examples_esbbroker_ESBBrokerProcess_Broker_reply">
 		<depends optional-attribute-name="DestinationManager">
 			jboss.mq:service=DestinationManager
 		</depends>
 	</mbean>
 	<mbean code="org.jboss.mq.server.jmx.Queue"
-			name="org.pi4soa.esbbroker.esbbroker.destination:service=Queue,name=org_pi4soa_esbbroker_esbbroker_ESBBrokerProcess_Broker__4">
+			name="org.jboss.savara.examples.esbbroker.destination:service=Queue,name=org_jboss_savara_examples_esbbroker_ESBBrokerProcess_Broker__12">
 		<depends optional-attribute-name="DestinationManager">
 			jboss.mq:service=DestinationManager
 		</depends>
 	</mbean>
 	<mbean code="org.jboss.mq.server.jmx.Queue"
-			name="org.pi4soa.esbbroker.esbbroker.destination:service=Queue,name=org_pi4soa_esbbroker_esbbroker_ESBBrokerProcess_Broker__3">
+			name="org.jboss.savara.examples.esbbroker.destination:service=Queue,name=org_jboss_savara_examples_esbbroker_ESBBrokerProcess_Broker__11">
 		<depends optional-attribute-name="DestinationManager">
 			jboss.mq:service=DestinationManager
 		</depends>

Added: cdl/trunk/samples/jbossesb/brokerage/broker/src/scripts/esb-assembly.xml
===================================================================
--- cdl/trunk/samples/jbossesb/brokerage/broker/src/scripts/esb-assembly.xml	                        (rev 0)
+++ cdl/trunk/samples/jbossesb/brokerage/broker/src/scripts/esb-assembly.xml	2009-08-21 10:10:51 UTC (rev 793)
@@ -0,0 +1,18 @@
+<assembly 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/xsd/assembly-1.1.0-SNAPSHOT.xsd">
+  <id>esb</id>
+  <formats>
+    <format>zip</format>
+  </formats>
+  <includeBaseDirectory>true</includeBaseDirectory>
+  <fileSets>
+    <fileSet>
+      <directory>target/classes</directory>
+      <outputDirectory>/</outputDirectory>
+      <excludes>
+       <exclude>jbmq-queue-service.xml</exclude>
+      </excludes>
+    </fileSet>
+  </fileSets>
+  
+</assembly>
\ No newline at end of file

Modified: cdl/trunk/samples/jbossesb/brokerage/models/ESBBroker.cdm
===================================================================
--- cdl/trunk/samples/jbossesb/brokerage/models/ESBBroker.cdm	2009-08-21 07:55:37 UTC (rev 792)
+++ cdl/trunk/samples/jbossesb/brokerage/models/ESBBroker.cdm	2009-08-21 10:10:51 UTC (rev 793)
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="Cp1252"?>
-<org.pi4soa.cdl:Package xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:org.pi4soa.cdl="http:///org/pi4soa/cdl.ecore" description="The choreography description for ESBBroker" name="ESBBroker" author="gary" version="0.3" targetNamespace="http://www.pi4soa.org/ESBBroker">
+<org.pi4soa.cdl:Package xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:org.pi4soa.cdl="http:///org/pi4soa/cdl.ecore" description="The choreography description for ESBBroker" name="ESBBroker" author="gary" version="0.3" targetNamespace="http://www.jboss.org/savara/examples">
   <typeDefinitions>
-    <nameSpaces description="Target Namespace for ESBBroker" prefix="tns" uRI="http://www.pi4soa.org/ESBBroker"/>
+    <nameSpaces description="Target Namespace for ESBBroker" prefix="tns" uRI="http://www.jboss.org/savara/examples"/>
     <nameSpaces description="XML Schema Namespace" prefix="xsd" uRI="http://www.w3.org/2001/XMLSchema"/>
     <informationTypes description="This is the information type BookingReference" name="BookingReference" elementName="bookingReference"/>
     <informationTypes description="This is the information type Buy" name="Buy" elementName="buy"/>
@@ -33,13 +33,13 @@
     <relationshipTypes description="Relationship between Broker and Supplier" name="BrokerToSupplierRel" firstRoleType="//@typeDefinitions/@roleTypes.0" secondRoleType="//@typeDefinitions/@roleTypes.3"/>
     <relationshipTypes description="Relationship between Buyer and Broker" name="BuyerToBrokerRel" firstRoleType="//@typeDefinitions/@roleTypes.1" secondRoleType="//@typeDefinitions/@roleTypes.0"/>
     <participantTypes description="This is the participant type Broker" name="Broker" roleTypes="//@typeDefinitions/@roleTypes.0">
-      <semanticAnnotations annotation="overlord.cdl.samples.LoanBroker at Broker" name="conversationType"/>
+      <semanticAnnotations annotation="savara.samples.LoanBroker at Broker" name="conversationType"/>
     </participantTypes>
     <participantTypes description="This is the participant type Buyer" name="Buyer" roleTypes="//@typeDefinitions/@roleTypes.1">
-      <semanticAnnotations annotation="overlord.cdl.samples.LoanBroker at Buyer" name="conversationType"/>
+      <semanticAnnotations annotation="savara.samples.LoanBroker at Buyer" name="conversationType"/>
     </participantTypes>
     <participantTypes description="This is the participant type CreditAgency" name="CreditAgency" roleTypes="//@typeDefinitions/@roleTypes.2">
-      <semanticAnnotations annotation="overlord.cdl.samples.Common at CreditAgency" name="conversationType"/>
+      <semanticAnnotations annotation="savara.samples.Common at CreditAgency" name="conversationType"/>
     </participantTypes>
     <participantTypes description="This is the participant type Supplier" name="Supplier" roleTypes="//@typeDefinitions/@roleTypes.3">
       <semanticAnnotations annotation="" name="conversationType"/>
@@ -51,7 +51,7 @@
   <choreographies description="Choreography flow for the ESBBroker process" name="ESBBrokerProcess" root="true">
     <enclosedChoreographies name="CompleteTransaction">
       <participantDefinitions name="SupplierTxnProcessor" roleTypes="//@typeDefinitions/@roleTypes.3">
-        <semanticAnnotations annotation="overlord.cdl.samples.LoanBroker at SupplierTxnProcessor" name="conversationType"/>
+        <semanticAnnotations annotation="savara.samples.LoanBroker at SupplierTxnProcessor" name="conversationType"/>
       </participantDefinitions>
       <variableDefinitions description="Channel to facilitate interaction to Broker" name="BrokerChannel" type="//@typeDefinitions/@channelTypes.0" free="true" roleTypes="//@typeDefinitions/@roleTypes.0 //@typeDefinitions/@roleTypes.1"/>
       <variableDefinitions description="Channel to facilitate interaction to CreditAgency" name="CreditAgencyChannel" type="//@typeDefinitions/@channelTypes.1"/>
@@ -87,7 +87,7 @@
     </enclosedChoreographies>
     <enclosedChoreographies name="RequestForQuote">
       <participantDefinitions name="SupplierQuoteEngine" roleTypes="//@typeDefinitions/@roleTypes.3">
-        <semanticAnnotations annotation="overlord.cdl.samples.LoanBroker at SupplierQuoteEngine" name="conversationType"/>
+        <semanticAnnotations annotation="savara.samples.LoanBroker at SupplierQuoteEngine" name="conversationType"/>
       </participantDefinitions>
       <variableDefinitions description="Channel to facilitate interaction to Supplier" name="SupplierChannel" type="//@typeDefinitions/@channelTypes.2"/>
       <activities xsi:type="org.pi4soa.cdl:Interaction" name="RFQ" operation="getQuote" channelVariable="//@choreographies.0/@enclosedChoreographies.1/@variableDefinitions.0" relationship="//@typeDefinitions/@relationshipTypes.1" toParticipant="//@choreographies.0/@enclosedChoreographies.1/@participantDefinitions.0">

Modified: cdl/trunk/samples/jbossesb/brokerage/supplier/pom.xml
===================================================================
--- cdl/trunk/samples/jbossesb/brokerage/supplier/pom.xml	2009-08-21 07:55:37 UTC (rev 792)
+++ cdl/trunk/samples/jbossesb/brokerage/supplier/pom.xml	2009-08-21 10:10:51 UTC (rev 793)
@@ -4,7 +4,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>org.jboss.savara.samples</groupId>
 	<artifactId>jbossesb-supplier</artifactId>
-	<packaging>jboss-esb</packaging>
+	<packaging>jar</packaging>
 	<name>Savara::Samples::Supplier</name>
 	<url>http://www.jboss.org/overlord</url>
 	
@@ -18,13 +18,11 @@
 			<dependency>
 				<groupId>log4j</groupId>
 				<artifactId>log4j</artifactId>
-				<version>${log4j.version}</version>
 				<scope>provided</scope>
 			</dependency>
 			<dependency>
-				<groupId>org.jboss.savara.runtime</groupId>
-				<artifactId>jbossesb</artifactId>
-				<version>${project.version}</version>
+				<groupId>org.jboss.savara</groupId>
+				<artifactId>savara-runtime-jbossesb</artifactId>
 				<scope>provided</scope>
 			</dependency>
 
@@ -33,25 +31,25 @@
 		<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-stateless.esb" todir="${deploy.dir}" overwrite="true" /-->
-			      </tasks>
-			    </configuration>
-			    <goals>
-			      <goal>run</goal>
-			    </goals>
-			  </execution>
-			  </executions>
-		     </plugin>		      
+		    <plugin>
+		        <artifactId>maven-assembly-plugin</artifactId>
+		         <executions> 
+		          <execution>
+		            <id>esb</id>
+		            <phase>package</phase>
+		            <goals>
+		              <goal>single</goal>
+		            </goals>
+		            <configuration>
+		              <finalName>supplier.esb</finalName>
+		              <appendAssemblyId>false</appendAssemblyId>
+		              <descriptors>
+		                <descriptor>src/scripts/esb-assembly.xml</descriptor>
+		              </descriptors>
+		            </configuration>
+		          </execution>		          
+		         </executions>
+	         </plugin>		      
 		    </plugins>
 		</build>
 	

Added: cdl/trunk/samples/jbossesb/brokerage/supplier/src/main/java/org/jboss/savara/examples/supplier/MemoryEPRStorage.java
===================================================================
--- cdl/trunk/samples/jbossesb/brokerage/supplier/src/main/java/org/jboss/savara/examples/supplier/MemoryEPRStorage.java	                        (rev 0)
+++ cdl/trunk/samples/jbossesb/brokerage/supplier/src/main/java/org/jboss/savara/examples/supplier/MemoryEPRStorage.java	2009-08-21 10:10:51 UTC (rev 793)
@@ -0,0 +1,46 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2008, JBoss Inc., and others contributors as indicated 
+ * by the @authors tag. All rights reserved. 
+ * See the copyright.txt in the distribution for a
+ * full listing of individual contributors. 
+ * This copyrighted material is made available to anyone wishing to use,
+ * modify, copy, or redistribute it subject to the terms and conditions
+ * of the GNU Lesser General Public License, v. 2.1.
+ * This program is distributed in the hope that it will be useful, but WITHOUT A 
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A 
+ * PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
+ * You should have received a copy of the GNU Lesser General Public License,
+ * v.2.1 along with this distribution; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, 
+ * MA  02110-1301, USA.
+ * 
+ * (C) 2008,
+ */
+package org.jboss.savara.examples.supplier;
+
+import java.util.HashMap;
+import java.util.Map;
+
+import org.jboss.savara.jbossesb.EPRStore;
+import org.jboss.soa.esb.addressing.EPR;
+import org.jboss.soa.esb.message.Message;
+
+/**
+ * @author <a href="mailto:cyu at redhat.com">Jeff Yu</a>
+ *
+ */
+public class MemoryEPRStorage implements EPRStore {
+	
+	private static final Map<String, EPR> storage = new HashMap<String, EPR>();
+	
+	public EPR getEPRByRole(String roleName, Message message) {
+		return storage.get(roleName);
+	}
+
+	public void registerRole(String roleName, Message message) {
+		EPR epr = message.getHeader().getCall().getReplyTo();
+		storage.put(roleName, epr);
+	}
+
+}

Added: cdl/trunk/samples/jbossesb/brokerage/supplier/src/main/java/org/jboss/savara/examples/supplier/SetOrderConfirmResponseAction.java
===================================================================
--- cdl/trunk/samples/jbossesb/brokerage/supplier/src/main/java/org/jboss/savara/examples/supplier/SetOrderConfirmResponseAction.java	                        (rev 0)
+++ cdl/trunk/samples/jbossesb/brokerage/supplier/src/main/java/org/jboss/savara/examples/supplier/SetOrderConfirmResponseAction.java	2009-08-21 10:10:51 UTC (rev 793)
@@ -0,0 +1,43 @@
+package org.jboss.savara.examples.supplier;
+
+
+import org.apache.log4j.Logger;
+import org.jboss.savara.internal.jbossesb.utils.XMLUtils;
+import org.jboss.soa.esb.actions.AbstractActionLifecycle;
+import org.jboss.soa.esb.helpers.ConfigTree;
+import org.jboss.soa.esb.message.Message;
+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/brokerage/supplier/src/main/java/org/jboss/savara/examples/supplier/SetQuoteMessageAction.java
===================================================================
--- cdl/trunk/samples/jbossesb/brokerage/supplier/src/main/java/org/jboss/savara/examples/supplier/SetQuoteMessageAction.java	                        (rev 0)
+++ cdl/trunk/samples/jbossesb/brokerage/supplier/src/main/java/org/jboss/savara/examples/supplier/SetQuoteMessageAction.java	2009-08-21 10:10:51 UTC (rev 793)
@@ -0,0 +1,39 @@
+package org.jboss.savara.examples.supplier;
+
+import org.apache.log4j.Logger;
+import org.jboss.savara.internal.jbossesb.utils.XMLUtils;
+import org.jboss.soa.esb.actions.AbstractActionLifecycle;
+import org.jboss.soa.esb.helpers.ConfigTree;
+import org.jboss.soa.esb.message.Message;
+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;
+	}
+	
+}

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	2009-08-21 07:55:37 UTC (rev 792)
+++ cdl/trunk/samples/jbossesb/brokerage/supplier/src/main/resources/META-INF/deployment.xml	2009-08-21 10:10:51 UTC (rev 793)
@@ -1,7 +1,9 @@
 <jbossesb-deployment>
-	<depends>jboss.esb:deployment=overlord-cdl-runtime.esb</depends>
-	<depends>org.pi4soa.esbbroker.esbbroker.destination:service=Queue,name=org_pi4soa_esbbroker_esbbroker_ESBBrokerProcess_SupplierTxnProcessor</depends>
-	<depends>org.pi4soa.esbbroker.esbbroker.destination:service=Queue,name=org_pi4soa_esbbroker_esbbroker_ESBBrokerProcess_SupplierTxnProcessor__1</depends>
-	<depends>org.pi4soa.esbbroker.esbbroker.destination:service=Queue,name=org_pi4soa_esbbroker_esbbroker_ESBBrokerProcess_SupplierQuoteEngine</depends>
-	<depends>org.pi4soa.esbbroker.esbbroker.destination:service=Queue,name=org_pi4soa_esbbroker_esbbroker_ESBBrokerProcess_SupplierQuoteEngine__1</depends>
+	<depends>jboss.esb:deployment=savara-runtime-jbossesb.esb</depends>
+	<depends>org.jboss.savara.examples.esbbroker.destination:service=Queue,name=org_jboss_savara_examples_esbbroker_ESBBrokerProcess_SupplierQuoteEngine</depends>
+	<depends>org.jboss.savara.examples.esbbroker.destination:service=Queue,name=org_jboss_savara_examples_esbbroker_ESBBrokerProcess_SupplierQuoteEngine_reply</depends>
+	<depends>org.jboss.savara.examples.esbbroker.destination:service=Queue,name=org_jboss_savara_examples_esbbroker_ESBBrokerProcess_SupplierQuoteEngine__1</depends>
+	<depends>org.jboss.savara.examples.esbbroker.destination:service=Queue,name=org_jboss_savara_examples_esbbroker_ESBBrokerProcess_SupplierTxnProcessor</depends>
+	<depends>org.jboss.savara.examples.esbbroker.destination:service=Queue,name=org_jboss_savara_examples_esbbroker_ESBBrokerProcess_SupplierTxnProcessor_reply</depends>
+	<depends>org.jboss.savara.examples.esbbroker.destination:service=Queue,name=org_jboss_savara_examples_esbbroker_ESBBrokerProcess_SupplierTxnProcessor__1</depends>
 </jbossesb-deployment>

Modified: cdl/trunk/samples/jbossesb/brokerage/supplier/src/main/resources/META-INF/jboss-esb.xml
===================================================================
--- cdl/trunk/samples/jbossesb/brokerage/supplier/src/main/resources/META-INF/jboss-esb.xml	2009-08-21 07:55:37 UTC (rev 792)
+++ cdl/trunk/samples/jbossesb/brokerage/supplier/src/main/resources/META-INF/jboss-esb.xml	2009-08-21 10:10:51 UTC (rev 793)
@@ -2,91 +2,91 @@
     <providers>
         <jms-provider connection-factory="ConnectionFactory" jndi-URL="localhost" jndi-context-factory="org.jnp.interfaces.NamingContextFactory" name="JBossMQ">
             <jms-bus busid="busId1">
-                <jms-message-filter dest-name="queue/org_pi4soa_esbbroker_esbbroker_ESBBrokerProcess_SupplierTxnProcessor" dest-type="QUEUE"/>
+                <jms-message-filter dest-name="queue/org_jboss_savara_examples_esbbroker_ESBBrokerProcess_SupplierTxnProcessor" dest-type="QUEUE"/>
             </jms-bus>
             <jms-bus busid="busId2">
-                <jms-message-filter dest-name="queue/org_pi4soa_esbbroker_esbbroker_ESBBrokerProcess_SupplierTxnProcessor__1" dest-type="QUEUE"/>
+                <jms-message-filter dest-name="queue/org_jboss_savara_examples_esbbroker_ESBBrokerProcess_SupplierTxnProcessor__1" dest-type="QUEUE"/>
             </jms-bus>
             <jms-bus busid="busId3">
-                <jms-message-filter dest-name="queue/org_pi4soa_esbbroker_esbbroker_ESBBrokerProcess_SupplierQuoteEngine" dest-type="QUEUE"/>
+                <jms-message-filter dest-name="queue/org_jboss_savara_examples_esbbroker_ESBBrokerProcess_SupplierQuoteEngine" dest-type="QUEUE"/>
             </jms-bus>
             <jms-bus busid="busId4">
-                <jms-message-filter dest-name="queue/org_pi4soa_esbbroker_esbbroker_ESBBrokerProcess_SupplierQuoteEngine__1" dest-type="QUEUE"/>
+                <jms-message-filter dest-name="queue/org_jboss_savara_examples_esbbroker_ESBBrokerProcess_SupplierQuoteEngine__1" dest-type="QUEUE"/>
             </jms-bus>
         </jms-provider>
     </providers>
     <services>
-        <service category="org.pi4soa.esbbroker.esbbroker" description="" name="ESBBrokerProcess_SupplierTxnProcessor">
+        <service category="org.jboss.savara.examples.esbbroker" description="" name="ESBBrokerProcess_SupplierTxnProcessor">
             <listeners>
-                <jms-listener busidref="busId1" maxThreads="1" name="org.pi4soa.esbbroker.esbbroker-ESBBrokerProcess_SupplierTxnProcessor"/>
+                <jms-listener busidref="busId1" maxThreads="1" name="org.jboss.savara.examples.esbbroker-ESBBrokerProcess_SupplierTxnProcessor"/>
             </listeners>
-            <actions mep="OneWay">
-                <action class="org.jboss.soa.overlord.jbossesb.actions.SwitchAction" name="ESBBrokerProcess_SupplierTxnProcessor_action_1" process="process">
-                    <property name="serviceDescriptionName" value="{org.pi4soa.esbbroker.esbbroker}ESBBrokerProcess-SupplierTxnProcessor"/>
-                    <property name="conversationType" value="overlord.cdl.samples.LoanBroker at SupplierTxnProcessor"/>
+            <actions>
+                <action class="org.jboss.savara.jbossesb.actionsSwitchAction" name="ESBBrokerProcess_SupplierTxnProcessor_action_1" process="process">
+                    <property name="serviceDescriptionName" value="{org.jboss.savara.examples.esbbroker}ESBBrokerProcess-SupplierTxnProcessor"/>
+                    <property name="conversationType" value="savara.samples.LoanBroker at SupplierTxnProcessor"/>
                     <property name="paths">
-                        <case service-category="org.pi4soa.esbbroker.esbbroker" service-name="ESBBrokerProcess_SupplierTxnProcessor__1">
+                        <case service-category="org.jboss.savara.examples.esbbroker" service-name="ESBBrokerProcess_SupplierTxnProcessor__1">
                             <message type="orderConfirmed"/>
                         </case>
                     </property>
                 </action>
             </actions>
         </service>
-        <service category="org.pi4soa.esbbroker.esbbroker" description="" name="ESBBrokerProcess_SupplierTxnProcessor__1">
+        <service category="org.jboss.savara.examples.esbbroker" description="" name="ESBBrokerProcess_SupplierTxnProcessor__1">
             <listeners>
-                <jms-listener busidref="busId2" maxThreads="1" name="org.pi4soa.esbbroker.esbbroker-ESBBrokerProcess_SupplierTxnProcessor__1"/>
+                <jms-listener busidref="busId2" maxThreads="1" name="org.jboss.savara.examples.esbbroker-ESBBrokerProcess_SupplierTxnProcessor__1"/>
             </listeners>
-            <actions mep="OneWay">
-                <action class="org.jboss.savara.jbossesb.actions.ReceiveMessageAction" name="ESBBrokerProcess_SupplierTxnProcessor__1_action_1" process="process">
+            <actions>
+                <action class="org.jboss.savara.jbossesb.actionsReceiveMessageAction" name="ESBBrokerProcess_SupplierTxnProcessor__1_action_1" process="process">
                     <property name="operation" value="confirm"/>
                     <property name="messageType" value="orderConfirmed"/>
                     <property name="clientRole" value="Broker" />
-                    <property name="eprStore" value="org.jboss.savara.samples.jbossesb.supplier.MemoryEPRStorage" />
+                    <property name="eprStore" value="org.jboss.savara.examples.supplier.MemoryEPRStorage" />
                 </action>
-                <action class="org.jboss.savara.samples.jbossesb.supplier.SetOrderConfirmResponseAction" name="su-1">
+                <action class="org.jboss.savara.examples.supplier.SetOrderConfirmResponseAction" name="su-1">
                 </action>
-                <action class="org.jboss.savara.jbossesb.actions.SendMessageAction" name="ESBBrokerProcess_SupplierTxnProcessor__1_action_2" process="process">
+                <action class="org.jboss.savara.jbossesb.actionsSendMessageAction" name="ESBBrokerProcess_SupplierTxnProcessor__1_action_2" process="process">
                     <property name="operation" value="confirm"/>
                     <property name="messageType" value="bookingReference"/>
                     <property name="clientRole" value="Broker"/>
-                    <property name="eprStore" value="org.jboss.savara.samples.jbossesb.supplier.MemoryEPRStorage" />
+                    <property name="eprStore" value="org.jboss.savara.examples.supplier.MemoryEPRStorage" />
                 </action>
             </actions>
         </service>
-        <service category="org.pi4soa.esbbroker.esbbroker" description="" name="ESBBrokerProcess_SupplierQuoteEngine">
+        <service category="org.jboss.savara.examples.esbbroker" description="" name="ESBBrokerProcess_SupplierQuoteEngine">
             <listeners>
-                <jms-listener busidref="busId3" maxThreads="1" name="org.pi4soa.esbbroker.esbbroker-ESBBrokerProcess_SupplierQuoteEngine"/>
+                <jms-listener busidref="busId3" maxThreads="1" name="org.jboss.savara.examples.esbbroker-ESBBrokerProcess_SupplierQuoteEngine"/>
             </listeners>
-            <actions mep="OneWay">
-                <action class="org.jboss.savara.jbossesb.actions.SwitchAction" name="ESBBrokerProcess_SupplierQuoteEngine_action_1" process="process">
-                    <property name="serviceDescriptionName" value="{org.pi4soa.esbbroker.esbbroker}ESBBrokerProcess-SupplierQuoteEngine"/>
-                    <property name="conversationType" value="overlord.cdl.samples.LoanBroker at SupplierQuoteEngine"/>
+            <actions>
+                <action class="org.jboss.savara.jbossesb.actionsSwitchAction" name="ESBBrokerProcess_SupplierQuoteEngine_action_1" process="process">
+                    <property name="serviceDescriptionName" value="{org.jboss.savara.examples.esbbroker}ESBBrokerProcess-SupplierQuoteEngine"/>
+                    <property name="conversationType" value="savara.samples.LoanBroker at SupplierQuoteEngine"/>
                     <property name="paths">
-                        <case service-category="org.pi4soa.esbbroker.esbbroker" service-name="ESBBrokerProcess_SupplierQuoteEngine__1">
+                        <case service-category="org.jboss.savara.examples.esbbroker" service-name="ESBBrokerProcess_SupplierQuoteEngine__1">
                             <message type="requestForQuote"/>
                         </case>
                     </property>
                 </action>
             </actions>
         </service>
-        <service category="org.pi4soa.esbbroker.esbbroker" description="" name="ESBBrokerProcess_SupplierQuoteEngine__1">
+        <service category="org.jboss.savara.examples.esbbroker" description="" name="ESBBrokerProcess_SupplierQuoteEngine__1">
             <listeners>
-                <jms-listener busidref="busId4" maxThreads="1" name="org.pi4soa.esbbroker.esbbroker-ESBBrokerProcess_SupplierQuoteEngine__1"/>
+                <jms-listener busidref="busId4" maxThreads="1" name="org.jboss.savara.examples.esbbroker-ESBBrokerProcess_SupplierQuoteEngine__1"/>
             </listeners>
-            <actions mep="OneWay">
-                <action class="org.jboss.savara.jbossesb.actions.ReceiveMessageAction" name="ESBBrokerProcess_SupplierQuoteEngine__1_action_1" process="process">
+            <actions>
+                <action class="org.jboss.savara.jbossesb.actionsReceiveMessageAction" name="ESBBrokerProcess_SupplierQuoteEngine__1_action_1" process="process">
                     <property name="operation" value="getQuote"/>
                     <property name="messageType" value="requestForQuote"/>
-                    <property name="clientRole" value="Broker"/>
-                    <property name="eprStore" value="org.jboss.savara.samples.jbossesb.supplier.MemoryEPRStorage" />
+                    <property name="clientRole" value="Broker" />
+                    <property name="eprStore" value="org.jboss.savara.examples.supplier.MemoryEPRStorage" />
                 </action>
-                <action class="org.jboss.savara.samples.jbossesb.supplier.SetQuoteMessageAction" name="su1-2">
-                </action>                
-                <action class="org.jboss.savara.jbossesb.actions.SendMessageAction" name="ESBBrokerProcess_SupplierQuoteEngine__1_action_2" process="process">
+                <action class="org.jboss.savara.examples.supplier.SetQuoteMessageAction" name="su1-2">
+                </action> 
+                <action class="org.jboss.savara.jbossesb.actionsSendMessageAction" name="ESBBrokerProcess_SupplierQuoteEngine__1_action_2" process="process">
                     <property name="operation" value="getQuote"/>
                     <property name="messageType" value="quote"/>
                     <property name="clientRole" value="Broker"/>
-                    <property name="eprStore" value="org.jboss.savara.samples.jbossesb.supplier.MemoryEPRStorage" />                    
+                    <property name="eprStore" value="org.jboss.savara.examples.supplier.MemoryEPRStorage" />
                 </action>
             </actions>
         </service>

Modified: cdl/trunk/samples/jbossesb/brokerage/supplier/src/main/resources/jbm-queue-service.xml
===================================================================
--- cdl/trunk/samples/jbossesb/brokerage/supplier/src/main/resources/jbm-queue-service.xml	2009-08-21 07:55:37 UTC (rev 792)
+++ cdl/trunk/samples/jbossesb/brokerage/supplier/src/main/resources/jbm-queue-service.xml	2009-08-21 10:10:51 UTC (rev 793)
@@ -1,37 +1,37 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <server>
   <mbean code="org.jboss.jms.server.destination.QueueService"
-    name="org.pi4soa.esbbroker.esbbroker.destination:service=Queue,name=org_pi4soa_esbbroker_esbbroker_ESBBrokerProcess_SupplierTxnProcessor"
+    name="org.jboss.savara.examples.esbbroker.destination:service=Queue,name=org_jboss_savara_examples_esbbroker_ESBBrokerProcess_SupplierTxnProcessor"
     xmbean-dd="xmdesc/Queue-xmbean.xml">
 	<depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends>
 	<depends>jboss.messaging:service=PostOffice</depends>
   </mbean>
   <mbean code="org.jboss.jms.server.destination.QueueService"
-    name="org.pi4soa.esbbroker.esbbroker.destination:service=Queue,name=org_pi4soa_esbbroker_esbbroker_ESBBrokerProcess_SupplierTxnProcessor_reply"
+    name="org.jboss.savara.examples.esbbroker.destination:service=Queue,name=org_jboss_savara_examples_esbbroker_ESBBrokerProcess_SupplierTxnProcessor_reply"
     xmbean-dd="xmdesc/Queue-xmbean.xml">
 	<depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends>
 	<depends>jboss.messaging:service=PostOffice</depends>
   </mbean>
   <mbean code="org.jboss.jms.server.destination.QueueService"
-    name="org.pi4soa.esbbroker.esbbroker.destination:service=Queue,name=org_pi4soa_esbbroker_esbbroker_ESBBrokerProcess_SupplierTxnProcessor__1"
+    name="org.jboss.savara.examples.esbbroker.destination:service=Queue,name=org_jboss_savara_examples_esbbroker_ESBBrokerProcess_SupplierTxnProcessor__1"
     xmbean-dd="xmdesc/Queue-xmbean.xml">
 	<depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends>
 	<depends>jboss.messaging:service=PostOffice</depends>
   </mbean>
   <mbean code="org.jboss.jms.server.destination.QueueService"
-    name="org.pi4soa.esbbroker.esbbroker.destination:service=Queue,name=org_pi4soa_esbbroker_esbbroker_ESBBrokerProcess_SupplierQuoteEngine"
+    name="org.jboss.savara.examples.esbbroker.destination:service=Queue,name=org_jboss_savara_examples_esbbroker_ESBBrokerProcess_SupplierQuoteEngine"
     xmbean-dd="xmdesc/Queue-xmbean.xml">
 	<depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends>
 	<depends>jboss.messaging:service=PostOffice</depends>
   </mbean>
   <mbean code="org.jboss.jms.server.destination.QueueService"
-    name="org.pi4soa.esbbroker.esbbroker.destination:service=Queue,name=org_pi4soa_esbbroker_esbbroker_ESBBrokerProcess_SupplierQuoteEngine_reply"
+    name="org.jboss.savara.examples.esbbroker.destination:service=Queue,name=org_jboss_savara_examples_esbbroker_ESBBrokerProcess_SupplierQuoteEngine_reply"
     xmbean-dd="xmdesc/Queue-xmbean.xml">
 	<depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends>
 	<depends>jboss.messaging:service=PostOffice</depends>
   </mbean>
   <mbean code="org.jboss.jms.server.destination.QueueService"
-    name="org.pi4soa.esbbroker.esbbroker.destination:service=Queue,name=org_pi4soa_esbbroker_esbbroker_ESBBrokerProcess_SupplierQuoteEngine__1"
+    name="org.jboss.savara.examples.esbbroker.destination:service=Queue,name=org_jboss_savara_examples_esbbroker_ESBBrokerProcess_SupplierQuoteEngine__1"
     xmbean-dd="xmdesc/Queue-xmbean.xml">
 	<depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends>
 	<depends>jboss.messaging:service=PostOffice</depends>

Modified: cdl/trunk/samples/jbossesb/brokerage/supplier/src/main/resources/jbmq-queue-service.xml
===================================================================
--- cdl/trunk/samples/jbossesb/brokerage/supplier/src/main/resources/jbmq-queue-service.xml	2009-08-21 07:55:37 UTC (rev 792)
+++ cdl/trunk/samples/jbossesb/brokerage/supplier/src/main/resources/jbmq-queue-service.xml	2009-08-21 10:10:51 UTC (rev 793)
@@ -1,36 +1,36 @@
 <server>
 	<mbean code="org.jboss.mq.server.jmx.Queue"
-			name="org.pi4soa.esbbroker.esbbroker.destination:service=Queue,name=org_pi4soa_esbbroker_esbbroker_ESBBrokerProcess_SupplierTxnProcessor">
+			name="org.jboss.savara.examples.esbbroker.destination:service=Queue,name=org_jboss_savara_examples_esbbroker_ESBBrokerProcess_SupplierTxnProcessor">
 		<depends optional-attribute-name="DestinationManager">
 			jboss.mq:service=DestinationManager
 		</depends>
 	</mbean>
-    <mbean code="org.jboss.mq.server.jmx.Queue"
-			name="org.pi4soa.esbbroker.esbbroker.destination:service=Queue,name=org_pi4soa_esbbroker_esbbroker_ESBBrokerProcess_SupplierTxnProcessor_reply">
+	<mbean code="org.jboss.mq.server.jmx.Queue"
+			name="org.jboss.savara.examples.esbbroker.destination:service=Queue,name=org_jboss_savara_examples_esbbroker_ESBBrokerProcess_SupplierTxnProcessor_reply">
 		<depends optional-attribute-name="DestinationManager">
 			jboss.mq:service=DestinationManager
 		</depends>
 	</mbean>
 	<mbean code="org.jboss.mq.server.jmx.Queue"
-			name="org.pi4soa.esbbroker.esbbroker.destination:service=Queue,name=org_pi4soa_esbbroker_esbbroker_ESBBrokerProcess_SupplierTxnProcessor__1">
+			name="org.jboss.savara.examples.esbbroker.destination:service=Queue,name=org_jboss_savara_examples_esbbroker_ESBBrokerProcess_SupplierTxnProcessor__1">
 		<depends optional-attribute-name="DestinationManager">
 			jboss.mq:service=DestinationManager
 		</depends>
 	</mbean>
 	<mbean code="org.jboss.mq.server.jmx.Queue"
-			name="org.pi4soa.esbbroker.esbbroker.destination:service=Queue,name=org_pi4soa_esbbroker_esbbroker_ESBBrokerProcess_SupplierQuoteEngine">
+			name="org.jboss.savara.examples.esbbroker.destination:service=Queue,name=org_jboss_savara_examples_esbbroker_ESBBrokerProcess_SupplierQuoteEngine__1">
 		<depends optional-attribute-name="DestinationManager">
 			jboss.mq:service=DestinationManager
 		</depends>
 	</mbean>
 	<mbean code="org.jboss.mq.server.jmx.Queue"
-			name="org.pi4soa.esbbroker.esbbroker.destination:service=Queue,name=org_pi4soa_esbbroker_esbbroker_ESBBrokerProcess_SupplierQuoteEngine_reply">
+			name="org.jboss.savara.examples.esbbroker.destination:service=Queue,name=org_jboss_savara_examples_esbbroker_ESBBrokerProcess_SupplierQuoteEngine">
 		<depends optional-attribute-name="DestinationManager">
 			jboss.mq:service=DestinationManager
 		</depends>
 	</mbean>
 	<mbean code="org.jboss.mq.server.jmx.Queue"
-			name="org.pi4soa.esbbroker.esbbroker.destination:service=Queue,name=org_pi4soa_esbbroker_esbbroker_ESBBrokerProcess_SupplierQuoteEngine__1">
+			name="org.jboss.savara.examples.esbbroker.destination:service=Queue,name=org_jboss_savara_examples_esbbroker_ESBBrokerProcess_SupplierQuoteEngine_reply">
 		<depends optional-attribute-name="DestinationManager">
 			jboss.mq:service=DestinationManager
 		</depends>

Added: cdl/trunk/samples/jbossesb/brokerage/supplier/src/scripts/esb-assembly.xml
===================================================================
--- cdl/trunk/samples/jbossesb/brokerage/supplier/src/scripts/esb-assembly.xml	                        (rev 0)
+++ cdl/trunk/samples/jbossesb/brokerage/supplier/src/scripts/esb-assembly.xml	2009-08-21 10:10:51 UTC (rev 793)
@@ -0,0 +1,18 @@
+<assembly 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/xsd/assembly-1.1.0-SNAPSHOT.xsd">
+  <id>esb</id>
+  <formats>
+    <format>zip</format>
+  </formats>
+  <includeBaseDirectory>true</includeBaseDirectory>
+  <fileSets>
+    <fileSet>
+      <directory>target/classes</directory>
+      <outputDirectory>/</outputDirectory>
+      <excludes>
+       <exclude>jbmq-queue-service.xml</exclude>
+      </excludes>
+    </fileSet>
+  </fileSets>
+  
+</assembly>
\ No newline at end of file

Modified: cdl/trunk/samples/jbossesb/client/src/org/jboss/savara/examples/client/BuyerClient.java
===================================================================
--- cdl/trunk/samples/jbossesb/client/src/org/jboss/savara/examples/client/BuyerClient.java	2009-08-21 07:55:37 UTC (rev 792)
+++ cdl/trunk/samples/jbossesb/client/src/org/jboss/savara/examples/client/BuyerClient.java	2009-08-21 10:10:51 UTC (rev 793)
@@ -39,7 +39,7 @@
     	System.setProperty("javax.xml.registry.ConnectionFactoryClass","org.apache.ws.scout.registry.ConnectionFactoryImpl");
 		
         try {
-        	storeInvoker = new ServiceInvoker("org.pi4soa.purchase.purchasegoods", "PurchaseGoodsProcess_Store");
+        	storeInvoker = new ServiceInvoker("org.jboss.savara.examples.purchasegoods", "PurchaseGoodsProcess_Store");
         } catch (Exception e) {
         	e.printStackTrace();
             throw new RuntimeException("Failed to create ServiceInvoker", e);

Added: cdl/trunk/samples/jbossesb/common/creditAgency/src/main/java/org/jboss/savara/examples/purchasegoods/PurchaseGoodsProcess.java
===================================================================
--- cdl/trunk/samples/jbossesb/common/creditAgency/src/main/java/org/jboss/savara/examples/purchasegoods/PurchaseGoodsProcess.java	                        (rev 0)
+++ cdl/trunk/samples/jbossesb/common/creditAgency/src/main/java/org/jboss/savara/examples/purchasegoods/PurchaseGoodsProcess.java	2009-08-21 10:10:51 UTC (rev 793)
@@ -0,0 +1,5 @@
+package org.jboss.savara.examples.purchasegoods;
+
+
+public class PurchaseGoodsProcess {
+}
\ No newline at end of file

Modified: cdl/trunk/samples/jbossesb/common/creditAgency/src/main/java/org/jboss/savara/examples/wsdl/CreditAgencyService.java
===================================================================
--- cdl/trunk/samples/jbossesb/common/creditAgency/src/main/java/org/jboss/savara/examples/wsdl/CreditAgencyService.java	2009-08-21 07:55:37 UTC (rev 792)
+++ cdl/trunk/samples/jbossesb/common/creditAgency/src/main/java/org/jboss/savara/examples/wsdl/CreditAgencyService.java	2009-08-21 10:10:51 UTC (rev 793)
@@ -52,7 +52,7 @@
     	Message message = getRequestMessage(creditCheckRequest);
         
     	try {
-			ServiceInvoker invoker = new ServiceInvoker("org.pi4soa.purchase.purchasegoods", "PurchaseGoodsProcess_CreditAgency");
+			ServiceInvoker invoker = new ServiceInvoker("org.jboss.savara.examples.purchasegoods", "PurchaseGoodsProcess_CreditAgency");
 			Message response = invoker.deliverSync(message, 20000);
     	
 			PurchaseDetailsType result = getConvertedResponse(response);

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	2009-08-21 07:55:37 UTC (rev 792)
+++ cdl/trunk/samples/jbossesb/common/creditAgency/src/main/resources/META-INF/jboss-esb.xml	2009-08-21 10:10:51 UTC (rev 793)
@@ -23,7 +23,7 @@
         
     </providers>
     <services>
-        <service category="org.jboss.overlord.examples" name="CreditAgencyService" description="WS Frontend speaks natively to the ESB">
+        <service category="org.jboss.savara.examples" name="CreditAgencyService" description="WS Frontend speaks natively to the ESB">
             <listeners>
                 <jbr-listener name="Http-Gateway" busidref="Http-1" is-gateway="true"/>
                 <jms-listener name="WS-ESBListener" busidref="ws-esb-busId"/>

Modified: cdl/trunk/samples/jbossesb/purchasing/store/src/main/java/org/jboss/savara/examples/store/SetBuyFailedMessageAction.java
===================================================================
--- cdl/trunk/samples/jbossesb/purchasing/store/src/main/java/org/jboss/savara/examples/store/SetBuyFailedMessageAction.java	2009-08-21 07:55:37 UTC (rev 792)
+++ cdl/trunk/samples/jbossesb/purchasing/store/src/main/java/org/jboss/savara/examples/store/SetBuyFailedMessageAction.java	2009-08-21 10:10:51 UTC (rev 793)
@@ -20,7 +20,7 @@
 package org.jboss.savara.examples.store;
 
 import org.apache.log4j.Logger;
-import org.jboss.savara.jbossesb.XMLUtils;
+import org.jboss.savara.internal.jbossesb.utils.XMLUtils;
 import org.jboss.soa.esb.actions.AbstractActionLifecycle;
 import org.jboss.soa.esb.helpers.ConfigTree;
 import org.jboss.soa.esb.message.Message;

Modified: cdl/trunk/samples/jbossesb/purchasing/store/src/main/java/org/jboss/savara/examples/store/SetBuyResponseMessageAction.java
===================================================================
--- cdl/trunk/samples/jbossesb/purchasing/store/src/main/java/org/jboss/savara/examples/store/SetBuyResponseMessageAction.java	2009-08-21 07:55:37 UTC (rev 792)
+++ cdl/trunk/samples/jbossesb/purchasing/store/src/main/java/org/jboss/savara/examples/store/SetBuyResponseMessageAction.java	2009-08-21 10:10:51 UTC (rev 793)
@@ -20,7 +20,7 @@
 package org.jboss.savara.examples.store;
 
 import org.apache.log4j.Logger;
-import org.jboss.savara.jbossesb.XMLUtils;
+import org.jboss.savara.internal.jbossesb.utils.XMLUtils;
 import org.jboss.soa.esb.actions.AbstractActionLifecycle;
 import org.jboss.soa.esb.helpers.ConfigTree;
 import org.jboss.soa.esb.message.Message;

Modified: cdl/trunk/samples/jbossesb/purchasing/store/src/main/java/org/jboss/savara/examples/store/SetCreditCheckRequestMessageAction.java
===================================================================
--- cdl/trunk/samples/jbossesb/purchasing/store/src/main/java/org/jboss/savara/examples/store/SetCreditCheckRequestMessageAction.java	2009-08-21 07:55:37 UTC (rev 792)
+++ cdl/trunk/samples/jbossesb/purchasing/store/src/main/java/org/jboss/savara/examples/store/SetCreditCheckRequestMessageAction.java	2009-08-21 10:10:51 UTC (rev 793)
@@ -20,7 +20,7 @@
 package org.jboss.savara.examples.store;
 
 import org.apache.log4j.Logger;
-import org.jboss.savara.jbossesb.XMLUtils;
+import org.jboss.savara.internal.jbossesb.utils.XMLUtils;
 import org.jboss.soa.esb.actions.AbstractActionLifecycle;
 import org.jboss.soa.esb.helpers.ConfigTree;
 import org.jboss.soa.esb.message.Message;



More information about the overlord-commits mailing list