[jboss-svn-commits] JBL Code SVN: r21013 - in labs/jbossesb/trunk/product: rosetta/src/org/jboss/internal/soa/esb/dependencies and 65 other directories.

jboss-svn-commits at lists.jboss.org jboss-svn-commits at lists.jboss.org
Sat Jul 12 06:55:05 EDT 2008


Author: kevin.conner at jboss.com
Date: 2008-07-12 06:55:04 -0400 (Sat, 12 Jul 2008)
New Revision: 21013

Added:
   labs/jbossesb/trunk/product/samples/quickstarts/helloworld_tx_sql_action/src/h2/
   labs/jbossesb/trunk/product/samples/quickstarts/helloworld_tx_sql_action/src/h2/create.sql
   labs/jbossesb/trunk/product/samples/quickstarts/jms_secured/messaging-db-users-service.xml
   labs/jbossesb/trunk/product/services/jbossesb/src/main/resources/message-store-sql/mssql/
   labs/jbossesb/trunk/product/services/jbossesb/src/main/resources/message-store-sql/mssql/create_database.sql
   labs/jbossesb/trunk/product/services/jbossesb/src/main/resources/message-store-sql/mssql/drop_database.sql
   labs/jbossesb/trunk/product/services/jbpm/ant-task/test/
   labs/jbossesb/trunk/product/services/jbpm/ant-task/test/org/
   labs/jbossesb/trunk/product/services/jbpm/ant-task/test/org/jbpm/
   labs/jbossesb/trunk/product/services/jbpm/ant-task/test/org/jbpm/ant/
   labs/jbossesb/trunk/product/services/jbpm/ant-task/test/org/jbpm/ant/DeployProcessToServerTaskUnitTest.java
Removed:
   labs/jbossesb/trunk/product/samples/quickstarts/helloworld_tx_sql_action/src/h2/create.sql
   labs/jbossesb/trunk/product/samples/quickstarts/helloworld_tx_sql_action/src/hsqldb/
   labs/jbossesb/trunk/product/services/jbossesb/src/main/resources/message-store-sql/mssql/create_database.sql
   labs/jbossesb/trunk/product/services/jbossesb/src/main/resources/message-store-sql/mssql/drop_database.sql
   labs/jbossesb/trunk/product/services/jbpm/ant-task/test/org/
   labs/jbossesb/trunk/product/services/jbpm/ant-task/test/org/jbpm/
   labs/jbossesb/trunk/product/services/jbpm/ant-task/test/org/jbpm/ant/
   labs/jbossesb/trunk/product/services/jbpm/ant-task/test/org/jbpm/ant/DeployProcessToServerTaskUnitTest.java
   labs/jbossesb/trunk/product/services/jbpm/lib/ext/jbpm-ant.jar
   labs/jbossesb/trunk/product/services/jbpm/src/main/resources/jbpm-sql/import.sql
Modified:
   labs/jbossesb/trunk/product/rosetta/src/org/jboss/internal/soa/esb/couriers/JmsCourier.java
   labs/jbossesb/trunk/product/rosetta/src/org/jboss/internal/soa/esb/couriers/SqlTableCourier.java
   labs/jbossesb/trunk/product/rosetta/src/org/jboss/internal/soa/esb/dependencies/H2Database.java
   labs/jbossesb/trunk/product/rosetta/src/org/jboss/internal/soa/esb/dependencies/H2DatabaseMBean.java
   labs/jbossesb/trunk/product/rosetta/src/org/jboss/internal/soa/esb/remoting/HttpUnmarshaller.java
   labs/jbossesb/trunk/product/rosetta/src/org/jboss/internal/soa/esb/rosetta/pooling/JmsConnectionPool.java
   labs/jbossesb/trunk/product/rosetta/src/org/jboss/internal/soa/esb/services/registry/JAXRRegistryImpl.java
   labs/jbossesb/trunk/product/rosetta/src/org/jboss/internal/soa/esb/util/StreamUtils.java
   labs/jbossesb/trunk/product/rosetta/src/org/jboss/soa/esb/common/JBossESBPropertyService.java
   labs/jbossesb/trunk/product/rosetta/src/org/jboss/soa/esb/helpers/Email.java
   labs/jbossesb/trunk/product/rosetta/src/org/jboss/soa/esb/listeners/StandAloneBootStrapper.java
   labs/jbossesb/trunk/product/rosetta/src/org/jboss/soa/esb/listeners/gateway/SqlTableGatewayListener.java
   labs/jbossesb/trunk/product/rosetta/tests/src/org/jboss/soa/esb/actions/routing/JmsRouterIntegrationTest.java
   labs/jbossesb/trunk/product/samples/quickstarts/aggregator/aggregation_service/jbossesb.xml
   labs/jbossesb/trunk/product/samples/quickstarts/aggregator/blue_service/jbossesb.xml
   labs/jbossesb/trunk/product/samples/quickstarts/aggregator/green_service/jbossesb.xml
   labs/jbossesb/trunk/product/samples/quickstarts/aggregator/inbound_splitter/jbossesb.xml
   labs/jbossesb/trunk/product/samples/quickstarts/aggregator/red_service/jbossesb.xml
   labs/jbossesb/trunk/product/samples/quickstarts/bpm_orchestration1/build.xml
   labs/jbossesb/trunk/product/samples/quickstarts/bpm_orchestration2/build.xml
   labs/jbossesb/trunk/product/samples/quickstarts/bpm_orchestration2/jboss-esb.xml
   labs/jbossesb/trunk/product/samples/quickstarts/bpm_orchestration2/readme.txt
   labs/jbossesb/trunk/product/samples/quickstarts/bpm_orchestration3/build.xml
   labs/jbossesb/trunk/product/samples/quickstarts/business_rules_service/jboss-esb.xml
   labs/jbossesb/trunk/product/samples/quickstarts/business_service/jboss-esb.xml
   labs/jbossesb/trunk/product/samples/quickstarts/conf/base-build.xml
   labs/jbossesb/trunk/product/samples/quickstarts/conf/quickstarts.properties-example
   labs/jbossesb/trunk/product/samples/quickstarts/custom_action/jboss-esb.xml
   labs/jbossesb/trunk/product/samples/quickstarts/deadletter/jboss-esb.xml
   labs/jbossesb/trunk/product/samples/quickstarts/exceptions_faults/jboss-esb.xml
   labs/jbossesb/trunk/product/samples/quickstarts/fun_cbr/jboss-esb.xml
   labs/jbossesb/trunk/product/samples/quickstarts/groovy_gateway/jboss-esb.xml
   labs/jbossesb/trunk/product/samples/quickstarts/helloworld_tx_sql_action/build.xml
   labs/jbossesb/trunk/product/samples/quickstarts/helloworld_tx_sql_action/jboss-esb.xml
   labs/jbossesb/trunk/product/samples/quickstarts/helloworld_tx_sql_action/jbossesb-service.xml
   labs/jbossesb/trunk/product/samples/quickstarts/helloworld_tx_sql_action/quickstart-ds.xml
   labs/jbossesb/trunk/product/samples/quickstarts/jms_secured/build.xml
   labs/jbossesb/trunk/product/samples/quickstarts/jms_secured/deployment.xml
   labs/jbossesb/trunk/product/samples/quickstarts/jms_secured/jboss-esb.xml
   labs/jbossesb/trunk/product/samples/quickstarts/jms_secured/readme.txt
   labs/jbossesb/trunk/product/samples/quickstarts/jms_topic/jboss-esb.xml
   labs/jbossesb/trunk/product/samples/quickstarts/jms_transacted/jboss-esb.xml
   labs/jbossesb/trunk/product/samples/quickstarts/load_generator/jboss-esb.xml
   labs/jbossesb/trunk/product/samples/quickstarts/messagefilter/jboss-esb.xml
   labs/jbossesb/trunk/product/samples/quickstarts/messagestore/jboss-esb.xml
   labs/jbossesb/trunk/product/samples/quickstarts/native_client/jboss-esb.xml
   labs/jbossesb/trunk/product/samples/quickstarts/scripting_groovy/jboss-esb.xml
   labs/jbossesb/trunk/product/samples/quickstarts/transform_XML2POJO/jboss-esb.xml
   labs/jbossesb/trunk/product/samples/quickstarts/webservice_bpel/jboss-esb.xml
   labs/jbossesb/trunk/product/samples/quickstarts/webservice_consumer1/jboss-esb.xml
   labs/jbossesb/trunk/product/samples/quickstarts/webservice_consumer2/jboss-esb.xml
   labs/jbossesb/trunk/product/samples/quickstarts/webservice_mtom/jboss-esb.xml
   labs/jbossesb/trunk/product/samples/quickstarts/webservice_producer/jboss-esb.xml
   labs/jbossesb/trunk/product/samples/quickstarts/webservice_wsaddressing/jboss-esb.xml
   labs/jbossesb/trunk/product/samples/quickstarts/webservice_wssecurity/jboss-esb.xml
   labs/jbossesb/trunk/product/samples/quickstarts/wiretap/jboss-esb.xml
   labs/jbossesb/trunk/product/services/base-project-build.xml
   labs/jbossesb/trunk/product/services/jbossesb/src/main/resources/META-INF/deployment.xml
   labs/jbossesb/trunk/product/services/jbpm/ant-task/build.xml
   labs/jbossesb/trunk/product/services/jbpm/ant-task/src/org/jbpm/ant/DeployProcessToServerTask.java
   labs/jbossesb/trunk/product/services/jbpm/ant-task/src/org/jbpm/ant/ProcessDeployer.java
   labs/jbossesb/trunk/product/services/jbpm/build.xml
   labs/jbossesb/trunk/product/services/jbpm/src/main/resources/jbpm-service.xml
   labs/jbossesb/trunk/product/services/soap/src/main/java/org/jboss/soa/esb/actions/soap/SOAPClient.java
   labs/jbossesb/trunk/product/services/soapui-client/soapui-client.iml
   labs/jbossesb/trunk/product/services/soapui-client/soapui-client.ipr
   labs/jbossesb/trunk/product/services/soapui-client/soapui-client.iws
   labs/jbossesb/trunk/product/services/soapui-client/src/test/java/org/jboss/soa/esb/services/soapui/JBESB_1713_SoapUIClientServiceMBeanUnitTest.java
   labs/jbossesb/trunk/product/services/soapui-client/src/test/java/org/jboss/soa/esb/services/soapui/orderprocessing/expected_01.xml
   labs/jbossesb/trunk/product/tools/console/management-esb/src/main/resources/oracle/create_database.sql
   labs/jbossesb/trunk/product/tools/console/management/build.xml
Log:
Updated to include CP2/FP3 modifications: JBESB-1867

Modified: labs/jbossesb/trunk/product/rosetta/src/org/jboss/internal/soa/esb/couriers/JmsCourier.java
===================================================================
--- labs/jbossesb/trunk/product/rosetta/src/org/jboss/internal/soa/esb/couriers/JmsCourier.java	2008-07-11 21:37:37 UTC (rev 21012)
+++ labs/jbossesb/trunk/product/rosetta/src/org/jboss/internal/soa/esb/couriers/JmsCourier.java	2008-07-12 10:55:04 UTC (rev 21013)
@@ -28,12 +28,12 @@
 import java.util.Properties;
 
 import javax.jms.DeliveryMode;
+import javax.jms.Destination;
 import javax.jms.JMSException;
 import javax.jms.MessageConsumer;
 import javax.jms.MessageProducer;
 import javax.jms.ObjectMessage;
 import javax.jms.Session;
-import javax.jms.Topic;
 import javax.naming.Context;
 import javax.naming.NamingException;
 import javax.xml.parsers.ParserConfigurationException;
