[jboss-svn-commits] JBL Code SVN: r12469 - in labs/jbossesb/workspace/dbevenius: product/core/listeners/src/org/jboss/soa/esb/listeners/gateway and 33 other directories.

jboss-svn-commits at lists.jboss.org jboss-svn-commits at lists.jboss.org
Mon Jun 11 16:28:49 EDT 2007


Author: beve
Date: 2007-06-11 16:28:48 -0400 (Mon, 11 Jun 2007)
New Revision: 12469

Added:
   labs/jbossesb/workspace/dbevenius/product/lib/ext/antlr-2.7.6.jar
   labs/jbossesb/workspace/dbevenius/product/lib/ext/antlr-3.0b7.jar
   labs/jbossesb/workspace/dbevenius/product/lib/ext/stringtemplate-3.0.jar
   labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/business_rules_service/
   labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/business_rules_service/MyBusinessRules.drl
   labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/business_rules_service/MyBusinessRulesDiscount.drl
   labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/business_rules_service/MyRoutingRules.drl
   labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/business_rules_service/SampleOrder.xml
   labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/business_rules_service/build.xml
   labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/business_rules_service/deployment.xml
   labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/business_rules_service/jbm-queue-service.xml
   labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/business_rules_service/jbmq-queue-service.xml
   labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/business_rules_service/jboss-esb.xml
   labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/business_rules_service/jbossesb-properties.xml
   labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/business_rules_service/jndi.properties
   labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/business_rules_service/juddi.properties
   labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/business_rules_service/lib/
   labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/business_rules_service/log4j.xml
   labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/business_rules_service/readme.txt
   labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/business_rules_service/smooks-res.xml
   labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/business_rules_service/src/
   labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/business_rules_service/src/org/
   labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/business_rules_service/src/org/jboss/
   labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/business_rules_service/src/org/jboss/soa/
   labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/business_rules_service/src/org/jboss/soa/esb/
   labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/business_rules_service/src/org/jboss/soa/esb/dvdstore/
   labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/business_rules_service/src/org/jboss/soa/esb/dvdstore/Customer.java
   labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/business_rules_service/src/org/jboss/soa/esb/dvdstore/DVDStoreAction.java
   labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/business_rules_service/src/org/jboss/soa/esb/dvdstore/OrderHeader.java
   labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/business_rules_service/src/org/jboss/soa/esb/dvdstore/OrderItem.java
   labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/business_rules_service/src/org/jboss/soa/esb/dvdstore/orderitem.st
   labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/business_rules_service/src/org/jboss/soa/esb/samples/
   labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/business_rules_service/src/org/jboss/soa/esb/samples/quickstart/
   labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/business_rules_service/src/org/jboss/soa/esb/samples/quickstart/businessrules/
   labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/business_rules_service/src/org/jboss/soa/esb/samples/quickstart/businessrules/ReviewMessage.java
   labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/business_rules_service/src/org/jboss/soa/esb/samples/quickstart/businessrules/SetupMessage.java
   labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/business_rules_service/src/org/jboss/soa/esb/samples/quickstart/businessrules/test/
   labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/business_rules_service/src/org/jboss/soa/esb/samples/quickstart/businessrules/test/SendJMSMessage.java
   labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/fun_cbr/FunCBRRules-XPath.drl
   labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/simple_cbr/SimpleCBRRules-XPath.drl
   labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/simple_cbr/SimpleCBRRules.drl
   labs/jbossesb/workspace/dbevenius/product/tools/console/lib/antlr-3.0b7.jar
   labs/jbossesb/workspace/dbevenius/product/tools/console/lib/stringtemplate-3.0.jar
   labs/jbossesb/workspace/dbevenius/qa/junit/resources/server/simple/META-INF/deployment.xml
Removed:
   labs/jbossesb/workspace/dbevenius/product/core/rosetta/src/org/jboss/soa/esb/helpers/persist/HibernateConn.java
   labs/jbossesb/workspace/dbevenius/product/lib/ext/antlr-2.7.6.jar
   labs/jbossesb/workspace/dbevenius/product/lib/ext/antlr-3.0ea8.jar
   labs/jbossesb/workspace/dbevenius/product/lib/ext/stringtemplate-2.3b6.jar
   labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/business_rules_service/MyBusinessRules.drl
   labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/business_rules_service/MyBusinessRulesDiscount.drl
   labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/business_rules_service/MyRoutingRules.drl
   labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/business_rules_service/SampleOrder.xml
   labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/business_rules_service/build.xml
   labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/business_rules_service/deployment.xml
   labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/business_rules_service/jbm-queue-service.xml
   labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/business_rules_service/jbmq-queue-service.xml
   labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/business_rules_service/jboss-esb.xml
   labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/business_rules_service/jbossesb-properties.xml
   labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/business_rules_service/jndi.properties
   labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/business_rules_service/juddi.properties
   labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/business_rules_service/lib/
   labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/business_rules_service/log4j.xml
   labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/business_rules_service/readme.txt
   labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/business_rules_service/smooks-res.xml
   labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/business_rules_service/src/
   labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/business_rules_service/src/org/
   labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/business_rules_service/src/org/jboss/
   labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/business_rules_service/src/org/jboss/soa/
   labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/business_rules_service/src/org/jboss/soa/esb/
   labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/business_rules_service/src/org/jboss/soa/esb/dvdstore/
   labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/business_rules_service/src/org/jboss/soa/esb/dvdstore/Customer.java
   labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/business_rules_service/src/org/jboss/soa/esb/dvdstore/DVDStoreAction.java
   labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/business_rules_service/src/org/jboss/soa/esb/dvdstore/OrderHeader.java
   labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/business_rules_service/src/org/jboss/soa/esb/dvdstore/OrderItem.java
   labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/business_rules_service/src/org/jboss/soa/esb/dvdstore/orderitem.st
   labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/business_rules_service/src/org/jboss/soa/esb/samples/
   labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/business_rules_service/src/org/jboss/soa/esb/samples/quickstart/
   labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/business_rules_service/src/org/jboss/soa/esb/samples/quickstart/businessrules/
   labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/business_rules_service/src/org/jboss/soa/esb/samples/quickstart/businessrules/ReviewMessage.java
   labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/business_rules_service/src/org/jboss/soa/esb/samples/quickstart/businessrules/SetupMessage.java
   labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/business_rules_service/src/org/jboss/soa/esb/samples/quickstart/businessrules/test/
   labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/business_rules_service/src/org/jboss/soa/esb/samples/quickstart/businessrules/test/SendJMSMessage.java
   labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/fun_cbr/src/services/
   labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/simple_cbr/src/services/
   labs/jbossesb/workspace/dbevenius/product/tools/console/lib/antlr-3.0ea8.jar
   labs/jbossesb/workspace/dbevenius/product/tools/console/lib/stringtemplate-2.3b6.jar
Modified:
   labs/jbossesb/workspace/dbevenius/product/build-distr.xml
   labs/jbossesb/workspace/dbevenius/product/core/listeners/src/org/jboss/soa/esb/listeners/gateway/HibernateEventBean.java
   labs/jbossesb/workspace/dbevenius/product/core/listeners/src/org/jboss/soa/esb/listeners/gateway/HibernateEventListener.java
   labs/jbossesb/workspace/dbevenius/product/core/listeners/src/org/jboss/soa/esb/listeners/gateway/HibernateGatewayListener.java
   labs/jbossesb/workspace/dbevenius/product/core/listeners/src/org/jboss/soa/esb/listeners/gateway/HibernateInterceptor.java
   labs/jbossesb/workspace/dbevenius/product/core/rosetta/src/org/jboss/internal/soa/esb/addressing/helpers/EPRHelper.java
   labs/jbossesb/workspace/dbevenius/product/core/rosetta/src/org/jboss/internal/soa/esb/couriers/HibernateCourier.java
   labs/jbossesb/workspace/dbevenius/product/core/rosetta/src/org/jboss/internal/soa/esb/message/format/serialized/BodyImpl.java
   labs/jbossesb/workspace/dbevenius/product/core/rosetta/src/org/jboss/internal/soa/esb/message/format/xml/BodyImpl.java
   labs/jbossesb/workspace/dbevenius/product/core/rosetta/src/org/jboss/soa/esb/addressing/eprs/HibernateEpr.java
   labs/jbossesb/workspace/dbevenius/product/core/rosetta/src/org/jboss/soa/esb/helpers/persist/HibernateSessionFactory.java
   labs/jbossesb/workspace/dbevenius/product/core/rosetta/src/org/jboss/soa/esb/message/Body.java
   labs/jbossesb/workspace/dbevenius/product/core/rosetta/src/org/jboss/soa/esb/util/Util.java
   labs/jbossesb/workspace/dbevenius/product/core/rosetta/tests/src/org/jboss/soa/esb/message/tests/MessageUnitTest.java
   labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/conf/base-build.xml
   labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/fun_cbr/build.xml
   labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/helloworld_hibernate_action/build.xml
   labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/helloworld_hibernate_action/readme.txt
   labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/simple_cbr/build.xml
   labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/tests/build.xml
   labs/jbossesb/workspace/dbevenius/product/services/smooks/src/main/java/org/jboss/soa/esb/actions/converters/SmooksTransformer.java
   labs/jbossesb/workspace/dbevenius/product/tools/console/resources/META-INF/application.xml
Log:
Merge from main 12407:12458

Modified: labs/jbossesb/workspace/dbevenius/product/build-distr.xml
===================================================================
--- labs/jbossesb/workspace/dbevenius/product/build-distr.xml	2007-06-11 20:11:01 UTC (rev 12468)
+++ labs/jbossesb/workspace/dbevenius/product/build-distr.xml	2007-06-11 20:28:48 UTC (rev 12469)
@@ -128,7 +128,7 @@
             <fileset dir="${lib.ext.dir}" includes="juddi-1.0-SNAPSHOT.jar,juddi-client-1.0-SNAPSHOT.jar"/>
             <!-- smooks for transformation -->
             <fileset dir="${lib.ext.dir}"
-                     includes="opencsv-*.jar,ognl-*.jar,groovy-*.jar,commons-lang-2.1.jar"/>
+                     includes="opencsv-*.jar,ognl-*.jar,groovy-*.jar,commons-lang-2.1.jar,stringtemplate-3.0.jar,antlr-2.7.6.jar"/>
             <!-- ftp -->
             <fileset dir="${lib.ext.dir}" includes="edtftpj-*.jar"/>
             <!-- JCR repository -->

Modified: labs/jbossesb/workspace/dbevenius/product/core/listeners/src/org/jboss/soa/esb/listeners/gateway/HibernateEventBean.java
===================================================================
--- labs/jbossesb/workspace/dbevenius/product/core/listeners/src/org/jboss/soa/esb/listeners/gateway/HibernateEventBean.java	2007-06-11 20:11:01 UTC (rev 12468)
+++ labs/jbossesb/workspace/dbevenius/product/core/listeners/src/org/jboss/soa/esb/listeners/gateway/HibernateEventBean.java	2007-06-11 20:28:48 UTC (rev 12469)
@@ -1,5 +1,33 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2006, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY 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 along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
 package org.jboss.soa.esb.listeners.gateway;
 
+/**
+ * Bean for hibernate events - contains an event and a class name.
+ * 
+ * @author <a href="mailto:tcunning at redhat.com">tcunning at redhat.com</a>
+ * @since Version 4.2
+ * 
+ */
 public class HibernateEventBean {
 	private String m_event;
 	private String m_className;
@@ -7,22 +35,44 @@
 	public HibernateEventBean() {
 	}
 	
+	/**
+	 * Constructor
+	 * @param f_event event
+	 * @param f_className class name
+	 */
 	public HibernateEventBean(String f_event, String f_className) {
 		m_event = f_event;
 		m_className = f_className;
 	}
 	
+	/**
+	 * Accessor for class name.
+	 * @return class name
+	 */
 	public String getClassname() {
 		return m_className;
 	}
 	
-	public void setClassname(String name) {
-		m_className = name;
+	/**
+	 * Mutator for class name
+	 * @param name class name
+	 */
+	public void setClassname(String classname) {
+		m_className = classname;
 	}
+	
+	/**
+	 * Accessor for list of events.
+	 * @return comma separated list of events
+	 */
 	public String getEvent() {
 		return m_event;
 	}
 	
+	/**
+	 * Mutator for event
+	 * @param m_event
+	 */
 	public void setEvent(String m_event) {
 		this.m_event = m_event;
 	}

Modified: labs/jbossesb/workspace/dbevenius/product/core/listeners/src/org/jboss/soa/esb/listeners/gateway/HibernateEventListener.java
===================================================================
--- labs/jbossesb/workspace/dbevenius/product/core/listeners/src/org/jboss/soa/esb/listeners/gateway/HibernateEventListener.java	2007-06-11 20:11:01 UTC (rev 12468)
+++ labs/jbossesb/workspace/dbevenius/product/core/listeners/src/org/jboss/soa/esb/listeners/gateway/HibernateEventListener.java	2007-06-11 20:28:48 UTC (rev 12469)
@@ -21,7 +21,6 @@
  */
 package org.jboss.soa.esb.listeners.gateway;
 
-import java.io.Serializable;
 import java.util.Map;
 import java.util.Set;
 import java.util.concurrent.BlockingQueue;
@@ -30,19 +29,14 @@
 import org.apache.log4j.Logger;
 import org.hibernate.HibernateException;
 import org.hibernate.event.*;
-import org.jboss.soa.esb.ConfigurationException;
-import org.jboss.soa.esb.helpers.ConfigTree;
-import org.jboss.soa.esb.helpers.persist.HibernateConn;
 
-import org.jboss.soa.esb.listeners.message.AbstractMessageComposer;
-import org.jboss.soa.esb.listeners.message.MessageDeliverException;
-import org.jboss.soa.esb.message.Message;
-
 /**
  * This class is a Hibernate EventListener which implements hooks to all the available
  * hibernate events.   It's not used at the moment, but might be a way of augmenting  
  * the Hibernate Interceptor hooks which are currently implemented.
  * 
+ * Again, please note that this file is not currently used.
+ * 
  * @author <a href="mailto:tcunning at redhat.com">tcunning at redhat.com</a>
  */
 public class HibernateEventListener implements 
@@ -70,7 +64,6 @@
 								SaveOrUpdateEventListener {
 
 	private static final long serialVersionUID = 7125882028251049616L;
-	protected HibernateConn m_conn;
 	protected final static Logger m_logger = Logger.getLogger(HibernateEventListener.class);
 	
 	public HibernateEventListener() {
@@ -132,79 +125,6 @@
 		
 	}
 	
-	/// hibernate message composer
-	public static class HibernateMessageComposer extends AbstractMessageComposer {
-		
-		@Override
-		protected void populateMessage(Message message, Object obj) throws MessageDeliverException {
-			Object instanceObj = null;
-			String entityName = null;
-			Serializable entityId = null;
-			Object result = null;
-			EventSource source = null;
-			Serializable requestId = null;
-			String type = null;
-			
-			
-			if(obj instanceof DeleteEvent) {
-				DeleteEvent devent = (DeleteEvent)obj;
-				entityName =  devent.getEntityName();
-				instanceObj  = devent.getObject();
-				source = devent.getSession();
-				type = "delete";
-			} else if (obj instanceof SaveOrUpdateEvent) {
-				SaveOrUpdateEvent sevent = (SaveOrUpdateEvent) obj;
-				entityName = sevent.getEntityName();
-				instanceObj = sevent.getObject();
-				source = sevent.getSession();
-				entityId = sevent.getResultId();
-				requestId = sevent.getRequestedId();
-				type = "saveOrUpdate";
-			} else if (obj instanceof LoadEvent) {
-				LoadEvent levent = (LoadEvent)obj;
-				instanceObj = levent.getInstanceToLoad();
-				entityName = levent.getEntityClassName();
-				entityId = levent.getEntityId();
-				result = levent.getResult();
-				source = levent.getSession();
-				type = "load";
-			}
-			
-
-
-			if(source != null) 
-				message.getProperties().setProperty("eventSource",source);
-			if(instanceObj != null) 
-				message.getProperties().setProperty("objectInstance",instanceObj);
-			if(entityId != null) 
-				message.getProperties().setProperty("entityId",entityId);
-			if(requestId != null) 
-					message.getProperties().setProperty("requestId",requestId);
-			if(entityName != null) 
-				message.getProperties().setProperty("entityName",entityName);
-			if(type != null) 
-				message.getProperties().setProperty("type",type);
-		}
-
-		public void setConfiguration(ConfigTree config) {
-		}
-		
-	}
-	
-	/**
-	 * Obtain a new database connection with parameter info
-	 * 
-	 * @return A new connection
-	 * @throws ConfigurationException -
-	 *             if problems are encountered
-	 */
-	protected HibernateConn getHibernateConn()
-	{
-		if (null == m_conn) {	
-		}
-		return m_conn;
-	}
-
 	public void onDelete(DeleteEvent arg0, Set arg1) throws HibernateException {
 		System.out.println("HibernateEventLister!");
 		m_logger.error("onDelete");

Modified: labs/jbossesb/workspace/dbevenius/product/core/listeners/src/org/jboss/soa/esb/listeners/gateway/HibernateGatewayListener.java
===================================================================
--- labs/jbossesb/workspace/dbevenius/product/core/listeners/src/org/jboss/soa/esb/listeners/gateway/HibernateGatewayListener.java	2007-06-11 20:11:01 UTC (rev 12468)
+++ labs/jbossesb/workspace/dbevenius/product/core/listeners/src/org/jboss/soa/esb/listeners/gateway/HibernateGatewayListener.java	2007-06-11 20:28:48 UTC (rev 12469)
@@ -104,25 +104,18 @@
 			// Grab the session factory and close it - if we have a hot re-deploy,
 			// we need to close the SessionFactory so that the old interceptors don't get
 			// in the way.
-			SessionFactory sf = null;
-			try {
-				sf = HibernateSessionFactory.getInstance(cfg);
-				sf.close();
-			} catch (Exception e) {
-				// Ignore.
-			}
-			
-			sf = HibernateSessionFactory.getInstance(cfg);
 			if (eventList.size() != 0) {
 				cfg.setInterceptor(new HibernateInterceptor(m_config, eventList));
 			}		
+
+			SessionFactory sf = null;
+			HibernateSessionFactory.close(cfg);
+			
+			sf = HibernateSessionFactory.getInstance(cfg);
+
 		} catch (ConfigurationException ce) {
 			throw new ManagedLifecycleException(ce.getMessage());
 		}
-		
-
-		
-
 	}
 
 	@Override

Modified: labs/jbossesb/workspace/dbevenius/product/core/listeners/src/org/jboss/soa/esb/listeners/gateway/HibernateInterceptor.java
===================================================================
--- labs/jbossesb/workspace/dbevenius/product/core/listeners/src/org/jboss/soa/esb/listeners/gateway/HibernateInterceptor.java	2007-06-11 20:11:01 UTC (rev 12468)
+++ labs/jbossesb/workspace/dbevenius/product/core/listeners/src/org/jboss/soa/esb/listeners/gateway/HibernateInterceptor.java	2007-06-11 20:28:48 UTC (rev 12469)
@@ -46,7 +46,6 @@
 import org.jboss.soa.esb.listeners.ListenerTagNames;
 import org.jboss.soa.esb.listeners.ListenerUtil;
 import org.jboss.soa.esb.listeners.RegistryUtil;
-import org.jboss.soa.esb.listeners.gateway.HibernateEventListener.HibernateMessageComposer;
 import org.jboss.soa.esb.listeners.lifecycle.ManagedLifecycleException;
 import org.jboss.soa.esb.message.Message;
 import org.jboss.soa.esb.services.registry.RegistryException;
@@ -97,9 +96,6 @@
 	public HibernateInterceptor(ConfigTree f_config, ArrayList<HibernateEventBean> f_list) throws ManagedLifecycleException {
 		m_config = f_config;
 		m_events = f_list;
-		m_composerName = HibernateMessageComposer.class.getName();
-		m_composerClass = HibernateMessageComposer.class;
-		m_composer = new HibernateMessageComposer();
 		
         try {
         	m_targetServiceCategory = ListenerUtil.obtainAtt(m_config,
@@ -138,14 +134,11 @@
 						.getName() + "> returned a null object");
 			}
 		} catch (IllegalArgumentException e) {
-			// TODO Auto-generated catch block
-			e.printStackTrace();
+			m_logger.error("Error creating message", e);
 		} catch (IllegalAccessException e) {
-			// TODO Auto-generated catch block
-			e.printStackTrace();
+			m_logger.error("Error creating message", e);
 		} catch (InvocationTargetException e) {
-			// TODO Auto-generated catch block
-			e.printStackTrace();
+			m_logger.error("Error creating message", e);
 		}
 		Message message = (Message) obj;
 		return message;

Modified: labs/jbossesb/workspace/dbevenius/product/core/rosetta/src/org/jboss/internal/soa/esb/addressing/helpers/EPRHelper.java
===================================================================
--- labs/jbossesb/workspace/dbevenius/product/core/rosetta/src/org/jboss/internal/soa/esb/addressing/helpers/EPRHelper.java	2007-06-11 20:11:01 UTC (rev 12468)
+++ labs/jbossesb/workspace/dbevenius/product/core/rosetta/src/org/jboss/internal/soa/esb/addressing/helpers/EPRHelper.java	2007-06-11 20:28:48 UTC (rev 12469)
@@ -38,6 +38,7 @@
 import org.jboss.soa.esb.addressing.eprs.FTPEpr;
 import org.jboss.soa.esb.addressing.eprs.FileEpr;
 import org.jboss.soa.esb.addressing.eprs.HTTPEpr;
+import org.jboss.soa.esb.addressing.eprs.HibernateEpr;
 import org.jboss.soa.esb.addressing.eprs.JDBCEpr;
 import org.jboss.soa.esb.addressing.eprs.JMSEpr;
 import org.jboss.soa.esb.addressing.eprs.SFTPEpr;
@@ -303,6 +304,8 @@
 			eprType = HTTPEpr.type().toString();
 		else if (epr instanceof JDBCEpr)
 			eprType = JDBCEpr.type().toString();
+		else if (epr instanceof HibernateEpr)
+			eprType = HibernateEpr.type().toString();
 		else if (epr instanceof JMSEpr)
 			eprType = JMSEpr.type().toString();
 		else if (epr instanceof FTPEpr)
@@ -336,6 +339,8 @@
 				return new HTTPEpr(epr);
 			else if (eprType.equals(JDBCEpr.type().toString()))
 				return new JDBCEpr(epr);
+			else if (eprType.equals(HibernateEpr.type().toString()))
+				return new HibernateEpr(epr);
 			else if (eprType.equals(JMSEpr.type().toString()))
 				return new JMSEpr(epr);
 			else if (eprType.equals(FTPEpr.type().toString()))
@@ -392,6 +397,8 @@
 				return new HTTPEpr(epr, header);
 			else if (eprType.equals(JDBCEpr.type().toString()))
 				return new JDBCEpr(epr, header);
+			else if (eprType.equals(HibernateEpr.type().toString()))
+				return new HibernateEpr(epr, header);
 			else if (eprType.equals(JMSEpr.type().toString()))
 				return new JMSEpr(epr, header);
 			else if (eprType.equals(FTPEpr.type().toString()))

Modified: labs/jbossesb/workspace/dbevenius/product/core/rosetta/src/org/jboss/internal/soa/esb/couriers/HibernateCourier.java
===================================================================
--- labs/jbossesb/workspace/dbevenius/product/core/rosetta/src/org/jboss/internal/soa/esb/couriers/HibernateCourier.java	2007-06-11 20:11:01 UTC (rev 12468)
+++ labs/jbossesb/workspace/dbevenius/product/core/rosetta/src/org/jboss/internal/soa/esb/couriers/HibernateCourier.java	2007-06-11 20:28:48 UTC (rev 12469)
@@ -21,24 +21,17 @@
  */
 package org.jboss.internal.soa.esb.couriers;
 
-import java.io.Serializable;
 import java.net.URI;
 import java.net.URISyntaxException;
-import java.util.List;
 import java.util.UUID;
 
 import org.apache.log4j.Logger;
-import org.hibernate.HibernateException;
 import org.hibernate.Query;
 import org.jboss.soa.esb.addressing.Call;
-import org.jboss.soa.esb.addressing.MalformedEPRException;
 import org.jboss.soa.esb.addressing.eprs.HibernateEpr;
 import org.jboss.soa.esb.couriers.CourierException;
 import org.jboss.soa.esb.couriers.CourierTimeoutException;
-import org.jboss.soa.esb.helpers.persist.HibernateConn;
 import org.jboss.soa.esb.message.Message;
-import org.jboss.soa.esb.util.Util;
-import org.xml.sax.SAXParseException;
 
 /**
  * Courier which delivers message.
@@ -49,7 +42,6 @@
  */
 public class HibernateCourier implements PickUpOnlyCourier, DeliverOnlyCourier {
 
-	protected HibernateConn m_conn = null;
 	protected HibernateEpr m_epr = null;
 	protected static Logger m_Logger = Logger.getLogger(HibernateCourier.class);
 
@@ -82,13 +74,6 @@
 	}
 
 	public void cleanup() {
-		if (null != m_conn) {
-			try {
-				m_conn.release();
-			} catch (Exception e) {
-				m_Logger.error("Unable to release connection", e);
-			}
-		}
 	}
 
 	/**
@@ -118,38 +103,7 @@
 		} catch (URISyntaxException e) {
 			throw new CourierException("Problems with message header ",e);
 		}
-		/*
-		if (null == m_conn) {
-			try {
-				m_conn = getConn();
-			} catch (Exception e) {
-				throw new CourierException(e);
-			}
-		}
 
-		
-		while (m_conn != null) {
-			try {
-				//TODO: Need to get the inserts working
-				int iCol = 1;
-				Query ins = insertStatement();
-				return true;
-			} catch (HibernateException e) {
-				if (null != m_conn) {
-					try {
-						m_conn.rollback();
-					} catch (Exception roll) {
-						m_Logger.error("", roll);
-					}
-				}
-				
-				m_Logger.error("Hibernate exception during deliver", e);
-				throw new CourierException(e);
-			} catch (Exception e) {
-				m_Logger.error("", e);
-			}
-		}
-		*/
 		return false;
 	}
 	
@@ -160,249 +114,15 @@
 	
 	public Message pickup(long millis) throws CourierException,
 			CourierTimeoutException {
-		Message result = null;
-		/*
-		long limit = System.currentTimeMillis()
-				+ ((millis < 100) ? 100 : millis);
-		do {
-			try {
-				List<String> list  = getRowList();
-								
-				if (null != list) {
-					for (String messageId : list) {
-						if (null == (result = tryToPickup(messageId)))
-							continue;
-						return result;
-					}
-				}
-			} catch (Exception e) {
-				m_Logger.error("Exception during pickup", e);
-				return null;
-			} finally {
-				if (m_conn != null) {
-					try {
-						m_conn.rollback();
-					} catch (HibernateException e) {} //ignore
-				}
-			}
-
-			try {
-				long lSleep = limit - System.currentTimeMillis();
-                if (m_pollLatency < lSleep)
-                	lSleep = m_pollLatency;
-                if (lSleep > 0)
-                	Thread.sleep(lSleep);
-			} catch (InterruptedException e) {
-				return null;
-			}
-		} while (System.currentTimeMillis() <= limit);
-		 */
 		return null;
 	}
 	
-	
-	/*
-	private List getRowList() throws CourierException
-	{
-		if (null == m_conn)
-		{
-			try {
-				m_conn = getConn();
-			} catch (Exception e) {
-				throw new CourierException(e);
-			}
-		}
-		while (m_conn != null)
-		{
-			try {
-				Query query = listStatement();
-				return m_conn.execQuery(query);
-			} catch (Exception e) {
-				m_Logger.error("Problem getting row list", e);
-			}
-		}
-		return null;
-	}
-	*/
-	
-	/*
-	protected Query listStatement()
-	{
-		if (null == m_prepGetList)
-			try {
-				String sb = "select x." + m_epr.getMessageField() + ", "
-				+ "x." + m_epr.getTimestampColumn() + " "
-				+ "from " + m_epr.getClassName() + " x "
-				+ "where x." + m_epr.getStatusField() + " = " + State.Pending.getColumnValue();
-				m_prepGetList = getConn().getSession().createQuery(sb);
-			} catch (Exception e) {
-				m_Logger.debug("Unable to prepare list query", e);
-				return null;
-			}
-		return m_prepGetList;
-	}
-	*/
 
-	/*
-	private Query insertStatement() {
-		if (null == m_prepInsert)
-			try
-			{
-				String[] columns =
-				{m_epr.getMessageField(), m_epr.getDataField(),
-						m_epr.getStatusField(), m_epr.getTimestampColumn() };
-
-				StringBuilder sb = new StringBuilder("insert into ").append(
-						m_epr.getClassName()).append("(");
-				int i1 = 0;
-				for (String col : columns)
-					sb.append((i1++ < 1) ? " " : ",").append(col);
-				sb.append(") values (?,?,?,?)");
-				m_prepInsert = getConn().getSession().createQuery(sb.toString());
-			} catch (Exception e) {
-				m_Logger.debug("Problem creating insertion query: ", e);
-				return null;
-			}
-		return m_prepInsert;
-	}
-	*/
 	
-	/*
-	private Message tryToPickup(String messageId) {
-		int iParm = 1;
-
-		Query updateQuery = selectUpdateStatement();
-		updateQuery.setString("messageid", messageId);
-		updateQuery.setString("statusid", State.Pending.getColumnValue());
-
-		while (m_conn != null) {
-			try {
-				List<String>list = m_conn.execQuery(updateQuery);
-				for (String data : list) {
-					Exception courEx = null;
-					try {
-						Message result = Util.deserialize((Serializable) data);
-						deleteMsg(messageId);
-						changeStatus(messageId, State.Done);
-						return result;
-					} catch (ClassCastException e) {
-						m_Logger.debug("", e);
-						courEx = e;
-					} catch (SAXParseException e) {
-						m_Logger.debug("", e);
-						courEx = e;
-					} catch (Exception e) {
-						throw new CourierException(e);
-					}
-					if (null != courEx) {
-						deleteMsg(messageId);
-						changeStatus(messageId, State.Error);
-						continue;
-					}
-				}
-				return null;
-			} catch (Exception e) {
-				m_Logger.error("", e);
-			}
-		}
-		return null;
-	}
-	*/
-	
-	/*
-	protected Query selectUpdateStatement() {
-		if (m_prepSelUpd == null) {
-			try {
-				String sb = "select x." + m_epr.getDataField() + " "
-					+ "from " + m_epr.getClassName() + " x "
-					+ "where x." + m_epr.getMessageField() + " =  :messageid "
-					+ "and x." + m_epr.getStatusField() + "= :statusid";
-				Query query = getConn().getSession().createQuery(sb);
-			} catch (Exception e) {
-				m_Logger.error("Problem creating select statement", e);
-				return null;
-			}
-		}
-
-		return m_prepSelUpd;
-	}
-	*/
-	
-	/*
-	private void deleteMsg(String messageId) {
-		Query delQuery = deleteStatement();
-		delQuery.setString("messageid", messageId);
-		m_conn.execQuery(delQuery);
-		m_conn.commit();
-
-	}
-	
-	private void changeStatus(String messageId, State to) {
-		Query statusQuery = updateStatement();
-		statusQuery.setString("statusid", messageId);
-		statusQuery.setString("messageid", to.getColumnValue());
-		m_conn.execQuery(statusQuery);
-		m_conn.commit();
-	}
-	
-	private Query deleteStatement() {
-		if (null == m_prepDelete) {
-			try
-			{
-				String delStatement = new String("delete " +  m_epr.getClassName()
-						+ " x where x." + m_epr.getMessageField()
-						+ " = :messageid");
-				m_prepDelete = getConn().getSession().createQuery(delStatement);
-			} catch (Exception e) {
-				m_Logger.error("Problem creating deletion query: ", e);
-				return null;
-			}
-		}
-		return m_prepDelete;
-	}
-
-	private Query updateStatement() {
-		if (null == m_prepUpdate) {
-			try {
-				String upStatement = new String("update " +  m_epr.getClassName() + " x "
-						+ "set " + m_epr.getStatusField() + " = :statusid"
-						+ "where x." + m_epr.getStatusField()
-						+ " = :messageid");
-				m_prepUpdate = getConn().getSession().createQuery(upStatement);
-			} catch (Exception e) {
-				m_Logger.error("Problem creating update query: ", e);
-				return null;
-			}
-		}
-		return m_prepUpdate;
-	}
-	
-	private HibernateConn getConn() throws MalformedEPRException
-	{
-		if (null == m_conn) {
-			try {
-				m_conn = new HibernateConn(m_epr.getHibernateCfgFile());
-			} catch (URISyntaxException ex) {
-				throw new MalformedEPRException(ex);
-			}
-		}
-		return m_conn;
-	} 
-	
-	public void setPollLatency(Long millis)
-	{
-		if (millis <= 200)
-			m_Logger.error("Poll latency must be >= 200 milliseconds - Keeping old value of "+ m_pollLatency);
-		else
-			m_pollLatency = millis;
-	} // ________________________________
-	
-	
 	protected enum State {
 		Pending, WorkInProgress, Done, Error;
 		String getColumnValue() {
 			return toString().substring(0, 1);
 		}
 	}
-	*/
 }

