[jboss-svn-commits] JBL Code SVN: r19343 - in labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product: rosetta/src/org/jboss/soa/esb/notification and 16 other directories.

jboss-svn-commits at lists.jboss.org jboss-svn-commits at lists.jboss.org
Mon Mar 31 11:14:12 EDT 2008


Author: kevin.conner at jboss.com
Date: 2008-03-31 11:14:12 -0400 (Mon, 31 Mar 2008)
New Revision: 19343

Modified:
   labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/rosetta/src/org/jboss/internal/soa/esb/util/EdtFtpImpl.java
   labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/rosetta/src/org/jboss/soa/esb/notification/NotifyFTP.java
   labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/rosetta/src/org/jboss/soa/esb/schedule/ScheduleProvider.java
   labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/helloworld/jboss-esb.xml
   labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/helloworld_db_registration/jboss-esb.xml
   labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/helloworld_hibernate_action/jboss-esb.xml
   labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/helloworld_sql_action/jboss-esb.xml
   labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/helloworld_topic_notifier/jboss-esb.xml
   labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/simple_cbr/jboss-esb.xml
   labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/spring_aop/jboss-esb.xml
   labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/spring_helloworld/jboss-esb.xml
   labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/spring_jpetstore/jboss-esb.xml
   labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/transform_CSV2XML/jboss-esb.xml
   labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/transform_EDI2XML_Groovy_XSLT/jboss-esb.xml
   labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/transform_XML2POJO2/jboss-esb.xml
   labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/transform_XML2XML_date_manipulation/jboss-esb.xml
   labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/transform_XML2XML_simple/jboss-esb.xml
   labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/services/soap/src/main/java/org/jboss/soa/esb/actions/soap/SOAPClient.java
Log:
Merged IR2

Modified: labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/rosetta/src/org/jboss/internal/soa/esb/util/EdtFtpImpl.java
===================================================================
--- labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/rosetta/src/org/jboss/internal/soa/esb/util/EdtFtpImpl.java	2008-03-31 15:02:49 UTC (rev 19342)
+++ labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/rosetta/src/org/jboss/internal/soa/esb/util/EdtFtpImpl.java	2008-03-31 15:14:12 UTC (rev 19343)
@@ -444,8 +444,17 @@
 							"Can't connect to FTP server");
 				m_oConn.user(m_sUser);
 				m_oConn.password(m_sPasswd);
-				m_oConn
-						.setConnectMode((m_bPassive) ? FTPConnectMode.PASV : FTPConnectMode.ACTIVE);
+				
+				/*
+				 * It's ok to set the passive/active mode here as this is for
+				 * the data connection. The previous call to connect() was for
+				 * the command connection and is not affected by this setting.
+				 * 
+				 * http://www.slacksite.com/other/ftp.html
+				 */
+				
+				m_oConn.setConnectMode((m_bPassive) ? FTPConnectMode.PASV : FTPConnectMode.ACTIVE);
+				
 				m_oConn.setType(m_oXferType);
 				
 				if (_timeout > 0)

Modified: labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/rosetta/src/org/jboss/soa/esb/notification/NotifyFTP.java
===================================================================
--- labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/rosetta/src/org/jboss/soa/esb/notification/NotifyFTP.java	2008-03-31 15:02:49 UTC (rev 19342)
+++ labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/rosetta/src/org/jboss/soa/esb/notification/NotifyFTP.java	2008-03-31 15:14:12 UTC (rev 19343)
@@ -29,6 +29,7 @@
 
 import org.apache.commons.io.IOUtils;
 import org.apache.commons.lang.StringUtils;
+import org.jboss.soa.esb.ConfigurationException;
 import org.jboss.soa.esb.addressing.eprs.FTPEpr;
 import org.jboss.soa.esb.helpers.ConfigTree;
 import org.jboss.soa.esb.message.Message;
@@ -37,6 +38,7 @@
 import org.jboss.soa.esb.util.RemoteFileSystem;
 import org.jboss.soa.esb.util.RemoteFileSystemException;
 import org.jboss.soa.esb.util.RemoteFileSystemFactory;