@@ -98,26 +98,28 @@
 
     public void cleanup() {
         synchronized(this) {
-            if (_messageProducer != null) {
-                try {
-                    _messageProducer.close();
-                } catch (Exception e) {
-                    _logger.debug(e.getMessage(), e);
-                } finally {
-                    _messageProducer = null;
-                    closeSession();
+            try {
+                if (_messageProducer != null) {
+                    try {
+                        _messageProducer.close();
+                    } catch (Exception e) {
+                        _logger.debug(e.getMessage(), e);
+                    } finally {
+                        _messageProducer = null;
+                    }
                 }
-            }
 
-            if (_messageConsumer != null) {
-                try {
-                   _messageConsumer.close();
-                } catch (JMSException e) {
-                    _logger.debug(e.getMessage(), e);
-                } finally {
-                    _messageConsumer = null;
-                    closeSession();
+                if (_messageConsumer != null) {
+                    try {
+                       _messageConsumer.close();
+                    } catch (JMSException e) {
+                        _logger.debug(e.getMessage(), e);
+                    } finally {
+                        _messageConsumer = null;
+                    }
                 }
+            } finally {
+                closeSession() ;
             }
         }
     } // ________________________________
@@ -311,59 +313,52 @@
     } // ________________________________
 
     private void createMessageProducer() throws CourierException, NamingContextException {
-        Context oJndiCtx = null;
-        
         synchronized(this) {
             if (_messageProducer == null) {
                 try {
-                    oJndiCtx = NamingContextPool.getNamingContext(_epr.getJndiEnvironment());
-
-                    String sType = _epr.getDestinationType();
-                    if (JMSEpr.QUEUE_TYPE.equals(sType)) {
-                        Session qSess = getJmsSession(_epr.getAcknowledgeMode());
-                        javax.jms.Queue queue = null;
-                        try {
-                            queue = (javax.jms.Queue) oJndiCtx.lookup(_epr
-                                    .getDestinationName());
-                        } catch (NamingException ne) {
+                    final Session session = getJmsSession(_epr.getAcknowledgeMode());
+                    Destination destination = null ;
+                    final String destinationName = _epr.getDestinationName() ;
+                    Context oJndiCtx = NamingContextPool.getNamingContext(_epr.getJndiEnvironment());
+                    try {
+                        String sType = _epr.getDestinationType();
+                        if (JMSEpr.QUEUE_TYPE.equals(sType)) {
                             try {
-                                oJndiCtx = NamingContextPool.replaceNamingContext(oJndiCtx, _epr.getJndiEnvironment());
-                                queue = (javax.jms.Queue) oJndiCtx.lookup(_epr
-                                        .getDestinationName());
-                            } catch (NamingException nex) {
-                                //ActiveMQ
-                                queue = qSess.createQueue(_epr.getDestinationName());
+                                destination = (Destination) oJndiCtx.lookup(destinationName);
+                            } catch (NamingException ne) {
+                                try {
+                                    oJndiCtx = NamingContextPool.replaceNamingContext(oJndiCtx, _epr.getJndiEnvironment());
+                                    destination = (Destination) oJndiCtx.lookup(destinationName);
+                                } catch (NamingException nex) {
+                                    //ActiveMQ
+                                    destination = session.createQueue(destinationName);
+                                }
                             }
+                        } else if (JMSEpr.TOPIC_TYPE.equals(sType)) {
+                            try {
+                                destination = (Destination) oJndiCtx.lookup(destinationName);
+                            }
+                            catch (NamingException ne) {
+                                destination = session.createTopic(destinationName);
+                            }
+                        } else {
+                            throw new CourierException("Unknown destination type");
                         }
-                        _messageProducer = qSess.createProducer(queue);
-                    } else if (JMSEpr.TOPIC_TYPE.equals(sType)) {
-                        Session tSess = getJmsSession(_epr.getAcknowledgeMode());
-                        Topic topic = null;
-                        try {
-                            topic = (Topic) oJndiCtx.lookup(_epr
-                                    .getDestinationName());
+                        _messageProducer = session.createProducer(destination);
+                        _messageProducer.setDeliveryMode(_epr.getPersistent()?DeliveryMode.PERSISTENT:DeliveryMode.NON_PERSISTENT);
+                        if ( _logger.isDebugEnabled() )
+                            _logger.debug("JMSCourier deliveryMode: " + _messageProducer.getDeliveryMode() + ", peristent:" + _epr.getPersistent());
+                    } finally {
+                        if (oJndiCtx != null) {
+                            NamingContextPool.releaseNamingContext(oJndiCtx) ;
                         }
-                        catch (NamingException ne) {
-                            topic = tSess.createTopic(_epr.getDestinationName());
-                        }
-                        _messageProducer = tSess.createProducer(topic);
-                    } else {
-                        throw new CourierException("Unknown destination type");
                     }
-                    _messageProducer.setDeliveryMode(_epr.getPersistent()?DeliveryMode.PERSISTENT:DeliveryMode.NON_PERSISTENT);
-                    if ( _logger.isDebugEnabled() )
-                        _logger.debug("JMSCourier deliveryMode: " + _messageProducer.getDeliveryMode() + ", peristent:" + _epr.getPersistent());
                 }
                 catch (JMSException ex) {
                     _logger.debug("Error from JMS system.", ex);
 
                     throw new CourierException(ex);
                 }
-                finally {
-                    if (oJndiCtx != null) {
-                        NamingContextPool.releaseNamingContext(oJndiCtx) ;
-                    }
-                }
             }
         }
     } // ________________________________
@@ -480,42 +475,39 @@
                 boolean success = false;
                 try {
                     Properties environment = _epr.getJndiEnvironment();
+                    final Session session = getJmsSession(_epr.getAcknowledgeMode());
+                    Destination destination = null ;
+                    final String destinationName = _epr.getDestinationName() ;
                     oJndiCtx = NamingContextPool.getNamingContext(environment);
                     try
                     {
                         String sType = _epr.getDestinationType();
                         if (JMSEpr.QUEUE_TYPE.equals(sType)) {
-                            Session qSess = getJmsSession(_epr.getAcknowledgeMode());
-                            javax.jms.Queue queue = null;
                             try {
-                                queue = (javax.jms.Queue) oJndiCtx.lookup(_epr
-                                        .getDestinationName());
+                                destination = (Destination) oJndiCtx.lookup(destinationName);
                             } catch (NamingException ne) {
                                 try {
                                     oJndiCtx = NamingContextPool.replaceNamingContext(oJndiCtx, environment);
-                                    queue = (javax.jms.Queue) oJndiCtx.lookup(_epr
-                                            .getDestinationName());
+                                    destination = (Destination) oJndiCtx.lookup(destinationName);
                                 } catch (NamingException nex) {
                                     //ActiveMQ
-                                    queue = qSess.createQueue(_epr.getDestinationName());
+                                    destination = session.createQueue(destinationName);
                                 }
                             }
-                            _messageConsumer = qSess.createConsumer(queue, _epr.getMessageSelector());
                         } else if (JMSEpr.TOPIC_TYPE.equals(sType)) {
-                            Session tSess = getJmsSession(_epr.getAcknowledgeMode());
-                            Topic topic = null;
                              try {
-                                   topic = (Topic) oJndiCtx.lookup(_epr
-                                                            .getDestinationName());
+                                   destination = (Destination) oJndiCtx.lookup(destinationName);
                              }
                              catch (NamingException ne) {
-                                   topic = tSess.createTopic(_epr.getDestinationName());
+                                   destination = session.createTopic(destinationName);
                              }
-                                  _messageConsumer = tSess.createConsumer(topic, _epr
-                                         .getMessageSelector());
                         } else {
                             throw new CourierException("Unknown destination type");
                         }
+                        if (destination == null) {
+                            throw new CourierException("Could not locate destination: " + destinationName);
+                        }
+                        _messageConsumer = session.createConsumer(destination, _epr.getMessageSelector());
                         success = true;
                     } finally {
                         NamingContextPool.releaseNamingContext(oJndiCtx) ;

Modified: labs/jbossesb/trunk/product/rosetta/src/org/jboss/internal/soa/esb/couriers/SqlTableCourier.java
===================================================================
--- labs/jbossesb/trunk/product/rosetta/src/org/jboss/internal/soa/esb/couriers/SqlTableCourier.java	2008-07-11 21:37:37 UTC (rev 21012)
+++ labs/jbossesb/trunk/product/rosetta/src/org/jboss/internal/soa/esb/couriers/SqlTableCourier.java	2008-07-12 10:55:04 UTC (rev 21013)
@@ -24,6 +24,7 @@
 
 import org.apache.log4j.Logger;
 import org.jboss.internal.soa.esb.couriers.helpers.JDBCEprDBResourceFactory;
+import org.jboss.internal.soa.esb.util.StreamUtils;
 import org.jboss.soa.esb.addressing.Call;
 import org.jboss.soa.esb.addressing.eprs.JDBCEpr;
 import org.jboss.soa.esb.common.TransactionStrategy;
@@ -34,13 +35,18 @@
 import org.jboss.soa.esb.message.util.Type;
 import org.jboss.soa.esb.util.Util;
 
+import java.io.Reader;
 import java.io.Serializable;
 import java.net.URI;
 import java.net.URISyntaxException;
+import java.sql.Blob;
+import java.sql.Clob;
 import java.sql.Connection;
 import java.sql.PreparedStatement;
 import java.sql.ResultSet;
+import java.sql.ResultSetMetaData;
 import java.sql.SQLException;
+import java.sql.Types;
 import java.util.UUID;
 
 public class SqlTableCourier implements PickUpOnlyCourier, DeliverOnlyCourier
@@ -270,6 +276,8 @@
             selectUpdateStatement.setString(2, State.Pending.getColumnValue());
 
             ResultSet resultSet = selectUpdateStatement.executeQuery();
+            final ResultSetMetaData metaData = resultSet.getMetaData() ;
+            final int type = metaData.getColumnType(1) ;
             try
             {
                 if (resultSet.next())
@@ -278,8 +286,22 @@
 
                     try
                     {
-                        Serializable blob = (Serializable) resultSet.getObject(1);
-                        result = Util.deserialize(blob);
+                        final Serializable value ;
+                        if (type == Types.BLOB)
+                        {
+                            final Blob blob = resultSet.getBlob(1) ;
+                            value = StreamUtils.readStreamString(blob.getBinaryStream(), "UTF-8");
+                        }
+                        else if (type == Types.CLOB)
+                        {
+                            final Clob clob = resultSet.getClob(1) ;
+                            value = StreamUtils.readReader(clob.getCharacterStream());
+                        }
+                        else
+                        {
+                            value = (Serializable) resultSet.getObject(1);
+                        }
+                        result = Util.deserialize(value);
                     }
                     catch (Exception e)
                     {

Modified: labs/jbossesb/trunk/product/rosetta/src/org/jboss/internal/soa/esb/dependencies/H2Database.java
===================================================================
--- labs/jbossesb/trunk/product/rosetta/src/org/jboss/internal/soa/esb/dependencies/H2Database.java	2008-07-11 21:37:37 UTC (rev 21012)
+++ labs/jbossesb/trunk/product/rosetta/src/org/jboss/internal/soa/esb/dependencies/H2Database.java	2008-07-12 10:55:04 UTC (rev 21013)
@@ -25,8 +25,10 @@
 import java.io.IOException;
 import java.sql.Connection;
 import java.sql.DriverManager;
+import java.sql.SQLException;
 import java.sql.Statement;
 
+import org.h2.tools.Server;
 import org.jboss.system.ServiceMBeanSupport;
 import org.jboss.system.server.ServerConfigLocator;
 
@@ -40,259 +42,431 @@
  * @author <a href="mailto:vesco.claudio at previnet.it">Claudio Vesco</a>
  * @author <a href="mailto:dimitris at jboss.org">Dimitris Andreadis</a>
  * @author <a href="mailto:kevin.conner at jboss.org">Kevin Conner</a>
+ * @author <a href="mailto:dbevenius at redhat.com">Daniel Bevenius</a>
  * @version $Revision$
  */
-public class H2Database extends ServiceMBeanSupport
-   implements H2DatabaseMBean
+public class H2Database extends ServiceMBeanSupport implements H2DatabaseMBean
 {
-   /** Default password: <code>empty string</code>. */
-   private static final String DEFAULT_PASSWORD = "";
+    /** Default password: <code>empty string</code>. */
+    private static final String DEFAULT_PASSWORD = "";
+       
+    /** Default user: <code>sa</code>. */
+    private static final String DEFAULT_USER = "sa";
+       
+    /** JDBC Driver class: <code>org.h2.Driver</code>. */
+    private static final String JDBC_DRIVER_CLASS = "org.h2.Driver";
+       
+    /** JDBC URL common prefix: <code>jdbc:h2:</code>. */
+    private static final String JDBC_URL_PREFIX = "jdbc:h2:";
    
-   /** Default user: <code>sa</code>. */
-   private static final String DEFAULT_USER = "sa";
+    /** JDBC in memory URL prefix: <code>jdbc:h2:mem:</code>. */
+    private static final String JDBC_MEM_URL_PREFIX = JDBC_URL_PREFIX + "mem:";
+       
+    /** JDBC flags */
+    private static final String DEFAULT_FLAGS = ";MVCC=TRUE;DB_CLOSE_ON_EXIT=FALSE";
+       
+    /** Default data subdir: <code>h2</code>. */
+    private static final String H2_DATA_DIR = "h2";
+       
+    /** Default database name: <code>default</code>. */
+    private static final String DEFAULT_DATABASE_NAME = "default";
+       
+    /** Default address for remote h2: <code>0.0.0.0</code>. */
+    private static final String DEFAULT_ADDRESS = "0.0.0.0";
+       
+    /** Default port for remote h2: <code>9092</code>. */
+    private static final int DEFAULT_PORT = 9092;
+    
+    /** Default delay for remote hypersonic initialisation (ms): <code>5000</code>. */
+    private static final long DEFAULT_DELAY = 5000;
+    
+    // Private Data --------------------------------------------------
+           
+    /** Full path to db/h2. */
+    private File dbPath;
+    
+    /** Database name. */
+    private String name = DEFAULT_DATABASE_NAME;
+       
+    /** In memory mode. */
+    private boolean inMemoryMode ;
+       
+    /** Database user. */
+    private String user = DEFAULT_USER;
+       
+    /** Database password. */
+    private String password = DEFAULT_PASSWORD;
+       
+    /** Database flags */
+    private String flags = DEFAULT_FLAGS ;
+       
+    /** Hold a connection for in memory h2. */
+    private Connection connection;
+       
+    /** Default address. */
+    private String address = DEFAULT_ADDRESS;
+       
+    /** Default port. */
+    private int port = DEFAULT_PORT;
+       
+    /** Server/remote mode. */
+    private boolean serverMode = false;
    
-   /** JDBC Driver class: <code>org.h2.Driver</code>. */
-   private static final String JDBC_DRIVER_CLASS = "org.h2.Driver";
-   
-   /** JDBC URL common prefix: <code>jdbc:h2:</code>. */
-   private static final String JDBC_URL_PREFIX = "jdbc:h2:";
-   
-   /** JDBC in memory URL prefix: <code>jdbc:h2:mem:</code>. */
-   private static final String JDBC_MEM_URL_PREFIX = JDBC_URL_PREFIX + "mem:";
-   
-   /** JDBC flags */
-   private static final String DEFAULT_FLAGS = ";MVCC=TRUE;DB_CLOSE_ON_EXIT=FALSE" ;
-   
-   /** Default data subdir: <code>h2</code>. */
-   private static final String H2_DATA_DIR = "h2";
-   
-   /** Default database name: <code>default</code>. */
-   private static final String DEFAULT_DATABASE_NAME = "default";
+    /** Server thread for remote h2. */
+    private Thread serverThread;
+    
+    /** The remote server instance */
+    private Server remoteServer ;
+    
+    /** Server thread delay for remote H2. */
+    private long delay = DEFAULT_DELAY ;
 
-   // Private Data --------------------------------------------------
+    // Attributes ----------------------------------------------------
    
-   /** Full path to db/h2. */
-   private File dbPath;
+    /**
+     * Set the database name.
+     * 
+     * @jmx.managed-attribute
+     */
+    public void setDatabase(String name)
+    {
+        if (name == null)
+        {
+            name = DEFAULT_DATABASE_NAME;
+        }
+        this.name = name;
+   }
 
-   /** Database name. */
-   private String name = DEFAULT_DATABASE_NAME;
-   
-   /** In memory mode. */
-   private boolean inMemoryMode ;
-   
-   /** Database user. */
-   private String user = DEFAULT_USER;
-   
-   /** Database password. */
-   private String password = DEFAULT_PASSWORD;
-   
-   /** Database flags */
-   private String flags = DEFAULT_FLAGS ;
-   
-   /** Hold a connection for in memory h2. */
-   private Connection connection;
+    /**
+     * Get the database name.
+     * 
+     * @jmx.managed-attribute
+     */
+    public String getDatabase()
+    {
+        return name;
+    }
+    
+    /**
+     * Get the full database path.
+     * 
+     * @jmx.managed-attribute
+     */
+    public String getDatabasePath()
+    {
+        if (dbPath != null)
+        {
+            return dbPath.toString();
+        }
+        else
+        {
+            return null;
+        }
+    }
+    
+    /**
+     * @return the <code>inMemoryMode</code> flag.
+     * 
+     * @jmx.managed-attribute 
+     */
+    public boolean isInMemoryMode()
+    {
+        return inMemoryMode;
+    }
 
+    /**
+     * If <b>true</b> the h2 is in memory mode otherwise embedded mode.
+     * 
+     * @param b in memory mode.
+     * 
+     * @jmx.managed-attribute
+     */
+    public void setInMemoryMode( boolean b )
+    {
+        inMemoryMode = b;
+    }
+    
+    /**
+     * @return the password
+     * 
+     * @jmx.managed-attribute 
+     */
+    public String getPassword()
+    {
+        return password;
+    }
 
-   // Attributes ----------------------------------------------------
+    /**
+     * @return the user
+     * 
+     * @jmx.managed-attribute 
+     */
+    public String getUser()
+    {
+        return user;
+    }
+    
+    /**
+     * @return the flags
+     * 
+     * @jmx.managed-attribute 
+     */
+    public String getFlags()
+    {
+        return flags;
+    }
+    
+    /**
+     * @param password
+     * 
+     * @jmx.managed-attribute 
+     */
+    public void setPassword(String password)
+    {
+        if (password == null)
+        {
+            password = DEFAULT_PASSWORD;
+        }
+        this.password = password;
+    }
+    
+    /**
+     * @param user
+     * 
+     * @jmx.managed-attribute 
+     */
+    public void setUser(String user)
+    {
+        if (user == null)
+        {
+            user = DEFAULT_USER;
+        }
+        this.user = user;
+    }
+        
+    /**
+     * @param flags
+     * 
+     * @jmx.managed-attribute 
+     */
+    public void setFlags(String flags)
+    {
+        if (flags == null)
+        {
+            flags = DEFAULT_FLAGS;
+        }
+      this.flags = flags;
+    }
    
-   /**
-    * Set the database name.
-    * 
-    * @jmx.managed-attribute
-    */
-   public void setDatabase(String name)
-   {
-      if (name == null)
-      {
-         name = DEFAULT_DATABASE_NAME;
-      }
-      this.name = name;
-   }
+    /**
+     * @return the serverMode
+     * 
+     * @jmx.managed-attribute 
+     */
+    public boolean isServerMode() 
+    {
+        return serverMode;
+    }
 
-   /**
-    * Get the database name.
-    * 
-    * @jmx.managed-attribute
-    */
-   public String getDatabase()
-   {
-      return name;
-   }
+    /**
+     * @param serverMode
+     * 
+     * @jmx.managed-attribute 
+     */
+    public void setServerMode( boolean serverMode ) 
+	{
+       	this.serverMode = serverMode;
+    }
 
-   /**
-    * Get the full database path.
-    * 
-    * @jmx.managed-attribute
-    */
-   public String getDatabasePath()
-   {
-      if (dbPath != null)
-      {
-         return dbPath.toString();
-      }
-      else
-      {
-         return null;
-      }
-   }
+    /**
+     * @return the address
+     * 
+     * @jmx.managed-attribute 
+     */
+	public String getBindAddress() 
+	{
+		return address;
+	}
 
-   /**
-    * @return the <code>inMemoryMode</code> flag.
-    * 
-    * @jmx.managed-attribute 
-    */
-   public boolean isInMemoryMode()
-   {
-      return inMemoryMode;
-   }
+    /**
+     * @return the port
+     * 
+     * @jmx.managed-attribute 
+     */
+	public int getPort() 
+	{
+		return port;
+	}
 
-   /**
-    * If <b>true</b> the h2 is in memory mode otherwise h2 is in server or remote mode.
-    * 
-    * @param b in memory mode.
-    * 
-    * @jmx.managed-attribute
-    */
-   public void setInMemoryMode(boolean b)
-   {
-      inMemoryMode = b;
-   }
+    /**
+     * @param address
+     * 
+     * @jmx.managed-attribute 
+     */
+    public void setBindAddress(String address) 
+    {
+		this.address = address;
+	}
 
-   /**
-    * @return the password
-    * 
-    * @jmx.managed-attribute 
-    */
-   public String getPassword()
-   {
-      return password;
-   }
+    /**
+     * @param port
+     * 
+     * @jmx.managed-attribute 
+     */
+    public void setPort(int port) 
+    {
+        this.port = port;
+    }
+    
+    /**
+     * Set the delay for remote hypersonic initialisation.
+     * 
+     * @jmx.managed-attribute
+     */
+    public void setDelay(final long delay)
+    {
+        this.delay = delay;
+    }
+    
+    /**
+     * Get the delay for remote hypersonic initialisation.
+     * 
+     * @jmx.managed-attribute
+     */
+    public long getDelay()
+    {
+        return delay;
+    }
+    
+    // Lifecycle -----------------------------------------------------
+   
+    /**
+     * Start the database
+     */
+    protected void startService() throws Exception
+    {
+        if (serverMode)
+        {
+            startRemoteDatabase();
+        }
+        else if (inMemoryMode)
+        {
+            startInMemoryDatabase();
+        }
+        else
+        {
+            startStandaloneDatabase();
+        }
+    }
 
-   /**
-    * @return the user
-    * 
-    * @jmx.managed-attribute 
-    */
-   public String getUser()
-   {
-      return user;
-   }
+    /**
+     * We now close the connection clean by calling the
+     * serverSocket throught jdbc. The MBeanServer calls this 
+     * method at closing time.
+     */
+    protected void stopService() throws Exception
+    {
+        if (serverMode)
+        {
+            stopRemoteDatabase();
+        }
+        else if (inMemoryMode)
+        {
+            stopInMemoryDatabase();
+        }
+        else
+        {
+            stopStandaloneDatabase();
+        }
+    }
 
-   /**
-    * @return the flags
-    * 
-    * @jmx.managed-attribute 
-    */
-   public String getFlags()
-   {
-      return flags;
-   }
+    // Private -------------------------------------------------------
+   
+    /**
+     * Start the standalone (in process) database.
+     */
+    private void startStandaloneDatabase() throws Exception
+    {
+        final File h2Dir = checkDataDir() ;
+               
+        dbPath = new File(h2Dir, name);
+        
+        final String dbURL = JDBC_URL_PREFIX + dbPath.toURI().toString() + flags ;
+        log.info(dbURL);
+        
+        // Check we have connectivity
+        connection = getConnection(dbURL);
+    }
 
-   /**
-    * @param password
-    * 
-    * @jmx.managed-attribute 
+    /**
+    * Start the only in memory database.
     */
-   public void setPassword(String password)
-   {
-      if (password == null)
-      {
-         password = DEFAULT_PASSWORD;
-      }
-      this.password = password;
-   }
+    private void startInMemoryDatabase() throws Exception
+    {
+        final String dbURL = JDBC_MEM_URL_PREFIX + name + flags ;
 
-   /**
-    * @param user
-    * 
-    * @jmx.managed-attribute 
-    */
-   public void setUser(String user)
-   {
-      if (user == null)
-      {
-         user = DEFAULT_USER;
-      }
-      this.user = user;
-   }
-
-   /**
-    * @param flags
-    * 
-    * @jmx.managed-attribute 
-    */
-   public void setFlags(String flags)
-   {
-      if (flags == null)
-      {
-          flags = DEFAULT_FLAGS;
-      }
-      this.flags = flags;
-   }
-
-   // Lifecycle -----------------------------------------------------
+        // hold a connection so h2 does not close the database
+        connection = getConnection(dbURL);
+    }
    
-   /**
-    * Start the database
-    */
-   protected void startService() throws Exception
-   {
-      if (inMemoryMode)
-      {
-          startInMemoryDatabase();
-      }
-      else
-      {
-          startStandaloneDatabase();
-      }
-   }
-
-   /**
-    * We now close the connection clean by calling the
-    * serverSocket throught jdbc. The MBeanServer calls this 
-    * method at closing time.
-    */
-   protected void stopService() throws Exception
-   {
-       if (inMemoryMode)
-       {
-           stopInMemoryDatabase();
-       }
-       else
-       {
-           stopStandaloneDatabase();
-       }
-   }
-   
-   // Private -------------------------------------------------------
-   
-   /**
-    * Start the standalone (in process) database.
-    */
-   private void startStandaloneDatabase() throws Exception
-   {
-       final File h2Dir = checkDataDir() ;
+    /**
+     * Start a remote/server database
+     * @throws Exception
+     */
+    private void startRemoteDatabase() throws Exception
+    {
+        final File h2Dir = checkDataDir() ;
+        dbPath = new File(h2Dir, name);
        
-       dbPath = new File(h2Dir, name);
+        // Start DB in new thread, or else it will block us
+        serverThread = new Thread("h2-" + name)
+        {
+            public void run()
+            {
+                try
+                {
+                	log.debug( "Starting remote h2 db with port : " + port );
+                	final String[] args = new String[] { 
+                			"-baseDir", dbPath.getAbsolutePath(), 
+                			"-tcpPort", String.valueOf(port),
+                			"-tcpAllowOthers","" }; //	need the extra empty string or a exception is thrown by H2
+                	final Server server = Server.createTcpServer(args) ;
+                	server.start() ;
+                	setRemoteServer(server);
+	            }
+	            catch (Exception e)
+	            {
+	               log.error("Failed to start database", e);
+                }
+            }
+        };
+        
+        serverThread.start();
+        
+        if (delay > 0)
+        {
+            log.debug("Waiting for Database initialisation: maximum " + delay + " milliseconds") ;
+            try
+            {
+                serverThread.join(delay) ;
+            }
+            catch (final InterruptedException ie)
+            {
+                Thread.currentThread().interrupt() ;
+            }
+            
+            if (serverThread.isAlive())
+            {
+                log.warn("Database initialisation is still active") ;
+            }
+            else
+            {
+                log.debug("Database initialisation completed") ;
+            }
+        }
+    }
 
-       final String dbURL = JDBC_URL_PREFIX + dbPath.toURI().toString() + flags ;
-
-       // Check we have connectivity
-       connection = getConnection(dbURL);
-   }
-
    /**
-    * Start the only in memory database.
-    */
-   private void startInMemoryDatabase() throws Exception
-   {
-       final String dbURL = JDBC_MEM_URL_PREFIX + name + flags ;
-
-       // hold a connection so h2 does not close the database
-       connection = getConnection(dbURL);
-   }
-
-   /**
     * Stop the standalone (in process) database.
     */
    private void stopStandaloneDatabase() throws Exception
@@ -326,46 +500,80 @@
    }
    
    /**
-    * Get the connection.
-    * 
-    * @param dbURL jdbc url.
-    * @return the connection, allocate one if needed.
-    * @throws Exception
+    * Stop the remote database.
     */
-   private synchronized Connection getConnection(String dbURL) throws Exception
+   private void stopRemoteDatabase() throws SQLException 
    {
-      if (connection == null)
-      {
-         ClassLoader cl = Thread.currentThread().getContextClassLoader();
-         Class.forName(JDBC_DRIVER_CLASS, true, cl).newInstance();
-         connection = DriverManager.getConnection(dbURL, user, password);
-      }
-      return connection;
+       final Server server = getRemoteServer() ;
+       if (server != null)
+       {
+           server.stop() ;
+       }
    }
    
    /**
-    * Check the existence of the h2 data directory.
-    * @return The h2 data directory.
-    * @throws IOException For errors checking/creating the h2 data directory.
+    * Set the remote server instance.
+    * @param remoteServer The remote server instance.
     */
-   private File checkDataDir()
-       throws IOException
+   private synchronized void setRemoteServer(final Server remoteServer)
    {
-       // Get the server data directory
-       final File dataDir = ServerConfigLocator.locate().getServerDataDir();
+       this.remoteServer = remoteServer ;
+   }
+   
+   /**
+    * Get the remote server instance.
+    * @return The remote server instance.
+    */
+   private synchronized Server getRemoteServer()
+   {
+       return remoteServer ;
+   }
+   
+    /**
+     * Get the connection.
+     * 
+     * @param dbURL jdbc url.
+     * @return the connection, allocate one if needed.
+     * @throws Exception
+     */
+    private synchronized Connection getConnection(String dbURL) throws Exception
+    {
+        if (connection == null)
+        {
+            ClassLoader cl = Thread.currentThread().getContextClassLoader();
+            Class.forName(JDBC_DRIVER_CLASS, true, cl).newInstance();
+            connection = DriverManager.getConnection(dbURL, user, password);
+        }
+        return connection;
+    }
+   
+    /**
+     * Check the existence of the h2 data directory.
+     * @return The h2 data directory.
+     * @throws IOException For errors checking/creating the h2 data directory.
+     */
+    private File checkDataDir() throws IOException
+    {
+        // Get the server data directory
+        final File dataDir = getDataDir();
 
-       // Get DB directory
-       final File h2Dir = new File(dataDir, H2_DATA_DIR);
+        // Get DB directory
+        final File h2Dir = new File(dataDir, H2_DATA_DIR);
 
-       if (!h2Dir.exists())
-       {
-           h2Dir.mkdirs();
-       }
-       else if (!h2Dir.isDirectory())
-       {
-          throw new IOException("Failed to create directory: " + h2Dir);
-       }
-       return h2Dir ;
-   }
+        if (!h2Dir.exists())
+        {
+            h2Dir.mkdirs();
+        }
+        else if (!h2Dir.isDirectory())
+        {
+            throw new IOException("Failed to create directory: " + h2Dir);
+        }
+        return h2Dir ;
+    }
+   
+    File getDataDir()
+    {
+        return ServerConfigLocator.locate().getServerDataDir();
+    }
 
 }

Modified: labs/jbossesb/trunk/product/rosetta/src/org/jboss/internal/soa/esb/dependencies/H2DatabaseMBean.java
===================================================================
--- labs/jbossesb/trunk/product/rosetta/src/org/jboss/internal/soa/esb/dependencies/H2DatabaseMBean.java	2008-07-11 21:37:37 UTC (rev 21012)
+++ labs/jbossesb/trunk/product/rosetta/src/org/jboss/internal/soa/esb/dependencies/H2DatabaseMBean.java	2008-07-12 10:55:04 UTC (rev 21013)
@@ -33,7 +33,7 @@
  * A few notes on h2 running modes:
  * 
  * remote (server) mode
- *    Not supported yet
+ * 	  h2 can be connected to vid tcp
  * 
  * in-process (standalone) mode
  *    h2 can only be contacted from in-vm clients
@@ -69,7 +69,19 @@
    boolean isInMemoryMode() ;
    void setInMemoryMode(boolean b) ;
    
+   /** Server/remote mode */
+   boolean isServerMode() ;
+   void setServerMode(boolean mode) ;
+   
    /** The flags to use when connecting to the DB, default is "" */
    String getFlags();
    void setFlags(String flags);
+   
+   /** The listening port when in remove server mode, default is '9092' */
+   int getPort();
+   void setPort(int port);
+
+   /** The binding address, default is '0.0.0.0' */
+   String getBindAddress();
+   void setBindAddress(String address);
 }

Modified: labs/jbossesb/trunk/product/rosetta/src/org/jboss/internal/soa/esb/remoting/HttpUnmarshaller.java
===================================================================
--- labs/jbossesb/trunk/product/rosetta/src/org/jboss/internal/soa/esb/remoting/HttpUnmarshaller.java	2008-07-11 21:37:37 UTC (rev 21012)
+++ labs/jbossesb/trunk/product/rosetta/src/org/jboss/internal/soa/esb/remoting/HttpUnmarshaller.java	2008-07-12 10:55:04 UTC (rev 21013)
@@ -101,10 +101,6 @@
         int amtRead = inputStream.read(byteBuffer);
         while (amtRead > 0) {
             byteOutputStream.write(byteBuffer, pointer, amtRead);
-            if (amtRead < bufferSize && byteOutputStream.size() >= contentLength) {
-                //done reading, so process
-                break;
-            }
             amtRead = inputStream.read(byteBuffer);
         }
 

Modified: labs/jbossesb/trunk/product/rosetta/src/org/jboss/internal/soa/esb/rosetta/pooling/JmsConnectionPool.java
===================================================================
--- labs/jbossesb/trunk/product/rosetta/src/org/jboss/internal/soa/esb/rosetta/pooling/JmsConnectionPool.java	2008-07-11 21:37:37 UTC (rev 21012)
+++ labs/jbossesb/trunk/product/rosetta/src/org/jboss/internal/soa/esb/rosetta/pooling/JmsConnectionPool.java	2008-07-12 10:55:04 UTC (rev 21013)
@@ -27,6 +27,14 @@
 import java.util.List;
 import java.util.Map;
 import java.util.Properties;
+import java.util.concurrent.Callable;
+import java.util.concurrent.CompletionService;
+import java.util.concurrent.ExecutionException;
+import java.util.concurrent.Executor;
+import java.util.concurrent.ExecutorCompletionService;
+import java.util.concurrent.Executors;
+import java.util.concurrent.Future;
+import java.util.concurrent.ThreadFactory;
 
 import javax.jms.Connection;
 import javax.jms.ConnectionFactory;
@@ -65,6 +73,15 @@
 	private static int CONFIGURED_POOL_SIZE = DEFAULT_POOL_SIZE;
 	private static int CONFIGURED_SLEEP = DEFAULT_SLEEP;
 	
+	/**
+	 * The executor used to create sessions.
+	 */
+	private static final Executor SESSION_EXECUTOR = Executors.newSingleThreadExecutor(new DaemonThreadFactory()) ;
+	/**
+	 * The completion service.
+	 */
+	private static final CompletionService<JmsSession> COMPLETION_SERVICE = new ExecutorCompletionService<JmsSession>(SESSION_EXECUTOR) ;
+	
     /** Maximum number of Sessions that will be created in this pool */
     private int MAX_SESSIONS = DEFAULT_POOL_SIZE;    //TODO Make this manageable
     
@@ -144,16 +161,44 @@
     private  synchronized void addAnotherSession(Map<String, String> poolKey, final boolean transacted, final int acknowledgeMode)
         throws JMSException
     {
+        final Future<JmsSession> future = COMPLETION_SERVICE.submit(new Callable<JmsSession>() {
+            public JmsSession call()
+                throws JMSException
+            {
+                final JmsSession session ;
+                if (transacted) {
+                    session = new JmsXASession(JmsConnectionPool.this, ((XAConnection)jmsConnection).createXASession(), id);
+                } else {
+                    session = new JmsSession(jmsConnection.createSession(transacted, acknowledgeMode), id);
+                }
+                return session ;
+            }
+        }) ;
+        
         //Create a new Session
         ArrayList<JmsSession> freeSessions = freeSessionsMap.get(acknowledgeMode);
         // For now we only support JTA transacted sessions
-        final JmsSession session ;
-        if (transacted) {
-            session = new JmsXASession(this,  ((XAConnection)jmsConnection).createXASession(), id);
-        } else {
-            session = new JmsSession(jmsConnection.createSession(transacted, acknowledgeMode), id);
+        try
+        {
+            freeSessions.add(future.get());
         }
-        freeSessions.add(session);
+        catch (final InterruptedException ie) {} // ignore
+        catch (final ExecutionException ee)
+        {
+            final Throwable th = ee.getCause() ;
+            if (th instanceof JMSException)
+            {
+                throw (JMSException)th ;
+            }
+            if (th instanceof Error)
+            {
+                throw (Error)th ;
+            }
+            if (th instanceof RuntimeException)
+            {
+                throw (RuntimeException)th ;
+            }
+        }
         logger.debug("Number of Sessions in the pool with acknowledgeMode: " + acknowledgeMode + " is now " + getSessionsInPool(acknowledgeMode));
     }
 
@@ -576,4 +621,27 @@
     		}
     	}
     }
+    
+    /**
+     * Thread factory returning daemon threads.
+     * @author kevin
+     */
+    private static final class DaemonThreadFactory implements ThreadFactory
+    {
+        /**
+         * The default executor factory.
+         */
+        private final ThreadFactory defaultFactory = Executors.defaultThreadFactory() ;
+        
+        /**
+         * Return a new daemon thread.
+         * @param runnable The runnable associated with the thread.
+         */
+        public Thread newThread(final Runnable runnable)
+        {
+            final Thread thread = defaultFactory.newThread(runnable) ;
+            thread.setDaemon(true) ;
+            return thread ;
+        }
+    }
 }

Modified: labs/jbossesb/trunk/product/rosetta/src/org/jboss/internal/soa/esb/services/registry/JAXRRegistryImpl.java
===================================================================
--- labs/jbossesb/trunk/product/rosetta/src/org/jboss/internal/soa/esb/services/registry/JAXRRegistryImpl.java	2008-07-11 21:37:37 UTC (rev 21012)
+++ labs/jbossesb/trunk/product/rosetta/src/org/jboss/internal/soa/esb/services/registry/JAXRRegistryImpl.java	2008-07-12 10:55:04 UTC (rev 21013)
@@ -400,7 +400,7 @@
 	 *
 	 * @param organizationName used to match with the name of the organization.
 	 * @return the Organization.
-	 */
+	 */	
     public static Organization findOrganization(String organizationName, JAXRConnectionFactory jaxrConnectionFactory) throws JAXRException {
 	    if (organizationName==null) {
 	    	organizationName="";
@@ -707,8 +707,9 @@
 		try {
 			RegistryService rs = connection.getRegistryService();
 			BusinessQueryManager bqm = rs.getBusinessQueryManager();
-			Collection<String> findQualifiers = new ArrayList<String>();
-			findQualifiers.add(FindQualifier.SORT_BY_NAME_ASC);
+			Collection<String> findQualifiers = null;
+			//Collection<String> findQualifiers = new ArrayList<String>();
+			//findQualifiers.add(FindQualifier.SORT_BY_DATE_ASC);
 			BulkResponse bulkResponse = bqm.findServiceBindings(service.getKey(),findQualifiers,null,null);
 			if (bulkResponse.getStatus()==JAXRResponse.STATUS_SUCCESS){
 				serviceBindings = (Collection<ServiceBinding>)bulkResponse.getCollection();

Modified: labs/jbossesb/trunk/product/rosetta/src/org/jboss/internal/soa/esb/util/StreamUtils.java
===================================================================
--- labs/jbossesb/trunk/product/rosetta/src/org/jboss/internal/soa/esb/util/StreamUtils.java	2008-07-11 21:37:37 UTC (rev 21012)
+++ labs/jbossesb/trunk/product/rosetta/src/org/jboss/internal/soa/esb/util/StreamUtils.java	2008-07-12 10:55:04 UTC (rev 21013)
@@ -61,6 +61,31 @@
 		
 		return outBuffer.toByteArray();
 	}
+	
+       /**
+         * Read the supplied Reader and return as a string.
+         * @param reader The reader to read.
+         * @return The reader contents as a string.
+         */
+        public static String readReader(Reader reader) {
+                if(reader == null) {
+                        throw new IllegalArgumentException("null 'reader' arg passed in method call.");
+                }
+                
+                StringWriter outBuffer = new StringWriter();
+                char[] buffer = new char[256];
+                int readCount = 0;
+                
+                try {
+                        while((readCount = reader.read(buffer)) != -1) {
+                                outBuffer.write(buffer, 0, readCount);
+                        }
+                } catch (IOException e) {
+                        throw new IllegalStateException("Error reading reader.", e);
+                }               
+                
+                return outBuffer.toString();
+        }
 
     public static String readStreamString(InputStream stream, String charset) throws UnsupportedEncodingException {
         return new String(StreamUtils.readStream(stream), charset);

Modified: labs/jbossesb/trunk/product/rosetta/src/org/jboss/soa/esb/common/JBossESBPropertyService.java
===================================================================
--- labs/jbossesb/trunk/product/rosetta/src/org/jboss/soa/esb/common/JBossESBPropertyService.java	2008-07-11 21:37:37 UTC (rev 21012)
+++ labs/jbossesb/trunk/product/rosetta/src/org/jboss/soa/esb/common/JBossESBPropertyService.java	2008-07-12 10:55:04 UTC (rev 21013)
@@ -147,7 +147,7 @@
             try
             {
                 tm.begin() ;
-                LOGGER.debug("Transaction started on current thread") ;
+                LOGGER.trace("Transaction started on current thread") ;
             }
             catch (final Throwable th)
             {
@@ -171,18 +171,18 @@
                 switch(status)
                 {
                     case Status.STATUS_ACTIVE:
-                        LOGGER.debug("Committing transaction on current thread") ;
+                        LOGGER.trace("Committing transaction on current thread") ;
                         tm.commit() ;
                         break ;
                     case Status.STATUS_MARKED_ROLLBACK:
-                        LOGGER.debug("Rollback transaction on current thread") ;
+                        LOGGER.trace("Rollback transaction on current thread") ;
                         tm.rollback();
                         break ;
                     default:
                         // Transaction is in some other state, just disassociate
-                        if (LOGGER.isDebugEnabled())
+                        if (LOGGER.isTraceEnabled())
                         {
-                            LOGGER.debug("Suspending transaction on current thread, status: " + status) ;
+                            LOGGER.trace("Suspending transaction on current thread, status: " + status) ;
                         }
                         tm.suspend() ;
                 }

Modified: labs/jbossesb/trunk/product/rosetta/src/org/jboss/soa/esb/helpers/Email.java
===================================================================
--- labs/jbossesb/trunk/product/rosetta/src/org/jboss/soa/esb/helpers/Email.java	2008-07-11 21:37:37 UTC (rev 21012)
+++ labs/jbossesb/trunk/product/rosetta/src/org/jboss/soa/esb/helpers/Email.java	2008-07-12 10:55:04 UTC (rev 21013)
@@ -160,7 +160,7 @@
     /**
      * The mail Session to use
      */
-    private Session oMailSess = null;
+    private final Session oMailSess;
 
 	/**
 	 * Public constructor.
@@ -458,7 +458,7 @@
 		catch (Exception e) { /* OK just leave standard port */ }
 
 		logger.info("Initialising mail server sesson. Properties: " + oMailP);
-		javax.mail.Session oMailSess = javax.mail.Session.getDefaultInstance(oMailP, oAuth);
+		javax.mail.Session oMailSess = javax.mail.Session.getInstance(oMailP, oAuth);
 		
 		return oMailSess;
 	}

Modified: labs/jbossesb/trunk/product/rosetta/src/org/jboss/soa/esb/listeners/StandAloneBootStrapper.java
===================================================================
--- labs/jbossesb/trunk/product/rosetta/src/org/jboss/soa/esb/listeners/StandAloneBootStrapper.java	2008-07-11 21:37:37 UTC (rev 21012)
+++ labs/jbossesb/trunk/product/rosetta/src/org/jboss/soa/esb/listeners/StandAloneBootStrapper.java	2008-07-12 10:55:04 UTC (rev 21013)
@@ -30,7 +30,6 @@
 import org.jboss.internal.soa.esb.util.Exit;
 import org.jboss.soa.esb.ConfigurationException;
 import org.jboss.soa.esb.services.registry.RegistryFactory;
-import org.jboss.soa.esb.services.registry.RegistryException;
 import org.jboss.soa.esb.lifecycle.LifecycleResourceManager;
 import org.jboss.soa.esb.listeners.config.ConfigurationController;
 

Modified: labs/jbossesb/trunk/product/rosetta/src/org/jboss/soa/esb/listeners/gateway/SqlTableGatewayListener.java
===================================================================
--- labs/jbossesb/trunk/product/rosetta/src/org/jboss/soa/esb/listeners/gateway/SqlTableGatewayListener.java	2008-07-11 21:37:37 UTC (rev 21012)
+++ labs/jbossesb/trunk/product/rosetta/src/org/jboss/soa/esb/listeners/gateway/SqlTableGatewayListener.java	2008-07-12 10:55:04 UTC (rev 21013)
@@ -26,10 +26,13 @@
 import java.lang.reflect.Constructor;
 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
+import java.sql.Blob;
+import java.sql.Clob;
 import java.sql.PreparedStatement;
 import java.sql.ResultSet;
 import java.sql.ResultSetMetaData;
 import java.sql.SQLException;
+import java.sql.Types;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collection;
@@ -45,6 +48,7 @@
 import javax.sql.DataSource;
 
 import org.apache.log4j.Logger;
+import org.jboss.internal.soa.esb.util.StreamUtils;
 import org.jboss.soa.esb.ConfigurationException;
 import org.jboss.soa.esb.addressing.EPR;
 import org.jboss.soa.esb.addressing.eprs.JDBCEpr;
@@ -479,8 +483,18 @@
                 Map<String, Object> row = new HashMap<String, Object>();
                 for (int iCurr = 1; iCurr <= meta.getColumnCount(); iCurr++) {
                     String sCol = meta.getColumnName(iCurr);
-                    if (!_inProcessField.equalsIgnoreCase(sCol))
-                        row.put(sCol, RS.getObject(iCurr));
+                    if (!_inProcessField.equalsIgnoreCase(sCol)) {
+                        final int type = meta.getColumnType(iCurr) ;
+                        if (type == Types.BLOB) {
+                            final Blob blob = RS.getBlob(iCurr) ;
+                            row.put(sCol, StreamUtils.readStreamString(blob.getBinaryStream(), "UTF-8"));
+                        } else if (type == Types.CLOB) {
+                            final Clob clob = RS.getClob(iCurr) ;
+                            row.put(sCol, StreamUtils.readReader(clob.getCharacterStream()));
+                        } else {
+                            row.put(sCol, RS.getObject(iCurr));
+                        }
+                    }
                 }
 
                 oResults.add(row);
@@ -601,37 +615,6 @@
     } // ________________________________
 
     /**
-     * Assemble the SQL "select for update" statement for the
-     * "inProcessField" parameter
-     * <p/>
-     * in the table row uniquely identified by the list of fields in the
-     * "keyFields" parameter
-     *
-     * @return - The resulting SQL statement
-     */
-    protected String selectForUpdStatement() {
-        StringBuilder sb = new StringBuilder().append("select ").append(
-                _inProcessField).append(" from ").append(_tableName).append(
-                " where ");
-        int iCurr = 0;
-        for (String sCurr : _keys) {
-            if (iCurr++ > 0)
-                sb.append(" and ");
-            sb.append(sCurr).append(" = ?");
-        }
-
-        /*
-        * HS QL does not support FOR UPDATE! All tables appear to be inherently
-        * updatable!
-        */
-
-        if (_driver.contains("hsqldb"))
-            return sb.toString();
-        else
-            return sb.append(" for update").toString();
-    } // ________________________________
-
-    /**
      * Assemble the SQL statement to delete the current row in the table row
      * uniquely identified by the list of fields in the "keyFields"
      * parameter
@@ -659,13 +642,13 @@
         try {
             int iParm = 1;
             for (String sColName : _keys) {
-            	String val = null;
+            	final Object val ;
             	if (_currentRow.containsKey(sColName)) {
-                    val = String.valueOf(_currentRow.get(sColName));            		
+                    val = _currentRow.get(sColName);
             	} else {
-                    val = String.valueOf(_upperCurrentRow.get(sColName));
+                    val = _upperCurrentRow.get(sColName.toUpperCase());
             	}
-                _PSdeleteRow.setString(iParm++, val);
+                _PSdeleteRow.setObject(iParm++, val);
             }
 
             try {
@@ -740,9 +723,9 @@
             for (String sColName : _keys) {
             	Object oVal = null;
             	if (_currentRow.containsKey(sColName)) {
-            		oVal = String.valueOf(_currentRow.get(sColName.toUpperCase()));
+            		oVal = _currentRow.get(sColName);
             	} else {
-            		oVal = String.valueOf(_upperCurrentRow.get(sColName.toUpperCase()));
+            		oVal = _upperCurrentRow.get(sColName.toUpperCase());
             	}
             	
                 _PSupdate.setObject(iParm++, oVal);

Modified: labs/jbossesb/trunk/product/rosetta/tests/src/org/jboss/soa/esb/actions/routing/JmsRouterIntegrationTest.java
===================================================================
--- labs/jbossesb/trunk/product/rosetta/tests/src/org/jboss/soa/esb/actions/routing/JmsRouterIntegrationTest.java	2008-07-11 21:37:37 UTC (rev 21012)
+++ labs/jbossesb/trunk/product/rosetta/tests/src/org/jboss/soa/esb/actions/routing/JmsRouterIntegrationTest.java	2008-07-12 10:55:04 UTC (rev 21013)
@@ -136,7 +136,7 @@
 	}
 
 	@Test
-	public void setJMSReplyTo_queue() throws JMSException, URISyntaxException, ConfigurationException, NamingException, ConnectionException
+	public void setJMSReplyToQueue() throws JMSException, URISyntaxException, ConfigurationException, NamingException, ConnectionException
 	{
 		final String queueName = "testQueue";
 
@@ -155,7 +155,7 @@
 
 	@Test
 	@Ignore
-	public void setJMSReplyTo_topic() throws JMSException, URISyntaxException, ConfigurationException, NamingException, ConnectionException
+	public void setJMSReplyToTopic() throws JMSException, URISyntaxException, ConfigurationException, NamingException, ConnectionException
 	{
 		final String queueName = "testTopic";
 

Modified: labs/jbossesb/trunk/product/samples/quickstarts/aggregator/aggregation_service/jbossesb.xml
===================================================================
--- labs/jbossesb/trunk/product/samples/quickstarts/aggregator/aggregation_service/jbossesb.xml	2008-07-11 21:37:37 UTC (rev 21012)
+++ labs/jbossesb/trunk/product/samples/quickstarts/aggregator/aggregation_service/jbossesb.xml	2008-07-12 10:55:04 UTC (rev 21013)
@@ -2,9 +2,7 @@
 <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-provider name="JBossMQ" connection-factory="ConnectionFactory">
              <jms-bus busid="AggregatorListenQueue">
                  <jms-message-filter dest-type="QUEUE" dest-name="queue/A"/>
              </jms-bus>             

Modified: labs/jbossesb/trunk/product/samples/quickstarts/aggregator/blue_service/jbossesb.xml
===================================================================
--- labs/jbossesb/trunk/product/samples/quickstarts/aggregator/blue_service/jbossesb.xml	2008-07-11 21:37:37 UTC (rev 21012)
+++ labs/jbossesb/trunk/product/samples/quickstarts/aggregator/blue_service/jbossesb.xml	2008-07-12 10:55:04 UTC (rev 21013)
@@ -2,9 +2,7 @@
 <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-provider name="JBossMQ" connection-factory="ConnectionFactory">
             <jms-bus busid="Aggregator_ToBlue">
                 <jms-message-filter dest-type="QUEUE" dest-name="queue/quickstart_Aggregator_ToBlue"/>
             </jms-bus>

Modified: labs/jbossesb/trunk/product/samples/quickstarts/aggregator/green_service/jbossesb.xml
===================================================================
--- labs/jbossesb/trunk/product/samples/quickstarts/aggregator/green_service/jbossesb.xml	2008-07-11 21:37:37 UTC (rev 21012)
+++ labs/jbossesb/trunk/product/samples/quickstarts/aggregator/green_service/jbossesb.xml	2008-07-12 10:55:04 UTC (rev 21013)
@@ -2,9 +2,7 @@
 <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-provider name="JBossMQ" connection-factory="ConnectionFactory">
             <jms-bus busid="Aggregator_ToGreen">
                 <jms-message-filter dest-type="QUEUE" dest-name="queue/quickstart_Aggregator_ToGreen"/>
             </jms-bus>

Modified: labs/jbossesb/trunk/product/samples/quickstarts/aggregator/inbound_splitter/jbossesb.xml
===================================================================
--- labs/jbossesb/trunk/product/samples/quickstarts/aggregator/inbound_splitter/jbossesb.xml	2008-07-11 21:37:37 UTC (rev 21012)
+++ labs/jbossesb/trunk/product/samples/quickstarts/aggregator/inbound_splitter/jbossesb.xml	2008-07-12 10:55:04 UTC (rev 21013)
@@ -2,9 +2,7 @@
 <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-provider name="JBossMQ" connection-factory="ConnectionFactory">
              <jms-bus busid="quickstartGwChannel">
                  <jms-message-filter dest-type="QUEUE" dest-name="queue/quickstart_Aggregator_Request_GW"/>
              </jms-bus>

Modified: labs/jbossesb/trunk/product/samples/quickstarts/aggregator/red_service/jbossesb.xml
===================================================================
--- labs/jbossesb/trunk/product/samples/quickstarts/aggregator/red_service/jbossesb.xml	2008-07-11 21:37:37 UTC (rev 21012)
+++ labs/jbossesb/trunk/product/samples/quickstarts/aggregator/red_service/jbossesb.xml	2008-07-12 10:55:04 UTC (rev 21013)
@@ -2,9 +2,7 @@
 <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-provider name="JBossMQ" connection-factory="ConnectionFactory">
         <jms-bus busid="Aggregator_ToRed">
               <jms-message-filter dest-type="QUEUE" dest-name="queue/quickstart_Aggregator_ToRed"/>
         </jms-bus>

Modified: labs/jbossesb/trunk/product/samples/quickstarts/bpm_orchestration1/build.xml
===================================================================
--- labs/jbossesb/trunk/product/samples/quickstarts/bpm_orchestration1/build.xml	2008-07-11 21:37:37 UTC (rev 21012)
+++ labs/jbossesb/trunk/product/samples/quickstarts/bpm_orchestration1/build.xml	2008-07-12 10:55:04 UTC (rev 21013)
@@ -41,11 +41,11 @@
 	
   <target name="deployProcess" description="deploys the process definition" depends="dependencies">
     <echo>Deploy the process definition</echo>
-	<taskdef name="deployToServer" classname="org.jbpm.ant.DeployProcessToServerTask">
-		<classpath refid="exec-classpath"/>
-	</taskdef>
-	<deployToServer>
-		<fileset dir="${basedir}/processDefinition" includes="*"/>
+	<taskdef name="deployToServer" classname="org.jbpm.ant.DeployProcessToServerTask">
+		<classpath refid="exec-classpath"/>
+	</taskdef>
+	<deployToServer username="${jbpm.console.username}" password="${jbpm.console.password}" serverDeployer="${org.jboss.esb.jbpm.console.upload.url}">
+		<fileset dir="${basedir}/processDefinition" includes="*"/>
 	</deployToServer>
   </target>
       

Modified: labs/jbossesb/trunk/product/samples/quickstarts/bpm_orchestration2/build.xml
===================================================================
--- labs/jbossesb/trunk/product/samples/quickstarts/bpm_orchestration2/build.xml	2008-07-11 21:37:37 UTC (rev 21012)
+++ labs/jbossesb/trunk/product/samples/quickstarts/bpm_orchestration2/build.xml	2008-07-12 10:55:04 UTC (rev 21013)
@@ -1,4 +1,4 @@
-<project name="Quickstart_bpm_orchestration2" default="run" basedir=".">
+<project name="Quickstart_bpm_orchestration2" default="deploy" basedir=".">
 
 	<description>
 		${ant.project.name}
@@ -27,6 +27,10 @@
 	  <antcall target="deployProcess"/>
   </target>
 	
+  <target name="run">
+        <echo message="This target is not implemented for this quickstart. Please run 'ant deploy', 'ant deployProcess' and 'ant startProcess'"/>
+  </target>
+
   <target name="runtest">
 	<echo>Use "ant deployProcess" followed by "ant startProcess"</echo>
   </target>
@@ -36,7 +40,7 @@
 	<taskdef name="deployToServer" classname="org.jbpm.ant.DeployProcessToServerTask">
 		<classpath refid="exec-classpath"/>
 	</taskdef>
-	<deployToServer>
+	<deployToServer username="${jbpm.console.username}" password="${jbpm.console.password}" serverDeployer="${org.jboss.esb.jbpm.console.upload.url}">
 		<fileset dir="${basedir}/processDefinition" includes="*"/>
 	</deployToServer>
   </target>

Modified: labs/jbossesb/trunk/product/samples/quickstarts/bpm_orchestration2/jboss-esb.xml
===================================================================
--- labs/jbossesb/trunk/product/samples/quickstarts/bpm_orchestration2/jboss-esb.xml	2008-07-11 21:37:37 UTC (rev 21012)
+++ labs/jbossesb/trunk/product/samples/quickstarts/bpm_orchestration2/jboss-esb.xml	2008-07-12 10:55:04 UTC (rev 21013)
@@ -3,10 +3,7 @@
     parameterReloadSecs="5">
 
     <providers>
-          <jms-provider name="JBossMQ" connection-factory="ConnectionFactory"
-                        jndi-URL="jnp://127.0.0.1:1099" jndi-context-factory="org.jnp.interfaces.NamingContextFactory"
-                        jndi-pkg-prefix="org.jboss.naming:org.jnp.interfaces">
-
+          <jms-provider name="JBossMQ" connection-factory="ConnectionFactory">
               <jms-bus busid="deployGwChannel">
                   <jms-message-filter dest-type="QUEUE"
                       dest-name="queue/quickstart_bpm_orchestration2_deploy_Request_gw" />
@@ -62,8 +59,6 @@
       </providers>
 
       <services>
-        
-        
         <service category="BPM_Orchestration2_Starter_Service" name="Starter_Service"
                  description="BPM Orchestration Sample 2: Use this service to start a process instance">
             <listeners>

Modified: labs/jbossesb/trunk/product/samples/quickstarts/bpm_orchestration2/readme.txt
===================================================================
--- labs/jbossesb/trunk/product/samples/quickstarts/bpm_orchestration2/readme.txt	2008-07-11 21:37:37 UTC (rev 21012)
+++ labs/jbossesb/trunk/product/samples/quickstarts/bpm_orchestration2/readme.txt	2008-07-12 10:55:04 UTC (rev 21013)
@@ -7,17 +7,7 @@
 
 To Run standalone mode:
 =======================
-  1. In a command terminal window in the quickstart folder type
-     'ant deploy-jms-dests'.
-  2. In a command terminal window in this folder ("Window1"), type 'ant run'.
-  3. Open another command terminal window in this folder ("Window2"), type
-     'ant deployProcess' to deploy the process.
-  4. Switch back to ESB console and wait for the message
-     'Process Definition Deployed:' to appear on the console.
-  5. Switch back to "Window2", type 'ant startProcess' to start the process.
-  6. Switch back to "Window1" to see the output from the ESB
-  7. When finished, interrupt the ESB using Ctrl-C and, in this folder
-     ("Window1"), type 'ant undeploy-jms-dests'.
+  This quickstart does not run in standalone mode.
 
 To Run '.esb' archive mode:
 ===========================
@@ -112,4 +102,4 @@
 13:18:39,106 INFO  [STDOUT] Out: Getting Started 'Receive Order'  'Credit Check'  'Validate Order'  'Inventory Check'  'Dallas'  'Shipped' 
 13:18:39,106 INFO  [STDOUT] ***** End Ship It *****
 13:18:39,113 INFO  [STDOUT] SUCCESS!: 
-13:18:39,113 INFO  [STDOUT] [Getting Started 'Receive Order'  'Credit Check'  'Validate Order'  'Inventory Check'  'Dallas'  'Shipped' ].
\ No newline at end of file
+13:18:39,113 INFO  [STDOUT] [Getting Started 'Receive Order'  'Credit Check'  'Validate Order'  'Inventory Check'  'Dallas'  'Shipped' ].

Modified: labs/jbossesb/trunk/product/samples/quickstarts/bpm_orchestration3/build.xml
===================================================================
--- labs/jbossesb/trunk/product/samples/quickstarts/bpm_orchestration3/build.xml	2008-07-11 21:37:37 UTC (rev 21012)
+++ labs/jbossesb/trunk/product/samples/quickstarts/bpm_orchestration3/build.xml	2008-07-12 10:55:04 UTC (rev 21013)
@@ -57,7 +57,7 @@
 	<taskdef name="deployToServer" classname="org.jbpm.ant.DeployProcessToServerTask">
 		<classpath refid="exec-classpath"/>
 	</taskdef>
-	<deployToServer>
+	<deployToServer username="${jbpm.console.username}" password="${jbpm.console.password}" serverDeployer="${org.jboss.esb.jbpm.console.upload.url}">
 		<fileset dir="${basedir}/processDefinition" includes="*"/>
 	</deployToServer>
   </target>

Modified: labs/jbossesb/trunk/product/samples/quickstarts/business_rules_service/jboss-esb.xml
===================================================================
--- labs/jbossesb/trunk/product/samples/quickstarts/business_rules_service/jboss-esb.xml	2008-07-11 21:37:37 UTC (rev 21012)
+++ labs/jbossesb/trunk/product/samples/quickstarts/business_rules_service/jboss-esb.xml	2008-07-12 10:55:04 UTC (rev 21013)
@@ -4,9 +4,7 @@
 
 	<providers>
 		<jms-provider name="JBossMQ"
-			connection-factory="ConnectionFactory"
-			jndi-context-factory="org.jnp.interfaces.NamingContextFactory"
-			jndi-URL="localhost">
+			connection-factory="ConnectionFactory">
 			<jms-bus busid="quickstartGwChannel">
 				<jms-message-filter dest-type="QUEUE"
 					dest-name="queue/quickstart_Business_Rules_Request_GW" />

Modified: labs/jbossesb/trunk/product/samples/quickstarts/business_service/jboss-esb.xml
===================================================================
--- labs/jbossesb/trunk/product/samples/quickstarts/business_service/jboss-esb.xml	2008-07-11 21:37:37 UTC (rev 21012)
+++ labs/jbossesb/trunk/product/samples/quickstarts/business_service/jboss-esb.xml	2008-07-12 10:55:04 UTC (rev 21013)
@@ -3,10 +3,7 @@
  parameterReloadSecs="5">
 
     <providers>
-          <jms-provider name="JBossMQ" connection-factory="ConnectionFactory"
-                      jndi-context-factory="org.jnp.interfaces.NamingContextFactory"
-                      jndi-URL="localhost" >
-                      
+          <jms-provider name="JBossMQ" connection-factory="ConnectionFactory">
               <jms-bus busid="quickstartGwChannel">
                   <jms-message-filter
                       dest-type="QUEUE"

Modified: labs/jbossesb/trunk/product/samples/quickstarts/conf/base-build.xml
===================================================================
--- labs/jbossesb/trunk/product/samples/quickstarts/conf/base-build.xml	2008-07-11 21:37:37 UTC (rev 21012)
+++ labs/jbossesb/trunk/product/samples/quickstarts/conf/base-build.xml	2008-07-12 10:55:04 UTC (rev 21013)
@@ -251,8 +251,40 @@
 <!-- compile-classpath, exec-classpath                                    -->
 <!-- ==================================================================== -->
 
-	<target name="dependencies" depends="classpath-dependencies, quickstart-specific-checks"/>
+	<target name="dependencies" depends="classpath-dependencies, quickstart-specific-checks">
+	
+		<!-- jBPM Console properties -->
+		<condition property="jbpm.production.properties.set" value="true" else="false">
+            <and>
+                <equals arg1="${org.jboss.esb.server.config}" arg2="production"/>
+                <isset property="quickstart.jbpm.console.username"/>
+                <isset property="quickstart.jbpm.console.password"/>
+            </and>
+         </condition>
+        <fail message="Quickstart configuration error: ${line.separator}${line.separator} jBPM username and password must be set in ${pwd}/quickstarts.properties. ${line.separator} The jBPM web console is secured when running in production mode i.e when org.jboss.esb.server.config=production.">
+            <condition>
+                <and>
+                    <equals arg1="${org.jboss.esb.server.config}" arg2="production"/>
+                    <equals arg1="${jbpm.production.properties.set}" arg2="false"/>
+                </and>
+            </condition>
+        </fail>
 
+        <condition property="org.jboss.esb.jbpm.console.upload.url" value="/jbpm-console/app/upload/" else="/jbpm-console/upload/">
+            <equals arg1="${org.jboss.esb.server.config}" arg2="production"/>
+        </condition>
+
+        <condition property="jbpm.console.username" value="${quickstart.jbpm.console.username}" else="">
+            <equals arg1="${org.jboss.esb.server.config}" arg2="production"/>
+        </condition>
+
+        <condition property="jbpm.console.password" value="${quickstart.jbpm.console.password}" else="">
+            <equals arg1="${org.jboss.esb.server.config}" arg2="production"/>
+        </condition>
+
+		<!-- End jBPM Console properties -->
+	</target>
+
 	<target name="classpath-dependencies" depends="messaging-dependencies, jbossmq-dependencies, quickstart-specific-dependencies">
     	
 		<path id="compile-classpath">

Modified: labs/jbossesb/trunk/product/samples/quickstarts/conf/quickstarts.properties-example
===================================================================
--- labs/jbossesb/trunk/product/samples/quickstarts/conf/quickstarts.properties-example	2008-07-11 21:37:37 UTC (rev 21012)
+++ labs/jbossesb/trunk/product/samples/quickstarts/conf/quickstarts.properties-example	2008-07-12 10:55:04 UTC (rev 21013)
@@ -5,13 +5,17 @@
 ##############################################################################################
 # Location of your JBoss Application Server installation.
 # Will override the same property name from install/deployment.properties
-#org.jboss.esb.server.home=${product.dir}/build/jbossesb-server-4.2GA
+#org.jboss.esb.server.home=${product.dir}/build/jbossesb-server-4.2.1CP3
 
 # JBossAS server name. If not set defaults to 'default'
 # Will override the same property name from install/deployment.properties
 #org.jboss.esb.server.config=default
 
+# jBPM console security credentials (if org.jboss.esb.server.config=production)
+#jbpm.console.username=admin
+#jbpm.console.password=admin
 
+
 # If you are running the ftp tests then you must complete the following
 jbossesb.ftp.hostname=
 jbossesb.ftp.username=

Modified: labs/jbossesb/trunk/product/samples/quickstarts/custom_action/jboss-esb.xml
===================================================================
--- labs/jbossesb/trunk/product/samples/quickstarts/custom_action/jboss-esb.xml	2008-07-11 21:37:37 UTC (rev 21012)
+++ labs/jbossesb/trunk/product/samples/quickstarts/custom_action/jboss-esb.xml	2008-07-12 10:55:04 UTC (rev 21013)
@@ -2,14 +2,11 @@
 <jbossesb xmlns="http://anonsvn.labs.jboss.com/labs/jbossesb/trunk/product/etc/schemas/xml/jbossesb-1.0.1.xsd" parameterReloadSecs="5">
 
     <providers>
-          <jms-provider name="JBossMQ" connection-factory="ConnectionFactory"
-                      jndi-context-factory="org.jnp.interfaces.NamingContextFactory"
-                      jndi-URL="localhost" >
-                      
+          <jms-provider name="JBossMQ" connection-factory="ConnectionFactory">
               <jms-bus busid="quickstartGwChannel">
                   <jms-message-filter
                       dest-type="QUEUE"
-   					  dest-name="queue/quickstart_custom_action_GW"
+   		      dest-name="queue/quickstart_custom_action_GW"
                   />
               </jms-bus>
               <jms-bus busid="quickstartEsbChannel">

Modified: labs/jbossesb/trunk/product/samples/quickstarts/deadletter/jboss-esb.xml
===================================================================
--- labs/jbossesb/trunk/product/samples/quickstarts/deadletter/jboss-esb.xml	2008-07-11 21:37:37 UTC (rev 21012)
+++ labs/jbossesb/trunk/product/samples/quickstarts/deadletter/jboss-esb.xml	2008-07-12 10:55:04 UTC (rev 21013)
@@ -2,10 +2,7 @@
 <jbossesb xmlns="http://anonsvn.labs.jboss.com/labs/jbossesb/trunk/product/etc/schemas/xml/jbossesb-1.0.1.xsd" parameterReloadSecs="5">
 
     <providers>
-          <jms-provider name="JBossMQ" connection-factory="ConnectionFactory"
-                        jndi-URL="jnp://127.0.0.1:1099" jndi-context-factory="org.jnp.interfaces.NamingContextFactory"
-                        jndi-pkg-prefix="org.jboss.naming:org.jnp.interfaces">
-                      
+          <jms-provider name="JBossMQ" connection-factory="ConnectionFactory">
               <jms-bus busid="quickstartGwChannel">
                   <jms-message-filter
                       dest-type="QUEUE"

Modified: labs/jbossesb/trunk/product/samples/quickstarts/exceptions_faults/jboss-esb.xml
===================================================================
--- labs/jbossesb/trunk/product/samples/quickstarts/exceptions_faults/jboss-esb.xml	2008-07-11 21:37:37 UTC (rev 21012)
+++ labs/jbossesb/trunk/product/samples/quickstarts/exceptions_faults/jboss-esb.xml	2008-07-12 10:55:04 UTC (rev 21013)
@@ -2,10 +2,7 @@
 <jbossesb xmlns="http://anonsvn.labs.jboss.com/labs/jbossesb/trunk/product/etc/schemas/xml/jbossesb-1.0.1.xsd" parameterReloadSecs="5">
 
     <providers>
-          <jms-provider name="JBossMQ" connection-factory="ConnectionFactory"
-                      jndi-context-factory="org.jnp.interfaces.NamingContextFactory"
-                      jndi-URL="localhost" >
-                      
+          <jms-provider name="JBossMQ" connection-factory="ConnectionFactory">
               <jms-bus busid="LostMessageServiceGW">
                   <jms-message-filter
                       dest-type="QUEUE"

Modified: labs/jbossesb/trunk/product/samples/quickstarts/fun_cbr/jboss-esb.xml
===================================================================
--- labs/jbossesb/trunk/product/samples/quickstarts/fun_cbr/jboss-esb.xml	2008-07-11 21:37:37 UTC (rev 21012)
+++ labs/jbossesb/trunk/product/samples/quickstarts/fun_cbr/jboss-esb.xml	2008-07-12 10:55:04 UTC (rev 21013)
@@ -2,9 +2,7 @@
 <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-provider name="JBossMQ" connection-factory="ConnectionFactory">
              <jms-bus busid="quickstartGwChannel">
                  <jms-message-filter dest-type="QUEUE" dest-name="queue/quickstart_Fun_CBR_Request_GW"/>
              </jms-bus>

Modified: labs/jbossesb/trunk/product/samples/quickstarts/groovy_gateway/jboss-esb.xml
===================================================================
--- labs/jbossesb/trunk/product/samples/quickstarts/groovy_gateway/jboss-esb.xml	2008-07-11 21:37:37 UTC (rev 21012)
+++ labs/jbossesb/trunk/product/samples/quickstarts/groovy_gateway/jboss-esb.xml	2008-07-12 10:55:04 UTC (rev 21013)
@@ -2,10 +2,7 @@
 <jbossesb xmlns="http://anonsvn.labs.jboss.com/labs/jbossesb/trunk/product/etc/schemas/xml/jbossesb-1.0.1.xsd" parameterReloadSecs="5">
 
     <providers>
-          <jms-provider name="JBossMQ" connection-factory="ConnectionFactory"
-                      jndi-context-factory="org.jnp.interfaces.NamingContextFactory"
-                      jndi-URL="localhost" >
-                      
+          <jms-provider name="JBossMQ" connection-factory="ConnectionFactory">
               <jms-bus busid="quickstartEsbChannel">
                   <jms-message-filter
                       dest-type="QUEUE"

Modified: labs/jbossesb/trunk/product/samples/quickstarts/helloworld_tx_sql_action/build.xml
===================================================================
--- labs/jbossesb/trunk/product/samples/quickstarts/helloworld_tx_sql_action/build.xml	2008-07-11 21:37:37 UTC (rev 21012)
+++ labs/jbossesb/trunk/product/samples/quickstarts/helloworld_tx_sql_action/build.xml	2008-07-12 10:55:04 UTC (rev 21013)
@@ -13,119 +13,114 @@
 	<target name="quickstart-specific-assemblies" description="Quickstart specific assemblies">
 	</target>
 
+	<target name="quickstart-specific-checks">
+		<property name="driver" value="org.h2.Driver"/>
+		<property name="driver.jar" value="${org.jboss.esb.server.home}/server/${org.jboss.esb.server.config}/lib/h2.jar"/>	
+		<property name="url" value="jdbc:h2:tcp://localhost:9095/"/>
+	</target>
+	
 	<target name="runtest" depends="dependencies" description="Insert row data into sql table polled by gateway">
-                <property name="hsqldb.jar"
-                        value="${org.jboss.esb.server.home}/server/${org.jboss.esb.server.config}/lib/hsqldb.jar"/>	
-				<echo>Insert row data into sql table polled by gateway</echo>
-                <sql
-                        driver="org.hsqldb.jdbcDriver"
-						url="jdbc:hsqldb:hsql://localhost:1705"
-                        userid="sa"	
-						autocommit="true"
-						password="">
-                        <classpath>
-				<pathelement path="${hsqldb.jar}"/>
-                        </classpath>
+		<echo>Insert row data into sql table polled by gateway</echo>
+		<sql
+			driver="${driver}"
+			url="${url}"
+			userid="sa"	
+			autocommit="true"
+			password="">
+			<classpath>
+				<pathelement path="${driver.jar}"/>
+			</classpath>
 			<transaction src="populate.sql"/>
-			</sql>
+		</sql>
 	</target>  
 
 	<target name="create" depends="dependencies" description="create table tx_esb_messages">
-		<property name="hsqldb.jar" 
-			value="${org.jboss.esb.server.home}/server/${org.jboss.esb.server.config}/lib/hsqldb.jar"/>
 		<echo>create table tx_esb_messages</echo>
 		<sql	
 			print="true"
-			driver="org.hsqldb.jdbcDriver"
-			url="jdbc:hsqldb:hsql://localhost:1705"
+			driver="${driver}"
+			url="${url}"
 			userid="sa"
 			autocommit="true"
 			password="">
 			<classpath>
-				<pathelement path="${hsqldb.jar}"/>
+				<pathelement path="${driver.jar}"/>
 			</classpath>
 			<transaction>
-			create table tx_esb_messages(MESSAGE_ID varchar, STATUS_COL varchar NOT NULL, TIMESTAMP_COL bigint, DATA_COL varchar NOT NULL);
+				create table tx_esb_messages(MESSAGE_ID varchar, STATUS_COL varchar NOT NULL, TIMESTAMP_COL bigint, DATA_COL varchar NOT NULL);
 			</transaction>
-			</sql>
-
+		</sql>
 	</target>  
 
 	<target name="drop" depends="dependencies" description="drop table tx_esb_messages">
-		<property name="hsqldb.jar" 
-			value="${org.jboss.esb.server.home}/server/${org.jboss.esb.server.config}/lib/hsqldb.jar"/>
 		<echo>drop table tx_esb_messages</echo>
 		<sql	
 			print="true"
-			driver="org.hsqldb.jdbcDriver"
-			url="jdbc:hsqldb:hsql://localhost:1705"
+			driver="${driver}"
+			url="${url}"
 			userid="sa"
 			autocommit="true"
 			password="">
 			<classpath>
-				<pathelement path="${hsqldb.jar}"/>
+				<pathelement path="${driver.jar}"/>
 			</classpath>
 			<transaction>
-			drop table tx_esb_messages
+				drop table tx_esb_messages
 			</transaction>
-			</sql>
-
+		</sql>
 	</target>
 
 	<target name="drop2" depends="dependencies" description="drop table gateway_table">
-		<property name="hsqldb.jar" 
-			value="${org.jboss.esb.server.home}/server/${org.jboss.esb.server.config}/lib/hsqldb.jar"/>
+		<echo>drop table tx_esb_messages</echo>
 		<echo>drop table gateway_table</echo>
 		<sql	
 			print="true"
-			driver="org.hsqldb.jdbcDriver"
-			url="jdbc:hsqldb:hsql://localhost:1705"
+			driver="${driver}"
+			url="${url}"
 			userid="sa"
 			autocommit="true"
 			password="">
 			<classpath>
-				<pathelement path="${hsqldb.jar}"/>
+				<pathelement path="${driver.jar}"/>
 			</classpath>
 			<transaction>
-			drop table gateway_table
+				drop table gateway_table
 			</transaction>
-			</sql>
-
+		</sql>
 	</target>  
 
 	<target name="select" depends="dependencies" description="select * from gateway_table">
-		<property name="hsqldb.jar" 
-			value="${org.jboss.esb.server.home}/server/${org.jboss.esb.server.config}/lib/hsqldb.jar"/>
-		<echo>Select * from gateway_table</echo>
+		<echo>Select * from tx_esb_messages</echo>
 		<sql	
 			print="true"
-			driver="org.hsqldb.jdbcDriver"
-			url="jdbc:hsqldb:hsql://localhost:1705"
+			driver="${driver}"
+			url="${url}"
 			userid="sa"
 			autocommit="true"
 			password="">
 			<classpath>
-				<pathelement path="${hsqldb.jar}"/>
+				<pathelement path="${driver.jar}"/>
 			</classpath>
 			<transaction>
-			select * from tx_esb_messages
+				select * from tx_esb_messages
 			</transaction>
-			</sql>
+		</sql>
+
+		<echo>Select * from gateway_table</echo>
 		<sql	
 			print="true"
-			driver="org.hsqldb.jdbcDriver"
-			url="jdbc:hsqldb:hsql://localhost:1705"
+			driver="${driver}"
+			url="${url}"
 			userid="sa"
 			autocommit="true"
 			password="">
 			<classpath>
-				<pathelement path="${hsqldb.jar}"/>
+				<pathelement path="${driver.jar}"/>
 			</classpath>
 			<transaction>
-			select * from gateway_table
+				select * from gateway_table where DATA_COLUMN like 'data%' and upper(STATUS_COL) like 'P%' order by DATA_COLUMN
 			</transaction>
-			</sql>
-
+		</sql>
 	</target>  
 
 	<target name="deploy-jms-dests">

Modified: labs/jbossesb/trunk/product/samples/quickstarts/helloworld_tx_sql_action/jboss-esb.xml
===================================================================
--- labs/jbossesb/trunk/product/samples/quickstarts/helloworld_tx_sql_action/jboss-esb.xml	2008-07-11 21:37:37 UTC (rev 21012)
+++ labs/jbossesb/trunk/product/samples/quickstarts/helloworld_tx_sql_action/jboss-esb.xml	2008-07-12 10:55:04 UTC (rev 21013)
@@ -3,16 +3,14 @@
 
     <providers>
           <sql-provider name="GatewaySQLprovider" 
-          			url="jdbc:hsqldb:hsql://localhost:1705"
-          			driver="org.hsqldb.jdbcDriver"
-          			username="sa"
-          			password="">
+          			url="jdbc:h2:tcp://localhost:9095/"
+          			datasource="java:/HelloworldTxSqlDB">
           	<sql-bus busid="helloSQLChannel" >
           		<sql-message-filter
-          			tablename="GATEWAY_TABLE"
+          			tablename="gateway_table"
           			status-column="STATUS_COL"
-				order-by="DATA_COLUMN"	
-				where-condition="DATA_COLUMN like 'data%'"
+					order-by="DATA_COLUMN"	
+					where-condition="DATA_COLUMN like 'data%'"
 					message-column="DATA_COLUMN"
           			message-id-column="UNIQUE_ID"
           			insert-timestamp-column="TIMESTAMP_COL"
@@ -21,15 +19,15 @@
           </sql-provider>
 
           <sql-provider name="SQLprovider" 
-          			url="jdbc:hsqldb:hsql://localhost:1705"
+          			url="jdbc:h2:tcp://localhost:9095/"
           			datasource="java:/HelloworldTxSqlDB">
           	<sql-bus busid="TxHelloSQLChannel" >
           		<sql-message-filter
           			tablename="TX_ESB_MESSAGES"
-				message-id-column="MESSAGE_ID"
+					message-id-column="MESSAGE_ID"
           			status-column="STATUS_COL"
-				insert-timestamp-column="TIMESTAMP_COL"
-				message-column="DATA_COLUMN"
+					insert-timestamp-column="TIMESTAMP_COL"
+					message-column="DATA_COLUMN"
           		/>
           	</sql-bus>
           </sql-provider>
@@ -37,27 +35,16 @@
       </providers>
       
       <services>
-        <service 
-			category="myCategory"
-			name="myTxListener"
-        	description="Hello World TX SQL Action (esb jdbc listener)">
+        <service category="myCategory" name="myTxListener" description="Hello World TX SQL Action (esb jdbc listener)">
             <listeners>
-            	<sql-listener name="SqlGateway"
-            		busidref="helloSQLChannel"
-            		maxThreads="1"
-            		is-gateway="true"/>
-            	<sql-listener name="TxSqlListener"
-            		busidref="TxHelloSQLChannel"
-            		maxThreads="1">
-			<property name="transacted" value="true"/>
+            	<sql-listener name="SqlGateway" busidref="helloSQLChannel" maxThreads="1" is-gateway="true"/>
+            	<sql-listener name="TxSqlListener" busidref="TxHelloSQLChannel" maxThreads="1">
+					<property name="transacted" value="true"/>
                 </sql-listener>
             </listeners>
             <actions mep="OneWay">
-		       <action name="action1" 
-                   	class="org.jboss.soa.esb.samples.quickstart.helloworldtxsqlaction.MyAction" 
-                   	process="displayMessage" 
-                   	/> 
-	               <action name="action2" class="org.jboss.soa.esb.actions.SystemPrintln" />    
+		       <action name="action1" class="org.jboss.soa.esb.samples.quickstart.helloworldtxsqlaction.MyAction" process="displayMessage" /> 
+			   <action name="action2" class="org.jboss.soa.esb.actions.SystemPrintln" />    
             </actions>
 
         </service>

Modified: labs/jbossesb/trunk/product/samples/quickstarts/helloworld_tx_sql_action/jbossesb-service.xml
===================================================================
--- labs/jbossesb/trunk/product/samples/quickstarts/helloworld_tx_sql_action/jbossesb-service.xml	2008-07-11 21:37:37 UTC (rev 21012)
+++ labs/jbossesb/trunk/product/samples/quickstarts/helloworld_tx_sql_action/jbossesb-service.xml	2008-07-12 10:55:04 UTC (rev 21013)
@@ -5,9 +5,7 @@
        name="jboss.esb:service=HelloworldTxSqlDatabaseInitializer">
       <attribute name="Datasource">java:/HelloworldTxSqlDB</attribute>
       <attribute name="ExistsSql">select * from gateway_table</attribute>
-      <attribute name="SqlFiles">
-	hsqldb/create.sql
-      </attribute>
+      <attribute name="SqlFiles">h2/create.sql</attribute>
       <depends>jboss.jca:name=HelloworldTxSqlDB,service=DataSourceBinding</depends>
    </mbean>
 </server>

Modified: labs/jbossesb/trunk/product/samples/quickstarts/helloworld_tx_sql_action/quickstart-ds.xml
===================================================================
--- labs/jbossesb/trunk/product/samples/quickstarts/helloworld_tx_sql_action/quickstart-ds.xml	2008-07-11 21:37:37 UTC (rev 21012)
+++ labs/jbossesb/trunk/product/samples/quickstarts/helloworld_tx_sql_action/quickstart-ds.xml	2008-07-12 10:55:04 UTC (rev 21013)
@@ -1,25 +1,23 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <datasources>
    <local-tx-datasource>
-      <jndi-name>HelloworldTxSqlDB</jndi-name>
-      <connection-url>jdbc:hsqldb:hsql://${jboss.bind.address}:1705</connection-url>
-      <driver-class>org.hsqldb.jdbcDriver</driver-class>
-      <user-name>sa</user-name>
-      <password></password>
-      <min-pool-size>5</min-pool-size>
-      <max-pool-size>20</max-pool-size>
-      <idle-timeout-minutes>0</idle-timeout-minutes>
-      <depends>jboss:service=HelloworldTxSqlDB</depends>	
-      <prepared-statement-cache-size>32</prepared-statement-cache-size>
+         <jndi-name>HelloworldTxSqlDB</jndi-name>
+         <connection-url>jdbc:h2:tcp://localhost:9095/;DB_CLOSE_ON_EXIT=FALSE</connection-url>
+         <driver-class>org.h2.Driver</driver-class>
+         <user-name>sa</user-name>
+         <password/>
+         <transaction-isolation>TRANSACTION_READ_COMMITTED</transaction-isolation>
+         <min-pool-size>5</min-pool-size>
+         <max-pool-size>20</max-pool-size>
+         <idle-timeout-minutes>0</idle-timeout-minutes>
+         <prepared-statement-cache-size>32</prepared-statement-cache-size>
+         <depends>jboss:service=HelloworldTxSqlDB</depends>	
    </local-tx-datasource>
 
-   <mbean code="org.jboss.internal.soa.esb.dependencies.HypersonicDatabase"
-     name="jboss:service=HelloworldTxSqlDB">
-     <attribute name="Port">1705</attribute>
-     <attribute name="BindAddress">${jboss.bind.address}</attribute> 
-     <attribute name="Database">HelloworldTxSqlDB</attribute>
-     <attribute name="Silent">true</attribute>
-     <attribute name="Trace">false</attribute>
-     <attribute name="No_system_exit">true</attribute>
+   <mbean code="org.jboss.internal.soa.esb.dependencies.H2Database" name="jboss:service=HelloworldTxSqlDB">
+        <attribute name="Database">HelloworldTxSqlDB</attribute>
+        <attribute name="ServerMode">true</attribute>
+        <attribute name="Port">9095</attribute>
+        <attribute name="InMemoryMode">false</attribute>
    </mbean>
 </datasources>

Copied: labs/jbossesb/trunk/product/samples/quickstarts/helloworld_tx_sql_action/src/h2 (from rev 21005, labs/jbossesb/tags/JBESB_4_2_1_GA_FP2/product/samples/quickstarts/helloworld_tx_sql_action/src/h2)

Deleted: labs/jbossesb/trunk/product/samples/quickstarts/helloworld_tx_sql_action/src/h2/create.sql
===================================================================
--- labs/jbossesb/tags/JBESB_4_2_1_GA_FP2/product/samples/quickstarts/helloworld_tx_sql_action/src/h2/create.sql	2008-07-11 13:15:28 UTC (rev 21005)
+++ labs/jbossesb/trunk/product/samples/quickstarts/helloworld_tx_sql_action/src/h2/create.sql	2008-07-12 10:55:04 UTC (rev 21013)
@@ -1,15 +0,0 @@
-CREATE TABLE gateway_table
-(
-unique_id INTEGER AUTO_INCREMENT NOT NULL PRIMARY KEY,
-data_column VARCHAR(255) NOT NULL,
-status_col VARCHAR(255) NOT NULL,
-timestamp_col VARCHAR(255)
-);
-
-CREATE TABLE TX_ESB_MESSAGES
-(
-message_id VARCHAR(255) NOT NULL,
-data_column CLOB NOT NULL,
-status_col VARCHAR(255) NOT NULL,
-timestamp_col VARCHAR(255)
-);

Copied: labs/jbossesb/trunk/product/samples/quickstarts/helloworld_tx_sql_action/src/h2/create.sql (from rev 21005, labs/jbossesb/tags/JBESB_4_2_1_GA_FP2/product/samples/quickstarts/helloworld_tx_sql_action/src/h2/create.sql)
===================================================================
--- labs/jbossesb/trunk/product/samples/quickstarts/helloworld_tx_sql_action/src/h2/create.sql	                        (rev 0)
+++ labs/jbossesb/trunk/product/samples/quickstarts/helloworld_tx_sql_action/src/h2/create.sql	2008-07-12 10:55:04 UTC (rev 21013)
@@ -0,0 +1,15 @@
+CREATE TABLE gateway_table
+(
+unique_id INTEGER AUTO_INCREMENT NOT NULL PRIMARY KEY,
+data_column VARCHAR(255) NOT NULL,
+status_col VARCHAR(255) NOT NULL,
+timestamp_col VARCHAR(255)
+);
+
+CREATE TABLE TX_ESB_MESSAGES
+(
+message_id VARCHAR(255) NOT NULL,
+data_column CLOB NOT NULL,
+status_col VARCHAR(255) NOT NULL,
+timestamp_col VARCHAR(255)
+);

Modified: labs/jbossesb/trunk/product/samples/quickstarts/jms_secured/build.xml
===================================================================
--- labs/jbossesb/trunk/product/samples/quickstarts/jms_secured/build.xml	2008-07-11 21:37:37 UTC (rev 21012)
+++ labs/jbossesb/trunk/product/samples/quickstarts/jms_secured/build.xml	2008-07-12 10:55:04 UTC (rev 21013)
@@ -4,6 +4,8 @@
 		${ant.project.name}
 		${line.separator}
 	</description>
+
+	<property name="additional.deploys" value="messaging-db-users-service.xml" />
 	
 	<!-- Import the base Ant build script... -->
 	<import file="../conf/base-build.xml"/>

Modified: labs/jbossesb/trunk/product/samples/quickstarts/jms_secured/deployment.xml
===================================================================
--- labs/jbossesb/trunk/product/samples/quickstarts/jms_secured/deployment.xml	2008-07-11 21:37:37 UTC (rev 21012)
+++ labs/jbossesb/trunk/product/samples/quickstarts/jms_secured/deployment.xml	2008-07-12 10:55:04 UTC (rev 21013)
@@ -1,4 +1,5 @@
 <jbossesb-deployment>
   <depends>jboss.esb.quickstart.destination:service=Queue,name=quickstart_jms_secured_Request_esb</depends>
   <depends>jboss.esb.quickstart.destination:service=Queue,name=quickstart_jms_secured_Request_gw</depends>
+  <depends>jboss.messaging:service=JMSSecuredQuickstartUserManager</depends>
 </jbossesb-deployment>

Modified: labs/jbossesb/trunk/product/samples/quickstarts/jms_secured/jboss-esb.xml
===================================================================
--- labs/jbossesb/trunk/product/samples/quickstarts/jms_secured/jboss-esb.xml	2008-07-11 21:37:37 UTC (rev 21012)
+++ labs/jbossesb/trunk/product/samples/quickstarts/jms_secured/jboss-esb.xml	2008-07-12 10:55:04 UTC (rev 21013)
@@ -2,10 +2,7 @@
 <jbossesb xmlns="http://anonsvn.labs.jboss.com/labs/jbossesb/trunk/product/etc/schemas/xml/jbossesb-1.0.1.xsd" parameterReloadSecs="5">
 
     <providers>
-          <jms-provider name="JBossMessaging" connection-factory="ConnectionFactory"
-                        jndi-URL="jnp://127.0.0.1:1099" jndi-context-factory="org.jnp.interfaces.NamingContextFactory"
-                        jndi-pkg-prefix="org.jboss.naming:org.jnp.interfaces">
-                      
+          <jms-provider name="JBossMessaging" connection-factory="ConnectionFactory">
               <jms-bus busid="quickstartGwChannel">
                   <jms-message-filter
                       dest-type="QUEUE"

Copied: labs/jbossesb/trunk/product/samples/quickstarts/jms_secured/messaging-db-users-service.xml (from rev 21005, labs/jbossesb/tags/JBESB_4_2_1_GA_FP2/product/samples/quickstarts/jms_secured/messaging-db-users-service.xml)
===================================================================
--- labs/jbossesb/trunk/product/samples/quickstarts/jms_secured/messaging-db-users-service.xml	                        (rev 0)
+++ labs/jbossesb/trunk/product/samples/quickstarts/jms_secured/messaging-db-users-service.xml	2008-07-12 10:55:04 UTC (rev 21013)
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<server>
+
+   <mbean code="org.jboss.jms.server.plugin.JDBCJMSUserManagerService"
+      name="jboss.messaging:service=JMSSecuredQuickstartUserManager"
+      xmbean-dd="xmdesc/JMSUserManager-xmbean.xml">
+
+      <depends>jboss.jca:service=DataSourceBinding,name=DefaultDS</depends>
+
+      <depends optional-attribute-name="TransactionManager">jboss:service=TransactionManager</depends>
+
+      <attribute name="DataSource">java:/DefaultDS</attribute>
+
+      <attribute name="CreateTablesOnStartup">true</attribute>
+
+      <attribute name="SqlProperties"><![CDATA[
+POPULATE.TABLES.1  = INSERT INTO JBM_USER (USER_ID, PASSWD) VALUES ('esbuser', 'esbpassword')
+POPULATE.TABLES.2  = INSERT INTO JBM_USER (USER_ID, PASSWD) VALUES ('gatewayuser', 'gwpassword')
+POPULATE.TABLES.3  = INSERT INTO JBM_ROLE (ROLE_ID, USER_ID) VALUES ('esbrole','esbuser')
+POPULATE.TABLES.4  = INSERT INTO JBM_ROLE (ROLE_ID, USER_ID) VALUES ('gatewayrole','gatewayuser')
+      ]]></attribute>
+   </mbean>
+
+</server>

Modified: labs/jbossesb/trunk/product/samples/quickstarts/jms_secured/readme.txt
===================================================================
--- labs/jbossesb/trunk/product/samples/quickstarts/jms_secured/readme.txt	2008-07-11 21:37:37 UTC (rev 21012)
+++ labs/jbossesb/trunk/product/samples/quickstarts/jms_secured/readme.txt	2008-07-12 10:55:04 UTC (rev 21013)
@@ -49,5 +49,10 @@
   3. jboss-esb.xml
      The message-filter for the jms-bus now specifies 'jms-security-principal' and
      'jms-security-credential'
-  	 
-
+  4. messaging-users.properties and messaging-roles.properties
+	 Simple properties files which are used when JBoss Messaging is configured for property file 
+	 based authentication. These files are copied to the conf/props directory of the jbossesb server 
+	 in use.
+  5. messaging-db-users.properties
+	 Is a jboss service that insert users and roles into the JBoss Messaging database. This is only used when JBoss
+	 Messaging is configured to use a database for managing users and roles.

Modified: labs/jbossesb/trunk/product/samples/quickstarts/jms_topic/jboss-esb.xml
===================================================================
--- labs/jbossesb/trunk/product/samples/quickstarts/jms_topic/jboss-esb.xml	2008-07-11 21:37:37 UTC (rev 21012)
+++ labs/jbossesb/trunk/product/samples/quickstarts/jms_topic/jboss-esb.xml	2008-07-12 10:55:04 UTC (rev 21013)
@@ -13,10 +13,7 @@
 
 
     <providers>
-        <jms-provider name="JMS" connection-factory="ConnectionFactory"
-                      jndi-context-factory="org.jnp.interfaces.NamingContextFactory"
-                      jndi-URL="localhost">
-
+        <jms-provider name="JMS" connection-factory="ConnectionFactory">
             <jms-bus busid="quickstart-topic">
                 <jms-message-filter dest-type="TOPIC" dest-name="topic/quickstart_jmstopic_topic"/>
             </jms-bus>

Modified: labs/jbossesb/trunk/product/samples/quickstarts/jms_transacted/jboss-esb.xml
===================================================================
--- labs/jbossesb/trunk/product/samples/quickstarts/jms_transacted/jboss-esb.xml	2008-07-11 21:37:37 UTC (rev 21012)
+++ labs/jbossesb/trunk/product/samples/quickstarts/jms_transacted/jboss-esb.xml	2008-07-12 10:55:04 UTC (rev 21013)
@@ -2,9 +2,7 @@
 <jbossesb xmlns="http://anonsvn.labs.jboss.com/labs/jbossesb/trunk/product/etc/schemas/xml/jbossesb-1.0.1.xsd" parameterReloadSecs="5">
 
 	<providers>
-		<jms-jca-provider name="JBossMessaging" connection-factory="XAConnectionFactory"
-			jndi-URL="jnp://127.0.0.1:1099" jndi-context-factory="org.jnp.interfaces.NamingContextFactory"
-			jndi-pkg-prefix="org.jboss.naming:org.jnp.interfaces">
+		<jms-jca-provider name="JBossMessaging" connection-factory="XAConnectionFactory">
 
 			<jms-bus busid="quickstartGwChannel">
 				<jms-message-filter

Modified: labs/jbossesb/trunk/product/samples/quickstarts/load_generator/jboss-esb.xml
===================================================================
--- labs/jbossesb/trunk/product/samples/quickstarts/load_generator/jboss-esb.xml	2008-07-11 21:37:37 UTC (rev 21012)
+++ labs/jbossesb/trunk/product/samples/quickstarts/load_generator/jboss-esb.xml	2008-07-12 10:55:04 UTC (rev 21013)
@@ -5,11 +5,7 @@
 
 	<providers>
 		<jms-provider name="JBossMQ"
-			connection-factory="ConnectionFactory"
-			jndi-URL="jnp://127.0.0.1:1099"
-			jndi-context-factory="org.jnp.interfaces.NamingContextFactory"
-			jndi-pkg-prefix="org.jboss.naming:org.jnp.interfaces">
-
+			connection-factory="ConnectionFactory">
 			<jms-bus busid="quickstartGwChannel">
 				<jms-message-filter dest-type="QUEUE"
 					dest-name="queue/quickstart_load_generator_Request_gw" />

Modified: labs/jbossesb/trunk/product/samples/quickstarts/messagefilter/jboss-esb.xml
===================================================================
--- labs/jbossesb/trunk/product/samples/quickstarts/messagefilter/jboss-esb.xml	2008-07-11 21:37:37 UTC (rev 21012)
+++ labs/jbossesb/trunk/product/samples/quickstarts/messagefilter/jboss-esb.xml	2008-07-12 10:55:04 UTC (rev 21013)
@@ -3,7 +3,6 @@
 
     <providers>
           <jms-provider name="JBossMessaging" connection-factory="ConnectionFactory">
-                      
               <jms-bus busid="quickstartGwChannel">
                   <jms-message-filter
                       dest-type="QUEUE"

Modified: labs/jbossesb/trunk/product/samples/quickstarts/messagestore/jboss-esb.xml
===================================================================
--- labs/jbossesb/trunk/product/samples/quickstarts/messagestore/jboss-esb.xml	2008-07-11 21:37:37 UTC (rev 21012)
+++ labs/jbossesb/trunk/product/samples/quickstarts/messagestore/jboss-esb.xml	2008-07-12 10:55:04 UTC (rev 21013)
@@ -2,10 +2,7 @@
 <jbossesb xmlns="http://anonsvn.labs.jboss.com/labs/jbossesb/trunk/product/etc/schemas/xml/jbossesb-1.0.1.xsd" parameterReloadSecs="5">
 
     <providers>
-          <jms-provider name="JBossMQ" connection-factory="ConnectionFactory"
-                        jndi-URL="jnp://127.0.0.1:1099" jndi-context-factory="org.jnp.interfaces.NamingContextFactory"
-                        jndi-pkg-prefix="org.jboss.naming:org.jnp.interfaces">
-                      
+          <jms-provider name="JBossMQ" connection-factory="ConnectionFactory">
               <jms-bus busid="quickstartGwChannel">
                   <jms-message-filter
                       dest-type="QUEUE"

Modified: labs/jbossesb/trunk/product/samples/quickstarts/native_client/jboss-esb.xml
===================================================================
--- labs/jbossesb/trunk/product/samples/quickstarts/native_client/jboss-esb.xml	2008-07-11 21:37:37 UTC (rev 21012)
+++ labs/jbossesb/trunk/product/samples/quickstarts/native_client/jboss-esb.xml	2008-07-12 10:55:04 UTC (rev 21013)
@@ -3,9 +3,7 @@
 	xmlns="http://anonsvn.labs.jboss.com/labs/jbossesb/trunk/product/etc/schemas/xml/jbossesb-1.0.1.xsd" parameterReloadSecs="5">
 
     <providers>
-          <jms-provider name="JBossMQ" connection-factory="ConnectionFactory"
-                      jndi-context-factory="org.jnp.interfaces.NamingContextFactory"
-                      jndi-URL="localhost" >                      
+          <jms-provider name="JBossMQ" connection-factory="ConnectionFactory">
               <jms-bus busid="quickstartEsbChannel">
                   <jms-message-filter
                       dest-type="QUEUE"

Modified: labs/jbossesb/trunk/product/samples/quickstarts/scripting_groovy/jboss-esb.xml
===================================================================
--- labs/jbossesb/trunk/product/samples/quickstarts/scripting_groovy/jboss-esb.xml	2008-07-11 21:37:37 UTC (rev 21012)
+++ labs/jbossesb/trunk/product/samples/quickstarts/scripting_groovy/jboss-esb.xml	2008-07-12 10:55:04 UTC (rev 21013)
@@ -2,10 +2,7 @@
 <jbossesb xmlns="http://anonsvn.labs.jboss.com/labs/jbossesb/trunk/product/etc/schemas/xml/jbossesb-1.0.1.xsd" parameterReloadSecs="5">
 
     <providers>
-          <jms-provider name="JBossMQ" connection-factory="ConnectionFactory"
-                      jndi-context-factory="org.jnp.interfaces.NamingContextFactory"
-                      jndi-URL="localhost" >
-                      
+          <jms-provider name="JBossMQ" connection-factory="ConnectionFactory">
               <jms-bus busid="quickstartGwChannel">
                   <jms-message-filter
                       dest-type="QUEUE"

Modified: labs/jbossesb/trunk/product/samples/quickstarts/transform_XML2POJO/jboss-esb.xml
===================================================================
--- labs/jbossesb/trunk/product/samples/quickstarts/transform_XML2POJO/jboss-esb.xml	2008-07-11 21:37:37 UTC (rev 21012)
+++ labs/jbossesb/trunk/product/samples/quickstarts/transform_XML2POJO/jboss-esb.xml	2008-07-12 10:55:04 UTC (rev 21013)
@@ -2,10 +2,7 @@
 <jbossesb xmlns="http://anonsvn.labs.jboss.com/labs/jbossesb/trunk/product/etc/schemas/xml/jbossesb-1.0.1.xsd" parameterReloadSecs="5">
 
     <providers>
-          <jms-provider name="JBossMQ" connection-factory="ConnectionFactory"
-                      jndi-context-factory="org.jnp.interfaces.NamingContextFactory"
-                      jndi-URL="localhost" >
-                      
+          <jms-provider name="JBossMQ" connection-factory="ConnectionFactory">
               <jms-bus busid="quickstartGwChannel">
                   <jms-message-filter
                       dest-type="QUEUE"

Modified: labs/jbossesb/trunk/product/samples/quickstarts/webservice_bpel/jboss-esb.xml
===================================================================
--- labs/jbossesb/trunk/product/samples/quickstarts/webservice_bpel/jboss-esb.xml	2008-07-11 21:37:37 UTC (rev 21012)
+++ labs/jbossesb/trunk/product/samples/quickstarts/webservice_bpel/jboss-esb.xml	2008-07-12 10:55:04 UTC (rev 21013)
@@ -4,10 +4,7 @@
         parameterReloadSecs="5">
 
     <providers>
-        <jms-provider name="JBossMQ" connection-factory="ConnectionFactory"
-                      jndi-context-factory="org.jnp.interfaces.NamingContextFactory"
-                      jndi-URL="localhost">
-
+        <jms-provider name="JBossMQ" connection-factory="ConnectionFactory">
             <jms-bus busid="OrderManagerGateway">
                 <jms-message-filter dest-type="QUEUE" dest-name="queue/quickstart_webservice_bpel_gw"/>
             </jms-bus>

Modified: labs/jbossesb/trunk/product/samples/quickstarts/webservice_consumer1/jboss-esb.xml
===================================================================
--- labs/jbossesb/trunk/product/samples/quickstarts/webservice_consumer1/jboss-esb.xml	2008-07-11 21:37:37 UTC (rev 21012)
+++ labs/jbossesb/trunk/product/samples/quickstarts/webservice_consumer1/jboss-esb.xml	2008-07-12 10:55:04 UTC (rev 21013)
@@ -5,9 +5,7 @@
 
 	<providers>
 		<jms-provider name="JBossMQ"
-			connection-factory="ConnectionFactory"
-			jndi-context-factory="org.jnp.interfaces.NamingContextFactory"
-			jndi-URL="localhost">
+			connection-factory="ConnectionFactory">
 				<jms-bus busid="quickstartGwChannel">
                   		<jms-message-filter
                       		dest-type="QUEUE"

Modified: labs/jbossesb/trunk/product/samples/quickstarts/webservice_consumer2/jboss-esb.xml
===================================================================
--- labs/jbossesb/trunk/product/samples/quickstarts/webservice_consumer2/jboss-esb.xml	2008-07-11 21:37:37 UTC (rev 21012)
+++ labs/jbossesb/trunk/product/samples/quickstarts/webservice_consumer2/jboss-esb.xml	2008-07-12 10:55:04 UTC (rev 21013)
@@ -5,9 +5,7 @@
 
 	<providers>
 		<jms-provider name="JBossMQ"
-			connection-factory="ConnectionFactory"
-			jndi-context-factory="org.jnp.interfaces.NamingContextFactory"
-			jndi-URL="localhost">
+			connection-factory="ConnectionFactory">
 			<jms-bus busid="quickstartGwChannel">
                                 <jms-message-filter
                                 dest-type="QUEUE"

Modified: labs/jbossesb/trunk/product/samples/quickstarts/webservice_mtom/jboss-esb.xml
===================================================================
--- labs/jbossesb/trunk/product/samples/quickstarts/webservice_mtom/jboss-esb.xml	2008-07-11 21:37:37 UTC (rev 21012)
+++ labs/jbossesb/trunk/product/samples/quickstarts/webservice_mtom/jboss-esb.xml	2008-07-12 10:55:04 UTC (rev 21013)
@@ -4,9 +4,7 @@
         parameterReloadSecs="5">
 
     <providers>
-        <jms-provider name="JBossMQ" connection-factory="ConnectionFactory"
-                      jndi-context-factory="org.jnp.interfaces.NamingContextFactory"
-                      jndi-URL="localhost">
+        <jms-provider name="JBossMQ" connection-factory="ConnectionFactory">
             <jms-bus busid="quickstartEsbChannel">
                 <jms-message-filter dest-type="QUEUE" dest-name="queue/quickstart_webservice_mtom_esb"/>
             </jms-bus>

Modified: labs/jbossesb/trunk/product/samples/quickstarts/webservice_producer/jboss-esb.xml
===================================================================
--- labs/jbossesb/trunk/product/samples/quickstarts/webservice_producer/jboss-esb.xml	2008-07-11 21:37:37 UTC (rev 21012)
+++ labs/jbossesb/trunk/product/samples/quickstarts/webservice_producer/jboss-esb.xml	2008-07-12 10:55:04 UTC (rev 21013)
@@ -4,10 +4,7 @@
         parameterReloadSecs="5">
 
     <providers>
-        <jms-provider name="JBossMQ" connection-factory="ConnectionFactory"
-                      jndi-context-factory="org.jnp.interfaces.NamingContextFactory"
-                      jndi-URL="localhost">
-
+        <jms-provider name="JBossMQ" connection-factory="ConnectionFactory">
             <jms-bus busid="quickstartGwChannel">
                 <jms-message-filter dest-type="QUEUE" dest-name="queue/quickstart_webservice_producer_gw"/>
             </jms-bus>

Modified: labs/jbossesb/trunk/product/samples/quickstarts/webservice_wsaddressing/jboss-esb.xml
===================================================================
--- labs/jbossesb/trunk/product/samples/quickstarts/webservice_wsaddressing/jboss-esb.xml	2008-07-11 21:37:37 UTC (rev 21012)
+++ labs/jbossesb/trunk/product/samples/quickstarts/webservice_wsaddressing/jboss-esb.xml	2008-07-12 10:55:04 UTC (rev 21013)
@@ -4,9 +4,7 @@
         parameterReloadSecs="5">
 
     <providers>
-        <jms-provider name="JBossMQ" connection-factory="ConnectionFactory"
-                      jndi-context-factory="org.jnp.interfaces.NamingContextFactory"
-                      jndi-URL="localhost">
+        <jms-provider name="JBossMQ" connection-factory="ConnectionFactory">
             <jms-bus busid="quickstartEsbChannel">
                 <jms-message-filter dest-type="QUEUE" dest-name="queue/quickstart_webservice_wsa_esb"/>
             </jms-bus>

Modified: labs/jbossesb/trunk/product/samples/quickstarts/webservice_wssecurity/jboss-esb.xml
===================================================================
--- labs/jbossesb/trunk/product/samples/quickstarts/webservice_wssecurity/jboss-esb.xml	2008-07-11 21:37:37 UTC (rev 21012)
+++ labs/jbossesb/trunk/product/samples/quickstarts/webservice_wssecurity/jboss-esb.xml	2008-07-12 10:55:04 UTC (rev 21013)
@@ -4,9 +4,7 @@
         parameterReloadSecs="5">
 
     <providers>
-        <jms-provider name="JBossMQ" connection-factory="ConnectionFactory"
-                      jndi-context-factory="org.jnp.interfaces.NamingContextFactory"
-                      jndi-URL="localhost">
+        <jms-provider name="JBossMQ" connection-factory="ConnectionFactory">
             <jms-bus busid="quickstartEsbChannel">
                 <jms-message-filter dest-type="QUEUE" dest-name="queue/quickstart_webservice_wss_esb"/>
             </jms-bus>

Modified: labs/jbossesb/trunk/product/samples/quickstarts/wiretap/jboss-esb.xml
===================================================================
--- labs/jbossesb/trunk/product/samples/quickstarts/wiretap/jboss-esb.xml	2008-07-11 21:37:37 UTC (rev 21012)
+++ labs/jbossesb/trunk/product/samples/quickstarts/wiretap/jboss-esb.xml	2008-07-12 10:55:04 UTC (rev 21013)
@@ -3,7 +3,6 @@
 
     <providers>
         <jms-provider name="JBossMQ" connection-factory="ConnectionFactory">
-      
            <jms-bus busid="wiretapCBRChannel">
                 <jms-message-filter dest-type="QUEUE" dest-name="queue/qswiretap_cbr_Request" />
             </jms-bus>

Modified: labs/jbossesb/trunk/product/services/base-project-build.xml
===================================================================
--- labs/jbossesb/trunk/product/services/base-project-build.xml	2008-07-11 21:37:37 UTC (rev 21012)
+++ labs/jbossesb/trunk/product/services/base-project-build.xml	2008-07-12 10:55:04 UTC (rev 21013)
@@ -19,8 +19,11 @@
 	<target name="prepare">
 		<mkdir dir="build/${ant.project.name}.esb/META-INF" />
 		<mkdir dir="build/classes" />
+		<antcall target="service-prepare"/>
 	</target>
 	
+	<target name="service-prepare"/>
+	
 	<path id="emma.libs">
 		<fileset dir="${esb.product.lib.ext}" includes="emma*.jar"/>
 	</path>

Modified: labs/jbossesb/trunk/product/services/jbossesb/src/main/resources/META-INF/deployment.xml
===================================================================
--- labs/jbossesb/trunk/product/services/jbossesb/src/main/resources/META-INF/deployment.xml	2008-07-11 21:37:37 UTC (rev 21012)
+++ labs/jbossesb/trunk/product/services/jbossesb/src/main/resources/META-INF/deployment.xml	2008-07-12 10:55:04 UTC (rev 21013)
@@ -3,4 +3,7 @@
   <depends>jboss.jca:service=DataSourceBinding,name=JBossESBDS</depends>
   <depends>jboss.esb.destination:service=Queue,name=DeadMessageQueue</depends>
   <depends>jboss.esb:service=MessageStoreDatabaseInitializer</depends>
+  <depends>jboss.esb.destination:service=Queue,name=DataCollectorQueue</depends>
+  <depends>jboss.esb.destination:service=Queue,name=OperationsCollectorQueue</depends>
+  <depends>jboss.esb.destination:service=Queue,name=OperationsResultCollectorQueue</depends> 
 </jbossesb-deployment>

Copied: labs/jbossesb/trunk/product/services/jbossesb/src/main/resources/message-store-sql/mssql (from rev 21005, labs/jbossesb/tags/JBESB_4_2_1_GA_FP2/product/services/jbossesb/src/main/resources/message-store-sql/mssql)

Deleted: labs/jbossesb/trunk/product/services/jbossesb/src/main/resources/message-store-sql/mssql/create_database.sql
===================================================================
--- labs/jbossesb/tags/JBESB_4_2_1_GA_FP2/product/services/jbossesb/src/main/resources/message-store-sql/mssql/create_database.sql	2008-07-11 13:15:28 UTC (rev 21005)
+++ labs/jbossesb/trunk/product/services/jbossesb/src/main/resources/message-store-sql/mssql/create_database.sql	2008-07-12 10:55:04 UTC (rev 21013)
@@ -1,10 +0,0 @@
-
-CREATE TABLE message 
-( 
-  uuid varchar(128) NOT NULL, 
-  type varchar(128) NOT NULL, 
-  message text NOT NULL, 
-  delivered varchar(10) NOT NULL, 
-  classification varchar(10), 
-  PRIMARY KEY (uuid) 
-);

Copied: labs/jbossesb/trunk/product/services/jbossesb/src/main/resources/message-store-sql/mssql/create_database.sql (from rev 21005, labs/jbossesb/tags/JBESB_4_2_1_GA_FP2/product/services/jbossesb/src/main/resources/message-store-sql/mssql/create_database.sql)
===================================================================
--- labs/jbossesb/trunk/product/services/jbossesb/src/main/resources/message-store-sql/mssql/create_database.sql	                        (rev 0)
+++ labs/jbossesb/trunk/product/services/jbossesb/src/main/resources/message-store-sql/mssql/create_database.sql	2008-07-12 10:55:04 UTC (rev 21013)
@@ -0,0 +1,10 @@
+
+CREATE TABLE message 
+( 
+  uuid varchar(128) NOT NULL, 
+  type varchar(128) NOT NULL, 
+  message text NOT NULL, 
+  delivered varchar(10) NOT NULL, 
+  classification varchar(10), 
+  PRIMARY KEY (uuid) 
+);

Deleted: labs/jbossesb/trunk/product/services/jbossesb/src/main/resources/message-store-sql/mssql/drop_database.sql
===================================================================
--- labs/jbossesb/tags/JBESB_4_2_1_GA_FP2/product/services/jbossesb/src/main/resources/message-store-sql/mssql/drop_database.sql	2008-07-11 13:15:28 UTC (rev 21005)
+++ labs/jbossesb/trunk/product/services/jbossesb/src/main/resources/message-store-sql/mssql/drop_database.sql	2008-07-12 10:55:04 UTC (rev 21013)
@@ -1 +0,0 @@
-DROP TABLE message;

Copied: labs/jbossesb/trunk/product/services/jbossesb/src/main/resources/message-store-sql/mssql/drop_database.sql (from rev 21005, labs/jbossesb/tags/JBESB_4_2_1_GA_FP2/product/services/jbossesb/src/main/resources/message-store-sql/mssql/drop_database.sql)
===================================================================
--- labs/jbossesb/trunk/product/services/jbossesb/src/main/resources/message-store-sql/mssql/drop_database.sql	                        (rev 0)
+++ labs/jbossesb/trunk/product/services/jbossesb/src/main/resources/message-store-sql/mssql/drop_database.sql	2008-07-12 10:55:04 UTC (rev 21013)
@@ -0,0 +1 @@
+DROP TABLE message;

Modified: labs/jbossesb/trunk/product/services/jbpm/ant-task/build.xml
===================================================================
--- labs/jbossesb/trunk/product/services/jbpm/ant-task/build.xml	2008-07-11 21:37:37 UTC (rev 21012)
+++ labs/jbossesb/trunk/product/services/jbpm/ant-task/build.xml	2008-07-12 10:55:04 UTC (rev 21013)
@@ -1,20 +1,20 @@
 <project name="jbpm-ant-task" default="build-task" basedir=".">
-
-        <path id="classpath">
-            <pathelement location="src/test/resources"/>
-                <pathelement location="build/classes" />
-                <pathelement location="build/test/classes" />
-        </path>
-
-
-        <target name="build-task">
+	<property name="jbpm.jar.file" location="build/jbpm-ant.jar"/>
+	
+	<path id="classpath">
+		<pathelement location="src/test/resources"/>
+			<pathelement location="${basedir}/../../../lib/ext/commons-codec-1.3.jar" />
+			<pathelement location="${basedir}/../../../lib/ext/junit-4.1.jar" />
+			<pathelement location="${basedir}/../../../lib/ext/commons-httpclient.jar" />
+			<pathelement location="${ant.library.dir}/ant.jar" />
+	</path>
+	
+	<target name="build-task">
 		<mkdir dir="build/classes"/>
-                <javac srcdir="src" destdir="build/classes"
-			debug="on" >
-                        <classpath refid="classpath" />
-                </javac>
-		<jar basedir="build/classes" destfile="build/jbpm-ant.jar"
-			includes="**/*.class"/>
+		<javac srcdir="src" destdir="build/classes" debug="on" >
+			<classpath refid="classpath" />
+		</javac>
+		<jar basedir="build/classes" destfile="${jbpm.jar.file}" includes="**/*.class"/>
 	</target>
 
 </project>

Modified: labs/jbossesb/trunk/product/services/jbpm/ant-task/src/org/jbpm/ant/DeployProcessToServerTask.java
===================================================================
--- labs/jbossesb/trunk/product/services/jbpm/ant-task/src/org/jbpm/ant/DeployProcessToServerTask.java	2008-07-11 21:37:37 UTC (rev 21012)
+++ labs/jbossesb/trunk/product/services/jbpm/ant-task/src/org/jbpm/ant/DeployProcessToServerTask.java	2008-07-12 10:55:04 UTC (rev 21013)
@@ -29,6 +29,7 @@
 import java.io.IOException;
 import java.io.InputStream;
 import java.net.ConnectException;
+import java.net.HttpURLConnection;
 import java.net.URL;
 import java.net.URLConnection;
 import java.util.ArrayList;
@@ -37,6 +38,14 @@
 import java.util.zip.ZipEntry;
 import java.util.zip.ZipOutputStream;
 
+import org.apache.commons.codec.binary.Base64;
+import org.apache.commons.httpclient.Cookie;
+import org.apache.commons.httpclient.Header;
+import org.apache.commons.httpclient.HttpClient;
+import org.apache.commons.httpclient.HttpException;
+import org.apache.commons.httpclient.HttpState;
+import org.apache.commons.httpclient.methods.GetMethod;
+import org.apache.commons.httpclient.methods.PostMethod;
 import org.apache.tools.ant.BuildException;
 import org.apache.tools.ant.DirectoryScanner;
 import org.apache.tools.ant.taskdefs.MatchingTask;
@@ -44,26 +53,51 @@
 
 /**
  * ant task for deploying process archives to the deployment servlet.
+ * </p>
+ * Usage:
+ * <pre>
+ * &lt;taskdef name="deployToServer" classname="org.jbpm.ant.DeployProcessToServerTask"&gt;
+ *     &lt;classpath refid="exec-classpath"/&gt;
+ * &lt;/taskdef&gt;
  * 
+ * &lt;deployToServer serverDeployer="jbpm-console/upload"&gt;
+ *     &lt;fileset dir="${basedir}/processDefinition" includes="*"/&gt;
+ * &lt;/deployToServer&gt;
+ * </pre>
+ * Optional attributes:
+ * <pre>
+ * serverName="localhost"
+ * serverPort="8080"
+ * serverDeployer="/jbpm-console/upload"
+ * process="processDefinitions/processdefinition.xml"
+ * username="username"
+ * password="password"
+ * </pre>
+ * 
  * @author kurt stam
+ * @author <a href="mailto:dbevenius at redhat.com">Daniel Bevenius</a>
  */
 public class DeployProcessToServerTask extends MatchingTask {
 
     private static final String boundary = "AaB03x";
     
-    String serverName = "localhost";
+    String servername = "localhost";
     String serverPort = "8080";
     String serverDeployer = "/jbpm-console/upload";
     String debug = null;
     File process = null;
     List fileSets = new ArrayList();
 
+	private String username;
+
+	private String password;
+
     public void setServerDeployer(String serverDeployer) {
         this.serverDeployer = serverDeployer;
     }
 
     public void setServerName(String serverName) {
-        this.serverName = serverName;
+        this.servername = serverName;
     }
 
     public void setServerPort(String serverPort) {
@@ -77,7 +111,17 @@
     public void setDebug(String debug) {
         this.debug = debug;
     }
+    
+	public void setUsername( final String userName )
+	{
+		this.username = userName;
+	}
 
+	public void setPassword( final String password )
+	{
+		this.password = password;
+	}
+
     public void execute() throws BuildException {
         try {
             if (pingServerOK()) {
@@ -95,7 +139,7 @@
                     if (debug!=null) {
                         saveParFile("debug.par", out.toByteArray());
                     }
-                    deployProcessWithServlet(serverName, serverPort, serverDeployer, out.toByteArray());
+                    deployProcessWithServlet(servername, serverPort, serverDeployer, out.toByteArray());
                     in.close();
                     log("deployment complete.");
                 }
@@ -127,13 +171,12 @@
                     if (debug!=null) {
                         saveParFile("debug.par", byteArrayOutputStream.toByteArray());
                     }
-                    deployProcessWithServlet(serverName, serverPort, serverDeployer, byteArrayOutputStream.toByteArray());
+                    deployProcessWithServlet(servername, serverPort, serverDeployer, byteArrayOutputStream.toByteArray());
                     log("deployment complete.");
                 }
             }
         } catch (Exception e) {
-            e.printStackTrace();
-            throw new BuildException( "couldn't deploy process archives : " + e.getMessage() );
+            throw new BuildException( "couldn't deploy process archives : " + e.getMessage(), e);
         }
     }
 
@@ -141,16 +184,33 @@
         this.fileSets.add(fileSet);
     }
 
-    public void deployProcessWithServlet(String serverName, String serverPort, String serverDeployer, byte[] parBytes) throws Exception {
+    public void deployProcessWithServlet(final String serverName, final String serverPort, final String serverDeployer, final byte[] parBytes) throws Exception {
+        log(deployProcess(serverName, serverPort, serverDeployer, parBytes));
+    }
+    
+    String deployProcess(final String serverName, final String serverPort, final String serverDeployer, final byte[] parBytes) throws Exception {
+        String sessionID = null; 
+        //	pass security credentials if specified.
+        boolean security = verifySecurityProperties();
+        if ( security )
+        	sessionID = tryFormBasedAuthentication();
+        
         URL url = new URL("http://" + serverName + ":" + serverPort + serverDeployer);
-        URLConnection urlConnection = url.openConnection();
+        HttpURLConnection urlConnection = (HttpURLConnection)url.openConnection();
+        urlConnection.setRequestMethod( "POST" );
         urlConnection.setDoInput(true);
         urlConnection.setDoOutput(true);
+        urlConnection.setAllowUserInteraction(false);
         urlConnection.setUseCaches(false);
-        urlConnection.setRequestProperty("Content-Type",
-        "multipart/form-data; boundary=AaB03x");
-        DataOutputStream dataOutputStream = new DataOutputStream(urlConnection
-                .getOutputStream());
+        
+        if ( sessionID != null ) // FORM based authentication
+        	urlConnection.setRequestProperty( "Cookie", sessionID  );
+        else // fall back to BASIC authentication
+            urlConnection.setRequestProperty( "Authorization", "Basic " + encode(username + ":" + password ) );
+        	
+        urlConnection.setRequestProperty("Content-Type", "multipart/form-data; boundary=AaB03x");
+        
+        DataOutputStream dataOutputStream = new DataOutputStream(urlConnection.getOutputStream());
         dataOutputStream.writeBytes("--" + boundary + "\r\n");
         dataOutputStream.writeBytes("Content-Disposition: form-data; name=\"definition\"; filename=\"dummy.par\"\r\n");
         dataOutputStream.writeBytes("Content-Type: application/x-zip-compressed\r\n\r\n");
@@ -160,14 +220,66 @@
         dataOutputStream.writeBytes("\r\n--" + boundary + "--\r\n");
         dataOutputStream.flush();
         dataOutputStream.close();
+        
         InputStream inputStream = urlConnection.getInputStream();
         StringBuffer result = new StringBuffer();
         int read;
         while ((read = inputStream.read()) != -1) {
             result.append((char)read);
         }
+        return result.toString() ;
     }
+    
+    /**
+     * Adds BASIC Authentication properties to the passed-in urlConnection.
+     * 
+     * @param urlConnection
+     */
+    void addBasicSecurityCredentials( final URLConnection urlConnection )
+    {
+        urlConnection.setRequestProperty("Authorization", "Basic " + encode(username + ":" + password));
+    }
+    
+    /**
+     * Try to authenticate using FORM based Authentication. 
+     * If succuessful the returned String will contain the JSESSIONID.
+     * 
+     * @return String	The session id from the serlvet. 
+     */
+    private String tryFormBasedAuthentication() throws HttpException, IOException
+    {
+    	final String path ="http://" + servername + ":" + serverPort + serverDeployer;
+        String sessionId = null;
+        
+    	final HttpClient httpClient = new HttpClient();
+        GetMethod indexGet = new GetMethod( path );
+        
+        if ( httpClient.executeMethod(indexGet) == 200 )
+        {
+        
+            HttpState state = httpClient.getState();
+            Cookie[] cookies = state.getCookies();
+        	for (Cookie cookie : cookies)
+			{
+                if( cookie.getName().equalsIgnoreCase("JSESSIONID") )
+                {
+                    sessionId = "JSESSIONID=" + cookie.getValue();
+                }
+            }
+        
+            PostMethod loginFormPost = new PostMethod( path + "/j_security_check");
+            loginFormPost.addParameter("j_username", username);
+            loginFormPost.addParameter("j_password", password);
+            httpClient.executeMethod(loginFormPost.getHostConfiguration(), loginFormPost, state);
 
+            Header location = loginFormPost.getResponseHeader("Location");
+            String indexURI = location.getValue();
+            GetMethod war1Index = new GetMethod(indexURI);
+            httpClient.executeMethod(war1Index.getHostConfiguration(), war1Index, state);
+        }
+        return sessionId;
+    }
+    
     public void addFile(ZipOutputStream zos, File file)
     throws IOException 
     {
@@ -194,9 +306,12 @@
     public boolean pingServerOK() {
         URL url = null;
         try {
-            url = new URL("http://" + serverName + ":" + serverPort + serverDeployer);
+            url = new URL("http://" + servername + ":" + serverPort + serverDeployer);
             URLConnection urlConnection = url.openConnection();
             urlConnection.setDoOutput(true);
+            //	pass security credentials is specified.
+            if ( verifySecurityProperties() )
+                addBasicSecurityCredentials( urlConnection );
             InputStream inputStream = urlConnection.getInputStream();
             StringBuffer result = new StringBuffer();
             int read;
@@ -210,8 +325,26 @@
             return false;
         }
         catch (Exception e) {
+        	e.printStackTrace();
             log("An unexpected exception happened while testing the server (" + url + ") connection.");
             return false;
         }
     }
+
+	boolean verifySecurityProperties() throws BuildException
+	{
+		if ( username == null && password == null || "".equals( username ) && "".equals( password ) )
+			return false;
+		
+		if ( username != null && password == null )
+			throw new BuildException( "'userName' must be accompanied with 'password'");
+		else if ( password != null && username == null )
+			throw new BuildException( "'password' must be accompanied with 'userName'");
+		
+		return true;
+	}
+	
+    public static String encode (String source) {
+        return new String( new Base64().encode( source.getBytes() ));
+    }
 }
\ No newline at end of file

Modified: labs/jbossesb/trunk/product/services/jbpm/ant-task/src/org/jbpm/ant/ProcessDeployer.java
===================================================================
--- labs/jbossesb/trunk/product/services/jbpm/ant-task/src/org/jbpm/ant/ProcessDeployer.java	2008-07-11 21:37:37 UTC (rev 21012)
+++ labs/jbossesb/trunk/product/services/jbpm/ant-task/src/org/jbpm/ant/ProcessDeployer.java	2008-07-12 10:55:04 UTC (rev 21013)
@@ -48,6 +48,6 @@
     	
     	zipOutputStream.close();
     	
-    	dptt.deployProcessWithServlet(serverName, serverPort, serverDeployer, byteArrayOutputStream.toByteArray());
+    	dptt.deployProcess(serverName, serverPort, serverDeployer, byteArrayOutputStream.toByteArray());
     }   
 }

Copied: labs/jbossesb/trunk/product/services/jbpm/ant-task/test (from rev 21005, labs/jbossesb/tags/JBESB_4_2_1_GA_FP2/product/services/jbpm/ant-task/test)

Copied: labs/jbossesb/trunk/product/services/jbpm/ant-task/test/org (from rev 21005, labs/jbossesb/tags/JBESB_4_2_1_GA_FP2/product/services/jbpm/ant-task/test/org)

Copied: labs/jbossesb/trunk/product/services/jbpm/ant-task/test/org/jbpm (from rev 21005, labs/jbossesb/tags/JBESB_4_2_1_GA_FP2/product/services/jbpm/ant-task/test/org/jbpm)

Copied: labs/jbossesb/trunk/product/services/jbpm/ant-task/test/org/jbpm/ant (from rev 21005, labs/jbossesb/tags/JBESB_4_2_1_GA_FP2/product/services/jbpm/ant-task/test/org/jbpm/ant)

Deleted: labs/jbossesb/trunk/product/services/jbpm/ant-task/test/org/jbpm/ant/DeployProcessToServerTaskUnitTest.java
===================================================================
--- labs/jbossesb/tags/JBESB_4_2_1_GA_FP2/product/services/jbpm/ant-task/test/org/jbpm/ant/DeployProcessToServerTaskUnitTest.java	2008-07-11 13:15:28 UTC (rev 21005)
+++ labs/jbossesb/trunk/product/services/jbpm/ant-task/test/org/jbpm/ant/DeployProcessToServerTaskUnitTest.java	2008-07-12 10:55:04 UTC (rev 21013)
@@ -1,82 +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.jbpm.ant;
-
-import static org.junit.Assert.*;
-
-import org.apache.tools.ant.BuildException;
-import org.junit.Before;
-import org.junit.Test;
-
-/**
- * Unit test for {@link DeployProcessToServerTask}
- * <p/>
- * @author <a href="mailto:dbevenius at redhat.com">Daniel Bevenius</a>
- * 
- */
-public class DeployProcessToServerTaskUnitTest
-{
-	private DeployProcessToServerTask task;
-	
-	private final String userName = "testuser";
-	private final String password = "testpasswd";
-	
-	@Test ( expected = BuildException.class )
-	public void showThrowIfPasswordIsNotSet()
-	{
-		task.setUsername( userName );
-		task.verifySecurityProperties();
-		
-	}
-	
-	@Test ( expected = BuildException.class )
-	public void showThrowIfUserNameIsNotSet()
-	{
-		task.setPassword( password );
-		task.verifySecurityProperties();
-	}
-	
-	@Test
-	public void noSecurityPropeties()
-	{
-		boolean useSecurity = task.verifySecurityProperties();
-		assertFalse ( useSecurity );
-	}
-	
-	@Test
-	public void emptyStringsSecurityPropeties()
-	{
-		task.setUsername( "" );
-		task.setPassword( "" );
-		boolean useSecurity = task.verifySecurityProperties();
-		assertFalse ( useSecurity );
-	}
-	
-	//	lifecycle 
-	
-	@Before
-	public void setup()
-	{
-		task = new DeployProcessToServerTask();
-	}
-		
-}

Copied: labs/jbossesb/trunk/product/services/jbpm/ant-task/test/org/jbpm/ant/DeployProcessToServerTaskUnitTest.java (from rev 21005, labs/jbossesb/tags/JBESB_4_2_1_GA_FP2/product/services/jbpm/ant-task/test/org/jbpm/ant/DeployProcessToServerTaskUnitTest.java)
===================================================================
--- labs/jbossesb/trunk/product/services/jbpm/ant-task/test/org/jbpm/ant/DeployProcessToServerTaskUnitTest.java	                        (rev 0)
+++ labs/jbossesb/trunk/product/services/jbpm/ant-task/test/org/jbpm/ant/DeployProcessToServerTaskUnitTest.java	2008-07-12 10:55:04 UTC (rev 21013)
@@ -0,0 +1,82 @@
+/*
+ * 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.jbpm.ant;
+
+import static org.junit.Assert.*;
+
+import org.apache.tools.ant.BuildException;
+import org.junit.Before;
+import org.junit.Test;
+
+/**
+ * Unit test for {@link DeployProcessToServerTask}
+ * <p/>
+ * @author <a href="mailto:dbevenius at redhat.com">Daniel Bevenius</a>
+ * 
+ */
+public class DeployProcessToServerTaskUnitTest
+{
+	private DeployProcessToServerTask task;
+	
+	private final String userName = "testuser";
+	private final String password = "testpasswd";
+	
+	@Test ( expected = BuildException.class )
+	public void showThrowIfPasswordIsNotSet()
+	{
+		task.setUsername( userName );
+		task.verifySecurityProperties();
+		
+	}
+	
+	@Test ( expected = BuildException.class )
+	public void showThrowIfUserNameIsNotSet()
+	{
+		task.setPassword( password );
+		task.verifySecurityProperties();
+	}
+	
+	@Test
+	public void noSecurityPropeties()
+	{
+		boolean useSecurity = task.verifySecurityProperties();
+		assertFalse ( useSecurity );
+	}
+	
+	@Test
+	public void emptyStringsSecurityPropeties()
+	{
+		task.setUsername( "" );
+		task.setPassword( "" );
+		boolean useSecurity = task.verifySecurityProperties();
+		assertFalse ( useSecurity );
+	}
+	
+	//	lifecycle 
+	
+	@Before
+	public void setup()
+	{
+		task = new DeployProcessToServerTask();
+	}
+		
+}

Modified: labs/jbossesb/trunk/product/services/jbpm/build.xml
===================================================================
--- labs/jbossesb/trunk/product/services/jbpm/build.xml	2008-07-11 21:37:37 UTC (rev 21012)
+++ labs/jbossesb/trunk/product/services/jbpm/build.xml	2008-07-12 10:55:04 UTC (rev 21013)
@@ -4,6 +4,12 @@
 	<!-- Import the base Ant build script... -->
 	<import file="${services.base.build}"/>
 	
+	<target name="service-prepare">
+		<ant dir="ant-task">
+			<property name="jbpm.jar.file" location="build/jbpm-ant.jar"/>
+		</ant>
+	</target>
+	
 	<target name="test" depends="base.test"/>
 
-</project>
\ No newline at end of file
+</project>

Deleted: labs/jbossesb/trunk/product/services/jbpm/lib/ext/jbpm-ant.jar
===================================================================
(Binary files differ)

Modified: labs/jbossesb/trunk/product/services/jbpm/src/main/resources/jbpm-service.xml
===================================================================
--- labs/jbossesb/trunk/product/services/jbpm/src/main/resources/jbpm-service.xml	2008-07-11 21:37:37 UTC (rev 21012)
+++ labs/jbossesb/trunk/product/services/jbpm/src/main/resources/jbpm-service.xml	2008-07-12 10:55:04 UTC (rev 21013)
@@ -8,8 +8,7 @@
       <attribute name="Datasource">java:/JbpmDS</attribute>
       <attribute name="ExistsSql">select * from JBPM_ID_USER</attribute>
       <attribute name="SqlFiles">
-      jbpm-sql/jbpm.jpdl.hsqldb.sql,
-      jbpm-sql/import.sql
+      jbpm-sql/jbpm.jpdl.hsqldb.sql
       </attribute>
       <depends>jboss.jca:service=DataSourceBinding,name=JbpmDS</depends>
       <attribute name="UseEOL">true</attribute>

Deleted: labs/jbossesb/trunk/product/services/jbpm/src/main/resources/jbpm-sql/import.sql
===================================================================
--- labs/jbossesb/trunk/product/services/jbpm/src/main/resources/jbpm-sql/import.sql	2008-07-11 21:37:37 UTC (rev 21012)
+++ labs/jbossesb/trunk/product/services/jbpm/src/main/resources/jbpm-sql/import.sql	2008-07-12 10:55:04 UTC (rev 21013)
@@ -1,23 +0,0 @@
-insert into JBPM_ID_USER (ID_,CLASS_,NAME_,EMAIL_,PASSWORD_) values (1,'U','user','user at sample.domain','user');
-insert into JBPM_ID_USER (ID_,CLASS_,NAME_,EMAIL_,PASSWORD_) values (2,'U','manager','manager at sample.domain','manager');
-insert into JBPM_ID_USER (ID_,CLASS_,NAME_,EMAIL_,PASSWORD_) values (3,'U','admin','admin at sample.domain','admin');
-insert into JBPM_ID_USER (ID_,CLASS_,NAME_,EMAIL_,PASSWORD_) values( 4,'U','shipper','shipper at sample.domain','shipper');
-
-insert into JBPM_ID_GROUP (ID_,CLASS_,NAME_,TYPE_) values (1,'G','sales','organisation');
-insert into JBPM_ID_GROUP (ID_,CLASS_,NAME_,TYPE_) values (2,'G','admin','security-role');
-insert into JBPM_ID_GROUP (ID_,CLASS_,NAME_,TYPE_) values (3,'G','user','security-role');
-insert into JBPM_ID_GROUP (ID_,CLASS_,NAME_,TYPE_) values (4,'G','hr','organisation');
-insert into JBPM_ID_GROUP (ID_,CLASS_,NAME_,TYPE_) values (5,'G','manager','security-role');
-
-insert into JBPM_ID_MEMBERSHIP (ID_,CLASS_,USER_,GROUP_) values (1,'M',2,4);
-insert into JBPM_ID_MEMBERSHIP (ID_,CLASS_,USER_,GROUP_) values (2,'M',3,4);
-insert into JBPM_ID_MEMBERSHIP (ID_,CLASS_,USER_,GROUP_) values (3,'M',4,4);
-insert into JBPM_ID_MEMBERSHIP (ID_,CLASS_,USER_,GROUP_) values (4,'M',4,3);
-insert into JBPM_ID_MEMBERSHIP (ID_,CLASS_,USER_,GROUP_) values (5,'M',1,3);
-insert into JBPM_ID_MEMBERSHIP (ID_,CLASS_,USER_,GROUP_) values (6,'M',2,3);
-insert into JBPM_ID_MEMBERSHIP (ID_,CLASS_,USER_,GROUP_) values (7,'M',3,3);
-insert into JBPM_ID_MEMBERSHIP (ID_,CLASS_,USER_,GROUP_) values (8,'M',3,2);
-insert into JBPM_ID_MEMBERSHIP (ID_,CLASS_,USER_,GROUP_) values (9,'M',2,2);
-insert into JBPM_ID_MEMBERSHIP (ID_,CLASS_,USER_,GROUP_) values (10,'M',2,5);
-insert into JBPM_ID_MEMBERSHIP (ID_,CLASS_,USER_,GROUP_) values (11,'M',2,1);
-insert into JBPM_ID_MEMBERSHIP (ID_,CLASS_,USER_,GROUP_) values (12,'M',1,1);
\ No newline at end of file

Modified: labs/jbossesb/trunk/product/services/soap/src/main/java/org/jboss/soa/esb/actions/soap/SOAPClient.java
===================================================================
--- labs/jbossesb/trunk/product/services/soap/src/main/java/org/jboss/soa/esb/actions/soap/SOAPClient.java	2008-07-11 21:37:37 UTC (rev 21012)
+++ labs/jbossesb/trunk/product/services/soap/src/main/java/org/jboss/soa/esb/actions/soap/SOAPClient.java	2008-07-12 10:55:04 UTC (rev 21013)
@@ -383,19 +383,24 @@
     }
 
     public Message process(final Message message) throws ActionProcessingException {
-        Map params;
+        Object payload;
 
         try {
-            params = (Map) payloadProxy.getPayload(message);
+            payload = payloadProxy.getPayload(message);
         } catch (MessageDeliverException e) {
-            throw new ActionProcessingException("Could not locate SOAP message parameters from payload", e) ;
+            throw new ActionProcessingException("Error getting SOAP message parameters from payload.", e);
         }
         catch (final ClassCastException ex)
         {
             throw new ActionProcessingException("Required a Map in the payload, but got something else!");
         }
 
-        if(params.isEmpty()) {
+        if (!(payload instanceof Map)) {
+            throw new ActionProcessingException("Invalid payload type in message body location '" + payloadProxy.getGetPayloadLocation() + "'.  Expected 'java.util.Map', was '" + payload.getClass().getName() + "'.");
+        }
+
+        Map params = (Map) payload;
+        if (params.isEmpty()) {
             logger.warn("Params Map found in message, but the map is empty.");
         }
 

Modified: labs/jbossesb/trunk/product/services/soapui-client/soapui-client.iml
===================================================================
--- labs/jbossesb/trunk/product/services/soapui-client/soapui-client.iml	2008-07-11 21:37:37 UTC (rev 21012)
+++ labs/jbossesb/trunk/product/services/soapui-client/soapui-client.iml	2008-07-12 10:55:04 UTC (rev 21013)
@@ -1,209 +1,208 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module version="4" relativePaths="false" type="JAVA_MODULE">
-  <component name="ModuleRootManager" />
-  <component name="NewModuleRootManager" inherit-compiler-output="false">
-    <output url="file://$MODULE_DIR$/target/classes" />
-    <exclude-output />
-    <output-test url="file://$MODULE_DIR$/target/test-classes" />
-    <content url="file://$MODULE_DIR$">
-      <sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/src/main/resources" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/test/resources" isTestSource="true" />
-      <excludeFolder url="file://$MODULE_DIR$/target" />
-    </content>
-    <orderEntry type="inheritedJdk" />
-    <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="module-library">
-      <library>
-        <CLASSES>
-          <root url="jar://C:/Documents and Settings/Tom Fennelly/.m2/repository/javax/servlet/servlet-api/2.3/servlet-api-2.3.jar!/" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES />
-      </library>
-    </orderEntry>
-    <orderEntry type="module-library">
-      <library>
-        <CLASSES>
-          <root url="jar://C:/Documents and Settings/Tom Fennelly/.m2/repository/eviware/soapui-xmlbeans/1.7/soapui-xmlbeans-1.7.jar!/" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES />
-      </library>
-    </orderEntry>
-    <orderEntry type="module-library">
-      <library>
-        <CLASSES>
-          <root url="jar://C:/Documents and Settings/Tom Fennelly/.m2/repository/xmlbeans/xbean/2.2.0/xbean-2.2.0.jar!/" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES />
-      </library>
-    </orderEntry>
-    <orderEntry type="module-library">
-      <library>
-        <CLASSES>
-          <root url="jar://C:/Documents and Settings/Tom Fennelly/.m2/repository/commons-logging/commons-logging/1.0.4/commons-logging-1.0.4.jar!/" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES />
-      </library>
-    </orderEntry>
-    <orderEntry type="module-library">
-      <library>
-        <CLASSES>
-          <root url="jar://C:/Documents and Settings/Tom Fennelly/.m2/repository/log4j/log4j/1.2.8/log4j-1.2.8.jar!/" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES />
-      </library>
-    </orderEntry>
-    <orderEntry type="module-library">
-      <library>
-        <CLASSES>
-          <root url="jar://C:/Documents and Settings/Tom Fennelly/.m2/repository/ognl/ognl/2.6.9/ognl-2.6.9.jar!/" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES />
-      </library>
-    </orderEntry>
-    <orderEntry type="module-library">
-      <library>
-        <CLASSES>
-          <root url="jar://C:/Documents and Settings/Tom Fennelly/.m2/repository/milyn/milyn-commons/0.9-SNAPSHOT/milyn-commons-0.9-SNAPSHOT.jar!/" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES />
-      </library>
-    </orderEntry>
-    <orderEntry type="module-library">
-      <library>
-        <CLASSES>
-          <root url="jar://C:/Documents and Settings/Tom Fennelly/.m2/repository/com/jgoodies/looks/2.1.2/looks-2.1.2.jar!/" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES />
-      </library>
-    </orderEntry>
-    <orderEntry type="module-library">
-      <library>
-        <CLASSES>
-          <root url="jar://C:/Documents and Settings/Tom Fennelly/.m2/repository/commons-lang/commons-lang/2.1/commons-lang-2.1.jar!/" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES />
-      </library>
-    </orderEntry>
-    <orderEntry type="module-library">
-      <library>
-        <CLASSES>
-          <root url="jar://C:/Documents and Settings/Tom Fennelly/.m2/repository/junit/junit/4.1/junit-4.1.jar!/" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES />
-      </library>
-    </orderEntry>
-    <orderEntry type="module-library">
-      <library>
-        <CLASSES>
-          <root url="jar://C:/Documents and Settings/Tom Fennelly/.m2/repository/commons-codec/commons-codec/1.2/commons-codec-1.2.jar!/" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES />
-      </library>
-    </orderEntry>
-    <orderEntry type="module-library">
-      <library>
-        <CLASSES>
-          <root url="jar://C:/Documents and Settings/Tom Fennelly/.m2/repository/eviware/soapui/1.7/soapui-1.7.jar!/" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES />
-      </library>
-    </orderEntry>
-    <orderEntry type="module-library">
-      <library>
-        <CLASSES>
-          <root url="jar://C:/Documents and Settings/Tom Fennelly/.m2/repository/commons-httpclient/commons-httpclient/3.0.1/commons-httpclient-3.0.1.jar!/" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES />
-      </library>
-    </orderEntry>
-    <orderEntry type="module-library">
-      <library>
-        <CLASSES>
-          <root url="jar://H:/Jboss/ESB/trunk/product/build/jbossesb/lib/jbossesb-rosetta.jar!/" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES />
-      </library>
-    </orderEntry>
-    <orderEntry type="module-library">
-      <library>
-        <CLASSES>
-          <root url="jar://C:/Documents and Settings/Tom Fennelly/.m2/repository/xalan/xalan/2.7.0/xalan-2.7.0.jar!/" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES />
-      </library>
-    </orderEntry>
-    <orderEntry type="module-library">
-      <library>
-        <CLASSES>
-          <root url="jar://$MODULE_DIR$/src/lib/wsdl4j-1.6.2.jar!/" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES />
-      </library>
-    </orderEntry>
-    <orderEntry type="module-library">
-      <library>
-        <CLASSES>
-          <root url="jar://$MODULE_DIR$/src/lib/jboss-system.jar!/" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES />
-      </library>
-    </orderEntry>
-    <orderEntry type="module-library">
-      <library>
-        <CLASSES>
-          <root url="jar://H:/Jboss/ESB/trunk/product/lib/ext/jbossall-client.jar!/" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES />
-      </library>
-    </orderEntry>
-    <orderEntry type="module-library">
-      <library>
-        <CLASSES>
-          <root url="jar://$MODULE_DIR$/src/lib/jsr173_1.0_api-xmlbeans-2.2.0.jar!/" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES />
-      </library>
-    </orderEntry>
-    <orderEntry type="module-library">
-      <library>
-        <CLASSES>
-          <root url="jar://C:/Documents and Settings/Tom Fennelly/.m2/repository/xml-apis/xml-apis/1.0.b2/xml-apis-1.0.b2.jar!/" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES />
-      </library>
-    </orderEntry>
-    <orderEntry type="module-library">
-      <library>
-        <CLASSES>
-          <root url="jar://$MODULE_DIR$/src/lib/jboss-system-client.jar!/" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES />
-      </library>
-    </orderEntry>
-    <orderEntryProperties />
-  </component>
-</module>
-
+<?xml version="1.0" encoding="UTF-8"?>
+<module relativePaths="false" type="JAVA_MODULE" version="4">
+  <component name="NewModuleRootManager" inherit-compiler-output="false">
+    <output url="file://$MODULE_DIR$/target/classes" />
+    <exclude-output />
+    <output-test url="file://$MODULE_DIR$/target/test-classes" />
+    <content url="file://$MODULE_DIR$">
+      <sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/src/main/resources" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/test/resources" isTestSource="true" />
+      <excludeFolder url="file://$MODULE_DIR$/target" />
+    </content>
+    <orderEntry type="inheritedJdk" />
+    <orderEntry type="sourceFolder" forTests="false" />
+    <orderEntry type="module-library">
+      <library>
+        <CLASSES>
+          <root url="jar://C:/Documents and Settings/Tom Fennelly/.m2/repository/javax/servlet/servlet-api/2.3/servlet-api-2.3.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES />
+      </library>
+    </orderEntry>
+    <orderEntry type="module-library">
+      <library>
+        <CLASSES>
+          <root url="jar://C:/Documents and Settings/Tom Fennelly/.m2/repository/eviware/soapui-xmlbeans/1.7/soapui-xmlbeans-1.7.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES />
+      </library>
+    </orderEntry>
+    <orderEntry type="module-library">
+      <library>
+        <CLASSES>
+          <root url="jar://C:/Documents and Settings/Tom Fennelly/.m2/repository/xmlbeans/xbean/2.2.0/xbean-2.2.0.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES />
+      </library>
+    </orderEntry>
+    <orderEntry type="module-library">
+      <library>
+        <CLASSES>
+          <root url="jar://C:/Documents and Settings/Tom Fennelly/.m2/repository/commons-logging/commons-logging/1.0.4/commons-logging-1.0.4.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES />
+      </library>
+    </orderEntry>
+    <orderEntry type="module-library">
+      <library>
+        <CLASSES>
+          <root url="jar://C:/Documents and Settings/Tom Fennelly/.m2/repository/log4j/log4j/1.2.8/log4j-1.2.8.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES />
+      </library>
+    </orderEntry>
+    <orderEntry type="module-library">
+      <library>
+        <CLASSES>
+          <root url="jar://C:/Documents and Settings/Tom Fennelly/.m2/repository/ognl/ognl/2.6.9/ognl-2.6.9.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES />
+      </library>
+    </orderEntry>
+    <orderEntry type="module-library">
+      <library>
+        <CLASSES>
+          <root url="jar://C:/Documents and Settings/Tom Fennelly/.m2/repository/milyn/milyn-commons/0.9-SNAPSHOT/milyn-commons-0.9-SNAPSHOT.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES />
+      </library>
+    </orderEntry>
+    <orderEntry type="module-library">
+      <library>
+        <CLASSES>
+          <root url="jar://C:/Documents and Settings/Tom Fennelly/.m2/repository/com/jgoodies/looks/2.1.2/looks-2.1.2.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES />
+      </library>
+    </orderEntry>
+    <orderEntry type="module-library">
+      <library>
+        <CLASSES>
+          <root url="jar://C:/Documents and Settings/Tom Fennelly/.m2/repository/commons-lang/commons-lang/2.1/commons-lang-2.1.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES />
+      </library>
+    </orderEntry>
+    <orderEntry type="module-library">
+      <library>
+        <CLASSES>
+          <root url="jar://C:/Documents and Settings/Tom Fennelly/.m2/repository/junit/junit/4.1/junit-4.1.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES />
+      </library>
+    </orderEntry>
+    <orderEntry type="module-library">
+      <library>
+        <CLASSES>
+          <root url="jar://C:/Documents and Settings/Tom Fennelly/.m2/repository/commons-codec/commons-codec/1.2/commons-codec-1.2.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES />
+      </library>
+    </orderEntry>
+    <orderEntry type="module-library">
+      <library>
+        <CLASSES>
+          <root url="jar://C:/Documents and Settings/Tom Fennelly/.m2/repository/eviware/soapui/1.7/soapui-1.7.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES />
+      </library>
+    </orderEntry>
+    <orderEntry type="module-library">
+      <library>
+        <CLASSES>
+          <root url="jar://C:/Documents and Settings/Tom Fennelly/.m2/repository/commons-httpclient/commons-httpclient/3.0.1/commons-httpclient-3.0.1.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES />
+      </library>
+    </orderEntry>
+    <orderEntry type="module-library">
+      <library>
+        <CLASSES>
+          <root url="jar://H:/Jboss/ESB/trunk/product/build/jbossesb/lib/jbossesb-rosetta.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES />
+      </library>
+    </orderEntry>
+    <orderEntry type="module-library">
+      <library>
+        <CLASSES>
+          <root url="jar://C:/Documents and Settings/Tom Fennelly/.m2/repository/xalan/xalan/2.7.0/xalan-2.7.0.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES />
+      </library>
+    </orderEntry>
+    <orderEntry type="module-library">
+      <library>
+        <CLASSES>
+          <root url="jar://$MODULE_DIR$/src/lib/wsdl4j-1.6.2.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES />
+      </library>
+    </orderEntry>
+    <orderEntry type="module-library">
+      <library>
+        <CLASSES>
+          <root url="jar://$MODULE_DIR$/src/lib/jboss-system.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES />
+      </library>
+    </orderEntry>
+    <orderEntry type="module-library">
+      <library>
+        <CLASSES>
+          <root url="jar://H:/Jboss/ESB/trunk/product/lib/ext/jbossall-client.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES />
+      </library>
+    </orderEntry>
+    <orderEntry type="module-library">
+      <library>
+        <CLASSES>
+          <root url="jar://$MODULE_DIR$/src/lib/jsr173_1.0_api-xmlbeans-2.2.0.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES />
+      </library>
+    </orderEntry>
+    <orderEntry type="module-library">
+      <library>
+        <CLASSES>
+          <root url="jar://C:/Documents and Settings/Tom Fennelly/.m2/repository/xml-apis/xml-apis/1.0.b2/xml-apis-1.0.b2.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES />
+      </library>
+    </orderEntry>
+    <orderEntry type="module-library">
+      <library>
+        <CLASSES>
+          <root url="jar://$MODULE_DIR$/src/lib/jboss-system-client.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES />
+      </library>
+    </orderEntry>
+    <orderEntryProperties />
+  </component>
+</module>
+

Modified: labs/jbossesb/trunk/product/services/soapui-client/soapui-client.ipr
===================================================================
--- labs/jbossesb/trunk/product/services/soapui-client/soapui-client.ipr	2008-07-11 21:37:37 UTC (rev 21012)
+++ labs/jbossesb/trunk/product/services/soapui-client/soapui-client.ipr	2008-07-12 10:55:04 UTC (rev 21013)
@@ -1,292 +1,338 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4" relativePaths="false">
-  <component name="AntConfiguration">
-    <defaultAnt bundledAnt="true" />
-  </component>
-  <component name="BuildJarProjectSettings">
-    <option name="BUILD_JARS_ON_MAKE" value="false" />
-  </component>
-  <component name="CodeStyleManager">
-    <option name="USE_DEFAULT_CODE_STYLE_SCHEME" value="true" />
-    <option name="CODE_STYLE_SCHEME" value="" />
-  </component>
-  <component name="CodeStyleProjectProfileManger">
-    <option name="PROJECT_PROFILE" />
-    <option name="USE_PROJECT_LEVEL_SETTINGS" value="false" />
-  </component>
-  <component name="CodeStyleSettingsManager">
-    <option name="PER_PROJECT_SETTINGS" />
-    <option name="USE_PER_PROJECT_SETTINGS" value="false" />
-  </component>
-  <component name="CompilerConfiguration">
-    <option name="DEFAULT_COMPILER" value="Javac" />
-    <option name="DEPLOY_AFTER_MAKE" value="0" />
-    <excludeFromCompile>
-      <file url="file://H:/Jboss/ESB/trunk/product/core/rosetta/tests/src/org/jboss/soa/esb/notification/NotifyQueuesUnitTest.java" />
-      <file url="file://H:/Jboss/ESB/trunk/product/core/rosetta/tests/src/org/jboss/soa/esb/helpers/EmailUnitTest.java" />
-    </excludeFromCompile>
-    <resourceExtensions />
-    <wildcardResourcePatterns>
-      <entry name="!?*.java" />
-    </wildcardResourcePatterns>
-  </component>
-  <component name="DataSourceManager" />
-  <component name="DataSourceManagerImpl" />
-  <component name="DependenciesAnalyzeManager">
-    <option name="myForwardDirection" value="false" />
-  </component>
-  <component name="DependencyValidationManager" />
-  <component name="EclipseCompilerSettings">
-    <option name="DEBUGGING_INFO" value="true" />
-    <option name="GENERATE_NO_WARNINGS" value="true" />
-    <option name="DEPRECATION" value="false" />
-    <option name="ADDITIONAL_OPTIONS_STRING" value="" />
-    <option name="MAXIMUM_HEAP_SIZE" value="128" />
-  </component>
-  <component name="EclipseEmbeddedCompilerSettings">
-    <option name="DEBUGGING_INFO" value="true" />
-    <option name="GENERATE_NO_WARNINGS" value="true" />
-    <option name="DEPRECATION" value="false" />
-    <option name="ADDITIONAL_OPTIONS_STRING" value="" />
-    <option name="MAXIMUM_HEAP_SIZE" value="128" />
-  </component>
-  <component name="EntryPointsManager">
-    <entry_points />
-  </component>
-  <component name="ExportToHTMLSettings">
-    <option name="PRINT_LINE_NUMBERS" value="false" />
-    <option name="OPEN_IN_BROWSER" value="false" />
-    <option name="OUTPUT_DIRECTORY" />
-  </component>
-  <component name="GUI Designer component loader factory" />
-  <component name="IdProvider" IDEtalkID="CC00DEA8EC72CCAE06854CBE4C29A6E5" />
-  <component name="ImportConfiguration">
-    <option name="VENDOR" />
-    <option name="RELEASE_TAG" />
-    <option name="LOG_MESSAGE" />
-    <option name="CHECKOUT_AFTER_IMPORT" value="true" />
-  </component>
-  <component name="InspectionProjectProfileManager">
-    <option name="PROJECT_PROFILE" value="Project Default" />
-    <option name="USE_PROJECT_LEVEL_SETTINGS" value="false" />
-    <scopes />
-    <profiles>
-      <profile version="1.0" is_locked="false">
-        <option name="myName" value="Project Default" />
-        <option name="myLocal" value="false" />
-        <used_levels>
-          <error>
-            <option name="myName" value="ERROR" />
-            <option name="myVal" value="400" />
-          </error>
-          <warning>
-            <option name="myName" value="WARNING" />
-            <option name="myVal" value="300" />
-          </warning>
-          <information>
-            <option name="myName" value="INFO" />
-            <option name="myVal" value="200" />
-          </information>
-          <server>
-            <option name="myName" value="SERVER PROBLEM" />
-            <option name="myVal" value="100" />
-          </server>
-        </used_levels>
-      </profile>
-    </profiles>
-  </component>
-  <component name="JUnitProjectSettings">
-    <option name="TEST_RUNNER" value="UI" />
-  </component>
-  <component name="JavacSettings">
-    <option name="DEBUGGING_INFO" value="true" />
-    <option name="GENERATE_NO_WARNINGS" value="false" />
-    <option name="DEPRECATION" value="true" />
-    <option name="ADDITIONAL_OPTIONS_STRING" value="" />
-    <option name="MAXIMUM_HEAP_SIZE" value="128" />
-  </component>
-  <component name="JavadocGenerationManager">
-    <option name="OUTPUT_DIRECTORY" />
-    <option name="OPTION_SCOPE" value="protected" />
-    <option name="OPTION_HIERARCHY" value="false" />
-    <option name="OPTION_NAVIGATOR" value="false" />
-    <option name="OPTION_INDEX" value="false" />
-    <option name="OPTION_SEPARATE_INDEX" value="false" />
-    <option name="OPTION_DOCUMENT_TAG_USE" value="false" />
-    <option name="OPTION_DOCUMENT_TAG_AUTHOR" value="false" />
-    <option name="OPTION_DOCUMENT_TAG_VERSION" value="false" />
-    <option name="OPTION_DOCUMENT_TAG_DEPRECATED" value="false" />
-    <option name="OPTION_DEPRECATED_LIST" value="false" />
-    <option name="OTHER_OPTIONS" />
-    <option name="HEAP_SIZE" />
-    <option name="LOCALE" />
-    <option name="OPEN_IN_BROWSER" value="false" />
-  </component>
-  <component name="JikesSettings">
-    <option name="JIKES_PATH" value="" />
-    <option name="DEBUGGING_INFO" value="true" />
-    <option name="DEPRECATION" value="true" />
-    <option name="GENERATE_NO_WARNINGS" value="false" />
-    <option name="IS_EMACS_ERRORS_MODE" value="true" />
-    <option name="ADDITIONAL_OPTIONS_STRING" value="" />
-  </component>
-  <component name="LogConsolePreferences">
-    <option name="FILTER_ERRORS" value="false" />
-    <option name="FILTER_WARNINGS" value="false" />
-    <option name="FILTER_INFO" value="true" />
-    <option name="CUSTOM_FILTER" />
-  </component>
-  <component name="Palette2">
-    <group name="Swing">
-      <item class="com.intellij.uiDesigner.HSpacer" tooltip-text="Horizontal Spacer" icon="/com/intellij/uiDesigner/icons/hspacer.png" removable="false" auto-create-binding="false" can-attach-label="false">
-        <default-constraints vsize-policy="1" hsize-policy="6" anchor="0" fill="1" />
-      </item>
-      <item class="com.intellij.uiDesigner.VSpacer" tooltip-text="Vertical Spacer" icon="/com/intellij/uiDesigner/icons/vspacer.png" removable="false" auto-create-binding="false" can-attach-label="false">
-        <default-constraints vsize-policy="6" hsize-policy="1" anchor="0" fill="2" />
-      </item>
-      <item class="javax.swing.JPanel" icon="/com/intellij/uiDesigner/icons/panel.png" removable="false" auto-create-binding="false" can-attach-label="false">
-        <default-constraints vsize-policy="3" hsize-policy="3" anchor="0" fill="3" />
-      </item>
-      <item class="javax.swing.JScrollPane" icon="/com/intellij/uiDesigner/icons/scrollPane.png" removable="false" auto-create-binding="false" can-attach-label="true">
-        <default-constraints vsize-policy="7" hsize-policy="7" anchor="0" fill="3" />
-      </item>
-      <item class="javax.swing.JButton" icon="/com/intellij/uiDesigner/icons/button.png" removable="false" auto-create-binding="true" can-attach-label="false">
-        <default-constraints vsize-policy="0" hsize-policy="3" anchor="0" fill="1" />
-        <initial-values>
-          <property name="text" value="Button" />
-        </initial-values>
-      </item>
-      <item class="javax.swing.JRadioButton" icon="/com/intellij/uiDesigner/icons/radioButton.png" removable="false" auto-create-binding="true" can-attach-label="false">
-        <default-constraints vsize-policy="0" hsize-policy="3" anchor="8" fill="0" />
-        <initial-values>
-          <property name="text" value="RadioButton" />
-        </initial-values>
-      </item>
-      <item class="javax.swing.JCheckBox" icon="/com/intellij/uiDesigner/icons/checkBox.png" removable="false" auto-create-binding="true" can-attach-label="false">
-        <default-constraints vsize-policy="0" hsize-policy="3" anchor="8" fill="0" />
-        <initial-values>
-          <property name="text" value="CheckBox" />
-        </initial-values>
-      </item>
-      <item class="javax.swing.JLabel" icon="/com/intellij/uiDesigner/icons/label.png" removable="false" auto-create-binding="false" can-attach-label="false">
-        <default-constraints vsize-policy="0" hsize-policy="0" anchor="8" fill="0" />
-        <initial-values>
-          <property name="text" value="Label" />
-        </initial-values>
-      </item>
-      <item class="javax.swing.JTextField" icon="/com/intellij/uiDesigner/icons/textField.png" removable="false" auto-create-binding="true" can-attach-label="true">
-        <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1">
-          <preferred-size width="150" height="-1" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JPasswordField" icon="/com/intellij/uiDesigner/icons/passwordField.png" removable="false" auto-create-binding="true" can-attach-label="true">
-        <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1">
-          <preferred-size width="150" height="-1" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JFormattedTextField" icon="/com/intellij/uiDesigner/icons/formattedTextField.png" removable="false" auto-create-binding="true" can-attach-label="true">
-        <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1">
-          <preferred-size width="150" height="-1" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JTextArea" icon="/com/intellij/uiDesigner/icons/textArea.png" removable="false" auto-create-binding="true" can-attach-label="true">
-        <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
-          <preferred-size width="150" height="50" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JTextPane" icon="/com/intellij/uiDesigner/icons/textPane.png" removable="false" auto-create-binding="true" can-attach-label="true">
-        <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
-          <preferred-size width="150" height="50" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JEditorPane" icon="/com/intellij/uiDesigner/icons/editorPane.png" removable="false" auto-create-binding="true" can-attach-label="true">
-        <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
-          <preferred-size width="150" height="50" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JComboBox" icon="/com/intellij/uiDesigner/icons/comboBox.png" removable="false" auto-create-binding="true" can-attach-label="true">
-        <default-constraints vsize-policy="0" hsize-policy="2" anchor="8" fill="1" />
-      </item>
-      <item class="javax.swing.JTable" icon="/com/intellij/uiDesigner/icons/table.png" removable="false" auto-create-binding="true" can-attach-label="false">
-        <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
-          <preferred-size width="150" height="50" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JList" icon="/com/intellij/uiDesigner/icons/list.png" removable="false" auto-create-binding="true" can-attach-label="false">
-        <default-constraints vsize-policy="6" hsize-policy="2" anchor="0" fill="3">
-          <preferred-size width="150" height="50" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JTree" icon="/com/intellij/uiDesigner/icons/tree.png" removable="false" auto-create-binding="true" can-attach-label="false">
-        <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
-          <preferred-size width="150" height="50" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JTabbedPane" icon="/com/intellij/uiDesigner/icons/tabbedPane.png" removable="false" auto-create-binding="true" can-attach-label="false">
-        <default-constraints vsize-policy="3" hsize-policy="3" anchor="0" fill="3">
-          <preferred-size width="200" height="200" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JSplitPane" icon="/com/intellij/uiDesigner/icons/splitPane.png" removable="false" auto-create-binding="false" can-attach-label="false">
-        <default-constraints vsize-policy="3" hsize-policy="3" anchor="0" fill="3">
-          <preferred-size width="200" height="200" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JSpinner" icon="/com/intellij/uiDesigner/icons/spinner.png" removable="false" auto-create-binding="true" can-attach-label="true">
-        <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1" />
-      </item>
-      <item class="javax.swing.JSlider" icon="/com/intellij/uiDesigner/icons/slider.png" removable="false" auto-create-binding="true" can-attach-label="false">
-        <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1" />
-      </item>
-      <item class="javax.swing.JSeparator" icon="/com/intellij/uiDesigner/icons/separator.png" removable="false" auto-create-binding="false" can-attach-label="false">
-        <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3" />
-      </item>
-      <item class="javax.swing.JProgressBar" icon="/com/intellij/uiDesigner/icons/progressbar.png" removable="false" auto-create-binding="true" can-attach-label="false">
-        <default-constraints vsize-policy="0" hsize-policy="6" anchor="0" fill="1" />
-      </item>
-      <item class="javax.swing.JToolBar" icon="/com/intellij/uiDesigner/icons/toolbar.png" removable="false" auto-create-binding="false" can-attach-label="false">
-        <default-constraints vsize-policy="0" hsize-policy="6" anchor="0" fill="1">
-          <preferred-size width="-1" height="20" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JToolBar$Separator" icon="/com/intellij/uiDesigner/icons/toolbarSeparator.png" removable="false" auto-create-binding="false" can-attach-label="false">
-        <default-constraints vsize-policy="0" hsize-policy="0" anchor="0" fill="1" />
-      </item>
-      <item class="javax.swing.JScrollBar" icon="/com/intellij/uiDesigner/icons/scrollbar.png" removable="false" auto-create-binding="true" can-attach-label="false">
-        <default-constraints vsize-policy="6" hsize-policy="0" anchor="0" fill="2" />
-      </item>
-    </group>
-  </component>
-  <component name="ProjectModuleManager">
-    <modules>
-      <module fileurl="file://H:/Jboss/ESB/trunk/product/product.iml" filepath="H:/Jboss/ESB/trunk/product/product.iml" />
-      <module fileurl="file://$PROJECT_DIR$/soapui-client.iml" filepath="$PROJECT_DIR$/soapui-client.iml" />
-    </modules>
-  </component>
-  <component name="ProjectRootManager" version="2" assert-keyword="true" jdk-15="true" project-jdk-name="1.5" />
-  <component name="ProjectRunConfigurationManager" />
-  <component name="RmicSettings">
-    <option name="IS_EANABLED" value="false" />
-    <option name="DEBUGGING_INFO" value="true" />
-    <option name="GENERATE_NO_WARNINGS" value="false" />
-    <option name="GENERATE_IIOP_STUBS" value="false" />
-    <option name="ADDITIONAL_OPTIONS_STRING" value="" />
-  </component>
-  <component name="StarteamVcsAdapter" />
-  <component name="VssVcs" />
-  <component name="com.intellij.jsf.UserDefinedFacesConfigs">
-    <option name="USER_DEFINED_CONFIGS">
-      <value>
-        <list size="0" />
-      </value>
-    </option>
-  </component>
-  <component name="libraryTable" />
-  <component name="uidesigner-configuration">
-    <option name="INSTRUMENT_CLASSES" value="true" />
-    <option name="COPY_FORMS_RUNTIME_TO_OUTPUT" value="true" />
-    <option name="DEFAULT_LAYOUT_MANAGER" value="GridLayoutManager" />
-  </component>
-  <UsedPathMacros />
-</project>
-
+<?xml version="1.0" encoding="UTF-8"?>
+<project relativePaths="false" version="4">
+  <component name="AntConfiguration">
+    <defaultAnt bundledAnt="true" />
+  </component>
+  <component name="BuildJarProjectSettings">
+    <option name="BUILD_JARS_ON_MAKE" value="false" />
+  </component>
+  <component name="CodeStyleManager">
+    <option name="USE_DEFAULT_CODE_STYLE_SCHEME" value="true" />
+    <option name="CODE_STYLE_SCHEME" value="" />
+  </component>
+  <component name="CodeStyleProjectProfileManger">
+    <option name="PROJECT_PROFILE" />
+    <option name="USE_PROJECT_LEVEL_SETTINGS" value="false" />
+  </component>
+  <component name="CodeStyleSettingsManager">
+    <option name="PER_PROJECT_SETTINGS" />
+    <option name="USE_PER_PROJECT_SETTINGS" value="false" />
+  </component>
+  <component name="CompilerConfiguration">
+    <option name="DEFAULT_COMPILER" value="Javac" />
+    <option name="DEPLOY_AFTER_MAKE" value="0" />
+    <excludeFromCompile>
+      <file url="file://H:/Jboss/ESB/trunk/product/core/rosetta/tests/src/org/jboss/soa/esb/notification/NotifyQueuesUnitTest.java" />
+      <file url="file://H:/Jboss/ESB/trunk/product/core/rosetta/tests/src/org/jboss/soa/esb/helpers/EmailUnitTest.java" />
+    </excludeFromCompile>
+    <resourceExtensions />
+    <wildcardResourcePatterns>
+      <entry name="!?*.java" />
+    </wildcardResourcePatterns>
+  </component>
+  <component name="DependenciesAnalyzeManager">
+    <option name="myForwardDirection" value="false" />
+  </component>
+  <component name="DependencyValidationManager">
+    <option name="SKIP_IMPORT_STATEMENTS" value="false" />
+  </component>
+  <component name="EclipseCompilerSettings">
+    <option name="DEBUGGING_INFO" value="true" />
+    <option name="GENERATE_NO_WARNINGS" value="true" />
+    <option name="DEPRECATION" value="false" />
+    <option name="ADDITIONAL_OPTIONS_STRING" value="" />
+    <option name="MAXIMUM_HEAP_SIZE" value="128" />
+  </component>
+  <component name="EclipseEmbeddedCompilerSettings">
+    <option name="DEBUGGING_INFO" value="true" />
+    <option name="GENERATE_NO_WARNINGS" value="true" />
+    <option name="DEPRECATION" value="false" />
+    <option name="ADDITIONAL_OPTIONS_STRING" value="" />
+    <option name="MAXIMUM_HEAP_SIZE" value="128" />
+  </component>
+  <component name="EntryPointsManager">
+    <entry_points version="2.0" />
+  </component>
+  <component name="ExportToHTMLSettings">
+    <option name="PRINT_LINE_NUMBERS" value="false" />
+    <option name="OPEN_IN_BROWSER" value="false" />
+    <option name="OUTPUT_DIRECTORY" />
+  </component>
+  <component name="IdProvider" IDEtalkID="CC00DEA8EC72CCAE06854CBE4C29A6E5" />
+  <component name="ImportConfiguration">
+    <option name="VENDOR" />
+    <option name="RELEASE_TAG" />
+    <option name="LOG_MESSAGE" />
+    <option name="CHECKOUT_AFTER_IMPORT" value="true" />
+  </component>
+  <component name="InspectionProjectProfileManager">
+    <option name="PROJECT_PROFILE" value="Project Default" />
+    <option name="USE_PROJECT_LEVEL_SETTINGS" value="false" />
+    <scopes />
+    <profiles>
+      <profile version="1.0" is_locked="false">
+        <option name="myName" value="Project Default" />
+        <option name="myLocal" value="false" />
+      </profile>
+    </profiles>
+    <list size="0" />
+  </component>
+  <component name="IntelliJadProjectConfigComponent">
+    <config>
+      <a type="boolean">false</a>
+      <af type="boolean">false</af>
+      <always-exclude-recursively type="boolean" />
+      <b type="boolean">false</b>
+      <clear type="boolean">false</clear>
+      <clear-and-close-console-on-success type="boolean" />
+      <create-output-directory type="boolean" />
+      <d type="string" />
+      <dead type="boolean">false</dead>
+      <decompile-on-navigation type="string">Always</decompile-on-navigation>
+      <decompile-to-memory type="boolean">true</decompile-to-memory>
+      <dis type="boolean">false</dis>
+      <exclusion-table-model type="table-model" model-class="net.stevechaloner.intellijad.config.ExclusionTableModel" content-types="string,boolean,boolean" />
+      <f type="boolean">false</f>
+      <ff type="boolean">false</ff>
+      <i type="boolean">false</i>
+      <indentation type="integer">4</indentation>
+      <jad-path type="string" />
+      <l type="integer">64</l>
+      <lnc type="boolean">false</lnc>
+      <lradix type="integer">10</lradix>
+      <nl type="boolean">false</nl>
+      <nocast type="boolean">false</nocast>
+      <noclass type="boolean">false</noclass>
+      <nocode type="boolean">false</nocode>
+      <noconv type="boolean">false</noconv>
+      <noctor type="boolean">false</noctor>
+      <nodos type="boolean">false</nodos>
+      <nofd type="boolean">false</nofd>
+      <noinner type="boolean">false</noinner>
+      <nolvt type="boolean">false</nolvt>
+      <nonlb type="boolean">false</nonlb>
+      <o type="boolean">false</o>
+      <pa type="string" />
+      <pc type="string">_cls</pc>
+      <pe type="string">_ex</pe>
+      <pf type="string">_fld</pf>
+      <pl type="string">_lcl</pl>
+      <pm type="string">_mth</pm>
+      <pp type="string">_prm</pp>
+      <pv type="integer">3</pv>
+      <r type="boolean">false</r>
+      <radix type="integer">10</radix>
+      <read-only type="boolean" />
+      <reformat-style type="string">Preferred-Style</reformat-style>
+      <s type="string">java</s>
+      <safe type="boolean">false</safe>
+      <sort type="boolean" />
+      <space type="boolean">false</space>
+      <stat type="boolean">false</stat>
+      <t type="boolean">false</t>
+      <use-project-specific-settings type="boolean" />
+      <v type="boolean">false</v>
+    </config>
+  </component>
+  <component name="JUnitProjectSettings">
+    <option name="TEST_RUNNER" value="UI" />
+  </component>
+  <component name="JavacSettings">
+    <option name="DEBUGGING_INFO" value="true" />
+    <option name="GENERATE_NO_WARNINGS" value="false" />
+    <option name="DEPRECATION" value="true" />
+    <option name="ADDITIONAL_OPTIONS_STRING" value="" />
+    <option name="MAXIMUM_HEAP_SIZE" value="128" />
+  </component>
+  <component name="JavadocGenerationManager">
+    <option name="OUTPUT_DIRECTORY" />
+    <option name="OPTION_SCOPE" value="protected" />
+    <option name="OPTION_HIERARCHY" value="false" />
+    <option name="OPTION_NAVIGATOR" value="false" />
+    <option name="OPTION_INDEX" value="false" />
+    <option name="OPTION_SEPARATE_INDEX" value="false" />
+    <option name="OPTION_DOCUMENT_TAG_USE" value="false" />
+    <option name="OPTION_DOCUMENT_TAG_AUTHOR" value="false" />
+    <option name="OPTION_DOCUMENT_TAG_VERSION" value="false" />
+    <option name="OPTION_DOCUMENT_TAG_DEPRECATED" value="false" />
+    <option name="OPTION_DEPRECATED_LIST" value="false" />
+    <option name="OTHER_OPTIONS" />
+    <option name="HEAP_SIZE" />
+    <option name="LOCALE" />
+    <option name="OPEN_IN_BROWSER" value="false" />
+  </component>
+  <component name="JikesSettings">
+    <option name="JIKES_PATH" value="" />
+    <option name="DEBUGGING_INFO" value="true" />
+    <option name="DEPRECATION" value="true" />
+    <option name="GENERATE_NO_WARNINGS" value="false" />
+    <option name="IS_EMACS_ERRORS_MODE" value="true" />
+    <option name="ADDITIONAL_OPTIONS_STRING" value="" />
+  </component>
+  <component name="LogConsolePreferences">
+    <option name="FILTER_ERRORS" value="false" />
+    <option name="FILTER_WARNINGS" value="false" />
+    <option name="FILTER_INFO" value="true" />
+    <option name="CUSTOM_FILTER" />
+  </component>
+  <component name="Palette2">
+    <group name="Swing">
+      <item class="com.intellij.uiDesigner.HSpacer" tooltip-text="Horizontal Spacer" icon="/com/intellij/uiDesigner/icons/hspacer.png" removable="false" auto-create-binding="false" can-attach-label="false">
+        <default-constraints vsize-policy="1" hsize-policy="6" anchor="0" fill="1" />
+      </item>
+      <item class="com.intellij.uiDesigner.VSpacer" tooltip-text="Vertical Spacer" icon="/com/intellij/uiDesigner/icons/vspacer.png" removable="false" auto-create-binding="false" can-attach-label="false">
+        <default-constraints vsize-policy="6" hsize-policy="1" anchor="0" fill="2" />
+      </item>
+      <item class="javax.swing.JPanel" icon="/com/intellij/uiDesigner/icons/panel.png" removable="false" auto-create-binding="false" can-attach-label="false">
+        <default-constraints vsize-policy="3" hsize-policy="3" anchor="0" fill="3" />
+      </item>
+      <item class="javax.swing.JScrollPane" icon="/com/intellij/uiDesigner/icons/scrollPane.png" removable="false" auto-create-binding="false" can-attach-label="true">
+        <default-constraints vsize-policy="7" hsize-policy="7" anchor="0" fill="3" />
+      </item>
+      <item class="javax.swing.JButton" icon="/com/intellij/uiDesigner/icons/button.png" removable="false" auto-create-binding="true" can-attach-label="false">
+        <default-constraints vsize-policy="0" hsize-policy="3" anchor="0" fill="1" />
+        <initial-values>
+          <property name="text" value="Button" />
+        </initial-values>
+      </item>
+      <item class="javax.swing.JRadioButton" icon="/com/intellij/uiDesigner/icons/radioButton.png" removable="false" auto-create-binding="true" can-attach-label="false">
+        <default-constraints vsize-policy="0" hsize-policy="3" anchor="8" fill="0" />
+        <initial-values>
+          <property name="text" value="RadioButton" />
+        </initial-values>
+      </item>
+      <item class="javax.swing.JCheckBox" icon="/com/intellij/uiDesigner/icons/checkBox.png" removable="false" auto-create-binding="true" can-attach-label="false">
+        <default-constraints vsize-policy="0" hsize-policy="3" anchor="8" fill="0" />
+        <initial-values>
+          <property name="text" value="CheckBox" />
+        </initial-values>
+      </item>
+      <item class="javax.swing.JLabel" icon="/com/intellij/uiDesigner/icons/label.png" removable="false" auto-create-binding="false" can-attach-label="false">
+        <default-constraints vsize-policy="0" hsize-policy="0" anchor="8" fill="0" />
+        <initial-values>
+          <property name="text" value="Label" />
+        </initial-values>
+      </item>
+      <item class="javax.swing.JTextField" icon="/com/intellij/uiDesigner/icons/textField.png" removable="false" auto-create-binding="true" can-attach-label="true">
+        <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1">
+          <preferred-size width="150" height="-1" />
+        </default-constraints>
+      </item>
+      <item class="javax.swing.JPasswordField" icon="/com/intellij/uiDesigner/icons/passwordField.png" removable="false" auto-create-binding="true" can-attach-label="true">
+        <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1">
+          <preferred-size width="150" height="-1" />
+        </default-constraints>
+      </item>
+      <item class="javax.swing.JFormattedTextField" icon="/com/intellij/uiDesigner/icons/formattedTextField.png" removable="false" auto-create-binding="true" can-attach-label="true">
+        <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1">
+          <preferred-size width="150" height="-1" />
+        </default-constraints>
+      </item>
+      <item class="javax.swing.JTextArea" icon="/com/intellij/uiDesigner/icons/textArea.png" removable="false" auto-create-binding="true" can-attach-label="true">
+        <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
+          <preferred-size width="150" height="50" />
+        </default-constraints>
+      </item>
+      <item class="javax.swing.JTextPane" icon="/com/intellij/uiDesigner/icons/textPane.png" removable="false" auto-create-binding="true" can-attach-label="true">
+        <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
+          <preferred-size width="150" height="50" />
+        </default-constraints>
+      </item>
+      <item class="javax.swing.JEditorPane" icon="/com/intellij/uiDesigner/icons/editorPane.png" removable="false" auto-create-binding="true" can-attach-label="true">
+        <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
+          <preferred-size width="150" height="50" />
+        </default-constraints>
+      </item>
+      <item class="javax.swing.JComboBox" icon="/com/intellij/uiDesigner/icons/comboBox.png" removable="false" auto-create-binding="true" can-attach-label="true">
+        <default-constraints vsize-policy="0" hsize-policy="2" anchor="8" fill="1" />
+      </item>
+      <item class="javax.swing.JTable" icon="/com/intellij/uiDesigner/icons/table.png" removable="false" auto-create-binding="true" can-attach-label="false">
+        <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
+          <preferred-size width="150" height="50" />
+        </default-constraints>
+      </item>
+      <item class="javax.swing.JList" icon="/com/intellij/uiDesigner/icons/list.png" removable="false" auto-create-binding="true" can-attach-label="false">
+        <default-constraints vsize-policy="6" hsize-policy="2" anchor="0" fill="3">
+          <preferred-size width="150" height="50" />
+        </default-constraints>
+      </item>
+      <item class="javax.swing.JTree" icon="/com/intellij/uiDesigner/icons/tree.png" removable="false" auto-create-binding="true" can-attach-label="false">
+        <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
+          <preferred-size width="150" height="50" />
+        </default-constraints>
+      </item>
+      <item class="javax.swing.JTabbedPane" icon="/com/intellij/uiDesigner/icons/tabbedPane.png" removable="false" auto-create-binding="true" can-attach-label="false">
+        <default-constraints vsize-policy="3" hsize-policy="3" anchor="0" fill="3">
+          <preferred-size width="200" height="200" />
+        </default-constraints>
+      </item>
+      <item class="javax.swing.JSplitPane" icon="/com/intellij/uiDesigner/icons/splitPane.png" removable="false" auto-create-binding="false" can-attach-label="false">
+        <default-constraints vsize-policy="3" hsize-policy="3" anchor="0" fill="3">
+          <preferred-size width="200" height="200" />
+        </default-constraints>
+      </item>
+      <item class="javax.swing.JSpinner" icon="/com/intellij/uiDesigner/icons/spinner.png" removable="false" auto-create-binding="true" can-attach-label="true">
+        <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1" />
+      </item>
+      <item class="javax.swing.JSlider" icon="/com/intellij/uiDesigner/icons/slider.png" removable="false" auto-create-binding="true" can-attach-label="false">
+        <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1" />
+      </item>
+      <item class="javax.swing.JSeparator" icon="/com/intellij/uiDesigner/icons/separator.png" removable="false" auto-create-binding="false" can-attach-label="false">
+        <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3" />
+      </item>
+      <item class="javax.swing.JProgressBar" icon="/com/intellij/uiDesigner/icons/progressbar.png" removable="false" auto-create-binding="true" can-attach-label="false">
+        <default-constraints vsize-policy="0" hsize-policy="6" anchor="0" fill="1" />
+      </item>
+      <item class="javax.swing.JToolBar" icon="/com/intellij/uiDesigner/icons/toolbar.png" removable="false" auto-create-binding="false" can-attach-label="false">
+        <default-constraints vsize-policy="0" hsize-policy="6" anchor="0" fill="1">
+          <preferred-size width="-1" height="20" />
+        </default-constraints>
+      </item>
+      <item class="javax.swing.JToolBar$Separator" icon="/com/intellij/uiDesigner/icons/toolbarSeparator.png" removable="false" auto-create-binding="false" can-attach-label="false">
+        <default-constraints vsize-policy="0" hsize-policy="0" anchor="0" fill="1" />
+      </item>
+      <item class="javax.swing.JScrollBar" icon="/com/intellij/uiDesigner/icons/scrollbar.png" removable="false" auto-create-binding="true" can-attach-label="false">
+        <default-constraints vsize-policy="6" hsize-policy="0" anchor="0" fill="2" />
+      </item>
+    </group>
+  </component>
+  <component name="ProjectFileVersion" converted="true" />
+  <component name="ProjectModuleManager">
+    <modules>
+      <module fileurl="file://H:/Jboss/ESB/trunk/product/product.iml" filepath="H:/Jboss/ESB/trunk/product/product.iml" />
+      <module fileurl="file://$PROJECT_DIR$/soapui-client.iml" filepath="$PROJECT_DIR$/soapui-client.iml" />
+    </modules>
+  </component>
+  <component name="ProjectRootManager" version="2" assert-keyword="true" jdk-15="true" project-jdk-name="1.5" />
+  <component name="ResourceManagerContainer">
+    <option name="myResourceBundles">
+      <value>
+        <list size="0" />
+      </value>
+    </option>
+  </component>
+  <component name="RmicSettings">
+    <option name="IS_EANABLED" value="false" />
+    <option name="DEBUGGING_INFO" value="true" />
+    <option name="GENERATE_NO_WARNINGS" value="false" />
+    <option name="GENERATE_IIOP_STUBS" value="false" />
+    <option name="ADDITIONAL_OPTIONS_STRING" value="" />
+  </component>
+  <component name="VcsDirectoryMappings">
+    <mapping directory="" vcs="svn" />
+  </component>
+  <component name="WebServicesPlugin" addRequiredLibraries="true" />
+  <component name="com.intellij.jsf.UserDefinedFacesConfigs">
+    <option name="USER_DEFINED_CONFIGS">
+      <value>
+        <list size="0" />
+      </value>
+    </option>
+  </component>
+  <component name="uidesigner-configuration">
+    <option name="INSTRUMENT_CLASSES" value="true" />
+    <option name="COPY_FORMS_RUNTIME_TO_OUTPUT" value="true" />
+    <option name="DEFAULT_LAYOUT_MANAGER" value="GridLayoutManager" />
+  </component>
+</project>
+

Modified: labs/jbossesb/trunk/product/services/soapui-client/soapui-client.iws
===================================================================
--- labs/jbossesb/trunk/product/services/soapui-client/soapui-client.iws	2008-07-11 21:37:37 UTC (rev 21012)
+++ labs/jbossesb/trunk/product/services/soapui-client/soapui-client.iws	2008-07-12 10:55:04 UTC (rev 21013)
@@ -1,1139 +1,883 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4" relativePaths="false">
-  <component name="AppServerRunManager" />
-  <component name="AspectsView" />
-  <component name="BookmarkManager" />
-  <component name="ChangeBrowserSettings">
-    <option name="MAIN_SPLITTER_PROPORTION" value="0.3" />
-    <option name="MESSAGES_SPLITTER_PROPORTION" value="0.8" />
-    <option name="USE_DATE_BEFORE_FILTER" value="false" />
-    <option name="USE_DATE_AFTER_FILTER" value="false" />
-    <option name="USE_CHANGE_BEFORE_FILTER" value="false" />
-    <option name="USE_CHANGE_AFTER_FILTER" value="false" />
-    <option name="DATE_BEFORE" value="" />
-    <option name="DATE_AFTER" value="" />
-    <option name="CHANGE_BEFORE" value="" />
-    <option name="CHANGE_AFTER" value="" />
-    <option name="USE_USER_FILTER" value="false" />
-    <option name="USER" value="" />
-  </component>
-  <component name="ChangeListManager">
-    <list default="true" name="Default" comment="" />
-  </component>
-  <component name="ChangeListSynchronizer" />
-  <component name="ChangesViewManager" flattened_view="true" />
-  <component name="CheckinPanelState" />
-  <component name="Commander">
-    <leftPanel />
-    <rightPanel />
-    <splitter proportion="0.5" />
-  </component>
-  <component name="CompilerWorkspaceConfiguration">
-    <option name="COMPILE_IN_BACKGROUND" value="false" />
-    <option name="AUTO_SHOW_ERRORS_IN_EDITOR" value="true" />
-    <option name="CLOSE_MESSAGE_VIEW_IF_SUCCESS" value="true" />
-    <option name="COMPILE_DEPENDENT_FILES" value="false" />
-    <option name="CLEAR_OUTPUT_DIRECTORY" value="false" />
-    <option name="ASSERT_NOT_NULL" value="true" />
-  </component>
-  <component name="CoverageDataManager" />
-  <component name="Cvs2Configuration">
-    <option name="PRUNE_EMPTY_DIRECTORIES" value="true" />
-    <option name="MERGING_MODE" value="0" />
-    <option name="MERGE_WITH_BRANCH1_NAME" value="HEAD" />
-    <option name="MERGE_WITH_BRANCH2_NAME" value="HEAD" />
-    <option name="RESET_STICKY" value="false" />
-    <option name="CREATE_NEW_DIRECTORIES" value="true" />
-    <option name="DEFAULT_TEXT_FILE_SUBSTITUTION" value="kv" />
-    <option name="PROCESS_UNKNOWN_FILES" value="false" />
-    <option name="PROCESS_DELETED_FILES" value="false" />
-    <option name="PROCESS_IGNORED_FILES" value="false" />
-    <option name="RESERVED_EDIT" value="false" />
-    <option name="CHECKOUT_DATE_OR_REVISION_SETTINGS">
-      <value>
-        <option name="BRANCH" value="" />
-        <option name="DATE" value="" />
-        <option name="USE_BRANCH" value="false" />
-        <option name="USE_DATE" value="false" />
-      </value>
-    </option>
-    <option name="UPDATE_DATE_OR_REVISION_SETTINGS">
-      <value>
-        <option name="BRANCH" value="" />
-        <option name="DATE" value="" />
-        <option name="USE_BRANCH" value="false" />
-        <option name="USE_DATE" value="false" />
-      </value>
-    </option>
-    <option name="SHOW_CHANGES_REVISION_SETTINGS">
-      <value>
-        <option name="BRANCH" value="" />
-        <option name="DATE" value="" />
-        <option name="USE_BRANCH" value="false" />
-        <option name="USE_DATE" value="false" />
-      </value>
-    </option>
-    <option name="SHOW_OUTPUT" value="false" />
-    <option name="ADD_WATCH_INDEX" value="0" />
-    <option name="REMOVE_WATCH_INDEX" value="0" />
-    <option name="UPDATE_KEYWORD_SUBSTITUTION" />
-    <option name="MAKE_NEW_FILES_READONLY" value="false" />
-    <option name="SHOW_CORRUPTED_PROJECT_FILES" value="0" />
-    <option name="TAG_AFTER_PROJECT_COMMIT" value="false" />
-    <option name="OVERRIDE_EXISTING_TAG_FOR_PROJECT" value="true" />
-    <option name="TAG_AFTER_PROJECT_COMMIT_NAME" value="" />
-    <option name="CLEAN_COPY" value="false" />
-  </component>
-  <component name="CvsTabbedWindow" />
-  <component name="DaemonCodeAnalyzer">
-    <disable_hints />
-  </component>
-  <component name="DebuggerManager">
-    <breakpoint_any>
-      <breakpoint>
-        <option name="NOTIFY_CAUGHT" value="true" />
-        <option name="NOTIFY_UNCAUGHT" value="true" />
-        <option name="ENABLED" value="false" />
-        <option name="SUSPEND_POLICY" value="SuspendAll" />
-        <option name="LOG_ENABLED" value="false" />
-        <option name="LOG_EXPRESSION_ENABLED" value="false" />
-        <option name="COUNT_FILTER_ENABLED" value="false" />
-        <option name="COUNT_FILTER" value="0" />
-        <option name="CONDITION_ENABLED" value="false" />
-        <option name="CLASS_FILTERS_ENABLED" value="false" />
-        <option name="INSTANCE_FILTERS_ENABLED" value="false" />
-        <option name="CONDITION" value="" />
-        <option name="LOG_MESSAGE" value="" />
-      </breakpoint>
-      <breakpoint>
-        <option name="NOTIFY_CAUGHT" value="true" />
-        <option name="NOTIFY_UNCAUGHT" value="true" />
-        <option name="ENABLED" value="false" />
-        <option name="SUSPEND_POLICY" value="SuspendAll" />
-        <option name="LOG_ENABLED" value="false" />
-        <option name="LOG_EXPRESSION_ENABLED" value="false" />
-        <option name="COUNT_FILTER_ENABLED" value="false" />
-        <option name="COUNT_FILTER" value="0" />
-        <option name="CONDITION_ENABLED" value="false" />
-        <option name="CLASS_FILTERS_ENABLED" value="false" />
-        <option name="INSTANCE_FILTERS_ENABLED" value="false" />
-        <option name="CONDITION" value="" />
-        <option name="LOG_MESSAGE" value="" />
-      </breakpoint>
-    </breakpoint_any>
-    <breakpoint_rules />
-    <ui_properties />
-  </component>
-  <component name="DebuggerSettings">
-    <option name="TRACING_FILTERS_ENABLED" value="true" />
-    <option name="TOSTRING_CLASSES_ENABLED" value="false" />
-    <option name="VALUE_LOOKUP_DELAY" value="700" />
-    <option name="DEBUGGER_TRANSPORT" value="0" />
-    <option name="FORCE_CLASSIC_VM" value="true" />
-    <option name="HIDE_DEBUGGER_ON_PROCESS_TERMINATION" value="false" />
-    <option name="SKIP_SYNTHETIC_METHODS" value="true" />
-    <option name="SKIP_CONSTRUCTORS" value="false" />
-    <option name="STEP_THREAD_SUSPEND_POLICY" value="SuspendThread" />
-    <default_breakpoint_settings>
-      <option name="NOTIFY_CAUGHT" value="true" />
-      <option name="NOTIFY_UNCAUGHT" value="true" />
-      <option name="WATCH_MODIFICATION" value="true" />
-      <option name="WATCH_ACCESS" value="true" />
-      <option name="WATCH_ENTRY" value="true" />
-      <option name="WATCH_EXIT" value="true" />
-      <option name="ENABLED" value="true" />
-      <option name="SUSPEND_VM" value="true" />
-      <option name="COUNT_FILTER_ENABLED" value="false" />
-      <option name="COUNT_FILTER" value="0" />
-      <option name="CONDITION_ENABLED" value="false" />
-      <option name="CONDITION" />
-      <option name="LOG_ENABLED" value="false" />
-      <option name="LOG_EXPRESSION_ENABLED" value="false" />
-      <option name="LOG_MESSAGE" />
-      <option name="CLASS_FILTERS_ENABLED" value="false" />
-      <option name="INVERSE_CLASS_FILLTERS" value="false" />
-      <option name="SUSPEND_POLICY" value="SuspendAll" />
-    </default_breakpoint_settings>
-    <filter>
-      <option name="PATTERN" value="com.sun.*" />
-      <option name="ENABLED" value="true" />
-    </filter>
-    <filter>
-      <option name="PATTERN" value="java.*" />
-      <option name="ENABLED" value="true" />
-    </filter>
-    <filter>
-      <option name="PATTERN" value="javax.*" />
-      <option name="ENABLED" value="true" />
-    </filter>
-    <filter>
-      <option name="PATTERN" value="org.omg.*" />
-      <option name="ENABLED" value="true" />
-    </filter>
-    <filter>
-      <option name="PATTERN" value="sun.*" />
-      <option name="ENABLED" value="true" />
-    </filter>
-    <filter>
-      <option name="PATTERN" value="junit.*" />
-      <option name="ENABLED" value="true" />
-    </filter>
-  </component>
-  <component name="EjbViewSettings">
-    <EjbView showMembers="false" autoscrollToSource="false" />
-  </component>
-  <component name="ErrorTreeViewConfiguration">
-    <option name="IS_AUTOSCROLL_TO_SOURCE" value="false" />
-    <option name="HIDE_WARNINGS" value="false" />
-  </component>
-  <component name="FavoritesManager">
-    <favorites_list name="soapui-client" />
-  </component>
-  <component name="FavoritesProjectViewPane">
-    <subPane subId="soapui-client">
-      <PATH>
-        <PATH_ELEMENT>
-          <option name="myItemId" />
-          <option name="myItemType" value="com.intellij.ide.favoritesTreeView.FavoritesTreeNodeDescriptor" />
-        </PATH_ELEMENT>
-      </PATH>
-    </subPane>
-  </component>
-  <component name="FileEditorManager">
-    <leaf />
-  </component>
-  <component name="FindManager">
-    <FindUsagesManager>
-      <setting name="OPEN_NEW_TAB" value="false" />
-    </FindUsagesManager>
-  </component>
-  <component name="HierarchyBrowserManager">
-    <option name="IS_AUTOSCROLL_TO_SOURCE" value="false" />
-    <option name="SORT_ALPHABETICALLY" value="false" />
-    <option name="HIDE_CLASSES_WHERE_METHOD_NOT_IMPLEMENTED" value="false" />
-  </component>
-  <component name="InspectionManager">
-    <option name="AUTOSCROLL_TO_SOURCE" value="false" />
-    <option name="SPLITTER_PROPORTION" value="0.5" />
-    <option name="GROUP_BY_SEVERITY" value="false" />
-    <option name="FILTER_RESOLVED_ITEMS" value="true" />
-    <option name="ANALYZE_TEST_SOURCES" value="true" />
-    <option name="SHOW_DIFF_WITH_PREVIOUS_RUN" value="false" />
-    <option name="SCOPE_TYPE" value="1" />
-    <option name="CUSTOM_SCOPE_NAME" value="" />
-    <option name="SHOW_ONLY_DIFF" value="false" />
-    <option name="myCurrentProfileName" value="Default" />
-  </component>
-  <component name="J2EEProjectPane" />
-  <component name="JspContextManager" />
-  <component name="LvcsProjectConfiguration">
-    <option name="ADD_LABEL_ON_PROJECT_OPEN" value="true" />
-    <option name="ADD_LABEL_ON_PROJECT_COMPILATION" value="true" />
-    <option name="ADD_LABEL_ON_FILE_PACKAGE_COMPILATION" value="true" />
-    <option name="ADD_LABEL_ON_PROJECT_MAKE" value="true" />
-    <option name="ADD_LABEL_ON_RUNNING" value="true" />
-    <option name="ADD_LABEL_ON_DEBUGGING" value="true" />
-    <option name="ADD_LABEL_ON_UNIT_TEST_PASSED" value="true" />
-    <option name="ADD_LABEL_ON_UNIT_TEST_FAILED" value="true" />
-  </component>
-  <component name="ModuleEditorState">
-    <option name="LAST_EDITED_MODULE_NAME" />
-    <option name="LAST_EDITED_TAB_NAME" />
-  </component>
-  <component name="NamedScopeManager" />
-  <component name="PackagesPane">
-    <subPane>
-      <PATH>
-        <PATH_ELEMENT>
-          <option name="myItemId" value="soapui-client.ipr" />
-          <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageViewProjectNode" />
-        </PATH_ELEMENT>
-        <PATH_ELEMENT>
-          <option name="myItemId" value="soapui-client" />
-          <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageViewModuleNode" />
-        </PATH_ELEMENT>
-      </PATH>
-    </subPane>
-  </component>
-  <component name="PerforceChangeBrowserSettings">
-    <option name="USE_CLIENT_FILTER" value="true" />
-    <option name="CLIENT" value="" />
-  </component>
-  <component name="PerforceConfiguration">
-    <option name="PORT" value="magic:1666" />
-    <option name="USER" value="" />
-    <option name="PASSWORD" value="" />
-    <option name="CLIENT" value="" />
-    <option name="TRACE" value="false" />
-    <option name="PERFORCE_STATUS" value="true" />
-    <option name="CHANGELIST_OPTION" value="false" />
-    <option name="SYSTEMROOT" value="" />
-    <option name="P4_EXECUTABLE" value="p4" />
-    <option name="SHOW_BRANCH_HISTORY" value="false" />
-    <option name="GENERATE_COMMENT" value="false" />
-    <option name="SYNC_OPTION" value="Sync" />
-    <option name="PUT_FOCUS_INTO_COMMENT" value="false" />
-    <option name="SHOW_CHECKIN_OPTIONS" value="true" />
-    <option name="FORCE_NON_EMPTY_COMMENT" value="true" />
-    <option name="LAST_COMMIT_MESSAGE" value="" />
-    <option name="SAVE_LAST_COMMIT_MESSAGE" value="true" />
-    <option name="CHECKIN_DIALOG_SPLITTER_PROPORTION" value="0.8" />
-    <option name="OPTIMIZE_IMPORTS_BEFORE_PROJECT_COMMIT" value="false" />
-    <option name="OPTIMIZE_IMPORTS_BEFORE_FILE_COMMIT" value="false" />
-    <option name="REFORMAT_BEFORE_PROJECT_COMMIT" value="false" />
-    <option name="REFORMAT_BEFORE_FILE_COMMIT" value="false" />
-    <option name="FILE_HISTORY_DIALOG_COMMENTS_SPLITTER_PROPORTION" value="0.8" />
-    <option name="FILE_HISTORY_DIALOG_SPLITTER_PROPORTION" value="0.5" />
-  </component>
-  <component name="PerforceDirect.Settings">
-    <option name="useP4CONFIG" value="true" />
-    <option name="port" value="&lt;perforce_server&gt;:1666" />
-    <option name="client" value="" />
-    <option name="user" value="" />
-    <option name="passwd" value="" />
-    <option name="showCmds" value="false" />
-    <option name="useNativeApi" value="true" />
-    <option name="pathToExec" value="p4" />
-    <option name="useCustomPathToExec" value="false" />
-    <option name="SYNC_FORCE" value="false" />
-    <option name="SYNC_RUN_RESOLVE" value="true" />
-    <option name="REVERT_UNCHANGED_FILES" value="true" />
-    <option name="CHARSET" value="none" />
-    <option name="SHOW_BRANCHES_HISTORY" value="true" />
-    <option name="ENABLED" value="true" />
-    <option name="USE_LOGIN" value="false" />
-    <option name="LOGIN_SILENTLY" value="false" />
-    <option name="INTEGRATE_RUN_RESOLVE" value="true" />
-    <option name="INTEGRATE_REVERT_UNCHANGED" value="true" />
-    <option name="SERVER_TIMEOUT" value="20000" />
-  </component>
-  <component name="ProjectLevelVcsManager">
-    <OptionsSetting value="true" id="Add" />
-    <OptionsSetting value="true" id="Remove" />
-    <OptionsSetting value="true" id="Checkin" />
-    <OptionsSetting value="true" id="Checkout" />
-    <OptionsSetting value="true" id="Update" />
-    <OptionsSetting value="true" id="Status" />
-    <OptionsSetting value="true" id="Edit" />
-    <OptionsSetting value="true" id="Undo Check Out" />
-    <OptionsSetting value="true" id="Compare with SourceSafe Version" />
-    <OptionsSetting value="true" id="Get Latest Version" />
-    <ConfirmationsSetting value="0" id="Add" />
-    <ConfirmationsSetting value="0" id="Remove" />
-  </component>
-  <component name="ProjectPane">
-    <subPane>
-      <PATH>
-        <PATH_ELEMENT>
-          <option name="myItemId" value="soapui-client.ipr" />
-          <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
-        </PATH_ELEMENT>
-        <PATH_ELEMENT>
-          <option name="myItemId" value="soapui-client" />
-          <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" />
-        </PATH_ELEMENT>
-        <PATH_ELEMENT>
-          <option name="myItemId" value="Libraries" />
-          <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.LibraryGroupNode" />
-        </PATH_ELEMENT>
-        <PATH_ELEMENT>
-          <option name="myItemId" value="&lt; 1.5 &gt;" />
-          <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.NamedLibraryElementNode" />
-        </PATH_ELEMENT>
-      </PATH>
-      <PATH>
-        <PATH_ELEMENT>
-          <option name="myItemId" value="soapui-client.ipr" />
-          <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
-        </PATH_ELEMENT>
-        <PATH_ELEMENT>
-          <option name="myItemId" value="soapui-client" />
-          <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" />
-        </PATH_ELEMENT>
-        <PATH_ELEMENT>
-          <option name="myItemId" value="Libraries" />
-          <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.LibraryGroupNode" />
-        </PATH_ELEMENT>
-      </PATH>
-      <PATH>
-        <PATH_ELEMENT>
-          <option name="myItemId" value="soapui-client.ipr" />
-          <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
-        </PATH_ELEMENT>
-        <PATH_ELEMENT>
-          <option name="myItemId" value="soapui-client" />
-          <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" />
-        </PATH_ELEMENT>
-        <PATH_ELEMENT>
-          <option name="myItemId" value="PsiDirectory:H:\Jboss\ESB\trunk\product\services\soapui-client" />
-          <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-        </PATH_ELEMENT>
-      </PATH>
-      <PATH>
-        <PATH_ELEMENT>
-          <option name="myItemId" value="soapui-client.ipr" />
-          <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
-        </PATH_ELEMENT>
-        <PATH_ELEMENT>
-          <option name="myItemId" value="soapui-client" />
-          <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" />
-        </PATH_ELEMENT>
-        <PATH_ELEMENT>
-          <option name="myItemId" value="PsiDirectory:H:\Jboss\ESB\trunk\product\services\soapui-client" />
-          <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-        </PATH_ELEMENT>
-        <PATH_ELEMENT>
-          <option name="myItemId" value="PsiDirectory:H:\Jboss\ESB\trunk\product\services\soapui-client\src" />
-          <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-        </PATH_ELEMENT>
-        <PATH_ELEMENT>
-          <option name="myItemId" value="PsiDirectory:H:\Jboss\ESB\trunk\product\services\soapui-client\src\test" />
-          <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-        </PATH_ELEMENT>
-      </PATH>
-      <PATH>
-        <PATH_ELEMENT>
-          <option name="myItemId" value="soapui-client.ipr" />
-          <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
-        </PATH_ELEMENT>
-        <PATH_ELEMENT>
-          <option name="myItemId" value="soapui-client" />
-          <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" />
-        </PATH_ELEMENT>
-        <PATH_ELEMENT>
-          <option name="myItemId" value="PsiDirectory:H:\Jboss\ESB\trunk\product\services\soapui-client" />
-          <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-        </PATH_ELEMENT>
-        <PATH_ELEMENT>
-          <option name="myItemId" value="PsiDirectory:H:\Jboss\ESB\trunk\product\services\soapui-client\src" />
-          <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-        </PATH_ELEMENT>
-        <PATH_ELEMENT>
-          <option name="myItemId" value="PsiDirectory:H:\Jboss\ESB\trunk\product\services\soapui-client\src\test" />
-          <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-        </PATH_ELEMENT>
-        <PATH_ELEMENT>
-          <option name="myItemId" value="PsiDirectory:H:\Jboss\ESB\trunk\product\services\soapui-client\src\test\java" />
-          <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-        </PATH_ELEMENT>
-        <PATH_ELEMENT>
-          <option name="myItemId" value="PsiDirectory:H:\Jboss\ESB\trunk\product\services\soapui-client\src\test\java\org\jboss\soa\esb\services\soapui" />
-          <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-        </PATH_ELEMENT>
-      </PATH>
-      <PATH>
-        <PATH_ELEMENT>
-          <option name="myItemId" value="soapui-client.ipr" />
-          <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
-        </PATH_ELEMENT>
-        <PATH_ELEMENT>
-          <option name="myItemId" value="soapui-client" />
-          <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" />
-        </PATH_ELEMENT>
-        <PATH_ELEMENT>
-          <option name="myItemId" value="PsiDirectory:H:\Jboss\ESB\trunk\product\services\soapui-client" />
-          <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-        </PATH_ELEMENT>
-        <PATH_ELEMENT>
-          <option name="myItemId" value="PsiDirectory:H:\Jboss\ESB\trunk\product\services\soapui-client\src" />
-          <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-        </PATH_ELEMENT>
-        <PATH_ELEMENT>
-          <option name="myItemId" value="PsiDirectory:H:\Jboss\ESB\trunk\product\services\soapui-client\src\main" />
-          <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-        </PATH_ELEMENT>
-      </PATH>
-      <PATH>
-        <PATH_ELEMENT>
-          <option name="myItemId" value="soapui-client.ipr" />
-          <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
-        </PATH_ELEMENT>
-        <PATH_ELEMENT>
-          <option name="myItemId" value="soapui-client" />
-          <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" />
-        </PATH_ELEMENT>
-        <PATH_ELEMENT>
-          <option name="myItemId" value="PsiDirectory:H:\Jboss\ESB\trunk\product\services\soapui-client" />
-          <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-        </PATH_ELEMENT>
-        <PATH_ELEMENT>
-          <option name="myItemId" value="PsiDirectory:H:\Jboss\ESB\trunk\product\services\soapui-client\src" />
-          <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-        </PATH_ELEMENT>
-        <PATH_ELEMENT>
-          <option name="myItemId" value="PsiDirectory:H:\Jboss\ESB\trunk\product\services\soapui-client\src\main" />
-          <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-        </PATH_ELEMENT>
-        <PATH_ELEMENT>
-          <option name="myItemId" value="PsiDirectory:H:\Jboss\ESB\trunk\product\services\soapui-client\src\main\java" />
-          <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-        </PATH_ELEMENT>
-        <PATH_ELEMENT>
-          <option name="myItemId" value="PsiDirectory:H:\Jboss\ESB\trunk\product\services\soapui-client\src\main\java\org\jboss\soa\esb\services\soapui" />
-          <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-        </PATH_ELEMENT>
-      </PATH>
-      <PATH>
-        <PATH_ELEMENT>
-          <option name="myItemId" value="soapui-client.ipr" />
-          <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
-        </PATH_ELEMENT>
-        <PATH_ELEMENT>
-          <option name="myItemId" value="soapui-client" />
-          <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" />
-        </PATH_ELEMENT>
-        <PATH_ELEMENT>
-          <option name="myItemId" value="PsiDirectory:H:\Jboss\ESB\trunk\product\services\soapui-client" />
-          <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-        </PATH_ELEMENT>
-        <PATH_ELEMENT>
-          <option name="myItemId" value="PsiDirectory:H:\Jboss\ESB\trunk\product\services\soapui-client\src" />
-          <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-        </PATH_ELEMENT>
-      </PATH>
-      <PATH>
-        <PATH_ELEMENT>
-          <option name="myItemId" value="soapui-client.ipr" />
-          <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
-        </PATH_ELEMENT>
-        <PATH_ELEMENT>
-          <option name="myItemId" value="product" />
-          <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" />
-        </PATH_ELEMENT>
-      </PATH>
-      <PATH>
-        <PATH_ELEMENT>
-          <option name="myItemId" value="soapui-client.ipr" />
-          <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
-        </PATH_ELEMENT>
-        <PATH_ELEMENT>
-          <option name="myItemId" value="product" />
-          <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" />
-        </PATH_ELEMENT>
-        <PATH_ELEMENT>
-          <option name="myItemId" value="PsiDirectory:H:\Jboss\ESB\trunk\product" />
-          <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-        </PATH_ELEMENT>
-      </PATH>
-      <PATH>
-        <PATH_ELEMENT>
-          <option name="myItemId" value="soapui-client.ipr" />
-          <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
-        </PATH_ELEMENT>
-        <PATH_ELEMENT>
-          <option name="myItemId" value="product" />
-          <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" />
-        </PATH_ELEMENT>
-        <PATH_ELEMENT>
-          <option name="myItemId" value="PsiDirectory:H:\Jboss\ESB\trunk\product" />
-          <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-        </PATH_ELEMENT>
-        <PATH_ELEMENT>
-          <option name="myItemId" value="PsiDirectory:H:\Jboss\ESB\trunk\product\core" />
-          <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-        </PATH_ELEMENT>
-      </PATH>
-      <PATH>
-        <PATH_ELEMENT>
-          <option name="myItemId" value="soapui-client.ipr" />
-          <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
-        </PATH_ELEMENT>
-        <PATH_ELEMENT>
-          <option name="myItemId" value="product" />
-          <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" />
-        </PATH_ELEMENT>
-        <PATH_ELEMENT>
-          <option name="myItemId" value="PsiDirectory:H:\Jboss\ESB\trunk\product" />
-          <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-        </PATH_ELEMENT>
-        <PATH_ELEMENT>
-          <option name="myItemId" value="PsiDirectory:H:\Jboss\ESB\trunk\product\core" />
-          <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-        </PATH_ELEMENT>
-        <PATH_ELEMENT>
-          <option name="myItemId" value="PsiDirectory:H:\Jboss\ESB\trunk\product\core\rosetta" />
-          <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-        </PATH_ELEMENT>
-      </PATH>
-      <PATH>
-        <PATH_ELEMENT>
-          <option name="myItemId" value="soapui-client.ipr" />
-          <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
-        </PATH_ELEMENT>
-        <PATH_ELEMENT>
-          <option name="myItemId" value="product" />
-          <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" />
-        </PATH_ELEMENT>
-        <PATH_ELEMENT>
-          <option name="myItemId" value="PsiDirectory:H:\Jboss\ESB\trunk\product" />
-          <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-        </PATH_ELEMENT>
-        <PATH_ELEMENT>
-          <option name="myItemId" value="PsiDirectory:H:\Jboss\ESB\trunk\product\core" />
-          <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-        </PATH_ELEMENT>
-        <PATH_ELEMENT>
-          <option name="myItemId" value="PsiDirectory:H:\Jboss\ESB\trunk\product\core\rosetta" />
-          <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-        </PATH_ELEMENT>
-        <PATH_ELEMENT>
-          <option name="myItemId" value="PsiDirectory:H:\Jboss\ESB\trunk\product\core\rosetta\src" />
-          <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-        </PATH_ELEMENT>
-        <PATH_ELEMENT>
-          <option name="myItemId" value="PsiDirectory:H:\Jboss\ESB\trunk\product\core\rosetta\src\org\jboss" />
-          <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-        </PATH_ELEMENT>
-      </PATH>
-      <PATH>
-        <PATH_ELEMENT>
-          <option name="myItemId" value="soapui-client.ipr" />
-          <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
-        </PATH_ELEMENT>
-        <PATH_ELEMENT>
-          <option name="myItemId" value="product" />
-          <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" />
-        </PATH_ELEMENT>
-        <PATH_ELEMENT>
-          <option name="myItemId" value="PsiDirectory:H:\Jboss\ESB\trunk\product" />
-          <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-        </PATH_ELEMENT>
-        <PATH_ELEMENT>
-          <option name="myItemId" value="PsiDirectory:H:\Jboss\ESB\trunk\product\core" />
-          <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-        </PATH_ELEMENT>
-        <PATH_ELEMENT>
-          <option name="myItemId" value="PsiDirectory:H:\Jboss\ESB\trunk\product\core\rosetta" />
-          <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-        </PATH_ELEMENT>
-        <PATH_ELEMENT>
-          <option name="myItemId" value="PsiDirectory:H:\Jboss\ESB\trunk\product\core\rosetta\src" />
-          <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-        </PATH_ELEMENT>
-        <PATH_ELEMENT>
-          <option name="myItemId" value="PsiDirectory:H:\Jboss\ESB\trunk\product\core\rosetta\src\org\jboss" />
-          <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-        </PATH_ELEMENT>
-        <PATH_ELEMENT>
-          <option name="myItemId" value="PsiDirectory:H:\Jboss\ESB\trunk\product\core\rosetta\src\org\jboss\internal\soa\esb" />
-          <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-        </PATH_ELEMENT>
-      </PATH>
-      <PATH>
-        <PATH_ELEMENT>
-          <option name="myItemId" value="soapui-client.ipr" />
-          <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
-        </PATH_ELEMENT>
-        <PATH_ELEMENT>
-          <option name="myItemId" value="product" />
-          <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" />
-        </PATH_ELEMENT>
-        <PATH_ELEMENT>
-          <option name="myItemId" value="PsiDirectory:H:\Jboss\ESB\trunk\product" />
-          <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-        </PATH_ELEMENT>
-        <PATH_ELEMENT>
-          <option name="myItemId" value="PsiDirectory:H:\Jboss\ESB\trunk\product\core" />
-          <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-        </PATH_ELEMENT>
-        <PATH_ELEMENT>
-          <option name="myItemId" value="PsiDirectory:H:\Jboss\ESB\trunk\product\core\rosetta" />
-          <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-        </PATH_ELEMENT>
-        <PATH_ELEMENT>
-          <option name="myItemId" value="PsiDirectory:H:\Jboss\ESB\trunk\product\core\rosetta\src" />
-          <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-        </PATH_ELEMENT>
-        <PATH_ELEMENT>
-          <option name="myItemId" value="PsiDirectory:H:\Jboss\ESB\trunk\product\core\rosetta\src\org\jboss" />
-          <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-        </PATH_ELEMENT>
-        <PATH_ELEMENT>
-          <option name="myItemId" value="PsiDirectory:H:\Jboss\ESB\trunk\product\core\rosetta\src\org\jboss\internal\soa\esb" />
-          <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-        </PATH_ELEMENT>
-        <PATH_ELEMENT>
-          <option name="myItemId" value="PsiDirectory:H:\Jboss\ESB\trunk\product\core\rosetta\src\org\jboss\internal\soa\esb\soap" />
-          <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-        </PATH_ELEMENT>
-      </PATH>
-    </subPane>
-  </component>
-  <component name="ProjectReloadState">
-    <option name="STATE" value="0" />
-  </component>
-  <component name="ProjectView">
-    <navigator currentView="ProjectPane" proportions="0.16666667" version="1" splitterProportion="0.5">
-      <flattenPackages />
-      <showMembers />
-      <showModules />
-      <showLibraryContents />
-      <hideEmptyPackages />
-      <abbreviatePackageNames />
-      <showStructure ProjectPane="false" PackagesPane="false" Favorites="false" />
-      <autoscrollToSource />
-      <autoscrollFromSource />
-      <sortByType />
-    </navigator>
-  </component>
-  <component name="ProjectViewSettings">
-    <navigator currentView="ProjectPane" flattenPackages="false" showMembers="false" showStructure="false" autoscrollToSource="false" splitterProportion="0.5" />
-    <view id="ProjectPane">
-      <expanded_node type="directory" url="file://$PROJECT_DIR$" />
-    </view>
-    <view id="SourcepathPane" />
-    <view id="ClasspathPane" />
-  </component>
-  <component name="PropertiesComponent">
-    <property name="MemberChooser.copyJavadoc" value="false" />
-    <property name="GoToClass.includeLibraries" value="false" />
-    <property name="MemberChooser.showClasses" value="true" />
-    <property name="MemberChooser.sorted" value="false" />
-    <property name="RunManagerConfig.compileBeforeRunning" value="true" />
-    <property name="GoToFile.includeJavaFiles" value="false" />
-    <property name="GoToClass.toSaveIncludeLibraries" value="false" />
-    <property name="RunManagerConfig.showSettingsBeforeRunnig" value="true" />
-  </component>
-  <component name="ReadonlyStatusHandler">
-    <option name="SHOW_DIALOG" value="true" />
-  </component>
-  <component name="RecentsManager">
-    <key name="CopyClassDialog.RECENTS_KEY">
-      <recent name="org.jboss.soa.esb.services.soapui" />
-    </key>
-  </component>
-  <component name="RestoreUpdateTree" />
-  <component name="RunManager" selected="JUnit.SoapUIClientServiceMBeanUnitTest.test_has_collections">
-    <tempConfiguration default="false" name="SoapUIClientServiceMBeanUnitTest.test_has_collections" type="JUnit" factoryName="JUnit" enabled="false" merge="false">
-      <pattern value="org.jboss.soa.esb.services.soapui.*" />
-      <module name="soapui-client" />
-      <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
-      <option name="ALTERNATIVE_JRE_PATH" value="" />
-      <option name="PACKAGE_NAME" value="org.jboss.soa.esb.services.soapui" />
-      <option name="MAIN_CLASS_NAME" value="org.jboss.soa.esb.services.soapui.SoapUIClientServiceMBeanUnitTest" />
-      <option name="METHOD_NAME" value="test_has_collections" />
-      <option name="TEST_OBJECT" value="method" />
-      <option name="VM_PARAMETERS" value="" />
-      <option name="PARAMETERS" value="" />
-      <option name="WORKING_DIRECTORY" value="file://$PROJECT_DIR$" />
-      <option name="ADDITIONAL_CLASS_PATH" />
-      <option name="TEST_SEARCH_SCOPE">
-        <value defaultName="wholeProject" />
-      </option>
-      <RunnerSettings RunnerId="Debug">
-        <option name="DEBUG_PORT" value="4078" />
-        <option name="TRANSPORT" value="0" />
-        <option name="LOCAL" value="true" />
-      </RunnerSettings>
-      <RunnerSettings RunnerId="Profile ">
-        <option name="myExternalizedOptions" value="&#13;&#10;snapshots-dir=&#13;&#10;" />
-      </RunnerSettings>
-      <RunnerSettings RunnerId="Run" />
-      <ConfigurationWrapper RunnerId="Debug" />
-      <ConfigurationWrapper RunnerId="Run" />
-      <method>
-        <option name="Make" value="true" />
-      </method>
-    </tempConfiguration>
-    <configuration default="true" type="Remote" factoryName="Remote">
-      <option name="USE_SOCKET_TRANSPORT" value="true" />
-      <option name="SERVER_MODE" value="false" />
-      <option name="SHMEM_ADDRESS" value="javadebug" />
-      <option name="HOST" value="localhost" />
-      <option name="PORT" value="5005" />
-    </configuration>
-    <configuration default="true" type="Applet" factoryName="Applet">
-      <module name="" />
-      <option name="MAIN_CLASS_NAME" />
-      <option name="HTML_FILE_NAME" />
-      <option name="HTML_USED" value="false" />
-      <option name="WIDTH" value="400" />
-      <option name="HEIGHT" value="300" />
-      <option name="POLICY_FILE" value="$APPLICATION_HOME_DIR$/bin/appletviewer.policy" />
-      <option name="VM_PARAMETERS" />
-      <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
-      <option name="ALTERNATIVE_JRE_PATH" />
-    </configuration>
-    <configuration default="true" type="Application" factoryName="Application" enabled="false" merge="false">
-      <option name="MAIN_CLASS_NAME" />
-      <option name="VM_PARAMETERS" />
-      <option name="PROGRAM_PARAMETERS" />
-      <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" />
-      <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
-      <option name="ALTERNATIVE_JRE_PATH" />
-      <option name="ENABLE_SWING_INSPECTOR" value="false" />
-      <module name="" />
-    </configuration>
-    <configuration default="true" type="JUnit" factoryName="JUnit" enabled="false" merge="false">
-      <module name="" />
-      <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
-      <option name="ALTERNATIVE_JRE_PATH" />
-      <option name="PACKAGE_NAME" />
-      <option name="MAIN_CLASS_NAME" />
-      <option name="METHOD_NAME" />
-      <option name="TEST_OBJECT" value="class" />
-      <option name="VM_PARAMETERS" />
-      <option name="PARAMETERS" />
-      <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" />
-      <option name="ADDITIONAL_CLASS_PATH" />
-      <option name="TEST_SEARCH_SCOPE">
-        <value defaultName="wholeProject" />
-      </option>
-      <method>
-        <option name="Make" value="true" />
-      </method>
-    </configuration>
-  </component>
-  <component name="ScopeViewComponent" />
-  <component name="SelectInManager" />
-  <component name="StarteamConfiguration">
-    <option name="SERVER" value="" />
-    <option name="PORT" value="49201" />
-    <option name="USER" value="" />
-    <option name="PASSWORD" value="" />
-    <option name="PROJECT" value="" />
-    <option name="VIEW" value="" />
-    <option name="ALTERNATIVE_WORKING_PATH" value="" />
-    <option name="LOCK_ON_CHECKOUT" value="false" />
-    <option name="UNLOCK_ON_CHECKIN" value="false" />
-  </component>
-  <component name="StructuralSearchPlugin" />
-  <component name="StructureViewFactory">
-    <option name="AUTOSCROLL_MODE" value="true" />
-    <option name="AUTOSCROLL_FROM_SOURCE" value="false" />
-    <option name="ACTIVE_ACTIONS" value="" />
-  </component>
-  <component name="Struts Assistant">
-    <option name="showInputs" value="true" />
-    <option name="resources">
-      <value>
-        <option name="strutsPath" />
-        <option name="strutsHelp" />
-      </value>
-    </option>
-    <option name="selectedTaglibs" />
-    <option name="selectedTaglibs" />
-    <option name="myStrutsValidationEnabled" value="true" />
-    <option name="myTilesValidationEnabled" value="true" />
-    <option name="myValidatorValidationEnabled" value="true" />
-    <option name="myReportErrorsAsWarnings" value="true" />
-  </component>
-  <component name="SvnChangesBrowserSettings">
-    <option name="USE_AUTHOR_FIELD" value="true" />
-    <option name="AUTHOR" value="" />
-    <option name="LOCATION" value="" />
-    <option name="USE_PROJECT_SETTINGS" value="true" />
-    <option name="USE_ALTERNATE_LOCATION" value="false" />
-  </component>
-  <component name="SvnConfiguration">
-    <option name="USER" value="" />
-    <option name="PASSWORD" value="" />
-    <option name="PROCESS_UNRESOLVED" value="false" />
-    <option name="LAST_MERGED_REVISION" />
-    <option name="UPDATE_RUN_STATUS" value="false" />
-    <option name="UPDATE_RECURSIVELY" value="true" />
-    <option name="MERGE_DRY_RUN" value="false" />
-  </component>
-  <component name="TodoView" selected-index="0">
-    <todo-panel id="selected-file">
-      <are-packages-shown value="false" />
-      <are-modules-shown value="false" />
-      <flatten-packages value="false" />
-      <is-autoscroll-to-source value="true" />
-    </todo-panel>
-    <todo-panel id="all">
-      <are-packages-shown value="true" />
-      <are-modules-shown value="false" />
-      <flatten-packages value="false" />
-      <is-autoscroll-to-source value="true" />
-    </todo-panel>
-  </component>
-  <component name="ToolWindowManager">
-    <frame x="-4" y="-4" width="1288" height="998" extended-state="6" />
-    <editor active="true" />
-    <layout>
-      <window_info id="UI Designer" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" order="3" />
-      <window_info id="CVS" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" order="8" />
-      <window_info id="IDEtalk" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" order="3" />
-      <window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" order="7" />
-      <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.31925264" order="0" />
-      <window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" order="1" />
-      <window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" order="1" />
-      <window_info id="Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32983682" order="8" />
-      <window_info id="Inspection" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.4" order="6" />
-      <window_info id="Profile" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" order="8" />
-      <window_info id="Module Dependencies" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" order="3" />
-      <window_info id="Dependency Viewer" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" order="8" />
-      <window_info id="Palette" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" order="3" />
-      <window_info id="Ant Build" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" order="1" />
-      <window_info id="Changes" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" order="8" />
-      <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.46853146" order="2" />
-      <window_info id="Hierarchy" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" order="2" />
-      <window_info id="File View" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" order="3" />
-      <window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.3997669" order="4" />
-      <window_info id="Commander" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.4" order="0" />
-      <window_info id="IDEtalk Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" order="8" />
-      <window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" order="8" />
-      <window_info id="Message" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" order="0" />
-      <window_info id="Aspects" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" order="3" />
-      <window_info id="Web" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" order="2" />
-      <window_info id="EJB" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" order="3" />
-      <window_info id="Cvs" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" order="5" />
-    </layout>
-  </component>
-  <component name="VCS.FileViewConfiguration">
-    <option name="SELECTED_STATUSES" value="DEFAULT" />
-    <option name="SELECTED_COLUMNS" value="DEFAULT" />
-    <option name="SHOW_FILTERS" value="true" />
-    <option name="CUSTOMIZE_VIEW" value="true" />
-    <option name="SHOW_FILE_HISTORY_AS_TREE" value="true" />
-  </component>
-  <component name="VcsManagerConfiguration">
-    <option name="OFFER_MOVE_TO_ANOTHER_CHANGELIST_ON_PARTIAL_COMMIT" value="true" />
-    <option name="CHECK_CODE_SMELLS_BEFORE_PROJECT_COMMIT" value="true" />
-    <option name="PERFORM_UPDATE_IN_BACKGROUND" value="false" />
-    <option name="PERFORM_COMMIT_IN_BACKGROUND" value="false" />
-    <option name="PUT_FOCUS_INTO_COMMENT" value="false" />
-    <option name="FORCE_NON_EMPTY_COMMENT" value="false" />
-    <option name="LAST_COMMIT_MESSAGE" />
-    <option name="SAVE_LAST_COMMIT_MESSAGE" value="true" />
-    <option name="CHECKIN_DIALOG_SPLITTER_PROPORTION" value="0.8" />
-    <option name="OPTIMIZE_IMPORTS_BEFORE_PROJECT_COMMIT" value="false" />
-    <option name="REFORMAT_BEFORE_PROJECT_COMMIT" value="false" />
-    <option name="REFORMAT_BEFORE_FILE_COMMIT" value="false" />
-    <option name="FILE_HISTORY_DIALOG_COMMENTS_SPLITTER_PROPORTION" value="0.8" />
-    <option name="FILE_HISTORY_DIALOG_SPLITTER_PROPORTION" value="0.5" />
-    <option name="ERROR_OCCURED" value="false" />
-    <option name="ACTIVE_VCS_NAME" value="" />
-    <option name="UPDATE_GROUP_BY_PACKAGES" value="false" />
-    <option name="SHOW_FILE_HISTORY_AS_TREE" value="false" />
-    <option name="FILE_HISTORY_SPLITTER_PROPORTION" value="0.6" />
-  </component>
-  <component name="VssConfiguration">
-    <option name="CLIENT_PATH" value="" />
-    <option name="SRCSAFEINI_PATH" value="" />
-    <option name="USER_NAME" value="" />
-    <option name="PWD" value="" />
-    <option name="VSS_IS_INITIALIZED" value="true" />
-    <CheckoutOptions>
-      <option name="COMMENT" value="" />
-      <option name="DO_NOT_GET_LATEST_VERSION" value="false" />
-      <option name="REPLACE_WRITABLE" value="false" />
-      <option name="RECURSIVE" value="false" />
-    </CheckoutOptions>
-    <CheckinOptions>
-      <option name="COMMENT" value="" />
-      <option name="KEEP_CHECKED_OUT" value="false" />
-      <option name="RECURSIVE" value="false" />
-    </CheckinOptions>
-    <AddOptions>
-      <option name="COMMENT" value="" />
-      <option name="STORE_ONLY_LATEST_VERSION" value="false" />
-      <option name="CHECK_OUT_IMMEDIATELY" value="false" />
-      <option name="FILE_TYPE" value="0" />
-    </AddOptions>
-    <UndocheckoutOptions>
-      <option name="MAKE_WRITABLE" value="false" />
-      <option name="REPLACE_LOCAL_COPY" value="0" />
-      <option name="RECURSIVE" value="false" />
-    </UndocheckoutOptions>
-    <GetOptions>
-      <option name="REPLACE_WRITABLE" value="0" />
-      <option name="MAKE_WRITABLE" value="false" />
-      <option name="ANSWER_NEGATIVELY" value="false" />
-      <option name="ANSWER_POSITIVELY" value="false" />
-      <option name="RECURSIVE" value="false" />
-      <option name="VERSION" />
-    </GetOptions>
-    <VssConfigurableExcludedFilesTag />
-  </component>
-  <component name="WebViewSettings">
-    <webview flattenPackages="false" showMembers="false" autoscrollToSource="false" />
-  </component>
-  <component name="antWorkspaceConfiguration">
-    <option name="IS_AUTOSCROLL_TO_SOURCE" value="false" />
-    <option name="FILTER_TARGETS" value="false" />
-  </component>
-  <component name="com.intellij.ide.util.scopeChooser.ScopeChooserConfigurable" proportions="" version="1">
-    <option name="myLastEditedConfigurable" />
-  </component>
-  <component name="com.intellij.openapi.roots.ui.configuration.projectRoot.ProjectRootMasterDetailsConfigurable" proportions="0.16666667,0.5" version="1">
-    <option name="myPlainMode" value="false" />
-    <option name="myLastEditedConfigurable" value="soapui-client" />
-  </component>
-  <component name="com.intellij.profile.ui.ErrorOptionsConfigurable" proportions="" version="1">
-    <option name="myLastEditedConfigurable" />
-  </component>
-  <component name="editorHistoryManager">
-    <entry file="jar://H:/Jboss/ESB/trunk/product/build/jbossesb/lib/jbossesb-rosetta.jar!/org/jboss/internal/soa/esb/soap/OGNLUtils.class">
-      <provider selected="true" editor-type-id="text-editor">
-        <state line="18" column="0" selection-start="861" selection-end="861" vertical-scroll-proportion="0.5952381">
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://H:/Jboss/ESB/trunk/product/core/rosetta/src/org/jboss/soa/esb/helpers/Email.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state line="46" column="49" selection-start="1817" selection-end="1817" vertical-scroll-proportion="0.1302682">
-          <folding>
-            <marker date="1175621365359" expanded="false" signature="0:1013" placeholder="/.../" />
-            <marker date="1175621365359" expanded="true" signature="1819:2805" placeholder="/**...*/" />
-            <marker date="1175621365359" expanded="true" signature="2830:2856" placeholder="/**...*/" />
-            <marker date="1175621365359" expanded="true" signature="2921:3024" placeholder="/**...*/" />
-            <marker date="1175621365359" expanded="true" signature="3070:3140" placeholder="/**...*/" />
-            <marker date="1175621365359" expanded="true" signature="3190:3265" placeholder="/**...*/" />
-            <marker date="1175621365359" expanded="true" signature="3313:3419" placeholder="/**...*/" />
-            <marker date="1175621365359" expanded="true" signature="3471:3575" placeholder="/**...*/" />
-            <marker date="1175621365359" expanded="true" signature="3629:3758" placeholder="/**...*/" />
-            <marker date="1175621365359" expanded="true" signature="3817:3899" placeholder="/**...*/" />
-            <marker date="1175621365359" expanded="true" signature="3937:3990" placeholder="/**...*/" />
-            <marker date="1175621365359" expanded="true" signature="4030:4088" placeholder="/**...*/" />
-            <marker date="1175621365359" expanded="true" signature="4128:4216" placeholder="/**...*/" />
-            <marker date="1175621365359" expanded="true" signature="4257:4321" placeholder="/**...*/" />
-            <marker date="1175621365359" expanded="true" signature="4372:4455" placeholder="/**...*/" />
-            <marker date="1175621365359" expanded="true" signature="4497:4580" placeholder="/**...*/" />
-            <marker date="1175621365359" expanded="true" signature="4624:4666" placeholder="/**...*/" />
-            <marker date="1175621365359" expanded="true" signature="4707:5216" placeholder="/**...*/" />
-            <marker date="1175621365359" expanded="true" signature="5277:5614" placeholder="{...}" />
-            <marker date="1175621365359" expanded="true" signature="5655:5824" placeholder="/**...*/" />
-            <marker date="1175621365359" expanded="true" signature="5878:5923" placeholder="{...}" />
-            <marker date="1175621365359" expanded="true" signature="5927:6067" placeholder="/**...*/" />
-            <marker date="1175621365359" expanded="true" signature="6131:6277" placeholder="{...}" />
-            <marker date="1175621365359" expanded="true" signature="6284:6335" placeholder="/**...*/" />
-            <marker date="1175621365359" expanded="true" signature="6373:6413" placeholder="{...}" />
-            <marker date="1175621365359" expanded="true" signature="6419:6480" placeholder="/**...*/" />
-            <marker date="1175621365359" expanded="true" signature="6534:6581" placeholder="{...}" />
-            <marker date="1175621365359" expanded="true" signature="6587:6633" placeholder="/**...*/" />
-            <marker date="1175621365359" expanded="true" signature="6664:6699" placeholder="{...}" />
-            <marker date="1175621365359" expanded="true" signature="6705:6756" placeholder="/**...*/" />
-            <marker date="1175621365359" expanded="true" signature="6798:6835" placeholder="{...}" />
-            <marker date="1175621365359" expanded="true" signature="6841:6885" placeholder="/**...*/" />
-            <marker date="1175621365359" expanded="true" signature="6914:6947" placeholder="{...}" />
-            <marker date="1175621365359" expanded="true" signature="6953:7000" placeholder="/**...*/" />
-            <marker date="1175621365359" expanded="true" signature="7038:7071" placeholder="{...}" />
-            <marker date="1175621365359" expanded="true" signature="7077:7123" placeholder="/**...*/" />
-            <marker date="1175621365359" expanded="true" signature="7154:7189" placeholder="{...}" />
-            <marker date="1175621365359" expanded="true" signature="7195:7246" placeholder="/**...*/" />
-            <marker date="1175621365359" expanded="true" signature="7288:7325" placeholder="{...}" />
-            <marker date="1175621365359" expanded="true" signature="7331:7378" placeholder="/**...*/" />
-            <marker date="1175621365359" expanded="true" signature="7410:7446" placeholder="{...}" />
-            <marker date="1175621365359" expanded="true" signature="7452:7505" placeholder="/**...*/" />
-            <marker date="1175621365359" expanded="true" signature="7549:7588" placeholder="{...}" />
-            <marker date="1175621365359" expanded="true" signature="7594:7641" placeholder="/**...*/" />
-            <marker date="1175621365359" expanded="true" signature="7673:7709" placeholder="{...}" />
-            <marker date="1175621365359" expanded="true" signature="7715:7768" placeholder="/**...*/" />
-            <marker date="1175621365359" expanded="true" signature="7812:7851" placeholder="{...}" />
-            <marker date="1175621365359" expanded="true" signature="7858:8178" placeholder="/**...*/" />
-            <marker date="1175621365359" expanded="true" signature="8281:8544" placeholder="{...}" />
-            <marker date="1175621365359" expanded="true" signature="8547:8785" placeholder="/**...*/" />
-            <marker date="1175621365359" expanded="true" signature="8887:9414" placeholder="{...}" />
-            <marker date="1175621365359" expanded="true" signature="9417:9611" placeholder="/**...*/" />
-            <marker date="1175621365359" expanded="true" signature="9692:9770" placeholder="{...}" />
-            <marker date="1175621365359" expanded="true" signature="9773:10026" placeholder="/**...*/" />
-            <marker date="1175621365359" expanded="true" signature="10107:10758" placeholder="{...}" />
-            <marker date="1175621365359" expanded="true" signature="10761:10895" placeholder="/**...*/" />
-            <marker date="1175621365359" expanded="true" signature="10937:11922" placeholder="{...}" />
-            <marker date="1175621365359" expanded="true" signature="11932:12226" placeholder="/**...*/" />
-            <marker date="1175621365359" expanded="true" signature="12317:12773" placeholder="{...}" />
-            <marker date="1175621365359" expanded="true" signature="12819:13105" placeholder="{...}" />
-            <marker date="1175621365359" expanded="true" signature="12899:12941" placeholder="{...}" />
-            <marker date="1175621365359" expanded="true" signature="13006:13066" placeholder="{...}" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://H:/Jboss/ESB/trunk/product/core/rosetta/tests/src/org/jboss/internal/soa/esb/util/embedded/ftp/NoConfigFileFtpServer.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state line="0" column="0" selection-start="0" selection-end="0" vertical-scroll-proportion="0.0">
-          <folding>
-            <element signature="imports" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/test/java/org/jboss/soa/esb/services/soapui/SoapUIClientServiceMBeanUnitTest.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state line="54" column="22" selection-start="2561" selection-end="2561" vertical-scroll-proportion="0.9280397">
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/pom.xml">
-      <provider selected="true" editor-type-id="text-editor">
-        <state line="96" column="21" selection-start="3557" selection-end="3557" vertical-scroll-proportion="0.040669855">
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/build.xml">
-      <provider selected="true" editor-type-id="text-editor">
-        <state line="11" column="70" selection-start="513" selection-end="531" vertical-scroll-proportion="0.042183623">
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://H:/Jboss/ESB/trunk/product/core/rosetta/src/org/jboss/internal/soa/esb/soap/OGNLUtils.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state line="91" column="0" selection-start="3132" selection-end="3132" vertical-scroll-proportion="0.37965262">
-          <folding>
-            <element signature="imports" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/org/jboss/soa/esb/services/soapui/SoapUIClientService.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state line="147" column="41" selection-start="5776" selection-end="5776" vertical-scroll-proportion="0.84367245">
-          <folding>
-            <element signature="imports" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-  </component>
-  <component name="editorManager" />
-  <component name="ideajad">
-    <property name="annotate" value="false" />
-    <property name="annotateFully" value="false" />
-    <property name="braces" value="false" />
-    <property name="clear" value="false" />
-    <property name="confirmNavigationTriggeredDecompile" value="true" />
-    <property name="dead" value="true" />
-    <property name="defaultInitializers" value="false" />
-    <property name="dissassemblerOnly" value="false" />
-    <property name="fieldsFirst" value="true" />
-    <property name="fileExtension" value="java" />
-    <property name="fullyQualifiedNames" value="false" />
-    <property name="indentation" value="4" />
-    <property name="intRadix" value="10" />
-    <property name="lineNumbersAsComments" value="true" />
-    <property name="longRadix" value="10" />
-    <property name="maxStringLength" value="64" />
-    <property name="nocast" value="false" />
-    <property name="noclass" value="false" />
-    <property name="nocode" value="false" />
-    <property name="noconv" value="false" />
-    <property name="noctor" value="false" />
-    <property name="nodos" value="false" />
-    <property name="nofd" value="false" />
-    <property name="noinner" value="false" />
-    <property name="nolvt" value="false" />
-    <property name="nonlb" value="false" />
-    <property name="outputDirectory" value="" />
-    <property name="packFields" value="3" />
-    <property name="packImports" value="7" />
-    <property name="prefixNumericalClasses" value="_cls" />
-    <property name="prefixNumericalFields" value="_fld" />
-    <property name="prefixNumericalLocals" value="_lcl" />
-    <property name="prefixNumericalMethods" value="_mth" />
-    <property name="prefixNumericalParameters" value="_prm" />
-    <property name="prefixUnusedExceptions" value="_ex" />
-    <property name="readonly" value="false" />
-    <property name="safe" value="false" />
-    <property name="sort" value="false" />
-    <property name="spaceAfterKeyword" value="false" />
-    <property name="splitStringsAtNewline" value="false" />
-    <property name="useTabs" value="false" />
-  </component>
-</project>
-
+<?xml version="1.0" encoding="UTF-8"?>
+<project relativePaths="false" version="4">
+  <component name="CCaseConfig">
+    <option name="checkoutReserved" value="false" />
+    <option name="markExternalChangeAsUpToDate" value="true" />
+    <option name="checkInUseHijack" value="true" />
+    <option name="useUcmModel" value="true" />
+    <option name="isOffline" value="false" />
+    <option name="synchOutside" value="false" />
+    <option name="isHistoryResticted" value="true" />
+    <option name="useIdenticalSwitch" value="true" />
+    <option name="lastScr" value="" />
+    <option name="scrTextFileName" value="" />
+    <option name="lastViewType" />
+    <option name="historyRevisionsNumber" value="4" />
+  </component>
+  <component name="ChangeBrowserSettings">
+    <option name="MAIN_SPLITTER_PROPORTION" value="0.3" />
+    <option name="MESSAGES_SPLITTER_PROPORTION" value="0.8" />
+    <option name="USE_DATE_BEFORE_FILTER" value="false" />
+    <option name="USE_DATE_AFTER_FILTER" value="false" />
+    <option name="USE_CHANGE_BEFORE_FILTER" value="false" />
+    <option name="USE_CHANGE_AFTER_FILTER" value="false" />
+    <option name="DATE_BEFORE" value="" />
+    <option name="DATE_AFTER" value="" />
+    <option name="CHANGE_BEFORE" value="" />
+    <option name="CHANGE_AFTER" value="" />
+    <option name="USE_USER_FILTER" value="false" />
+    <option name="USER" value="" />
+  </component>
+  <component name="ChangeListManager">
+    <list default="true" name="Default" comment="">
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/soapui-client.iml" afterPath="$PROJECT_DIR$/soapui-client.iml" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/soapui-client.iws" afterPath="$PROJECT_DIR$/soapui-client.iws" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/soapui-client.ipr" afterPath="$PROJECT_DIR$/soapui-client.ipr" />
+      <change type="MODIFICATION" beforePath="H:/Jboss/ESB/trunk/product/etc/schemas/xml/jbossesb-1.0.1.xsd" afterPath="H:/Jboss/ESB/trunk/product/etc/schemas/xml/jbossesb-1.0.1.xsd" />
+    </list>
+  </component>
+  <component name="ChangesViewManager" flattened_view="true" show_ignored="false" />
+  <component name="Commander">
+    <leftPanel />
+    <rightPanel />
+    <splitter proportion="0.5" />
+  </component>
+  <component name="CompilerWorkspaceConfiguration">
+    <option name="COMPILE_IN_BACKGROUND" value="false" />
+    <option name="AUTO_SHOW_ERRORS_IN_EDITOR" value="true" />
+    <option name="CLOSE_MESSAGE_VIEW_IF_SUCCESS" value="true" />
+    <option name="COMPILE_DEPENDENT_FILES" value="false" />
+    <option name="CLEAR_OUTPUT_DIRECTORY" value="false" />
+    <option name="ASSERT_NOT_NULL" value="true" />
+  </component>
+  <component name="CreatePatchCommitExecutor">
+    <option name="PATCH_PATH" value="" />
+    <option name="REVERSE_PATCH" value="false" />
+  </component>
+  <component name="Cvs2Configuration">
+    <option name="PRUNE_EMPTY_DIRECTORIES" value="true" />
+    <option name="MERGING_MODE" value="0" />
+    <option name="MERGE_WITH_BRANCH1_NAME" value="HEAD" />
+    <option name="MERGE_WITH_BRANCH2_NAME" value="HEAD" />
+    <option name="RESET_STICKY" value="false" />
+    <option name="CREATE_NEW_DIRECTORIES" value="true" />
+    <option name="DEFAULT_TEXT_FILE_SUBSTITUTION" value="kv" />
+    <option name="PROCESS_UNKNOWN_FILES" value="false" />
+    <option name="PROCESS_DELETED_FILES" value="false" />
+    <option name="PROCESS_IGNORED_FILES" value="false" />
+    <option name="RESERVED_EDIT" value="false" />
+    <option name="CHECKOUT_DATE_OR_REVISION_SETTINGS">
+      <value>
+        <option name="BRANCH" value="" />
+        <option name="DATE" value="" />
+        <option name="USE_BRANCH" value="false" />
+        <option name="USE_DATE" value="false" />
+      </value>
+    </option>
+    <option name="UPDATE_DATE_OR_REVISION_SETTINGS">
+      <value>
+        <option name="BRANCH" value="" />
+        <option name="DATE" value="" />
+        <option name="USE_BRANCH" value="false" />
+        <option name="USE_DATE" value="false" />
+      </value>
+    </option>
+    <option name="SHOW_CHANGES_REVISION_SETTINGS">
+      <value>
+        <option name="BRANCH" value="" />
+        <option name="DATE" value="" />
+        <option name="USE_BRANCH" value="false" />
+        <option name="USE_DATE" value="false" />
+      </value>
+    </option>
+    <option name="SHOW_OUTPUT" value="false" />
+    <option name="ADD_WATCH_INDEX" value="0" />
+    <option name="REMOVE_WATCH_INDEX" value="0" />
+    <option name="UPDATE_KEYWORD_SUBSTITUTION" />
+    <option name="MAKE_NEW_FILES_READONLY" value="false" />
+    <option name="SHOW_CORRUPTED_PROJECT_FILES" value="0" />
+    <option name="TAG_AFTER_PROJECT_COMMIT" value="false" />
+    <option name="OVERRIDE_EXISTING_TAG_FOR_PROJECT" value="true" />
+    <option name="TAG_AFTER_PROJECT_COMMIT_NAME" value="" />
+    <option name="CLEAN_COPY" value="false" />
+  </component>
+  <component name="DaemonCodeAnalyzer">
+    <disable_hints />
+  </component>
+  <component name="DebuggerManager">
+    <breakpoint_any>
+      <breakpoint>
+        <option name="NOTIFY_CAUGHT" value="true" />
+        <option name="NOTIFY_UNCAUGHT" value="true" />
+        <option name="ENABLED" value="false" />
+        <option name="LOG_ENABLED" value="false" />
+        <option name="LOG_EXPRESSION_ENABLED" value="false" />
+        <option name="SUSPEND_POLICY" value="SuspendAll" />
+        <option name="COUNT_FILTER_ENABLED" value="false" />
+        <option name="COUNT_FILTER" value="0" />
+        <option name="CONDITION_ENABLED" value="false" />
+        <option name="CLASS_FILTERS_ENABLED" value="false" />
+        <option name="INSTANCE_FILTERS_ENABLED" value="false" />
+        <option name="CONDITION" value="" />
+        <option name="LOG_MESSAGE" value="" />
+      </breakpoint>
+      <breakpoint>
+        <option name="NOTIFY_CAUGHT" value="true" />
+        <option name="NOTIFY_UNCAUGHT" value="true" />
+        <option name="ENABLED" value="false" />
+        <option name="LOG_ENABLED" value="false" />
+        <option name="LOG_EXPRESSION_ENABLED" value="false" />
+        <option name="SUSPEND_POLICY" value="SuspendAll" />
+        <option name="COUNT_FILTER_ENABLED" value="false" />
+        <option name="COUNT_FILTER" value="0" />
+        <option name="CONDITION_ENABLED" value="false" />
+        <option name="CLASS_FILTERS_ENABLED" value="false" />
+        <option name="INSTANCE_FILTERS_ENABLED" value="false" />
+        <option name="CONDITION" value="" />
+        <option name="LOG_MESSAGE" value="" />
+      </breakpoint>
+    </breakpoint_any>
+    <breakpoint_rules />
+    <ui_properties />
+  </component>
+  <component name="DebuggerSettings">
+    <option name="TRACING_FILTERS_ENABLED" value="true" />
+    <option name="TOSTRING_CLASSES_ENABLED" value="false" />
+    <option name="VALUE_LOOKUP_DELAY" value="700" />
+    <option name="DEBUGGER_TRANSPORT" value="0" />
+    <option name="FORCE_CLASSIC_VM" value="true" />
+    <option name="HIDE_DEBUGGER_ON_PROCESS_TERMINATION" value="false" />
+    <option name="SKIP_SYNTHETIC_METHODS" value="true" />
+    <option name="SKIP_CONSTRUCTORS" value="false" />
+    <option name="STEP_THREAD_SUSPEND_POLICY" value="SuspendThread" />
+    <default_breakpoint_settings>
+      <option name="NOTIFY_CAUGHT" value="true" />
+      <option name="NOTIFY_UNCAUGHT" value="true" />
+      <option name="WATCH_MODIFICATION" value="true" />
+      <option name="WATCH_ACCESS" value="true" />
+      <option name="WATCH_ENTRY" value="true" />
+      <option name="WATCH_EXIT" value="true" />
+      <option name="ENABLED" value="true" />
+      <option name="SUSPEND_VM" value="true" />
+      <option name="COUNT_FILTER_ENABLED" value="false" />
+      <option name="COUNT_FILTER" value="0" />
+      <option name="CONDITION_ENABLED" value="false" />
+      <option name="CONDITION" />
+      <option name="LOG_ENABLED" value="false" />
+      <option name="LOG_EXPRESSION_ENABLED" value="false" />
+      <option name="LOG_MESSAGE" />
+      <option name="CLASS_FILTERS_ENABLED" value="false" />
+      <option name="INVERSE_CLASS_FILLTERS" value="false" />
+      <option name="SUSPEND_POLICY" value="SuspendAll" />
+    </default_breakpoint_settings>
+    <filter>
+      <option name="PATTERN" value="com.sun.*" />
+      <option name="ENABLED" value="true" />
+    </filter>
+    <filter>
+      <option name="PATTERN" value="java.*" />
+      <option name="ENABLED" value="true" />
+    </filter>
+    <filter>
+      <option name="PATTERN" value="javax.*" />
+      <option name="ENABLED" value="true" />
+    </filter>
+    <filter>
+      <option name="PATTERN" value="org.omg.*" />
+      <option name="ENABLED" value="true" />
+    </filter>
+    <filter>
+      <option name="PATTERN" value="sun.*" />
+      <option name="ENABLED" value="true" />
+    </filter>
+    <filter>
+      <option name="PATTERN" value="junit.*" />
+      <option name="ENABLED" value="true" />
+    </filter>
+  </component>
+  <component name="EjbViewSettings">
+    <EjbView showMembers="false" autoscrollToSource="false" />
+  </component>
+  <component name="ErrorTreeViewConfiguration">
+    <option name="IS_AUTOSCROLL_TO_SOURCE" value="false" />
+    <option name="HIDE_WARNINGS" value="false" />
+  </component>
+  <component name="FavoritesManager">
+    <favorites_list name="soapui-client" />
+  </component>
+  <component name="FavoritesProjectViewPane">
+    <subPane subId="soapui-client">
+      <PATH>
+        <PATH_ELEMENT>
+          <option name="myItemId" />
+          <option name="myItemType" value="com.intellij.ide.favoritesTreeView.FavoritesTreeNodeDescriptor" />
+        </PATH_ELEMENT>
+      </PATH>
+    </subPane>
+  </component>
+  <component name="FileEditorManager">
+    <leaf>
+      <file leaf-file-name="SoapUIClientServiceMBean.java" pinned="false" current="true" current-in-tab="true">
+        <entry file="file://$PROJECT_DIR$/src/main/java/org/jboss/soa/esb/services/soapui/SoapUIClientServiceMBean.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state line="36" column="17" selection-start="1489" selection-end="1489" vertical-scroll-proportion="0.27116564">
+              <folding />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file leaf-file-name="jboss-service.xml" pinned="false" current="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/main/resources/META-INF/jboss-service.xml">
+          <provider selected="true" editor-type-id="text-editor">
+            <state line="0" column="0" selection-start="0" selection-end="0" vertical-scroll-proportion="0.0">
+              <folding />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file leaf-file-name="SoapUIClientService.java" pinned="false" current="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/main/java/org/jboss/soa/esb/services/soapui/SoapUIClientService.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state line="56" column="79" selection-start="2325" selection-end="2325" vertical-scroll-proportion="0.20858896">
+              <folding />
+            </state>
+          </provider>
+        </entry>
+      </file>
+    </leaf>
+  </component>
+  <component name="FindManager">
+    <FindUsagesManager>
+      <setting name="OPEN_NEW_TAB" value="false" />
+    </FindUsagesManager>
+  </component>
+  <component name="HierarchyBrowserManager">
+    <option name="IS_AUTOSCROLL_TO_SOURCE" value="false" />
+    <option name="SORT_ALPHABETICALLY" value="false" />
+    <option name="HIDE_CLASSES_WHERE_METHOD_NOT_IMPLEMENTED" value="false" />
+  </component>
+  <component name="LvcsProjectConfiguration">
+    <option name="ADD_LABEL_ON_PROJECT_OPEN" value="true" />
+    <option name="ADD_LABEL_ON_PROJECT_COMPILATION" value="true" />
+    <option name="ADD_LABEL_ON_FILE_PACKAGE_COMPILATION" value="true" />
+    <option name="ADD_LABEL_ON_PROJECT_MAKE" value="true" />
+    <option name="ADD_LABEL_ON_RUNNING" value="true" />
+    <option name="ADD_LABEL_ON_DEBUGGING" value="true" />
+    <option name="ADD_LABEL_ON_UNIT_TEST_PASSED" value="true" />
+    <option name="ADD_LABEL_ON_UNIT_TEST_FAILED" value="true" />
+  </component>
+  <component name="ModuleEditorState">
+    <option name="LAST_EDITED_MODULE_NAME" />
+    <option name="LAST_EDITED_TAB_NAME" />
+  </component>
+  <component name="PackagesPane">
+    <subPane>
+      <PATH>
+        <PATH_ELEMENT>
+          <option name="myItemId" value="soapui-client.ipr" />
+          <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageViewProjectNode" />
+        </PATH_ELEMENT>
+        <PATH_ELEMENT>
+          <option name="myItemId" value="soapui-client" />
+          <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageViewModuleNode" />
+        </PATH_ELEMENT>
+      </PATH>
+    </subPane>
+  </component>
+  <component name="PerforceChangeBrowserSettings">
+    <option name="USE_CLIENT_FILTER" value="true" />
+    <option name="CLIENT" value="" />
+  </component>
+  <component name="PerforceConfiguration">
+    <option name="PORT" value="magic:1666" />
+    <option name="USER" value="" />
+    <option name="PASSWORD" value="" />
+    <option name="CLIENT" value="" />
+    <option name="TRACE" value="false" />
+    <option name="PERFORCE_STATUS" value="true" />
+    <option name="CHANGELIST_OPTION" value="false" />
+    <option name="SYSTEMROOT" value="" />
+    <option name="P4_EXECUTABLE" value="p4" />
+    <option name="SHOW_BRANCH_HISTORY" value="false" />
+    <option name="GENERATE_COMMENT" value="false" />
+    <option name="SYNC_OPTION" value="Sync" />
+    <option name="PUT_FOCUS_INTO_COMMENT" value="false" />
+    <option name="SHOW_CHECKIN_OPTIONS" value="true" />
+    <option name="FORCE_NON_EMPTY_COMMENT" value="true" />
+    <option name="LAST_COMMIT_MESSAGE" value="" />
+    <option name="SAVE_LAST_COMMIT_MESSAGE" value="true" />
+    <option name="CHECKIN_DIALOG_SPLITTER_PROPORTION" value="0.8" />
+    <option name="OPTIMIZE_IMPORTS_BEFORE_PROJECT_COMMIT" value="false" />
+    <option name="OPTIMIZE_IMPORTS_BEFORE_FILE_COMMIT" value="false" />
+    <option name="REFORMAT_BEFORE_PROJECT_COMMIT" value="false" />
+    <option name="REFORMAT_BEFORE_FILE_COMMIT" value="false" />
+    <option name="FILE_HISTORY_DIALOG_COMMENTS_SPLITTER_PROPORTION" value="0.8" />
+    <option name="FILE_HISTORY_DIALOG_SPLITTER_PROPORTION" value="0.5" />
+  </component>
+  <component name="PerforceDirect.Settings">
+    <option name="useNativeApi" value="true" />
+  </component>
+  <component name="ProjectLevelVcsManager">
+    <OptionsSetting value="true" id="Add" />
+    <OptionsSetting value="true" id="Remove" />
+    <OptionsSetting value="true" id="Checkin" />
+    <OptionsSetting value="true" id="Checkout" />
+    <OptionsSetting value="true" id="Update" />
+    <OptionsSetting value="true" id="Status" />
+    <OptionsSetting value="true" id="Edit" />
+    <OptionsSetting value="true" id="Undo Check Out" />
+    <OptionsSetting value="true" id="Compare with SourceSafe Version" />
+    <OptionsSetting value="true" id="Get Latest Version" />
+    <ConfirmationsSetting value="0" id="Add" />
+    <ConfirmationsSetting value="0" id="Remove" />
+  </component>
+  <component name="ProjectPane">
+    <subPane>
+      <PATH>
+        <PATH_ELEMENT>
+          <option name="myItemId" value="soapui-client" />
+          <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
+        </PATH_ELEMENT>
+        <PATH_ELEMENT>
+          <option name="myItemId" value="soapui-client" />
+          <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" />
+        </PATH_ELEMENT>
+      </PATH>
+      <PATH>
+        <PATH_ELEMENT>
+          <option name="myItemId" value="soapui-client" />
+          <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
+        </PATH_ELEMENT>
+        <PATH_ELEMENT>
+          <option name="myItemId" value="soapui-client" />
+          <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" />
+        </PATH_ELEMENT>
+        <PATH_ELEMENT>
+          <option name="myItemId" value="PsiDirectory:H:\Jboss\ESB\JBESB_4_2_1_GA_CP_1\product\services\soapui-client" />
+          <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+        </PATH_ELEMENT>
+      </PATH>
+      <PATH>
+        <PATH_ELEMENT>
+          <option name="myItemId" value="soapui-client" />
+          <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
+        </PATH_ELEMENT>
+        <PATH_ELEMENT>
+          <option name="myItemId" value="soapui-client" />
+          <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" />
+        </PATH_ELEMENT>
+        <PATH_ELEMENT>
+          <option name="myItemId" value="PsiDirectory:H:\Jboss\ESB\JBESB_4_2_1_GA_CP_1\product\services\soapui-client" />
+          <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+        </PATH_ELEMENT>
+        <PATH_ELEMENT>
+          <option name="myItemId" value="PsiDirectory:H:\Jboss\ESB\JBESB_4_2_1_GA_CP_1\product\services\soapui-client\src" />
+          <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+        </PATH_ELEMENT>
+      </PATH>
+      <PATH>
+        <PATH_ELEMENT>
+          <option name="myItemId" value="soapui-client" />
+          <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
+        </PATH_ELEMENT>
+        <PATH_ELEMENT>
+          <option name="myItemId" value="soapui-client" />
+          <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" />
+        </PATH_ELEMENT>
+        <PATH_ELEMENT>
+          <option name="myItemId" value="PsiDirectory:H:\Jboss\ESB\JBESB_4_2_1_GA_CP_1\product\services\soapui-client" />
+          <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+        </PATH_ELEMENT>
+        <PATH_ELEMENT>
+          <option name="myItemId" value="PsiDirectory:H:\Jboss\ESB\JBESB_4_2_1_GA_CP_1\product\services\soapui-client\src" />
+          <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+        </PATH_ELEMENT>
+        <PATH_ELEMENT>
+          <option name="myItemId" value="PsiDirectory:H:\Jboss\ESB\JBESB_4_2_1_GA_CP_1\product\services\soapui-client\src\main" />
+          <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+        </PATH_ELEMENT>
+        <PATH_ELEMENT>
+          <option name="myItemId" value="PsiDirectory:H:\Jboss\ESB\JBESB_4_2_1_GA_CP_1\product\services\soapui-client\src\main\resources" />
+          <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+        </PATH_ELEMENT>
+      </PATH>
+      <PATH>
+        <PATH_ELEMENT>
+          <option name="myItemId" value="soapui-client" />
+          <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
+        </PATH_ELEMENT>
+        <PATH_ELEMENT>
+          <option name="myItemId" value="soapui-client" />
+          <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" />
+        </PATH_ELEMENT>
+        <PATH_ELEMENT>
+          <option name="myItemId" value="PsiDirectory:H:\Jboss\ESB\JBESB_4_2_1_GA_CP_1\product\services\soapui-client" />
+          <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+        </PATH_ELEMENT>
+        <PATH_ELEMENT>
+          <option name="myItemId" value="PsiDirectory:H:\Jboss\ESB\JBESB_4_2_1_GA_CP_1\product\services\soapui-client\src" />
+          <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+        </PATH_ELEMENT>
+        <PATH_ELEMENT>
+          <option name="myItemId" value="PsiDirectory:H:\Jboss\ESB\JBESB_4_2_1_GA_CP_1\product\services\soapui-client\src\main" />
+          <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+        </PATH_ELEMENT>
+        <PATH_ELEMENT>
+          <option name="myItemId" value="PsiDirectory:H:\Jboss\ESB\JBESB_4_2_1_GA_CP_1\product\services\soapui-client\src\main\resources" />
+          <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+        </PATH_ELEMENT>
+        <PATH_ELEMENT>
+          <option name="myItemId" value="PsiDirectory:H:\Jboss\ESB\JBESB_4_2_1_GA_CP_1\product\services\soapui-client\src\main\resources\META-INF" />
+          <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+        </PATH_ELEMENT>
+      </PATH>
+      <PATH>
+        <PATH_ELEMENT>
+          <option name="myItemId" value="soapui-client" />
+          <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
+        </PATH_ELEMENT>
+        <PATH_ELEMENT>
+          <option name="myItemId" value="soapui-client" />
+          <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" />
+        </PATH_ELEMENT>
+        <PATH_ELEMENT>
+          <option name="myItemId" value="PsiDirectory:H:\Jboss\ESB\JBESB_4_2_1_GA_CP_1\product\services\soapui-client" />
+          <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+        </PATH_ELEMENT>
+        <PATH_ELEMENT>
+          <option name="myItemId" value="PsiDirectory:H:\Jboss\ESB\JBESB_4_2_1_GA_CP_1\product\services\soapui-client\src" />
+          <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+        </PATH_ELEMENT>
+        <PATH_ELEMENT>
+          <option name="myItemId" value="PsiDirectory:H:\Jboss\ESB\JBESB_4_2_1_GA_CP_1\product\services\soapui-client\src\main" />
+          <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+        </PATH_ELEMENT>
+        <PATH_ELEMENT>
+          <option name="myItemId" value="PsiDirectory:H:\Jboss\ESB\JBESB_4_2_1_GA_CP_1\product\services\soapui-client\src\main\java" />
+          <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+        </PATH_ELEMENT>
+        <PATH_ELEMENT>
+          <option name="myItemId" value="PsiDirectory:H:\Jboss\ESB\JBESB_4_2_1_GA_CP_1\product\services\soapui-client\src\main\java\org\jboss\soa\esb\services\soapui" />
+          <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+        </PATH_ELEMENT>
+      </PATH>
+      <PATH>
+        <PATH_ELEMENT>
+          <option name="myItemId" value="soapui-client" />
+          <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
+        </PATH_ELEMENT>
+      </PATH>
+    </subPane>
+  </component>
+  <component name="ProjectReloadState">
+    <option name="STATE" value="0" />
+  </component>
+  <component name="ProjectView">
+    <navigator currentView="ProjectPane" proportions="0.16666667" version="1" splitterProportion="0.5">
+      <flattenPackages />
+      <showMembers />
+      <showModules />
+      <showLibraryContents />
+      <hideEmptyPackages />
+      <abbreviatePackageNames />
+      <showStructure Favorites="false" PackagesPane="false" ProjectPane="false" />
+      <autoscrollToSource />
+      <autoscrollFromSource />
+      <sortByType />
+    </navigator>
+  </component>
+  <component name="ProjectViewSettings">
+    <navigator currentView="ProjectPane" flattenPackages="false" showMembers="false" showStructure="false" autoscrollToSource="false" splitterProportion="0.5" />
+    <view id="ProjectPane">
+      <expanded_node type="directory" url="file://$PROJECT_DIR$" />
+    </view>
+    <view id="SourcepathPane" />
+    <view id="ClasspathPane" />
+  </component>
+  <component name="PropertiesComponent">
+    <property name="GoToFile.includeJavaFiles" value="false" />
+    <property name="GoToClass.toSaveIncludeLibraries" value="false" />
+    <property name="RunManagerConfig.showSettingsBeforeRunnig" value="true" />
+    <property name="RunManagerConfig.compileBeforeRunning" value="true" />
+    <property name="TEMP_MODULE_EXPLODED_DIR_FOR_product/web/Web2" value="C:\Documents and Settings\Tom Fennelly\Local Settings\Temp\webExplodedDir25239tmp" />
+    <property name="TEMP_MODULE_EXPLODED_DIR_FOR_product/web/Web" value="C:\Documents and Settings\Tom Fennelly\Local Settings\Temp\webExplodedDir25238tmp" />
+    <property name="MemberChooser.sorted" value="false" />
+    <property name="MemberChooser.showClasses" value="true" />
+    <property name="GoToClass.includeLibraries" value="false" />
+    <property name="TEMP_MODULE_EXPLODED_DIR_FOR_product/web/Web9" value="C:\Documents and Settings\Tom Fennelly\Local Settings\Temp\webExplodedDir25240tmp" />
+    <property name="MemberChooser.copyJavadoc" value="false" />
+  </component>
+  <component name="ReadonlyStatusHandler">
+    <option name="SHOW_DIALOG" value="true" />
+  </component>
+  <component name="RecentsManager">
+    <key name="CopyClassDialog.RECENTS_KEY">
+      <recent name="org.jboss.soa.esb.services.soapui" />
+    </key>
+  </component>
+  <component name="RunManager" selected="JUnit.SoapUIClientServiceMBeanUnitTest.test_has_collections">
+    <tempConfiguration default="false" name="SoapUIClientServiceMBeanUnitTest.test_has_collections" type="JUnit" factoryName="JUnit" enabled="false" merge="false">
+      <pattern value="org.jboss.soa.esb.services.soapui.*" />
+      <module name="soapui-client" />
+      <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
+      <option name="ALTERNATIVE_JRE_PATH" value="" />
+      <option name="PACKAGE_NAME" value="org.jboss.soa.esb.services.soapui" />
+      <option name="MAIN_CLASS_NAME" value="org.jboss.soa.esb.services.soapui.SoapUIClientServiceMBeanUnitTest" />
+      <option name="METHOD_NAME" value="test_has_collections" />
+      <option name="TEST_OBJECT" value="method" />
+      <option name="VM_PARAMETERS" value="" />
+      <option name="PARAMETERS" value="" />
+      <option name="WORKING_DIRECTORY" value="file://$PROJECT_DIR$" />
+      <option name="ENV_VARIABLES" />
+      <option name="PASS_PARENT_ENVS" value="true" />
+      <option name="ADDITIONAL_CLASS_PATH" />
+      <option name="TEST_SEARCH_SCOPE">
+        <value defaultName="wholeProject" />
+      </option>
+      <RunnerSettings RunnerId="Debug">
+        <option name="DEBUG_PORT" value="4078" />
+        <option name="TRANSPORT" value="0" />
+        <option name="LOCAL" value="true" />
+      </RunnerSettings>
+      <RunnerSettings RunnerId="Profile ">
+        <option name="myExternalizedOptions" value="&#13;&#10;snapshots-dir=&#13;&#10;" />
+      </RunnerSettings>
+      <RunnerSettings RunnerId="Run" />
+      <ConfigurationWrapper RunnerId="Debug" />
+      <ConfigurationWrapper RunnerId="Run" />
+      <method>
+        <option name="Make" value="true" />
+      </method>
+    </tempConfiguration>
+    <configuration default="true" type="Remote" factoryName="Remote">
+      <option name="USE_SOCKET_TRANSPORT" value="true" />
+      <option name="SERVER_MODE" value="false" />
+      <option name="SHMEM_ADDRESS" value="javadebug" />
+      <option name="HOST" value="localhost" />
+      <option name="PORT" value="5005" />
+    </configuration>
+    <configuration default="true" type="Applet" factoryName="Applet">
+      <module name="" />
+      <option name="MAIN_CLASS_NAME" />
+      <option name="HTML_FILE_NAME" />
+      <option name="HTML_USED" value="false" />
+      <option name="WIDTH" value="400" />
+      <option name="HEIGHT" value="300" />
+      <option name="POLICY_FILE" value="$APPLICATION_HOME_DIR$/bin/appletviewer.policy" />
+      <option name="VM_PARAMETERS" />
+      <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
+      <option name="ALTERNATIVE_JRE_PATH" />
+    </configuration>
+    <configuration default="true" type="JUnit" factoryName="JUnit" enabled="false" merge="false">
+      <module name="" />
+      <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
+      <option name="ALTERNATIVE_JRE_PATH" />
+      <option name="PACKAGE_NAME" />
+      <option name="MAIN_CLASS_NAME" />
+      <option name="METHOD_NAME" />
+      <option name="TEST_OBJECT" value="class" />
+      <option name="VM_PARAMETERS" />
+      <option name="PARAMETERS" />
+      <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" />
+      <option name="ENV_VARIABLES" />
+      <option name="PASS_PARENT_ENVS" value="true" />
+      <option name="ADDITIONAL_CLASS_PATH" />
+      <option name="TEST_SEARCH_SCOPE">
+        <value defaultName="wholeProject" />
+      </option>
+      <method>
+        <option name="Make" value="true" />
+      </method>
+    </configuration>
+    <configuration default="true" type="Application" factoryName="Application" enabled="false" merge="false">
+      <option name="MAIN_CLASS_NAME" />
+      <option name="VM_PARAMETERS" />
+      <option name="PROGRAM_PARAMETERS" />
+      <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" />
+      <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
+      <option name="ALTERNATIVE_JRE_PATH" />
+      <option name="ENABLE_SWING_INSPECTOR" value="false" />
+      <option name="ENV_VARIABLES" />
+      <option name="PASS_PARENT_ENVS" value="true" />
+      <module name="" />
+    </configuration>
+    <list size="1">
+      <item index="0" class="java.lang.String" itemvalue="JUnit.SoapUIClientServiceMBeanUnitTest.test_has_collections" />
+    </list>
+  </component>
+  <component name="StarteamConfiguration">
+    <option name="SERVER" value="" />
+    <option name="PORT" value="49201" />
+    <option name="USER" value="" />
+    <option name="PASSWORD" value="" />
+    <option name="PROJECT" value="" />
+    <option name="VIEW" value="" />
+    <option name="ALTERNATIVE_WORKING_PATH" value="" />
+    <option name="LOCK_ON_CHECKOUT" value="false" />
+    <option name="UNLOCK_ON_CHECKIN" value="false" />
+  </component>
+  <component name="StructureViewFactory">
+    <option name="AUTOSCROLL_MODE" value="true" />
+    <option name="AUTOSCROLL_FROM_SOURCE" value="false" />
+    <option name="ACTIVE_ACTIONS" value="" />
+  </component>
+  <component name="Struts Assistant">
+    <option name="showInputs" value="true" />
+    <option name="resources">
+      <value>
+        <option name="strutsPath" />
+        <option name="strutsHelp" />
+      </value>
+    </option>
+    <option name="selectedTaglibs" />
+    <option name="selectedTaglibs" />
+    <option name="myStrutsValidationEnabled" value="true" />
+    <option name="myTilesValidationEnabled" value="true" />
+    <option name="myValidatorValidationEnabled" value="true" />
+    <option name="myReportErrorsAsWarnings" value="true" />
+  </component>
+  <component name="SvnChangesBrowserSettings">
+    <option name="USE_AUTHOR_FIELD" value="true" />
+    <option name="AUTHOR" value="" />
+    <option name="LOCATION" value="" />
+    <option name="USE_PROJECT_SETTINGS" value="true" />
+    <option name="USE_ALTERNATE_LOCATION" value="false" />
+  </component>
+  <component name="SvnConfiguration">
+    <option name="USER" value="" />
+    <option name="PASSWORD" value="" />
+    <option name="LAST_MERGED_REVISION" />
+    <option name="UPDATE_RUN_STATUS" value="false" />
+    <option name="UPDATE_RECURSIVELY" value="true" />
+    <option name="MERGE_DRY_RUN" value="false" />
+    <configuration useDefault="true">C:\Documents and Settings\Tom Fennelly\Application Data\Subversion</configuration>
+  </component>
+  <component name="TodoView" selected-index="0">
+    <todo-panel id="selected-file">
+      <are-packages-shown value="false" />
+      <are-modules-shown value="false" />
+      <flatten-packages value="false" />
+      <is-autoscroll-to-source value="true" />
+    </todo-panel>
+    <todo-panel id="all">
+      <are-packages-shown value="true" />
+      <are-modules-shown value="false" />
+      <flatten-packages value="false" />
+      <is-autoscroll-to-source value="true" />
+    </todo-panel>
+    <todo-panel id="default-changelist">
+      <are-packages-shown value="false" />
+      <are-modules-shown value="false" />
+      <flatten-packages value="false" />
+      <is-autoscroll-to-source value="false" />
+    </todo-panel>
+  </component>
+  <component name="ToolWindowManager">
+    <frame x="0" y="0" width="1280" height="998" extended-state="0" />
+    <editor active="true" />
+    <layout>
+      <window_info id="UI Designer" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" order="3" />
+      <window_info id="Changes" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" order="8" />
+      <window_info id="Palette" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" order="3" />
+      <window_info id="Ant Build" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" order="1" />
+      <window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" order="1" />
+      <window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.3997669" order="4" />
+      <window_info id="IDEtalk Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" order="8" />
+      <window_info id="IDEtalk" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" order="3" />
+      <window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" order="8" />
+      <window_info id="Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32983682" order="8" />
+      <window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" order="7" />
+      <window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" order="1" />
+      <window_info id="Commander" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.4" order="0" />
+      <window_info id="Maven projects" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" order="-1" />
+      <window_info id="Module Dependencies" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" order="3" />
+      <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.32134098" order="0" />
+      <window_info id="Dependency Viewer" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" order="8" />
+      <window_info id="Hierarchy" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" order="2" />
+      <window_info id="Inspection" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.4" order="6" />
+      <window_info id="Duplicates" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" order="-1" />
+      <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.46853146" order="2" />
+      <window_info id="Aspects" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" order="3" />
+      <window_info id="File View" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" order="3" />
+      <window_info id="Cvs" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" order="5" />
+      <window_info id="Message" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" order="0" />
+      <window_info id="Profile" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" order="8" />
+      <window_info id="Web" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" order="2" />
+      <window_info id="EJB" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" order="3" />
+      <window_info id="CVS" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" order="8" />
+    </layout>
+  </component>
+  <component name="VCS.FileViewConfiguration">
+    <option name="SELECTED_STATUSES" value="DEFAULT" />
+    <option name="SELECTED_COLUMNS" value="DEFAULT" />
+    <option name="SHOW_FILTERS" value="true" />
+    <option name="CUSTOMIZE_VIEW" value="true" />
+    <option name="SHOW_FILE_HISTORY_AS_TREE" value="true" />
+  </component>
+  <component name="VcsManagerConfiguration">
+    <option name="OFFER_MOVE_TO_ANOTHER_CHANGELIST_ON_PARTIAL_COMMIT" value="true" />
+    <option name="CHECK_CODE_SMELLS_BEFORE_PROJECT_COMMIT" value="true" />
+    <option name="PERFORM_UPDATE_IN_BACKGROUND" value="false" />
+    <option name="PERFORM_COMMIT_IN_BACKGROUND" value="false" />
+    <option name="PERFORM_EDIT_IN_BACKGROUND" value="true" />
+    <option name="PERFORM_ADD_REMOVE_IN_BACKGROUND" value="true" />
+    <option name="FORCE_NON_EMPTY_COMMENT" value="false" />
+    <option name="LAST_COMMIT_MESSAGE" />
+    <option name="OPTIMIZE_IMPORTS_BEFORE_PROJECT_COMMIT" value="false" />
+    <option name="REFORMAT_BEFORE_PROJECT_COMMIT" value="false" />
+    <option name="REFORMAT_BEFORE_FILE_COMMIT" value="false" />
+    <option name="FILE_HISTORY_DIALOG_COMMENTS_SPLITTER_PROPORTION" value="0.8" />
+    <option name="FILE_HISTORY_DIALOG_SPLITTER_PROPORTION" value="0.5" />
+    <option name="ACTIVE_VCS_NAME" value="" />
+    <option name="UPDATE_GROUP_BY_PACKAGES" value="false" />
+    <option name="UPDATE_GROUP_BY_CHANGELIST" value="false" />
+    <option name="SHOW_FILE_HISTORY_AS_TREE" value="false" />
+    <option name="FILE_HISTORY_SPLITTER_PROPORTION" value="0.6" />
+  </component>
+  <component name="VssConfiguration">
+    <option name="CLIENT_PATH" value="" />
+    <option name="SRCSAFEINI_PATH" value="" />
+    <option name="USER_NAME" value="" />
+    <option name="PWD" value="" />
+    <CheckoutOptions>
+      <option name="COMMENT" value="" />
+      <option name="DO_NOT_GET_LATEST_VERSION" value="false" />
+      <option name="REPLACE_WRITABLE" value="false" />
+      <option name="RECURSIVE" value="false" />
+    </CheckoutOptions>
+    <CheckinOptions>
+      <option name="COMMENT" value="" />
+      <option name="KEEP_CHECKED_OUT" value="false" />
+      <option name="RECURSIVE" value="false" />
+    </CheckinOptions>
+    <AddOptions>
+      <option name="STORE_ONLY_LATEST_VERSION" value="false" />
+      <option name="CHECK_OUT_IMMEDIATELY" value="false" />
+    </AddOptions>
+    <UndocheckoutOptions>
+      <option name="MAKE_WRITABLE" value="false" />
+      <option name="REPLACE_LOCAL_COPY" value="0" />
+      <option name="RECURSIVE" value="false" />
+    </UndocheckoutOptions>
+    <GetOptions>
+      <option name="REPLACE_WRITABLE" value="0" />
+      <option name="MAKE_WRITABLE" value="false" />
+      <option name="ANSWER_NEGATIVELY" value="false" />
+      <option name="ANSWER_POSITIVELY" value="false" />
+      <option name="RECURSIVE" value="false" />
+      <option name="VERSION" />
+    </GetOptions>
+  </component>
+  <component name="WebViewSettings">
+    <webview flattenPackages="false" showMembers="false" autoscrollToSource="false" />
+  </component>
+  <component name="antWorkspaceConfiguration">
+    <option name="IS_AUTOSCROLL_TO_SOURCE" value="false" />
+    <option name="FILTER_TARGETS" value="false" />
+  </component>
+  <component name="com.intellij.ide.util.scopeChooser.ScopeChooserConfigurable" proportions="" version="1">
+    <option name="myLastEditedConfigurable" />
+  </component>
+  <component name="com.intellij.openapi.roots.ui.configuration.projectRoot.ProjectRootMasterDetailsConfigurable" proportions="0.16666667,0.5" version="1">
+    <option name="myPlainMode" value="false" />
+    <option name="myLastEditedConfigurable" value="soapui-client" />
+  </component>
+  <component name="com.intellij.profile.ui.ErrorOptionsConfigurable" proportions="" version="1">
+    <option name="myLastEditedConfigurable" />
+  </component>
+  <component name="editorHistoryManager">
+    <entry file="jar://H:/Jboss/ESB/trunk/product/build/jbossesb/lib/jbossesb-rosetta.jar!/org/jboss/internal/soa/esb/soap/OGNLUtils.class">
+      <provider selected="true" editor-type-id="text-editor">
+        <state line="18" column="0" selection-start="861" selection-end="861" vertical-scroll-proportion="0.5952381">
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/test/java/org/jboss/soa/esb/services/soapui/SoapUIClientServiceMBeanUnitTest.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state line="54" column="22" selection-start="2561" selection-end="2561" vertical-scroll-proportion="0.9280397">
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/build.xml">
+      <provider selected="true" editor-type-id="text-editor">
+        <state line="11" column="70" selection-start="513" selection-end="531" vertical-scroll-proportion="0.042183623">
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/pom.xml">
+      <provider selected="true" editor-type-id="text-editor">
+        <state line="46" column="18" selection-start="1628" selection-end="1628" vertical-scroll-proportion="0.26576018">
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/org/jboss/soa/esb/services/soapui/SoapUIClientService.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state line="56" column="79" selection-start="2325" selection-end="2325" vertical-scroll-proportion="0.20858896">
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/resources/META-INF/jboss-service.xml">
+      <provider selected="true" editor-type-id="text-editor">
+        <state line="0" column="0" selection-start="0" selection-end="0" vertical-scroll-proportion="0.0">
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/org/jboss/soa/esb/services/soapui/SoapUIClientServiceMBean.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state line="36" column="17" selection-start="1489" selection-end="1489" vertical-scroll-proportion="0.27116564">
+          <folding />
+        </state>
+      </provider>
+    </entry>
+  </component>
+  <component name="ideajad">
+    <property name="annotate" value="false" />
+    <property name="annotateFully" value="false" />
+    <property name="braces" value="false" />
+    <property name="clear" value="false" />
+    <property name="confirmNavigationTriggeredDecompile" value="true" />
+    <property name="dead" value="true" />
+    <property name="defaultInitializers" value="false" />
+    <property name="dissassemblerOnly" value="false" />
+    <property name="fieldsFirst" value="true" />
+    <property name="fileExtension" value="java" />
+    <property name="fullyQualifiedNames" value="false" />
+    <property name="indentation" value="4" />
+    <property name="intRadix" value="10" />
+    <property name="lineNumbersAsComments" value="true" />
+    <property name="longRadix" value="10" />
+    <property name="maxStringLength" value="64" />
+    <property name="nocast" value="false" />
+    <property name="noclass" value="false" />
+    <property name="nocode" value="false" />
+    <property name="noconv" value="false" />
+    <property name="noctor" value="false" />
+    <property name="nodos" value="false" />
+    <property name="nofd" value="false" />
+    <property name="noinner" value="false" />
+    <property name="nolvt" value="false" />
+    <property name="nonlb" value="false" />
+    <property name="outputDirectory" value="" />
+    <property name="packFields" value="3" />
+    <property name="packImports" value="7" />
+    <property name="prefixNumericalClasses" value="_cls" />
+    <property name="prefixNumericalFields" value="_fld" />
+    <property name="prefixNumericalLocals" value="_lcl" />
+    <property name="prefixNumericalMethods" value="_mth" />
+    <property name="prefixNumericalParameters" value="_prm" />
+    <property name="prefixUnusedExceptions" value="_ex" />
+    <property name="readonly" value="false" />
+    <property name="safe" value="false" />
+    <property name="sort" value="false" />
+    <property name="spaceAfterKeyword" value="false" />
+    <property name="splitStringsAtNewline" value="false" />
+    <property name="useTabs" value="false" />
+  </component>
+</project>
+

Modified: labs/jbossesb/trunk/product/services/soapui-client/src/test/java/org/jboss/soa/esb/services/soapui/JBESB_1713_SoapUIClientServiceMBeanUnitTest.java
===================================================================
--- labs/jbossesb/trunk/product/services/soapui-client/src/test/java/org/jboss/soa/esb/services/soapui/JBESB_1713_SoapUIClientServiceMBeanUnitTest.java	2008-07-11 21:37:37 UTC (rev 21012)
+++ labs/jbossesb/trunk/product/services/soapui-client/src/test/java/org/jboss/soa/esb/services/soapui/JBESB_1713_SoapUIClientServiceMBeanUnitTest.java	2008-07-12 10:55:04 UTC (rev 21013)
@@ -160,4 +160,4 @@
 
         return stringBuf;
     }
-}
\ No newline at end of file
+}

Modified: labs/jbossesb/trunk/product/services/soapui-client/src/test/java/org/jboss/soa/esb/services/soapui/orderprocessing/expected_01.xml
===================================================================
--- labs/jbossesb/trunk/product/services/soapui-client/src/test/java/org/jboss/soa/esb/services/soapui/orderprocessing/expected_01.xml	2008-07-11 21:37:37 UTC (rev 21012)
+++ labs/jbossesb/trunk/product/services/soapui-client/src/test/java/org/jboss/soa/esb/services/soapui/orderprocessing/expected_01.xml	2008-07-12 10:55:04 UTC (rev 21013)
@@ -34,4 +34,4 @@
          </order>
       </end:processOrder>
    </soapenv:Body>
-</soapenv:Envelope>
\ No newline at end of file
+</soapenv:Envelope>

Modified: labs/jbossesb/trunk/product/tools/console/management/build.xml
===================================================================
--- labs/jbossesb/trunk/product/tools/console/management/build.xml	2008-07-11 21:37:37 UTC (rev 21012)
+++ labs/jbossesb/trunk/product/tools/console/management/build.xml	2008-07-12 10:55:04 UTC (rev 21013)
@@ -21,6 +21,10 @@
 			value="${esb.root.dir}/server/default/deploy/jbossesb.sar/lib">
 			<available type="dir" file="${esb.root.dir}/server/default/deploy/jbossesb.sar/lib"/>
 		</condition>	
+                <condition property="esb.lib.dir"
+                         value="${esb.root.dir}/server/all/deploy/jbossesb.sar/lib">
+                         <available type="dir" file="${esb.root.dir}/server/all/deploy/jbossesb.sar/lib"/>
+                </condition> 
 		<condition property="esb.lib.dir"
                          value="${esb.root.dir}/server/all/deploy/jbossesb.sar/lib">
                          <available type="dir" file="${esb.root.dir}/server/all/deploy/jbossesb.sar/lib"/>

Modified: labs/jbossesb/trunk/product/tools/console/management-esb/src/main/resources/oracle/create_database.sql
===================================================================
--- labs/jbossesb/trunk/product/tools/console/management-esb/src/main/resources/oracle/create_database.sql	2008-07-11 21:37:37 UTC (rev 21012)
+++ labs/jbossesb/trunk/product/tools/console/management-esb/src/main/resources/oracle/create_database.sql	2008-07-12 10:55:04 UTC (rev 21013)
@@ -8,8 +8,8 @@
     
     create table JMXATTRIBUTE (
         statid number(19,0),
-        objectname varchar2(255 char),
-        attribute varchar2(255 char),
+        objectname varchar2(2000 char),
+        attribute varchar2(2000 char),
         primary key (statid)
     );
 
@@ -24,28 +24,28 @@
         primary key (id)
     );
 	