Modified: labs/jbossesb/workspace/dbevenius/product/core/rosetta/src/org/jboss/internal/soa/esb/message/format/serialized/BodyImpl.java
===================================================================
--- labs/jbossesb/workspace/dbevenius/product/core/rosetta/src/org/jboss/internal/soa/esb/message/format/serialized/BodyImpl.java	2007-06-11 20:11:01 UTC (rev 12468)
+++ labs/jbossesb/workspace/dbevenius/product/core/rosetta/src/org/jboss/internal/soa/esb/message/format/serialized/BodyImpl.java	2007-06-11 20:28:48 UTC (rev 12469)
@@ -35,150 +35,149 @@
 
 public class BodyImpl implements Body, java.io.Serializable
 {
-	private static final long serialVersionUID = 0x0;
-	
-	public BodyImpl ()
+    private static final long serialVersionUID = 0x0;
+
+    public BodyImpl()
+    {
+	_content = null;
+	_objects = new Hashtable<String, Serializable>();
+    }
+
+    public void setByteArray (byte[] content)
+    {
+	_content = content;
+    }
+
+    public byte[] getByteArray ()
+    {
+	return _content;
+    }
+
+    public void setContents (byte[] content)
+    {
+	setByteArray(content);
+    }
+
+    public byte[] getContents ()
+    {
+	return getByteArray();
+    }
+
+    public void add (Object value)
+    {
+	add(Body.DEFAULT_LOCATION, value);
+    }
+
+    public void add (String name, Object value)
+    {
+	AssertArgument.isNotNull(value, "value");
+	AssertArgument.isNotNull(name, "name");
+
+	if (value instanceof Serializable)
 	{
-		_content = null;
-		_objects = new Hashtable<String, Serializable>();
+	    synchronized (_objects)
+	    {
+		_objects.put(name, (Serializable) value);
+	    }
 	}
+	else
+	    throw new IllegalArgumentException("Object must be Serializable.");
+    }
+
+    public Object get ()
+    {
+	return get(Body.DEFAULT_LOCATION);
+    }
+
+    public Object get (String name)
+    {
+	AssertArgument.isNotNull(name, "name");
 	
-	public void setByteArray (byte[] content)
+	synchronized (_objects)
 	{
-		_content = content;
+	    return _objects.get(name);
 	}
+    }
 
-	public byte[] getByteArray ()
+    public String[] getNames ()
+    {
+	Set<String> keys = _objects.keySet();
+
+	if (keys != null)
 	{
-		return _content;
+	    String[] toReturn = new String[keys.size()];
+
+	    return keys.toArray(toReturn);
 	}
-	
-	public void setContents (byte[] content)
+	else
+	    return null;
+    }
+
+    public Object remove (String name)
+    {
+	synchronized (_objects)
 	{
-		setByteArray(content);
+	    return _objects.remove(name);
 	}
+    }
 
-	public byte[] getContents ()
+    public void replace (Body b)
+    {
+	if (b == null)
+	    throw new IllegalArgumentException();
+
+	setByteArray(b.getByteArray());
+
+	_objects = ((BodyImpl) b)._objects;
+    }
+
+    public void merge (Body b)
+    {
+	if (b == null)
+	    throw new IllegalArgumentException();
+
+	byte[] toAdd = b.getByteArray();
+
+	if ((toAdd != null) && (toAdd.length > 0))
 	{
-		return getByteArray();
+	    if ((_content == null) || (_content.length == 0))
+	    {
+		_content = toAdd;
+	    }
+	    else
+	    {
+		int newSize = _content.length + toAdd.length;
+		byte[] buffer = new byte[newSize];
+
+		System.arraycopy(_content, 0, buffer, 0, _content.length);
+		System.arraycopy(toAdd, 0, buffer, _content.length,
+			toAdd.length);
+
+		_content = buffer;
+	    }
 	}
-	
-	public void add (Object value)
+    }
+
+    public String toString ()
+    {
+	String toReturn = "body: [ ";
+
+	if (_content != null)
+	    toReturn += "byte[]: " + Util.format(new String(_content));
+
+	if (_objects != null)
 	{
-		add(Body.DEFAULT_LOCATION, value);
-	}
-	
-	public void add (String name, Object value)
-	{
-        AssertArgument.isNotNull(value, "value");
-        if (name == null) {
-			name = Body.DEFAULT_LOCATION;
-        }
+	    if (_content != null)
+		toReturn += ", ";
 
-        if (value instanceof Serializable)
-		{
-			synchronized (_objects)
-			{
-				_objects.put(name, (Serializable) value);
-			}
-		}
-		else
-			throw new IllegalArgumentException("Object must be Serializable.");
+	    toReturn += "objects: " + _objects.toString();
 	}
-	
-	public Object get ()
-	{
-		return get(Body.DEFAULT_LOCATION);
-	}
-	
-	public Object get (String name)
-	{
-        if (name == null) {
-			name = Body.DEFAULT_LOCATION;
-        }
-		synchronized (_objects)
-		{
-			return _objects.get(name);
-		}
-	}
-	
-	public String[] getNames ()
-	{
-		Set<String> keys = _objects.keySet();
-		
-		if (keys != null)
-		{
-			String[] toReturn = new String[keys.size()];
-		
-			return keys.toArray(toReturn);
-		}
-		else
-			return null;
-	}
-	
-	public Object remove (String name)
-	{
-		synchronized (_objects)
-		{
-			return _objects.remove(name);
-		}
-	}
-	
-	public void replace (Body b)
-	{
-		if (b == null)
-			throw new IllegalArgumentException();
-		
-		setByteArray(b.getByteArray());
-		
-		_objects = ((BodyImpl) b)._objects;
-	}
-	
-	public void merge (Body b)
-	{
-		if (b == null)
-			throw new IllegalArgumentException();
-		
-		byte[] toAdd = b.getByteArray();
-		
-		if ((toAdd != null) && (toAdd.length > 0))
-		{
-			if ((_content == null) || (_content.length == 0))
-			{
-				_content = toAdd;
-			}
-			else
-			{
-				int newSize = _content.length + toAdd.length;
-				byte[] buffer = new byte[newSize];
-				
-				System.arraycopy(_content, 0, buffer, 0, _content.length);
-				System.arraycopy(toAdd, 0, buffer, _content.length, toAdd.length);
-				
-				_content = buffer;
-			}
-		}
-	}
-	
-	public String toString ()
-	{
-		String toReturn = "body: [ ";
-		
-		if (_content != null)
-			toReturn += "byte[]: "+Util.format(new String(_content));
-		
-		if (_objects != null)
-		{
-			if (_content != null)
-				toReturn += ", ";
-			
-			toReturn += "objects: "+_objects.toString();
-		}
-		
-		return toReturn+" ]";
-	}
-	
-	private byte[] _content;
-	private Hashtable<String, Serializable> _objects;
-	
+
+	return toReturn + " ]";
+    }
+
+    private byte[] _content;
+
+    private Hashtable<String, Serializable> _objects;
+
 }
\ No newline at end of file