+import org.jboss.soa.esb.listeners.ListenerUtil;
 import org.jboss.soa.esb.listeners.message.MessageDeliverException;
 
 /**
@@ -161,7 +163,7 @@
 	}
 
 	/**
-	 * Builds an FTP EPR from the configutation data.
+	 * Builds an FTP EPR from the configuration data.
 	 * 
 	 * @return FTPEpr
 	 */
@@ -170,10 +172,16 @@
 			ConfigTree ftpConfig = getFtpConfig();
 			String url = ftpConfig.getAttribute(FTPEpr.URL_TAG);
 			try {
-				epr = new FTPEpr(url);
-			} catch (URISyntaxException e) {
-				throw new NotificationException(e);
+			    epr = (FTPEpr) ListenerUtil.fileEprFromElement(ftpConfig);
 			}
+			catch (final ConfigurationException ex)
+			{
+			    throw new NotificationException(ex);
+			}
+			catch (final ClassCastException ex)
+			{
+			    throw new NotificationException("Not an FTPEpr!", ex);
+			}
 		}
 		return epr;
 	}

Modified: labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/rosetta/src/org/jboss/soa/esb/schedule/ScheduleProvider.java
===================================================================
--- labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/rosetta/src/org/jboss/soa/esb/schedule/ScheduleProvider.java	2008-03-31 15:02:49 UTC (rev 19342)
+++ labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/rosetta/src/org/jboss/soa/esb/schedule/ScheduleProvider.java	2008-03-31 15:14:12 UTC (rev 19343)
@@ -220,6 +220,10 @@
                 JobExecutionException jobException = new JobExecutionException("Scheduling exception on " + jobExecutionContext.getJobDetail().getName());
                 jobException.initCause(e);
                 throw jobException;
+            } catch (final Throwable th) {
+                JobExecutionException jobException = new JobExecutionException("Unexpected exception on " + jobExecutionContext.getJobDetail().getName());
+                jobException.initCause(th);
+                throw jobException;
             } finally {
                 thread.setContextClassLoader(currentClassLoader) ;
             }

Modified: labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/helloworld/jboss-esb.xml
===================================================================
--- labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/helloworld/jboss-esb.xml	2008-03-31 15:02:49 UTC (rev 19342)
+++ labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/helloworld/jboss-esb.xml	2008-03-31 15:14:12 UTC (rev 19343)
@@ -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/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/helloworld_db_registration/jboss-esb.xml
===================================================================
--- labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/helloworld_db_registration/jboss-esb.xml	2008-03-31 15:02:49 UTC (rev 19342)
+++ labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/helloworld_db_registration/jboss-esb.xml	2008-03-31 15:14:12 UTC (rev 19343)
@@ -1,8 +1,7 @@
 <?xml version = "1.0" encoding = "UTF-8"?>
 <jbossesb xmlns="http://anonsvn.labs.jboss.com/labs/jbossesb/trunk/product/etc/schemas/xml/jbossesb-1.0.1.xsd" >
     <providers>
-        <jms-provider name="JBossMQ" connection-factory="ConnectionFactory"
-            jndi-URL="localhost" jndi-context-factory="org.jnp.interfaces.NamingContextFactory">
+        <jms-provider name="JBossMQ" connection-factory="ConnectionFactory">
             <jms-bus busid="helloworldDBGatewayChannel">
                 <jms-message-filter dest-name="queue/quickstart_helloworld_db_registration"
                     dest-type="QUEUE"/>

Modified: labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/helloworld_hibernate_action/jboss-esb.xml
===================================================================
--- labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/helloworld_hibernate_action/jboss-esb.xml	2008-03-31 15:02:49 UTC (rev 19342)
+++ labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/helloworld_hibernate_action/jboss-esb.xml	2008-03-31 15:14:12 UTC (rev 19343)
@@ -12,10 +12,7 @@
           </hibernate-provider>
           
           <jms-provider name="JBossMQ" 
