[jboss-svn-commits] JBL Code SVN: r15239 - in labs/jbossesb/trunk/product: samples/quickstarts/webservice_bpel/services/order-manager/src/com/activebpel/ordermanagement and 2 other directories.

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

Author: tfennelly
Date: 2007-09-19 13:54:24 -0400 (Wed, 19 Sep 2007)
New Revision: 15239

Modified:
   labs/jbossesb/trunk/product/extras/jaxbintros/src/main/java/org/jboss/jaxb/intros/handlers/XmlTypeHandler.java
   labs/jbossesb/trunk/product/samples/quickstarts/webservice_bpel/services/order-manager/src/com/activebpel/ordermanagement/CustomerOrder.java
   labs/jbossesb/trunk/product/samples/quickstarts/webservice_bpel/services/order-manager/src/com/activebpel/ordermanagement/OrderInquiry.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/war/resources/META-INF/jaxb-intros.xml
Log:
Field not populated when calling web service from SOAPProcessor: http://jira.jboss.com/jira/browse/JBESB-1005

Modified: labs/jbossesb/trunk/product/extras/jaxbintros/src/main/java/org/jboss/jaxb/intros/handlers/XmlTypeHandler.java
===================================================================
--- labs/jbossesb/trunk/product/extras/jaxbintros/src/main/java/org/jboss/jaxb/intros/handlers/XmlTypeHandler.java	2007-09-19 17:35:17 UTC (rev 15238)
+++ labs/jbossesb/trunk/product/extras/jaxbintros/src/main/java/org/jboss/jaxb/intros/handlers/XmlTypeHandler.java	2007-09-19 17:54:24 UTC (rev 15239)
@@ -70,7 +70,12 @@
             return xmlTypeIntro.getName();
         } else if(methodName.equals("propOrder")) {
             try {
-                return xmlTypeIntro.getPropOrder().split(",");
+                String[] propOrder = xmlTypeIntro.getPropOrder().split(",");
+                for (int i = 0; i < propOrder.length; i++) {
+                    String s = propOrder[i];
+                    propOrder[i] = s.trim();
+                }
+                return propOrder;
             } catch(Exception e) {
                 logger.warn("Bad 'XmlType.propOrder' config value '" + xmlTypeIntro.getPropOrder() + "' in JAXB Annotation Introduction config.  Must be a CSV String.");
             }

Modified: labs/jbossesb/trunk/product/samples/quickstarts/webservice_bpel/services/order-manager/src/com/activebpel/ordermanagement/CustomerOrder.java
===================================================================
--- labs/jbossesb/trunk/product/samples/quickstarts/webservice_bpel/services/order-manager/src/com/activebpel/ordermanagement/CustomerOrder.java	2007-09-19 17:35:17 UTC (rev 15238)
+++ labs/jbossesb/trunk/product/samples/quickstarts/webservice_bpel/services/order-manager/src/com/activebpel/ordermanagement/CustomerOrder.java	2007-09-19 17:54:24 UTC (rev 15239)
@@ -10,7 +10,6 @@
 
 package com.activebpel.ordermanagement;
 
-import javax.xml.bind.annotation.*;
 import java.io.Serializable;
 
 public class  CustomerOrder implements Serializable {

Modified: labs/jbossesb/trunk/product/samples/quickstarts/webservice_bpel/services/order-manager/src/com/activebpel/ordermanagement/OrderInquiry.java
===================================================================
--- labs/jbossesb/trunk/product/samples/quickstarts/webservice_bpel/services/order-manager/src/com/activebpel/ordermanagement/OrderInquiry.java	2007-09-19 17:35:17 UTC (rev 15238)
+++ labs/jbossesb/trunk/product/samples/quickstarts/webservice_bpel/services/order-manager/src/com/activebpel/ordermanagement/OrderInquiry.java	2007-09-19 17:54:24 UTC (rev 15239)
@@ -32,4 +32,7 @@
 
 public void setPoNumber(java.lang.String poNumber){ this.poNumber=poNumber; }
 
+    public String toString() {
+        return customerNumber + ":" + poNumber;
+    }
 }

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-09-19 17:35:17 UTC (rev 15238)
+++ labs/jbossesb/trunk/product/samples/quickstarts/webservice_bpel/src/org/jboss/esb/quickstarts/bpel/OrderManagerService.java	2007-09-19 17:54:24 UTC (rev 15239)
@@ -63,6 +63,7 @@
 
     @WebMethod(operationName = "cancelOrder")
     public boolean cancelOrder(CancelOrder cancelOrder) throws RemoteException {
+        System.out.println("cancelOrder.getOrderInquiry(): " + cancelOrder.getOrderInquiry());
         return orderManagement.cancelOrder(cancelOrder);
     }
 

Modified: labs/jbossesb/trunk/product/samples/quickstarts/webservice_bpel/war/resources/META-INF/jaxb-intros.xml
===================================================================
--- labs/jbossesb/trunk/product/samples/quickstarts/webservice_bpel/war/resources/META-INF/jaxb-intros.xml	2007-09-19 17:35:17 UTC (rev 15238)
+++ labs/jbossesb/trunk/product/samples/quickstarts/webservice_bpel/war/resources/META-INF/jaxb-intros.xml	2007-09-19 17:54:24 UTC (rev 15239)
@@ -19,6 +19,13 @@
             <XmlElement namespace="http://org.jboss.esb/quickstarts/bpel/ABI_OrderManager" />
         </Method>
     </Class>
+    <Class name="com.activebpel.ordermanagement.CancelOrder">
+        <XmlType name="cancelOrder" propOrder="orderInquiry" />
+    </Class>
+    <Class name="com.activebpel.ordermanagement.OrderInquiry">
+        <XmlType name="orderInquiry" propOrder="customerNumber, poNumber" />
+    </Class>
+
     <!--
     More general namespace config for the rest of the message...
     -->
@@ -28,7 +35,6 @@
         </Method>
     </Class>
 
-
     <!--
     JAXB annotation introductions for ShippingRequest messages.
     -->
@@ -42,6 +48,7 @@
             <XmlElement namespace="http://org.jboss.esb/quickstarts/bpel/ABI_Shipping" />
         </Method>
     </Class>
+    
     <Class name="com.activebpel.shipping.ShippingResponse">
         <Method name="isOrderShipped">
             <XmlElement namespace="http://org.jboss.esb/quickstarts/bpel/ABI_Shipping" />