Modified: labs/jbossesb/workspace/dbevenius/product/core/rosetta/src/org/jboss/internal/soa/esb/message/format/xml/BodyImpl.java
===================================================================
--- labs/jbossesb/workspace/dbevenius/product/core/rosetta/src/org/jboss/internal/soa/esb/message/format/xml/BodyImpl.java	2007-06-11 20:11:01 UTC (rev 12468)
+++ labs/jbossesb/workspace/dbevenius/product/core/rosetta/src/org/jboss/internal/soa/esb/message/format/xml/BodyImpl.java	2007-06-11 20:28:48 UTC (rev 12469)
@@ -43,287 +43,285 @@
 
 public class BodyImpl implements Body
 {
-	public static final String BODY_TAG = "Body";
+    public static final String BODY_TAG = "Body";
 
-	public static final String BYTES_TAG = "Bytes";
+    public static final String BYTES_TAG = "Bytes";
 
-	public static final String CONTENT_TAG = "Content";
+    public static final String CONTENT_TAG = "Content";
 
-	public static final String KEY_TAG = "Key";
+    public static final String KEY_TAG = "Key";
 
-	public static final String VALUE_TAG = "Value";
+    public static final String VALUE_TAG = "Value";
 
-	public BodyImpl()
-	{
-		_content = null;
-		_objects = new Hashtable<String, Object>();
-	}
+    public BodyImpl()
+    {
+	_content = null;
+	_objects = new Hashtable<String, Object>();
+    }
 
-	public void add (Object value)
-	{
-		add(Body.DEFAULT_LOCATION, value);
-	}
-	
-	public void add(String name, Object value)
-	{
-        AssertArgument.isNotNull(value, "value");
-        if (name == null) {
-			name = Body.DEFAULT_LOCATION;
-        }
+    public void add (Object value)
+    {
+	add(Body.DEFAULT_LOCATION, value);
+    }
 
-		synchronized (_objects)
-		{
-			_objects.put(name, value);
-		}
-	}
+    public void add (String name, Object value)
+    {
+	AssertArgument.isNotNull(value, "value");
+	AssertArgument.isNotNull(name, "name");
 
-	public Object get ()
+	synchronized (_objects)
 	{
-		return get(Body.DEFAULT_LOCATION);
+	    _objects.put(name, value);
 	}
+    }
+
+    public Object get ()
+    {
+	return get(Body.DEFAULT_LOCATION);
+    }
+
+    public Object get (String name)
+    {
+	AssertArgument.isNotNull(name, "name");
 	
-	public Object get(String name)
+	synchronized (_objects)
 	{
-        if (name == null) {
-			name = Body.DEFAULT_LOCATION;
-        }
-		synchronized (_objects)
-		{
-			return _objects.get(name);
-		}
+	    return _objects.get(name);
 	}
+    }
 
-	public String[] getNames()
+    public String[] getNames ()
+    {
+	Set<String> keys = _objects.keySet();
+
+	if (keys != null)
 	{
-		Set<String> keys = _objects.keySet();
+	    String[] toReturn = new String[keys.size()];
 
-		if (keys != null)
-		{
-			String[] toReturn = new String[keys.size()];
-
-			return keys.toArray(toReturn);
-		}
-		else
-			return null;
+	    return keys.toArray(toReturn);
 	}
+	else
+	    return null;
+    }
 
-	public Object remove(String name)
+    public Object remove (String name)
+    {
+	synchronized (_objects)
 	{
-		synchronized (_objects)
-		{
-			return _objects.remove(name);
-		}
+	    return _objects.remove(name);
 	}
+    }
 
-	public Element toXML(Element envelope) throws MarshalException
-	{
-		Document doc = envelope.getOwnerDocument();
-		Element bodyElement = doc.createElement(BODY_TAG);
+    public Element toXML (Element envelope) throws MarshalException
+    {
+	Document doc = envelope.getOwnerDocument();
+	Element bodyElement = doc.createElement(BODY_TAG);
 
-		envelope.appendChild(bodyElement);
+	envelope.appendChild(bodyElement);
 
-		if (_content != null)
-		{
-			Element byteElement = doc.createElement(BYTES_TAG);
+	if (_content != null)
+	{
+	    Element byteElement = doc.createElement(BYTES_TAG);
 
-			byteElement.appendChild(doc.createCDATASection(Base64
-					.encodeBytes(_content)));
+	    byteElement.appendChild(doc.createCDATASection(Base64
+		    .encodeBytes(_content)));
 
-			bodyElement.appendChild(byteElement);
-		}
+	    bodyElement.appendChild(byteElement);
+	}
 
-		/*
-		 * This would normally be handled by an external adapter.
-		 */
+	/*
+         * This would normally be handled by an external adapter.
+         */
 
-		Enumeration<String> keys = _objects.keys();
+	Enumeration<String> keys = _objects.keys();
 
-		while (keys.hasMoreElements())
-		{
-			String key = keys.nextElement();
-			Object value = _objects.get(key);
+	while (keys.hasMoreElements())
+	{
+	    String key = keys.nextElement();
+	    Object value = _objects.get(key);
 
-			Element objElement = doc.createElement(CONTENT_TAG);
-			Element keyElement = doc.createElement(KEY_TAG);
-			Element valueElement = doc.createElement(VALUE_TAG);
+	    Element objElement = doc.createElement(CONTENT_TAG);
+	    Element keyElement = doc.createElement(KEY_TAG);
+	    Element valueElement = doc.createElement(VALUE_TAG);
 
-			keyElement.appendChild(doc.createCDATASection(Base64
-					.encodeBytes(key.getBytes())));
+	    keyElement.appendChild(doc.createCDATASection(Base64
+		    .encodeBytes(key.getBytes())));
 
-			objElement.appendChild(keyElement);
-			objElement.appendChild(valueElement);
+	    objElement.appendChild(keyElement);
+	    objElement.appendChild(valueElement);
 
-			if (MarshalUnmarshalManager.getInstance().marshal(valueElement,
-					value))
-			{
-				bodyElement.appendChild(objElement);
-			}
-			else
-				throw new MarshalException("Cannot pack object " + key);
-		}
-
-		return bodyElement;
+	    if (MarshalUnmarshalManager.getInstance().marshal(valueElement,
+		    value))
+	    {
+		bodyElement.appendChild(objElement);
+	    }
+	    else
+		throw new MarshalException("Cannot pack object " + key);
 	}
 
-	public void fromXML(Element envelope) throws UnmarshalException
-	{
-		NodeList nl = envelope.getChildNodes();
+	return bodyElement;
+    }
 
-		for (int i = 0; i < nl.getLength(); i++)
-		{
-			/*
-			 * TODO
-			 * 
-			 * In the past, bugs in certain Dom implementations mean that
-			 * getElementsByName did not always work. Still the case? Plus this
-			 * way is quicker.
-			 */
+    public void fromXML (Element envelope) throws UnmarshalException
+    {
+	NodeList nl = envelope.getChildNodes();
 
-			if (nl.item(i).getNodeName().equals(BODY_TAG))
-			{
-				NodeList children = nl.item(i).getChildNodes();
+	for (int i = 0; i < nl.getLength(); i++)
+	{
+	    /*
+                 * TODO
+                 * 
+                 * In the past, bugs in certain Dom implementations mean that
+                 * getElementsByName did not always work. Still the case? Plus
+                 * this way is quicker.
+                 */
 
-				for (int j = 0; j < children.getLength(); j++)
-				{
-					Object xxx = children.item(j);
+	    if (nl.item(i).getNodeName().equals(BODY_TAG))
+	    {
+		NodeList children = nl.item(i).getChildNodes();
 
-					if (!(xxx instanceof Element))
-						continue;
+		for (int j = 0; j < children.getLength(); j++)
+		{
+		    Object xxx = children.item(j);
 
-					Element node = (Element) xxx;
+		    if (!(xxx instanceof Element))
+			continue;
 
-					if (node.getNodeName().equals(BYTES_TAG))
-					{
-						CDATASection cdata = (CDATASection) node
-								.getFirstChild();
+		    Element node = (Element) xxx;
 
-						// support empty byte (null files etc.)
+		    if (node.getNodeName().equals(BYTES_TAG))
+		    {
+			CDATASection cdata = (CDATASection) node
+				.getFirstChild();
 
-						if (cdata != null)
-							_content = Base64.decode(cdata.getWholeText());
-						else
-							_content = new byte[0];
-					}
-					else
-					{
-						if (node.getNodeName().equals(CONTENT_TAG))
-						{
-							final NodeList childList = node.getChildNodes();
+			// support empty byte (null files etc.)
 
-							String key = null;
-							Object value = null;
+			if (cdata != null)
+			    _content = Base64.decode(cdata.getWholeText());
+			else
+			    _content = new byte[0];
+		    }
+		    else
+		    {
+			if (node.getNodeName().equals(CONTENT_TAG))
+			{
+			    final NodeList childList = node.getChildNodes();
 
-							for (int k = 0; k < childList.getLength(); k++)
-							{
-								if (childList.item(k).getNodeName().equals(
-										VALUE_TAG))
-									value = MarshalUnmarshalManager
-											.getInstance()
-											.unmarshal(
-													(Element) childList.item(k));
+			    String key = null;
+			    Object value = null;
 
-								if (childList.item(k).getNodeName().equals(
-										KEY_TAG))
-								{
-									CDATASection cdata = (CDATASection) childList.item(k).getFirstChild();
+			    for (int k = 0; k < childList.getLength(); k++)
+			    {
+				if (childList.item(k).getNodeName().equals(
+					VALUE_TAG))
+				    value = MarshalUnmarshalManager
+					    .getInstance()
+					    .unmarshal(
+						    (Element) childList.item(k));
 
-									key = new String(Base64.decode(cdata
-											.getWholeText()));
-								}
-							}
+				if (childList.item(k).getNodeName().equals(
+					KEY_TAG))
+				{
+				    CDATASection cdata = (CDATASection) childList
+					    .item(k).getFirstChild();
 
-							if (value == null)
-								throw new UnmarshalException(
-										"Cannot unpack object "
-												+ node.getNodeName());
-							else
-								_objects.put(key, value);
-						}
-					}
+				    key = new String(Base64.decode(cdata
+					    .getWholeText()));
 				}
+			    }
+
+			    if (value == null)
+				throw new UnmarshalException(
+					"Cannot unpack object "
+						+ node.getNodeName());
+			    else
+				_objects.put(key, value);
 			}
+		    }
 		}
+	    }
 	}
+    }
 
-	public void setByteArray(byte[] content)
-	{
-		_content = content;
-	}
+    public void setByteArray (byte[] content)
+    {
+	_content = content;
+    }
 
-	public byte[] getByteArray()
-	{
-		return _content;
-	}
+    public byte[] getByteArray ()
+    {
+	return _content;
+    }
 
-	public void setContents (byte[] content)
-	{
-		setByteArray(content);
-	}
+    public void setContents (byte[] content)
+    {
+	setByteArray(content);
+    }
 
-	public byte[] getContents ()
-	{
-		return getByteArray();
-	}
-	
-	public void replace(Body b)
-	{
-		if (b == null)
-			throw new IllegalArgumentException();
+    public byte[] getContents ()
+    {
+	return getByteArray();
+    }
 
-		setByteArray(b.getByteArray());
+    public void replace (Body b)
+    {
+	if (b == null)
+	    throw new IllegalArgumentException();
 
-		_objects = ((BodyImpl) b)._objects;
-	}
+	setByteArray(b.getByteArray());
 
-	public void merge(Body b)
-	{
-		if (b == null)
-			throw new IllegalArgumentException();
+	_objects = ((BodyImpl) b)._objects;
+    }
 
-		byte[] toAdd = b.getByteArray();
+    public void merge (Body b)
+    {
+	if (b == null)
+	    throw new IllegalArgumentException();
 
-		if ((toAdd != null) && (toAdd.length > 0))
-		{
-			if ((_content == null) || (_content.length == 0))
-			{
-				_content = toAdd;
-			}
-			else
-			{
-				int newSize = _content.length + toAdd.length;
-				byte[] buffer = new byte[newSize];
+	byte[] toAdd = b.getByteArray();
 
-				System.arraycopy(_content, 0, buffer, 0, _content.length);
-				System.arraycopy(toAdd, 0, buffer, _content.length,
-						toAdd.length);
+	if ((toAdd != null) && (toAdd.length > 0))
+	{
+	    if ((_content == null) || (_content.length == 0))
+	    {
+		_content = toAdd;
+	    }
+	    else
+	    {
+		int newSize = _content.length + toAdd.length;
+		byte[] buffer = new byte[newSize];
 
-				_content = buffer;
-			}
-		}
+		System.arraycopy(_content, 0, buffer, 0, _content.length);
+		System.arraycopy(toAdd, 0, buffer, _content.length,
+			toAdd.length);
 
-		_objects.putAll(((BodyImpl) b)._objects);
+		_content = buffer;
+	    }
 	}
 
-	public String toString ()
+	_objects.putAll(((BodyImpl) b)._objects);
+    }
+
+    public String toString ()
+    {
+	String toReturn = "body: [ ";
+
+	if (_content != null)
+	    toReturn += "byte[]: " + Util.format(new String(_content));
+
+	if (_objects != null)
 	{
-		String toReturn = "body: [ ";
-		
-		if (_content != null)
-			toReturn += "byte[]: "+Util.format(new String(_content));
-		
-		if (_objects != null)
-		{
-			if (_content != null)
-				toReturn += ", ";
-			
-			toReturn += "objects: "+_objects.toString();
-		}
-		
-		return toReturn+" ]";
+	    if (_content != null)
+		toReturn += ", ";
+
+	    toReturn += "objects: " + _objects.toString();
 	}
-	
-	private byte[] _content;
 
-	private Hashtable<String, Object> _objects;
+	return toReturn + " ]";
+    }
 
+    private byte[] _content;
+
+    private Hashtable<String, Object> _objects;
+
 }
\ No newline at end of file

Modified: labs/jbossesb/workspace/dbevenius/product/core/rosetta/src/org/jboss/soa/esb/addressing/eprs/HibernateEpr.java
===================================================================
--- labs/jbossesb/workspace/dbevenius/product/core/rosetta/src/org/jboss/soa/esb/addressing/eprs/HibernateEpr.java	2007-06-11 20:11:01 UTC (rev 12468)
+++ labs/jbossesb/workspace/dbevenius/product/core/rosetta/src/org/jboss/soa/esb/addressing/eprs/HibernateEpr.java	2007-06-11 20:28:48 UTC (rev 12469)
@@ -29,8 +29,16 @@
 import org.w3c.dom.Element;
 import org.w3c.dom.NodeList;
 
+/**
+ * This class is a helper class for using Hibernate EPRs.
+ *
+ * @author <a href="mailto:tcunning at redhat.com">tcunning at redhat.com</a>
+ */
 public class HibernateEpr extends EPR {
-
+	// TODO: Need to remove String constants and getter/setters for messagefield,
+	// status-field, data-field, insert-timestamp-field, postDelete, errorDelete 
+	// all of which are unused.
+	
 	public static final String LOAD_LISTENER = "loadListener";
 	public static final String SAVE_LISTENER = "saveListener";
 	public static final String DELETE_LISTENER = "deleteListener";

Deleted: labs/jbossesb/workspace/dbevenius/product/core/rosetta/src/org/jboss/soa/esb/helpers/persist/HibernateConn.java
===================================================================
--- labs/jbossesb/workspace/dbevenius/product/core/rosetta/src/org/jboss/soa/esb/helpers/persist/HibernateConn.java	2007-06-11 20:11:01 UTC (rev 12468)
+++ labs/jbossesb/workspace/dbevenius/product/core/rosetta/src/org/jboss/soa/esb/helpers/persist/HibernateConn.java	2007-06-11 20:28:48 UTC (rev 12469)
@@ -1,158 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2006, JBoss Inc., and individual contributors as indicated
- * by the @authors tag. See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY 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 along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.soa.esb.helpers.persist;
-
-import java.util.List;
-
-import org.apache.log4j.Logger;
-
-import org.hibernate.Query;
-import org.hibernate.Session;
-import org.hibernate.SessionFactory;
-import org.hibernate.Transaction;
-import org.hibernate.cfg.Configuration;
-import org.jboss.soa.esb.ConfigurationException;
-
-/**
- * This class is a Hibernate EventListener which implements hooks to all the available
- * hibernate events.   It's not used at the moment, but might be a way of augmenting  
- * the Hibernate Interceptor hooks which are currently implemented.
- * 
- * @author <a href="mailto:tcunning at redhat.com">tcunning at redhat.com</a>
- */
-public class HibernateConn
-{
-	protected final static Logger m_Logger = Logger.getLogger(HibernateConn.class);
-
-	private Session m_session = null;
-	private Transaction m_tx = null;
-
-	/**
-	 * Constructor.
-	 * 
-	 * @param f_cfgfile configuration file name
-	 */
-	public HibernateConn(String f_cfgfile)
-	{
-		Configuration cfg = new Configuration();
-		cfg.configure(f_cfgfile);
-		SessionFactory sf = null;
-		try {
-			sf = HibernateSessionFactory.getInstance(cfg);
-		} catch (ConfigurationException e) {
-			m_Logger.error("", e);
-		}
-		
-		m_session = sf.getCurrentSession();
-	}
-
-	/**
-	 * 
-	 */
-	public void commit() {
-		if (null != m_tx)
-		{
-			m_tx.commit();
-		}
-	}
-
-	/**
-	 * 
-	 */
-	public void rollback() {
-		if (null != m_tx)
-		{
-			m_tx.rollback();
-		}
-	}
-
-	/**
-	 * 
-	 */
-	public void release() {
-		if (null != m_tx)
-		{
-			try
-			{
-				m_tx.rollback();
-			} catch (Exception eRoll) {
-			}
-		}
-		m_tx = null;
-	} // __________________________________
-
-	public Transaction getTransaction() {
-		if (null == m_tx)
-		{
-			connect();
-		}
-		
-		return m_tx;
-	} // __________________________________
-
-	public Session getSession() {
-		return m_session;
-	}
-	
-	public List execQuery(Query f_query) {
-		List l = null;
-		Transaction tx = null;
-		try {
-			tx = getTransaction();
-			l = f_query.list();
-			tx.commit();
-		} catch (Exception e) {
-			m_Logger.error("", e);
-			if (tx != null && tx.isActive()) {
-				tx.rollback();
-			}
-		}
-		return l;
-	}	
-	
-	private void connect() {
-		if (m_tx != null) {
-			return;
-		}
-
-		for (int i1 = 0; i1 < 5; i1++) {
-			try {
-				m_tx = m_session.beginTransaction();
-				break;
-			} catch (Exception e) {
-				m_Logger.debug("", e);
-			}
-			
-			try {
-				Thread.sleep(2000 + (new Double(100 * Math.random()))
-						.longValue());
-			} catch (InterruptedException ex) {
-				m_Logger.error("Thread interrupted.", ex);
-			}
-		}
-
-		if (m_tx == null)
-		{
-			throw new RuntimeException("connect() FAILED: no connection");
-		}
-	}
-}
\ No newline at end of file

Modified: labs/jbossesb/workspace/dbevenius/product/core/rosetta/src/org/jboss/soa/esb/helpers/persist/HibernateSessionFactory.java
===================================================================
--- labs/jbossesb/workspace/dbevenius/product/core/rosetta/src/org/jboss/soa/esb/helpers/persist/HibernateSessionFactory.java	2007-06-11 20:11:01 UTC (rev 12468)
+++ labs/jbossesb/workspace/dbevenius/product/core/rosetta/src/org/jboss/soa/esb/helpers/persist/HibernateSessionFactory.java	2007-06-11 20:28:48 UTC (rev 12469)
@@ -42,35 +42,47 @@
 public class HibernateSessionFactory {
 	public static final String HIBERNATE_JNDI = "java:comp/env/hibernate/SessionFactory";
 	
-	private static SessionFactory sf = null;
 	private static final Logger m_Logger = Logger.getLogger(HibernateSessionFactory.class);	
 	
 	private HibernateSessionFactory() {
 	}
-		
-	public static SessionFactory getInstance() {
-		if (sf != null) {
-			return sf;
-		} else { 
-			return null;
-		}
+				
+	public static SessionFactory getInstance(Configuration f_cfg) throws ConfigurationException {
+		return init(f_cfg);		
 	}
 		
-	public static SessionFactory getInstance(Configuration f_cfg) throws ConfigurationException {
-		if (sf == null) {
-			init(f_cfg);		
+	/**
+	 * Checks whether the SessionFactory exists within JNDI and whether it is closed.
+	 * @param f_cfg Hibernate Configuration - needed for SESSION_FACTORY_NAME
+	 * @return whether the Hibernate SessionFactory is in JNDI and is alive
+	 */
+	public static boolean isAlive(Configuration f_cfg) {
+		boolean result = false; 
+		SessionFactory sf = null;
+		String cfgName = f_cfg.getProperty(Environment.SESSION_FACTORY_NAME);
+
+		Context ic = null;
+		// Look up SessionFactory in JNDI
+		if (cfgName != null) {
+			try {
+				ic = new InitialContext();
+				sf = (SessionFactory) ic.lookup(cfgName);
+				result = ! sf.isClosed();
+				m_Logger.debug("Connection isAlive is " + result + ".");
+			} catch (NamingException ne) {
+			}
 		}
-		return sf;	
+		return result;
 	}
-		
+	
 	/**
 	 * Grab InitialContext out of JNDI.
 	 * @param f_cfg hibernate configuration
 	 * @throws ConfigurationException
 	 */
-	private static synchronized void init(Configuration f_cfg) throws ConfigurationException {
+	private static SessionFactory init(Configuration f_cfg) throws ConfigurationException {
 		String cfgName = f_cfg.getProperty(Environment.SESSION_FACTORY_NAME);
-
+		SessionFactory sf = null;
 		Context ic = null;
 		// Look up SessionFactory in JNDI
 		if (cfgName != null) {
@@ -95,9 +107,28 @@
 	        	throw new ConfigurationException("Hibernate Configuration is null");
 	        }
 		}
+		return sf;
 	}
 
-	public static void close() {
+	/**
+	 * Close the SessionFactory stored in JNDI at SESSION_FACTORY_NAME.
+	 * @param f_cfg hibernate configuration
+	 */
+	public static void close(Configuration f_cfg) {
+		SessionFactory sf = null;
+		
+		String cfgName = f_cfg.getProperty(Environment.SESSION_FACTORY_NAME);
+
+		Context ic = null;
+		// Look up SessionFactory in JNDI
+		if (cfgName != null) {
+			try {
+				ic = new InitialContext();
+				sf = (SessionFactory) ic.lookup(cfgName);
+			} catch (Exception e) {
+			}
+		}
+		
 		if (sf != null) {
 			sf.close();	
 		}

Modified: labs/jbossesb/workspace/dbevenius/product/core/rosetta/src/org/jboss/soa/esb/message/Body.java
===================================================================
--- labs/jbossesb/workspace/dbevenius/product/core/rosetta/src/org/jboss/soa/esb/message/Body.java	2007-06-11 20:11:01 UTC (rev 12468)
+++ labs/jbossesb/workspace/dbevenius/product/core/rosetta/src/org/jboss/soa/esb/message/Body.java	2007-06-11 20:28:48 UTC (rev 12469)
@@ -79,8 +79,11 @@
 	 * Add the specified Object to the body.
 	 * 
 	 * @param name
-	 *            The name of the object. MUST be unique within this body.  If null,
-     *            the object will be stored under the {@link Body#DEFAULT_LOCATION default name}.
+	 *            The name of the object. MUST be unique within this body. If null
+	 *            then an exception will be thrown. This is to make sure that some
+	 *            computational errors don't arbitrarily resolve to data within the message body that could
+	 *            then be misinterpreted. If someone wants to go with the default name
+	 *            then they can either use add(value) or explicitly use the default name.
 	 * @param value
 	 *            The Object to add.
 	 */
@@ -100,8 +103,11 @@
 	 * Get the specified Object, or <code>null</code> if not present.
 	 * 
 	 * @param name
-	 *            the name of the Object to retrieve.  If null,
-     *            the object will be looked for under the {@link Body#DEFAULT_LOCATION default name}.
+	 *            the name of the Object to retrieve.  If null
+	 *            then an exception will be thrown. This is to make sure that some
+	 *            computational errors don't arbitrarily resolve to data within the message body that could
+	 *            then be misinterpreted. If someone wants to go with the default name
+	 *            then they can either use add(value) or explicitly use the default name.
 	 * @return the Object.
 	 */
 

Modified: labs/jbossesb/workspace/dbevenius/product/core/rosetta/src/org/jboss/soa/esb/util/Util.java
===================================================================
--- labs/jbossesb/workspace/dbevenius/product/core/rosetta/src/org/jboss/soa/esb/util/Util.java	2007-06-11 20:11:01 UTC (rev 12468)
+++ labs/jbossesb/workspace/dbevenius/product/core/rosetta/src/org/jboss/soa/esb/util/Util.java	2007-06-11 20:28:48 UTC (rev 12469)
@@ -62,256 +62,284 @@
 
 public class Util
 {
-	private Util()
+    private Util()
+    {
+    }
+
+    public static void dumpSysProps (PrintStream p_OS)
+    {
+	String[] sa = new String[ModulePropertyManager.getPropertyManager(
+		ModulePropertyManager.TRANSPORTS_MODULE).getProperties().size()];
+	ModulePropertyManager.getPropertyManager(
+		ModulePropertyManager.TRANSPORTS_MODULE).getProperties()
+		.keySet().toArray(sa);
+	Arrays.sort(sa);
+	for (String sCurr : sa)
+	    p_OS.println(sCurr
+		    + "="
+		    + ModulePropertyManager.getPropertyManager(
+			    ModulePropertyManager.TRANSPORTS_MODULE)
+			    .getProperty(sCurr));
+    } // __________________________________
+
+    public static boolean isNullString (String p_s)
+    {
+	return (null == p_s) ? true : p_s.trim().length() < 1;
+    } // __________________________________
+
+    public static boolean isLong (String p_s)
+    {
+	if (isNullString(p_s))
+	    return false;
+
+	try
 	{
+	    Long.parseLong(p_s);
+	    return true;
 	}
-
-	public static void dumpSysProps(PrintStream p_OS)
+	catch (Exception e)
 	{
-		String[] sa = new String[ModulePropertyManager.getPropertyManager(
-				ModulePropertyManager.TRANSPORTS_MODULE).getProperties().size()];
-		ModulePropertyManager.getPropertyManager(
-				ModulePropertyManager.TRANSPORTS_MODULE).getProperties()
-				.keySet().toArray(sa);
-		Arrays.sort(sa);
-		for (String sCurr : sa)
-			p_OS.println(sCurr
-					+ "="
-					+ ModulePropertyManager.getPropertyManager(
-							ModulePropertyManager.TRANSPORTS_MODULE)
-							.getProperty(sCurr));
-	} // __________________________________
+	    return false;
+	}
+    } // __________________________________
 
-	public static boolean isNullString(String p_s)
-	{
-		return (null == p_s) ? true : p_s.trim().length() < 1;
-	} // __________________________________
+    public static boolean isPositiveLong (String p_s)
+    {
+	if (isNullString(p_s))
+	    return false;
 
-	public static boolean isLong(String p_s)
+	try
 	{
-		if (isNullString(p_s))
-			return false;
-		
-		try
-		{
-			Long.parseLong(p_s);
-			return true;
-		}
-		catch (Exception e)
-		{
-			return false;
-		}
-	} // __________________________________
+	    long lBk = Long.parseLong(p_s);
+	    return lBk > 0;
+	}
+	catch (Exception e)
+	{
+	    return false;
+	}
+    } // __________________________________
 
-	public static boolean isPositiveLong(String p_s)
+    public static int parseInt (String s)
+    {
+	if (s == null)
+	    return 0;
+
+	String sVal = s.trim();
+
+	if (sVal.length() < 1)
+	    return 0;
+	else
 	{
-		if (isNullString(p_s))
-			return false;
-		
-		try
-		{
-			long lBk = Long.parseLong(p_s);
-			return lBk > 0;
-		}
-		catch (Exception e)
-		{
-			return false;
-		}
-	} // __________________________________
+	    try
+	    {
+		return Integer.parseInt(s);
+	    }
+	    catch (NumberFormatException ex)
+	    {
+		return 0;
+	    }
+	}
+    } // __________________________________
 
-	public static int parseInt(String s)
+    public static long parseLong (String s)
+    {
+	if (s == null)
+	    return 0;
+
+	String sVal = s.trim();
+
+	if (sVal.length() < 1)
+	    return 0;
+	else
 	{
-		if (s == null)
-			return 0;
-		
-		String sVal = s.trim();
-		
-		if (sVal.length() < 1)
-			return 0;
-		else
-		{
-			try
-			{
-				return Integer.parseInt(s);
-			}
-			catch (NumberFormatException ex)
-			{
-				return 0;
-			}
-		}
-	} // __________________________________
+	    try
+	    {
+		return Long.parseLong(s);
+	    }
+	    catch (NumberFormatException ex)
+	    {
+		return 0;
+	    }
+	}
+    } // __________________________________
 
-	public static long parseLong(String s)
+    public static Logger getDefaultLogger (Class p_oCls)
+    {
+	Logger oRet = Logger.getLogger(p_oCls.getName());
+	Appender oApp = new ConsoleAppender(new TTCCLayout("ISO8601"));
+	oRet.addAppender(oApp);
+	return oRet;
+    } // __________________________________
+
+    public static Serializable serialize (Message message)
+	    throws ParserConfigurationException, IOException
+    {
+	if (message.getType().equals(
+		org.jboss.soa.esb.message.format.MessageType.JAVA_SERIALIZED))
+	    return (Serializable) message;
+
+	try
 	{
-		if (s == null)
-			return 0;
-		
-		String sVal = s.trim();
-		
-		if (sVal.length() < 1)
-			return 0;
-		else
-		{
-			try
-			{
-				return Long.parseLong(s);
-			}
-			catch (NumberFormatException ex)
-			{
-				return 0;
-			}
-		}
-	} // __________________________________
+	    DocumentBuilderFactory factory = DocumentBuilderFactory
+		    .newInstance();
 
-	public static Logger getDefaultLogger(Class p_oCls)
+	    factory.setNamespaceAware(true);
+
+	    Document doc = factory.newDocumentBuilder().newDocument();
+	    ((org.jboss.internal.soa.esb.message.format.xml.MessageImpl) message)
+		    .toXML(doc);
+	    StringWriter sWriter = new StringWriter();
+	    OutputFormat format = new OutputFormat();
+	    format.setIndenting(true);
+	    XMLSerializer xmlS = new XMLSerializer(sWriter, format);
+	    xmlS.asDOMSerializer();
+	    xmlS.serialize(doc);
+	    return sWriter.toString();
+	}
+	catch (MarshalException ex)
 	{
-		Logger oRet = Logger.getLogger(p_oCls.getName());
-		Appender oApp = new ConsoleAppender(new TTCCLayout("ISO8601"));
-		oRet.addAppender(oApp);
-		return oRet;
-	} // __________________________________
+	    throw new IOException(ex.toString());
+	}
+    }// ________________________________
 
-	public static Serializable serialize(Message message)
-			throws ParserConfigurationException, IOException
+    public static Message deserialize (Serializable serial)
+	    throws ParserConfigurationException, SAXException, IOException
+    {
+	if (serial instanceof MessageImpl) // MessageType.JAVA_SERIALIZED
+	    return (Message) serial;
+
+	try
 	{
-		if (message.getType().equals(
-				org.jboss.soa.esb.message.format.MessageType.JAVA_SERIALIZED))
-			return (Serializable) message;
+	    // MessageType.JBOSS_XML
+	    InputStream inStream = new ByteArrayInputStream(((String) serial)
+		    .getBytes());
+	    DocumentBuilderFactory factory = DocumentBuilderFactory
+		    .newInstance();
+	    factory.setNamespaceAware(true);
 
-		try
-		{
-			DocumentBuilderFactory factory = DocumentBuilderFactory.newInstance();
-			
-			factory.setNamespaceAware(true);
-			
-			Document doc = factory.newDocumentBuilder().newDocument();
-			((org.jboss.internal.soa.esb.message.format.xml.MessageImpl) message)
-					.toXML(doc);
-			StringWriter sWriter = new StringWriter();
-			OutputFormat format = new OutputFormat();
-			format.setIndenting(true);
-			XMLSerializer xmlS = new XMLSerializer(sWriter, format);
-			xmlS.asDOMSerializer();
-			xmlS.serialize(doc);
-			return sWriter.toString();
-		}
-		catch (MarshalException ex)
-		{
-			throw new IOException(ex.toString());
-		}
-	}// ________________________________
+	    DocumentBuilder builder = factory.newDocumentBuilder();
+	    Document doc = builder.parse(inStream);
 
-	public static Message deserialize(Serializable serial)
-			throws ParserConfigurationException, SAXException, IOException
+	    org.jboss.internal.soa.esb.message.format.xml.MessageImpl message = new org.jboss.internal.soa.esb.message.format.xml.MessageImpl();
+	    message.fromXML(doc);
+	    return message;
+	}
+	catch (UnmarshalException ex)
 	{
-		if (serial instanceof MessageImpl) // MessageType.JAVA_SERIALIZED
-			return (Message) serial;
+	    throw new IOException(ex.toString());
+	}
+    } // ________________________________
 
-		try
-		{
-			// MessageType.JBOSS_XML
-			InputStream inStream = new ByteArrayInputStream(((String) serial)
-					.getBytes());
-			DocumentBuilderFactory factory = DocumentBuilderFactory.newInstance();
-			factory.setNamespaceAware(true);
-			
-			DocumentBuilder builder = factory.newDocumentBuilder();
-			Document doc = builder.parse(inStream);
-	
-			org.jboss.internal.soa.esb.message.format.xml.MessageImpl message = new org.jboss.internal.soa.esb.message.format.xml.MessageImpl();
-			message.fromXML(doc);
-			return message;
-		}
-		catch (UnmarshalException ex)
-		{
-			throw new IOException(ex.toString());
-		}
-	} // ________________________________
+    public static List<KeyValuePair> propertiesFromSelector (String selector)
+    {
+	// No problem if selector is null - everything in queue will be returned
+	List<KeyValuePair> oRet = new ArrayList<KeyValuePair>();
 
-	public static List<KeyValuePair> propertiesFromSelector(String selector)
+	if (!Util.isNullString(selector))
 	{
-		// No problem if selector is null - everything in queue will be returned
-		List<KeyValuePair> oRet = new ArrayList<KeyValuePair>();
-		
-		if (!Util.isNullString(selector))
+	    for (String sCurr : selector.trim().split(","))
+	    {
+		String[] sa = sCurr.split("=");
+		if (sa.length != 2 || sa[1].charAt(0) != '\''
+			|| sa[1].charAt(-1 + sa[1].length()) != '\'')
 		{
-			for (String sCurr : selector.trim().split(","))
-			{
-				String[] sa = sCurr.split("=");
-				if (sa.length != 2 || sa[1].charAt(0) != '\''
-						|| sa[1].charAt(-1 + sa[1].length()) != '\'') {
-					throw new IllegalArgumentException("Illegal message selector syntax <" + selector + ">.  Must be 2 tokens seperated by an '=' character, and the token after the '=' character must be enclosed in single quotes.");
-                }
-                KeyValuePair oNew = new KeyValuePair(sa[0], sa[1].substring(0,
-						-1 + sa[1].length()).substring(1));
-				oRet.add(oNew);
-			}
+		    throw new IllegalArgumentException(
+			    "Illegal message selector syntax <"
+				    + selector
+				    + ">.  Must be 2 tokens seperated by an '=' character, and the token after the '=' character must be enclosed in single quotes.");
 		}
-		
-		return oRet;
-	} // ________________________________
+		KeyValuePair oNew = new KeyValuePair(sa[0], sa[1].substring(0,
+			-1 + sa[1].length()).substring(1));
+		oRet.add(oNew);
+	    }
+	}
 
-	public static String getStamp()
-	{
-		return s_oTS.format(new java.util.Date(System.currentTimeMillis()));
-	}
-	
-	/**
-	 * Attempt to format the output.
-	 * 
-	 * @param output
-	 *            Output to be formatted.
-	 * @return Output.
+	return oRet;
+    } // ________________________________
+
+    public static String getStamp ()
+    {
+	return s_oTS.format(new java.util.Date(System.currentTimeMillis()));
+    }
+
+    /**
+         * Attempt to format the output.
+         * 
+         * @param output
+         *                Output to be formatted.
+         * @return Output.
+         */
+
+    public static String format (String output)
+    {
+	/*
+	 * If it's not XML, then don't try to deal with it as if it were.
 	 */
 	
-	public static String format(String output)
+	if (!output.startsWith("<?xml"))
+	    return output;
+	
+	StreamSource source = new StreamSource(new ByteArrayInputStream(output
+		.getBytes()));
+	ByteArrayOutputStream outStream = new ByteArrayOutputStream();
+
+	try
 	{
-		StreamSource source = new StreamSource(new ByteArrayInputStream(output
-				.getBytes()));
-		ByteArrayOutputStream outStream = new ByteArrayOutputStream();
+	    Transformer transformer;
 
-		try
-		{
-			Transformer transformer;
+	    try
+	    {
+		factory.setAttribute("indent-number", new Integer(4));
+	    }
+	    catch (Exception e)
+	    {
+		// Ignore... Xalan may throw on this!!
+		// We handle Xalan indentation below (yeuckkk) ...
+	    }
+	    transformer = factory.newTransformer();
+	    transformer.setOutputProperty(OutputKeys.INDENT, "yes");
+	    // There's a bug in Java 5 re this code (formatting).
+	    // See
+                // http://forum.java.sun.com/thread.jspa?threadID=562510&start=0
+	    // and it explains the
+	    // whys of the following code.
+	    transformer.setOutputProperty(
+		    "{http://xml.apache.org/xalan}indent-amount", "4");
+	    transformer.setOutputProperty(OutputKeys.OMIT_XML_DECLARATION,
+		    "yes");
+	    transformer.setErrorListener(new NullErrorListener());
+	    transformer.transform(source, new StreamResult(outStream));
 
-            try {
-                factory.setAttribute("indent-number", new Integer(4));
-            } catch(Exception e) {
-                // Ignore... Xalan may throw on this!!
-                // We handle Xalan indentation below (yeuckkk) ...
-            }
-			transformer = factory.newTransformer();
-			transformer.setOutputProperty(OutputKeys.INDENT, "yes");
-            // There's a bug in Java 5 re this code (formatting).
-            // See http://forum.java.sun.com/thread.jspa?threadID=562510&start=0
-            // and it explains the
-            // whys of the following code.
-			transformer.setOutputProperty(
-					"{http://xml.apache.org/xalan}indent-amount", "4");
-			transformer.setOutputProperty(OutputKeys.OMIT_XML_DECLARATION,
-					"yes");
-            transformer.setErrorListener(new NullErrorListener());
-            transformer.transform(source, new StreamResult(outStream));
+	    return outStream.toString();
+	}
+	catch (Exception e)
+	{
+	    return output;
+	}
+    }
 
-			return outStream.toString();
-		}
-		catch (Exception e)
-		{
-			return output;
-		}
+    private static TransformerFactory factory = TransformerFactory
+	    .newInstance();
+
+    private static class NullErrorListener implements ErrorListener
+    {
+	public void warning (TransformerException exception)
+		throws TransformerException
+	{
 	}
 
-    private static TransformerFactory factory = TransformerFactory.newInstance();
-    private static class NullErrorListener implements ErrorListener {
-        public void warning(TransformerException exception) throws TransformerException {
-        }
-        public void error(TransformerException exception) throws TransformerException {
-        }
-        public void fatalError(TransformerException exception) throws TransformerException {
-        }
+	public void error (TransformerException exception)
+		throws TransformerException
+	{
+	}
+
+	public void fatalError (TransformerException exception)
+		throws TransformerException
+	{
+	}
     }
-	
+
     private static final SimpleDateFormat s_oTS = new SimpleDateFormat(
-			"yyyy/MM/dd hh:mm:ss.SSS");
+	    "yyyy/MM/dd hh:mm:ss.SSS");
 
 } // ____________________________________________________________________________

Modified: labs/jbossesb/workspace/dbevenius/product/core/rosetta/tests/src/org/jboss/soa/esb/message/tests/MessageUnitTest.java
===================================================================
--- labs/jbossesb/workspace/dbevenius/product/core/rosetta/tests/src/org/jboss/soa/esb/message/tests/MessageUnitTest.java	2007-06-11 20:11:01 UTC (rev 12468)
+++ labs/jbossesb/workspace/dbevenius/product/core/rosetta/tests/src/org/jboss/soa/esb/message/tests/MessageUnitTest.java	2007-06-11 20:28:48 UTC (rev 12469)
@@ -32,7 +32,7 @@
 import org.jboss.soa.esb.message.format.MessageType;
 
 /**
- * Unit tests for the Class class.
+ * Unit tests for the Message class.
  * 
  * @author Mark Little
  */

Deleted: labs/jbossesb/workspace/dbevenius/product/lib/ext/antlr-2.7.6.jar
===================================================================
(Binary files differ)

Copied: labs/jbossesb/workspace/dbevenius/product/lib/ext/antlr-2.7.6.jar (from rev 12458, labs/jbossesb/trunk/product/lib/ext/antlr-2.7.6.jar)
===================================================================
(Binary files differ)

Copied: labs/jbossesb/workspace/dbevenius/product/lib/ext/antlr-3.0b7.jar (from rev 12458, labs/jbossesb/trunk/product/lib/ext/antlr-3.0b7.jar)
===================================================================
(Binary files differ)

Deleted: labs/jbossesb/workspace/dbevenius/product/lib/ext/antlr-3.0ea8.jar
===================================================================
(Binary files differ)

Deleted: labs/jbossesb/workspace/dbevenius/product/lib/ext/stringtemplate-2.3b6.jar
===================================================================
(Binary files differ)

Copied: labs/jbossesb/workspace/dbevenius/product/lib/ext/stringtemplate-3.0.jar (from rev 12458, labs/jbossesb/trunk/product/lib/ext/stringtemplate-3.0.jar)
===================================================================
(Binary files differ)

Copied: labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/business_rules_service (from rev 12458, labs/jbossesb/trunk/product/samples/quickstarts/business_rules_service)

Deleted: labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/business_rules_service/MyBusinessRules.drl
===================================================================
--- labs/jbossesb/trunk/product/samples/quickstarts/business_rules_service/MyBusinessRules.drl	2007-06-11 18:14:26 UTC (rev 12458)
+++ labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/business_rules_service/MyBusinessRules.drl	2007-06-11 20:28:48 UTC (rev 12469)
@@ -1,43 +0,0 @@
-#created on: Oct 30, 2006
-package com.jboss.soa.esb.routing.cbr
-
-#list any import classes here.
-import org.jboss.soa.esb.message.Message;
-import org.jboss.soa.esb.message.format.MessageType;
-import org.jboss.soa.esb.dvdstore.OrderHeader;
-import org.jboss.soa.esb.dvdstore.Customer;
-
-global java.util.List destinations;
-
-
-
-rule "Logging"
-when 
-   order: OrderHeader()
-   customer: Customer()
-then
-   System.out.println("Customer Status: " + customer.getStatus());
-   System.out.println("Order Total: " + order.getTotalAmount());
-end
-
-rule "Customer Platinum Status"
- when
-   customer: Customer(status > 50)
-   order: OrderHeader(totalAmount > 50)
- then
-   System.out.println("Platinum Customer - High Priority");
-   order.setOrderPriority(3);
-end 
-
-rule "Customer Gold Status"
- when
-   customer: Customer(status > 10, status <= 50)
-   order: OrderHeader(totalAmount > 25)
- then
-   System.out.println("Gold Customer - Medium Priority ");
-   order.setOrderPriority(2);
-end 
-
-
-
-   
\ No newline at end of file

Copied: labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/business_rules_service/MyBusinessRules.drl (from rev 12458, labs/jbossesb/trunk/product/samples/quickstarts/business_rules_service/MyBusinessRules.drl)
===================================================================
--- labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/business_rules_service/MyBusinessRules.drl	                        (rev 0)
+++ labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/business_rules_service/MyBusinessRules.drl	2007-06-11 20:28:48 UTC (rev 12469)
@@ -0,0 +1,43 @@
+#created on: Oct 30, 2006
+package com.jboss.soa.esb.routing.cbr
+
+#list any import classes here.
+import org.jboss.soa.esb.message.Message;
+import org.jboss.soa.esb.message.format.MessageType;
+import org.jboss.soa.esb.dvdstore.OrderHeader;
+import org.jboss.soa.esb.dvdstore.Customer;
+
+global java.util.List destinations;
+
+
+
+rule "Logging"
+when 
+   order: OrderHeader()
+   customer: Customer()
+then
+   System.out.println("Customer Status: " + customer.getStatus());
+   System.out.println("Order Total: " + order.getTotalAmount());
+end
+
+rule "Customer Platinum Status"
+ when
+   customer: Customer(status > 50)
+   order: OrderHeader(totalAmount > 50)
+ then
+   System.out.println("Platinum Customer - High Priority");
+   order.setOrderPriority(3);
+end 
+
+rule "Customer Gold Status"
+ when
+   customer: Customer(status > 10, status <= 50)
+   order: OrderHeader(totalAmount > 25)
+ then
+   System.out.println("Gold Customer - Medium Priority ");
+   order.setOrderPriority(2);
+end 
+
+
+
+   
\ No newline at end of file

Deleted: labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/business_rules_service/MyBusinessRulesDiscount.drl
===================================================================
--- labs/jbossesb/trunk/product/samples/quickstarts/business_rules_service/MyBusinessRulesDiscount.drl	2007-06-11 18:14:26 UTC (rev 12458)
+++ labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/business_rules_service/MyBusinessRulesDiscount.drl	2007-06-11 20:28:48 UTC (rev 12469)
@@ -1,46 +0,0 @@
-#created on: Oct 30, 2006
-package com.jboss.soa.esb.routing.cbr
-
-#list any import classes here.
-import org.jboss.soa.esb.message.Message;
-import org.jboss.soa.esb.message.format.MessageType;
-import org.jboss.soa.esb.dvdstore.OrderHeader;
-import org.jboss.soa.esb.dvdstore.Customer;
-
-global java.util.List destinations;
-
-
-
-rule "Logging"
-salience 10
-when 
-   order: OrderHeader()
-   customer: Customer()
-then
-   System.out.println("Customer Status: " + customer.getStatus());
-   System.out.println("Order Total: " + order.getTotalAmount());
-end
-
-rule "Customer Platinum Status"
-salience 20
- when
-   customer: Customer(status > 50)
-   order: OrderHeader(orderPriority == 3)
- then
-   System.out.println("Platinum Customer - High Priority - Higher discount");
-   order.setOrderDiscount(8.5);
-end 
-
-rule "Customer Gold Status"
-salience 20
- when
-   customer: Customer(status > 10, status <= 50)
-   order: OrderHeader(orderPriority == 2)
- then
-   System.out.println("Gold Customer - Medium Priority - discount ");
-   order.setOrderDiscount(3.4);
-end 
-
-
-
-   
\ No newline at end of file

Copied: labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/business_rules_service/MyBusinessRulesDiscount.drl (from rev 12458, labs/jbossesb/trunk/product/samples/quickstarts/business_rules_service/MyBusinessRulesDiscount.drl)
===================================================================
--- labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/business_rules_service/MyBusinessRulesDiscount.drl	                        (rev 0)
+++ labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/business_rules_service/MyBusinessRulesDiscount.drl	2007-06-11 20:28:48 UTC (rev 12469)
@@ -0,0 +1,46 @@
+#created on: Oct 30, 2006
+package com.jboss.soa.esb.routing.cbr
+
+#list any import classes here.
+import org.jboss.soa.esb.message.Message;
+import org.jboss.soa.esb.message.format.MessageType;
+import org.jboss.soa.esb.dvdstore.OrderHeader;
+import org.jboss.soa.esb.dvdstore.Customer;
+
+global java.util.List destinations;
+
+
+
+rule "Logging"
+salience 10
+when 
+   order: OrderHeader()
+   customer: Customer()
+then
+   System.out.println("Customer Status: " + customer.getStatus());
+   System.out.println("Order Total: " + order.getTotalAmount());
+end
+
+rule "Customer Platinum Status"
+salience 20
+ when
+   customer: Customer(status > 50)
+   order: OrderHeader(orderPriority == 3)
+ then
+   System.out.println("Platinum Customer - High Priority - Higher discount");
+   order.setOrderDiscount(8.5);
+end 
+
+rule "Customer Gold Status"
+salience 20
+ when
+   customer: Customer(status > 10, status <= 50)
+   order: OrderHeader(orderPriority == 2)
+ then
+   System.out.println("Gold Customer - Medium Priority - discount ");
+   order.setOrderDiscount(3.4);
+end 
+
+
+
+   
\ No newline at end of file

Deleted: labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/business_rules_service/MyRoutingRules.drl
===================================================================
--- labs/jbossesb/trunk/product/samples/quickstarts/business_rules_service/MyRoutingRules.drl	2007-06-11 18:14:26 UTC (rev 12458)
+++ labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/business_rules_service/MyRoutingRules.drl	2007-06-11 20:28:48 UTC (rev 12469)
@@ -1,40 +0,0 @@
-#created on: Oct 30, 2006
-package com.jboss.soa.esb.routing.cbr
-
-#list any import classes here.
-import org.jboss.soa.esb.message.Message;
-import org.jboss.soa.esb.message.format.MessageType;
-import org.jboss.soa.esb.dvdstore.OrderHeader;
-
-#declare any global variables here
-global java.util.List destinations;
-
-
-rule "Highest Priority Orders"
-	
-	when
-		OrderHeader( orderPriority == 3 )
-	then
-		System.out.println("HIGHEST PRIORITY");
-		destinations.add("SuperSpecialCustomerService");
-		
-end
-
-rule "Medium Priority Orders"
-	
-	when
-		OrderHeader( orderPriority == 2 )
-	then 
-		System.out.println("Medium Priority");
-		destinations.add("SpecialCustomerService");
-end
-
-rule "Low Priority Orders"
-	
-	when
-		OrderHeader( orderPriority == 1 )
-	then 
-		System.out.println("Low Priority");
-		destinations.add("RegularCustomerService");
-end
-

Copied: labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/business_rules_service/MyRoutingRules.drl (from rev 12458, labs/jbossesb/trunk/product/samples/quickstarts/business_rules_service/MyRoutingRules.drl)
===================================================================
--- labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/business_rules_service/MyRoutingRules.drl	                        (rev 0)
+++ labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/business_rules_service/MyRoutingRules.drl	2007-06-11 20:28:48 UTC (rev 12469)
@@ -0,0 +1,40 @@
+#created on: Oct 30, 2006
+package com.jboss.soa.esb.routing.cbr
+
+#list any import classes here.
+import org.jboss.soa.esb.message.Message;
+import org.jboss.soa.esb.message.format.MessageType;
+import org.jboss.soa.esb.dvdstore.OrderHeader;
+
+#declare any global variables here
+global java.util.List destinations;
+
+
+rule "Highest Priority Orders"
+	
+	when
+		OrderHeader( orderPriority == 3 )
+	then
+		System.out.println("HIGHEST PRIORITY");
+		destinations.add("SuperSpecialCustomerService");
+		
+end
+
+rule "Medium Priority Orders"
+	
+	when
+		OrderHeader( orderPriority == 2 )
+	then 
+		System.out.println("Medium Priority");
+		destinations.add("SpecialCustomerService");
+end
+
+rule "Low Priority Orders"
+	
+	when
+		OrderHeader( orderPriority == 1 )
+	then 
+		System.out.println("Low Priority");
+		destinations.add("RegularCustomerService");
+end
+

Deleted: labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/business_rules_service/SampleOrder.xml
===================================================================
--- labs/jbossesb/trunk/product/samples/quickstarts/business_rules_service/SampleOrder.xml	2007-06-11 18:14:26 UTC (rev 12458)
+++ labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/business_rules_service/SampleOrder.xml	2007-06-11 20:28:48 UTC (rev 12469)
@@ -1,12 +0,0 @@
-<Order orderId="1" orderDate="Wed Nov 15 13:45:28 EST 2006" statusCode="0" 
-netAmount="59.97" totalAmount="64.92" tax="4.95">
-	<Customer userName="user1" firstName="Harry" lastName="Fletcher" state="SD"/>
-	<OrderLines>
-		<OrderLine position="1" quantity="1">
-			<Product productId="364" title="The 40-Year-Old Virgin " price="29.98"/>
-		</OrderLine>
-		<OrderLine position="2" quantity="1">
-			<Product productId="299" title="Pulp Fiction" price="29.99"/>
-		</OrderLine>
-	</OrderLines>
-</Order>

Copied: labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/business_rules_service/SampleOrder.xml (from rev 12458, labs/jbossesb/trunk/product/samples/quickstarts/business_rules_service/SampleOrder.xml)
===================================================================
--- labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/business_rules_service/SampleOrder.xml	                        (rev 0)
+++ labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/business_rules_service/SampleOrder.xml	2007-06-11 20:28:48 UTC (rev 12469)
@@ -0,0 +1,12 @@
+<Order orderId="1" orderDate="Wed Nov 15 13:45:28 EST 2006" statusCode="0" 
+netAmount="59.97" totalAmount="64.92" tax="4.95">
+	<Customer userName="user1" firstName="Harry" lastName="Fletcher" state="SD"/>
+	<OrderLines>
+		<OrderLine position="1" quantity="1">
+			<Product productId="364" title="The 40-Year-Old Virgin " price="29.98"/>
+		</OrderLine>
+		<OrderLine position="2" quantity="1">
+			<Product productId="299" title="Pulp Fiction" price="29.99"/>
+		</OrderLine>
+	</OrderLines>
+</Order>

Deleted: labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/business_rules_service/build.xml
===================================================================
--- labs/jbossesb/trunk/product/samples/quickstarts/business_rules_service/build.xml	2007-06-11 18:14:26 UTC (rev 12458)
+++ labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/business_rules_service/build.xml	2007-06-11 20:28:48 UTC (rev 12469)
@@ -1,22 +0,0 @@
-<project name="Quickstart_business_rules_service" default="run" basedir=".">
-	
-	<description> 
-		${ant.project.name}
-		${line.separator}
-	</description>
-		
-	<property name="additional.deploys" value="MyBusinessRulesDiscount.drl MyBusinessRules.drl MyRoutingRules.drl smooks-res.xml"/>
-
-	<!-- Import the base Ant build script... -->
-	<import file="../conf/base-build.xml"/>
-	
-	
-  <target name="runtest" depends="compile"
-	description="willl receive JMS message to tigger the actions in the ESB">
-     <echo>Runs Test JMS Sender</echo>
-     <java fork="yes" classname="org.jboss.soa.esb.samples.quickstart.businessrules.test.SendJMSMessage" failonerror="true">
-		<classpath refid="exec-classpath" />
-     </java>
-  </target>  
-	
-</project>

Copied: labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/business_rules_service/build.xml (from rev 12458, labs/jbossesb/trunk/product/samples/quickstarts/business_rules_service/build.xml)
===================================================================
--- labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/business_rules_service/build.xml	                        (rev 0)
+++ labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/business_rules_service/build.xml	2007-06-11 20:28:48 UTC (rev 12469)
@@ -0,0 +1,22 @@
+<project name="Quickstart_business_rules_service" default="run" basedir=".">
+	
+	<description> 
+		${ant.project.name}
+		${line.separator}
+	</description>
+		
+	<property name="additional.deploys" value="MyBusinessRulesDiscount.drl MyBusinessRules.drl MyRoutingRules.drl smooks-res.xml"/>
+
+	<!-- Import the base Ant build script... -->
+	<import file="../conf/base-build.xml"/>
+	
+	
+  <target name="runtest" depends="compile"
+	description="willl receive JMS message to tigger the actions in the ESB">
+     <echo>Runs Test JMS Sender</echo>
+     <java fork="yes" classname="org.jboss.soa.esb.samples.quickstart.businessrules.test.SendJMSMessage" failonerror="true">
+		<classpath refid="exec-classpath" />
+     </java>
+  </target>  
+	
+</project>

Deleted: labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/business_rules_service/deployment.xml
===================================================================
--- labs/jbossesb/trunk/product/samples/quickstarts/business_rules_service/deployment.xml	2007-06-11 18:14:26 UTC (rev 12458)
+++ labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/business_rules_service/deployment.xml	2007-06-11 20:28:48 UTC (rev 12469)
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<jbossesb-deployment>
-  <depends>jboss.esb:deployment=jbrules.esb</depends>
-  <depends>jboss.esb:deployment=smooks.esb</depends>
-  <depends>jboss.esb.quickstart.destination:service=Queue,name=quickstart_Business_Rules_Request_GW</depends>
-  <depends>jboss.esb.quickstart.destination:service=Queue,name=quickstart_Business_Rules_Request_ESB</depends>
-  <depends>jboss.esb.quickstart.destination:service=Queue,name=quickstart_Business_Rules_ConciergeManager</depends>
-  <depends>jboss.esb.quickstart.destination:service=Queue,name=quickstart_Business_Rules_DistributionManager</depends>
-  <depends>jboss.esb.quickstart.destination:service=Queue,name=quickstart_Business_Rules_BasicShipping</depends>
-</jbossesb-deployment>

Copied: labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/business_rules_service/deployment.xml (from rev 12458, labs/jbossesb/trunk/product/samples/quickstarts/business_rules_service/deployment.xml)
===================================================================
--- labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/business_rules_service/deployment.xml	                        (rev 0)
+++ labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/business_rules_service/deployment.xml	2007-06-11 20:28:48 UTC (rev 12469)
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<jbossesb-deployment>
+  <depends>jboss.esb:deployment=jbrules.esb</depends>
+  <depends>jboss.esb:deployment=smooks.esb</depends>
+  <depends>jboss.esb.quickstart.destination:service=Queue,name=quickstart_Business_Rules_Request_GW</depends>
+  <depends>jboss.esb.quickstart.destination:service=Queue,name=quickstart_Business_Rules_Request_ESB</depends>
+  <depends>jboss.esb.quickstart.destination:service=Queue,name=quickstart_Business_Rules_ConciergeManager</depends>
+  <depends>jboss.esb.quickstart.destination:service=Queue,name=quickstart_Business_Rules_DistributionManager</depends>
+  <depends>jboss.esb.quickstart.destination:service=Queue,name=quickstart_Business_Rules_BasicShipping</depends>
+</jbossesb-deployment>

Deleted: labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/business_rules_service/jbm-queue-service.xml
===================================================================
--- labs/jbossesb/trunk/product/samples/quickstarts/business_rules_service/jbm-queue-service.xml	2007-06-11 18:14:26 UTC (rev 12458)
+++ labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/business_rules_service/jbm-queue-service.xml	2007-06-11 20:28:48 UTC (rev 12469)
@@ -1,33 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<server>
-  <mbean code="org.jboss.jms.server.destination.QueueService"
-    name="jboss.esb.quickstart.destination:service=Queue,name=quickstart_Business_Rules_Request_GW"
-    xmbean-dd="xmdesc/Queue-xmbean.xml">
-    <depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends>
-	<depends>jboss.messaging:service=PostOffice</depends>
-  </mbean>
-  <mbean code="org.jboss.jms.server.destination.QueueService"
-    name="jboss.esb.quickstart.destination:service=Queue,name=quickstart_Business_Rules_Request_ESB"
-    xmbean-dd="xmdesc/Queue-xmbean.xml">
-    <depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends>
-	<depends>jboss.messaging:service=PostOffice</depends>
-  </mbean>
-  <mbean code="org.jboss.jms.server.destination.QueueService"
-    name="jboss.esb.quickstart.destination:service=Queue,name=quickstart_Business_Rules_ConciergeManager"
-    xmbean-dd="xmdesc/Queue-xmbean.xml">
-    <depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends>
-	<depends>jboss.messaging:service=PostOffice</depends>
-  </mbean>
-  <mbean code="org.jboss.jms.server.destination.QueueService"
-    name="jboss.esb.quickstart.destination:service=Queue,name=quickstart_Business_Rules_DistributionManager"
-    xmbean-dd="xmdesc/Queue-xmbean.xml">
-    <depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends>
-	<depends>jboss.messaging:service=PostOffice</depends>
-  </mbean>
-  <mbean code="org.jboss.jms.server.destination.QueueService"
-    name="jboss.esb.quickstart.destination:service=Queue,name=quickstart_Business_Rules_BasicShipping"
-    xmbean-dd="xmdesc/Queue-xmbean.xml">
-    <depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends>
-	<depends>jboss.messaging:service=PostOffice</depends>
-  </mbean>
-  </server>

Copied: labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/business_rules_service/jbm-queue-service.xml (from rev 12458, labs/jbossesb/trunk/product/samples/quickstarts/business_rules_service/jbm-queue-service.xml)
===================================================================
--- labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/business_rules_service/jbm-queue-service.xml	                        (rev 0)
+++ labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/business_rules_service/jbm-queue-service.xml	2007-06-11 20:28:48 UTC (rev 12469)
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<server>
+  <mbean code="org.jboss.jms.server.destination.QueueService"
+    name="jboss.esb.quickstart.destination:service=Queue,name=quickstart_Business_Rules_Request_GW"
+    xmbean-dd="xmdesc/Queue-xmbean.xml">
+    <depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends>
+	<depends>jboss.messaging:service=PostOffice</depends>
+  </mbean>
+  <mbean code="org.jboss.jms.server.destination.QueueService"
+    name="jboss.esb.quickstart.destination:service=Queue,name=quickstart_Business_Rules_Request_ESB"
+    xmbean-dd="xmdesc/Queue-xmbean.xml">
+    <depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends>
+	<depends>jboss.messaging:service=PostOffice</depends>
+  </mbean>
+  <mbean code="org.jboss.jms.server.destination.QueueService"
+    name="jboss.esb.quickstart.destination:service=Queue,name=quickstart_Business_Rules_ConciergeManager"
+    xmbean-dd="xmdesc/Queue-xmbean.xml">
+    <depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends>
+	<depends>jboss.messaging:service=PostOffice</depends>
+  </mbean>
+  <mbean code="org.jboss.jms.server.destination.QueueService"
+    name="jboss.esb.quickstart.destination:service=Queue,name=quickstart_Business_Rules_DistributionManager"
+    xmbean-dd="xmdesc/Queue-xmbean.xml">
+    <depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends>
+	<depends>jboss.messaging:service=PostOffice</depends>
+  </mbean>
+  <mbean code="org.jboss.jms.server.destination.QueueService"
+    name="jboss.esb.quickstart.destination:service=Queue,name=quickstart_Business_Rules_BasicShipping"
+    xmbean-dd="xmdesc/Queue-xmbean.xml">
+    <depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends>
+	<depends>jboss.messaging:service=PostOffice</depends>
+  </mbean>
+  </server>

Deleted: labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/business_rules_service/jbmq-queue-service.xml
===================================================================
--- labs/jbossesb/trunk/product/samples/quickstarts/business_rules_service/jbmq-queue-service.xml	2007-06-11 18:14:26 UTC (rev 12458)
+++ labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/business_rules_service/jbmq-queue-service.xml	2007-06-11 20:28:48 UTC (rev 12469)
@@ -1,33 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<server>
-  <mbean code="org.jboss.mq.server.jmx.Queue"
-    name="jboss.esb.quickstart.destination:service=Queue,name=quickstart_Business_Rules_Request_GW">
-    <depends optional-attribute-name="DestinationManager">
-      jboss.mq:service=DestinationManager
-    </depends>
-  </mbean>
-  <mbean code="org.jboss.mq.server.jmx.Queue"
-    name="jboss.esb.quickstart.destination:service=Queue,name=quickstart_Business_Rules_Request_ESB">
-    <depends optional-attribute-name="DestinationManager">
-      jboss.mq:service=DestinationManager
-    </depends>
-  </mbean>
-  <mbean code="org.jboss.mq.server.jmx.Queue"
-    name="jboss.esb.quickstart.destination:service=Queue,name=quickstart_Business_Rules_ConciergeManager">
-    <depends optional-attribute-name="DestinationManager">
-      jboss.mq:service=DestinationManager
-    </depends>
-  </mbean>
-  <mbean code="org.jboss.mq.server.jmx.Queue"
-    name="jboss.esb.quickstart.destination:service=Queue,name=quickstart_Business_Rules_DistributionManager">
-    <depends optional-attribute-name="DestinationManager">
-      jboss.mq:service=DestinationManager
-    </depends>
-  </mbean>
-  <mbean code="org.jboss.mq.server.jmx.Queue"
-    name="jboss.esb.quickstart.destination:service=Queue,name=quickstart_Business_Rules_BasicShipping">
-    <depends optional-attribute-name="DestinationManager">
-      jboss.mq:service=DestinationManager
-    </depends>
-  </mbean>
-</server>

Copied: labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/business_rules_service/jbmq-queue-service.xml (from rev 12458, labs/jbossesb/trunk/product/samples/quickstarts/business_rules_service/jbmq-queue-service.xml)
===================================================================
--- labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/business_rules_service/jbmq-queue-service.xml	                        (rev 0)
+++ labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/business_rules_service/jbmq-queue-service.xml	2007-06-11 20:28:48 UTC (rev 12469)
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<server>
+  <mbean code="org.jboss.mq.server.jmx.Queue"
+    name="jboss.esb.quickstart.destination:service=Queue,name=quickstart_Business_Rules_Request_GW">
+    <depends optional-attribute-name="DestinationManager">
+      jboss.mq:service=DestinationManager
+    </depends>
+  </mbean>
+  <mbean code="org.jboss.mq.server.jmx.Queue"
+    name="jboss.esb.quickstart.destination:service=Queue,name=quickstart_Business_Rules_Request_ESB">
+    <depends optional-attribute-name="DestinationManager">
+      jboss.mq:service=DestinationManager
+    </depends>
+  </mbean>
+  <mbean code="org.jboss.mq.server.jmx.Queue"
+    name="jboss.esb.quickstart.destination:service=Queue,name=quickstart_Business_Rules_ConciergeManager">
+    <depends optional-attribute-name="DestinationManager">
+      jboss.mq:service=DestinationManager
+    </depends>
+  </mbean>
+  <mbean code="org.jboss.mq.server.jmx.Queue"
+    name="jboss.esb.quickstart.destination:service=Queue,name=quickstart_Business_Rules_DistributionManager">
+    <depends optional-attribute-name="DestinationManager">
+      jboss.mq:service=DestinationManager
+    </depends>
+  </mbean>
+  <mbean code="org.jboss.mq.server.jmx.Queue"
+    name="jboss.esb.quickstart.destination:service=Queue,name=quickstart_Business_Rules_BasicShipping">
+    <depends optional-attribute-name="DestinationManager">
+      jboss.mq:service=DestinationManager
+    </depends>
+  </mbean>
+</server>

Deleted: labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/business_rules_service/jboss-esb.xml
===================================================================
--- labs/jbossesb/trunk/product/samples/quickstarts/business_rules_service/jboss-esb.xml	2007-06-11 18:14:26 UTC (rev 12458)
+++ labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/business_rules_service/jboss-esb.xml	2007-06-11 20:28:48 UTC (rev 12469)
@@ -1,167 +0,0 @@
-<?xml version = "1.0" encoding = "UTF-8"?>
-<jbossesb
-	xmlns="http://anonsvn.labs.jboss.com/labs/jbossesb/trunk/product/etc/schemas/xml/jbossesb-1.0.1.xsd">
-
-	<providers>
-		<jms-provider name="JBossMQ"
-			connection-factory="ConnectionFactory"
-			jndi-context-factory="org.jnp.interfaces.NamingContextFactory"
-			jndi-URL="localhost">
-			<jms-bus busid="quickstartGwChannel">
-				<jms-message-filter dest-type="QUEUE"
-					dest-name="queue/quickstart_Business_Rules_Request_GW" />
-			</jms-bus>
-			<jms-bus busid="quickstartEsbChannel">
-				<jms-message-filter dest-type="QUEUE"
-					dest-name="queue/quickstart_Business_Rules_Request_ESB" />
-			</jms-bus>
-			<jms-bus busid="Business_Rules_ConciergeManager">
-				<jms-message-filter dest-type="QUEUE"
-					dest-name="queue/quickstart_Business_Rules_ConciergeManager" />
-			</jms-bus>
-			<jms-bus busid="Business_Rules_DistributionManager">
-				<jms-message-filter dest-type="QUEUE"
-					dest-name="queue/quickstart_Business_Rules_DistributionManager" />
-			</jms-bus>
-			<jms-bus busid="Business_Rules_BasicShipping">
-				<jms-message-filter dest-type="QUEUE"
-					dest-name="queue/quickstart_Business_Rules_BasicShipping" />
-			</jms-bus>
-		</jms-provider>
-	</providers>
-
-	<services>
-
-		<service category="Business_RulesServices"
-			name="Business_Rules_Service" description="The main entry point">
-			<listeners>
-				<!-- Gateway -->
-				<jms-listener name="TheGateway"
-					busidref="quickstartGwChannel" maxThreads="1" is-gateway="true" />
-				<jms-listener name="TheESBChannel"
-					busidref="quickstartEsbChannel" maxThreads="1">
-				</jms-listener>
-			</listeners>
-			<actions>
-				<!--  
-					<action name="print-before" class="org.jboss.soa.esb.actions.SystemPrintln">
-					<property name="message" value="Message before transformation" />
-					</action>
-				-->
-			     
-				<action name="transform"
-					class="org.jboss.soa.esb.actions.converters.SmooksTransformer">
-					<property name="resource-config"
-						value="/smooks-res.xml" />
-				</action>
-
-				<action name="fixUpMessage"
-					class="org.jboss.soa.esb.samples.quickstart.businessrules.SetupMessage">
-					<property name="status" value="60" /><!--  status was not in order XML -->
-				</action>
-				
-				<!--  Use the BRP to calculate the order priority -->
-				<action
-					class="org.jboss.soa.esb.actions.BusinessRulesProcessor"
-					name="BRP">
-					<property name="ruleSet"
-						value="MyBusinessRules.drl" />
-					<property name="ruleReload" value="true" />
-					<property name="object-paths">
-						<object-path path="body.TheOrderHeader" />
-						<object-path path="body.TheCustomer" />
-					</property>
-				</action>
-
-				<action name="reviewMessage"
-					class="org.jboss.soa.esb.samples.quickstart.businessrules.ReviewMessage">
-					<property name="stuff" value="After Order Priority"/>
-			     </action>
-
-				<!--  Use the BRP to calculate the order discount -->
-				<action
-					class="org.jboss.soa.esb.actions.BusinessRulesProcessor"
-					name="BRP">
-					<property name="ruleSet"
-						value="MyBusinessRulesDiscount.drl" />
-					<property name="ruleReload" value="true" />
-					<property name="object-paths">
-						<object-path path="body.TheOrderHeader" />
-						<object-path path="body.TheCustomer" />
-					</property>
-				</action>
-
-				<action name="reviewMessage"
-					class="org.jboss.soa.esb.samples.quickstart.businessrules.ReviewMessage">
-					<property name="stuff" value="After Order Discount"/>
-			     </action>
-
-				<!--  Use the CBR to route the "scored" order to the appropriate service team -->
-				<action
-					class="org.jboss.soa.esb.actions.ContentBasedRouter"
-					name="ContentBasedRouter">
-					<property name="ruleSet" value="MyRoutingRules.drl" />
-					<property name="ruleReload" value="true" />
-					<property name="destinations">
-						<route-to
-							destination-name="SuperSpecialCustomerService"
-							service-category="ConciergeManager" service-name="ConciergeService" />
-						<route-to
-							destination-name="SpecialCustomerService"
-							service-category="DistributionManager" service-name="DistributionService" />
-						<route-to
-							destination-name="RegularCustomerService"
-							service-category="BasicShipping" service-name="ShipperService" />
-					</property>
-					<property name="object-paths">
-						<object-path path="body.TheOrderHeader" />
-						<object-path path="body.TheCustomer" />
-					</property>
-				</action>
-			</actions>
-		</service>
-		<service category="ConciergeManager"
-			name="ConciergeService" description="For highest priority customers">
-			<listeners>
-				<jms-listener name="Business_Rules_ConciergeManager"
-					busidref="Business_Rules_ConciergeManager" maxThreads="1">
-				</jms-listener>
-			</listeners>
-			<actions>
-			  	<action name="reviewMessage"
-					class="org.jboss.soa.esb.samples.quickstart.businessrules.ReviewMessage">
-					<property name="stuff" value="Concierge"/>
-			     </action>
-			</actions>
-		</service>
-
-		<service category="DistributionManager"
-			name="DistributionService" description="For medium priority customers">
-			<listeners>
-				<jms-listener name="Business_Rules_DistributionManager"
-					busidref="Business_Rules_DistributionManager" maxThreads="1">
-				</jms-listener>
-			</listeners>
-			<actions>
-			  	<action name="reviewMessage"
-					class="org.jboss.soa.esb.samples.quickstart.businessrules.ReviewMessage">
-					<property name="stuff" value="Distribution"/>
-			     </action>
-			</actions>
-		</service>
-		<service category="BasicShipping"
-			name="ShipperService" description="For low priority customers">
-			<listeners>
-				<jms-listener name="Business_Rules_BasicShipping"
-					busidref="Business_Rules_BasicShipping" maxThreads="1">
-				</jms-listener>
-			</listeners>
-			<actions>
-			  	<action name="reviewMessage"
-					class="org.jboss.soa.esb.samples.quickstart.businessrules.ReviewMessage">
-					<property name="stuff" value="Shipping"/>
-			     </action>
-			</actions>
-		</service>				
-	</services>
-</jbossesb>

Copied: labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/business_rules_service/jboss-esb.xml (from rev 12458, labs/jbossesb/trunk/product/samples/quickstarts/business_rules_service/jboss-esb.xml)
===================================================================
--- labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/business_rules_service/jboss-esb.xml	                        (rev 0)
+++ labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/business_rules_service/jboss-esb.xml	2007-06-11 20:28:48 UTC (rev 12469)
@@ -0,0 +1,167 @@
+<?xml version = "1.0" encoding = "UTF-8"?>
+<jbossesb
+	xmlns="http://anonsvn.labs.jboss.com/labs/jbossesb/trunk/product/etc/schemas/xml/jbossesb-1.0.1.xsd">
+
+	<providers>
+		<jms-provider name="JBossMQ"
+			connection-factory="ConnectionFactory"
+			jndi-context-factory="org.jnp.interfaces.NamingContextFactory"
+			jndi-URL="localhost">
+			<jms-bus busid="quickstartGwChannel">
+				<jms-message-filter dest-type="QUEUE"
+					dest-name="queue/quickstart_Business_Rules_Request_GW" />
+			</jms-bus>
+			<jms-bus busid="quickstartEsbChannel">
+				<jms-message-filter dest-type="QUEUE"
+					dest-name="queue/quickstart_Business_Rules_Request_ESB" />
+			</jms-bus>
+			<jms-bus busid="Business_Rules_ConciergeManager">
+				<jms-message-filter dest-type="QUEUE"
+					dest-name="queue/quickstart_Business_Rules_ConciergeManager" />
+			</jms-bus>
+			<jms-bus busid="Business_Rules_DistributionManager">
+				<jms-message-filter dest-type="QUEUE"
+					dest-name="queue/quickstart_Business_Rules_DistributionManager" />
+			</jms-bus>
+			<jms-bus busid="Business_Rules_BasicShipping">
+				<jms-message-filter dest-type="QUEUE"
+					dest-name="queue/quickstart_Business_Rules_BasicShipping" />
+			</jms-bus>
+		</jms-provider>
+	</providers>
+
+	<services>
+
+		<service category="Business_RulesServices"
+			name="Business_Rules_Service" description="The main entry point">
+			<listeners>
+				<!-- Gateway -->
+				<jms-listener name="TheGateway"
+					busidref="quickstartGwChannel" maxThreads="1" is-gateway="true" />
+				<jms-listener name="TheESBChannel"
+					busidref="quickstartEsbChannel" maxThreads="1">
+				</jms-listener>
+			</listeners>
+			<actions>
+				<!--  
+					<action name="print-before" class="org.jboss.soa.esb.actions.SystemPrintln">
+					<property name="message" value="Message before transformation" />
+					</action>
+				-->
+			     
+				<action name="transform"
+					class="org.jboss.soa.esb.actions.converters.SmooksTransformer">
+					<property name="resource-config"
+						value="/smooks-res.xml" />
+				</action>
+
+				<action name="fixUpMessage"
+					class="org.jboss.soa.esb.samples.quickstart.businessrules.SetupMessage">
+					<property name="status" value="60" /><!--  status was not in order XML -->
+				</action>
+				
+				<!--  Use the BRP to calculate the order priority -->
+				<action
+					class="org.jboss.soa.esb.actions.BusinessRulesProcessor"
+					name="BRP">
+					<property name="ruleSet"
+						value="MyBusinessRules.drl" />
+					<property name="ruleReload" value="true" />
+					<property name="object-paths">
+						<object-path path="body.TheOrderHeader" />
+						<object-path path="body.TheCustomer" />
+					</property>
+				</action>
+
+				<action name="reviewMessage"
+					class="org.jboss.soa.esb.samples.quickstart.businessrules.ReviewMessage">
+					<property name="stuff" value="After Order Priority"/>
+			     </action>
+
+				<!--  Use the BRP to calculate the order discount -->
+				<action
+					class="org.jboss.soa.esb.actions.BusinessRulesProcessor"
+					name="BRP">
+					<property name="ruleSet"
+						value="MyBusinessRulesDiscount.drl" />
+					<property name="ruleReload" value="true" />
+					<property name="object-paths">
+						<object-path path="body.TheOrderHeader" />
+						<object-path path="body.TheCustomer" />
+					</property>
+				</action>
+
+				<action name="reviewMessage"
+					class="org.jboss.soa.esb.samples.quickstart.businessrules.ReviewMessage">
+					<property name="stuff" value="After Order Discount"/>
+			     </action>
+
+				<!--  Use the CBR to route the "scored" order to the appropriate service team -->
+				<action
+					class="org.jboss.soa.esb.actions.ContentBasedRouter"
+					name="ContentBasedRouter">
+					<property name="ruleSet" value="MyRoutingRules.drl" />
+					<property name="ruleReload" value="true" />
+					<property name="destinations">
+						<route-to
+							destination-name="SuperSpecialCustomerService"
+							service-category="ConciergeManager" service-name="ConciergeService" />
+						<route-to
+							destination-name="SpecialCustomerService"
+							service-category="DistributionManager" service-name="DistributionService" />
+						<route-to
+							destination-name="RegularCustomerService"
+							service-category="BasicShipping" service-name="ShipperService" />
+					</property>
+					<property name="object-paths">
+						<object-path path="body.TheOrderHeader" />
+						<object-path path="body.TheCustomer" />
+					</property>
+				</action>
+			</actions>
+		</service>
+		<service category="ConciergeManager"
+			name="ConciergeService" description="For highest priority customers">
+			<listeners>
+				<jms-listener name="Business_Rules_ConciergeManager"
+					busidref="Business_Rules_ConciergeManager" maxThreads="1">
+				</jms-listener>
+			</listeners>
+			<actions>
+			  	<action name="reviewMessage"
+					class="org.jboss.soa.esb.samples.quickstart.businessrules.ReviewMessage">
+					<property name="stuff" value="Concierge"/>
+			     </action>
+			</actions>
+		</service>
+
+		<service category="DistributionManager"
+			name="DistributionService" description="For medium priority customers">
+			<listeners>
+				<jms-listener name="Business_Rules_DistributionManager"
+					busidref="Business_Rules_DistributionManager" maxThreads="1">
+				</jms-listener>
+			</listeners>
+			<actions>
+			  	<action name="reviewMessage"
+					class="org.jboss.soa.esb.samples.quickstart.businessrules.ReviewMessage">
+					<property name="stuff" value="Distribution"/>
+			     </action>
+			</actions>
+		</service>
+		<service category="BasicShipping"
+			name="ShipperService" description="For low priority customers">
+			<listeners>
+				<jms-listener name="Business_Rules_BasicShipping"
+					busidref="Business_Rules_BasicShipping" maxThreads="1">
+				</jms-listener>
+			</listeners>
+			<actions>
+			  	<action name="reviewMessage"
+					class="org.jboss.soa.esb.samples.quickstart.businessrules.ReviewMessage">
+					<property name="stuff" value="Shipping"/>
+			     </action>
+			</actions>
+		</service>				
+	</services>
+</jbossesb>

Deleted: labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/business_rules_service/jbossesb-properties.xml
===================================================================
--- labs/jbossesb/trunk/product/samples/quickstarts/business_rules_service/jbossesb-properties.xml	2007-06-11 18:14:26 UTC (rev 12458)
+++ labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/business_rules_service/jbossesb-properties.xml	2007-06-11 20:28:48 UTC (rev 12469)
@@ -1,84 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!--
-  JBoss, Home of Professional Open Source
-  Copyright 2006, 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) 2005-2006,
-  @author JBoss Inc.
--->
-<!-- $Id: jbossesb-unittest-properties.xml $ -->
-<!--
-  These options are described in the JBossESB manual.
-  Defaults are provided here for convenience only.
- 
-  Please read through this file prior to using the system, and consider
-  updating the specified entries.
--->
-<esb
-  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:noNamespaceSchemaLocation="jbossesb-1_0.xsd">
-    <properties name="core">
-		<property name="org.jboss.soa.esb.jndi.server.type" value="jboss"/>
-		<property name="org.jboss.soa.esb.jndi.server.url" value="localhost"/>
-		<property name="org.jboss.soa.esb.persistence.connection.factory" 	value="org.jboss.internal.soa.esb.persistence.format.MessageStoreFactoryImpl"/>
-    </properties>
-    <properties name="registry">      
-    	<property name="org.jboss.soa.esb.registry.queryManagerURI"     		
-    		value="jnp://localhost:1099/InquiryService?org.apache.juddi.registry.rmi.Inquiry#inquire"/>    		
-    	<property name="org.jboss.soa.esb.registry.lifeCycleManagerURI"     		
-    		value="jnp://localhost:1099/PublishService?org.apache.juddi.registry.rmi.Publish#publish" />
-    	<property name="org.jboss.soa.esb.registry.implementationClass" 
-    		value="org.jboss.internal.soa.esb.services.registry.JAXRRegistryImpl"/>
-    	<property name="org.jboss.soa.esb.registry.factoryClass" 
-    		value="org.apache.ws.scout.registry.ConnectionFactoryImpl"/>
-    	<property name="org.jboss.soa.esb.registry.user" 
-    		value="jbossesb"/>
-    	<property name="org.jboss.soa.esb.registry.password" 
-    	  value="password"/>
-    	<!-- the following parameter is scout specific to set the type of communication between scout and the UDDI (embedded, rmi, soap) -->
-    	<property name="org.jboss.soa.esb.scout.proxy.transportClass" 
-    		value="org.apache.ws.scout.transport.RMITransport"/>
-    </properties>
-    <properties name="transports" depends="core">
-    	<property name="org.jboss.soa.esb.mail.smtp.host" value="localhost"/>
-    	<property name="org.jboss.soa.esb.mail.smtp.user" value="jbossesb"/>
-    	<property name="org.jboss.soa.esb.mail.smtp.password" value=""/>
-    	<property name="org.jboss.soa.esb.mail.smtp.port" value="25"/>
-    </properties>
-    <properties name="connection">
-    	<property name="min-pool-size" value="5"/>
-    	<property name="max-pool=size" value="10"/>
-    	<property name="blocking-timeout-millis" value="5000"/>
-    	<property name="abandoned-connection-timeout" value="10000"/>
-    	<property name="abandoned-connection-time-interval" value="30000"/>
-    </properties>
-    <properties name="dbstore">
-		<property name="org.jboss.soa.esb.persistence.db.connection.url" 	value="jdbc:hsqldb:hsql://localhost:9001/jbossesb"/>
-		<property name="org.jboss.soa.esb.persistence.db.jdbc.driver" 		value="org.hsqldb.jdbcDriver"/>
-		<property name="org.jboss.soa.esb.persistence.db.user" 			value="sa"/>
-		<property name="org.jboss.soa.esb.persistence.db.pwd" 			value=""/>		
-		<property name="org.jboss.soa.esb.persistence.db.pool.initial.size"	value="2"/>
-		<property name="org.jboss.soa.esb.persistence.db.pool.min.size"	value="2"/>
-		<property name="org.jboss.soa.esb.persistence.db.pool.max.size"	value="5"/>
-		<!--table managed by pool to test for valid connections - created by pool automatically -->
-		<property name="org.jboss.soa.esb.persistence.db.pool.test.table"	value="pooltest"/>
-		<!-- # of milliseconds to timeout waiting for a connection from pool -->
-		<property name="org.jboss.soa.esb.persistence.db.pool.timeout.millis"	value="5000"/> 
-    </properties>
-    <properties name="messagerouting">
-    	<property name="org.jboss.soa.esb.routing.cbrClass" value="org.jboss.internal.soa.esb.services.routing.cbr.JBossRulesRouter"/>
-    </properties>
-</esb>

Copied: labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/business_rules_service/jbossesb-properties.xml (from rev 12458, labs/jbossesb/trunk/product/samples/quickstarts/business_rules_service/jbossesb-properties.xml)
===================================================================
--- labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/business_rules_service/jbossesb-properties.xml	                        (rev 0)
+++ labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/business_rules_service/jbossesb-properties.xml	2007-06-11 20:28:48 UTC (rev 12469)
@@ -0,0 +1,84 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!--
+  JBoss, Home of Professional Open Source
+  Copyright 2006, 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) 2005-2006,
+  @author JBoss Inc.
+-->
+<!-- $Id: jbossesb-unittest-properties.xml $ -->
+<!--
+  These options are described in the JBossESB manual.
+  Defaults are provided here for convenience only.
+ 
+  Please read through this file prior to using the system, and consider
+  updating the specified entries.
+-->
+<esb
+  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xsi:noNamespaceSchemaLocation="jbossesb-1_0.xsd">
+    <properties name="core">
+		<property name="org.jboss.soa.esb.jndi.server.type" value="jboss"/>
+		<property name="org.jboss.soa.esb.jndi.server.url" value="localhost"/>
+		<property name="org.jboss.soa.esb.persistence.connection.factory" 	value="org.jboss.internal.soa.esb.persistence.format.MessageStoreFactoryImpl"/>
+    </properties>
+    <properties name="registry">      
+    	<property name="org.jboss.soa.esb.registry.queryManagerURI"     		
+    		value="jnp://localhost:1099/InquiryService?org.apache.juddi.registry.rmi.Inquiry#inquire"/>    		
+    	<property name="org.jboss.soa.esb.registry.lifeCycleManagerURI"     		
+    		value="jnp://localhost:1099/PublishService?org.apache.juddi.registry.rmi.Publish#publish" />
+    	<property name="org.jboss.soa.esb.registry.implementationClass" 
+    		value="org.jboss.internal.soa.esb.services.registry.JAXRRegistryImpl"/>
+    	<property name="org.jboss.soa.esb.registry.factoryClass" 
+    		value="org.apache.ws.scout.registry.ConnectionFactoryImpl"/>
+    	<property name="org.jboss.soa.esb.registry.user" 
+    		value="jbossesb"/>
+    	<property name="org.jboss.soa.esb.registry.password" 
+    	  value="password"/>
+    	<!-- the following parameter is scout specific to set the type of communication between scout and the UDDI (embedded, rmi, soap) -->
+    	<property name="org.jboss.soa.esb.scout.proxy.transportClass" 
+    		value="org.apache.ws.scout.transport.RMITransport"/>
+    </properties>
+    <properties name="transports" depends="core">
+    	<property name="org.jboss.soa.esb.mail.smtp.host" value="localhost"/>
+    	<property name="org.jboss.soa.esb.mail.smtp.user" value="jbossesb"/>
+    	<property name="org.jboss.soa.esb.mail.smtp.password" value=""/>
+    	<property name="org.jboss.soa.esb.mail.smtp.port" value="25"/>
+    </properties>
+    <properties name="connection">
+    	<property name="min-pool-size" value="5"/>
+    	<property name="max-pool=size" value="10"/>
+    	<property name="blocking-timeout-millis" value="5000"/>
+    	<property name="abandoned-connection-timeout" value="10000"/>
+    	<property name="abandoned-connection-time-interval" value="30000"/>
+    </properties>
+    <properties name="dbstore">
+		<property name="org.jboss.soa.esb.persistence.db.connection.url" 	value="jdbc:hsqldb:hsql://localhost:9001/jbossesb"/>
+		<property name="org.jboss.soa.esb.persistence.db.jdbc.driver" 		value="org.hsqldb.jdbcDriver"/>
+		<property name="org.jboss.soa.esb.persistence.db.user" 			value="sa"/>
+		<property name="org.jboss.soa.esb.persistence.db.pwd" 			value=""/>		
+		<property name="org.jboss.soa.esb.persistence.db.pool.initial.size"	value="2"/>
+		<property name="org.jboss.soa.esb.persistence.db.pool.min.size"	value="2"/>
+		<property name="org.jboss.soa.esb.persistence.db.pool.max.size"	value="5"/>
+		<!--table managed by pool to test for valid connections - created by pool automatically -->
+		<property name="org.jboss.soa.esb.persistence.db.pool.test.table"	value="pooltest"/>
+		<!-- # of milliseconds to timeout waiting for a connection from pool -->
+		<property name="org.jboss.soa.esb.persistence.db.pool.timeout.millis"	value="5000"/> 
+    </properties>
+    <properties name="messagerouting">
+    	<property name="org.jboss.soa.esb.routing.cbrClass" value="org.jboss.internal.soa.esb.services.routing.cbr.JBossRulesRouter"/>
+    </properties>
+</esb>

Deleted: labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/business_rules_service/jndi.properties
===================================================================
--- labs/jbossesb/trunk/product/samples/quickstarts/business_rules_service/jndi.properties	2007-06-11 18:14:26 UTC (rev 12458)
+++ labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/business_rules_service/jndi.properties	2007-06-11 20:28:48 UTC (rev 12469)
@@ -1,5 +0,0 @@
-java.naming.factory.initial=org.jnp.interfaces.NamingContextFactory
-java.naming.provider.url=jnp://localhost:1099
-java.naming.factory.url.pkgs=org.jboss.naming
-java.naming.factory.url.pkgs=org.jnp.interfaces
-

Copied: labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/business_rules_service/jndi.properties (from rev 12458, labs/jbossesb/trunk/product/samples/quickstarts/business_rules_service/jndi.properties)
===================================================================
--- labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/business_rules_service/jndi.properties	                        (rev 0)
+++ labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/business_rules_service/jndi.properties	2007-06-11 20:28:48 UTC (rev 12469)
@@ -0,0 +1,5 @@
+java.naming.factory.initial=org.jnp.interfaces.NamingContextFactory
+java.naming.provider.url=jnp://localhost:1099
+java.naming.factory.url.pkgs=org.jboss.naming
+java.naming.factory.url.pkgs=org.jnp.interfaces
+

Deleted: labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/business_rules_service/juddi.properties
===================================================================
--- labs/jbossesb/trunk/product/samples/quickstarts/business_rules_service/juddi.properties	2007-06-11 18:14:26 UTC (rev 12458)
+++ labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/business_rules_service/juddi.properties	2007-06-11 20:28:48 UTC (rev 12469)
@@ -1,69 +0,0 @@
-# jUDDI Registry Properties (used by RegistryServer)
-# see http://www.juddi.org for more information
-
-# The UDDI Operator Name
-juddi.operatorName = jUDDI.org
-
-# The i18n locale default codes
-juddi.i18n.languageCode = en
-juddi.i18n.countryCode = US
-
-# The UDDI DiscoveryURL Prefix
-juddi.discoveryURL = http://localhost:8080/juddi/uddiget.jsp?
-
-# The UDDI Operator Contact Email Address
-juddi.operatorEmailAddress = admin at juddi.org
-
-# The maximum name size and maximum number
-# of name elements allows in several of the
-# FindXxxx and SaveXxxx UDDI functions.
-juddi.maxNameLength=255
-juddi.maxNameElementsAllowed=5
-
-# The maximum number of UDDI artifacts allowed
-# per publisher. A value of '-1' indicates any 
-# number of artifacts is valid (These values can be
-# overridden at the individual publisher level).
-juddi.maxBusinessesPerPublisher=25
-juddi.maxServicesPerBusiness=20
-juddi.maxBindingsPerService=10
-juddi.maxTModelsPerPublisher=100
-
-# jUDDI Authentication module to use
-juddi.auth = org.apache.juddi.auth.DefaultAuthenticator
-
-# jUDDI DataStore module currently to use
-juddi.dataStore = org.apache.juddi.datastore.jdbc.JDBCDataStore
-
-# use a dataSource (if set to false a direct 
-# jdbc connection will be used.
-juddi.isUseDataSource=false
-juddi.jdbcDriver=com.mysql.jdbc.Driver
-juddi.jdbcUrl=jdbc:mysql://localhost:3306/juddi
-juddi.jdbcUsername=root
-juddi.jdbcPassword=admin
-# jUDDI DataSource to use
-# juddi.dataSource=java:comp/env/jdbc/MySqlDS
-
-# jUDDI UUIDGen implementation to use
-juddi.uuidgen = org.apache.juddi.uuidgen.DefaultUUIDGen
-
-# jUDDI Cryptor implementation to use
-juddi.cryptor = org.apache.juddi.cryptor.DefaultCryptor
- 
-# jUDDI Validator to use
-juddi.validator=org.apache.juddi.validator.DefaultValidator
-
-# jUDDI Proxy Properties (used by RegistryProxy)
-juddi.proxy.adminURL = http://localhost:8080/juddi/admin
-juddi.proxy.inquiryURL = http://localhost:8080/juddi/inquiry
-juddi.proxy.publishURL = http://localhost:8080/juddi/publish
-juddi.proxy.transportClass = org.apache.juddi.proxy.AxisTransport
-juddi.proxy.securityProvider = com.sun.net.ssl.internal.ssl.Provider
-juddi.proxy.protocolHandler = com.sun.net.ssl.internal.www.protocol
-
-# JNDI settings (used by RMITransport)
-java.naming.factory.initial=org.jnp.interfaces.NamingContextFactory
-java.naming.provider.url=jnp://localhost:1099
-java.naming.factory.url.pkgs=org.jboss.naming
-  

Copied: labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/business_rules_service/juddi.properties (from rev 12458, labs/jbossesb/trunk/product/samples/quickstarts/business_rules_service/juddi.properties)
===================================================================
--- labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/business_rules_service/juddi.properties	                        (rev 0)
+++ labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/business_rules_service/juddi.properties	2007-06-11 20:28:48 UTC (rev 12469)
@@ -0,0 +1,69 @@
+# jUDDI Registry Properties (used by RegistryServer)
+# see http://www.juddi.org for more information
+
+# The UDDI Operator Name
+juddi.operatorName = jUDDI.org
+
+# The i18n locale default codes
+juddi.i18n.languageCode = en
+juddi.i18n.countryCode = US
+
+# The UDDI DiscoveryURL Prefix
+juddi.discoveryURL = http://localhost:8080/juddi/uddiget.jsp?
+
+# The UDDI Operator Contact Email Address
+juddi.operatorEmailAddress = admin at juddi.org
+
+# The maximum name size and maximum number
+# of name elements allows in several of the
+# FindXxxx and SaveXxxx UDDI functions.
+juddi.maxNameLength=255
+juddi.maxNameElementsAllowed=5
+
+# The maximum number of UDDI artifacts allowed
+# per publisher. A value of '-1' indicates any 
+# number of artifacts is valid (These values can be
+# overridden at the individual publisher level).
+juddi.maxBusinessesPerPublisher=25
+juddi.maxServicesPerBusiness=20
+juddi.maxBindingsPerService=10
+juddi.maxTModelsPerPublisher=100
+
+# jUDDI Authentication module to use
+juddi.auth = org.apache.juddi.auth.DefaultAuthenticator
+
+# jUDDI DataStore module currently to use
+juddi.dataStore = org.apache.juddi.datastore.jdbc.JDBCDataStore
+
+# use a dataSource (if set to false a direct 
+# jdbc connection will be used.
+juddi.isUseDataSource=false
+juddi.jdbcDriver=com.mysql.jdbc.Driver
+juddi.jdbcUrl=jdbc:mysql://localhost:3306/juddi
+juddi.jdbcUsername=root
+juddi.jdbcPassword=admin
+# jUDDI DataSource to use
+# juddi.dataSource=java:comp/env/jdbc/MySqlDS
+
+# jUDDI UUIDGen implementation to use
+juddi.uuidgen = org.apache.juddi.uuidgen.DefaultUUIDGen
+
+# jUDDI Cryptor implementation to use
+juddi.cryptor = org.apache.juddi.cryptor.DefaultCryptor
+ 
+# jUDDI Validator to use
+juddi.validator=org.apache.juddi.validator.DefaultValidator
+
+# jUDDI Proxy Properties (used by RegistryProxy)
+juddi.proxy.adminURL = http://localhost:8080/juddi/admin
+juddi.proxy.inquiryURL = http://localhost:8080/juddi/inquiry
+juddi.proxy.publishURL = http://localhost:8080/juddi/publish
+juddi.proxy.transportClass = org.apache.juddi.proxy.AxisTransport
+juddi.proxy.securityProvider = com.sun.net.ssl.internal.ssl.Provider
+juddi.proxy.protocolHandler = com.sun.net.ssl.internal.www.protocol
+
+# JNDI settings (used by RMITransport)
+java.naming.factory.initial=org.jnp.interfaces.NamingContextFactory
+java.naming.provider.url=jnp://localhost:1099
+java.naming.factory.url.pkgs=org.jboss.naming
+  

Copied: labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/business_rules_service/lib (from rev 12458, labs/jbossesb/trunk/product/samples/quickstarts/business_rules_service/lib)

Deleted: labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/business_rules_service/log4j.xml
===================================================================
--- labs/jbossesb/trunk/product/samples/quickstarts/business_rules_service/log4j.xml	2007-06-11 18:14:26 UTC (rev 12458)
+++ labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/business_rules_service/log4j.xml	2007-06-11 20:28:48 UTC (rev 12469)
@@ -1,84 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE log4j:configuration SYSTEM "log4j.dtd">
-
-<!-- ===================================================================== -->
-<!--                                                                       -->
-<!--  Log4j Configuration                                                  -->
-<!--                                                                       -->
-<!-- ===================================================================== -->
-
-<!-- $Id: log4j.xml,v 1.26.2.5 2005/09/15 09:31:02 dimitris Exp $ -->
-
-<!--
-   | For more configuration infromation and examples see the Jakarta Log4j
-   | owebsite: http://jakarta.apache.org/log4j
- -->
-
-<log4j:configuration xmlns:log4j="http://jakarta.apache.org/log4j/" debug="false">
-
-   <!-- ============================== -->
-   <!-- Append messages to the console -->
-   <!-- ============================== -->
-
-   <appender name="CONSOLE" class="org.apache.log4j.ConsoleAppender">
-      <errorHandler class="org.jboss.logging.util.OnlyOnceErrorHandler"/>
-      <param name="Target" value="System.out"/>
-
-      <layout class="org.apache.log4j.PatternLayout">
-         <!-- The default pattern: Date Priority [Category] Message\n -->
-         <param name="ConversionPattern" value="%d{ABSOLUTE} %-5p [%t][%c{1}] %m%n"/>
-      </layout>
-   </appender>
-
-
-   <!-- ================================= -->
-   <!-- Preserve messages in a local file -->
-   <!-- ================================= -->
-
-   <!-- A size based file rolling appender -->
-   <appender name="FILE" class="org.jboss.logging.appender.RollingFileAppender">
-     <errorHandler class="org.jboss.logging.util.OnlyOnceErrorHandler"/>
-     <param name="File" value="./listener.log"/>
-     <param name="Append" value="false"/>
-     <param name="MaxFileSize" value="500KB"/>
-     <param name="MaxBackupIndex" value="1"/>
-
-     <layout class="org.apache.log4j.PatternLayout">
-       <param name="ConversionPattern" value="%d %-5p [%t][%c] %m%n"/>
-     </layout>	    
-   </appender>
-
-   <!-- ================ -->
-   <!-- Limit categories -->
-   <!-- ================ -->
-
-   <category name="org.jboss">
-      <priority value="WARN"/>
-   </category>
-   <category name="org.jboss.soa.esb">
-      <priority value="WARN"/>
-   </category>
-   <category name="org.jboss.internal.soa.esb">
-      <priority value="WARN"/>
-   </category>
-   <category name="org.apache">
-      <priority value="ERROR"/>
-   </category>
-   <category name="org.milyn">
-      <priority value="ERROR"/>
-   </category>
-
-   <category name="quickstarts">
-      <priority value="WARN"/>
-   </category>
-   
-   <!-- ======================= -->
-   <!-- Setup the Root category -->
-   <!-- ======================= -->
-
-   <root>
-      <appender-ref ref="CONSOLE"/>
-      <appender-ref ref="FILE"/>
-   </root>
-
-</log4j:configuration>

Copied: labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/business_rules_service/log4j.xml (from rev 12458, labs/jbossesb/trunk/product/samples/quickstarts/business_rules_service/log4j.xml)
===================================================================
--- labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/business_rules_service/log4j.xml	                        (rev 0)
+++ labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/business_rules_service/log4j.xml	2007-06-11 20:28:48 UTC (rev 12469)
@@ -0,0 +1,84 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE log4j:configuration SYSTEM "log4j.dtd">
+
+<!-- ===================================================================== -->
+<!--                                                                       -->
+<!--  Log4j Configuration                                                  -->
+<!--                                                                       -->
+<!-- ===================================================================== -->
+
+<!-- $Id: log4j.xml,v 1.26.2.5 2005/09/15 09:31:02 dimitris Exp $ -->
+
+<!--
+   | For more configuration infromation and examples see the Jakarta Log4j
+   | owebsite: http://jakarta.apache.org/log4j
+ -->
+
+<log4j:configuration xmlns:log4j="http://jakarta.apache.org/log4j/" debug="false">
+
+   <!-- ============================== -->
+   <!-- Append messages to the console -->
+   <!-- ============================== -->
+
+   <appender name="CONSOLE" class="org.apache.log4j.ConsoleAppender">
+      <errorHandler class="org.jboss.logging.util.OnlyOnceErrorHandler"/>
+      <param name="Target" value="System.out"/>
+
+      <layout class="org.apache.log4j.PatternLayout">
+         <!-- The default pattern: Date Priority [Category] Message\n -->
+         <param name="ConversionPattern" value="%d{ABSOLUTE} %-5p [%t][%c{1}] %m%n"/>
+      </layout>
+   </appender>
+
+
+   <!-- ================================= -->
+   <!-- Preserve messages in a local file -->
+   <!-- ================================= -->
+
+   <!-- A size based file rolling appender -->
+   <appender name="FILE" class="org.jboss.logging.appender.RollingFileAppender">
+     <errorHandler class="org.jboss.logging.util.OnlyOnceErrorHandler"/>
+     <param name="File" value="./listener.log"/>
+     <param name="Append" value="false"/>
+     <param name="MaxFileSize" value="500KB"/>
+     <param name="MaxBackupIndex" value="1"/>
+
+     <layout class="org.apache.log4j.PatternLayout">
+       <param name="ConversionPattern" value="%d %-5p [%t][%c] %m%n"/>
+     </layout>	    
+   </appender>
+
+   <!-- ================ -->
+   <!-- Limit categories -->
+   <!-- ================ -->
+
+   <category name="org.jboss">
+      <priority value="WARN"/>
+   </category>
+   <category name="org.jboss.soa.esb">
+      <priority value="WARN"/>
+   </category>
+   <category name="org.jboss.internal.soa.esb">
+      <priority value="WARN"/>
+   </category>
+   <category name="org.apache">
+      <priority value="ERROR"/>
+   </category>
+   <category name="org.milyn">
+      <priority value="ERROR"/>
+   </category>
+
+   <category name="quickstarts">
+      <priority value="WARN"/>
+   </category>
+   
+   <!-- ======================= -->
+   <!-- Setup the Root category -->
+   <!-- ======================= -->
+
+   <root>
+      <appender-ref ref="CONSOLE"/>
+      <appender-ref ref="FILE"/>
+   </root>
+
+</log4j:configuration>

Deleted: labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/business_rules_service/readme.txt
===================================================================
--- labs/jbossesb/trunk/product/samples/quickstarts/business_rules_service/readme.txt	2007-06-11 18:14:26 UTC (rev 12458)
+++ labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/business_rules_service/readme.txt	2007-06-11 20:28:48 UTC (rev 12469)
@@ -1,24 +0,0 @@
-Description:
- Demonstrates the use of the BusinessRulesProcessor which allows for modification of the POJOs
- attached to an ESB Message.  The example uses Rules to calculate the priority associated with an
- inbound order for later routing, plus it calculates the discount percentage associated with an
- order.
-
-Prereqs:
- First make sure you have run simple_cbr, transformation_XML2POJO and fun_cbr quickstarts as their
- principles are used in this more complex example.
- 
-Notes:
- - To test:
-  -- startup the ESB Server
-  -- ant deploy-jms-dests
-  -- ant run (terminal window 1)
-  -- ant runtest (terminal window 2)
- - Only runs via standalone bootstrapper (ant run), NOT with a .esb archive (ant deploy)
- - Only has queue declarations for JBoss Messaging, NOT JBossMQ
- - Review the 3 different .drl files to see the distinction between business rules used for 
- calculation/validation and rules used for routing. 
- - The customer status is actually set in the jboss-esb.xml via the SetupMessage action since
- it is not provided with the inbound XML. You don't want a customer to determine their status.
- In a real world situation, another system would be integrated via an action/service, that first
- calculates the customer's status (frequent flier, volume of previous purchases, etc.)
\ No newline at end of file

Copied: labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/business_rules_service/readme.txt (from rev 12458, labs/jbossesb/trunk/product/samples/quickstarts/business_rules_service/readme.txt)
===================================================================
--- labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/business_rules_service/readme.txt	                        (rev 0)
+++ labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/business_rules_service/readme.txt	2007-06-11 20:28:48 UTC (rev 12469)
@@ -0,0 +1,24 @@
+Description:
+ Demonstrates the use of the BusinessRulesProcessor which allows for modification of the POJOs
+ attached to an ESB Message.  The example uses Rules to calculate the priority associated with an
+ inbound order for later routing, plus it calculates the discount percentage associated with an
+ order.
+
+Prereqs:
+ First make sure you have run simple_cbr, transformation_XML2POJO and fun_cbr quickstarts as their
+ principles are used in this more complex example.
+ 
+Notes:
+ - To test:
+  -- startup the ESB Server
+  -- ant deploy-jms-dests
+  -- ant run (terminal window 1)
+  -- ant runtest (terminal window 2)
+ - Only runs via standalone bootstrapper (ant run), NOT with a .esb archive (ant deploy)
+ - Only has queue declarations for JBoss Messaging, NOT JBossMQ
+ - Review the 3 different .drl files to see the distinction between business rules used for 
+ calculation/validation and rules used for routing. 
+ - The customer status is actually set in the jboss-esb.xml via the SetupMessage action since
+ it is not provided with the inbound XML. You don't want a customer to determine their status.
+ In a real world situation, another system would be integrated via an action/service, that first
+ calculates the customer's status (frequent flier, volume of previous purchases, etc.)
\ No newline at end of file

Deleted: labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/business_rules_service/smooks-res.xml
===================================================================
--- labs/jbossesb/trunk/product/samples/quickstarts/business_rules_service/smooks-res.xml	2007-06-11 18:14:26 UTC (rev 12458)
+++ labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/business_rules_service/smooks-res.xml	2007-06-11 20:28:48 UTC (rev 12469)
@@ -1,56 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<smooks-resource-list xmlns="http://www.milyn.org/xsd/smooks-1.0.xsd">
-
-    <!-- Populate the OrderHeader -->
-	<resource-config selector="order">
-        <resource>org.milyn.javabean.ProcessingPhaseBeanPopulator</resource>
-        <param name="beanId">orderHeader</param>
-		<param name="beanClass">org.jboss.soa.esb.dvdstore.OrderHeader</param>
-        <param name="bindings">
-            <binding property="orderId" selector="Order @orderId" />
-            <binding property="orderDate" selector="Order @orderDate" type="LongDate"/>
-            <binding property="statusCode" selector="Order @statusCode" type="Integer" />
-            <binding property="netAmount" selector="Order @netAmount" type="Double" />
-            <binding property="totalAmount" selector="Order @totalAmount" type="Double" />
-            <binding property="tax" selector="Order @tax" type="Double" />
-        </param>
-    </resource-config>
-
-    <!-- Populate the Customer -->
-    <resource-config selector="order customer">
-        <resource>org.milyn.javabean.ProcessingPhaseBeanPopulator</resource>
-		<param name="beanId">customer</param>
-		<param name="beanClass">org.jboss.soa.esb.dvdstore.Customer</param>
-        <param name="bindings">
-            <binding property="userName" selector="order customer @userName" />
-            <binding property="firstName" selector="order customer @firstName" />
-            <binding property="lastName" selector="order customer @lastName" />
-            <binding property="state" selector="order customer @state" />
-        </param>
-	</resource-config>
-
-    <!-- Populate the OrderItem list -->
-	<resource-config selector="order orderlines orderline">
-        <resource>org.milyn.javabean.ProcessingPhaseBeanPopulator</resource>
-		<param name="beanId">orderItem</param>
-		<param name="beanClass">org.jboss.soa.esb.dvdstore.OrderItem</param>
-		<param name="addToList">true</param>
-        <param name="bindings">
-            <binding property="position"  selector="order orderlines orderline @position" type="Integer" />
-            <binding property="quantity"  selector="order orderlines orderline @quantity" type="Integer" />
-            <binding property="productId" selector="order orderlines orderline product @productId" />
-            <binding property="title"     selector="order orderlines orderline product @title" />
-            <binding property="price"     selector="order orderlines orderline product @price" type="Double" />
-        </param>
-	</resource-config>
-
-	<resource-config selector="order orderlines orderline">
-        <resource>/org/jboss/soa/esb/dvdstore/orderitem.st</resource>
-	</resource-config>
-
-    <resource-config selector="decoder:LongDate">
-        <resource>org.milyn.javabean.decoders.CalendarDecoder</resource>
-        <param name="format">EEE MMM dd HH:mm:ss z yyyy</param>
-    </resource-config>
-    
-</smooks-resource-list>

Copied: labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/business_rules_service/smooks-res.xml (from rev 12458, labs/jbossesb/trunk/product/samples/quickstarts/business_rules_service/smooks-res.xml)
===================================================================
--- labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/business_rules_service/smooks-res.xml	                        (rev 0)
+++ labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/business_rules_service/smooks-res.xml	2007-06-11 20:28:48 UTC (rev 12469)
@@ -0,0 +1,56 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<smooks-resource-list xmlns="http://www.milyn.org/xsd/smooks-1.0.xsd">
+
+    <!-- Populate the OrderHeader -->
+	<resource-config selector="order">
+        <resource>org.milyn.javabean.ProcessingPhaseBeanPopulator</resource>
+        <param name="beanId">orderHeader</param>
+		<param name="beanClass">org.jboss.soa.esb.dvdstore.OrderHeader</param>
+        <param name="bindings">
+            <binding property="orderId" selector="Order @orderId" />
+            <binding property="orderDate" selector="Order @orderDate" type="LongDate"/>
+            <binding property="statusCode" selector="Order @statusCode" type="Integer" />
+            <binding property="netAmount" selector="Order @netAmount" type="Double" />
+            <binding property="totalAmount" selector="Order @totalAmount" type="Double" />
+            <binding property="tax" selector="Order @tax" type="Double" />
+        </param>
+    </resource-config>
+
+    <!-- Populate the Customer -->
+    <resource-config selector="order customer">
+        <resource>org.milyn.javabean.ProcessingPhaseBeanPopulator</resource>
+		<param name="beanId">customer</param>
+		<param name="beanClass">org.jboss.soa.esb.dvdstore.Customer</param>
+        <param name="bindings">
+            <binding property="userName" selector="order customer @userName" />
+            <binding property="firstName" selector="order customer @firstName" />
+            <binding property="lastName" selector="order customer @lastName" />
+            <binding property="state" selector="order customer @state" />
+        </param>
+	</resource-config>
+
+    <!-- Populate the OrderItem list -->
+	<resource-config selector="order orderlines orderline">
+        <resource>org.milyn.javabean.ProcessingPhaseBeanPopulator</resource>
+		<param name="beanId">orderItem</param>
+		<param name="beanClass">org.jboss.soa.esb.dvdstore.OrderItem</param>
+		<param name="addToList">true</param>
+        <param name="bindings">
+            <binding property="position"  selector="order orderlines orderline @position" type="Integer" />
+            <binding property="quantity"  selector="order orderlines orderline @quantity" type="Integer" />
+            <binding property="productId" selector="order orderlines orderline product @productId" />
+            <binding property="title"     selector="order orderlines orderline product @title" />
+            <binding property="price"     selector="order orderlines orderline product @price" type="Double" />
+        </param>
+	</resource-config>
+
+	<resource-config selector="order orderlines orderline">
+        <resource>/org/jboss/soa/esb/dvdstore/orderitem.st</resource>
+	</resource-config>
+
+    <resource-config selector="decoder:LongDate">
+        <resource>org.milyn.javabean.decoders.CalendarDecoder</resource>
+        <param name="format">EEE MMM dd HH:mm:ss z yyyy</param>
+    </resource-config>
+    
+</smooks-resource-list>

Copied: labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/business_rules_service/src (from rev 12458, labs/jbossesb/trunk/product/samples/quickstarts/business_rules_service/src)

Copied: labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/business_rules_service/src/org (from rev 12458, labs/jbossesb/trunk/product/samples/quickstarts/business_rules_service/src/org)

Copied: labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/business_rules_service/src/org/jboss (from rev 12458, labs/jbossesb/trunk/product/samples/quickstarts/business_rules_service/src/org/jboss)

Copied: labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/business_rules_service/src/org/jboss/soa (from rev 12458, labs/jbossesb/trunk/product/samples/quickstarts/business_rules_service/src/org/jboss/soa)

Copied: labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/business_rules_service/src/org/jboss/soa/esb (from rev 12458, labs/jbossesb/trunk/product/samples/quickstarts/business_rules_service/src/org/jboss/soa/esb)

Copied: labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/business_rules_service/src/org/jboss/soa/esb/dvdstore (from rev 12458, labs/jbossesb/trunk/product/samples/quickstarts/business_rules_service/src/org/jboss/soa/esb/dvdstore)

Deleted: labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/business_rules_service/src/org/jboss/soa/esb/dvdstore/Customer.java
===================================================================
--- labs/jbossesb/trunk/product/samples/quickstarts/business_rules_service/src/org/jboss/soa/esb/dvdstore/Customer.java	2007-06-11 18:14:26 UTC (rev 12458)
+++ labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/business_rules_service/src/org/jboss/soa/esb/dvdstore/Customer.java	2007-06-11 20:28:48 UTC (rev 12469)
@@ -1,103 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2006, 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) 2005-2006,
- * @author JBoss Inc.
- */
-
-package org.jboss.soa.esb.dvdstore;
-
-import java.io.Serializable;
-
-/**
- * @author <a href="mailto:tom.fennelly at jboss.com">tom.fennelly at jboss.com</a>
- */
-public class Customer implements Serializable {
-
-	// <Customer userName="user1" firstName="Harry" lastName="Potter" state="SD"/>
-	private String userName;
-	private String firstName;
-	private String lastName;
-	private String state;
-	private int status;
-	
-	/**
-	 * @return Returns the firstName.
-	 */
-	public String getFirstName() {
-		return firstName;
-	}
-	/**
-	 * @param firstName The firstName to set.
-	 */
-	public void setFirstName(String firstName) {
-		//System.out.println("**** firstName: " + firstName);
-		this.firstName = firstName;
-	}
-	/**
-	 * @return Returns the lastName.
-	 */
-	public String getLastName() {
-		return lastName;
-	}
-	/**
-	 * @param lastName The lastName to set.
-	 */
-	public void setLastName(String lastName) {
-		this.lastName = lastName;
-	}
-	/**
-	 * @return Returns the state.
-	 */
-	public String getState() {
-		return state;
-	}
-	/**
-	 * @param state The state to set.
-	 */
-	public void setState(String state) {
-		this.state = state;
-	}
-	/**
-	 * @return Returns the userName.
-	 */
-	public String getUserName() {
-		return userName;
-	}
-	/**
-	 * @param userName The userName to set.
-	 */
-	public void setUserName(String userName) {
-		this.userName = userName;
-	}
-	
-	/* (non-Javadoc)
-	 * @see java.lang.Object#toString()
-	 */
-	@Override
-	public String toString() {
-		return userName + "," + firstName + "," + lastName + "," + state + "," + status;
-	}
-	
-	public int getStatus() {
-		return status;
-  }
-  public void setStatus(int status) {
-  	 this.status = status;
-  }
-
-}

Copied: labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/business_rules_service/src/org/jboss/soa/esb/dvdstore/Customer.java (from rev 12458, labs/jbossesb/trunk/product/samples/quickstarts/business_rules_service/src/org/jboss/soa/esb/dvdstore/Customer.java)
===================================================================
--- labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/business_rules_service/src/org/jboss/soa/esb/dvdstore/Customer.java	                        (rev 0)
+++ labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/business_rules_service/src/org/jboss/soa/esb/dvdstore/Customer.java	2007-06-11 20:28:48 UTC (rev 12469)
@@ -0,0 +1,103 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2006, 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) 2005-2006,
+ * @author JBoss Inc.
+ */
+
+package org.jboss.soa.esb.dvdstore;
+
+import java.io.Serializable;
+
+/**
+ * @author <a href="mailto:tom.fennelly at jboss.com">tom.fennelly at jboss.com</a>
+ */
+public class Customer implements Serializable {
+
+	// <Customer userName="user1" firstName="Harry" lastName="Potter" state="SD"/>
+	private String userName;
+	private String firstName;
+	private String lastName;
+	private String state;
+	private int status;
+	
+	/**
+	 * @return Returns the firstName.
+	 */
+	public String getFirstName() {
+		return firstName;
+	}
+	/**
+	 * @param firstName The firstName to set.
+	 */
+	public void setFirstName(String firstName) {
+		//System.out.println("**** firstName: " + firstName);
+		this.firstName = firstName;
+	}
+	/**
+	 * @return Returns the lastName.
+	 */
+	public String getLastName() {
+		return lastName;
+	}
+	/**
+	 * @param lastName The lastName to set.
+	 */
+	public void setLastName(String lastName) {
+		this.lastName = lastName;
+	}
+	/**
+	 * @return Returns the state.
+	 */
+	public String getState() {
+		return state;
+	}
+	/**
+	 * @param state The state to set.
+	 */
+	public void setState(String state) {
+		this.state = state;
+	}
+	/**
+	 * @return Returns the userName.
+	 */
+	public String getUserName() {
+		return userName;
+	}
+	/**
+	 * @param userName The userName to set.
+	 */
+	public void setUserName(String userName) {
+		this.userName = userName;
+	}
+	
+	/* (non-Javadoc)
+	 * @see java.lang.Object#toString()
+	 */
+	@Override
+	public String toString() {
+		return userName + "," + firstName + "," + lastName + "," + state + "," + status;
+	}
+	
+	public int getStatus() {
+		return status;
+  }
+  public void setStatus(int status) {
+  	 this.status = status;
+  }
+
+}

Deleted: labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/business_rules_service/src/org/jboss/soa/esb/dvdstore/DVDStoreAction.java
===================================================================
--- labs/jbossesb/trunk/product/samples/quickstarts/business_rules_service/src/org/jboss/soa/esb/dvdstore/DVDStoreAction.java	2007-06-11 18:14:26 UTC (rev 12458)
+++ labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/business_rules_service/src/org/jboss/soa/esb/dvdstore/DVDStoreAction.java	2007-06-11 20:28:48 UTC (rev 12469)
@@ -1,71 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2006, 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) 2005-2006,
- * @author JBoss Inc.
- */
-
-package org.jboss.soa.esb.dvdstore;
-
-import java.util.HashMap;
-import java.util.List;
-
-import org.jboss.soa.esb.actions.AbstractActionPipelineProcessor;
-import org.jboss.soa.esb.actions.ActionProcessingException;
-import org.jboss.soa.esb.helpers.ConfigTree;
-import org.jboss.soa.esb.message.Message;
-
-/**
- * DVD Store action.
- * <p/>
- * This action uses bean value objects that were prepopulated by Smooks in an earlier action on the pipline.
- * @author <a href="mailto:tom.fennelly at jboss.com">tom.fennelly at jboss.com</a>
- */
-public class DVDStoreAction extends AbstractActionPipelineProcessor {
-
-	public DVDStoreAction(ConfigTree configTree) {
-		
-	}
-	
-	public Message process(Message message) throws ActionProcessingException {
-		HashMap beanHash = (HashMap) message.getBody().get("EXTRACTED_BEANS_HASH");
-		
-		StringBuffer results = new StringBuffer();		
-		if(beanHash != null) {
-			OrderHeader header = (OrderHeader) beanHash.get("orderHeader");
-			Customer customer = (Customer) beanHash.get("customer");
-			List orderItems = (List) beanHash.get("orderItemList");
-			results.append("Demonstrates Smooks ability to rip the XML into Objects\n");
-			results.append("********* DVDStoreAction - Order Value Objects Populated *********\n");
-			results.append("Header: " + header + "\n");
-			results.append("Customer: " + customer + "\n");
-			if(orderItems != null) {
-				results.append("Order Items (" + orderItems.size() + "):\n");
-				for(int i = 0; i < orderItems.size(); i++) {
-					results.append("\t" + i + ": " + orderItems.get(i) + "\n");
-				}
-			}
-			results.append("\n****************************************************************** ");
-		} else {
-			results.append("\n*** No beanhash found!");
-		}
-		
-		// Take this "parsed" output and make it a new message
-		message.getBody().setByteArray(results.toString().getBytes());
-		return message;
-	}
-}

Copied: labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/business_rules_service/src/org/jboss/soa/esb/dvdstore/DVDStoreAction.java (from rev 12458, labs/jbossesb/trunk/product/samples/quickstarts/business_rules_service/src/org/jboss/soa/esb/dvdstore/DVDStoreAction.java)
===================================================================
--- labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/business_rules_service/src/org/jboss/soa/esb/dvdstore/DVDStoreAction.java	                        (rev 0)
+++ labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/business_rules_service/src/org/jboss/soa/esb/dvdstore/DVDStoreAction.java	2007-06-11 20:28:48 UTC (rev 12469)
@@ -0,0 +1,71 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2006, 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) 2005-2006,
+ * @author JBoss Inc.
+ */
+
+package org.jboss.soa.esb.dvdstore;
+
+import java.util.HashMap;
+import java.util.List;
+
+import org.jboss.soa.esb.actions.AbstractActionPipelineProcessor;
+import org.jboss.soa.esb.actions.ActionProcessingException;
+import org.jboss.soa.esb.helpers.ConfigTree;
+import org.jboss.soa.esb.message.Message;
+
+/**
+ * DVD Store action.
+ * <p/>
+ * This action uses bean value objects that were prepopulated by Smooks in an earlier action on the pipline.
+ * @author <a href="mailto:tom.fennelly at jboss.com">tom.fennelly at jboss.com</a>
+ */
+public class DVDStoreAction extends AbstractActionPipelineProcessor {
+
+	public DVDStoreAction(ConfigTree configTree) {
+		
+	}
+	
+	public Message process(Message message) throws ActionProcessingException {
+		HashMap beanHash = (HashMap) message.getBody().get("EXTRACTED_BEANS_HASH");
+		
+		StringBuffer results = new StringBuffer();		
+		if(beanHash != null) {
+			OrderHeader header = (OrderHeader) beanHash.get("orderHeader");
+			Customer customer = (Customer) beanHash.get("customer");
+			List orderItems = (List) beanHash.get("orderItemList");
+			results.append("Demonstrates Smooks ability to rip the XML into Objects\n");
+			results.append("********* DVDStoreAction - Order Value Objects Populated *********\n");
+			results.append("Header: " + header + "\n");
+			results.append("Customer: " + customer + "\n");
+			if(orderItems != null) {
+				results.append("Order Items (" + orderItems.size() + "):\n");
+				for(int i = 0; i < orderItems.size(); i++) {
+					results.append("\t" + i + ": " + orderItems.get(i) + "\n");
+				}
+			}
+			results.append("\n****************************************************************** ");
+		} else {
+			results.append("\n*** No beanhash found!");
+		}
+		
+		// Take this "parsed" output and make it a new message
+		message.getBody().setByteArray(results.toString().getBytes());
+		return message;
+	}
+}

Deleted: labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/business_rules_service/src/org/jboss/soa/esb/dvdstore/OrderHeader.java
===================================================================
--- labs/jbossesb/trunk/product/samples/quickstarts/business_rules_service/src/org/jboss/soa/esb/dvdstore/OrderHeader.java	2007-06-11 18:14:26 UTC (rev 12458)
+++ labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/business_rules_service/src/org/jboss/soa/esb/dvdstore/OrderHeader.java	2007-06-11 20:28:48 UTC (rev 12469)
@@ -1,140 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2006, 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) 2005-2006,
- * @author JBoss Inc.
- */
-
-package org.jboss.soa.esb.dvdstore;
-
-/**
- * @author <a href="mailto:tom.fennelly at jboss.com">tom.fennelly at jboss.com</a>
- */
-import java.io.Serializable;
-import java.util.Calendar;
-
-public class OrderHeader implements Serializable {
-	
-	// <Order orderId="1" orderDate="Wed Nov 15 13:45:28 EST 2006" statusCode="0" netAmount="59.97" totalAmount="64.92" tax="4.95">
-	private String orderId;
-	private Calendar orderDate;
-	private int statusCode;
-	private double netAmount;
-	private double totalAmount;
-	private double tax;
-	private int orderPriority = 1;
-	private double orderDiscount;
-	
-	/**
-	 * @return Returns the netAmount.
-	 */
-	public double getNetAmount() {
-		return netAmount;
-	}
-	/**
-	 * @param netAmount The netAmount to set.
-	 */
-	public void setNetAmount(double netAmount) {
-		// System.out.println("**** netAmount: " + netAmount);
-		this.netAmount = netAmount;
-	}
-	/**
-	 * @return Returns the orderDate.
-	 */
-	public Calendar getOrderDate() {
-		return orderDate;
-	}
-	/**
-	 * @param orderDate The orderDate to set.
-	 */
-	public void setOrderDate(Calendar orderDate) {
-		this.orderDate = orderDate;
-	}
-	/**
-	 * @return Returns the orderId.
-	 */
-	public String getOrderId() {
-		return orderId;
-	}
-	/**
-	 * @param orderId The orderId to set.
-	 */
-	public void setOrderId(String orderId) {
-		this.orderId = orderId;
-	}
-	/**
-	 * @return Returns the statusCode.
-	 */
-	public int getStatusCode() {
-		return statusCode;
-	}
-	/**
-	 * @param statusCode The statusCode to set.
-	 */
-	public void setStatusCode(int statusCode) {
-		this.statusCode = statusCode;
-	}
-	/**
-	 * @return Returns the tax.
-	 */
-	public double getTax() {
-		return tax;
-	}
-	/**
-	 * @param tax The tax to set.
-	 */
-	public void setTax(double tax) {
-		this.tax = tax;
-	}
-	/**
-	 * @return Returns the totalAmount.
-	 */
-	public double getTotalAmount() {
-		return totalAmount;
-	}
-	/**
-	 * @param totalAmount The totalAmount to set.
-	 */
-	public void setTotalAmount(double totalAmount) {
-		this.totalAmount = totalAmount;
-	}
-	
-	/* (non-Javadoc)
-	 * @see java.lang.Object#toString()
-	 */
-	@Override
-	public String toString() {
-		return orderId + ", " + orderDate + ", " + statusCode + ", " + netAmount + ", " + totalAmount + ", " + tax + ", ";
-	}
-	
-	public int getOrderPriority() {
-  	  return this.orderPriority;
-    }
-	
-	public void setOrderPriority(int orderPriority) {
-		this.orderPriority = orderPriority;
-    }
-	
-	public double getOrderDiscount() {
-		return this.orderDiscount;
-	}
-	
-	public void setOrderDiscount(double orderDiscount) {
-		this.orderDiscount = orderDiscount;
-	}
-	
-}