-          		connection-factory="ConnectionFactory"
-            	jndi-context-factory="org.jnp.interfaces.NamingContextFactory"
-            	jndi-URL="localhost" >
-            
+          		connection-factory="ConnectionFactory">
 			    <jms-bus busid="quickstartEsbChannel">
 			        <jms-message-filter
 			            dest-type="QUEUE"

Modified: labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/helloworld_sql_action/jboss-esb.xml
===================================================================
--- labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/helloworld_sql_action/jboss-esb.xml	2008-03-31 15:02:49 UTC (rev 19342)
+++ labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/helloworld_sql_action/jboss-esb.xml	2008-03-31 15:14:12 UTC (rev 19343)
@@ -21,10 +21,7 @@
           </sql-provider>
           
           <jms-provider name="JBossMQ" 
-          		connection-factory="ConnectionFactory"
-            	jndi-context-factory="org.jnp.interfaces.NamingContextFactory"
-            	jndi-URL="localhost" >
-            
+          		connection-factory="ConnectionFactory">
 			    <jms-bus busid="quickstartEsbChannel">
 			        <jms-message-filter
 			            dest-type="QUEUE"

Modified: labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/helloworld_topic_notifier/jboss-esb.xml
===================================================================
--- labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/helloworld_topic_notifier/jboss-esb.xml	2008-03-31 15:02:49 UTC (rev 19342)
+++ labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/helloworld_topic_notifier/jboss-esb.xml	2008-03-31 15:14:12 UTC (rev 19343)
@@ -44,7 +44,7 @@
                        	<NotificationList type="ok">
 							<target class="NotifyConsole"/>
                         	<target class="NotifyFiles">
-								<file append="false" URI="file:////Users/tcunning/src/esb/JBESB_4_2_1_GA_CP/product/samples/quickstarts/helloworld_topic_notifier/results.log"/>
+								<file append="false" URI="file:////Users/cunningt/src/esb/JBESB_4_2_1_GA_CP/product/samples/quickstarts/helloworld_topic_notifier/results.log"/>
 								<file append="false" URI="/tmp/HelloWorldFileNotifierTest.log"/>
 							</target>
 							<target class="NotifyTopics">

Modified: labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/simple_cbr/jboss-esb.xml
===================================================================
--- labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/simple_cbr/jboss-esb.xml	2008-03-31 15:02:49 UTC (rev 19342)
+++ labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/simple_cbr/jboss-esb.xml	2008-03-31 15:14:12 UTC (rev 19343)
@@ -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/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/spring_aop/jboss-esb.xml
===================================================================
--- labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/spring_aop/jboss-esb.xml	2008-03-31 15:02:49 UTC (rev 19342)
+++ labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/spring_aop/jboss-esb.xml	2008-03-31 15:14:12 UTC (rev 19343)
@@ -3,7 +3,6 @@
 
     <providers>
           <jms-provider name="JBossMQ" connection-factory="ConnectionFactory">
-                      
               <jms-bus busid="quickstartGwChannel">
                   <jms-message-filter
                       dest-type="QUEUE"

Modified: labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/spring_helloworld/jboss-esb.xml
===================================================================
--- labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/spring_helloworld/jboss-esb.xml	2008-03-31 15:02:49 UTC (rev 19342)
+++ labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/spring_helloworld/jboss-esb.xml	2008-03-31 15:14:12 UTC (rev 19343)
@@ -3,7 +3,6 @@
 
     <providers>
           <jms-provider name="JBossMQ" connection-factory="ConnectionFactory">
-                      
               <jms-bus busid="quickstartGwChannel">
                   <jms-message-filter
                       dest-type="QUEUE"

Modified: labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/spring_jpetstore/jboss-esb.xml
===================================================================
--- labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/spring_jpetstore/jboss-esb.xml	2008-03-31 15:02:49 UTC (rev 19342)
+++ labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/spring_jpetstore/jboss-esb.xml	2008-03-31 15:14:12 UTC (rev 19343)
@@ -3,7 +3,6 @@
 
     <providers>
           <jms-provider name="JBossMQ" connection-factory="ConnectionFactory">
-                      
               <jms-bus busid="quickstartGwChannel">
                   <jms-message-filter
                       dest-type="QUEUE"