-	CREATE TABLE JMXOPERATION (
-		OPID number(19,0),
-		OBJECTNAME VARCHAR2(255 char) NOT NULL,
-		OPERATION VARCHAR2(255 char) NOT NULL,
-		DESCRIPTION VARCHAR2(255) NOT NULL,
-		RETURNTYPE VARCHAR2(255 char) NOT NULL,
-		SERVERNAME VARCHAR2(255 char) NOT NULL,
-		ACTIVEFLAG NUMBER(1) NOT NULL,
-		primary key (opid)
-	);
+    CREATE TABLE JMXOPERATION (
+	OPID number(19,0),
+	OBJECTNAME VARCHAR2(2000 char) NOT NULL,
+	OPERATION VARCHAR2(255 char) NOT NULL,
+	DESCRIPTION VARCHAR2(2000) NOT NULL,
+	RETURNTYPE VARCHAR2(255 char) NOT NULL,
+	SERVERNAME VARCHAR2(255 char) NOT NULL,
+	ACTIVEFLAG NUMBER(1) NOT NULL,
+	primary key (opid)
+    );
 	
-	CREATE TABLE JMXOPERATIONRESULT (
-		ID number(19,0),
-		OPID number(19,0),
-		SERVER VARCHAR(255),
-		STATDATE TIMESTAMP,
-		RESULT VARCHAR(255),
-		primary key(id)
-	);
+    CREATE TABLE JMXOPERATIONRESULT (
+	ID number(19,0),
+	OPID number(19,0),
+	SERVER VARCHAR(255),
+	STATDATE TIMESTAMP,
+	RESULT VARCHAR(255),
+	primary key(id)
+    );
 
     CREATE SEQUENCE SEQ_JMX_ATTRIBUTE START WITH 1 MINVALUE 1 INCREMENT BY 1 NOCYCLE;
     CREATE SEQUENCE SEQ_JMX_DATA START WITH 1 MINVALUE 1 INCREMENT BY 1 NOCYCLE;
     CREATE SEQUENCE SEQ_JMX_PATTERN START WITH 1 MINVALUE 1 INCREMENT BY 1 NOCYCLE;
-	CREATE SEQUENCE SEQ_JMX_OPERATION START WITH 1 MINVALUE 1 INCREMENT BY 1 NOCYCLE;
-	CREATE SEQUENCE SEQ_JMX_OPERATION_RESULT START WITH 1 MINVALUE 1 INCREMENT BY 1 NOCYCLE;
+    CREATE SEQUENCE SEQ_JMX_OPERATION START WITH 1 MINVALUE 1 INCREMENT BY 1 NOCYCLE;
+    CREATE SEQUENCE SEQ_JMX_OPERATION_RESULT START WITH 1 MINVALUE 1 INCREMENT BY 1 NOCYCLE;




More information about the jboss-svn-commits mailing list