Copied: labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/business_rules_service/src/org/jboss/soa/esb/dvdstore/OrderHeader.java (from rev 12458, labs/jbossesb/trunk/product/samples/quickstarts/business_rules_service/src/org/jboss/soa/esb/dvdstore/OrderHeader.java)
===================================================================
--- labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/business_rules_service/src/org/jboss/soa/esb/dvdstore/OrderHeader.java	                        (rev 0)
+++ labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/business_rules_service/src/org/jboss/soa/esb/dvdstore/OrderHeader.java	2007-06-11 20:28:48 UTC (rev 12469)
@@ -0,0 +1,140 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2006, 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) 2005-2006,
+ * @author JBoss Inc.
+ */
+
+package org.jboss.soa.esb.dvdstore;
+
+/**
+ * @author <a href="mailto:tom.fennelly at jboss.com">tom.fennelly at jboss.com</a>
+ */
+import java.io.Serializable;
+import java.util.Calendar;
+
+public class OrderHeader implements Serializable {
+	
+	// <Order orderId="1" orderDate="Wed Nov 15 13:45:28 EST 2006" statusCode="0" netAmount="59.97" totalAmount="64.92" tax="4.95">
+	private String orderId;
+	private Calendar orderDate;
+	private int statusCode;
+	private double netAmount;
+	private double totalAmount;
+	private double tax;
+	private int orderPriority = 1;
+	private double orderDiscount;
+	
+	/**
+	 * @return Returns the netAmount.
+	 */
+	public double getNetAmount() {
+		return netAmount;
+	}
+	/**
+	 * @param netAmount The netAmount to set.
+	 */
+	public void setNetAmount(double netAmount) {
+		// System.out.println("**** netAmount: " + netAmount);
+		this.netAmount = netAmount;
+	}
+	/**
+	 * @return Returns the orderDate.
+	 */
+	public Calendar getOrderDate() {
+		return orderDate;
+	}
+	/**
+	 * @param orderDate The orderDate to set.
+	 */
+	public void setOrderDate(Calendar orderDate) {
+		this.orderDate = orderDate;
+	}
+	/**
+	 * @return Returns the orderId.
+	 */
+	public String getOrderId() {
+		return orderId;
+	}
+	/**
+	 * @param orderId The orderId to set.
+	 */
+	public void setOrderId(String orderId) {
+		this.orderId = orderId;
+	}
+	/**
+	 * @return Returns the statusCode.
+	 */
+	public int getStatusCode() {
+		return statusCode;
+	}
+	/**
+	 * @param statusCode The statusCode to set.
+	 */
+	public void setStatusCode(int statusCode) {
+		this.statusCode = statusCode;
+	}
+	/**
+	 * @return Returns the tax.
+	 */
+	public double getTax() {
+		return tax;
+	}
+	/**
+	 * @param tax The tax to set.
+	 */
+	public void setTax(double tax) {
+		this.tax = tax;
+	}
+	/**
+	 * @return Returns the totalAmount.
+	 */
+	public double getTotalAmount() {
+		return totalAmount;
+	}
+	/**
+	 * @param totalAmount The totalAmount to set.
+	 */
+	public void setTotalAmount(double totalAmount) {
+		this.totalAmount = totalAmount;
+	}
+	
+	/* (non-Javadoc)
+	 * @see java.lang.Object#toString()
+	 */
+	@Override
+	public String toString() {
+		return orderId + ", " + orderDate + ", " + statusCode + ", " + netAmount + ", " + totalAmount + ", " + tax + ", ";
+	}
+	
+	public int getOrderPriority() {
+  	  return this.orderPriority;
+    }
+	
+	public void setOrderPriority(int orderPriority) {
+		this.orderPriority = orderPriority;
+    }
+	
+	public double getOrderDiscount() {
+		return this.orderDiscount;
+	}
+	
+	public void setOrderDiscount(double orderDiscount) {
+		this.orderDiscount = orderDiscount;
+	}
+	
+}

