From jboss-svn-commits at lists.jboss.org  Wed Aug  6 13:22:19 2014
From: jboss-svn-commits at lists.jboss.org (jboss-svn-commits at lists.jboss.org)
Date: Wed, 6 Aug 2014 13:22:19 -0400
Subject: [jboss-svn-commits] JBL Code SVN: r38447 - in
	labs/jbossesb/branches/JBESB_4_11_CP2/product:
	rosetta/tests/src/org/jboss/soa/esb/actions/converters and 2
	other directories.
Message-ID: <201408061722.s76HMJL0002777@svn01.web.mwc.hst.phx2.redhat.com>

Author: tcunning
Date: 2014-08-06 13:22:19 -0400 (Wed, 06 Aug 2014)
New Revision: 38447

Modified:
   labs/jbossesb/branches/JBESB_4_11_CP2/product/ivy.xml
   labs/jbossesb/branches/JBESB_4_11_CP2/product/rosetta/tests/src/org/jboss/soa/esb/actions/converters/XStreamToObjectUnitTest.java
   labs/jbossesb/branches/JBESB_4_11_CP2/product/services/base-project-build.xml
   labs/jbossesb/branches/JBESB_4_11_CP2/product/services/soap/src/test/java/org/jboss/soa/esb/actions/soap/soapclient-config-01.xml
Log:
JBESB-3974
Upgrade xstream from 1.2.2 to 1.4.7


Modified: labs/jbossesb/branches/JBESB_4_11_CP2/product/ivy.xml
===================================================================
--- labs/jbossesb/branches/JBESB_4_11_CP2/product/ivy.xml	2014-05-13 17:14:13 UTC (rev 38446)
+++ labs/jbossesb/branches/JBESB_4_11_CP2/product/ivy.xml	2014-08-06 17:22:19 UTC (rev 38447)
@@ -71,8 +71,8 @@
 
         <dependency org="xml-apis" name="xml-apis" rev="1.3.02"/>
         <dependency org="xmlbeans" name="xbean" rev="2.2.0"/>
-        <dependency org="com.thoughtworks.xstream" name="xstream" rev="1.2.2">
-            <exclude org="xpp3" module="xpp3_min"/>
+        <dependency org="com.thoughtworks.xstream" name="xstream" rev="1.4.7">
+            <!--<exclude org="xpp3" module="xpp3_min"/>-->
             <exclude org="org.codehaus.woodstox" module="wstx-asl"/>
         </dependency>
         <dependency org="org.codehaus.woodstox" name="wstx-asl" rev="3.2.9">
@@ -199,6 +199,7 @@
         <dependency org="net.sf.trove4j" name="trove4j" rev="3.0.2" transitive="false"/>
 
         <exclude org="apache-httpclient" module="commons-httpclient"/>
+	<exclude org="org.codehaus.jettison" module="jettison"/>
 
     </dependencies>
 </ivy-module>

Modified: labs/jbossesb/branches/JBESB_4_11_CP2/product/rosetta/tests/src/org/jboss/soa/esb/actions/converters/XStreamToObjectUnitTest.java
===================================================================
--- labs/jbossesb/branches/JBESB_4_11_CP2/product/rosetta/tests/src/org/jboss/soa/esb/actions/converters/XStreamToObjectUnitTest.java	2014-05-13 17:14:13 UTC (rev 38446)
+++ labs/jbossesb/branches/JBESB_4_11_CP2/product/rosetta/tests/src/org/jboss/soa/esb/actions/converters/XStreamToObjectUnitTest.java	2014-08-06 17:22:19 UTC (rev 38447)
@@ -137,7 +137,7 @@
         assertEquals("Tom", bean.getName());
         assertEquals("1234", bean.getPhone());
     }
-	
+
 	@Test
 	public void implicitCollections() throws ActionProcessingException
 	{
@@ -145,12 +145,13 @@
         builder.classAlias("TomsClass");
         builder.incomingType(TestBean.class.getName());
         builder.alias("address", String.class.getName());
-        builder.implicitCollection(List.class.getName(), "addresses", "address", String.class.getName());
+        builder.alias("addresses", java.util.List.class.getName());
+        builder.implicitCollection(TestBean.class.getName(), "addresses"); 
         
         XStreamToObject xstreamToObject = new XStreamToObject(builder.build());
         
         Message msg = MessageFactory.getInstance().getMessage();
-        String xml = "<TomsClass><name>Tom</name><phone>1234</phone><addresses><address>street1</address><address>street2</address></addresses></TomsClass>";
+        String xml = "<TomsClass><name>Tom</name><phone>1234</phone><address>street1</address><address>street2</address></TomsClass>";
         msg.getBody().add(xml);
         
         msg = xstreamToObject.process(msg);
@@ -334,7 +335,8 @@
         TestBean person2 = nodes.get( 1 );
         assertEquals( TestBean.GENDER.FEMALE, person2.getGender() );
     }
