[jboss-svn-commits] JBL Code SVN: r11646 - in labs/jbossesb/trunk/product/samples/quickstarts/webservice_bpel: services/order-manager and 4 other directories.
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Thu May 3 12:47:57 EDT 2007
Author: tfennelly
Date: 2007-05-03 12:47:56 -0400 (Thu, 03 May 2007)
New Revision: 11646
Added:
labs/jbossesb/trunk/product/samples/quickstarts/webservice_bpel/services/order-manager/webapp/
labs/jbossesb/trunk/product/samples/quickstarts/webservice_bpel/services/order-manager/webapp/WEB-INF/
labs/jbossesb/trunk/product/samples/quickstarts/webservice_bpel/services/order-manager/webapp/index.jsp
labs/jbossesb/trunk/product/samples/quickstarts/webservice_bpel/services/order-manager/webapp/style.css
labs/jbossesb/trunk/product/samples/quickstarts/webservice_bpel/smooks-cdr.lst
labs/jbossesb/trunk/product/samples/quickstarts/webservice_bpel/smooks-res.xml
Modified:
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/samples/quickstarts/webservice_bpel/log4j.xml
labs/jbossesb/trunk/product/samples/quickstarts/webservice_bpel/services/order-manager/src/com/activebpel/ordermanagement/OrderManager.java
labs/jbossesb/trunk/product/samples/quickstarts/webservice_bpel/services/order-manager/src/com/activebpel/ordermanagement/OrderManagerBean.java
labs/jbossesb/trunk/product/samples/quickstarts/webservice_bpel/src/org/jboss/esb/quickstarts/bpel/OrderManagerService.java
labs/jbossesb/trunk/product/samples/quickstarts/webservice_bpel/src/org/jboss/soa/esb/actions/soap/SOAPUIClient.java
Log:
Added browser form for approving orders in the OrderManager.
Modified: labs/jbossesb/trunk/product/samples/quickstarts/webservice_bpel/build.xml
===================================================================
--- labs/jbossesb/trunk/product/samples/quickstarts/webservice_bpel/build.xml 2007-05-03 15:53:45 UTC (rev 11645)
+++ labs/jbossesb/trunk/product/samples/quickstarts/webservice_bpel/build.xml 2007-05-03 16:47:56 UTC (rev 11646)
@@ -1,6 +1,6 @@
<project name="Quickstart_webservice_bpel" default="deploy" basedir=".">
- <property name="additional.deploys" value="jbmq-service.xml,jbossesb-properties.xml,groovy/**"/>
+ <property name="additional.deploys" value="jbmq-service.xml,jbossesb-properties.xml,smooks-*.*"/>
<property environment="env" />
<!-- Import the base Ant build script... -->
@@ -11,6 +11,7 @@
<antcall target="build-ejb-service">
<param name="servicename" value="order-manager" />
</antcall>
+ <jar destfile="${build.dir}/order-manager/order-manager.war" basedir="services/order-manager/webapp" />
<antcall target="build-ejb-service">
<param name="servicename" value="shipping" />
</antcall>
@@ -32,7 +33,7 @@
<property name="web-inf.dir" value="${basedir}/war/resources/WEB-INF"/>
- <!-- Build the webservice... -->
+ <!-- Build the jsr181 webservice... -->
<war warfile="build/${ant.project.name}.war"
webxml="${web-inf.dir}/web.xml">
<fileset dir="${basedir}/war/view">
@@ -47,7 +48,7 @@
<target name="quickstart-specific-deploys">
<!-- Deply the quickstart apps. -->
<copy overwrite="true" todir="${org.jboss.esb.server.deploy.dir}">
- <fileset dir="${build.dir}/order-manager" includes="order-manager-service.jar" />
+ <fileset dir="${build.dir}/order-manager" includes="order-manager-service.jar,order-manager.war" />
<fileset dir="${build.dir}/shipping" includes="shipping-service.jar" />
<fileset dir="${basedir}/soapui-client/target" includes="soapui-client.sar" />
</copy>
@@ -67,17 +68,19 @@
<target name="display-instructions">
<echo message='${line.separator}******************' />
<echo>Quickstart deployed to target JBoss ESB/App Server at '${org.jboss.esb.server.deploy.dir}'.</echo>
- <echo>1. Check your ESB Server console to make sure the deployment was executed without errors.</echo>
- <echo>2. Make sure your Tomcat deployment at '${env.CATALINA_HOME}' is configured such that it's ports do not clash with those of your running JBoss AS. See '${env.CATALINA_HOME}/conf/server.xml'.</echo>
- <echo>3. Make sure your Tomcat deployment at '${env.CATALINA_HOME}' is configured to listen for HTTP traffic on port 18080. See '${env.CATALINA_HOME}/conf/server.xml'.</echo>
- <echo>4. Start your Tomcat deployment at '${env.CATALINA_HOME}'.</echo>
- <echo>5. Goto 'Deployed Processes' on the BPEL Console (http://localhost:18080/BpelAdmin) and confirm that the 'Customer' and 'OrderProcess' BPEL processes are deployed.</echo>
- <echo>6. Start your favorite SOAP client (e.g. SOAPUI) and load the 'RetailerService' WSDL (http://localhost:18080/active-bpel/services/RetailerService?wsdl).</echo>
- <echo>7. Load the SOAP client with the sample order in 'bpel/resources/sampleData/submit-order-01.xml'.</echo>
- <echo>8. Submit the new order using the SOAP UI client.</echo>
- <echo>9. View the state of the new process in 'Active Processes' on the BPEL Console. Will appear as 'Running'.</echo>
- <echo>10. Drill into the 'Running' process OrderProcess (select it).</echo>
- <echo>11. If you drill down, you will see that the process is waiting on an acknowledgement/notification from the OrderManager service (WaitForNotificationFromOrderManager).</echo>
+ <echo>1. Ensure that the value of the 'directory' attribute on the 'notificationChannel' (jboss-esb.xml) matches the value of the 'order.approval.drop.location' property in 'services/order-manager/order-manager.properties'.</echo>
+ <echo>2. Check your ESB Server console to make sure the deployment was executed without errors.</echo>
+ <echo>3. Make sure your Tomcat deployment at '${env.CATALINA_HOME}' is configured such that it's ports do not clash with those of your running JBoss AS. See '${env.CATALINA_HOME}/conf/server.xml'.</echo>
+ <echo>4. Make sure your Tomcat deployment at '${env.CATALINA_HOME}' is configured to listen for HTTP traffic on port 18080. See '${env.CATALINA_HOME}/conf/server.xml'.</echo>
+ <echo>5. Start your Tomcat deployment at '${env.CATALINA_HOME}'.</echo>
+ <echo>6. Goto 'Deployed Processes' on the BPEL Console (http://localhost:18080/BpelAdmin) and confirm that the 'Customer' and 'OrderProcess' BPEL processes are deployed.</echo>
+ <echo>7. Start your favorite SOAP client (e.g. SOAPUI) and load the 'RetailerService' WSDL (http://localhost:18080/active-bpel/services/RetailerService?wsdl).</echo>
+ <echo>8. Load the SOAP client with the sample order in 'bpel/resources/sampleData/submit-order-01.xml'.</echo>
+ <echo>9. Submit the new order using the SOAP UI client.</echo>
+ <echo>10. View the state of the new process in 'Active Processes' on the BPEL Console. Will appear as 'Running'.</echo>
+ <echo>11. Drill into the 'Running' OrderProcess process (select it).</echo>
+ <echo>12. Drill down, you will see that the process is waiting on an acknowledgement/notification from the OrderManager service (WaitForNotificationFromOrderManager).</echo>
+ <echo>13. Goto http://localhost:8080/order-manager/ (note, not port '18080'). From here, you can approve the order.</echo>
<echo message='******************' />
</target>
Modified: labs/jbossesb/trunk/product/samples/quickstarts/webservice_bpel/jboss-esb.xml
===================================================================
--- labs/jbossesb/trunk/product/samples/quickstarts/webservice_bpel/jboss-esb.xml 2007-05-03 15:53:45 UTC (rev 11645)
+++ labs/jbossesb/trunk/product/samples/quickstarts/webservice_bpel/jboss-esb.xml 2007-05-03 16:47:56 UTC (rev 11646)
@@ -37,6 +37,22 @@
<jbr-bus busid="Socket-1" port="8988"/>
</jbr-provider>
+ <fs-provider name="File Sys Provider">
+ <fs-bus busid="notificationChannel">
+ <fs-message-filter
+ directory="/ae-demo/orders"
+ input-suffix=".in.csv"
+ work-suffix=".esbWorking"
+ post-delete="false"
+ post-directory="/ae-demo/orders"
+ post-suffix=".done.csv"
+ error-delete="false"
+ error-directory="/ae-demo/orders"
+ error-suffix=".IN_ERROR.csv"
+ />
+ </fs-bus>
+ </fs-provider>
+
</providers>
<services>
@@ -87,19 +103,28 @@
</actions>
</service>
- <service category="OrderNotificationService" name="OrderNotificationService" description="Order Notification Service">
+ <service category="OrderNotificationService" name="OrderNotificationService"
+ description="Order Notification Service">
<listeners>
- <groovy-listener name="OrderNotificationService-Injection-Gateway" script="MessageInjectionConsole" is-gateway="true" />
+ <fs-listener name="FileGateway" busidref="notificationChannel" is-gateway="true"
+ poll-frequency-seconds="10"/>
<jms-listener name="OrderNotificationService" busidref="OrderNotificationService"/>
</listeners>
<actions>
- <action name="message-populator" class="org.jboss.soa.esb.actions.scripting.GroovyActionProcessor">
- <property name="script" value="/org/jboss/esb/quickstarts/bpel/orderNotificationBean.groovy" />
+ <action name="message-populator" class="org.jboss.soa.esb.actions.converters.SmooksTransformer">
+ <property name="from" value="OrderManager"/>
+ <property name="from-type" value="text/csv:orderApproval"/>
+ <property name="to" value="RetailerCallback"/>
+ <property name="to-type" value="text/xml:SendSalesOrderNotification"/>
</action>
-
+ <action name="print-csv" class="org.jboss.soa.esb.actions.SystemPrintln">
+ <property name="message"
+ value="[Quickstart_webservice_bpel] CSV"/>
+ </action>
<action name="soapui-client" class="org.jboss.soa.esb.actions.soap.SOAPUIClient">
- <property name="wsdl" value="http://localhost:18080/active-bpel/services/RetailerCallback?wsdl" />
- <property name="operation" value="SendSalesOrderNotification" />
+ <property name="wsdl" value="http://localhost:18080/active-bpel/services/RetailerCallback?wsdl"/>
+ <property name="operation" value="SendSalesOrderNotification"/>
+ <property name="paramsLocation" value="EXTRACTED_BEANS_HASH"/>
</action>
</actions>
</service>
Modified: labs/jbossesb/trunk/product/samples/quickstarts/webservice_bpel/log4j.xml
===================================================================
--- labs/jbossesb/trunk/product/samples/quickstarts/webservice_bpel/log4j.xml 2007-05-03 15:53:45 UTC (rev 11645)
+++ labs/jbossesb/trunk/product/samples/quickstarts/webservice_bpel/log4j.xml 2007-05-03 16:47:56 UTC (rev 11646)
@@ -39,7 +39,7 @@
<category name="org.jboss.soa.esb">
<priority value="ERROR"/>
</category>
- <category name="org.jboss.soa.esb.listeners.gateway.JBossRemotingGatewayListener">
+ <category name="org.milyn.javabean">
<priority value="DEBUG"/>
</category>
<category name="org.jboss.internal.soa.esb">
Modified: labs/jbossesb/trunk/product/samples/quickstarts/webservice_bpel/services/order-manager/src/com/activebpel/ordermanagement/OrderManager.java
===================================================================
--- labs/jbossesb/trunk/product/samples/quickstarts/webservice_bpel/services/order-manager/src/com/activebpel/ordermanagement/OrderManager.java 2007-05-03 15:53:45 UTC (rev 11645)
+++ labs/jbossesb/trunk/product/samples/quickstarts/webservice_bpel/services/order-manager/src/com/activebpel/ordermanagement/OrderManager.java 2007-05-03 16:47:56 UTC (rev 11646)
@@ -19,5 +19,5 @@
public Map<String, CustomerOrder> getOrders() throws java.rmi.RemoteException;
- public void approveOrder(String orderNumber) throws java.rmi.RemoteException;
+ public boolean approveOrder(String orderNumber) throws java.rmi.RemoteException;
}
Modified: labs/jbossesb/trunk/product/samples/quickstarts/webservice_bpel/services/order-manager/src/com/activebpel/ordermanagement/OrderManagerBean.java
===================================================================
--- labs/jbossesb/trunk/product/samples/quickstarts/webservice_bpel/services/order-manager/src/com/activebpel/ordermanagement/OrderManagerBean.java 2007-05-03 15:53:45 UTC (rev 11645)
+++ labs/jbossesb/trunk/product/samples/quickstarts/webservice_bpel/services/order-manager/src/com/activebpel/ordermanagement/OrderManagerBean.java 2007-05-03 16:47:56 UTC (rev 11646)
@@ -25,12 +25,10 @@
import javax.ejb.Remote;
import javax.ejb.Stateless;
import java.rmi.RemoteException;
-import java.util.UUID;
-import java.util.Map;
-import java.util.HashMap;
-import java.util.Properties;
+import java.util.*;
import java.io.Serializable;
import java.io.File;
+import java.io.FileWriter;
import java.io.IOException;
/**
@@ -43,7 +41,7 @@
public class OrderManagerBean implements OrderManager, Serializable {
private Logger logger = Logger.getLogger(OrderManagerBean.class);
- private static Map<String, CustomerOrder> orders = new HashMap<String, CustomerOrder>();
+ private static Map<String, CustomerOrder> orders = new LinkedHashMap<String, CustomerOrder>();
private Properties properties;
private File approvalDir;
private static final String ORDER_MANAGER_PROPERTIES = "order-manager.properties";
@@ -76,13 +74,12 @@
String ordernum = UUID.randomUUID().toString();
orders.put(ordernum, customerOrder);
- System.out.println("Orders: " + orders.keySet());
+ logger.info("Orders: " + orders.keySet());
return ordernum;
}
public boolean cancelOrder(CancelOrder cancelOrder) throws RemoteException {
- orders.remove(cancelOrder.getOrderInquiry().getPoNumber());
return true;
}
@@ -90,7 +87,42 @@
return orders;
}
- public void approveOrder(String orderNumber) throws RemoteException {
-
+ public boolean approveOrder(String orderNumber) throws RemoteException {
+ CustomerOrder order = orders.get(orderNumber);
+
+ if(order == null) {
+ logger.error("No such order: " + orderNumber);
+ return false;
+ }
+
+ File orderCSVDrop = new File(approvalDir, orderNumber + ".in.csv");
+ FileWriter fileWriter = null;
+ try {
+ fileWriter = new FileWriter(orderCSVDrop);
+ } catch (IOException e) {
+ logger.error("Failed to create a FileWriter for order file '" + orderCSVDrop.getAbsolutePath() + "'.", e);
+ return false;
+ }
+
+ try {
+ fileWriter.write(orderNumber + "," + order.getHeader().customerNumber + "," + order.getHeader().getBillTo().company + "," + order.getHeader().getOrderDate().getTime());
+ orders.remove(orderNumber);
+ } catch (IOException e) {
+ logger.error("Failed to write order to file '" + orderCSVDrop.getAbsolutePath() + "'.", e);
+ return false;
+ } finally {
+ try {
+ fileWriter.flush();
+ } catch (IOException e) {
+ logger.warn("Failed to flush order to file '" + orderCSVDrop.getAbsolutePath() + "'.", e);
+ }
+ try {
+ fileWriter.close();
+ } catch (IOException e) {
+ logger.warn("Failed to close order file '" + orderCSVDrop.getAbsolutePath() + "'.", e);
+ }
+ }
+
+ return true;
}
}
Added: labs/jbossesb/trunk/product/samples/quickstarts/webservice_bpel/services/order-manager/webapp/index.jsp
===================================================================
--- labs/jbossesb/trunk/product/samples/quickstarts/webservice_bpel/services/order-manager/webapp/index.jsp (rev 0)
+++ labs/jbossesb/trunk/product/samples/quickstarts/webservice_bpel/services/order-manager/webapp/index.jsp 2007-05-03 16:47:56 UTC (rev 11646)
@@ -0,0 +1,63 @@
+<%@ page import="javax.naming.InitialContext" %>
+<%@ page import="javax.naming.NamingException" %>
+<%@ page import="com.activebpel.ordermanagement.OrderManager" %>
+<%@ page import="java.util.Map" %>
+<%@ page import="com.activebpel.ordermanagement.CustomerOrder" %>
+<%@ page import="java.util.Set" %>
+<%@ page import="java.util.Iterator" %>
+<%
+ InitialContext ctx;
+ OrderManager orderManager;
+ Map orders;
+ String approveOrderNum = request.getParameter("approve");
+
+ try {
+ ctx = new InitialContext();
+ } catch (NamingException e) {
+ throw new RuntimeException("Unable to create JNDI context.", e);
+ }
+ try {
+ orderManager = (OrderManager) ctx.lookup("OrderManagerBean/remote");
+ } catch (NamingException e) {
+ throw new RuntimeException("Unable to lookup OrderManager Service Bean.", e);
+ }
+
+ if (approveOrderNum != null && !approveOrderNum.trim().equals("")) {
+ orderManager.approveOrder(approveOrderNum);
+ }
+ orders = orderManager.getOrders();
+%>
+<html>
+ <head>
+ <title>Order Manager Service - Order Approval</title>
+ <link rel='stylesheet' href='./style.css'>
+ <meta http-equiv="refresh" content="3;url=index.jsp">
+ </head>
+ <html>
+ <h1>Order Manager - Orders For Approval</h1>
+
+ <table id="data-table" border="1">
+ <colgroup>
+ <col width="25%"/><col width="25%"/><col width="20%"/><col width="20%"/><col width="10%"/>
+ </colgroup>
+ <tr id="table-head">
+ <td>Order Date</td><td>Order Number</td><td>Customer Number</td><td>Customer Name</td><td> </td>
+ </tr>
+ <%
+ Iterator orderSet = orders.entrySet().iterator();
+ while (orderSet.hasNext()) {
+ Map.Entry orderEntry = (Map.Entry) orderSet.next();
+ String orderNum = (String) orderEntry.getKey();
+ CustomerOrder order = (CustomerOrder) orderEntry.getValue();
+ %>
+ <tr id="table-row">
+ <td><%=order.getHeader().getOrderDate().getTime()%></td><td><%=orderNum%></td><td><%=order.getHeader().getCustomerNumber()%></td><td><%=order.getHeader().getBillTo().getCompany()%></td><td><a href="index.jsp?approve=<%=orderNum%>">Approve</a></td>
+ </tr>
+ <%
+ }
+ %>
+ <td> </td><td> </td><td> </td><td> </td><td> </td>
+ </table>
+
+ </html>
+</html>
\ No newline at end of file
Added: labs/jbossesb/trunk/product/samples/quickstarts/webservice_bpel/services/order-manager/webapp/style.css
===================================================================
--- labs/jbossesb/trunk/product/samples/quickstarts/webservice_bpel/services/order-manager/webapp/style.css (rev 0)
+++ labs/jbossesb/trunk/product/samples/quickstarts/webservice_bpel/services/order-manager/webapp/style.css 2007-05-03 16:47:56 UTC (rev 11646)
@@ -0,0 +1,8 @@
+table {
+ border: thick double black;
+ width: 100%
+}
+
+#table-head {
+ background-color: #dddddd;
+}
\ No newline at end of file
Added: labs/jbossesb/trunk/product/samples/quickstarts/webservice_bpel/smooks-cdr.lst
===================================================================
--- labs/jbossesb/trunk/product/samples/quickstarts/webservice_bpel/smooks-cdr.lst (rev 0)
+++ labs/jbossesb/trunk/product/samples/quickstarts/webservice_bpel/smooks-cdr.lst 2007-05-03 16:47:56 UTC (rev 11646)
@@ -0,0 +1,10 @@
+####################################################
+# Uncomment out to load config from database
+####################################################
+# http://localhost:8080/jboss-esb-console/transform/smooks-config.jsf
+
+####################################################
+# Uncomment out to load config from local XML file
+####################################################
+/smooks-res.xml
+/org/milyn/templating/templating-cdu-creators-0.1.cdrl
Added: labs/jbossesb/trunk/product/samples/quickstarts/webservice_bpel/smooks-res.xml
===================================================================
--- labs/jbossesb/trunk/product/samples/quickstarts/webservice_bpel/smooks-res.xml (rev 0)
+++ labs/jbossesb/trunk/product/samples/quickstarts/webservice_bpel/smooks-res.xml 2007-05-03 16:47:56 UTC (rev 11646)
@@ -0,0 +1,24 @@
+<?xml version="1.0"?>
+<!DOCTYPE smooks-resource-list PUBLIC "-//MILYN//DTD SMOOKS 1.0//EN" "http://www.milyn.org/dtd/smooksres-list-1.0.dtd" >
+
+<smooks-resource-list default-useragent="from-type:text/csv:orderApproval and from:OrderManager and to-type:text/xml:SendSalesOrderNotification and to:RetailerCallback">
+
+ <!--
+ Set the parser for the message - CSV.
+ -->
+ <smooks-resource selector="org.xml.sax.driver" path="org.milyn.csv.CSVParser" >
+ <param name="fields" type="string-list">
+ orderNum,customerNumber,customerName,orderDate
+ </param>
+ </smooks-resource>
+
+ <!--
+ Suck the order number out of the CSV record and into the SalesOrderNotification bean.
+ -->
+ <smooks-resource selector="csv-record orderNum" path="org.milyn.javabean.ProcessingPhaseBeanPopulator">
+ <param name="beanId"><![CDATA[salesOrderNotification]]></param>
+ <param name="beanClass"><![CDATA[com.activebpel.ordermanagement.SalesOrderNotification]]></param>
+ <param name="setterName"><![CDATA[setOrderNumber]]></param>
+ </smooks-resource>
+
+</smooks-resource-list>
\ No newline at end of file
Property changes on: labs/jbossesb/trunk/product/samples/quickstarts/webservice_bpel/smooks-res.xml
___________________________________________________________________
Name: svn:mime-type
+ text/xml
Name: svn:eol-style
+ native
Modified: labs/jbossesb/trunk/product/samples/quickstarts/webservice_bpel/src/org/jboss/esb/quickstarts/bpel/OrderManagerService.java
===================================================================
--- labs/jbossesb/trunk/product/samples/quickstarts/webservice_bpel/src/org/jboss/esb/quickstarts/bpel/OrderManagerService.java 2007-05-03 15:53:45 UTC (rev 11645)
+++ labs/jbossesb/trunk/product/samples/quickstarts/webservice_bpel/src/org/jboss/esb/quickstarts/bpel/OrderManagerService.java 2007-05-03 16:47:56 UTC (rev 11646)
@@ -69,7 +69,7 @@
throw new UnsupportedOperationException("Not exposed as a SOAP operation.");
}
- public void approveOrder(String orderNumber) throws RemoteException {
+ public boolean approveOrder(String orderNumber) throws RemoteException {
throw new UnsupportedOperationException("Not exposed as a SOAP operation.");
}
}
Modified: labs/jbossesb/trunk/product/samples/quickstarts/webservice_bpel/src/org/jboss/soa/esb/actions/soap/SOAPUIClient.java
===================================================================
--- labs/jbossesb/trunk/product/samples/quickstarts/webservice_bpel/src/org/jboss/soa/esb/actions/soap/SOAPUIClient.java 2007-05-03 15:53:45 UTC (rev 11645)
+++ labs/jbossesb/trunk/product/samples/quickstarts/webservice_bpel/src/org/jboss/soa/esb/actions/soap/SOAPUIClient.java 2007-05-03 16:47:56 UTC (rev 11646)
@@ -84,6 +84,8 @@
}
if(params == null) {
throw new ActionProcessingException("No params. SOAP message parameters must either be set as the default message body payload, or set on the body under the key defined in the 'paramsLocation' acton property.");
+ } else if(params.isEmpty()) {
+ logger.warn("Params Map found in message, but the map is empty.");
}
String request = buildRequestMessage(params);
More information about the jboss-svn-commits
mailing list