Deleted: labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/business_rules_service/src/org/jboss/soa/esb/dvdstore/OrderItem.java
===================================================================
--- labs/jbossesb/trunk/product/samples/quickstarts/business_rules_service/src/org/jboss/soa/esb/dvdstore/OrderItem.java	2007-06-11 18:14:26 UTC (rev 12458)
+++ labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/business_rules_service/src/org/jboss/soa/esb/dvdstore/OrderItem.java	2007-06-11 20:28:48 UTC (rev 12469)
@@ -1,111 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2006, 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) 2005-2006,
- * @author JBoss Inc.
- */
-
-package org.jboss.soa.esb.dvdstore;
-
-import java.io.Serializable;
-
-/**
- * @author <a href="mailto:tom.fennelly at jboss.com">tom.fennelly at jboss.com</a>
- */
-public class OrderItem implements Serializable {
-
-	// <OrderLine position="1" quantity="1">
-	// 		<Product productId="364" title="The 40-Year-Old Virgin " price="29.98"/>
-	// </OrderLine>
-	private int position;
-	private int quantity;
-	private String productId;
-	private String title;
-	private double price;
-	
-	/**
-	 * @return Returns the position.
-	 */
-	public int getPosition() {
-		return position;
-	}
-	/**
-	 * @param position The position to set.
-	 */
-	public void setPosition(int position) {
-		//System.out.println("**** position: " + position);
-		this.position = position;
-	}
-	/**
-	 * @return Returns the price.
-	 */
-	public double getPrice() {
-		return price;
-	}
-	/**
-	 * @param price The price to set.
-	 */
-	public void setPrice(double price) {
-		//System.out.println("**** price: " + price);
-		this.price = price;
-	}
-	/**
-	 * @return Returns the productId.
-	 */
-	public String getProductId() {
-		return productId;
-	}
-	/**
-	 * @param productId The productId to set.
-	 */
-	public void setProductId(String productId) {
-		this.productId = productId;
-	}
-	/**
-	 * @return Returns the quantity.
-	 */
-	public int getQuantity() {
-		return quantity;
-	}
-	/**
-	 * @param quantity The quantity to set.
-	 */
-	public void setQuantity(int quantity) {
-		this.quantity = quantity;
-	}
-	/**
-	 * @return Returns the title.
-	 */
-	public String getTitle() {
-		return title;
-	}
-	/**
-	 * @param title The title to set.
-	 */
-	public void setTitle(String title) {
-		this.title = title;
-	}
-	
-	/* (non-Javadoc)
-	 * @see java.lang.Object#toString()
-	 */
-	@Override
-	public String toString() {
-		return position + "," + quantity + "," + productId + "," + title + "," + price;
-		
-	}
-}