-	
+
+
 	@Test
     public void fromXmlToObject_with_collections() throws ActionProcessingException
     {
@@ -349,7 +351,7 @@
     	
         XStreamToObject xstreamToObject = new XStreamToObject( builder.build() );
         
-        String xml = "<someNode><list><Persons><TomsClass><list></list></TomsClass><TomsClass></TomsClass></Persons></list></someNode>";
+        String xml = "<someNode><list><Persons><TomsClass></TomsClass><TomsClass></TomsClass></Persons></list></someNode>";
         
         Object obj = new ArrayList<TestBean>();
         obj = xstreamToObject.fromXmlToObject( xml, obj );
@@ -425,4 +427,4 @@
 	}
 	
 }	
-	
\ No newline at end of file
+	

Modified: labs/jbossesb/branches/JBESB_4_11_CP2/product/services/base-project-build.xml
===================================================================
--- labs/jbossesb/branches/JBESB_4_11_CP2/product/services/base-project-build.xml	2014-05-13 17:14:13 UTC (rev 38446)
+++ labs/jbossesb/branches/JBESB_4_11_CP2/product/services/base-project-build.xml	2014-08-06 17:22:19 UTC (rev 38447)
@@ -95,6 +95,7 @@
         <fileset dir="${esb.main.lib}" includes="uddi-ws*.jar"/>
         <fileset dir="${esb.main.lib}" includes="xbean*.jar"/>
         <fileset dir="${esb.main.lib}" includes="xstream*.jar"/>
+        <fileset dir="${esb.main.lib}" includes="xpp3*.jar"/>
         <pathelement location="${esb.root.dir}/etc/test/registry"/>
 	</path>
 

Modified: labs/jbossesb/branches/JBESB_4_11_CP2/product/services/soap/src/test/java/org/jboss/soa/esb/actions/soap/soapclient-config-01.xml
===================================================================
--- labs/jbossesb/branches/JBESB_4_11_CP2/product/services/soap/src/test/java/org/jboss/soa/esb/actions/soap/soapclient-config-01.xml	2014-05-13 17:14:13 UTC (rev 38446)
+++ labs/jbossesb/branches/JBESB_4_11_CP2/product/services/soap/src/test/java/org/jboss/soa/esb/actions/soap/soapclient-config-01.xml	2014-08-06 17:22:19 UTC (rev 38447)
@@ -48,9 +48,9 @@
                     <property name="SOAPAction" value="ZZZ"/>
                     <property name="responseXStreamConfig">
                         <alias name="customerOrder" class="org.jboss.soa.esb.actions.soap.beans.Order" namespace="http://schemas.active-endpoints.com/sample/customerorder/2006/04/CustomerOrder.xsd" />
-                        <alias name="customerName" class="java.lang.String" namespace="http://schemas.active-endpoints.com/sample/customerorder/2006/04/CustomerOrder.xsd" />
-                        <alias name="orderheader" class="org.jboss.soa.esb.actions.soap.beans.Header" namespace="http://schemas.active-endpoints.com/sample/customerorder/2006/04/CustomerOrder.xsd" />
+                        <!--<alias name="orderheader" class="org.jboss.soa.esb.actions.soap.beans.Header" namespace="http://schemas.active-endpoints.com/sample/customerorder/2006/04/CustomerOrder.xsd" />-->
                         <alias name="item" class="org.jboss.soa.esb.actions.soap.beans.OrderItem" namespace="http://schemas.active-endpoints.com/sample/customerorder/2006/04/CustomerOrder.xsd" />
+			<fieldAlias name="orderheader" class="org.jboss.soa.esb.actions.soap.beans.Order" fieldName="header"/>
                     </property>
                 </action>
                 <action name="soapui-client-action-06" class="org.jboss.soa.esb.actions.soap.SOAPClient">