Modified: labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/transform_CSV2XML/jboss-esb.xml
===================================================================
--- labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/transform_CSV2XML/jboss-esb.xml	2008-03-31 15:02:49 UTC (rev 19342)
+++ labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/transform_CSV2XML/jboss-esb.xml	2008-03-31 15:14:12 UTC (rev 19343)
@@ -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="quickstartCSVGwChannel">
 				<jms-message-filter dest-type="QUEUE" dest-name="queue/quickstart_transform_CSV2XML_gw" />

Modified: labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/transform_EDI2XML_Groovy_XSLT/jboss-esb.xml
===================================================================
--- labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/transform_EDI2XML_Groovy_XSLT/jboss-esb.xml	2008-03-31 15:02:49 UTC (rev 19342)
+++ labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/transform_EDI2XML_Groovy_XSLT/jboss-esb.xml	2008-03-31 15:14:12 UTC (rev 19343)
@@ -4,10 +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_edi_groovy_xslt_gw" />
 			</jms-bus>

Modified: labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/transform_XML2POJO2/jboss-esb.xml
===================================================================
--- labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/transform_XML2POJO2/jboss-esb.xml	2008-03-31 15:02:49 UTC (rev 19342)
+++ labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/transform_XML2POJO2/jboss-esb.xml	2008-03-31 15:14:12 UTC (rev 19343)
@@ -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/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/transform_XML2XML_date_manipulation/jboss-esb.xml
===================================================================
--- labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/transform_XML2XML_date_manipulation/jboss-esb.xml	2008-03-31 15:02:49 UTC (rev 19342)
+++ labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/transform_XML2XML_date_manipulation/jboss-esb.xml	2008-03-31 15:14:12 UTC (rev 19343)
@@ -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" dest-name="queue/quickstart_date_manipulation_gw"/>

Modified: labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/transform_XML2XML_simple/jboss-esb.xml
===================================================================
--- labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/transform_XML2XML_simple/jboss-esb.xml	2008-03-31 15:02:49 UTC (rev 19342)
+++ labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/transform_XML2XML_simple/jboss-esb.xml	2008-03-31 15:14:12 UTC (rev 19343)
@@ -4,10 +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_transform_simple_gw" />
 			</jms-bus>

Modified: labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/services/soap/src/main/java/org/jboss/soa/esb/actions/soap/SOAPClient.java
===================================================================
--- labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/services/soap/src/main/java/org/jboss/soa/esb/actions/soap/SOAPClient.java	2008-03-31 15:02:49 UTC (rev 19342)
+++ labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/services/soap/src/main/java/org/jboss/soa/esb/actions/soap/SOAPClient.java	2008-03-31 15:14:12 UTC (rev 19343)
@@ -97,7 +97,7 @@
  *          <a href="http://www.ognl.org/">OGNL</a></li> framework.  More on the use of OGNL below.
  *      <li><b>Option 2</b>: With a set of String based key-value pairs(&lt;String, Object&gt;), where the
  *          key is an OGNL expression identifying the SOAP parameter to be populated with
- *          the key's value.  More on the use of OGNL below.
+ *          the key's value. More on the use of OGNL below.
  *      </li>
  * </ol>
  * As stated above, <a href="http://www.ognl.org/">OGNL</a> is the mechanism we use for selecting
@@ -189,7 +189,9 @@
  *          <a href="http://xstream.codehaus.org">XStream</a> toolkit.
  *      <li><b>Option 2</b>: As a set of String based key-value pairs(&lt;String, String&gt;), where the
  *          key is an OGNL expression identifying the SOAP response element and the value is a String
- *          representing the value from the SOAP message.
+ *          representing the value from the SOAP message.   This option should only be used for simple
+ *          responses.  If your response contains collections etc, this option is not viable.  You need
+ *          to use option 1.
  *      </li>
  *      <li><b>Option 3</b>: If Options 1 or 2 are not specified in the action configuration, the raw SOAP
  *          response message (String) is attached to the message.




More information about the jboss-svn-commits mailing list