Copied: labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/business_rules_service/src/org/jboss/soa/esb/dvdstore/OrderItem.java (from rev 12458, labs/jbossesb/trunk/product/samples/quickstarts/business_rules_service/src/org/jboss/soa/esb/dvdstore/OrderItem.java)
===================================================================
--- labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/business_rules_service/src/org/jboss/soa/esb/dvdstore/OrderItem.java	                        (rev 0)
+++ labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/business_rules_service/src/org/jboss/soa/esb/dvdstore/OrderItem.java	2007-06-11 20:28:48 UTC (rev 12469)
@@ -0,0 +1,111 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2006, 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) 2005-2006,
+ * @author JBoss Inc.
+ */
+
+package org.jboss.soa.esb.dvdstore;
+
+import java.io.Serializable;
+
+/**
+ * @author <a href="mailto:tom.fennelly at jboss.com">tom.fennelly at jboss.com</a>
+ */
+public class OrderItem implements Serializable {
+
+	// <OrderLine position="1" quantity="1">
+	// 		<Product productId="364" title="The 40-Year-Old Virgin " price="29.98"/>
+	// </OrderLine>
+	private int position;
+	private int quantity;
+	private String productId;
+	private String title;
+	private double price;
+	
+	/**
+	 * @return Returns the position.
+	 */
+	public int getPosition() {
+		return position;
+	}
+	/**
+	 * @param position The position to set.
+	 */
+	public void setPosition(int position) {
+		//System.out.println("**** position: " + position);
+		this.position = position;
+	}
+	/**
+	 * @return Returns the price.
+	 */
+	public double getPrice() {
+		return price;
+	}
+	/**
+	 * @param price The price to set.
+	 */
+	public void setPrice(double price) {
+		//System.out.println("**** price: " + price);
+		this.price = price;
+	}
+	/**
+	 * @return Returns the productId.
+	 */
+	public String getProductId() {
+		return productId;
+	}
+	/**
+	 * @param productId The productId to set.
+	 */
+	public void setProductId(String productId) {
+		this.productId = productId;
+	}
+	/**
+	 * @return Returns the quantity.
+	 */
+	public int getQuantity() {
+		return quantity;
+	}
+	/**
+	 * @param quantity The quantity to set.
+	 */
+	public void setQuantity(int quantity) {
+		this.quantity = quantity;
+	}
+	/**
+	 * @return Returns the title.
+	 */
+	public String getTitle() {
+		return title;
+	}
+	/**
+	 * @param title The title to set.
+	 */
+	public void setTitle(String title) {
+		this.title = title;
+	}
+	
+	/* (non-Javadoc)
+	 * @see java.lang.Object#toString()
+	 */
+	@Override
+	public String toString() {
+		return position + "," + quantity + "," + productId + "," + title + "," + price;
+		
+	}
+}

