[jboss-svn-commits] JBL Code SVN: r35276 - in labs/jbossesb/branches/JBESB_4_9_CP/product: services/soap/src/main/java/org/jboss/soa/esb/actions/soap/wise and 1 other directory.

[jboss-svn-commits at lists.jboss.org]

Author: tfennelly
Date: 2010-09-24 13:00:34 -0400 (Fri, 24 Sep 2010)
New Revision: 35276

Modified:
   labs/jbossesb/branches/JBESB_4_9_CP/product/samples/quickstarts/webservice_consumer_wise2/smooks-request-config.xml
   labs/jbossesb/branches/JBESB_4_9_CP/product/services/soap/src/main/java/org/jboss/soa/esb/actions/soap/wise/SmooksMapper.java
Log:
https://jira.jboss.org/browse/JBESB-3440
Smooks 1.2 JavaBean namespace with wise SoapClient causes ClassNotFoundException

Modified: labs/jbossesb/branches/JBESB_4_9_CP/product/samples/quickstarts/webservice_consumer_wise2/smooks-request-config.xml
===================================================================
--- labs/jbossesb/branches/JBESB_4_9_CP/product/samples/quickstarts/webservice_consumer_wise2/smooks-request-config.xml	2010-09-24 16:09:33 UTC (rev 35275)
+++ labs/jbossesb/branches/JBESB_4_9_CP/product/samples/quickstarts/webservice_consumer_wise2/smooks-request-config.xml	2010-09-24 17:00:34 UTC (rev 35276)
@@ -1,24 +1,17 @@
 <?xml version="1.0"?>
-<smooks-resource-list xmlns="http://www.milyn.org/xsd/smooks-1.0.xsd">
+<smooks-resource-list xmlns="http://www.milyn.org/xsd/smooks-1.1.xsd"
+                      xmlns:jb="http://www.milyn.org/xsd/smooks/javabean-1.2.xsd">
 
-    <resource-config selector="global-parameters">
+    <params>
         <param name="stream.filter.type">SAX</param>
-    </resource-config>
+    </params>
 
-    <resource-config selector="org.jboss.soa.esb.samples.quickstart.webservice__consumer__wise2.ExternalObject">
-        <resource>org.milyn.javabean.BeanPopulator</resource>
-        <param name="beanId">complexObject</param>
-        <param name="beanClass">org.jboss.soa.esb.samples.quickstart.webservice_consumer_wise2.generated.ComplexObject</param>
-        <param name="bindings">
-            <binding property="integerField" type="Integer" selector="internal number" />
-            <binding property="stringField" selector="internal text" />
-            <binding property="calendarField" type="XMLGregorianCalendar" selector="date" />
-        </param>
-    </resource-config>
+    <jb:bean beanId="complexObject" createOnElement="$document" class="org.jboss.soa.esb.samples.quickstart.webservice_consumer_wise2.generated.ComplexObject">
+		<jb:value property="integerField" data="internal/number" />
+		<jb:value property="stringField" data="internal/text" />
+		<jb:value property="calendarField" data="date" decoder="it.javalinux.wise.smooks.decoders.XMLGregorianCalendarDecoder">
+			<jb:decodeParam name="format">yyyy-MM-dd HH:mm:ss.S z</jb:decodeParam>
+		</jb:value>
+    </jb:bean>
 
-    <resource-config selector="decoder:XMLGregorianCalendar">
-        <resource>it.javalinux.wise.smooks.decoders.XMLGregorianCalendarDecoder</resource>
-        <param name="format">yyyy-MM-dd HH:mm:ss.S z</param>
-    </resource-config>
-
-</smooks-resource-list>
+</smooks-resource-list>
\ No newline at end of file

Modified: labs/jbossesb/branches/JBESB_4_9_CP/product/services/soap/src/main/java/org/jboss/soa/esb/actions/soap/wise/SmooksMapper.java
===================================================================
--- labs/jbossesb/branches/JBESB_4_9_CP/product/services/soap/src/main/java/org/jboss/soa/esb/actions/soap/wise/SmooksMapper.java	2010-09-24 16:09:33 UTC (rev 35275)
+++ labs/jbossesb/branches/JBESB_4_9_CP/product/services/soap/src/main/java/org/jboss/soa/esb/actions/soap/wise/SmooksMapper.java	2010-09-24 17:00:34 UTC (rev 35276)
@@ -39,7 +39,7 @@
 
     private String smooksReport ;
 
-    private final Smooks smooks ;
+    private Smooks smooks ;
     
     /**
      * Create this mapper using passed resource
@@ -74,8 +74,6 @@
         throws IOException, IllegalArgumentException, SAXException, LifecycleResourceException {
 	this.smooksResource = smooksResource;
 	this.smooksReport = smooksReport;
-	smooks = SmooksResource.createSmooksResource();
-	smooks.addConfigurations("smooks-resource", new URIResourceLocator().getResource(smooksResource));
     }
 
     /**
@@ -90,6 +88,15 @@
      */
     public Map<String, Object> applyMapping(Object originalObjects) throws Exception {
 
+    if(smooks == null) {
+    	synchronized (this) {
+    	    if(smooks == null) {
+	    		smooks = SmooksResource.createSmooksResource();
+	    		smooks.addConfigurations("smooks-resource", new URIResourceLocator().getResource(smooksResource));
+    	    }
+		}
+    }
+    	
 	ExecutionContext executionContext = smooks.createExecutionContext();
 	// Configure the execution context to generate a report...
 	if (this.getSmooksReport() != null) {