[jboss-svn-commits] JBL Code SVN: r15599 - in labs/jbossesb/trunk/product: rosetta/src/org/jboss/soa/esb/listeners/message and 5 other directories.
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Fri Oct 5 04:39:49 EDT 2007
Author: tfennelly
Date: 2007-10-05 04:39:49 -0400 (Fri, 05 Oct 2007)
New Revision: 15599
Added:
labs/jbossesb/trunk/product/samples/quickstarts/webservice_bpel/images/
labs/jbossesb/trunk/product/samples/quickstarts/webservice_bpel/images/process-overview.png
Modified:
labs/jbossesb/trunk/product/rosetta/src/org/jboss/soa/esb/listeners/gateway/LocalFileMessageComposer.java
labs/jbossesb/trunk/product/rosetta/src/org/jboss/soa/esb/listeners/message/AbstractMessageComposer.java
labs/jbossesb/trunk/product/samples/quickstarts/webservice_bpel/bpel/OrderProcess.bpel
labs/jbossesb/trunk/product/samples/quickstarts/webservice_bpel/bpel/OrderProcess.pdd
labs/jbossesb/trunk/product/samples/quickstarts/webservice_bpel/bpel/OrderProcess.vbpel
labs/jbossesb/trunk/product/samples/quickstarts/webservice_bpel/bpel/OrderProcess0.pdd
labs/jbossesb/trunk/product/samples/quickstarts/webservice_bpel/bpel/order_process.bprd
labs/jbossesb/trunk/product/samples/quickstarts/webservice_bpel/bpel/resources/wsdl/Customer.wsdl
labs/jbossesb/trunk/product/samples/quickstarts/webservice_bpel/bpel/resources/wsdl/OrderManager.wsdl
labs/jbossesb/trunk/product/samples/quickstarts/webservice_bpel/bpel/resources/wsdl/Retailer.wsdl
labs/jbossesb/trunk/product/samples/quickstarts/webservice_bpel/build.xml
labs/jbossesb/trunk/product/samples/quickstarts/webservice_bpel/jboss-esb.xml
labs/jbossesb/trunk/product/services/smooks/src/main/java/org/jboss/soa/esb/actions/converters/SmooksTransformer.java
Log:
http://jira.jboss.com/jira/browse/JBESB-1089
http://jira.jboss.com/jira/browse/JBESB-1099
http://jira.jboss.com/jira/browse/JBESB-1134
http://jira.jboss.com/jira/browse/JBESB-1140
Modified: labs/jbossesb/trunk/product/rosetta/src/org/jboss/soa/esb/listeners/gateway/LocalFileMessageComposer.java
===================================================================
--- labs/jbossesb/trunk/product/rosetta/src/org/jboss/soa/esb/listeners/gateway/LocalFileMessageComposer.java 2007-10-05 08:32:47 UTC (rev 15598)
+++ labs/jbossesb/trunk/product/rosetta/src/org/jboss/soa/esb/listeners/gateway/LocalFileMessageComposer.java 2007-10-05 08:39:49 UTC (rev 15599)
@@ -40,6 +40,11 @@
*/
public class LocalFileMessageComposer<T extends File> implements MessageComposer<T> {
+ public static final String PROP_FILE_OBJ = "in-file-obj";
+ public static final String PROP_FILE_PATH = "in-file-path";
+ public static final String PROP_FILE_LENGTH = "in-file-length";
+ public static final String PROP_FILE_LASTMOD = "in-file-lastmod";
+
public void setConfiguration(ConfigTree config) throws ConfigurationException {
}
@@ -57,6 +62,12 @@
throw new MessageDeliverException("Error reading input file '" + inputFile.getAbsolutePath() + "'.", e);
}
+ // Add some metadate about the file....
+ message.getProperties().setProperty(PROP_FILE_OBJ, inputFile);
+ message.getProperties().setProperty(PROP_FILE_PATH, inputFile.getAbsolutePath());
+ message.getProperties().setProperty(PROP_FILE_LENGTH, inputFile.length());
+ message.getProperties().setProperty(PROP_FILE_LASTMOD, inputFile.lastModified());
+
return message;
}
Modified: labs/jbossesb/trunk/product/rosetta/src/org/jboss/soa/esb/listeners/message/AbstractMessageComposer.java
===================================================================
--- labs/jbossesb/trunk/product/rosetta/src/org/jboss/soa/esb/listeners/message/AbstractMessageComposer.java 2007-10-05 08:32:47 UTC (rev 15598)
+++ labs/jbossesb/trunk/product/rosetta/src/org/jboss/soa/esb/listeners/message/AbstractMessageComposer.java 2007-10-05 08:39:49 UTC (rev 15599)
@@ -71,15 +71,16 @@
// Hopefully we can fix the Message object such that there's no need for this
// i.e. the message will have setContents(Object) and getContents() methods.
- Object response = message.getBody().get();
+ Object response = message.getBody().get(ActionUtils.POST_ACTION_DATA);
if(response != null) {
return response;
} else {
- Object content = message.getBody().get(BytesBody.BYTES_LOCATION);
+ Object content = message.getBody().get();
- if (content == null)
- content = message.getBody().get(ActionUtils.POST_ACTION_DATA);
+ if (content == null) {
+ content = message.getBody().get(BytesBody.BYTES_LOCATION);
+ }
return content;
}
Modified: labs/jbossesb/trunk/product/samples/quickstarts/webservice_bpel/bpel/OrderProcess.bpel
===================================================================
--- labs/jbossesb/trunk/product/samples/quickstarts/webservice_bpel/bpel/OrderProcess.bpel 2007-10-05 08:32:47 UTC (rev 15598)
+++ labs/jbossesb/trunk/product/samples/quickstarts/webservice_bpel/bpel/OrderProcess.bpel 2007-10-05 08:39:49 UTC (rev 15599)
@@ -1,13 +1,13 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
BPEL Process Definition
-Edited using ActiveBPEL(tm) Designer Version 3.1.0 (http://www.active-endpoints.com)
+Edited using ActiveBPEL(r) Designer Version 4.1.0 (http://www.active-endpoints.com)
-->
<bpel:process xmlns:OrderMgr="http://org.jboss.esb/quickstarts/bpel/ABI_OrderManager" xmlns:aud="http://schemas.active-endpoints.com/sample/audit/2006/04/Audit.xsd" xmlns:aws="http://docs.active-endpoints.com/activebpel/sample/wsdl/audit/2006/04/Audit.wsdl" xmlns:bpel="http://docs.oasis-open.org/wsbpel/2.0/process/executable" xmlns:brws="http://docs.active-endpoints.com/activebpel/sample/wsdl/bpelretailer/2006/04/BPELRetailer.wsdl" xmlns:cmws="http://docs.active-endpoints.com/activebpel/sample/wsdl/creditmanager/2006/04/CreditManager.wsdl" xmlns:crdmgr="http://schemas.active-endpoints.com/sample/creditmanager/2006/04/CreditManager.xsd" xmlns:cust="http://schemas.active-endpoints.com/sample/customer/2006/04/Customer.xsd" xmlns:cws="http://docs.active-endpoints.com/activebpel/sample/wsdl/customer/2006/04/Customer.wsdl" xmlns:ns="http://ordermanagement.activebpel.com/jaws" xmlns:ord="http://schemas.active-endpoints.com/sample/customerorder/2006/04/CustomerOrder.xsd" xmlns:ordm!
gr="http://schemas.active-endpoints.com/sample/ordermanager/2006/04/OrderManager.xsd" xmlns:rws="http://docs.active-endpoints.com/activebpel/sample/wsdl/retailer/2006/04/Retailer.wsdl" xmlns:ship="http://schemas.active-endpoints.com/sample/shipping/2006/04/Shipping.xsd" xmlns:shipping="http://org.jboss.esb/quickstarts/bpel/ABI_Shipping" xmlns:tns="http://docs.active-endpoints.com/activebpel/sample/bpel/OrderProcess/2006/04/OrderProcess.bpel" xmlns:xsd="http://www.w3.org/2001/XMLSchema" name="OrderProcess" suppressJoinFailure="yes" targetNamespace="http://docs.active-endpoints.com/activebpel/sample/bpel/OrderProcess/2006/04/OrderProcess.bpel">
<bpel:import importType="http://schemas.xmlsoap.org/wsdl/" location="resources/wsdl/Retailer.wsdl" namespace="http://docs.active-endpoints.com/activebpel/sample/wsdl/retailer/2006/04/Retailer.wsdl"/>
<bpel:import importType="http://schemas.xmlsoap.org/wsdl/" location="resources/wsdl/BPELRetailer.wsdl" namespace="http://docs.active-endpoints.com/activebpel/sample/wsdl/bpelretailer/2006/04/BPELRetailer.wsdl"/>
- <bpel:import importType="http://schemas.xmlsoap.org/wsdl/" location="resources/wsdl/OrderManager.wsdl" namespace="http://docs.active-endpoints.com/activebpel/sample/wsdl/ordermanager/2006/04/OrderManager.wsdl"/>
- <bpel:import importType="http://schemas.xmlsoap.org/wsdl/" location="resources/wsdl/Shipping.wsdl" namespace="http://docs.active-endpoints.com/activebpel/sample/wsdl/shipping/2006/04/Shipping.wsdl"/>
+ <bpel:import importType="http://schemas.xmlsoap.org/wsdl/" location="resources/wsdl/OrderManager.wsdl" namespace="http://org.jboss.esb/quickstarts/bpel/ABI_OrderManager"/>
+ <bpel:import importType="http://schemas.xmlsoap.org/wsdl/" location="resources/wsdl/Shipping.wsdl" namespace="http://org.jboss.esb/quickstarts/bpel/ABI_Shipping"/>
<bpel:import importType="http://schemas.xmlsoap.org/wsdl/" location="resources/wsdl/Customer.wsdl" namespace="http://docs.active-endpoints.com/activebpel/sample/wsdl/customer/2006/04/Customer.wsdl"/>
<bpel:partnerLinks>
<bpel:partnerLink myRole="Seller" name="Customer" partnerLinkType="brws:PurchasingPLT" partnerRole="Buyer"/>
Modified: labs/jbossesb/trunk/product/samples/quickstarts/webservice_bpel/bpel/OrderProcess.pdd
===================================================================
--- labs/jbossesb/trunk/product/samples/quickstarts/webservice_bpel/bpel/OrderProcess.pdd 2007-10-05 08:32:47 UTC (rev 15598)
+++ labs/jbossesb/trunk/product/samples/quickstarts/webservice_bpel/bpel/OrderProcess.pdd 2007-10-05 08:39:49 UTC (rev 15599)
@@ -4,7 +4,7 @@
<partnerLink name="Customer">
<partnerRole endpointReference="static" invokeHandler="default:Address">
<wsa:EndpointReference xmlns:s="http://docs.active-endpoints.com/activebpel/sample/wsdl/customer/2006/04/Customer.wsdl" xmlns:wsa="http://schemas.xmlsoap.org/ws/2003/03/addressing">
- <wsa:Address>http://localhost:18080/active-bpel/services/ABI_Customer</wsa:Address>
+ <wsa:Address>http://localhost:8080/active-bpel/services/ABI_Customer</wsa:Address>
<wsa:ServiceName PortName="CustomerSoap">s:CustomerService</wsa:ServiceName>
</wsa:EndpointReference>
</partnerRole>
Modified: labs/jbossesb/trunk/product/samples/quickstarts/webservice_bpel/bpel/OrderProcess.vbpel
===================================================================
--- labs/jbossesb/trunk/product/samples/quickstarts/webservice_bpel/bpel/OrderProcess.vbpel 2007-10-05 08:32:47 UTC (rev 15598)
+++ labs/jbossesb/trunk/product/samples/quickstarts/webservice_bpel/bpel/OrderProcess.vbpel 2007-10-05 08:39:49 UTC (rev 15599)
@@ -29,14 +29,14 @@
<att name="objectId" value="117373504324610713"/>
</node>
<node id="5" name="IMPORT">
- <att name="ImportLocation" value="resources/wsdl/OrderManager.wsdl;http://docs.active-endpoints.com/activebpel/sample/wsdl/ordermanager/2006/04/OrderManager.wsdl;http://schemas.xmlsoap.org/wsdl/"/>
- <att name="ImportNamespace" value="http://docs.active-endpoints.com/activebpel/sample/wsdl/ordermanager/2006/04/OrderManager.wsdl"/>
+ <att name="ImportLocation" value="resources/wsdl/OrderManager.wsdl;http://org.jboss.esb/quickstarts/bpel/ABI_OrderManager;http://schemas.xmlsoap.org/wsdl/"/>
+ <att name="ImportNamespace" value="http://org.jboss.esb/quickstarts/bpel/ABI_OrderManager"/>
<att name="ImportType" value="http://schemas.xmlsoap.org/wsdl/"/>
<att name="objectId" value="117373504324610717"/>
</node>
<node id="6" name="IMPORT">
- <att name="ImportLocation" value="resources/wsdl/Shipping.wsdl;http://docs.active-endpoints.com/activebpel/sample/wsdl/shipping/2006/04/Shipping.wsdl;http://schemas.xmlsoap.org/wsdl/"/>
- <att name="ImportNamespace" value="http://docs.active-endpoints.com/activebpel/sample/wsdl/shipping/2006/04/Shipping.wsdl"/>
+ <att name="ImportLocation" value="resources/wsdl/Shipping.wsdl;http://org.jboss.esb/quickstarts/bpel/ABI_Shipping;http://schemas.xmlsoap.org/wsdl/"/>
+ <att name="ImportNamespace" value="http://org.jboss.esb/quickstarts/bpel/ABI_Shipping"/>
<att name="ImportType" value="http://schemas.xmlsoap.org/wsdl/"/>
<att name="objectId" value="117373504324610721"/>
</node>
@@ -255,18 +255,19 @@
<att name="gap" value="50"/>
<node id="47" name="RECEIVE">
<att name="objectId" value="117373504335510927"/>
- <att name="size" value="DIM {185,56}"/>
+ <att name="size" value="DIM {205,56}"/>
<att name="name" value="ReceiveCustomerOrder"/>
<att name="partnerLink" value="Customer"/>
<att name="operation" value="SubmitOrder"/>
<att name="createInstance" value="true"/>
<att name="variable" value="SubmitOrderRequest"/>
+ <att name="attachments" value=""/>
<att name="fromParts" value="0"/>
</node>
<att>
<graph id="48" name="ASSIGN">
<att name="objectId" value="117623753602612073"/>
- <att name="size" value="DIM {203,56}"/>
+ <att name="size" value="DIM {227,56}"/>
<att name="name" value="AssignDataForNormalReply"/>
<att name="copy" value="1"/>
<att name="validateVars" value="false"/>
@@ -282,7 +283,7 @@
</att>
<node id="50" name="REPLY">
<att name="objectId" value="117623753602612075"/>
- <att name="size" value="DIM {212,56}"/>
+ <att name="size" value="DIM {236,56}"/>
<att name="name" value="AcknowledgeReceiptOfOrder"/>
<att name="partnerLink" value="Customer"/>
<att name="operation" value="SubmitOrder"/>
@@ -317,7 +318,7 @@
<att>
<graph id="57" name="ASSIGN">
<att name="objectId" value="117373504335511023"/>
- <att name="size" value="DIM {196,56}"/>
+ <att name="size" value="DIM {219,56}"/>
<att name="name" value="AssignDataForSalesOrder"/>
<att name="copy" value="1"/>
<att name="validateVars" value="true"/>
@@ -355,7 +356,7 @@
<node id="64" name="INVOKE">
<att name="objectId" value="117373504335511027"/>
<att name="location" value="LOC {5,5}"/>
- <att name="size" value="DIM {159,56}"/>
+ <att name="size" value="DIM {175,56}"/>
<att name="name" value="CreateSalesOrder"/>
<att name="partnerLink" value="OrderManager"/>
<att name="portType" value="OrderMgr:OrderManagerPortType"/>
@@ -365,6 +366,7 @@
<att name="outputVariable" value="SalesOrderResponse"/>
<att name="fromParts" value="0"/>
<att name="toParts" value="0"/>
+ <att name="attachments" value=""/>
</node>
</graph>
</att>
@@ -390,7 +392,7 @@
<att>
<graph id="70" name="ASSIGN">
<att name="objectId" value="117373504335511015"/>
- <att name="size" value="DIM {228,56}"/>
+ <att name="size" value="DIM {257,56}"/>
<att name="name" value="AssignDataForCancelSalesOrder"/>
<att name="copy" value="3"/>
<att name="validateVars" value="false"/>
@@ -428,7 +430,7 @@
</att>
<node id="74" name="INVOKE">
<att name="objectId" value="117373504335511019"/>
- <att name="size" value="DIM {158,56}"/>
+ <att name="size" value="DIM {175,56}"/>
<att name="name" value="CancelSalesOrder"/>
<att name="partnerLink" value="OrderManager"/>
<att name="portType" value="OrderMgr:OrderManagerPortType"/>
@@ -437,6 +439,7 @@
<att name="outputVariable" value="CancelOrderResponse"/>
<att name="fromParts" value="0"/>
<att name="toParts" value="0"/>
+ <att name="attachments" value=""/>
</node>
</graph>
</att>
@@ -446,19 +449,20 @@
</att>
<node id="75" name="RECEIVE">
<att name="objectId" value="117373504335511029"/>
- <att name="size" value="DIM {259,56}"/>
+ <att name="size" value="DIM {294,56}"/>
<att name="name" value="WaitForNotificationFromOrderManager"/>
<att name="partnerLink" value="OrderManager"/>
<att name="portType" value="OrderMgr:RetailerCallbackPortType"/>
<att name="operation" value="SendSalesOrderNotification"/>
<att name="correlations" value="orderCS,no#false"/>
<att name="variable" value="SendSalesOrderNotificationRequest"/>
+ <att name="attachments" value=""/>
<att name="fromParts" value="0"/>
</node>
<att>
<graph id="76" name="ASSIGN">
<att name="objectId" value="117373504335511031"/>
- <att name="size" value="DIM {300,56}"/>
+ <att name="size" value="DIM {342,56}"/>
<att name="name" value="AssignDataForOrderManagerAcknowledgement"/>
<att name="copy" value="1"/>
<att name="validateVars" value="false"/>
@@ -474,7 +478,7 @@
</att>
<node id="78" name="REPLY">
<att name="objectId" value="117373504335511035"/>
- <att name="size" value="DIM {206,56}"/>
+ <att name="size" value="DIM {231,56}"/>
<att name="name" value="AcknowledgeOrderManager"/>
<att name="partnerLink" value="OrderManager"/>
<att name="portType" value="OrderMgr:RetailerCallbackPortType"/>
@@ -485,7 +489,7 @@
<att>
<graph id="79" name="ASSIGN">
<att name="objectId" value="117373504335511037"/>
- <att name="size" value="DIM {191,56}"/>
+ <att name="size" value="DIM {213,56}"/>
<att name="name" value="AssignDataForShipOrder"/>
<att name="copy" value="4"/>
<att name="validateVars" value="false"/>
@@ -534,7 +538,7 @@
</att>
<node id="84" name="INVOKE">
<att name="objectId" value="117373504335511045"/>
- <att name="size" value="DIM {121,56}"/>
+ <att name="size" value="DIM {131,56}"/>
<att name="name" value="ShipOrder"/>
<att name="partnerLink" value="Shipper"/>
<att name="portType" value="shipping:ShippingPortType"/>
@@ -543,11 +547,12 @@
<att name="outputVariable" value="ShipOrderResponse"/>
<att name="fromParts" value="0"/>
<att name="toParts" value="0"/>
+ <att name="attachments" value=""/>
</node>
<att>
<graph id="85" name="ASSIGN">
<att name="objectId" value="117373504335511047"/>
- <att name="size" value="DIM {232,56}"/>
+ <att name="size" value="DIM {261,56}"/>
<att name="name" value="AssignDataForOrderConfirmation"/>
<att name="copy" value="4"/>
<att name="validateVars" value="false"/>
@@ -595,7 +600,7 @@
</att>
<node id="90" name="INVOKE">
<att name="objectId" value="117373504335511057"/>
- <att name="size" value="DIM {186,56}"/>
+ <att name="size" value="DIM {208,56}"/>
<att name="name" value="SendOrderConfirmation"/>
<att name="partnerLink" value="Customer"/>
<att name="portType" value="cws:CustomerPortType"/>
@@ -604,6 +609,7 @@
<att name="outputVariable" value="SendOrderConfirmationResponse"/>
<att name="fromParts" value="0"/>
<att name="toParts" value="0"/>
+ <att name="attachments" value=""/>
</node>
</graph>
</att>
Modified: labs/jbossesb/trunk/product/samples/quickstarts/webservice_bpel/bpel/OrderProcess0.pdd
===================================================================
--- labs/jbossesb/trunk/product/samples/quickstarts/webservice_bpel/bpel/OrderProcess0.pdd 2007-10-05 08:32:47 UTC (rev 15598)
+++ labs/jbossesb/trunk/product/samples/quickstarts/webservice_bpel/bpel/OrderProcess0.pdd 2007-10-05 08:39:49 UTC (rev 15599)
@@ -4,7 +4,7 @@
<partnerLink name="Customer">
<partnerRole endpointReference="static">
<wsa:EndpointReference xmlns:s="http://docs.active-endpoints.com/activebpel/sample/wsdl/customer/2006/04/Customer.wsdl" xmlns:wsa="http://schemas.xmlsoap.org/ws/2003/03/addressing">
- <wsa:Address>http://localhost:18080/active-bpel/services/ABI_Customer</wsa:Address>
+ <wsa:Address>http://localhost:8080/active-bpel/services/ABI_Customer</wsa:Address>
<wsa:ServiceName PortName="CustomerSoap">s:CustomerService</wsa:ServiceName>
</wsa:EndpointReference>
</partnerRole>
Modified: labs/jbossesb/trunk/product/samples/quickstarts/webservice_bpel/bpel/order_process.bprd
===================================================================
--- labs/jbossesb/trunk/product/samples/quickstarts/webservice_bpel/bpel/order_process.bprd 2007-10-05 08:32:47 UTC (rev 15598)
+++ labs/jbossesb/trunk/product/samples/quickstarts/webservice_bpel/bpel/order_process.bprd 2007-10-05 08:39:49 UTC (rev 15599)
@@ -10,7 +10,7 @@
<property name="archive.filename" value="C:\customer_projects\OrderManagement_v1\order_process.bpr" />
<!-- The deployment location. Typically a server/container deployment directory. -->
- <property name="archive.deploypath" value="http://localhost:18080/active-bpel/services/DeployBPRService" />
+ <property name="archive.deploypath" value="http://localhost:8080/active-bpel/services/DeployBPRService" />
<!-- Build the BPR file from the following (generated) file set. -->
<target name="build" depends="">
@@ -56,7 +56,7 @@
<!-- Deploy the built BPR file to some kind of container/server. -->
<target name="deploy" depends="">
<echo message="Deploying Business Process Archive." />
- <deploybpr type="webservice" file="${archive.filename}" tourl="http://localhost:18080/active-bpel/services/DeployBPRService" />
+ <deploybpr type="webservice" file="${archive.filename}" tourl="http://localhost:8080/active-bpel/services/DeployBPRService" />
<echo message="Business Process Archive deployed." />
</target>
Modified: labs/jbossesb/trunk/product/samples/quickstarts/webservice_bpel/bpel/resources/wsdl/Customer.wsdl
===================================================================
--- labs/jbossesb/trunk/product/samples/quickstarts/webservice_bpel/bpel/resources/wsdl/Customer.wsdl 2007-10-05 08:32:47 UTC (rev 15598)
+++ labs/jbossesb/trunk/product/samples/quickstarts/webservice_bpel/bpel/resources/wsdl/Customer.wsdl 2007-10-05 08:39:49 UTC (rev 15599)
@@ -48,7 +48,7 @@
<wsdl:service name="CustomerService">
<wsdl:port name="CustomerSoap" binding="tns:CustomerSoap">
<soap:address
- location="http://localhost:18080/active-bpel/services/ABI_Customer" />
+ location="http://localhost:8080/active-bpel/services/ABI_Customer" />
</wsdl:port>
</wsdl:service>
</wsdl:definitions>
Modified: labs/jbossesb/trunk/product/samples/quickstarts/webservice_bpel/bpel/resources/wsdl/OrderManager.wsdl
===================================================================
--- labs/jbossesb/trunk/product/samples/quickstarts/webservice_bpel/bpel/resources/wsdl/OrderManager.wsdl 2007-10-05 08:32:47 UTC (rev 15598)
+++ labs/jbossesb/trunk/product/samples/quickstarts/webservice_bpel/bpel/resources/wsdl/OrderManager.wsdl 2007-10-05 08:39:49 UTC (rev 15599)
@@ -232,7 +232,7 @@
<port name="RetailerCallbackSoap"
binding="tns:RetailerCallbackSoap">
<soap:address
- location="http://localhost:18080/active-bpel/services/RetailerCallback"
+ location="http://localhost:8080/active-bpel/services/RetailerCallback"
xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" />
</port>
</service>
Modified: labs/jbossesb/trunk/product/samples/quickstarts/webservice_bpel/bpel/resources/wsdl/Retailer.wsdl
===================================================================
--- labs/jbossesb/trunk/product/samples/quickstarts/webservice_bpel/bpel/resources/wsdl/Retailer.wsdl 2007-10-05 08:32:47 UTC (rev 15598)
+++ labs/jbossesb/trunk/product/samples/quickstarts/webservice_bpel/bpel/resources/wsdl/Retailer.wsdl 2007-10-05 08:39:49 UTC (rev 15599)
@@ -46,7 +46,7 @@
</wsdl:binding>
<wsdl:service name="RetailerService">
<wsdl:port name="RetailerPort" binding="tns:RetailerBinding">
- <soap:address location="http://localhost:18080/active-bpel/services/Retailer" />
+ <soap:address location="http://localhost:8080/active-bpel/services/Retailer" />
</wsdl:port>
</wsdl:service>
</wsdl:definitions>
Modified: labs/jbossesb/trunk/product/samples/quickstarts/webservice_bpel/build.xml
===================================================================
--- labs/jbossesb/trunk/product/samples/quickstarts/webservice_bpel/build.xml 2007-10-05 08:32:47 UTC (rev 15598)
+++ labs/jbossesb/trunk/product/samples/quickstarts/webservice_bpel/build.xml 2007-10-05 08:39:49 UTC (rev 15599)
@@ -44,8 +44,7 @@
</war>
</target>
- <target name="quickstart-specific-deploys"
- depends="assert-CATALINA_HOME-set, assert-ACTIVEBPEL_ENGINE-installed">
+ <target name="quickstart-specific-deploys">
<!-- Deploy the quickstart apps. -->
<copy overwrite="true" todir="${org.jboss.esb.server.deploy.dir}">
<fileset dir="${build.dir}/order-manager" includes="order-manager-service.jar,order-manager.war" />
@@ -53,13 +52,13 @@
</copy>
<!-- Deploy the ActiveBPEL components. -->
- <copy overwrite="true" todir="${env.CATALINA_HOME}/bpr">
+ <!--copy overwrite="true" todir="${env.CATALINA_HOME}/bpr">
<fileset dir="bpel" includes="order_process.bpr" />
<fileset dir="bpel/resources/supportServices/Customer" includes="customer.bpr" />
</copy>
<copy overwrite="true" todir="${env.CATALINA_HOME}/shared/classes">
<fileset dir="bpel/tomcat-configs" includes="*.wsdd" />
- </copy>
+ </copy-->
</target>
<target name="quickstart-specific-undeploys"
Added: labs/jbossesb/trunk/product/samples/quickstarts/webservice_bpel/images/process-overview.png
===================================================================
(Binary files differ)
Property changes on: labs/jbossesb/trunk/product/samples/quickstarts/webservice_bpel/images/process-overview.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Modified: labs/jbossesb/trunk/product/samples/quickstarts/webservice_bpel/jboss-esb.xml
===================================================================
--- labs/jbossesb/trunk/product/samples/quickstarts/webservice_bpel/jboss-esb.xml 2007-10-05 08:32:47 UTC (rev 15598)
+++ labs/jbossesb/trunk/product/samples/quickstarts/webservice_bpel/jboss-esb.xml 2007-10-05 08:39:49 UTC (rev 15599)
@@ -135,7 +135,7 @@
template and will then use OGNL to populate the values (from the Smooks
EXTRACTED_BEANS_HASH) into the soap message. -->
<action name="SendSalesOrderNotification" class="org.jboss.soa.esb.actions.soap.SOAPClient">
- <property name="wsdl" value="http://localhost:18080/active-bpel/services/RetailerCallback?wsdl"/>
+ <property name="wsdl" value="http://localhost:8080/active-bpel/services/RetailerCallback?wsdl"/>
<property name="SOAPAction" value="http://org.jboss.esb/quickstarts/bpel/ABI_OrderManager/SendSalesOrderNotification"/>
<property name="paramsLocation" value="EXTRACTED_BEANS_HASH"/>
<property name="responseXStreamConfig">
Modified: labs/jbossesb/trunk/product/services/smooks/src/main/java/org/jboss/soa/esb/actions/converters/SmooksTransformer.java
===================================================================
--- labs/jbossesb/trunk/product/services/smooks/src/main/java/org/jboss/soa/esb/actions/converters/SmooksTransformer.java 2007-10-05 08:32:47 UTC (rev 15598)
+++ labs/jbossesb/trunk/product/services/smooks/src/main/java/org/jboss/soa/esb/actions/converters/SmooksTransformer.java 2007-10-05 08:39:49 UTC (rev 15599)
@@ -20,6 +20,7 @@
package org.jboss.soa.esb.actions.converters;
import java.io.ByteArrayInputStream;
+import java.io.InputStream;
import java.util.*;
import org.apache.log4j.Logger;
@@ -240,10 +241,16 @@
logger.debug("smooks-base-configs: " + Arrays.asList(resources));
}
for(String resource : resources) {
+ String fullResPath = "/smooks-base-configs/" + resource.trim();
try {
- smooks.addConfigurations("/smooks-base-configs/", ClassUtil.getResourceAsStream("/smooks-base-configs/" + resource.trim(), getClass()));
+ InputStream smooksRes = ClassUtil.getResourceAsStream(fullResPath, getClass());
+ if(smooksRes != null) {
+ smooks.addConfigurations("/smooks-base-configs/", smooksRes);
+ } else {
+ logger.warn("Configured Smooks resource '" + fullResPath + "' doesn't exist on the classpath.");
+ }
} catch(Throwable t) {
- // ignore
+ logger.warn("Exception while loading Smooks resource '" + fullResPath + "'.", t);
}
}
}
More information about the jboss-svn-commits
mailing list