Deleted: labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/business_rules_service/src/org/jboss/soa/esb/dvdstore/orderitem.st
===================================================================
--- labs/jbossesb/trunk/product/samples/quickstarts/business_rules_service/src/org/jboss/soa/esb/dvdstore/orderitem.st	2007-06-11 18:14:26 UTC (rev 12458)
+++ labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/business_rules_service/src/org/jboss/soa/esb/dvdstore/orderitem.st	2007-06-11 20:28:48 UTC (rev 12469)
@@ -1,7 +0,0 @@
-		<order-item>
-			<index>$orderItem.position$</index>
-			<quantity>$orderItem.quantity$</quantity>
-			<product>$orderItem.productId$</product>
-			<title>$orderItem.title$</title>
-			<price>$orderItem.price$</price>
-		</order-item>
\ No newline at end of file

Copied: labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/business_rules_service/src/org/jboss/soa/esb/dvdstore/orderitem.st (from rev 12458, labs/jbossesb/trunk/product/samples/quickstarts/business_rules_service/src/org/jboss/soa/esb/dvdstore/orderitem.st)
===================================================================
--- labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/business_rules_service/src/org/jboss/soa/esb/dvdstore/orderitem.st	                        (rev 0)
+++ labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/business_rules_service/src/org/jboss/soa/esb/dvdstore/orderitem.st	2007-06-11 20:28:48 UTC (rev 12469)
@@ -0,0 +1,7 @@
+		<order-item>
+			<index>$orderItem.position$</index>
+			<quantity>$orderItem.quantity$</quantity>
+			<product>$orderItem.productId$</product>
+			<title>$orderItem.title$</title>
+			<price>$orderItem.price$</price>
+		</order-item>
\ No newline at end of file

Copied: labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/business_rules_service/src/org/jboss/soa/esb/samples (from rev 12458, labs/jbossesb/trunk/product/samples/quickstarts/business_rules_service/src/org/jboss/soa/esb/samples)

Copied: labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/business_rules_service/src/org/jboss/soa/esb/samples/quickstart (from rev 12458, labs/jbossesb/trunk/product/samples/quickstarts/business_rules_service/src/org/jboss/soa/esb/samples/quickstart)

Copied: labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/business_rules_service/src/org/jboss/soa/esb/samples/quickstart/businessrules (from rev 12458, labs/jbossesb/trunk/product/samples/quickstarts/business_rules_service/src/org/jboss/soa/esb/samples/quickstart/businessrules)

Deleted: labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/business_rules_service/src/org/jboss/soa/esb/samples/quickstart/businessrules/ReviewMessage.java
===================================================================
--- labs/jbossesb/trunk/product/samples/quickstarts/business_rules_service/src/org/jboss/soa/esb/samples/quickstart/businessrules/ReviewMessage.java	2007-06-11 18:14:26 UTC (rev 12458)
+++ labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/business_rules_service/src/org/jboss/soa/esb/samples/quickstart/businessrules/ReviewMessage.java	2007-06-11 20:28:48 UTC (rev 12469)
@@ -1,53 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2006, 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) 2005-2006,
- * @author JBoss Inc.
- */
-package org.jboss.soa.esb.samples.quickstart.businessrules;
-
-import java.util.HashMap;
-import org.jboss.soa.esb.actions.AbstractActionPipelineProcessor;
-import org.jboss.soa.esb.actions.ActionProcessingException;
-import org.jboss.soa.esb.helpers.ConfigTree;
-import org.jboss.soa.esb.message.Message;
-import org.jboss.soa.esb.dvdstore.Customer;
-import org.jboss.soa.esb.dvdstore.OrderHeader;
-
-public class ReviewMessage extends AbstractActionPipelineProcessor {
-	private String input = "Reviewer";
-	
-	public Message process(Message message) throws ActionProcessingException {
-		
-		OrderHeader order = (OrderHeader) message.getBody().get("TheOrderHeader");
-		Customer customer = (Customer) message.getBody().get("TheCustomer");	
-		System.out.println("{ ================ " + input);		
-		System.out.println("Customer: " + customer);
-		System.out.println("Order Priority: " + order.getOrderPriority());
-		System.out.println("Order Discount: " + order.getOrderDiscount());
-		System.out.println("Order Total: " + order.getTotalAmount());
-		System.out.println("} ================ " + input);
-		// System.out.println("Order: " + order);
-	
-		return message;
-	}
-	
-	public ReviewMessage(ConfigTree configTree) {
-		input = configTree.getAttribute("stuff");
-	}
-	
-}
\ No newline at end of file

Copied: labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/business_rules_service/src/org/jboss/soa/esb/samples/quickstart/businessrules/ReviewMessage.java (from rev 12458, labs/jbossesb/trunk/product/samples/quickstarts/business_rules_service/src/org/jboss/soa/esb/samples/quickstart/businessrules/ReviewMessage.java)
===================================================================
--- labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/business_rules_service/src/org/jboss/soa/esb/samples/quickstart/businessrules/ReviewMessage.java	                        (rev 0)
+++ labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/business_rules_service/src/org/jboss/soa/esb/samples/quickstart/businessrules/ReviewMessage.java	2007-06-11 20:28:48 UTC (rev 12469)
@@ -0,0 +1,53 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2006, 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) 2005-2006,
+ * @author JBoss Inc.
+ */
+package org.jboss.soa.esb.samples.quickstart.businessrules;
+
+import java.util.HashMap;
+import org.jboss.soa.esb.actions.AbstractActionPipelineProcessor;
+import org.jboss.soa.esb.actions.ActionProcessingException;
+import org.jboss.soa.esb.helpers.ConfigTree;
+import org.jboss.soa.esb.message.Message;
+import org.jboss.soa.esb.dvdstore.Customer;
+import org.jboss.soa.esb.dvdstore.OrderHeader;
+
+public class ReviewMessage extends AbstractActionPipelineProcessor {
+	private String input = "Reviewer";
+	
+	public Message process(Message message) throws ActionProcessingException {
+		
+		OrderHeader order = (OrderHeader) message.getBody().get("TheOrderHeader");
+		Customer customer = (Customer) message.getBody().get("TheCustomer");	
+		System.out.println("{ ================ " + input);		
+		System.out.println("Customer: " + customer);
+		System.out.println("Order Priority: " + order.getOrderPriority());
+		System.out.println("Order Discount: " + order.getOrderDiscount());
+		System.out.println("Order Total: " + order.getTotalAmount());
+		System.out.println("} ================ " + input);
+		// System.out.println("Order: " + order);
+	
+		return message;
+	}
+	
+	public ReviewMessage(ConfigTree configTree) {
+		input = configTree.getAttribute("stuff");
+	}
+	
+}
\ No newline at end of file

Deleted: labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/business_rules_service/src/org/jboss/soa/esb/samples/quickstart/businessrules/SetupMessage.java
===================================================================
--- labs/jbossesb/trunk/product/samples/quickstarts/business_rules_service/src/org/jboss/soa/esb/samples/quickstart/businessrules/SetupMessage.java	2007-06-11 18:14:26 UTC (rev 12458)
+++ labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/business_rules_service/src/org/jboss/soa/esb/samples/quickstart/businessrules/SetupMessage.java	2007-06-11 20:28:48 UTC (rev 12469)
@@ -1,53 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2006, 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) 2005-2006,
- * @author JBoss Inc.
- */
-package org.jboss.soa.esb.samples.quickstart.businessrules;
-
-import java.util.HashMap;
-import org.jboss.soa.esb.actions.AbstractActionPipelineProcessor;
-import org.jboss.soa.esb.actions.ActionProcessingException;
-import org.jboss.soa.esb.helpers.ConfigTree;
-import org.jboss.soa.esb.message.Message;
-import org.jboss.soa.esb.dvdstore.Customer;
-import org.jboss.soa.esb.dvdstore.OrderHeader;
-import org.apache.log4j.Logger;
-
-public class SetupMessage extends AbstractActionPipelineProcessor {
-	private Logger logger = Logger.getLogger(SetupMessage.class);
-	private int status = 0;
-	
-	public Message process(Message message) throws ActionProcessingException {
-		HashMap transformedBeans = (HashMap) message.getBody().get("EXTRACTED_BEANS_HASH");
-		if(transformedBeans != null) {
-			OrderHeader header = (OrderHeader) transformedBeans.get("orderHeader");
-			Customer customer = (Customer) transformedBeans.get("customer");	
-			customer.setStatus(status); // demo purposes, passed in from the jboss-esb.xml
-			message.getBody().add("TheOrderHeader",header);
-			message.getBody().add("TheCustomer",customer);			
-			logger.info("Moved the transformed Order Header and Customer");
-		}
-		return message;
-	}
-	
-	public SetupMessage(ConfigTree configTree) {
-		status = Integer.parseInt(configTree.getAttribute("status"));
-	}
-	
-}
\ No newline at end of file

Copied: labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/business_rules_service/src/org/jboss/soa/esb/samples/quickstart/businessrules/SetupMessage.java (from rev 12458, labs/jbossesb/trunk/product/samples/quickstarts/business_rules_service/src/org/jboss/soa/esb/samples/quickstart/businessrules/SetupMessage.java)
===================================================================
--- labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/business_rules_service/src/org/jboss/soa/esb/samples/quickstart/businessrules/SetupMessage.java	                        (rev 0)
+++ labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/business_rules_service/src/org/jboss/soa/esb/samples/quickstart/businessrules/SetupMessage.java	2007-06-11 20:28:48 UTC (rev 12469)
@@ -0,0 +1,53 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2006, 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) 2005-2006,
+ * @author JBoss Inc.
+ */
+package org.jboss.soa.esb.samples.quickstart.businessrules;
+
+import java.util.HashMap;
+import org.jboss.soa.esb.actions.AbstractActionPipelineProcessor;
+import org.jboss.soa.esb.actions.ActionProcessingException;
+import org.jboss.soa.esb.helpers.ConfigTree;
+import org.jboss.soa.esb.message.Message;
+import org.jboss.soa.esb.dvdstore.Customer;
+import org.jboss.soa.esb.dvdstore.OrderHeader;
+import org.apache.log4j.Logger;
+
+public class SetupMessage extends AbstractActionPipelineProcessor {
+	private Logger logger = Logger.getLogger(SetupMessage.class);
+	private int status = 0;
+	
+	public Message process(Message message) throws ActionProcessingException {
+		HashMap transformedBeans = (HashMap) message.getBody().get("EXTRACTED_BEANS_HASH");
+		if(transformedBeans != null) {
+			OrderHeader header = (OrderHeader) transformedBeans.get("orderHeader");
+			Customer customer = (Customer) transformedBeans.get("customer");	
+			customer.setStatus(status); // demo purposes, passed in from the jboss-esb.xml
+			message.getBody().add("TheOrderHeader",header);
+			message.getBody().add("TheCustomer",customer);			
+			logger.info("Moved the transformed Order Header and Customer");
+		}
+		return message;
+	}
+	
+	public SetupMessage(ConfigTree configTree) {
+		status = Integer.parseInt(configTree.getAttribute("status"));
+	}
+	
+}
\ No newline at end of file

Copied: labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/business_rules_service/src/org/jboss/soa/esb/samples/quickstart/businessrules/test (from rev 12458, labs/jbossesb/trunk/product/samples/quickstarts/business_rules_service/src/org/jboss/soa/esb/samples/quickstart/businessrules/test)

