[jboss-svn-commits] JBL Code SVN: r21017 - in labs/jbossesb/trunk: product/samples/quickstarts/bpm_orchestration4/scripts and 14 other directories.
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Sun Jul 13 03:47:58 EDT 2008
Author: tfennelly
Date: 2008-07-13 03:47:58 -0400 (Sun, 13 Jul 2008)
New Revision: 21017
Added:
labs/jbossesb/trunk/product/samples/quickstarts/bpm_orchestration4/scripts/capture_original.groovy
labs/jbossesb/trunk/product/samples/quickstarts/business_rules_service/map_order_components.groovy
Removed:
labs/jbossesb/trunk/product/samples/quickstarts/bpm_orchestration4/altered_jboss-esb.xml
Modified:
labs/jbossesb/trunk/product/samples/quickstarts/bpm_orchestration4/jboss-esb.xml
labs/jbossesb/trunk/product/samples/quickstarts/bpm_orchestration4/scripts/check-origin.groovy
labs/jbossesb/trunk/product/samples/quickstarts/bpm_orchestration4/smooks-config.xml
labs/jbossesb/trunk/product/samples/quickstarts/bpm_orchestration4/src/org/jboss/soa/esb/samples/quickstarts/bpm_orchestration4/esb_actions/SetupMessage.java
labs/jbossesb/trunk/product/samples/quickstarts/bpm_orchestration4/src/org/jboss/soa/esb/store/StoreAction.java
labs/jbossesb/trunk/product/samples/quickstarts/business_rules_service/build.xml
labs/jbossesb/trunk/product/samples/quickstarts/business_rules_service/jboss-esb.xml
labs/jbossesb/trunk/product/samples/quickstarts/business_rules_service/smooks-res.xml
labs/jbossesb/trunk/product/samples/quickstarts/business_ruleservice_ruleAgent/build.xml
labs/jbossesb/trunk/product/samples/quickstarts/business_ruleservice_ruleAgent/jboss-esb.xml
labs/jbossesb/trunk/product/samples/quickstarts/business_ruleservice_ruleAgent/ruleAgent/brmsdeployedrules.properties
labs/jbossesb/trunk/product/samples/quickstarts/business_ruleservice_ruleAgent/smooks-res.xml
labs/jbossesb/trunk/product/samples/quickstarts/business_ruleservice_ruleAgent/src/org/jboss/soa/esb/samples/quickstart/ruleagent/businessrules/SetupMessage.java
labs/jbossesb/trunk/product/samples/quickstarts/business_ruleservice_stateful/jboss-esb.xml
labs/jbossesb/trunk/product/samples/quickstarts/business_ruleservice_stateful/src/org/jboss/soa/esb/samples/quickstart/businessrulesstateful/SetupMessage.java
labs/jbossesb/trunk/product/samples/quickstarts/transform_CSV2XML/jboss-esb.xml
labs/jbossesb/trunk/product/samples/quickstarts/transform_CSV2XML/smooks-res.xml
labs/jbossesb/trunk/product/samples/quickstarts/transform_XML2POJO2/jboss-esb.xml
labs/jbossesb/trunk/product/samples/quickstarts/transform_XML2POJO2/scripts/check-origin.groovy
labs/jbossesb/trunk/product/samples/quickstarts/transform_XML2POJO2/smooks-config.xml
labs/jbossesb/trunk/product/samples/quickstarts/transform_XML2POJO2/src/org/jboss/soa/esb/store/StoreAction.java
labs/jbossesb/trunk/product/samples/quickstarts/transform_XML2XML_stream/jboss-esb.xml
labs/jbossesb/trunk/qa/quickstarts/src/org/jboss/soa/esb/quickstart/test/BusinessRulesServiceTest.java
Log:
http://jira.jboss.com/jira/browse/JBESB-1831
http://jira.jboss.com/jira/browse/JBESB-1832
http://jira.jboss.com/jira/browse/JBESB-1868
Deleted: labs/jbossesb/trunk/product/samples/quickstarts/bpm_orchestration4/altered_jboss-esb.xml
===================================================================
--- labs/jbossesb/trunk/product/samples/quickstarts/bpm_orchestration4/altered_jboss-esb.xml 2008-07-12 21:24:19 UTC (rev 21016)
+++ labs/jbossesb/trunk/product/samples/quickstarts/bpm_orchestration4/altered_jboss-esb.xml 2008-07-13 07:47:58 UTC (rev 21017)
@@ -1,209 +0,0 @@
-<?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"
- 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-bus busid="startGwChannel">
- <jms-message-filter dest-type="QUEUE"
- dest-name="queue/quickstart_bpm_orchestration4_start_gw" />
- </jms-bus>
- <jms-bus busid="startEsbChannel">
- <jms-message-filter dest-type="QUEUE"
- dest-name="queue/quickstart_bpm_orchestration4_start_esb" />
- </jms-bus>
- <jms-bus busid="intakeServiceEsbChannel">
- <jms-message-filter dest-type="QUEUE"
- dest-name="queue/quickstart_bpm_orchestration4_intake_service_esb" />
- </jms-bus>
- <jms-bus busid="discountServiceEsbChannel">
- <jms-message-filter dest-type="QUEUE"
- dest-name="queue/quickstart_bpm_orchestration4_discount_service_esb" />
- </jms-bus>
- <jms-bus busid="shippingServiceEsbChannel">
- <jms-message-filter dest-type="QUEUE"
- dest-name="queue/quickstart_bpm_orchestration4_shipping_service_esb" />
- </jms-bus>
- <jms-bus busid="conciergeServiceEsbChannel">
- <jms-message-filter dest-type="QUEUE"
- dest-name="queue/quickstart_bpm_orchestration4_ConciergeManager" />
- </jms-bus>
- <jms-bus busid="distributionServiceEsbChannel">
- <jms-message-filter dest-type="QUEUE"
- dest-name="queue/quickstart_bpm_orchestration4_DistributionManager" />
- </jms-bus>
- <jms-bus busid="basicShippingServiceEsbChannel">
- <jms-message-filter dest-type="QUEUE"
- dest-name="queue/quickstart_bpm_orchestration4_BasicShipping" />
- </jms-bus>
-
- </jms-provider>
- </providers>
-
- <services>
- <!-- removed the deploy service, this process definition needs to be deployed by a .par and/or from
- the graphical process designer -->
- <service category="BPM_orchestration4_Starter_Service" name="Starter_Service"
- description="BPM Orchestration Sample 4: Use this service to start a process instance">
- <listeners>
- <jms-listener name="JMS-Gateway" busidref="startGwChannel"
- maxThreads="1"
- is-gateway="true" />
- <jms-listener name="ESB-Listener" busidref="startEsbChannel"
- maxThreads="1"/>
- </listeners>
- <actions>
-
- <action name="transformXML2POJO"
- class="org.jboss.soa.esb.actions.converters.SmooksTransformer">
- <property name="resource-config"
- value="/smooks-res.xml" />
- </action>
- <!--
- <action name="dump2" class="org.jboss.soa.esb.actions.SystemPrintln">
- <property name="message" value="After" />
- <property name="printfull" value="true"/>
- </action>
- -->
- <action name="SetupMessage"
- class="org.jboss.soa.esb.samples.quickstarts.bpm_orchestration4.esb_actions.SetupMessage">
- <property name="status" value="60" /><!-- status was not in order XML -->
- </action>
-
- <action name="start_a_new_order_process"
- class="org.jboss.soa.esb.services.jbpm.actions.BpmProcessor">
- <property name="command" value="StartProcessInstanceCommand" />
- <property name="process-definition-name" value="bpm4_ESBOrderProcess"/>
- <property name="key" value="businessKey"/>
- <property name="object-paths">
- <object-path esb="body.entireOrder" bpm="entireOrder" />
- <object-path esb="body.order.orderId" bpm="order_orderid" />
-
-
- <object-path esb="body.customer.firstName" bpm="customer_firstName" />
- <object-path esb="body.customer.lastName" bpm="customer_lastName" />
- <object-path esb="body.customer.status" bpm="customer_status" />
- </property>
-
- </action>
- <!--
- <action name="dump3" class="org.jboss.soa.esb.actions.SystemPrintln">
- <property name="message" value="After" />
- <property name="printfull" value="true"/>
- </action>
- -->
- </actions>
- </service>
- <!-- no external signal is necessary
- <service category="BPM_orchestration4_Signal_Service" name="Signal_Service"
- description="BPM Orchestration Sample 3: Use this service to signal a process instance">
- <listeners>
- <jms-listener name="JMS-Gateway" busidref="signalGwChannel"
- maxThreads="1"
- is-gateway="true" />
- <jms-listener name="ESB-Listener" busidref="signalEsbChannel"
- maxThreads="1"/>
- </listeners>
- <actions>
-
- <action name="dump1" class="org.jboss.soa.esb.actions.SystemPrintln">
- <property name="message" value="SIGNAL" />
- <property name="printfull" value="true"/>
- </action>
-
- <action name="SetupSignal" class="org.jboss.soa.esb.samples.quickstarts.bpm_orchestration4.esb_actions.SetupSignal"/>
-
- <action name="signal_a_process_instance"
- class="org.jboss.soa.esb.services.jbpm.actions.BpmProcessor">
- <property name="command" value="SignalCommand" />
- <property name="object-paths">
- <object-path esb="BODY_CONTENT" bpm="theBody" />
- <object-path esb="body" bpm="theData" />
- </property>
- </action>
-
-
- <action name="dump2" class="org.jboss.soa.esb.actions.SystemPrintln">
- <property name="message" value="After" />
- <property name="printfull" value="true"/>
- </action>
-
- </actions>
- </service>
- -->
-
- <service category="BPM_Orchestration4" name="IntakeService"
- description="IntakeService">
- <listeners>
- <jms-listener name="ESB-Listener" busidref="intakeServiceEsbChannel"
- maxThreads="1"/>
- </listeners>
- <actions>
- <!--
- <action name="dump" class="org.jboss.soa.esb.actions.SystemPrintln">
- <property name="printfull" value="true"/>
- </action>
- -->
-
- <action name="groovy" class="org.jboss.soa.esb.actions.scripting.GroovyActionProcessor">
- <property name="script" value="/scripts/intake_service.groovy" />
- </action>
-
- <!--
- <action name="alert" class="org.jboss.soa.esb.samples.quickstarts.bpm_orchestration4.esb_actions.SimpleJMSNotifier">
- <property name="ALERT_QUEUE_NAME" value="quickstart_bpm_orchestration4_service1_Alert" />
- </action>
- -->
- </actions>
- </service>
- <service category="BPM_Orchestration4" name="DiscountService"
- description="DiscountService">
- <listeners>
- <jms-listener name="ESB-Listener" busidref="discountServiceEsbChannel"
- maxThreads="1"/>
- </listeners>
- <actions>
- <!--
- <action name="dump" class="org.jboss.soa.esb.actions.SystemPrintln">
- <property name="printfull" value="true"/>
- </action>
- -->
- <action name="groovy" class="org.jboss.soa.esb.actions.scripting.GroovyActionProcessor">
- <property name="script" value="/scripts/discount_service.groovy" />
- </action>
- <!--
- <action name="alert" class="org.jboss.soa.esb.samples.quickstarts.bpm_orchestration2.esb_actions.SimpleJMSNotifier">
- <property name="ALERT_QUEUE_NAME" value="quickstart_bpm_orchestration2_service2_Alert" />
- </action>
- -->
- </actions>
- </service>
- <service category="BPM_Orchestration4" name="ShippingService"
- description="ShippingService">
- <listeners>
- <jms-listener name="ESB-Listener" busidref="shippingServiceEsbChannel"
- maxThreads="1"/>
- </listeners>
- <actions>
- <!--
- <action name="dump" class="org.jboss.soa.esb.actions.SystemPrintln">
- <property name="printfull" value="true"/>
- </action>
- -->
- <action name="groovy" class="org.jboss.soa.esb.actions.scripting.GroovyActionProcessor">
- <property name="script" value="/scripts/shipping_service.groovy" />
- </action>
- <!--
- <action name="alert" class="org.jboss.soa.esb.samples.quickstarts.bpm_orchestration2.esb_actions.SimpleJMSNotifier">
- <property name="ALERT_QUEUE_NAME" value="quickstart_bpm_orchestration2_service3_Alert" />
- </action>
- -->
- </actions>
- </service>
-
- </services>
-
-</jbossesb>
Modified: labs/jbossesb/trunk/product/samples/quickstarts/bpm_orchestration4/jboss-esb.xml
===================================================================
--- labs/jbossesb/trunk/product/samples/quickstarts/bpm_orchestration4/jboss-esb.xml 2008-07-12 21:24:19 UTC (rev 21016)
+++ labs/jbossesb/trunk/product/samples/quickstarts/bpm_orchestration4/jboss-esb.xml 2008-07-13 07:47:58 UTC (rev 21017)
@@ -107,14 +107,20 @@
<action name="dump" class="org.jboss.soa.esb.actions.SystemPrintln">
<property name="printfull" value="true"/>
</action>
-
- <!-- transform -->
+
+ <action name="capture-original-message" class="org.jboss.soa.esb.actions.scripting.GroovyActionProcessor">
+ <property name="script" value="/scripts/capture_original.groovy" />
+ </action>
+
+ <!-- Initialise message profile... -->
<action name="discover-message-origin" class="org.jboss.soa.esb.actions.scripting.GroovyActionProcessor">
<property name="script" value="/scripts/check-origin.groovy" />
</action>
- <action name="transform" class="org.jboss.soa.esb.actions.converters.SmooksTransformer">
- <property name="resource-config" value="/smooks-config.xml" />
+ <!-- Transform XML to POJOs... -->
+ <action name="transform" class="org.jboss.soa.esb.smooks.SmooksAction">
+ <property name="smooksConfig" value="/smooks-config.xml" />
+ <property name="resultType" value="JAVA" />
</action>
<action name="SetupMessage"
Added: labs/jbossesb/trunk/product/samples/quickstarts/bpm_orchestration4/scripts/capture_original.groovy
===================================================================
--- labs/jbossesb/trunk/product/samples/quickstarts/bpm_orchestration4/scripts/capture_original.groovy (rev 0)
+++ labs/jbossesb/trunk/product/samples/quickstarts/bpm_orchestration4/scripts/capture_original.groovy 2008-07-13 07:47:58 UTC (rev 21017)
@@ -0,0 +1,3 @@
+// Capture the original XML message and store it on the message
+// under "entireOrderAsXML"...
+message.getBody().add("entireOrderAsXML", message.getBody().get());
\ No newline at end of file
Modified: labs/jbossesb/trunk/product/samples/quickstarts/bpm_orchestration4/scripts/check-origin.groovy
===================================================================
--- labs/jbossesb/trunk/product/samples/quickstarts/bpm_orchestration4/scripts/check-origin.groovy 2008-07-12 21:24:19 UTC (rev 21016)
+++ labs/jbossesb/trunk/product/samples/quickstarts/bpm_orchestration4/scripts/check-origin.groovy 2008-07-13 07:47:58 UTC (rev 21017)
@@ -1,3 +1,4 @@
+import org.jboss.soa.esb.message.*
def messageText = message.getBody().get();
def order = new XmlParser().parseText(messageText);
@@ -3,7 +4,7 @@
if(order.OrderLines.size() == 1) {
- message.getProperties().setProperty("from", "dvdstore");
+ message.getProperties().setProperty(Properties.MESSAGE_PROFILE, "from:dvdstore");
} else if(order.LineItems.size() == 1) {
- message.getProperties().setProperty("from", "petstore");
+ message.getProperties().setProperty(Properties.MESSAGE_PROFILE, "from:petstore");
}
Modified: labs/jbossesb/trunk/product/samples/quickstarts/bpm_orchestration4/smooks-config.xml
===================================================================
--- labs/jbossesb/trunk/product/samples/quickstarts/bpm_orchestration4/smooks-config.xml 2008-07-12 21:24:19 UTC (rev 21016)
+++ labs/jbossesb/trunk/product/samples/quickstarts/bpm_orchestration4/smooks-config.xml 2008-07-13 07:47:58 UTC (rev 21017)
@@ -1,6 +1,11 @@
<?xml version="1.0"?>
<smooks-resource-list xmlns="http://www.milyn.org/xsd/smooks-1.0.xsd">
+ <profiles>
+ <profile base-profile="from:dvdstore" />
+ <profile base-profile="from:petstore" />
+ </profiles>
+
<import file="classpath:/transforms/from-dvdstore.xml" />
<import file="classpath:/transforms/from-petstore.xml" />
Modified: labs/jbossesb/trunk/product/samples/quickstarts/bpm_orchestration4/src/org/jboss/soa/esb/samples/quickstarts/bpm_orchestration4/esb_actions/SetupMessage.java
===================================================================
--- labs/jbossesb/trunk/product/samples/quickstarts/bpm_orchestration4/src/org/jboss/soa/esb/samples/quickstarts/bpm_orchestration4/esb_actions/SetupMessage.java 2008-07-12 21:24:19 UTC (rev 21016)
+++ labs/jbossesb/trunk/product/samples/quickstarts/bpm_orchestration4/src/org/jboss/soa/esb/samples/quickstarts/bpm_orchestration4/esb_actions/SetupMessage.java 2008-07-13 07:47:58 UTC (rev 21017)
@@ -20,23 +20,26 @@
*/
package org.jboss.soa.esb.samples.quickstarts.bpm_orchestration4.esb_actions;
+import org.apache.log4j.Logger;
import org.jboss.soa.esb.actions.AbstractActionPipelineProcessor;
import org.jboss.soa.esb.actions.ActionProcessingException;
import org.jboss.soa.esb.helpers.ConfigTree;
import org.jboss.soa.esb.message.Message;
import org.jboss.soa.esb.store.Customer;
import org.jboss.soa.esb.store.OrderHeader;
-import org.apache.log4j.Logger;
+import java.util.Map;
+
public class SetupMessage extends AbstractActionPipelineProcessor {
private Logger logger = Logger.getLogger(SetupMessage.class);
private int status = 0;
public Message process(Message message) throws ActionProcessingException {
- OrderHeader order = (OrderHeader) message.getBody().get("orderHeader");
- Customer customer = (Customer) message.getBody().get("customer");
- //List orderItems = (List) message.getBody().get("orderItemList");
+ Map javaResultMap = (Map) message.getBody().get();
+ OrderHeader order = (OrderHeader) javaResultMap.get("orderHeader");
+ Customer customer = (Customer) javaResultMap.get("customer");
+ //List orderItems = (List) javaResultMap.get("orderItemList");
customer.setStatus(status);
@@ -46,7 +49,9 @@
logger.info("businessKey: " + order.getOrderId());
logger.info("--------------------------------");
- message.getBody().add("entireOrderAsXML", message.getBody().get());
+ message.getBody().add("orderHeader", order);
+ message.getBody().add("customer", customer);
+
message.getBody().add("order_orderId", order.getOrderId());
message.getBody().add("order_orderPriority", order.getOrderPriority());
message.getBody().add("order_totalAmount", order.getTotalAmount());
Modified: labs/jbossesb/trunk/product/samples/quickstarts/bpm_orchestration4/src/org/jboss/soa/esb/store/StoreAction.java
===================================================================
--- labs/jbossesb/trunk/product/samples/quickstarts/bpm_orchestration4/src/org/jboss/soa/esb/store/StoreAction.java 2008-07-12 21:24:19 UTC (rev 21016)
+++ labs/jbossesb/trunk/product/samples/quickstarts/bpm_orchestration4/src/org/jboss/soa/esb/store/StoreAction.java 2008-07-13 07:47:58 UTC (rev 21017)
@@ -42,7 +42,7 @@
StringBuffer results = new StringBuffer();
// "order", "customer", "orderItem" is set in the smooks config file: from-dvdstore.xml
- OrderHeader header = (OrderHeader) message.getBody().get("orderHeader");
+ OrderHeader header = (OrderHeader) message.getBody().get("orderHeader");
Customer customer = (Customer) message.getBody().get("customer");
List orderItems = (List) message.getBody().get("orderItemList");
// System.out.println("************************\n\n");
Modified: labs/jbossesb/trunk/product/samples/quickstarts/business_rules_service/build.xml
===================================================================
--- labs/jbossesb/trunk/product/samples/quickstarts/business_rules_service/build.xml 2008-07-12 21:24:19 UTC (rev 21016)
+++ labs/jbossesb/trunk/product/samples/quickstarts/business_rules_service/build.xml 2008-07-13 07:47:58 UTC (rev 21017)
@@ -5,7 +5,7 @@
${line.separator}
</description>
- <property name="additional.deploys" value="MyBusinessRulesDiscount.drl MyBusinessRules.drl MyRoutingRules.drl smooks-res.xml"/>
+ <property name="additional.deploys" value="MyBusinessRulesDiscount.drl MyBusinessRules.drl MyRoutingRules.drl smooks-res.xml *.groovy"/>
<!-- Import the base Ant build script... -->
<import file="../conf/base-build.xml"/>
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-12 21:24:19 UTC (rev 21016)
+++ labs/jbossesb/trunk/product/samples/quickstarts/business_rules_service/jboss-esb.xml 2008-07-13 07:47:58 UTC (rev 21017)
@@ -48,12 +48,16 @@
-->
<action name="transform"
- class="org.jboss.soa.esb.actions.converters.SmooksTransformer">
- <property name="resource-config"
- value="/smooks-res.xml" />
+ class="org.jboss.soa.esb.smooks.SmooksAction">
+ <property name="smooksConfig" value="/smooks-res.xml" />
+ <property name="resultType" value="JAVA" />
</action>
- <!-- Use the BRP to calculate the order priority -->
+ <action name="map_order_components" class="org.jboss.soa.esb.actions.scripting.GroovyActionProcessor">
+ <property name="script" value="/map_order_components.groovy" />
+ </action>
+
+ <!-- Use the BRP to calculate the order priority -->
<action
class="org.jboss.soa.esb.actions.BusinessRulesProcessor"
name="BRP">
Added: labs/jbossesb/trunk/product/samples/quickstarts/business_rules_service/map_order_components.groovy
===================================================================
--- labs/jbossesb/trunk/product/samples/quickstarts/business_rules_service/map_order_components.groovy (rev 0)
+++ labs/jbossesb/trunk/product/samples/quickstarts/business_rules_service/map_order_components.groovy 2008-07-13 07:47:58 UTC (rev 21017)
@@ -0,0 +1,4 @@
+// Need to map down the orderHeader and customer beans onto the message
+// to make them available to the ObjectMapper...
+message.getBody().add("orderHeader", message.getBody().get().get("orderHeader"));
+message.getBody().add("customer", message.getBody().get().get("customer"));
\ No newline at end of file
Modified: labs/jbossesb/trunk/product/samples/quickstarts/business_rules_service/smooks-res.xml
===================================================================
--- labs/jbossesb/trunk/product/samples/quickstarts/business_rules_service/smooks-res.xml 2008-07-12 21:24:19 UTC (rev 21016)
+++ labs/jbossesb/trunk/product/samples/quickstarts/business_rules_service/smooks-res.xml 2008-07-13 07:47:58 UTC (rev 21017)
@@ -7,12 +7,12 @@
<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" />
+ <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>
@@ -22,10 +22,10 @@
<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" />
+ <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>
@@ -36,11 +36,11 @@
<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" />
+ <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>
Modified: labs/jbossesb/trunk/product/samples/quickstarts/business_ruleservice_ruleAgent/build.xml
===================================================================
--- labs/jbossesb/trunk/product/samples/quickstarts/business_ruleservice_ruleAgent/build.xml 2008-07-12 21:24:19 UTC (rev 21016)
+++ labs/jbossesb/trunk/product/samples/quickstarts/business_ruleservice_ruleAgent/build.xml 2008-07-13 07:47:58 UTC (rev 21017)
@@ -6,16 +6,20 @@
</description>
<property name="additional.deploys" value="ruleAgent/brmsdeployedrules.properties ruleAgent/package/org.jboss.soa.esb.services.rules.pkg smooks-res.xml"/>
-
- <target name="quickstart-specific-assemblies">
- <copy file="${basedir}/ruleAgent/brmsdeployedrules-unfiltered.properties" tofile="${basedir}/ruleAgent/brmsdeployedrules.properties" overwrite="true" filtering="true">
- <filterset>
- <filter token="quickstart.dir" value="${basedir}"/>
- </filterset>
- </copy>
- </target>
-
+ <target name="quickstart-specific-assemblies">
+ <pathconvert targetos="unix" property="basedir_unix">
+ <path><pathelement location="${basedir}"/></path>
+ </pathconvert>
+
+ <copy file="${basedir}/ruleAgent/brmsdeployedrules-unfiltered.properties" tofile="${basedir}/ruleAgent/brmsdeployedrules.properties" overwrite="true" filtering="true">
+ <filterset>
+ <filter token="quickstart.dir" value="${basedir_unix}"/>
+ </filterset>
+ </copy>
+ </target>
+
+
<!-- Import the base Ant build script... -->
<import file="../conf/base-build.xml"/>
Modified: labs/jbossesb/trunk/product/samples/quickstarts/business_ruleservice_ruleAgent/jboss-esb.xml
===================================================================
--- labs/jbossesb/trunk/product/samples/quickstarts/business_ruleservice_ruleAgent/jboss-esb.xml 2008-07-12 21:24:19 UTC (rev 21016)
+++ labs/jbossesb/trunk/product/samples/quickstarts/business_ruleservice_ruleAgent/jboss-esb.xml 2008-07-13 07:47:58 UTC (rev 21017)
@@ -20,48 +20,44 @@
<services>
- <service category="PolicyPricingServices"
- name="PolicyPricingService" description="Prices the policy application">
- <listeners>
- <!-- Gateway -->
- <jms-listener name="TheGateway"
- busidref="quickstartGwChannel" maxThreads="1" is-gateway="true" />
- <jms-listener name="TheESBChannel"
- busidref="quickstartEsbChannel" maxThreads="1">
- </jms-listener>
- </listeners>
-
- <actions mep="OneWay">
- <action name="print-before" class="org.jboss.soa.esb.actions.SystemPrintln">
- <property name="message" value="Message before transformation" />
- </action>
-
- <action name="transform"
- class="org.jboss.soa.esb.actions.converters.SmooksTransformer">
- <property name="resource-config"
- value="/smooks-res.xml" />
- </action>
-
- <action name="fixUpMessage"
- class="org.jboss.soa.esb.samples.quickstart.ruleagent.businessrules.SetupMessage">
- </action>
+ <service category="PolicyPricingServices"
+ name="PolicyPricingService" description="Prices the policy application">
+ <listeners>
+ <!-- Gateway -->
+ <jms-listener name="TheGateway"
+ busidref="quickstartGwChannel" maxThreads="1" is-gateway="true" />
+ <jms-listener name="TheESBChannel"
+ busidref="quickstartEsbChannel" maxThreads="1">
+ </jms-listener>
+ </listeners>
+
+ <actions mep="OneWay">
+ <action name="print-before" class="org.jboss.soa.esb.actions.SystemPrintln">
+ <property name="message" value="Message before transformation" />
+ </action>
+
+ <action name="transform" class="org.jboss.soa.esb.smooks.SmooksAction">
+ <property name="smooksConfig" value="/smooks-res.xml" />
+ <property name="resultType" value="JAVA" />
+ </action>
+
+ <action name="fixUpMessage" class="org.jboss.soa.esb.samples.quickstart.ruleagent.businessrules.SetupMessage" />
<!-- Use the BRP to calculate the policy price -->
<action
- class="org.jboss.soa.esb.actions.BusinessRulesProcessor"
- name="PolicyPricing">
- <property name="ruleAgentProperties" value="ruleAgent/brmsdeployedrules.properties" />
+ class="org.jboss.soa.esb.actions.BusinessRulesProcessor" name="PolicyPricing">
+ <property name="ruleAgentProperties" value="ruleAgent/brmsdeployedrules.properties" />
<property name="object-paths">
<object-path esb="body.Driver" />
<object-path esb="body.Policy" />
</property>
- </action>
-
- <action name="reviewMessage"
- class="org.jboss.soa.esb.samples.quickstart.ruleagent.businessrules.ReviewMessage">
- <property name="stuff" value="Sent notification: "/>
- </action>
- </actions>
+ </action>
+
+ <action name="reviewMessage"
+ class="org.jboss.soa.esb.samples.quickstart.ruleagent.businessrules.ReviewMessage">
+ <property name="stuff" value="Sent notification: "/>
+ </action>
+ </actions>
</service>
</services>
</jbossesb>
Modified: labs/jbossesb/trunk/product/samples/quickstarts/business_ruleservice_ruleAgent/ruleAgent/brmsdeployedrules.properties
===================================================================
--- labs/jbossesb/trunk/product/samples/quickstarts/business_ruleservice_ruleAgent/ruleAgent/brmsdeployedrules.properties 2008-07-12 21:24:19 UTC (rev 21016)
+++ labs/jbossesb/trunk/product/samples/quickstarts/business_ruleservice_ruleAgent/ruleAgent/brmsdeployedrules.properties 2008-07-13 07:47:58 UTC (rev 21017)
@@ -1,6 +1,6 @@
newInstance=true
-file=/opt/jboss/esb/trunk/product/samples/quickstarts/business_ruleservice_ruleAgent/ruleAgent/package/org.jboss.soa.esb.services.rules.pkg
+file=H:/Jboss/ESB/trunk/product/samples/quickstarts/business_ruleservice_ruleAgent/ruleAgent/package/org.jboss.soa.esb.services.rules.pkg
#dir=/ruleAgent/package
Modified: labs/jbossesb/trunk/product/samples/quickstarts/business_ruleservice_ruleAgent/smooks-res.xml
===================================================================
--- labs/jbossesb/trunk/product/samples/quickstarts/business_ruleservice_ruleAgent/smooks-res.xml 2008-07-12 21:24:19 UTC (rev 21016)
+++ labs/jbossesb/trunk/product/samples/quickstarts/business_ruleservice_ruleAgent/smooks-res.xml 2008-07-13 07:47:58 UTC (rev 21017)
@@ -7,21 +7,21 @@
<param name="beanId">Policy</param>
<param name="beanClass">org.jboss.soa.esb.services.rules.Policy</param>
<param name="bindings">
- <binding property="type" selector="policy @type" />
+ <binding property="type" selector="policy/@type" />
</param>
</resource-config>
<!-- Populate the Driver -->
- <resource-config selector="policy driver">
+ <resource-config selector="policy/driver">
<resource>org.milyn.javabean.BeanPopulator</resource>
<param name="beanId">Driver</param>
- <param name="beanClass">org.jboss.soa.esb.services.rules.Driver</param>
- <param name="setOn">Policy</param>
- <param name="bindings">
- <binding property="name" selector="policy driver @name" />
- <binding property="age" selector="policy driver @age" type="Integer" />
- <binding property="priorClaims" selector="policy driver @priorClaims" type="Integer" />
- <binding property="locationRiskProfile" selector="policy driver @locationRiskProfile" />
+ <param name="beanClass">org.jboss.soa.esb.services.rules.Driver</param>
+ <param name="setOn">Policy</param>
+ <param name="bindings">
+ <binding property="name" selector="policy/driver/@name" />
+ <binding property="age" selector="policy/driver/@age" type="Integer" />
+ <binding property="priorClaims" selector="policy/driver/@priorClaims" type="Integer" />
+ <binding property="locationRiskProfile" selector="policy/driver/@locationRiskProfile" />
</param>
</resource-config>
Modified: labs/jbossesb/trunk/product/samples/quickstarts/business_ruleservice_ruleAgent/src/org/jboss/soa/esb/samples/quickstart/ruleagent/businessrules/SetupMessage.java
===================================================================
--- labs/jbossesb/trunk/product/samples/quickstarts/business_ruleservice_ruleAgent/src/org/jboss/soa/esb/samples/quickstart/ruleagent/businessrules/SetupMessage.java 2008-07-12 21:24:19 UTC (rev 21016)
+++ labs/jbossesb/trunk/product/samples/quickstarts/business_ruleservice_ruleAgent/src/org/jboss/soa/esb/samples/quickstart/ruleagent/businessrules/SetupMessage.java 2008-07-13 07:47:58 UTC (rev 21017)
@@ -1,51 +1,53 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2006, JBoss Inc., and others contributors as indicated
- * by the @authors tag. All rights reserved.
- * See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU Lesser General Public License, v. 2.1.
- * This program is distributed in the hope that it will be useful, but WITHOUT A
- * 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,
- * v.2.1 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA 02110-1301, USA.
- *
- * (C) 2005-2006,
- * @author JBoss Inc.
- */
-package org.jboss.soa.esb.samples.quickstart.ruleagent.businessrules;
-
-import java.util.HashMap;
-import org.jboss.soa.esb.actions.AbstractActionPipelineProcessor;
-import org.jboss.soa.esb.actions.ActionProcessingException;
-import org.jboss.soa.esb.helpers.ConfigTree;
-import org.jboss.soa.esb.message.Message;
-import org.jboss.soa.esb.services.rules.Driver;
-import org.jboss.soa.esb.services.rules.Policy;
-import org.apache.log4j.Logger;
-
-public class SetupMessage extends AbstractActionPipelineProcessor {
- private Logger logger = Logger.getLogger(SetupMessage.class);
-
- public Message process(Message message) throws ActionProcessingException {
- HashMap transformedBeans = (HashMap) message.getBody().get("EXTRACTED_BEANS_HASH");
- if(transformedBeans != null) {
- Driver driver = (Driver) transformedBeans.get("Driver");
- Policy policy = (Policy) transformedBeans.get("Policy");
- message.getBody().add("Driver", driver);
- message.getBody().add("Policy", policy);
- logger.info("Moved the transformed driver and policy");
- }
- return message;
- }
-
- public SetupMessage(ConfigTree configTree) {
-
- }
-
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2006, JBoss Inc., and others contributors as indicated
+ * by the @authors tag. All rights reserved.
+ * See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ * This copyrighted material is made available to anyone wishing to use,
+ * modify, copy, or redistribute it subject to the terms and conditions
+ * of the GNU Lesser General Public License, v. 2.1.
+ * This program is distributed in the hope that it will be useful, but WITHOUT A
+ * 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,
+ * v.2.1 along with this distribution; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA 02110-1301, USA.
+ *
+ * (C) 2005-2006,
+ * @author JBoss Inc.
+ */
+package org.jboss.soa.esb.samples.quickstart.ruleagent.businessrules;
+
+import org.apache.log4j.Logger;
+import org.jboss.soa.esb.actions.AbstractActionPipelineProcessor;
+import org.jboss.soa.esb.actions.ActionProcessingException;
+import org.jboss.soa.esb.helpers.ConfigTree;
+import org.jboss.soa.esb.message.Message;
+import org.jboss.soa.esb.services.rules.Driver;
+import org.jboss.soa.esb.services.rules.Policy;
+
+import java.util.Map;
+
+public class SetupMessage extends AbstractActionPipelineProcessor {
+ private Logger logger = Logger.getLogger(SetupMessage.class);
+
+ public Message process(Message message) throws ActionProcessingException {
+ Map transformedBeans = (Map) message.getBody().get();
+
+ if(transformedBeans != null) {
+ Driver driver = (Driver) transformedBeans.get("Driver");
+ Policy policy = (Policy) transformedBeans.get("Policy");
+ message.getBody().add("Driver", driver);
+ message.getBody().add("Policy", policy);
+ logger.info("Moved the transformed driver and policy");
+ }
+ return message;
+ }
+
+ public SetupMessage(ConfigTree configTree) {
+
+ }
+
}
Modified: labs/jbossesb/trunk/product/samples/quickstarts/business_ruleservice_stateful/jboss-esb.xml
===================================================================
--- labs/jbossesb/trunk/product/samples/quickstarts/business_ruleservice_stateful/jboss-esb.xml 2008-07-12 21:24:19 UTC (rev 21016)
+++ labs/jbossesb/trunk/product/samples/quickstarts/business_ruleservice_stateful/jboss-esb.xml 2008-07-13 07:47:58 UTC (rev 21017)
@@ -14,7 +14,7 @@
<jms-bus busid="quickstartEsbChannel">
<jms-message-filter dest-type="QUEUE"
dest-name="queue/quickstart_Business_Rules_Stateful_Request_ESB" />
- </jms-bus>
+ </jms-bus>
</jms-provider>
</providers>
@@ -31,16 +31,15 @@
busidref="quickstartEsbChannel" maxThreads="1">
</jms-listener>
</listeners>
- <actions mep="OneWay">
+ <actions mep="OneWay">
<action name="print-before" class="org.jboss.soa.esb.actions.SystemPrintln">
<property name="message" value="Message before transformation" />
</action>
- <action name="transform"
- class="org.jboss.soa.esb.actions.converters.SmooksTransformer">
- <property name="resource-config"
- value="/smooks-res.xml" />
- </action>
+ <action name="transform" class="org.jboss.soa.esb.smooks.SmooksAction">
+ <property name="smooksConfig" value="/smooks-res.xml" />
+ <property name="resultType" value="JAVA" />
+ </action>
<action name="fixUpMessage"
class="org.jboss.soa.esb.samples.quickstart.businessrulesstateful.SetupMessage">
Modified: labs/jbossesb/trunk/product/samples/quickstarts/business_ruleservice_stateful/src/org/jboss/soa/esb/samples/quickstart/businessrulesstateful/SetupMessage.java
===================================================================
--- labs/jbossesb/trunk/product/samples/quickstarts/business_ruleservice_stateful/src/org/jboss/soa/esb/samples/quickstart/businessrulesstateful/SetupMessage.java 2008-07-12 21:24:19 UTC (rev 21016)
+++ labs/jbossesb/trunk/product/samples/quickstarts/business_ruleservice_stateful/src/org/jboss/soa/esb/samples/quickstart/businessrulesstateful/SetupMessage.java 2008-07-13 07:47:58 UTC (rev 21017)
@@ -1,72 +1,74 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2006, JBoss Inc., and others contributors as indicated
- * by the @authors tag. All rights reserved.
- * See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU Lesser General Public License, v. 2.1.
- * This program is distributed in the hope that it will be useful, but WITHOUT A
- * 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,
- * v.2.1 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA 02110-1301, USA.
- *
- * (C) 2005-2006,
- * @author JBoss Inc.
- */
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2006, JBoss Inc., and others contributors as indicated
+ * by the @authors tag. All rights reserved.
+ * See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ * This copyrighted material is made available to anyone wishing to use,
+ * modify, copy, or redistribute it subject to the terms and conditions
+ * of the GNU Lesser General Public License, v. 2.1.
+ * This program is distributed in the hope that it will be useful, but WITHOUT A
+ * 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,
+ * v.2.1 along with this distribution; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA 02110-1301, USA.
+ *
+ * (C) 2005-2006,
+ * @author JBoss Inc.
+ */
package org.jboss.soa.esb.samples.quickstart.businessrulesstateful;
-
-import java.util.HashMap;
-import org.jboss.soa.esb.actions.AbstractActionPipelineProcessor;
-import org.jboss.soa.esb.actions.ActionProcessingException;
-import org.jboss.soa.esb.helpers.ConfigTree;
-import org.jboss.soa.esb.message.Message;
+
+import org.apache.log4j.Logger;
+import org.jboss.soa.esb.actions.AbstractActionPipelineProcessor;
+import org.jboss.soa.esb.actions.ActionProcessingException;
+import org.jboss.soa.esb.helpers.ConfigTree;
+import org.jboss.soa.esb.message.Message;
+import org.jboss.soa.esb.samples.quickstart.businessrulesstateful.dvdstore.Customer;
import org.jboss.soa.esb.samples.quickstart.businessrulesstateful.dvdstore.OrderHeader;
-import org.jboss.soa.esb.samples.quickstart.businessrulesstateful.dvdstore.Customer;
-import org.apache.log4j.Logger;
-
-public class SetupMessage extends AbstractActionPipelineProcessor {
- private Logger logger = Logger.getLogger(SetupMessage.class);
- private int status = 0;
-
- public Message process(Message message) throws ActionProcessingException {
- HashMap transformedBeans = (HashMap) message.getBody().get("EXTRACTED_BEANS_HASH");
- if(transformedBeans != null) {
- OrderHeader header = (OrderHeader) transformedBeans.get("orderHeader");
- Customer customer = (Customer) transformedBeans.get("customer");
- message.getBody().add("TheOrderHeader", header);
- message.getBody().add("TheCustomer", customer);
-
- status = header.getStatusCode();
-
- if (status == 0 ) {
- message.getProperties().setProperty("dispose", false);
- message.getProperties().setProperty("continue", false);
-
- }
-
- if (status == 1 ) {
- message.getProperties().setProperty("dispose", false);
- message.getProperties().setProperty("continue", true);
- }
-
- if (status == 2 ) {
- message.getProperties().setProperty("dispose", true);
- message.getProperties().setProperty("continue", true);
- }
-
- logger.info("Moved the transformed Order Header and Customer");
+
+import java.util.Map;
+
+public class SetupMessage extends AbstractActionPipelineProcessor {
+ private Logger logger = Logger.getLogger(SetupMessage.class);
+ private int status = 0;
+
+ public Message process(Message message) throws ActionProcessingException {
+ Map transformedBeans = (Map) message.getBody().get();
+
+ if(transformedBeans != null) {
+ OrderHeader header = (OrderHeader) transformedBeans.get("orderHeader");
+ Customer customer = (Customer) transformedBeans.get("customer");
+ message.getBody().add("TheOrderHeader", header);
+ message.getBody().add("TheCustomer", customer);
+
+ status = header.getStatusCode();
+
+ if (status == 0 ) {
+ message.getProperties().setProperty("dispose", false);
+ message.getProperties().setProperty("continue", false);
+
+ }
+
+ if (status == 1 ) {
+ message.getProperties().setProperty("dispose", false);
+ message.getProperties().setProperty("continue", true);
+ }
+
+ if (status == 2 ) {
+ message.getProperties().setProperty("dispose", true);
+ message.getProperties().setProperty("continue", true);
+ }
+
+ logger.info("Moved the transformed Order Header and Customer");
}
-
- return message;
- }
-
- public SetupMessage(ConfigTree configTree) {
- // status = Integer.parseInt(configTree.getAttribute("status"));
- }
-
+
+ return message;
+ }
+
+ public SetupMessage(ConfigTree configTree) {
+ // status = Integer.parseInt(configTree.getAttribute("status"));
+ }
+
}
Modified: labs/jbossesb/trunk/product/samples/quickstarts/transform_CSV2XML/jboss-esb.xml
===================================================================
--- labs/jbossesb/trunk/product/samples/quickstarts/transform_CSV2XML/jboss-esb.xml 2008-07-12 21:24:19 UTC (rev 21016)
+++ labs/jbossesb/trunk/product/samples/quickstarts/transform_CSV2XML/jboss-esb.xml 2008-07-13 07:47:58 UTC (rev 21017)
@@ -36,12 +36,11 @@
</action>
<!--
- Transform 1: CSV to XML...
+ Transform 1: Source CSV to Canonical XML...
-->
- <action name="transform-from-csv" class="org.jboss.soa.esb.actions.converters.SmooksTransformer">
- <property name="resource-config" value="/smooks-res.xml" />
- <property name="from-type" value="text/csv:order-list" />
- <property name="to-type" value="text/xml:smooks-order-xml" />
+ <action name="transform-from-csv" class="org.jboss.soa.esb.smooks.SmooksAction">
+ <property name="smooksConfig" value="/smooks-res.xml" />
+ <property name="messageProfile" value="source-csv" />
</action>
<action name="print-after-csv-tranform" class="org.jboss.soa.esb.actions.SystemPrintln">
@@ -49,14 +48,13 @@
</action>
<!--
- Transform 2: XML to XML...
+ Transform 2: Canonical XML to target XML...
-->
- <action name="transform-smooksXml-to-canonicalXml" class="org.jboss.soa.esb.actions.converters.SmooksTransformer">
- <property name="resource-config" value="/smooks-res.xml" />
- <property name="from-type" value="text/xml:smooks-order-xml" />
- <property name="to-type" value="text/xml:canonical-order-xml" />
- </action>
-
+ <action name="transform-to-xml" class="org.jboss.soa.esb.smooks.SmooksAction">
+ <property name="smooksConfig" value="/smooks-res.xml" />
+ <property name="messageProfile" value="canonical-xml" />
+ </action>
+
<action name="print-after-xml-transform" class="org.jboss.soa.esb.actions.SystemPrintln">
<property name="message" value=">>>> Message after Smooks intermediate xml -> target xml : " />
</action>
Modified: labs/jbossesb/trunk/product/samples/quickstarts/transform_CSV2XML/smooks-res.xml
===================================================================
--- labs/jbossesb/trunk/product/samples/quickstarts/transform_CSV2XML/smooks-res.xml 2008-07-12 21:24:19 UTC (rev 21016)
+++ labs/jbossesb/trunk/product/samples/quickstarts/transform_CSV2XML/smooks-res.xml 2008-07-13 07:47:58 UTC (rev 21017)
@@ -1,7 +1,12 @@
<?xml version='1.0' encoding='UTF-8'?>
<smooks-resource-list xmlns="http://www.milyn.org/xsd/smooks-1.0.xsd">
- <resource-config target-profile="from-type:text/csv:order-list AND to-type:text/xml:smooks-order-xml" selector="org.xml.sax.driver">
+ <profiles>
+ <profile base-profile="source-csv" />
+ <profile base-profile="canonical-xml" />
+ </profiles>
+
+ <resource-config target-profile="source-csv" selector="org.xml.sax.driver">
<resource>org.milyn.csv.CSVParser</resource>
<param name="fields" type="string-list">
orderId,
@@ -27,7 +32,7 @@
</param>
</resource-config>
- <resource-config target-profile="from-type:text/xml:smooks-order-xml AND to-type:text/xml:canonical-order-xml" selector="csv-set">
+ <resource-config target-profile="canonical-xml" selector="csv-set">
<resource type="xsl">
<![CDATA[
<orders>
Modified: labs/jbossesb/trunk/product/samples/quickstarts/transform_XML2POJO2/jboss-esb.xml
===================================================================
--- labs/jbossesb/trunk/product/samples/quickstarts/transform_XML2POJO2/jboss-esb.xml 2008-07-12 21:24:19 UTC (rev 21016)
+++ labs/jbossesb/trunk/product/samples/quickstarts/transform_XML2POJO2/jboss-esb.xml 2008-07-13 07:47:58 UTC (rev 21017)
@@ -45,8 +45,9 @@
<property name="script" value="/scripts/check-origin.groovy" />
</action>
- <action name="transform" class="org.jboss.soa.esb.actions.converters.SmooksTransformer">
- <property name="resource-config" value="/smooks-config.xml" />
+ <action name="transform" class="org.jboss.soa.esb.smooks.SmooksAction">
+ <property name="smooksConfig" value="/smooks-config.xml" />
+ <property name="resultType" value="JAVA" />
</action>
<action name="convertPOJO2Message" class="org.jboss.soa.esb.store.StoreAction" />
Modified: labs/jbossesb/trunk/product/samples/quickstarts/transform_XML2POJO2/scripts/check-origin.groovy
===================================================================
--- labs/jbossesb/trunk/product/samples/quickstarts/transform_XML2POJO2/scripts/check-origin.groovy 2008-07-12 21:24:19 UTC (rev 21016)
+++ labs/jbossesb/trunk/product/samples/quickstarts/transform_XML2POJO2/scripts/check-origin.groovy 2008-07-13 07:47:58 UTC (rev 21017)
@@ -1,3 +1,4 @@
+import org.jboss.soa.esb.message.*
def messageText = message.getBody().get();
def order = new XmlParser().parseText(messageText);
@@ -3,7 +4,7 @@
if(order.OrderLines.size() == 1) {
- message.getProperties().setProperty("from", "dvdstore");
+ message.getProperties().setProperty(Properties.MESSAGE_PROFILE, "from:dvdstore");
} else if(order.LineItems.size() == 1) {
- message.getProperties().setProperty("from", "petstore");
+ message.getProperties().setProperty(Properties.MESSAGE_PROFILE, "from:petstore");
}
Modified: labs/jbossesb/trunk/product/samples/quickstarts/transform_XML2POJO2/smooks-config.xml
===================================================================
--- labs/jbossesb/trunk/product/samples/quickstarts/transform_XML2POJO2/smooks-config.xml 2008-07-12 21:24:19 UTC (rev 21016)
+++ labs/jbossesb/trunk/product/samples/quickstarts/transform_XML2POJO2/smooks-config.xml 2008-07-13 07:47:58 UTC (rev 21017)
@@ -1,6 +1,11 @@
<?xml version="1.0"?>
<smooks-resource-list xmlns="http://www.milyn.org/xsd/smooks-1.0.xsd">
+ <profiles>
+ <profile base-profile="from:dvdstore" />
+ <profile base-profile="from:petstore" />
+ </profiles>
+
<import file="classpath:/transforms/from-dvdstore.xml" />
<import file="classpath:/transforms/from-petstore.xml" />
Modified: labs/jbossesb/trunk/product/samples/quickstarts/transform_XML2POJO2/src/org/jboss/soa/esb/store/StoreAction.java
===================================================================
--- labs/jbossesb/trunk/product/samples/quickstarts/transform_XML2POJO2/src/org/jboss/soa/esb/store/StoreAction.java 2008-07-12 21:24:19 UTC (rev 21016)
+++ labs/jbossesb/trunk/product/samples/quickstarts/transform_XML2POJO2/src/org/jboss/soa/esb/store/StoreAction.java 2008-07-13 07:47:58 UTC (rev 21017)
@@ -21,14 +21,14 @@
package org.jboss.soa.esb.store;
-import java.util.HashMap;
-import java.util.List;
-
import org.jboss.soa.esb.actions.AbstractActionPipelineProcessor;
import org.jboss.soa.esb.actions.ActionProcessingException;
import org.jboss.soa.esb.helpers.ConfigTree;
import org.jboss.soa.esb.message.Message;
+import java.util.List;
+import java.util.Map;
+
/**
* Store action.
* <p/>
@@ -42,13 +42,13 @@
}
public Message process(Message message) throws ActionProcessingException {
- HashMap beanHash = (HashMap) message.getBody().get("EXTRACTED_BEANS_HASH");
+ Map resultBeanMap = (Map) message.getBody().get();
StringBuffer results = new StringBuffer();
- if(beanHash != null) {
- OrderHeader header = (OrderHeader) beanHash.get("orderHeader");
- Customer customer = (Customer) beanHash.get("customer");
- List orderItems = (List) beanHash.get("orderItemList");
+ if(resultBeanMap != null) {
+ OrderHeader header = (OrderHeader) resultBeanMap.get("orderHeader");
+ Customer customer = (Customer) resultBeanMap.get("customer");
+ List orderItems = (List) resultBeanMap.get("orderItemList");
results.append("Demonstrates Smooks ability to rip the XML into Objects\n");
results.append("********* StoreAction - Order Value Objects Populated *********\n");
results.append("Header: " + header + "\n");
@@ -64,7 +64,7 @@
message.getBody().add("Customer",customer);
message.getBody().add("OrderItems",orderItems);
} else {
- results.append("\n*** No beanhash found!");
+ results.append("\n*** No resultBeanMap found!");
}
// Take this "parsed" output
Modified: labs/jbossesb/trunk/product/samples/quickstarts/transform_XML2XML_stream/jboss-esb.xml
===================================================================
--- labs/jbossesb/trunk/product/samples/quickstarts/transform_XML2XML_stream/jboss-esb.xml 2008-07-12 21:24:19 UTC (rev 21016)
+++ labs/jbossesb/trunk/product/samples/quickstarts/transform_XML2XML_stream/jboss-esb.xml 2008-07-13 07:47:58 UTC (rev 21017)
@@ -34,8 +34,8 @@
<action name="print-before" class="org.jboss.soa.esb.actions.SystemPrintln">
<property name="message" value="[transform_XML2XML_simple] Message before transformation" />
</action>
- <action name="simple-transform" class="org.jboss.soa.esb.actions.converters.SmooksTransformer">
- <property name="resource-config" value="/smooks-res.xml" />
+ <action name="simple-transform" class="org.jboss.soa.esb.smooks.SmooksAction">
+ <property name="smooksConfig" value="/smooks-res.xml" />
</action>
<action name="print-after" class="org.jboss.soa.esb.actions.SystemPrintln">
<property name="message" value="[transform_XML2XML_simple] Message after transformation" />
Modified: labs/jbossesb/trunk/qa/quickstarts/src/org/jboss/soa/esb/quickstart/test/BusinessRulesServiceTest.java
===================================================================
--- labs/jbossesb/trunk/qa/quickstarts/src/org/jboss/soa/esb/quickstart/test/BusinessRulesServiceTest.java 2008-07-12 21:24:19 UTC (rev 21016)
+++ labs/jbossesb/trunk/qa/quickstarts/src/org/jboss/soa/esb/quickstart/test/BusinessRulesServiceTest.java 2008-07-13 07:47:58 UTC (rev 21017)
@@ -21,27 +21,16 @@
package org.jboss.soa.esb.quickstart.test;
import junit.framework.Test;
-
import org.jboss.soa.esb.samples.quickstart.businessrules.test.SendJMSMessage;
+import java.util.Arrays;
+
/**
* CI test for the businessrulesservice quickstart.
*
* @author <a href="mailto:tcunning at redhat.com">Tom Cunningham</a>
*/
public class BusinessRulesServiceTest extends AbstractQuickstartTestCase {
- private static final String JMS_MESSAGE =
- "<Order netAmount=\"59.97\" orderDate=\"Wed Nov 15 13:45:28 EST 2006\" orderId=\"1\" statusCode=\"0\" tax=\"4.95\" totalAmount=\"64.92\">" +
- " <Customer firstName=\"Harry\" lastName=\"Fletcher\" state=\"SD\" userName=\"user1\"/>" +
- " <OrderLines>" +
- " <OrderLine position=\"1\" quantity=\"1\">" +
- " <Product price=\"29.98\" productId=\"364\" title=\"The 40-Year-Old Virgin \"/>" +
- " </OrderLine>" +
- " <OrderLine position=\"2\" quantity=\"1\">" +
- " <Product price=\"29.99\" productId=\"299\" title=\"Pulp Fiction\"/>" +
- " </OrderLine>" +
- " </OrderLines>" +
- "</Order>" ;
public BusinessRulesServiceTest(String name) {
super(name);
@@ -51,7 +40,7 @@
clearMessages();
sendMessage();
final String[] messages = waitForMessages(1, 30000) ;
- assertTrue("XML response message", Helpers.compareXMLContent(JMS_MESSAGE, messages[0])) ;
+ assertEquals("[{orderItemList=[1,1,364,The 40-Year-Old Virgin ,29.98, 2,1,299,Pulp Fiction,29.99], orderHeader=1, java.util.GregorianCalendar[time=1163616328000,areFieldsSet=true,areAllFieldsSet=false,lenient=true,zone=sun.util.calendar.ZoneInfo[id=\"EST\",offset=-18000000,dstSavings=0,useDaylight=false,transitions=0,lastRule=null],firstDayOfWeek=2,minimalDaysInFirstWeek=4,ERA=?,YEAR=2006,MONTH=10,WEEK_OF_YEAR=?,WEEK_OF_MONTH=?,DAY_OF_MONTH=15,DAY_OF_YEAR=?,DAY_OF_WEEK=4,DAY_OF_WEEK_IN_MONTH=?,AM_PM=?,HOUR=?,HOUR_OF_DAY=13,MINUTE=45,SECOND=28,MILLISECOND=?,ZONE_OFFSET=-18000000,DST_OFFSET=0], 0, 59.97, 64.92, 4.95, , customer=user1,Harry,Fletcher,SD,0, orderItem=2,1,299,Pulp Fiction,29.99}]", Arrays.asList(messages).toString()) ;
}
public void sendMessage() throws Exception {
More information about the jboss-svn-commits
mailing list