[jboss-svn-commits] JBL Code SVN: r25305 - in labs/jbossesb/branches/JBESB_4_4_GA_FP/product: rosetta/src/org/jboss/internal/soa/esb/rosetta/pooling and 7 other directories.
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Tue Feb 17 08:24:57 EST 2009
Author: tfennelly
Date: 2009-02-17 08:24:57 -0500 (Tue, 17 Feb 2009)
New Revision: 25305
Added:
labs/jbossesb/branches/JBESB_4_4_GA_FP/product/services/smooks/lib/ext/jackson-lgpl-0.9.3.jar
labs/jbossesb/branches/JBESB_4_4_GA_FP/product/services/smooks/lib/ext/jline-0.9.93.jar
labs/jbossesb/branches/JBESB_4_4_GA_FP/product/services/smooks/lib/ext/milyn-commons-1.1.jar
labs/jbossesb/branches/JBESB_4_4_GA_FP/product/services/smooks/lib/ext/milyn-edisax-parser-1.1.jar
labs/jbossesb/branches/JBESB_4_4_GA_FP/product/services/smooks/lib/ext/milyn-magger-1.1.jar
labs/jbossesb/branches/JBESB_4_4_GA_FP/product/services/smooks/lib/ext/milyn-smooks-core-1.1.jar
labs/jbossesb/branches/JBESB_4_4_GA_FP/product/services/smooks/lib/ext/milyn-smooks-css-1.1.jar
labs/jbossesb/branches/JBESB_4_4_GA_FP/product/services/smooks/lib/ext/milyn-smooks-csv-1.1.jar
labs/jbossesb/branches/JBESB_4_4_GA_FP/product/services/smooks/lib/ext/milyn-smooks-edi-1.1.jar
labs/jbossesb/branches/JBESB_4_4_GA_FP/product/services/smooks/lib/ext/milyn-smooks-javabean-1.1.jar
labs/jbossesb/branches/JBESB_4_4_GA_FP/product/services/smooks/lib/ext/milyn-smooks-json-1.1.jar
labs/jbossesb/branches/JBESB_4_4_GA_FP/product/services/smooks/lib/ext/milyn-smooks-misc-1.1.jar
labs/jbossesb/branches/JBESB_4_4_GA_FP/product/services/smooks/lib/ext/milyn-smooks-routing-1.1.jar
labs/jbossesb/branches/JBESB_4_4_GA_FP/product/services/smooks/lib/ext/milyn-smooks-scripting-1.1.jar
labs/jbossesb/branches/JBESB_4_4_GA_FP/product/services/smooks/lib/ext/milyn-smooks-servlet-1.1.jar
labs/jbossesb/branches/JBESB_4_4_GA_FP/product/services/smooks/lib/ext/milyn-smooks-templating-1.1.jar
labs/jbossesb/branches/JBESB_4_4_GA_FP/product/services/smooks/lib/ext/milyn-tinak-1.1.jar
Removed:
labs/jbossesb/branches/JBESB_4_4_GA_FP/product/services/smooks/lib/ext/milyn-commons-1.0.jar
labs/jbossesb/branches/JBESB_4_4_GA_FP/product/services/smooks/lib/ext/milyn-edisax-0.3.jar
labs/jbossesb/branches/JBESB_4_4_GA_FP/product/services/smooks/lib/ext/milyn-edisax-model-0.3.jar
labs/jbossesb/branches/JBESB_4_4_GA_FP/product/services/smooks/lib/ext/milyn-magger-0.1.3.jar
labs/jbossesb/branches/JBESB_4_4_GA_FP/product/services/smooks/lib/ext/milyn-smooks-core-1.0.1.jar
labs/jbossesb/branches/JBESB_4_4_GA_FP/product/services/smooks/lib/ext/milyn-smooks-css-1.0.1.jar
labs/jbossesb/branches/JBESB_4_4_GA_FP/product/services/smooks/lib/ext/milyn-smooks-csv-1.0.1.jar
labs/jbossesb/branches/JBESB_4_4_GA_FP/product/services/smooks/lib/ext/milyn-smooks-edi-1.0.1.jar
labs/jbossesb/branches/JBESB_4_4_GA_FP/product/services/smooks/lib/ext/milyn-smooks-javabean-1.0.1.jar
labs/jbossesb/branches/JBESB_4_4_GA_FP/product/services/smooks/lib/ext/milyn-smooks-misc-1.0.1.jar
labs/jbossesb/branches/JBESB_4_4_GA_FP/product/services/smooks/lib/ext/milyn-smooks-routing-1.0.1.jar
labs/jbossesb/branches/JBESB_4_4_GA_FP/product/services/smooks/lib/ext/milyn-smooks-scripting-1.0.1.jar
labs/jbossesb/branches/JBESB_4_4_GA_FP/product/services/smooks/lib/ext/milyn-smooks-servlet-1.0.1.jar
labs/jbossesb/branches/JBESB_4_4_GA_FP/product/services/smooks/lib/ext/milyn-smooks-templating-1.0.1.jar
labs/jbossesb/branches/JBESB_4_4_GA_FP/product/services/smooks/lib/ext/milyn-tinak-0.8.1.jar
Modified:
labs/jbossesb/branches/JBESB_4_4_GA_FP/product/ivy-build.xml
labs/jbossesb/branches/JBESB_4_4_GA_FP/product/ivy.xml
labs/jbossesb/branches/JBESB_4_4_GA_FP/product/rosetta/src/org/jboss/internal/soa/esb/rosetta/pooling/JmsXASession.java
labs/jbossesb/branches/JBESB_4_4_GA_FP/product/samples/quickstarts/business_rules_service/jboss-esb.xml
labs/jbossesb/branches/JBESB_4_4_GA_FP/product/samples/quickstarts/business_rules_service/smooks-res.xml
labs/jbossesb/branches/JBESB_4_4_GA_FP/product/samples/quickstarts/transform_XML2POJO/smooks-res.xml
labs/jbossesb/branches/JBESB_4_4_GA_FP/product/samples/quickstarts/transform_XML2POJO2/smooks-config.xml
labs/jbossesb/branches/JBESB_4_4_GA_FP/product/samples/quickstarts/transform_XML2POJO2/transforms/from-dvdstore.xml
labs/jbossesb/branches/JBESB_4_4_GA_FP/product/samples/quickstarts/transform_XML2POJO2/transforms/from-petstore.xml
labs/jbossesb/branches/JBESB_4_4_GA_FP/product/services/smooks/src/main/java/org/jboss/soa/esb/actions/converters/SmooksInstanceManager.java
labs/jbossesb/branches/JBESB_4_4_GA_FP/product/services/smooks/src/main/java/org/jboss/soa/esb/actions/converters/SmooksTransformer.java
labs/jbossesb/branches/JBESB_4_4_GA_FP/product/services/soapui-client/src/main/java/org/jboss/soa/esb/services/soapui/SoapUIClientService.java
Log:
https://jira.jboss.org/jira/browse/JBESB-2422
Modified: labs/jbossesb/branches/JBESB_4_4_GA_FP/product/ivy-build.xml
===================================================================
--- labs/jbossesb/branches/JBESB_4_4_GA_FP/product/ivy-build.xml 2009-02-17 12:37:30 UTC (rev 25304)
+++ labs/jbossesb/branches/JBESB_4_4_GA_FP/product/ivy-build.xml 2009-02-17 13:24:57 UTC (rev 25305)
@@ -12,6 +12,12 @@
<target name="retrieve" depends="ivy.init">
<ivy:retrieve />
+
+ <!-- We have to get the Smooks dependencies manually due to an issue with Ivy. See ivy.xml. -->
+ <get src="http://repo1.maven.org/maven2/org/milyn/milyn-commons/1.1/milyn-commons-1.1.jar" dest="${ivy.lib.dir}/milyn-commons-1.1.jar" />
+ <get src="http://repo1.maven.org/maven2/org/milyn/milyn-smooks-core/1.1/milyn-smooks-core-1.1.jar" dest="${ivy.lib.dir}/milyn-smooks-core-1.1.jar" />
+ <get src="http://repo1.maven.org/maven2/org/milyn/milyn-smooks-javabean/1.1/milyn-smooks-javabean-1.1.jar" dest="${ivy.lib.dir}/milyn-smooks-javabean-1.1.jar" />
+
</target>
<target name="clean" depends="ivy.init">
Modified: labs/jbossesb/branches/JBESB_4_4_GA_FP/product/ivy.xml
===================================================================
--- labs/jbossesb/branches/JBESB_4_4_GA_FP/product/ivy.xml 2009-02-17 12:37:30 UTC (rev 25304)
+++ labs/jbossesb/branches/JBESB_4_4_GA_FP/product/ivy.xml 2009-02-17 13:24:57 UTC (rev 25305)
@@ -62,9 +62,7 @@
<dependency org="beanshell" name="bsh" rev="1.3.0"/>
<!-- Smooks dependencies -->
- <dependency org="milyn" name="milyn-smooks-core" rev="1.0.1"/>
- <dependency org="milyn" name="milyn-commons" rev="1.0"/>
- <dependency org="milyn" name="milyn-smooks-javabean" rev="1.0.1"/>
+ <!-- See ivy-build.xml: We get the smooks using ant "get". Ivy has issues with parsing POMs that use variables for version numbers. Not able to resolve them it seems :( -->
<dependency org="javax.jcr" name="jcr" rev="1.0"/>
Modified: labs/jbossesb/branches/JBESB_4_4_GA_FP/product/rosetta/src/org/jboss/internal/soa/esb/rosetta/pooling/JmsXASession.java
===================================================================
--- labs/jbossesb/branches/JBESB_4_4_GA_FP/product/rosetta/src/org/jboss/internal/soa/esb/rosetta/pooling/JmsXASession.java 2009-02-17 12:37:30 UTC (rev 25304)
+++ labs/jbossesb/branches/JBESB_4_4_GA_FP/product/rosetta/src/org/jboss/internal/soa/esb/rosetta/pooling/JmsXASession.java 2009-02-17 13:24:57 UTC (rev 25305)
@@ -162,7 +162,7 @@
if (!associated)
{
cleanupAction = Cleanup.none ;
- final XAResource resource = session.getXAResource() ;
+ final XAResource resource = session.getXAResource();
final TransactionStrategy transactionStrategy = TransactionStrategy.getTransactionStrategy(true) ;
try
{
Modified: labs/jbossesb/branches/JBESB_4_4_GA_FP/product/samples/quickstarts/business_rules_service/jboss-esb.xml
===================================================================
--- labs/jbossesb/branches/JBESB_4_4_GA_FP/product/samples/quickstarts/business_rules_service/jboss-esb.xml 2009-02-17 12:37:30 UTC (rev 25304)
+++ labs/jbossesb/branches/JBESB_4_4_GA_FP/product/samples/quickstarts/business_rules_service/jboss-esb.xml 2009-02-17 13:24:57 UTC (rev 25305)
@@ -41,7 +41,7 @@
</jms-listener>
</listeners>
<actions mep="OneWay">
-
+
<action name="transform"
class="org.jboss.soa.esb.smooks.SmooksAction">
@@ -52,8 +52,8 @@
<action name="map_order_components" class="org.jboss.soa.esb.actions.scripting.GroovyActionProcessor">
<property name="script" value="/map_order_components.groovy" />
</action>
-
- <!-- Update Customer Status -->
+
+ <!-- Update Customer Status -->
<action name="updateCustomerStatus"
class="org.jboss.soa.esb.samples.quickstart.businessrules.UpdateCustomerStatus">
<property name="status" value="60"/>
@@ -95,7 +95,9 @@
<property name="stuff" value="After Order Discount"/>
</action>
- <!-- Use the CBR to route the "scored" order to the appropriate service team -->
+ <action name="sout" class="org.jboss.soa.esb.actions.SystemPrintln" />
+
+ <!-- Use the CBR to route the "scored" order to the appropriate service team -->
<action
class="org.jboss.soa.esb.actions.ContentBasedRouter"
name="ContentBasedRouter">
Modified: labs/jbossesb/branches/JBESB_4_4_GA_FP/product/samples/quickstarts/business_rules_service/smooks-res.xml
===================================================================
--- labs/jbossesb/branches/JBESB_4_4_GA_FP/product/samples/quickstarts/business_rules_service/smooks-res.xml 2009-02-17 12:37:30 UTC (rev 25304)
+++ labs/jbossesb/branches/JBESB_4_4_GA_FP/product/samples/quickstarts/business_rules_service/smooks-res.xml 2009-02-17 13:24:57 UTC (rev 25305)
@@ -1,52 +1,39 @@
<?xml version='1.0' encoding='UTF-8'?>
-<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.1.xsd">
<!-- Populate the OrderHeader -->
- <resource-config selector="order">
- <resource>org.milyn.javabean.BeanPopulator</resource>
- <param name="beanId">orderHeader</param>
- <param name="beanClass">org.jboss.soa.esb.samples.quickstart.businessrules.dvdstore.OrderHeader</param>
- <param name="bindings">
- <binding property="orderId" selector="Order/@orderId" />
- <binding property="orderDate" selector="Order/@orderDate" type="LongDate"/>
- <binding property="statusCode" selector="Order/@statusCode" type="Integer" />
- <binding property="netAmount" selector="Order/@netAmount" type="Double" />
- <binding property="totalAmount" selector="Order/@totalAmount" type="Double" />
- <binding property="tax" selector="Order/@tax" type="Double" />
- </param>
- </resource-config>
+ <jb:bindings beanId="orderHeader" class="org.jboss.soa.esb.samples.quickstart.businessrules.dvdstore.OrderHeader" createOnElement="order">
+ <jb:value property="orderId" data="Order/@orderId" />
+ <jb:value property="orderDate" data="Order/@orderDate" decoder="Calendar">
+ <jb:decodeParam name="format">EEE MMM dd HH:mm:ss z yyyy</jb:decodeParam>
+ </jb:value>
+ <jb:value property="statusCode" data="Order/@statusCode" decoder="Integer" />
+ <jb:value property="netAmount" data="Order/@netAmount" decoder="Double" />
+ <jb:value property="totalAmount" data="Order/@totalAmount" decoder="Double" />
+ <jb:value property="tax" data="Order/@tax" decoder="Double" />
+ </jb:bindings>
<!-- Populate the Customer -->
- <resource-config selector="order customer">
- <resource>org.milyn.javabean.BeanPopulator</resource>
- <param name="beanId">customer</param>
- <param name="beanClass">org.jboss.soa.esb.samples.quickstart.businessrules.dvdstore.Customer</param>
- <param name="bindings">
- <binding property="userName" selector="order/customer/@userName" />
- <binding property="firstName" selector="order/customer/@firstName" />
- <binding property="lastName" selector="order/customer/@lastName" />
- <binding property="state" selector="order/customer/@state" />
- </param>
- </resource-config>
+ <jb:bindings beanId="customer" class="org.jboss.soa.esb.samples.quickstart.businessrules.dvdstore.Customer" createOnElement="customer">
+ <jb:value property="userName" data="customer/@userName" />
+ <jb:value property="firstName" data="customer/@firstName" />
+ <jb:value property="lastName" data="customer/@lastName" />
+ <jb:value property="state" data="customer/@state" />
+ </jb:bindings>
<!-- Populate the OrderItem list -->
- <resource-config selector="order orderlines orderline">
- <resource>org.milyn.javabean.BeanPopulator</resource>
- <param name="beanId">orderItem</param>
- <param name="beanClass">org.jboss.soa.esb.samples.quickstart.businessrules.dvdstore.OrderItem</param>
- <param name="addToList">true</param>
- <param name="bindings">
- <binding property="position" selector="order/orderlines/orderline/@position" type="Integer" />
- <binding property="quantity" selector="order/orderlines/orderline/@quantity" type="Integer" />
- <binding property="productId" selector="order/orderlines/orderline/product/@productId" />
- <binding property="title" selector="order/orderlines/orderline/product/@title" />
- <binding property="price" selector="order/orderlines/orderline/product/@price" type="Double" />
- </param>
- </resource-config>
+ <jb:bindings beanId="orderItemList" class="java.util.ArrayList" createOnElement="orderlines">
+ <jb:wiring beanIdRef="orderItem" />
+ </jb:bindings>
- <resource-config selector="decoder:LongDate">
- <resource>org.milyn.javabean.decoders.CalendarDecoder</resource>
- <param name="format">EEE MMM dd HH:mm:ss z yyyy</param>
- </resource-config>
+ <!-- Populate the OrderItem instance -->
+ <jb:bindings beanId="orderItem" class="org.jboss.soa.esb.samples.quickstart.businessrules.dvdstore.OrderItem" createOnElement="orderlines/orderline">
+ <jb:value property="position" data="orderline/@position" decoder="Integer" />
+ <jb:value property="quantity" data="orderline/@quantity" decoder="Integer" />
+ <jb:value property="productId" data="orderline/product/@productId" />
+ <jb:value property="title" data="orderline/product/@title" />
+ <jb:value property="price" data="orderline/product/@price" decoder="Double" />
+ </jb:bindings>
</smooks-resource-list>
Modified: labs/jbossesb/branches/JBESB_4_4_GA_FP/product/samples/quickstarts/transform_XML2POJO/smooks-res.xml
===================================================================
--- labs/jbossesb/branches/JBESB_4_4_GA_FP/product/samples/quickstarts/transform_XML2POJO/smooks-res.xml 2009-02-17 12:37:30 UTC (rev 25304)
+++ labs/jbossesb/branches/JBESB_4_4_GA_FP/product/samples/quickstarts/transform_XML2POJO/smooks-res.xml 2009-02-17 13:24:57 UTC (rev 25305)
@@ -1,52 +1,39 @@
<?xml version='1.0' encoding='UTF-8'?>
-<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.1.xsd">
<!-- Populate the OrderHeader -->
- <resource-config selector="order">
- <resource>org.milyn.javabean.BeanPopulator</resource>
- <param name="beanId">orderHeader</param>
- <param name="beanClass">org.jboss.soa.esb.dvdstore.OrderHeader</param>
- <param name="bindings">
- <binding property="orderId" selector="Order/@orderId" />
- <binding property="orderDate" selector="Order/@orderDate" type="LongDate"/>
- <binding property="statusCode" selector="Order/@statusCode" type="Integer" />
- <binding property="netAmount" selector="Order/@netAmount" type="Double" />
- <binding property="totalAmount" selector="Order/@totalAmount" type="Double" />
- <binding property="tax" selector="Order/@tax" type="Double" />
- </param>
- </resource-config>
+ <jb:bindings beanId="orderHeader" class="org.jboss.soa.esb.dvdstore.OrderHeader" createOnElement="order">
+ <jb:value property="orderId" data="Order/@orderId" />
+ <jb:value property="orderDate" data="Order/@orderDate" decoder="Calendar">
+ <jb:decodeParam name="format">EEE MMM dd HH:mm:ss z yyyy</jb:decodeParam>
+ </jb:value>
+ <jb:value property="statusCode" data="Order/@statusCode" decoder="Integer" />
+ <jb:value property="netAmount" data="Order/@netAmount" decoder="Double" />
+ <jb:value property="totalAmount" data="Order/@totalAmount" decoder="Double" />
+ <jb:value property="tax" data="Order/@tax" decoder="Double" />
+ </jb:bindings>
<!-- Populate the Customer -->
- <resource-config selector="order/customer">
- <resource>org.milyn.javabean.BeanPopulator</resource>
- <param name="beanId">customer</param>
- <param name="beanClass">org.jboss.soa.esb.dvdstore.Customer</param>
- <param name="bindings">
- <binding property="userName" selector="order/customer/@userName" />
- <binding property="firstName" selector="order/customer/@firstName" />
- <binding property="lastName" selector="order/customer/@lastName" />
- <binding property="state" selector="order/customer/@state" />
- </param>
- </resource-config>
+ <jb:bindings beanId="customer" class="org.jboss.soa.esb.dvdstore.Customer" createOnElement="customer">
+ <jb:value property="userName" data="customer/@userName" />
+ <jb:value property="firstName" data="customer/@firstName" />
+ <jb:value property="lastName" data="customer/@lastName" />
+ <jb:value property="state" data="customer/@state" />
+ </jb:bindings>
<!-- Populate the OrderItem list -->
- <resource-config selector="order/orderlines/orderline">
- <resource>org.milyn.javabean.BeanPopulator</resource>
- <param name="beanId">orderItem</param>
- <param name="beanClass">org.jboss.soa.esb.dvdstore.OrderItem</param>
- <param name="addToList">true</param>
- <param name="bindings">
- <binding property="position" selector="order/orderlines/orderline/@position" type="Integer" />
- <binding property="quantity" selector="order/orderlines/orderline/@quantity" type="Integer" />
- <binding property="productId" selector="order/orderlines/orderline/product/@productId" />
- <binding property="title" selector="order/orderlines/orderline/product/@title" />
- <binding property="price" selector="order/orderlines/orderline/product/@price" type="Double" />
- </param>
- </resource-config>
+ <jb:bindings beanId="orderItemList" class="java.util.ArrayList" createOnElement="orderlines">
+ <jb:wiring beanIdRef="orderItem" />
+ </jb:bindings>
- <resource-config selector="decoder:LongDate">
- <resource>org.milyn.javabean.decoders.CalendarDecoder</resource>
- <param name="format">EEE MMM dd HH:mm:ss z yyyy</param>
- </resource-config>
+ <!-- Populate the OrderItem instance -->
+ <jb:bindings beanId="orderItem" class="org.jboss.soa.esb.dvdstore.OrderItem" createOnElement="orderlines/orderline">
+ <jb:value property="position" data="orderline/@position" decoder="Integer" />
+ <jb:value property="quantity" data="orderline/@quantity" decoder="Integer" />
+ <jb:value property="productId" data="orderline/product/@productId" />
+ <jb:value property="title" data="orderline/product/@title" />
+ <jb:value property="price" data="orderline/product/@price" decoder="Double" />
+ </jb:bindings>
</smooks-resource-list>
Modified: labs/jbossesb/branches/JBESB_4_4_GA_FP/product/samples/quickstarts/transform_XML2POJO2/smooks-config.xml
===================================================================
--- labs/jbossesb/branches/JBESB_4_4_GA_FP/product/samples/quickstarts/transform_XML2POJO2/smooks-config.xml 2009-02-17 12:37:30 UTC (rev 25304)
+++ labs/jbossesb/branches/JBESB_4_4_GA_FP/product/samples/quickstarts/transform_XML2POJO2/smooks-config.xml 2009-02-17 13:24:57 UTC (rev 25305)
@@ -1,5 +1,5 @@
<?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">
<profiles>
<profile base-profile="from:dvdstore" />
Modified: labs/jbossesb/branches/JBESB_4_4_GA_FP/product/samples/quickstarts/transform_XML2POJO2/transforms/from-dvdstore.xml
===================================================================
--- labs/jbossesb/branches/JBESB_4_4_GA_FP/product/samples/quickstarts/transform_XML2POJO2/transforms/from-dvdstore.xml 2009-02-17 12:37:30 UTC (rev 25304)
+++ labs/jbossesb/branches/JBESB_4_4_GA_FP/product/samples/quickstarts/transform_XML2POJO2/transforms/from-dvdstore.xml 2009-02-17 13:24:57 UTC (rev 25305)
@@ -1,54 +1,40 @@
<?xml version='1.0' encoding='UTF-8'?>
-<smooks-resource-list xmlns="http://www.milyn.org/xsd/smooks-1.0.xsd"
- default-target-profile="from:dvdstore">
+<smooks-resource-list xmlns="http://www.milyn.org/xsd/smooks-1.1.xsd"
+ xmlns:jb="http://www.milyn.org/xsd/smooks/javabean-1.1.xsd"
+ default-target-profile="from:dvdstore">
<!-- Populate the OrderHeader -->
- <resource-config selector="order">
- <resource>org.milyn.javabean.BeanPopulator</resource>
- <param name="beanId">orderHeader</param>
- <param name="beanClass">org.jboss.soa.esb.store.OrderHeader</param>
- <param name="bindings">
- <binding property="orderId" selector="Order @orderId" />
- <binding property="orderDate" selector="Order @orderDate" type="LongDate"/>
- <binding property="statusCode" selector="Order @statusCode" />
- <binding property="netAmount" selector="Order @netAmount" type="Double" />
- <binding property="totalAmount" selector="Order @totalAmount" type="Double" />
- <binding property="tax" selector="Order @tax" type="Double" />
- </param>
- </resource-config>
+ <jb:bindings beanId="orderHeader" class="org.jboss.soa.esb.store.OrderHeader" createOnElement="order">
+ <jb:value property="orderId" data="Order/@orderId" />
+ <jb:value property="orderDate" data="Order/@orderDate" decoder="Calendar">
+ <jb:decodeParam name="format">EEE MMM dd HH:mm:ss z yyyy</jb:decodeParam>
+ </jb:value>
+ <jb:value property="statusCode" data="Order/@statusCode" />
+ <jb:value property="netAmount" data="Order/@netAmount" decoder="Double" />
+ <jb:value property="totalAmount" data="Order/@totalAmount" decoder="Double" />
+ <jb:value property="tax" data="Order/@tax" decoder="Double" />
+ </jb:bindings>
<!-- Populate the Customer -->
- <resource-config selector="order customer">
- <resource>org.milyn.javabean.BeanPopulator</resource>
- <param name="beanId">customer</param>
- <param name="beanClass">org.jboss.soa.esb.store.Customer</param>
- <param name="bindings">
- <binding property="userName" selector="order customer @userName" />
- <binding property="firstName" selector="order customer @firstName" />
- <binding property="lastName" selector="order customer @lastName" />
- <binding property="state" selector="order customer @state" />
- </param>
- </resource-config>
+ <jb:bindings beanId="customer" class="org.jboss.soa.esb.store.Customer" createOnElement="customer">
+ <jb:value property="userName" data="customer/@userName" />
+ <jb:value property="firstName" data="customer/@firstName" />
+ <jb:value property="lastName" data="customer/@lastName" />
+ <jb:value property="state" data="customer/@state" />
+ </jb:bindings>
<!-- Populate the OrderItem list -->
- <resource-config selector="order orderlines orderline">
- <resource>org.milyn.javabean.BeanPopulator</resource>
- <param name="beanId">orderItem</param>
- <param name="beanClass">org.jboss.soa.esb.store.OrderItem</param>
- <param name="addToList">true</param>
- <param name="bindings">
- <binding property="position" selector="order orderlines orderline @position" type="Integer" />
- <binding property="quantity" selector="order orderlines orderline @quantity" type="Integer" />
- <binding property="productId" selector="order orderlines orderline product @productId" />
- <binding property="title" selector="order orderlines orderline product @title" />
- <binding property="price" selector="order orderlines orderline product @price" type="Double" />
- </param>
- </resource-config>
+ <jb:bindings beanId="orderItemList" class="java.util.ArrayList" createOnElement="orderlines">
+ <jb:wiring beanIdRef="orderItem" />
+ </jb:bindings>
-
- <resource-config selector="decoder:LongDate">
- <resource>org.milyn.javabean.decoders.CalendarDecoder</resource>
- <param name="format">EEE MMM dd HH:mm:ss z yyyy</param>
- </resource-config>
+ <!-- Populate the OrderItem instance -->
+ <jb:bindings beanId="orderItem" class="org.jboss.soa.esb.store.OrderItem" createOnElement="orderlines/orderline">
+ <jb:value property="position" data="orderline/@position" decoder="Integer" />
+ <jb:value property="quantity" data="orderline/@quantity" decoder="Integer" />
+ <jb:value property="productId" data="orderline/product/@productId" />
+ <jb:value property="title" data="orderline/product/@title" />
+ <jb:value property="price" data="orderline/product/@price" decoder="Double" />
+ </jb:bindings>
</smooks-resource-list>
Modified: labs/jbossesb/branches/JBESB_4_4_GA_FP/product/samples/quickstarts/transform_XML2POJO2/transforms/from-petstore.xml
===================================================================
--- labs/jbossesb/branches/JBESB_4_4_GA_FP/product/samples/quickstarts/transform_XML2POJO2/transforms/from-petstore.xml 2009-02-17 12:37:30 UTC (rev 25304)
+++ labs/jbossesb/branches/JBESB_4_4_GA_FP/product/samples/quickstarts/transform_XML2POJO2/transforms/from-petstore.xml 2009-02-17 13:24:57 UTC (rev 25305)
@@ -1,52 +1,39 @@
<?xml version='1.0' encoding='UTF-8'?>
-<smooks-resource-list xmlns="http://www.milyn.org/xsd/smooks-1.0.xsd"
- default-target-profile="from:petstore">
+<smooks-resource-list xmlns="http://www.milyn.org/xsd/smooks-1.1.xsd"
+ xmlns:jb="http://www.milyn.org/xsd/smooks/javabean-1.1.xsd"
+ default-target-profile="from:petstore">
<!-- Populate the OrderHeader -->
- <resource-config selector="order">
- <resource>org.milyn.javabean.BeanPopulator</resource>
- <param name="beanId">orderHeader</param>
- <param name="beanClass">org.jboss.soa.esb.store.OrderHeader</param>
- <param name="bindings">
- <binding property="orderId" selector="Order @orderId" />
- <binding property="orderDate" selector="Order @orderDate" type="LongDate"/>
- <binding property="statusCode" selector="Order @status" />
- <binding property="totalAmount" selector="Order @totalPrice" type="Double" />
- </param>
- </resource-config>
+ <jb:bindings beanId="orderHeader" class="org.jboss.soa.esb.store.OrderHeader" createOnElement="order">
+ <jb:value property="orderId" data="Order/@orderId" />
+ <jb:value property="orderDate" data="Order/@orderDate" decoder="Calendar">
+ <jb:decodeParam name="format">EEE MMM dd HH:mm:ss z yyyy</jb:decodeParam>
+ </jb:value>
+ <jb:value property="statusCode" data="Order/@status" />
+ <jb:value property="totalAmount" data="Order/@totalPrice" decoder="Double" />
+ </jb:bindings>
<!-- Populate the Customer -->
- <resource-config selector="order">
- <resource>org.milyn.javabean.BeanPopulator</resource>
- <param name="beanId">customer</param>
- <param name="beanClass">org.jboss.soa.esb.store.Customer</param>
- <param name="bindings">
- <binding property="userName" selector="order @username" />
- <binding property="firstName" selector="order @shipToFirstName" />
- <binding property="lastName" selector="order @shipToLastName" />
- <binding property="state" selector="order @shipState" />
- </param>
- </resource-config>
+ <jb:bindings beanId="customer" class="org.jboss.soa.esb.store.Customer" createOnElement="order">
+ <jb:value property="userName" data="order/@userName" />
+ <jb:value property="firstName" data="order/@shipToFirstName" />
+ <jb:value property="lastName" data="order/@shipToLastName" />
+ <jb:value property="state" data="order/@shipState" />
+ </jb:bindings>
<!-- Populate the OrderItem list -->
- <resource-config selector="order LineItems LineItem">
- <resource>org.milyn.javabean.BeanPopulator</resource>
- <param name="beanId">orderItem</param>
- <param name="beanClass">org.jboss.soa.esb.store.OrderItem</param>
- <param name="addToList">true</param>
- <param name="bindings">
- <binding property="position" selector="LineItem @lineNumber" type="Integer" />
- <binding property="quantity" selector="LineItem @quantity" type="Integer" />
- <binding property="productId" selector="LineItem Item @itemId" />
- <binding property="price" selector="LineItem Item @listPrice" type="Double" />
- <binding property="title" selector="LineItem Item @name" />
- </param>
- </resource-config>
+ <jb:bindings beanId="orderItemList" class="java.util.ArrayList" createOnElement="LineItems">
+ <jb:wiring beanIdRef="orderItem" />
+ </jb:bindings>
+ <!-- Populate the OrderItem instance -->
+ <jb:bindings beanId="orderItem" class="org.jboss.soa.esb.store.OrderItem" createOnElement="LineItems/LineItem">
+ <jb:value property="position" data="LineItem/@lineNumber" decoder="Integer" />
+ <jb:value property="quantity" data="LineItem/@quantity" decoder="Integer" />
+ <jb:value property="productId" data="LineItem/Item/@itemId" />
+ <jb:value property="price" data="LineItem/Item/@listPrice" decoder="Double" />
+ <jb:value property="title" data="LineItem/Item/@name" />
+ </jb:bindings>
- <resource-config selector="decoder:LongDate">
- <resource>org.milyn.javabean.decoders.CalendarDecoder</resource>
- <param name="format">EEE MMM dd HH:mm:ss z yyyy</param>
- </resource-config>
</smooks-resource-list>
Copied: labs/jbossesb/branches/JBESB_4_4_GA_FP/product/services/smooks/lib/ext/jackson-lgpl-0.9.3.jar (from rev 24981, labs/jbossesb/trunk/product/services/smooks/lib/ext/jackson-lgpl-0.9.3.jar)
===================================================================
(Binary files differ)
Copied: labs/jbossesb/branches/JBESB_4_4_GA_FP/product/services/smooks/lib/ext/jline-0.9.93.jar (from rev 24981, labs/jbossesb/trunk/product/services/smooks/lib/ext/jline-0.9.93.jar)
===================================================================
(Binary files differ)
Deleted: labs/jbossesb/branches/JBESB_4_4_GA_FP/product/services/smooks/lib/ext/milyn-commons-1.0.jar
===================================================================
(Binary files differ)
Copied: labs/jbossesb/branches/JBESB_4_4_GA_FP/product/services/smooks/lib/ext/milyn-commons-1.1.jar (from rev 24981, labs/jbossesb/trunk/product/services/smooks/lib/ext/milyn-commons-1.1.jar)
===================================================================
(Binary files differ)
Deleted: labs/jbossesb/branches/JBESB_4_4_GA_FP/product/services/smooks/lib/ext/milyn-edisax-0.3.jar
===================================================================
(Binary files differ)
Deleted: labs/jbossesb/branches/JBESB_4_4_GA_FP/product/services/smooks/lib/ext/milyn-edisax-model-0.3.jar
===================================================================
(Binary files differ)
Copied: labs/jbossesb/branches/JBESB_4_4_GA_FP/product/services/smooks/lib/ext/milyn-edisax-parser-1.1.jar (from rev 24981, labs/jbossesb/trunk/product/services/smooks/lib/ext/milyn-edisax-parser-1.1.jar)
===================================================================
(Binary files differ)
Deleted: labs/jbossesb/branches/JBESB_4_4_GA_FP/product/services/smooks/lib/ext/milyn-magger-0.1.3.jar
===================================================================
(Binary files differ)
Copied: labs/jbossesb/branches/JBESB_4_4_GA_FP/product/services/smooks/lib/ext/milyn-magger-1.1.jar (from rev 24981, labs/jbossesb/trunk/product/services/smooks/lib/ext/milyn-magger-1.1.jar)
===================================================================
(Binary files differ)
Deleted: labs/jbossesb/branches/JBESB_4_4_GA_FP/product/services/smooks/lib/ext/milyn-smooks-core-1.0.1.jar
===================================================================
(Binary files differ)
Copied: labs/jbossesb/branches/JBESB_4_4_GA_FP/product/services/smooks/lib/ext/milyn-smooks-core-1.1.jar (from rev 24981, labs/jbossesb/trunk/product/services/smooks/lib/ext/milyn-smooks-core-1.1.jar)
===================================================================
(Binary files differ)
Deleted: labs/jbossesb/branches/JBESB_4_4_GA_FP/product/services/smooks/lib/ext/milyn-smooks-css-1.0.1.jar
===================================================================
(Binary files differ)
Copied: labs/jbossesb/branches/JBESB_4_4_GA_FP/product/services/smooks/lib/ext/milyn-smooks-css-1.1.jar (from rev 24981, labs/jbossesb/trunk/product/services/smooks/lib/ext/milyn-smooks-css-1.1.jar)
===================================================================
(Binary files differ)
Deleted: labs/jbossesb/branches/JBESB_4_4_GA_FP/product/services/smooks/lib/ext/milyn-smooks-csv-1.0.1.jar
===================================================================
(Binary files differ)
Copied: labs/jbossesb/branches/JBESB_4_4_GA_FP/product/services/smooks/lib/ext/milyn-smooks-csv-1.1.jar (from rev 24981, labs/jbossesb/trunk/product/services/smooks/lib/ext/milyn-smooks-csv-1.1.jar)
===================================================================
(Binary files differ)
Deleted: labs/jbossesb/branches/JBESB_4_4_GA_FP/product/services/smooks/lib/ext/milyn-smooks-edi-1.0.1.jar
===================================================================
(Binary files differ)
Copied: labs/jbossesb/branches/JBESB_4_4_GA_FP/product/services/smooks/lib/ext/milyn-smooks-edi-1.1.jar (from rev 24981, labs/jbossesb/trunk/product/services/smooks/lib/ext/milyn-smooks-edi-1.1.jar)
===================================================================
(Binary files differ)
Deleted: labs/jbossesb/branches/JBESB_4_4_GA_FP/product/services/smooks/lib/ext/milyn-smooks-javabean-1.0.1.jar
===================================================================
(Binary files differ)
Copied: labs/jbossesb/branches/JBESB_4_4_GA_FP/product/services/smooks/lib/ext/milyn-smooks-javabean-1.1.jar (from rev 24981, labs/jbossesb/trunk/product/services/smooks/lib/ext/milyn-smooks-javabean-1.1.jar)
===================================================================
(Binary files differ)
Copied: labs/jbossesb/branches/JBESB_4_4_GA_FP/product/services/smooks/lib/ext/milyn-smooks-json-1.1.jar (from rev 24981, labs/jbossesb/trunk/product/services/smooks/lib/ext/milyn-smooks-json-1.1.jar)
===================================================================
(Binary files differ)
Deleted: labs/jbossesb/branches/JBESB_4_4_GA_FP/product/services/smooks/lib/ext/milyn-smooks-misc-1.0.1.jar
===================================================================
(Binary files differ)
Copied: labs/jbossesb/branches/JBESB_4_4_GA_FP/product/services/smooks/lib/ext/milyn-smooks-misc-1.1.jar (from rev 24981, labs/jbossesb/trunk/product/services/smooks/lib/ext/milyn-smooks-misc-1.1.jar)
===================================================================
(Binary files differ)
Deleted: labs/jbossesb/branches/JBESB_4_4_GA_FP/product/services/smooks/lib/ext/milyn-smooks-routing-1.0.1.jar
===================================================================
(Binary files differ)
Copied: labs/jbossesb/branches/JBESB_4_4_GA_FP/product/services/smooks/lib/ext/milyn-smooks-routing-1.1.jar (from rev 24981, labs/jbossesb/trunk/product/services/smooks/lib/ext/milyn-smooks-routing-1.1.jar)
===================================================================
(Binary files differ)
Deleted: labs/jbossesb/branches/JBESB_4_4_GA_FP/product/services/smooks/lib/ext/milyn-smooks-scripting-1.0.1.jar
===================================================================
(Binary files differ)
Copied: labs/jbossesb/branches/JBESB_4_4_GA_FP/product/services/smooks/lib/ext/milyn-smooks-scripting-1.1.jar (from rev 24981, labs/jbossesb/trunk/product/services/smooks/lib/ext/milyn-smooks-scripting-1.1.jar)
===================================================================
(Binary files differ)
Deleted: labs/jbossesb/branches/JBESB_4_4_GA_FP/product/services/smooks/lib/ext/milyn-smooks-servlet-1.0.1.jar
===================================================================
(Binary files differ)
Copied: labs/jbossesb/branches/JBESB_4_4_GA_FP/product/services/smooks/lib/ext/milyn-smooks-servlet-1.1.jar (from rev 24981, labs/jbossesb/trunk/product/services/smooks/lib/ext/milyn-smooks-servlet-1.1.jar)
===================================================================
(Binary files differ)
Deleted: labs/jbossesb/branches/JBESB_4_4_GA_FP/product/services/smooks/lib/ext/milyn-smooks-templating-1.0.1.jar
===================================================================
(Binary files differ)
Copied: labs/jbossesb/branches/JBESB_4_4_GA_FP/product/services/smooks/lib/ext/milyn-smooks-templating-1.1.jar (from rev 24981, labs/jbossesb/trunk/product/services/smooks/lib/ext/milyn-smooks-templating-1.1.jar)
===================================================================
(Binary files differ)
Deleted: labs/jbossesb/branches/JBESB_4_4_GA_FP/product/services/smooks/lib/ext/milyn-tinak-0.8.1.jar
===================================================================
(Binary files differ)
Copied: labs/jbossesb/branches/JBESB_4_4_GA_FP/product/services/smooks/lib/ext/milyn-tinak-1.1.jar (from rev 24981, labs/jbossesb/trunk/product/services/smooks/lib/ext/milyn-tinak-1.1.jar)
===================================================================
(Binary files differ)
Modified: labs/jbossesb/branches/JBESB_4_4_GA_FP/product/services/smooks/src/main/java/org/jboss/soa/esb/actions/converters/SmooksInstanceManager.java
===================================================================
--- labs/jbossesb/branches/JBESB_4_4_GA_FP/product/services/smooks/src/main/java/org/jboss/soa/esb/actions/converters/SmooksInstanceManager.java 2009-02-17 12:37:30 UTC (rev 25304)
+++ labs/jbossesb/branches/JBESB_4_4_GA_FP/product/services/smooks/src/main/java/org/jboss/soa/esb/actions/converters/SmooksInstanceManager.java 2009-02-17 13:24:57 UTC (rev 25305)
@@ -83,7 +83,6 @@
// older instance(s) will eventually get GC'd.
try {
Smooks instance = new Smooks(configurationSourceURI);
- addBaseConfigs(instance);
// We need to disable the resource config store's shutdown hook
// because the ESB container lifecycle handles this through
@@ -98,27 +97,6 @@
}
}
- private void addBaseConfigs(Smooks instance) {
- String baseConfigs = config.getProperty("smooks.base.configs", "creators.xml");
- String[] resources = baseConfigs.split(",");
- if(logger.isDebugEnabled()) {
- logger.debug("smooks-base-configs: " + Arrays.asList(resources));
- }
- for(String resource : resources) {
- String fullResPath = "/smooks-base-configs/" + resource.trim();
- try {
- InputStream smooksRes = ClassUtil.getResourceAsStream(fullResPath, getClass());
- if(smooksRes != null) {
- instance.addConfigurations("/smooks-base-configs/", smooksRes);
- } else {
- logger.warn("Configured Smooks resource '" + fullResPath + "' doesn't exist on the classpath.");
- }
- } catch(Throwable t) {
- logger.warn("Exception while loading Smooks resource '" + fullResPath + "'.", t);
- }
- }
- }
-
/**
* JMS Listener for receiving configuration update notifications.
* @author <a href="mailto:tom.fennelly at jboss.com">tom.fennelly at jboss.com</a>
Modified: labs/jbossesb/branches/JBESB_4_4_GA_FP/product/services/smooks/src/main/java/org/jboss/soa/esb/actions/converters/SmooksTransformer.java
===================================================================
--- labs/jbossesb/branches/JBESB_4_4_GA_FP/product/services/smooks/src/main/java/org/jboss/soa/esb/actions/converters/SmooksTransformer.java 2009-02-17 12:37:30 UTC (rev 25304)
+++ labs/jbossesb/branches/JBESB_4_4_GA_FP/product/services/smooks/src/main/java/org/jboss/soa/esb/actions/converters/SmooksTransformer.java 2009-02-17 13:24:57 UTC (rev 25305)
@@ -38,6 +38,7 @@
import org.milyn.SmooksUtil;
import org.milyn.container.ExecutionContext;
import org.milyn.javabean.BeanAccessor;
+import org.milyn.javabean.repository.BeanRepository;
import org.milyn.profile.DefaultProfileSet;
import org.milyn.profile.ProfileStore;
import org.milyn.profile.UnknownProfileMemberException;
@@ -321,8 +322,8 @@
executionContext = smooks.createExecutionContext(messageProfile);
}
transformedMessage = SmooksUtil.filterAndSerialize(executionContext, new ByteArrayInputStream( messageBytes), smooks);
-
- HashMap beanHash = BeanAccessor.getBeans(executionContext); // Backward compatibility.
+
+ HashMap beanHash = getBeanHashMap(executionContext);
if(beanHash != null) {
message.getBody().add(EXTRACTED_BEANS_HASH, beanHash); // Backward compatibility.
} else {
@@ -360,7 +361,7 @@
// Set the transformation Java output. Will be the individual
// java objects directly on the message and (optionally) the map itself...
- Map beanMap = BeanAccessor.getBeans(executionContext);
+ Map beanMap = BeanRepository.getInstance(executionContext).getBeanMap();
if(beanMap != null) {
Iterator<Map.Entry> beans = beanMap.entrySet().iterator();
while (beans.hasNext()) {
@@ -409,12 +410,12 @@
// Get the routing info from the message...
messageFrom = (String)message.getProperties().getProperty(FROM, defaultMessageFrom);
messageTo = (String)message.getProperties().getProperty(TO, defaultMessageTo);
-
+
// Get the message typing info from the message...
messageFromType = (String)message.getProperties().getProperty(FROM_TYPE, defaultMessageFromType);
messageToType = (String)message.getProperties().getProperty(TO_TYPE, defaultMessageToType);
-
- // Construct the message profile string for use with Smooks. This is basically the
+
+ // Construct the message profile string for use with Smooks. This is basically the
// name of the Message Exchange on which transformations are to be performed...
messageProfile = getMessageProfileString(messageFromType, messageFrom, messageToType, messageTo);
@@ -435,7 +436,7 @@
}
}
}
-
+
return messageProfile;
}
@@ -450,7 +451,7 @@
protected static String[] getMessageProfiles(String messageFromType, String messageFrom, String messageToType, String messageTo) {
List<String> profiles = new ArrayList<String>();
String[] profileArray;
-
+
if(messageFromType != null) {
profiles.add(FROM_TYPE + ":" + messageFromType);
}
@@ -463,7 +464,7 @@
if(messageTo != null) {
profiles.add(TO + ":" + messageTo);
}
-
+
profileArray = new String[profiles.size()];
profiles.toArray(profileArray);
@@ -480,7 +481,7 @@
*/
protected static String getMessageProfileString(String messageFromType, String messageFrom, String messageToType, String messageTo) {
StringBuffer string = new StringBuffer();
-
+
if(messageFromType != null) {
string.append(FROM_TYPE + ":" + messageFromType);
string.append((messageFrom!=null || messageToType!=null || messageTo!=null?":":""));
@@ -504,6 +505,11 @@
return string.toString();
}
+ private HashMap getBeanHashMap(ExecutionContext executionContext) {
+ Map beanMap = BeanRepository.getInstance(executionContext).getBeanMap();
+ return new HashMap(beanMap);
+ }
+
public void processException(final Message message, final Throwable th) {
}
Modified: labs/jbossesb/branches/JBESB_4_4_GA_FP/product/services/soapui-client/src/main/java/org/jboss/soa/esb/services/soapui/SoapUIClientService.java
===================================================================
--- labs/jbossesb/branches/JBESB_4_4_GA_FP/product/services/soapui-client/src/main/java/org/jboss/soa/esb/services/soapui/SoapUIClientService.java 2009-02-17 12:37:30 UTC (rev 25304)
+++ labs/jbossesb/branches/JBESB_4_4_GA_FP/product/services/soapui-client/src/main/java/org/jboss/soa/esb/services/soapui/SoapUIClientService.java 2009-02-17 13:24:57 UTC (rev 25305)
@@ -481,7 +481,6 @@
if(smooks == null) {
smooks = new Smooks();
smooks.addConfigurations("smooks-resource", new ByteArrayInputStream(smooksResource.getBytes("UTF-8")));
- smooks.addConfigurations("cdu-creators", new URIResourceLocator().getResource("/META-INF/smooks-creators.xml"));
smooksCache.put(smooksResource, smooks);
}
More information about the jboss-svn-commits
mailing list