Deleted: labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/business_rules_service/src/org/jboss/soa/esb/samples/quickstart/businessrules/test/SendJMSMessage.java
===================================================================
--- labs/jbossesb/trunk/product/samples/quickstarts/business_rules_service/src/org/jboss/soa/esb/samples/quickstart/businessrules/test/SendJMSMessage.java	2007-06-11 18:14:26 UTC (rev 12458)
+++ labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/business_rules_service/src/org/jboss/soa/esb/samples/quickstart/businessrules/test/SendJMSMessage.java	2007-06-11 20:28:48 UTC (rev 12469)
@@ -1,110 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2006, 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) 2005-2006,
- * @author JBoss Inc.
- */
-package org.jboss.soa.esb.samples.quickstart.businessrules.test;
-
-import javax.naming.InitialContext;
-import javax.naming.NamingException;
-import javax.jms.JMSException;
-import javax.jms.QueueConnectionFactory;
-import javax.jms.Queue;
-import javax.jms.QueueConnection;
-import javax.jms.QueueSession;
-import javax.jms.QueueSender;
-import javax.jms.ObjectMessage;
-
-import java.io.File;
-import java.io.FileReader;
-import java.io.IOException;
-
-public class SendJMSMessage {
-    QueueConnection conn;
-    QueueSession session;
-    Queue que;
-    
-    
-    public void setupConnection() throws JMSException, NamingException
-    {
-    	InitialContext iniCtx = new InitialContext();
-    	Object tmp = iniCtx.lookup("ConnectionFactory");
-    	QueueConnectionFactory qcf = (QueueConnectionFactory) tmp;
-    	conn = qcf.createQueueConnection();
-    	que = (Queue) iniCtx.lookup("queue/quickstart_Business_Rules_Request_GW");
-    	session = conn.createQueueSession(false, QueueSession.AUTO_ACKNOWLEDGE);
-    	conn.start();
-    	System.out.println("Connection Started");
-    }
-    
-    public void stop() throws JMSException 
-    { 
-        conn.stop();
-        session.close();
-        conn.close();
-    }
-    
-    public void sendAMessage(String msg) throws JMSException {
-    	
-        QueueSender send = session.createSender(que);        
-        ObjectMessage tm = session.createObjectMessage(msg);        
-        send.send(tm);        
-        send.close();
-    }
-    public String readAsciiFile(String fileName) throws IOException {
-		  FileReader fr = null;
-		  char[] thechars = null;
-
-		  try {
-			  File thefile = new File( fileName );
-			  fr = new FileReader( thefile );
-			  int size = (int) thefile.length();
-			  thechars = new char[size];
-		
-			  int count, index = 0;
-		
-			  // 	read in the bytes from the input stream
-			  while( ( count = fr.read( thechars, index, size ) ) > 0 ) {
-				  size -= count;
-				  index += count;
-			  }
-			} catch(Exception e) {	
-				System.out.println(e);
-			}
-			finally {
-				if( fr != null )
-		        fr.close();
-			}
-			return new String(thechars);
-
-    } // readAsciiFile
-    
-    public static void main(String args[]) throws Exception
-    {        	    	
-    	SendJMSMessage sm = new SendJMSMessage();
-    	sm.setupConnection();
-    	String fileContent = sm.readAsciiFile("SampleOrder.xml");
-    	System.out.println("---------------------------------------------");
-    	System.out.println(fileContent);
-    	System.out.println("---------------------------------------------");
-    	sm.sendAMessage(fileContent); 
-    	sm.stop();
-    	
-    }
-    
-}
\ No newline at end of file

Copied: labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/business_rules_service/src/org/jboss/soa/esb/samples/quickstart/businessrules/test/SendJMSMessage.java (from rev 12458, labs/jbossesb/trunk/product/samples/quickstarts/business_rules_service/src/org/jboss/soa/esb/samples/quickstart/businessrules/test/SendJMSMessage.java)
===================================================================
--- labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/business_rules_service/src/org/jboss/soa/esb/samples/quickstart/businessrules/test/SendJMSMessage.java	                        (rev 0)
+++ labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/business_rules_service/src/org/jboss/soa/esb/samples/quickstart/businessrules/test/SendJMSMessage.java	2007-06-11 20:28:48 UTC (rev 12469)
@@ -0,0 +1,110 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2006, 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) 2005-2006,
+ * @author JBoss Inc.
+ */
+package org.jboss.soa.esb.samples.quickstart.businessrules.test;
+
+import javax.naming.InitialContext;
+import javax.naming.NamingException;
+import javax.jms.JMSException;
+import javax.jms.QueueConnectionFactory;
+import javax.jms.Queue;
+import javax.jms.QueueConnection;
+import javax.jms.QueueSession;
+import javax.jms.QueueSender;
+import javax.jms.ObjectMessage;
+
+import java.io.File;
+import java.io.FileReader;
+import java.io.IOException;
+
+public class SendJMSMessage {
+    QueueConnection conn;
+    QueueSession session;
+    Queue que;
+    
+    
+    public void setupConnection() throws JMSException, NamingException
+    {
+    	InitialContext iniCtx = new InitialContext();
+    	Object tmp = iniCtx.lookup("ConnectionFactory");
+    	QueueConnectionFactory qcf = (QueueConnectionFactory) tmp;
+    	conn = qcf.createQueueConnection();
+    	que = (Queue) iniCtx.lookup("queue/quickstart_Business_Rules_Request_GW");
+    	session = conn.createQueueSession(false, QueueSession.AUTO_ACKNOWLEDGE);
+    	conn.start();
+    	System.out.println("Connection Started");
+    }
+    
+    public void stop() throws JMSException 
+    { 
+        conn.stop();
+        session.close();
+        conn.close();
+    }
+    
+    public void sendAMessage(String msg) throws JMSException {
+    	
+        QueueSender send = session.createSender(que);        
+        ObjectMessage tm = session.createObjectMessage(msg);        
+        send.send(tm);        
+        send.close();
+    }
+    public String readAsciiFile(String fileName) throws IOException {
+		  FileReader fr = null;
+		  char[] thechars = null;
+
+		  try {
+			  File thefile = new File( fileName );
+			  fr = new FileReader( thefile );
+			  int size = (int) thefile.length();
+			  thechars = new char[size];
+		
+			  int count, index = 0;
+		
+			  // 	read in the bytes from the input stream
+			  while( ( count = fr.read( thechars, index, size ) ) > 0 ) {
+				  size -= count;
+				  index += count;
+			  }
+			} catch(Exception e) {	
+				System.out.println(e);
+			}
+			finally {
+				if( fr != null )
+		        fr.close();
+			}
+			return new String(thechars);
+
+    } // readAsciiFile
+    
+    public static void main(String args[]) throws Exception
+    {        	    	
+    	SendJMSMessage sm = new SendJMSMessage();
+    	sm.setupConnection();
+    	String fileContent = sm.readAsciiFile("SampleOrder.xml");
+    	System.out.println("---------------------------------------------");
+    	System.out.println(fileContent);
+    	System.out.println("---------------------------------------------");
+    	sm.sendAMessage(fileContent); 
+    	sm.stop();
+    	
+    }
+    
+}
\ No newline at end of file

Modified: labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/conf/base-build.xml
===================================================================
--- labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/conf/base-build.xml	2007-06-11 20:11:01 UTC (rev 12468)
+++ labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/conf/base-build.xml	2007-06-11 20:28:48 UTC (rev 12469)
@@ -234,9 +234,9 @@
 
 <!-- ==================================================================== -->
 <!-- This section defines the following public targets.                   -->
-<!-- compile, run, deploy jar, package-deployment, undeploy,              -->
-<!-- deploy-jms-dests, undeploy-jms-dests, echoCP, echoPaths, clean,      -->
-<!-- help-quickstarts, help                                               -->
+<!-- compile, run, deploy jar, prepare-deployment, package-deployment,    -->
+<!-- undeploy, deploy-jms-dests, undeploy-jms-dests, echoCP, echoPaths,   -->
+<!-- clean, help-quickstarts, help                                        -->
 <!-- ==================================================================== -->
 
     <target name="compile" depends="dependencies">
@@ -261,21 +261,11 @@
 		</java>
 	</target>
 
-    <target name="deploy" depends="compile, config">
+    <target name="deploy" depends="prepare-deployment">
 		<description>deploy				will deploy the Quickstart .esb archive to JBoss ESB Server
     	</description>
 		<echo>Deploying Quickstart to JBoss ESB/App Server...</echo>
 
-        <mkdir dir="${build.dir}/META-INF" />
-        <copy todir="${build.dir}/META-INF">
-            <fileset dir="${basedir}" includes="jboss-esb.xml" />
-            <fileset dir="${basedir}" includes="deployment.xml" />
-        </copy>
-    	
-        <antcall target="quickstart-specific-assemblies" />
-
-        <antcall target="package-deployment" />
-
         <condition property="deploy.exploded.requested">
             <equals arg1="${deploy.exploded}" arg2="true" casesensitive="false"/>
         </condition>
@@ -288,6 +278,18 @@
         <antcall target="display-instructions" />
     </target>
 
+    <target name="prepare-deployment" depends="compile, config">
+        <mkdir dir="${build.dir}/META-INF" />
+        <copy todir="${build.dir}/META-INF">
+            <fileset dir="${basedir}" includes="jboss-esb.xml" />
+            <fileset dir="${basedir}" includes="deployment.xml" />
+        </copy>
+    	
+        <antcall target="quickstart-specific-assemblies" />
+
+        <antcall target="package-deployment" />
+    </target>
+
     <target name="deploy-esb" unless="deploy.exploded.requested">
     	<copy todir="${org.jboss.esb.server.deploy.dir}"
             file="${build.dir}/${ant.project.name}.esb"/>	

Copied: labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/fun_cbr/FunCBRRules-XPath.drl (from rev 12458, labs/jbossesb/trunk/product/samples/quickstarts/fun_cbr/FunCBRRules-XPath.drl)
===================================================================
--- labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/fun_cbr/FunCBRRules-XPath.drl	                        (rev 0)
+++ labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/fun_cbr/FunCBRRules-XPath.drl	2007-06-11 20:28:48 UTC (rev 12469)
@@ -0,0 +1,34 @@
+package com.jboss.soa.esb.routing.cbr
+
+#list any import classes here.
+import org.jboss.soa.esb.message.Message;
+import org.jboss.soa.esb.message.format.MessageType;
+
+expander XPathLanguage.dsl
+
+#declare any global variables here
+global java.util.List destinations;
+
+rule "Blue Routing Rule using XPATH"	
+	when
+		xpathEquals "/Order/@statusCode", "0"
+	then 
+	    Log : "Blue Team";
+		Destination : "blue";		
+end
+
+rule "Red Routing Rule using XPATH"	
+	when
+		xpathEquals "/Order/@statusCode", "1"
+	then 
+	    Log : "Red Team";
+		Destination : "red";		
+end
+
+rule "Green Routing Rule using XPATH"	
+	when
+		xpathEquals "/Order/@statusCode", "2"
+	then 
+	    Log : "Green Team";
+		Destination : "green";		
+end
\ No newline at end of file

Modified: labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/fun_cbr/build.xml
===================================================================
--- labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/fun_cbr/build.xml	2007-06-11 20:11:01 UTC (rev 12468)
+++ labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/fun_cbr/build.xml	2007-06-11 20:28:48 UTC (rev 12469)
@@ -5,52 +5,12 @@
 		${line.separator}
 	</description>
 		
+	<property name="additional.deploys" value="FunCBRRules-XPath.drl"/>
+
 	<!-- Import the base Ant build script... -->
 	<import file="../conf/base-build.xml"/>
 	
-	<property name="myrules.drl" value="FunCBRRules-XPath.drl"/>
-	<property name="myrules.xpath.drl" value="XPathLanguage.dsl"/>
-	<property name="rules.jar.name" value="${build.dir}/${ant.project.name}_rules.jar"/>
 	
-    <property name="additional.deploys" value="${rules.jar.name}, build/classes/${myrules.drl}, build/classes/${myrules.xpath.drl}" />
-		
-	<path id="quickstart-dependencies-classpath">
-		<pathelement location="${rules.jar.name}" />  
-	</path>
-	
-	<target name="quickstart-specific-deploys" depends="config">
-        <echo message="jar rules to ${rules.jar.name}" />
-		<antcall target="jar"/>
-	    <jar destfile="${rules.jar.name}" basedir="${basedir}/src/services/rules" includes="*.*"/>
-        <copy 
-			todir="${org.jboss.esb.server.deploy.dir}/jbossesb.sar/lib" 
-			file="${rules.jar.name}"  />
-    </target>
-	
-	<target name="jar">
-	    <jar destfile="${rules.jar.name}" basedir="${basedir}/src/services/rules" includes="*.*"/>
-		<antcall target="base-build.jar"/>
-	</target> 
-	
-	<target name="config">
-        <copy todir="${basedir}/build/classes" >
-			<fileset dir="src/services/rules">
-				<include name="${myrules.drl}"/>	
-				<include name="${myrules.xpath.drl}"/>	
-			</fileset>
-		</copy>
-	</target>
-
-  <target name="updateRules" description="update rules">
-	  	<!-- Rules files must be jarred and on the classpath -->
-	    <jar destfile="${build.dir}/${ant.project.name}_Rules.jar"
-			basedir="${basedir}/src/services/rules" includes="*.*"/>
-
-  	  <copy file="${build.dir}/${ant.project.name}_Rules.jar" overwrite="true"
-			todir="${org.jboss.esb.server.deploy.dir}/jbossesb.sar/lib"	
-	  />
-  </target>
-	
   <target name="runtest" depends="compile"
 	description="willl receive JMS message to tigger the actions in the ESB">
      <echo>Runs Test JMS Sender</echo>

Modified: labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/helloworld_hibernate_action/build.xml
===================================================================
--- labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/helloworld_hibernate_action/build.xml	2007-06-11 20:11:01 UTC (rev 12468)
+++ labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/helloworld_hibernate_action/build.xml	2007-06-11 20:28:48 UTC (rev 12469)
@@ -17,6 +17,9 @@
 		<fileset dir="${basedir}/lib" includes="*.jar"/>
 	</path>	
 
+	<target name="package-deployment">
+	</target>
+
 	<target name="deploy" depends="build-ear">
 		<copy file="${build.dir}/${ant.project.name}.ear"
 			todir="${org.jboss.esb.server.deploy.dir}"/>
@@ -29,7 +32,7 @@
                         todir="build/classes/org/jboss/soa/esb/samples/quickstart/hibernateaction"/>	
 	</target>
 
-	<target name="build-ear" depends="package-deployment">
+	<target name="build-ear" depends="compile, package-deployment">
 		<jar destfile="${build.dir}/${ant.project.name}.jar">
 			<fileset dir="${build.dir}/classes">
 				<include name="**"/>

Modified: labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/helloworld_hibernate_action/readme.txt
===================================================================
--- labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/helloworld_hibernate_action/readme.txt	2007-06-11 20:11:01 UTC (rev 12468)
+++ labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/helloworld_hibernate_action/readme.txt	2007-06-11 20:28:48 UTC (rev 12469)
@@ -11,6 +11,17 @@
 that you load and delete items, you can watch the Hibernate entities sent
 in messages to JBoss's console. 
 
+Here are the Hibernate Interceptor events which can be listened for:
+onCollectionRemove
+onCollectionUpdate
+onDelete
+onFlushDirty
+onLoad
+onSave
+
+See the sample jboss-esb.xml for how these are used within a
+<hibernate-message-filter>.
+
 Running this quickstart:
 ========================
     Please refer to 'ant help-quickstarts' for prerequisites about the quickstarts and a

Copied: labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/simple_cbr/SimpleCBRRules-XPath.drl (from rev 12458, labs/jbossesb/trunk/product/samples/quickstarts/simple_cbr/SimpleCBRRules-XPath.drl)
===================================================================
--- labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/simple_cbr/SimpleCBRRules-XPath.drl	                        (rev 0)
+++ labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/simple_cbr/SimpleCBRRules-XPath.drl	2007-06-11 20:28:48 UTC (rev 12469)
@@ -0,0 +1,33 @@
+#created on: Nov 8, 2006
+package com.jboss.soa.esb.routing.cbr
+
+#list any import classes here.
+import org.jboss.soa.esb.message.Message;
+import org.jboss.soa.esb.message.format.MessageType;
+
+expander XPathLanguage.dsl
+
+#declare any global variables here
+global java.util.List destinations;
+
+rule "Routing Rule using XPATH"
+	
+	when
+		xpathGreaterThan "/Order/@totalAmount", "50.0"
+	then 
+	    Log : "EXPRESS";
+		Log : "EXPRESS";
+		Log : "Really It's EXPRESS Shipping";
+		Destination : "express";
+		
+end
+
+rule "Routing Rule using XPATH less"
+    when
+        xpathLessThan "/Order/@totalAmount", "50.0"
+    then
+	    Log : "NORMAL";
+		Log : "NORMAL";
+		Log : "Really It's NORMAL Shipping";
+		Destination : "normal";
+end
\ No newline at end of file

Copied: labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/simple_cbr/SimpleCBRRules.drl (from rev 12458, labs/jbossesb/trunk/product/samples/quickstarts/simple_cbr/SimpleCBRRules.drl)
===================================================================
--- labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/simple_cbr/SimpleCBRRules.drl	                        (rev 0)
+++ labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/simple_cbr/SimpleCBRRules.drl	2007-06-11 20:28:48 UTC (rev 12469)
@@ -0,0 +1,29 @@
+#created on: Oct 30, 2006
+package com.jboss.soa.esb.routing.cbr
+
+#list any import classes here.
+import org.jboss.soa.esb.message.Message;
+import org.jboss.soa.esb.message.format.MessageType;
+
+#declare any global variables here
+global java.util.List destinations;
+
+
+rule "Routing Rule - Serialized based message"
+	
+	when
+		Message( type == MessageType.JAVA_SERIALIZED)
+	then
+		System.out.println("Serialized");
+		destinations.add("serialized");
+		
+end
+
+rule "Routing Rule - XML based message"
+	
+	when
+		Message( type == MessageType.JBOSS_XML)
+	then 
+		System.out.println("JBoss_XML");
+		destinations.add("xml");
+end
\ No newline at end of file

Modified: labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/simple_cbr/build.xml
===================================================================
--- labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/simple_cbr/build.xml	2007-06-11 20:11:01 UTC (rev 12468)
+++ labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/simple_cbr/build.xml	2007-06-11 20:28:48 UTC (rev 12469)
@@ -5,23 +5,11 @@
 		${line.separator}
 	</description>
 	
+	<property name="additional.deploys" value="SimpleCBRRules.drl SimpleCBRRules-XPath.drl"/>
+
 	<!-- Import the base Ant build script... -->
 	<import file="../conf/base-build.xml"/>
 		
-	<property name="myrules.drl" value="SimpleCBRRules.drl"/>
-	<property name="myrules.xpath.drl" value="SimpleCBRRules-XPath.drl"/>
-	
-    <property name="additional.deploys" value=" build/classes/${myrules.drl}, build/classes/${myrules.xpath.drl}" />
-	
-	<target name="config">
-        <copy todir="${basedir}/build/classes" >
-			<fileset dir="src/services/rules">
-				<include name="${myrules.drl}"/>	
-				<include name="${myrules.xpath.drl}"/>	
-			</fileset>
-		</copy>
-	</target>
-
   <target name="runtest" description="sends a JMS message to the ESB" depends="compile">
      <echo>Runs Test JMS Sender</echo>
      <java fork="yes" classname="org.jboss.soa.esb.samples.quickstart.simplecbr.test.SendJMSMessage" failonerror="true">

Modified: labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/tests/build.xml
===================================================================
--- labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/tests/build.xml	2007-06-11 20:11:01 UTC (rev 12468)
+++ labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/tests/build.xml	2007-06-11 20:28:48 UTC (rev 12469)
@@ -38,6 +38,9 @@
       <fileset dir="..">
 	<include name="**/*.jar"/>
       </fileset> 
+      <dirset dir="..">
+	<include name="*/build/classes/"/>
+      </dirset>
       <fileset dir="${lib.ext}" includes="*.jar"/>
       <fileset dir="${product.lib}" includes="*.jar"/>
       <path refid="base.cp"/>
@@ -134,21 +137,10 @@
 	<macrodef name="output-esb">
 		<attribute name="quickstartdir"/>
 		<sequential>	
-			<mkdir dir="@{quickstartdir}/build/META-INF"/>
-		        <copy todir="@{quickstartdir}/build/META-INF">
-            			<fileset dir="@{quickstartdir}" includes="jboss-esb.xml" />
-            			<fileset dir="@{quickstartdir}" includes="deployment.xml" />
-        		</copy>		
-	
-			<ant antfile="build.xml"
-                		dir="@{quickstartdir}"
-                		target="jar"/>
                         <ant antfile="build.xml"
-                                dir="@{quickstartdir}"
-                                target="config"/>
-                        <ant antfile="build.xml"
-                                dir="@{quickstartdir}"
-                                target="package-deployment"/>
+                                dir="@{quickstartdir}">
+                                <target name="prepare-deployment"/>
+                        </ant>
         		<copy todir="output/lib">
                 	<fileset dir="@{quickstartdir}/build">
                        		 <include name="*.esb"/>
@@ -157,26 +149,9 @@
 		</sequential>
 	</macrodef>
 	
-	<!-- bpm_orchestration has non-standard targets -->
-	<ant antfile="build.xml"
-		dir="../bpm_orchestration1"
-		target="esb"/>	
-	<copy todir="output/lib">
-		<fileset dir="../bpm_orchestration1/build">
-			<include name="**"/>
-		</fileset>
-	</copy>
+   	<output-esb quickstartdir="../bpm_orchestration1"/>
+   	<output-esb quickstartdir="../jbpm_simple1"/>
 
-        <!-- jbpm_simple1n has non-standard targets -->
-        <ant antfile="build.xml"
-                dir="../jbpm_simple1"
-                target="esb"/>
-        <copy todir="output/lib">
-                <fileset dir="../jbpm_simple1/build">
-                        <include name="**"/>
-                </fileset>
-        </copy>	
-
    	<output-esb quickstartdir="../fun_cbr">
 	</output-esb>
    	<output-esb quickstartdir="../helloworld">

Modified: labs/jbossesb/workspace/dbevenius/product/services/smooks/src/main/java/org/jboss/soa/esb/actions/converters/SmooksTransformer.java
===================================================================
--- labs/jbossesb/workspace/dbevenius/product/services/smooks/src/main/java/org/jboss/soa/esb/actions/converters/SmooksTransformer.java	2007-06-11 20:11:01 UTC (rev 12468)
+++ labs/jbossesb/workspace/dbevenius/product/services/smooks/src/main/java/org/jboss/soa/esb/actions/converters/SmooksTransformer.java	2007-06-11 20:28:48 UTC (rev 12469)
@@ -14,6 +14,7 @@
 import org.jboss.soa.esb.actions.ActionUtils;
 import org.jboss.soa.esb.helpers.ConfigTree;
 import org.jboss.soa.esb.helpers.KeyValuePair;
+import org.jboss.soa.esb.message.Body;
 import org.jboss.soa.esb.message.Message;
 import org.jboss.soa.esb.services.transform.TransformationException;
 import org.jboss.soa.esb.services.transform.TransformationService;
@@ -137,8 +138,10 @@
 	public SmooksTransformer(ConfigTree propertiesTree) throws ConfigurationException {
         List<KeyValuePair> properties = propertiesTree.attributesAsList();
 
-        inputLocation = KeyValuePair.getValue(INPUT_LOCATION, properties);
-        outputLocation = KeyValuePair.getValue(OUTPUT_LOCATION, properties);
+        // if no input location given, then assume default location in message body.
+        inputLocation = KeyValuePair.getValue(INPUT_LOCATION, properties, Body.DEFAULT_LOCATION);
+        // if no output location given, then assume default location in message body.
+        outputLocation = KeyValuePair.getValue(OUTPUT_LOCATION, properties, Body.DEFAULT_LOCATION);
 
         // Get the default message flow properties (can be overriden by the message properties)...
 		defaultMessageFromType = KeyValuePair.getValue(FROM_TYPE, properties);

Copied: labs/jbossesb/workspace/dbevenius/product/tools/console/lib/antlr-3.0b7.jar (from rev 12458, labs/jbossesb/trunk/product/tools/console/lib/antlr-3.0b7.jar)
===================================================================
(Binary files differ)

Deleted: labs/jbossesb/workspace/dbevenius/product/tools/console/lib/antlr-3.0ea8.jar
===================================================================
(Binary files differ)

Deleted: labs/jbossesb/workspace/dbevenius/product/tools/console/lib/stringtemplate-2.3b6.jar
===================================================================
(Binary files differ)

Copied: labs/jbossesb/workspace/dbevenius/product/tools/console/lib/stringtemplate-3.0.jar (from rev 12458, labs/jbossesb/trunk/product/tools/console/lib/stringtemplate-3.0.jar)
===================================================================
(Binary files differ)

Modified: labs/jbossesb/workspace/dbevenius/product/tools/console/resources/META-INF/application.xml
===================================================================
--- labs/jbossesb/workspace/dbevenius/product/tools/console/resources/META-INF/application.xml	2007-06-11 20:11:01 UTC (rev 12468)
+++ labs/jbossesb/workspace/dbevenius/product/tools/console/resources/META-INF/application.xml	2007-06-11 20:28:48 UTC (rev 12469)
@@ -51,7 +51,7 @@
       <java>antlr-2.7.6.jar</java>
    </module>
    <module>
-      <java>antlr-3.0ea8.jar</java>
+      <java>antlr-3.0b7.jar</java>
    </module>
    <module>
       <java>commons-jci-core-1.0-406301.jar</java>
@@ -60,7 +60,7 @@
       <java>commons-jci-janino-2.4.3.jar</java>
    </module>
    <module>
-      <java>stringtemplate-2.3b6.jar</java>
+      <java>stringtemplate-3.0.jar</java>
    </module>
 
    <!-- Smooks and dependencies -->
@@ -110,4 +110,4 @@
       <java>xmlpublic.jar</java>
    </module>
 
-</application>
\ No newline at end of file
+</application>

Copied: labs/jbossesb/workspace/dbevenius/qa/junit/resources/server/simple/META-INF/deployment.xml (from rev 12458, labs/jbossesb/trunk/qa/junit/resources/server/simple/META-INF/deployment.xml)
===================================================================
--- labs/jbossesb/workspace/dbevenius/qa/junit/resources/server/simple/META-INF/deployment.xml	                        (rev 0)
+++ labs/jbossesb/workspace/dbevenius/qa/junit/resources/server/simple/META-INF/deployment.xml	2007-06-11 20:28:48 UTC (rev 12469)
@@ -0,0 +1,5 @@
+<jbossesb-deployment>
+   <depends>jboss.esb:test=server</depends>
+   <depends>jboss.messaging.destination:service=Queue,name=esb_gateway_channel</depends>
+   <depends>jboss.messaging.destination:service=Queue,name=esb_channel</depends>
+</jbossesb-deployment>
\ No newline at end of file




More information about the jboss-svn-commits mailing list