You are viewing a plain text version of this content. The canonical link for it is here.
Posted to stonehenge-commits@incubator.apache.org by be...@apache.org on 2009/09/30 16:21:14 UTC

svn commit: r820332 [5/7] - in /incubator/stonehenge/trunk/stocktrader/metro: ./ active_sts/ active_sts/etc/ active_sts/src/ active_sts/src/org/ active_sts/src/org/apache/ active_sts/src/org/apache/stonehenge/ active_sts/src/org/apache/stonehenge/stock...

Modified: incubator/stonehenge/trunk/stocktrader/metro/etc/business_service/wsdl0.wsdl
URL: http://svn.apache.org/viewvc/incubator/stonehenge/trunk/stocktrader/metro/etc/business_service/wsdl0.wsdl?rev=820332&r1=820331&r2=820332&view=diff
==============================================================================
--- incubator/stonehenge/trunk/stocktrader/metro/etc/business_service/wsdl0.wsdl (original)
+++ incubator/stonehenge/trunk/stocktrader/metro/etc/business_service/wsdl0.wsdl Wed Sep 30 16:21:08 2009
@@ -1,257 +1,291 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<wsdl:definitions targetNamespace="http://trade.samples.websphere.ibm.com" xmlns:tns="http://trade.samples.websphere.ibm.com" xmlns:wsx="http://schemas.xmlsoap.org/ws/2004/09/mex" xmlns:soap12="http://schemas.xmlsoap.org/wsdl/soap12/" xmlns:wsa="http://schemas.xmlsoap.org/ws/2004/08/addressing" xmlns:wsap="http://schemas.xmlsoap.org/ws/2004/08/addressing/policy" xmlns:wsaw="http://www.w3.org/2006/05/addressing/wsdl" xmlns:wsp="http://schemas.xmlsoap.org/ws/2004/09/policy" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns:wsa10="http://www.w3.org/2005/08/addressing" xmlns:soapenc="http://schemas.xmlsoap.org/soap/encoding/" xmlns:wsam="http://www.w3.org/2007/05/addressing/metadata" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:wsu="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utility-1.0.xsd" xmlns:msc="http://schemas.microsoft.com/ws/2005/12/wsdl/contract">
-  <wsdl:types>
-    <xsd:schema targetNamespace="http://trade.samples.websphere.ibm.com/Imports">
-      <xsd:import namespace="http://trade.samples.websphere.ibm.com" schemaLocation="xsd0.xsd"/>
-      <xsd:import namespace="http://schemas.microsoft.com/2003/10/Serialization/" schemaLocation="xsd1.xsd"/>
-    </xsd:schema>
-  </wsdl:types>
-  <wsdl:message name="ITradeServices_getHolding_InputMessage">
-    <wsdl:part name="parameters" element="tns:getHolding">
-    </wsdl:part>
-  </wsdl:message>
-  <wsdl:message name="ITradeServices_sellEnhanced_OutputMessage">
-    <wsdl:part name="parameters" element="tns:sellEnhancedResponse">
-    </wsdl:part>
-  </wsdl:message>
-  <wsdl:message name="ITradeServices_logout_InputMessage">
-    <wsdl:part name="parameters" element="tns:logout">
-    </wsdl:part>
-  </wsdl:message>
-  <wsdl:message name="ITradeServices_getAccountProfileData_InputMessage">
-    <wsdl:part name="parameters" element="tns:getAccountProfileData">
-    </wsdl:part>
-  </wsdl:message>
-  <wsdl:message name="ITradeServices_updateAccountProfile_OutputMessage">
-    <wsdl:part name="parameters" element="tns:updateAccountProfileResponse">
-    </wsdl:part>
-  </wsdl:message>
-  <wsdl:message name="ITradeServices_isOnline_InputMessage">
-    <wsdl:part name="parameters" element="tns:isOnline">
-    </wsdl:part>
-  </wsdl:message>
-  <wsdl:message name="ITradeServices_login_OutputMessage">
-    <wsdl:part name="parameters" element="tns:loginResponse">
-    </wsdl:part>
-  </wsdl:message>
-  <wsdl:message name="ITradeServices_register_InputMessage">
-    <wsdl:part name="parameters" element="tns:register">
-    </wsdl:part>
-  </wsdl:message>
-  <wsdl:message name="ITradeServices_getQuote_InputMessage">
-    <wsdl:part name="parameters" element="tns:getQuote">
-    </wsdl:part>
-  </wsdl:message>
-  <wsdl:message name="ITradeServices_getAccountData_OutputMessage">
-    <wsdl:part name="parameters" element="tns:getAccountDataResponse">
-    </wsdl:part>
-  </wsdl:message>
-  <wsdl:message name="ITradeServices_getClosedOrders_InputMessage">
-    <wsdl:part name="parameters" element="tns:getClosedOrders">
-    </wsdl:part>
-  </wsdl:message>
-  <wsdl:message name="ITradeServices_logout_OutputMessage">
-    <wsdl:part name="parameters" element="tns:logoutResponse">
-    </wsdl:part>
-  </wsdl:message>
-  <wsdl:message name="ITradeServices_sell_InputMessage">
-    <wsdl:part name="parameters" element="tns:sell">
-    </wsdl:part>
-  </wsdl:message>
-  <wsdl:message name="ITradeServices_getMarketSummary_OutputMessage">
-    <wsdl:part name="parameters" element="tns:getMarketSummaryResponse">
-    </wsdl:part>
-  </wsdl:message>
-  <wsdl:message name="ITradeServices_getClosedOrders_OutputMessage">
-    <wsdl:part name="parameters" element="tns:getClosedOrdersResponse">
-    </wsdl:part>
-  </wsdl:message>
-  <wsdl:message name="ITradeServices_emptyMethodAction_InputMessage">
-    <wsdl:part name="parameters" element="tns:emptyMethodAction">
-    </wsdl:part>
-  </wsdl:message>
-  <wsdl:message name="ITradeServices_sellEnhanced_InputMessage">
-    <wsdl:part name="parameters" element="tns:sellEnhanced">
-    </wsdl:part>
-  </wsdl:message>
-  <wsdl:message name="ITradeServices_getMarketSummary_InputMessage">
-    <wsdl:part name="parameters" element="tns:getMarketSummary">
-    </wsdl:part>
-  </wsdl:message>
-  <wsdl:message name="ITradeServices_login_InputMessage">
-    <wsdl:part name="parameters" element="tns:login">
-    </wsdl:part>
-  </wsdl:message>
-  <wsdl:message name="ITradeServices_getTopOrders_OutputMessage">
-    <wsdl:part name="parameters" element="tns:getTopOrdersResponse">
-    </wsdl:part>
-  </wsdl:message>
-  <wsdl:message name="ITradeServices_getAccountProfileData_OutputMessage">
-    <wsdl:part name="parameters" element="tns:getAccountProfileDataResponse">
-    </wsdl:part>
-  </wsdl:message>
-  <wsdl:message name="ITradeServices_emptyMethodAction_OutputMessage">
-    <wsdl:part name="parameters" element="tns:emptyMethodActionResponse">
-    </wsdl:part>
-  </wsdl:message>
-  <wsdl:message name="ITradeServices_getHoldings_OutputMessage">
-    <wsdl:part name="parameters" element="tns:getHoldingsResponse">
-    </wsdl:part>
-  </wsdl:message>
-  <wsdl:message name="ITradeServices_getQuote_OutputMessage">
-    <wsdl:part name="parameters" element="tns:getQuoteResponse">
-    </wsdl:part>
-  </wsdl:message>
-  <wsdl:message name="ITradeServices_getHoldings_InputMessage">
-    <wsdl:part name="parameters" element="tns:getHoldings">
-    </wsdl:part>
-  </wsdl:message>
-  <wsdl:message name="ITradeServices_getTopOrders_InputMessage">
-    <wsdl:part name="parameters" element="tns:getTopOrders">
-    </wsdl:part>
-  </wsdl:message>
-  <wsdl:message name="ITradeServices_register_OutputMessage">
-    <wsdl:part name="parameters" element="tns:registerResponse">
-    </wsdl:part>
-  </wsdl:message>
-  <wsdl:message name="ITradeServices_updateAccountProfile_InputMessage">
-    <wsdl:part name="parameters" element="tns:updateAccountProfile">
-    </wsdl:part>
-  </wsdl:message>
-  <wsdl:message name="ITradeServices_getAccountData_InputMessage">
-    <wsdl:part name="parameters" element="tns:getAccountData">
-    </wsdl:part>
-  </wsdl:message>
-  <wsdl:message name="ITradeServices_getOrders_OutputMessage">
-    <wsdl:part name="parameters" element="tns:getOrdersResponse">
-    </wsdl:part>
-  </wsdl:message>
-  <wsdl:message name="ITradeServices_getHolding_OutputMessage">
-    <wsdl:part name="parameters" element="tns:getHoldingResponse">
-    </wsdl:part>
-  </wsdl:message>
-  <wsdl:message name="ITradeServices_getOrders_InputMessage">
-    <wsdl:part name="parameters" element="tns:getOrders">
-    </wsdl:part>
-  </wsdl:message>
-  <wsdl:message name="ITradeServices_buy_InputMessage">
-    <wsdl:part name="parameters" element="tns:buy">
-    </wsdl:part>
-  </wsdl:message>
-  <wsdl:message name="ITradeServices_buy_OutputMessage">
-    <wsdl:part name="parameters" element="tns:buyResponse">
-    </wsdl:part>
-  </wsdl:message>
-  <wsdl:message name="ITradeServices_sell_OutputMessage">
-    <wsdl:part name="parameters" element="tns:sellResponse">
-    </wsdl:part>
-  </wsdl:message>
-  <wsdl:portType name="ITradeServices">
-    <wsdl:operation name="emptyMethodAction">
-      <wsdl:input message="tns:ITradeServices_emptyMethodAction_InputMessage" wsaw:Action="">
-    </wsdl:input>
-      <wsdl:output message="tns:ITradeServices_emptyMethodAction_OutputMessage" wsaw:Action="http://trade.samples.websphere.ibm.com/ITradeServices/emptyMethodActionResponse">
-    </wsdl:output>
-    </wsdl:operation>
-    <wsdl:operation name="isOnline">
-      <wsdl:input message="tns:ITradeServices_isOnline_InputMessage" wsaw:Action="isOnline">
-    </wsdl:input>
-    </wsdl:operation>
-    <wsdl:operation name="login">
-      <wsdl:input message="tns:ITradeServices_login_InputMessage" wsaw:Action="http://trade.samples.websphere.ibm.com/ITradeServices/login">
-    </wsdl:input>
-      <wsdl:output message="tns:ITradeServices_login_OutputMessage" wsaw:Action="http://trade.samples.websphere.ibm.com/ITradeServices/loginResponse">
-    </wsdl:output>
-    </wsdl:operation>
-    <wsdl:operation name="getOrders">
-      <wsdl:input message="tns:ITradeServices_getOrders_InputMessage" wsaw:Action="getOrders">
-    </wsdl:input>
-      <wsdl:output message="tns:ITradeServices_getOrders_OutputMessage" wsaw:Action="http://trade.samples.websphere.ibm.com/ITradeServices/getOrdersResponse">
-    </wsdl:output>
-    </wsdl:operation>
-    <wsdl:operation name="getAccountData">
-      <wsdl:input message="tns:ITradeServices_getAccountData_InputMessage" wsaw:Action="getAccountData">
-    </wsdl:input>
-      <wsdl:output message="tns:ITradeServices_getAccountData_OutputMessage" wsaw:Action="http://trade.samples.websphere.ibm.com/ITradeServices/getAccountDataResponse">
-    </wsdl:output>
-    </wsdl:operation>
-    <wsdl:operation name="getAccountProfileData">
-      <wsdl:input message="tns:ITradeServices_getAccountProfileData_InputMessage" wsaw:Action="getAccountProfileData">
-    </wsdl:input>
-      <wsdl:output message="tns:ITradeServices_getAccountProfileData_OutputMessage" wsaw:Action="http://trade.samples.websphere.ibm.com/ITradeServices/getAccountProfileDataResponse">
-    </wsdl:output>
-    </wsdl:operation>
-    <wsdl:operation name="updateAccountProfile">
-      <wsdl:input message="tns:ITradeServices_updateAccountProfile_InputMessage" wsaw:Action="updateAccountProfile">
-    </wsdl:input>
-      <wsdl:output message="tns:ITradeServices_updateAccountProfile_OutputMessage" wsaw:Action="http://trade.samples.websphere.ibm.com/ITradeServices/updateAccountProfileResponse">
-    </wsdl:output>
-    </wsdl:operation>
-    <wsdl:operation name="logout">
-      <wsdl:input message="tns:ITradeServices_logout_InputMessage" wsaw:Action="logout">
-    </wsdl:input>
-      <wsdl:output message="tns:ITradeServices_logout_OutputMessage" wsaw:Action="http://trade.samples.websphere.ibm.com/ITradeServices/logoutResponse">
-    </wsdl:output>
-    </wsdl:operation>
-    <wsdl:operation name="buy">
-      <wsdl:input message="tns:ITradeServices_buy_InputMessage" wsaw:Action="buy">
-    </wsdl:input>
-      <wsdl:output message="tns:ITradeServices_buy_OutputMessage" wsaw:Action="http://trade.samples.websphere.ibm.com/ITradeServices/buyResponse">
-    </wsdl:output>
-    </wsdl:operation>
-    <wsdl:operation name="sell">
-      <wsdl:input message="tns:ITradeServices_sell_InputMessage" wsaw:Action="sell">
-    </wsdl:input>
-      <wsdl:output message="tns:ITradeServices_sell_OutputMessage" wsaw:Action="http://trade.samples.websphere.ibm.com/ITradeServices/sellResponse">
-    </wsdl:output>
-    </wsdl:operation>
-    <wsdl:operation name="getHoldings">
-      <wsdl:input message="tns:ITradeServices_getHoldings_InputMessage" wsaw:Action="getHoldings">
-    </wsdl:input>
-      <wsdl:output message="tns:ITradeServices_getHoldings_OutputMessage" wsaw:Action="http://trade.samples.websphere.ibm.com/ITradeServices/getHoldingsResponse">
-    </wsdl:output>
-    </wsdl:operation>
-    <wsdl:operation name="register">
-      <wsdl:input message="tns:ITradeServices_register_InputMessage" wsaw:Action="register">
-    </wsdl:input>
-      <wsdl:output message="tns:ITradeServices_register_OutputMessage" wsaw:Action="http://trade.samples.websphere.ibm.com/ITradeServices/registerResponse">
-    </wsdl:output>
-    </wsdl:operation>
-    <wsdl:operation name="getClosedOrders">
-      <wsdl:input message="tns:ITradeServices_getClosedOrders_InputMessage" wsaw:Action="getClosedOrders">
-    </wsdl:input>
-      <wsdl:output message="tns:ITradeServices_getClosedOrders_OutputMessage" wsaw:Action="http://trade.samples.websphere.ibm.com/ITradeServices/getClosedOrdersResponse">
-    </wsdl:output>
-    </wsdl:operation>
-    <wsdl:operation name="getMarketSummary">
-      <wsdl:input message="tns:ITradeServices_getMarketSummary_InputMessage" wsaw:Action="getMarketSummary">
-    </wsdl:input>
-      <wsdl:output message="tns:ITradeServices_getMarketSummary_OutputMessage" wsaw:Action="http://trade.samples.websphere.ibm.com/ITradeServices/getMarketSummaryResponse">
-    </wsdl:output>
-    </wsdl:operation>
-    <wsdl:operation name="getQuote">
-      <wsdl:input message="tns:ITradeServices_getQuote_InputMessage" wsaw:Action="http://trade.samples.websphere.ibm.com/ITradeServices/getQuote">
-    </wsdl:input>
-      <wsdl:output message="tns:ITradeServices_getQuote_OutputMessage" wsaw:Action="http://trade.samples.websphere.ibm.com/ITradeServices/getQuoteResponse">
-    </wsdl:output>
-    </wsdl:operation>
-    <wsdl:operation name="getHolding">
-      <wsdl:input message="tns:ITradeServices_getHolding_InputMessage" wsaw:Action="getHolding">
-    </wsdl:input>
-      <wsdl:output message="tns:ITradeServices_getHolding_OutputMessage" wsaw:Action="http://trade.samples.websphere.ibm.com/ITradeServices/getHoldingResponse">
-    </wsdl:output>
-    </wsdl:operation>
-    <wsdl:operation name="getTopOrders">
-      <wsdl:input message="tns:ITradeServices_getTopOrders_InputMessage" wsaw:Action="getTopOrders">
-    </wsdl:input>
-      <wsdl:output message="tns:ITradeServices_getTopOrders_OutputMessage" wsaw:Action="http://trade.samples.websphere.ibm.com/ITradeServices/getTopOrdersResponse">
-    </wsdl:output>
-    </wsdl:operation>
-    <wsdl:operation name="sellEnhanced">
-      <wsdl:input message="tns:ITradeServices_sellEnhanced_InputMessage" wsaw:Action="sellEnhanced">
-    </wsdl:input>
-      <wsdl:output message="tns:ITradeServices_sellEnhanced_OutputMessage" wsaw:Action="http://trade.samples.websphere.ibm.com/ITradeServices/sellEnhancedResponse">
-    </wsdl:output>
-    </wsdl:operation>
-  </wsdl:portType>
+<wsdl:definitions targetNamespace="http://trade.samples.websphere.ibm.com"
+                  xmlns:tns="http://trade.samples.websphere.ibm.com"
+                  xmlns:wsx="http://schemas.xmlsoap.org/ws/2004/09/mex"
+                  xmlns:soap12="http://schemas.xmlsoap.org/wsdl/soap12/"
+                  xmlns:wsa="http://schemas.xmlsoap.org/ws/2004/08/addressing"
+                  xmlns:wsap="http://schemas.xmlsoap.org/ws/2004/08/addressing/policy"
+                  xmlns:wsaw="http://www.w3.org/2006/05/addressing/wsdl"
+                  xmlns:wsp="http://schemas.xmlsoap.org/ws/2004/09/policy" xmlns:xsd="http://www.w3.org/2001/XMLSchema"
+                  xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns:wsa10="http://www.w3.org/2005/08/addressing"
+                  xmlns:soapenc="http://schemas.xmlsoap.org/soap/encoding/"
+                  xmlns:wsam="http://www.w3.org/2007/05/addressing/metadata"
+                  xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"
+                  xmlns:wsu="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utility-1.0.xsd"
+                  xmlns:msc="http://schemas.microsoft.com/ws/2005/12/wsdl/contract">
+    <wsdl:types>
+        <xsd:schema targetNamespace="http://trade.samples.websphere.ibm.com/Imports">
+            <xsd:import namespace="http://trade.samples.websphere.ibm.com" schemaLocation="xsd0.xsd"/>
+            <xsd:import namespace="http://schemas.microsoft.com/2003/10/Serialization/" schemaLocation="xsd1.xsd"/>
+        </xsd:schema>
+    </wsdl:types>
+    <wsdl:message name="ITradeServices_getHolding_InputMessage">
+        <wsdl:part name="parameters" element="tns:getHolding">
+        </wsdl:part>
+    </wsdl:message>
+    <wsdl:message name="ITradeServices_sellEnhanced_OutputMessage">
+        <wsdl:part name="parameters" element="tns:sellEnhancedResponse">
+        </wsdl:part>
+    </wsdl:message>
+    <wsdl:message name="ITradeServices_logout_InputMessage">
+        <wsdl:part name="parameters" element="tns:logout">
+        </wsdl:part>
+    </wsdl:message>
+    <wsdl:message name="ITradeServices_getAccountProfileData_InputMessage">
+        <wsdl:part name="parameters" element="tns:getAccountProfileData">
+        </wsdl:part>
+    </wsdl:message>
+    <wsdl:message name="ITradeServices_updateAccountProfile_OutputMessage">
+        <wsdl:part name="parameters" element="tns:updateAccountProfileResponse">
+        </wsdl:part>
+    </wsdl:message>
+    <wsdl:message name="ITradeServices_isOnline_InputMessage">
+        <wsdl:part name="parameters" element="tns:isOnline">
+        </wsdl:part>
+    </wsdl:message>
+    <wsdl:message name="ITradeServices_login_OutputMessage">
+        <wsdl:part name="parameters" element="tns:loginResponse">
+        </wsdl:part>
+    </wsdl:message>
+    <wsdl:message name="ITradeServices_register_InputMessage">
+        <wsdl:part name="parameters" element="tns:register">
+        </wsdl:part>
+    </wsdl:message>
+    <wsdl:message name="ITradeServices_getQuote_InputMessage">
+        <wsdl:part name="parameters" element="tns:getQuote">
+        </wsdl:part>
+    </wsdl:message>
+    <wsdl:message name="ITradeServices_getAccountData_OutputMessage">
+        <wsdl:part name="parameters" element="tns:getAccountDataResponse">
+        </wsdl:part>
+    </wsdl:message>
+    <wsdl:message name="ITradeServices_getClosedOrders_InputMessage">
+        <wsdl:part name="parameters" element="tns:getClosedOrders">
+        </wsdl:part>
+    </wsdl:message>
+    <wsdl:message name="ITradeServices_logout_OutputMessage">
+        <wsdl:part name="parameters" element="tns:logoutResponse">
+        </wsdl:part>
+    </wsdl:message>
+    <wsdl:message name="ITradeServices_sell_InputMessage">
+        <wsdl:part name="parameters" element="tns:sell">
+        </wsdl:part>
+    </wsdl:message>
+    <wsdl:message name="ITradeServices_getMarketSummary_OutputMessage">
+        <wsdl:part name="parameters" element="tns:getMarketSummaryResponse">
+        </wsdl:part>
+    </wsdl:message>
+    <wsdl:message name="ITradeServices_getClosedOrders_OutputMessage">
+        <wsdl:part name="parameters" element="tns:getClosedOrdersResponse">
+        </wsdl:part>
+    </wsdl:message>
+    <wsdl:message name="ITradeServices_emptyMethodAction_InputMessage">
+        <wsdl:part name="parameters" element="tns:emptyMethodAction">
+        </wsdl:part>
+    </wsdl:message>
+    <wsdl:message name="ITradeServices_sellEnhanced_InputMessage">
+        <wsdl:part name="parameters" element="tns:sellEnhanced">
+        </wsdl:part>
+    </wsdl:message>
+    <wsdl:message name="ITradeServices_getMarketSummary_InputMessage">
+        <wsdl:part name="parameters" element="tns:getMarketSummary">
+        </wsdl:part>
+    </wsdl:message>
+    <wsdl:message name="ITradeServices_login_InputMessage">
+        <wsdl:part name="parameters" element="tns:login">
+        </wsdl:part>
+    </wsdl:message>
+    <wsdl:message name="ITradeServices_getTopOrders_OutputMessage">
+        <wsdl:part name="parameters" element="tns:getTopOrdersResponse">
+        </wsdl:part>
+    </wsdl:message>
+    <wsdl:message name="ITradeServices_getAccountProfileData_OutputMessage">
+        <wsdl:part name="parameters" element="tns:getAccountProfileDataResponse">
+        </wsdl:part>
+    </wsdl:message>
+    <wsdl:message name="ITradeServices_emptyMethodAction_OutputMessage">
+        <wsdl:part name="parameters" element="tns:emptyMethodActionResponse">
+        </wsdl:part>
+    </wsdl:message>
+    <wsdl:message name="ITradeServices_getHoldings_OutputMessage">
+        <wsdl:part name="parameters" element="tns:getHoldingsResponse">
+        </wsdl:part>
+    </wsdl:message>
+    <wsdl:message name="ITradeServices_getQuote_OutputMessage">
+        <wsdl:part name="parameters" element="tns:getQuoteResponse">
+        </wsdl:part>
+    </wsdl:message>
+    <wsdl:message name="ITradeServices_getHoldings_InputMessage">
+        <wsdl:part name="parameters" element="tns:getHoldings">
+        </wsdl:part>
+    </wsdl:message>
+    <wsdl:message name="ITradeServices_getTopOrders_InputMessage">
+        <wsdl:part name="parameters" element="tns:getTopOrders">
+        </wsdl:part>
+    </wsdl:message>
+    <wsdl:message name="ITradeServices_register_OutputMessage">
+        <wsdl:part name="parameters" element="tns:registerResponse">
+        </wsdl:part>
+    </wsdl:message>
+    <wsdl:message name="ITradeServices_updateAccountProfile_InputMessage">
+        <wsdl:part name="parameters" element="tns:updateAccountProfile">
+        </wsdl:part>
+    </wsdl:message>
+    <wsdl:message name="ITradeServices_getAccountData_InputMessage">
+        <wsdl:part name="parameters" element="tns:getAccountData">
+        </wsdl:part>
+    </wsdl:message>
+    <wsdl:message name="ITradeServices_getOrders_OutputMessage">
+        <wsdl:part name="parameters" element="tns:getOrdersResponse">
+        </wsdl:part>
+    </wsdl:message>
+    <wsdl:message name="ITradeServices_getHolding_OutputMessage">
+        <wsdl:part name="parameters" element="tns:getHoldingResponse">
+        </wsdl:part>
+    </wsdl:message>
+    <wsdl:message name="ITradeServices_getOrders_InputMessage">
+        <wsdl:part name="parameters" element="tns:getOrders">
+        </wsdl:part>
+    </wsdl:message>
+    <wsdl:message name="ITradeServices_buy_InputMessage">
+        <wsdl:part name="parameters" element="tns:buy">
+        </wsdl:part>
+    </wsdl:message>
+    <wsdl:message name="ITradeServices_buy_OutputMessage">
+        <wsdl:part name="parameters" element="tns:buyResponse">
+        </wsdl:part>
+    </wsdl:message>
+    <wsdl:message name="ITradeServices_sell_OutputMessage">
+        <wsdl:part name="parameters" element="tns:sellResponse">
+        </wsdl:part>
+    </wsdl:message>
+    <wsdl:portType name="ITradeServices">
+        <wsdl:operation name="emptyMethodAction">
+            <wsdl:input message="tns:ITradeServices_emptyMethodAction_InputMessage" wsaw:Action="">
+            </wsdl:input>
+            <wsdl:output message="tns:ITradeServices_emptyMethodAction_OutputMessage"
+                         wsaw:Action="http://trade.samples.websphere.ibm.com/ITradeServices/emptyMethodActionResponse">
+            </wsdl:output>
+        </wsdl:operation>
+        <wsdl:operation name="isOnline">
+            <wsdl:input message="tns:ITradeServices_isOnline_InputMessage" wsaw:Action="isOnline">
+            </wsdl:input>
+        </wsdl:operation>
+        <wsdl:operation name="login">
+            <wsdl:input message="tns:ITradeServices_login_InputMessage"
+                        wsaw:Action="http://trade.samples.websphere.ibm.com/ITradeServices/login">
+            </wsdl:input>
+            <wsdl:output message="tns:ITradeServices_login_OutputMessage"
+                         wsaw:Action="http://trade.samples.websphere.ibm.com/ITradeServices/loginResponse">
+            </wsdl:output>
+        </wsdl:operation>
+        <wsdl:operation name="getOrders">
+            <wsdl:input message="tns:ITradeServices_getOrders_InputMessage" wsaw:Action="getOrders">
+            </wsdl:input>
+            <wsdl:output message="tns:ITradeServices_getOrders_OutputMessage"
+                         wsaw:Action="http://trade.samples.websphere.ibm.com/ITradeServices/getOrdersResponse">
+            </wsdl:output>
+        </wsdl:operation>
+        <wsdl:operation name="getAccountData">
+            <wsdl:input message="tns:ITradeServices_getAccountData_InputMessage" wsaw:Action="getAccountData">
+            </wsdl:input>
+            <wsdl:output message="tns:ITradeServices_getAccountData_OutputMessage"
+                         wsaw:Action="http://trade.samples.websphere.ibm.com/ITradeServices/getAccountDataResponse">
+            </wsdl:output>
+        </wsdl:operation>
+        <wsdl:operation name="getAccountProfileData">
+            <wsdl:input message="tns:ITradeServices_getAccountProfileData_InputMessage"
+                        wsaw:Action="getAccountProfileData">
+            </wsdl:input>
+            <wsdl:output message="tns:ITradeServices_getAccountProfileData_OutputMessage"
+                         wsaw:Action="http://trade.samples.websphere.ibm.com/ITradeServices/getAccountProfileDataResponse">
+            </wsdl:output>
+        </wsdl:operation>
+        <wsdl:operation name="updateAccountProfile">
+            <wsdl:input message="tns:ITradeServices_updateAccountProfile_InputMessage"
+                        wsaw:Action="updateAccountProfile">
+            </wsdl:input>
+            <wsdl:output message="tns:ITradeServices_updateAccountProfile_OutputMessage"
+                         wsaw:Action="http://trade.samples.websphere.ibm.com/ITradeServices/updateAccountProfileResponse">
+            </wsdl:output>
+        </wsdl:operation>
+        <wsdl:operation name="logout">
+            <wsdl:input message="tns:ITradeServices_logout_InputMessage" wsaw:Action="logout">
+            </wsdl:input>
+            <wsdl:output message="tns:ITradeServices_logout_OutputMessage"
+                         wsaw:Action="http://trade.samples.websphere.ibm.com/ITradeServices/logoutResponse">
+            </wsdl:output>
+        </wsdl:operation>
+        <wsdl:operation name="buy">
+            <wsdl:input message="tns:ITradeServices_buy_InputMessage" wsaw:Action="buy">
+            </wsdl:input>
+            <wsdl:output message="tns:ITradeServices_buy_OutputMessage"
+                         wsaw:Action="http://trade.samples.websphere.ibm.com/ITradeServices/buyResponse">
+            </wsdl:output>
+        </wsdl:operation>
+        <wsdl:operation name="sell">
+            <wsdl:input message="tns:ITradeServices_sell_InputMessage" wsaw:Action="sell">
+            </wsdl:input>
+            <wsdl:output message="tns:ITradeServices_sell_OutputMessage"
+                         wsaw:Action="http://trade.samples.websphere.ibm.com/ITradeServices/sellResponse">
+            </wsdl:output>
+        </wsdl:operation>
+        <wsdl:operation name="getHoldings">
+            <wsdl:input message="tns:ITradeServices_getHoldings_InputMessage" wsaw:Action="getHoldings">
+            </wsdl:input>
+            <wsdl:output message="tns:ITradeServices_getHoldings_OutputMessage"
+                         wsaw:Action="http://trade.samples.websphere.ibm.com/ITradeServices/getHoldingsResponse">
+            </wsdl:output>
+        </wsdl:operation>
+        <wsdl:operation name="register">
+            <wsdl:input message="tns:ITradeServices_register_InputMessage" wsaw:Action="register">
+            </wsdl:input>
+            <wsdl:output message="tns:ITradeServices_register_OutputMessage"
+                         wsaw:Action="http://trade.samples.websphere.ibm.com/ITradeServices/registerResponse">
+            </wsdl:output>
+        </wsdl:operation>
+        <wsdl:operation name="getClosedOrders">
+            <wsdl:input message="tns:ITradeServices_getClosedOrders_InputMessage" wsaw:Action="getClosedOrders">
+            </wsdl:input>
+            <wsdl:output message="tns:ITradeServices_getClosedOrders_OutputMessage"
+                         wsaw:Action="http://trade.samples.websphere.ibm.com/ITradeServices/getClosedOrdersResponse">
+            </wsdl:output>
+        </wsdl:operation>
+        <wsdl:operation name="getMarketSummary">
+            <wsdl:input message="tns:ITradeServices_getMarketSummary_InputMessage" wsaw:Action="getMarketSummary">
+            </wsdl:input>
+            <wsdl:output message="tns:ITradeServices_getMarketSummary_OutputMessage"
+                         wsaw:Action="http://trade.samples.websphere.ibm.com/ITradeServices/getMarketSummaryResponse">
+            </wsdl:output>
+        </wsdl:operation>
+        <wsdl:operation name="getQuote">
+            <wsdl:input message="tns:ITradeServices_getQuote_InputMessage"
+                        wsaw:Action="http://trade.samples.websphere.ibm.com/ITradeServices/getQuote">
+            </wsdl:input>
+            <wsdl:output message="tns:ITradeServices_getQuote_OutputMessage"
+                         wsaw:Action="http://trade.samples.websphere.ibm.com/ITradeServices/getQuoteResponse">
+            </wsdl:output>
+        </wsdl:operation>
+        <wsdl:operation name="getHolding">
+            <wsdl:input message="tns:ITradeServices_getHolding_InputMessage" wsaw:Action="getHolding">
+            </wsdl:input>
+            <wsdl:output message="tns:ITradeServices_getHolding_OutputMessage"
+                         wsaw:Action="http://trade.samples.websphere.ibm.com/ITradeServices/getHoldingResponse">
+            </wsdl:output>
+        </wsdl:operation>
+        <wsdl:operation name="getTopOrders">
+            <wsdl:input message="tns:ITradeServices_getTopOrders_InputMessage" wsaw:Action="getTopOrders">
+            </wsdl:input>
+            <wsdl:output message="tns:ITradeServices_getTopOrders_OutputMessage"
+                         wsaw:Action="http://trade.samples.websphere.ibm.com/ITradeServices/getTopOrdersResponse">
+            </wsdl:output>
+        </wsdl:operation>
+        <wsdl:operation name="sellEnhanced">
+            <wsdl:input message="tns:ITradeServices_sellEnhanced_InputMessage" wsaw:Action="sellEnhanced">
+            </wsdl:input>
+            <wsdl:output message="tns:ITradeServices_sellEnhanced_OutputMessage"
+                         wsaw:Action="http://trade.samples.websphere.ibm.com/ITradeServices/sellEnhancedResponse">
+            </wsdl:output>
+        </wsdl:operation>
+    </wsdl:portType>
 </wsdl:definitions>

Modified: incubator/stonehenge/trunk/stocktrader/metro/etc/config_service/ConfigService.wsdl
URL: http://svn.apache.org/viewvc/incubator/stonehenge/trunk/stocktrader/metro/etc/config_service/ConfigService.wsdl?rev=820332&r1=820331&r2=820332&view=diff
==============================================================================
--- incubator/stonehenge/trunk/stocktrader/metro/etc/config_service/ConfigService.wsdl (original)
+++ incubator/stonehenge/trunk/stocktrader/metro/etc/config_service/ConfigService.wsdl Wed Sep 30 16:21:08 2009
@@ -97,7 +97,7 @@
     </wsdl:binding>
     <wsdl:service name="ConfigService">
         <wsdl:port name="BasicHttpBinding_ConfigServiceService" binding="tns:BasicHttpBinding_ConfigServiceService">
-            <soap:address location="http://localhost:8080/config_service/ConfigService"/>
+            <soap:address location=""/>
         </wsdl:port>
     </wsdl:service>
 </wsdl:definitions>
\ No newline at end of file

Added: incubator/stonehenge/trunk/stocktrader/metro/etc/key/stonehenge-keystore.jks
URL: http://svn.apache.org/viewvc/incubator/stonehenge/trunk/stocktrader/metro/etc/key/stonehenge-keystore.jks?rev=820332&view=auto
==============================================================================
Binary file - no diff available.

Propchange: incubator/stonehenge/trunk/stocktrader/metro/etc/key/stonehenge-keystore.jks
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Added: incubator/stonehenge/trunk/stocktrader/metro/etc/key/stonehenge-truststore.jks
URL: http://svn.apache.org/viewvc/incubator/stonehenge/trunk/stocktrader/metro/etc/key/stonehenge-truststore.jks?rev=820332&view=auto
==============================================================================
Binary file - no diff available.

Propchange: incubator/stonehenge/trunk/stocktrader/metro/etc/key/stonehenge-truststore.jks
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Added: incubator/stonehenge/trunk/stocktrader/metro/etc/metaData/Fedidp.xml
URL: http://svn.apache.org/viewvc/incubator/stonehenge/trunk/stocktrader/metro/etc/metaData/Fedidp.xml?rev=820332&view=auto
==============================================================================
--- incubator/stonehenge/trunk/stocktrader/metro/etc/metaData/Fedidp.xml (added)
+++ incubator/stonehenge/trunk/stocktrader/metro/etc/metaData/Fedidp.xml Wed Sep 30 16:21:08 2009
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<Federation FederationID="Fedidp" xmlns="http://schemas.xmlsoap.org/ws/2006/12/federation">
+    <TokenSigningKeyInfo>
+        <ns1:SecurityTokenReference ns1:Usage="" xmlns:ns1="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-secext-1.0.xsd">
+            <ns2:X509Data xmlns:ns2="http://www.w3.org/2000/09/xmldsig#">
+                <ns2:X509Certificate>MIICQDCCAakCBEeNB0swDQYJKoZIhvcNAQEEBQAwZzELMAkGA1UEBhMCVVMxEzARBgNVBAgTCkNhbGlmb3JuaWExFDASBgNVBAcTC1NhbnRhIENsYXJhMQwwCgYDVQQKEwNTdW4xEDAOBgNVBAsTB09wZW5TU08xDTALBgNVBAMTBHRlc3QwHhcNMDgwMTE1MTkxOTM5WhcNMTgwMTEyMTkxOTM5WjBnMQswCQYDVQQGEwJVUzETMBEGA1UECBMKQ2FsaWZvcm5pYTEUMBIGA1UEBxMLU2FudGEgQ2xhcmExDDAKBgNVBAoTA1N1bjEQMA4GA1UECxMHT3BlblNTTzENMAsGA1UEAxMEdGVzdDCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEArSQc/U75GB2AtKhbGS5piiLkmJzqEsp64rDxbMJ+xDrye0EN/q1U5Of+RkDsaN/igkAvV1cuXEgTL6RlafFPcUX7QxDhZBhsYF9pbwtMzi4A4su9hnxIhURebGEmxKW9qJNYJs0Vo5+IgjxuEWnjnnVgHTs1+mq5QYTA7E6ZyL8CAwEAATANBgkqhkiG9w0BAQQFAAOBgQB3Pw/UQzPKTPTYi9upbFXlrAKMwtFf2OW4yvGWWvlcwcNSZJmTJ8ARvVYOMEVNbsT4OFcfu2/PeYoAdiDAcGy/F2Zuj8XJJpuQRSE6PtQqBuDEHjjmOQJ0rV/r8mO1ZCtHRhpZ5zYRjhRC9eCbjx9VrFax0JDC/FfwWigmrW0Y0Q==</ns2:X509Certificate>
+            </ns2:X509Data>
+        </ns1:SecurityTokenReference>
+    </TokenSigningKeyInfo>
+    <TokenIssuerName>Fedidp</TokenIssuerName>
+    <TokenIssuerEndpoint>
+        <ns3:Address xmlns:ns3="http://www.w3.org/2005/08/addressing">https://idp.stonehenge.com:8181/opensso/WSFederationServlet/metaAlias/Fedidp</ns3:Address>
+    </TokenIssuerEndpoint>
+    <TokenTypesOffered>
+        <TokenType Uri="urn:oasis:names:tc:SAML:1.1"/>
+    </TokenTypesOffered>
+    <UriNamedClaimTypesOffered>
+        <ClaimType Uri="http://schemas.xmlsoap.org/claims/UPN">
+            <DisplayName>UPN</DisplayName>
+        </ClaimType>
+    </UriNamedClaimTypesOffered>
+</Federation>

Added: incubator/stonehenge/trunk/stocktrader/metro/etc/metaData/Fedidpx.xml
URL: http://svn.apache.org/viewvc/incubator/stonehenge/trunk/stocktrader/metro/etc/metaData/Fedidpx.xml?rev=820332&view=auto
==============================================================================
--- incubator/stonehenge/trunk/stocktrader/metro/etc/metaData/Fedidpx.xml (added)
+++ incubator/stonehenge/trunk/stocktrader/metro/etc/metaData/Fedidpx.xml Wed Sep 30 16:21:08 2009
@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<FederationConfig FederationID="Fedidp" hosted="true" xmlns="urn:sun:fm:wsfederation:1.0:federationconfig">
+    <IDPSSOConfig metaAlias="/Fedidp">
+        <Attribute name="displayName">
+            <Value>/Fedidp</Value>
+        </Attribute>
+        <Attribute name="nameIdFormat">
+            <Value/>
+        </Attribute>
+        <Attribute name="nameIdAttribute">
+            <Value/>
+        </Attribute>
+        <Attribute name="nameIncludesDomain">
+            <Value/>
+        </Attribute>
+        <Attribute name="domainAttribute">
+            <Value/>
+        </Attribute>
+        <Attribute name="upnDomain">
+            <Value>stonehenge.com</Value>
+        </Attribute>
+        <Attribute name="signingCertAlias">
+            <Value>test</Value>
+        </Attribute>
+        <Attribute name="assertionNotBeforeTimeSkew">
+            <Value>600</Value>
+        </Attribute>
+        <Attribute name="assertionEffectiveTime">
+            <Value>600</Value>
+        </Attribute>
+        <Attribute name="idpAuthncontextMapper">
+            <Value>com.sun.identity.wsfederation.plugins.DefaultIDPAuthenticationMethodMapper</Value>
+        </Attribute>
+        <Attribute name="idpAccountMapper">
+            <Value>com.sun.identity.wsfederation.plugins.DefaultIDPAccountMapper</Value>
+        </Attribute>
+        <Attribute name="idpAttributeMapper">
+            <Value>com.sun.identity.wsfederation.plugins.DefaultIDPAttributeMapper</Value>
+        </Attribute>
+        <Attribute name="cotlist"/>
+    </IDPSSOConfig>
+</FederationConfig>

Added: incubator/stonehenge/trunk/stocktrader/metro/etc/metaData/Fedsp.xml
URL: http://svn.apache.org/viewvc/incubator/stonehenge/trunk/stocktrader/metro/etc/metaData/Fedsp.xml?rev=820332&view=auto
==============================================================================
--- incubator/stonehenge/trunk/stocktrader/metro/etc/metaData/Fedsp.xml (added)
+++ incubator/stonehenge/trunk/stocktrader/metro/etc/metaData/Fedsp.xml Wed Sep 30 16:21:08 2009
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<Federation FederationID="Fedsp" xmlns="http://schemas.xmlsoap.org/ws/2006/12/federation">
+    <TokenIssuerName>Fedsp</TokenIssuerName>
+    <TokenIssuerEndpoint>
+        <ns1:Address xmlns:ns1="http://www.w3.org/2005/08/addressing">https://sp.stonehenge.com:8191/opensso/WSFederationServlet/metaAlias/Fedsp</ns1:Address>
+    </TokenIssuerEndpoint>
+    <SingleSignOutNotificationEndpoint>
+        <ns2:Address xmlns:ns2="http://www.w3.org/2005/08/addressing">https://sp.stonehenge.com:8191/opensso/WSFederationServlet/metaAlias/Fedsp</ns2:Address>
+    </SingleSignOutNotificationEndpoint>
+</Federation>

Added: incubator/stonehenge/trunk/stocktrader/metro/etc/metaData/Fedspx.xml
URL: http://svn.apache.org/viewvc/incubator/stonehenge/trunk/stocktrader/metro/etc/metaData/Fedspx.xml?rev=820332&view=auto
==============================================================================
--- incubator/stonehenge/trunk/stocktrader/metro/etc/metaData/Fedspx.xml (added)
+++ incubator/stonehenge/trunk/stocktrader/metro/etc/metaData/Fedspx.xml Wed Sep 30 16:21:08 2009
@@ -0,0 +1,51 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<FederationConfig FederationID="Fedsp" hosted="true" xmlns="urn:sun:fm:wsfederation:1.0:federationconfig">
+    <SPSSOConfig metaAlias="/Fedsp">
+        <Attribute name="displayName">
+            <Value>/Fedsp</Value>
+        </Attribute>
+        <Attribute name="AccountRealmSelection">
+            <Value>cookie</Value>
+        </Attribute>
+        <Attribute name="AccountRealmCookieName">
+            <Value>amWSFederationAccountRealm</Value>
+        </Attribute>
+        <Attribute name="HomeRealmDiscoveryService">
+            <Value>https://sp.stonehenge.com:8191/opensso/RealmSelection/metaAlias/Fedsp</Value>
+        </Attribute>
+        <Attribute name="signingCertAlias">
+            <Value>test</Value>
+        </Attribute>
+        <Attribute name="assertionEffectiveTime">
+            <Value>600</Value>
+        </Attribute>
+        <Attribute name="spAccountMapper">
+            <Value>com.sun.identity.wsfederation.plugins.DefaultADFSPartnerAccountMapper</Value>
+        </Attribute>
+        <Attribute name="spAttributeMapper">
+            <Value>com.sun.identity.wsfederation.plugins.DefaultSPAttributeMapper</Value>
+        </Attribute>
+        <Attribute name="spAuthncontextMapper">
+            <Value>com.sun.identity.saml2.plugins.DefaultSPAuthnContextMapper</Value>
+        </Attribute>
+        <Attribute name="spAuthncontextClassrefMapping">
+            <Value>urn:oasis:names:tc:SAML:2.0:ac:classes:PasswordProtectedTransport|0|default</Value>
+        </Attribute>
+        <Attribute name="spAuthncontextComparisonType">
+            <Value>exact</Value>
+        </Attribute>
+        <Attribute name="saml2AuthModuleName">
+            <Value/>
+        </Attribute>
+        <Attribute name="defaultRelayState">
+            <Value>https://sp.stonehenge.com:8191/opensso</Value>
+        </Attribute>
+        <Attribute name="assertionTimeSkew">
+            <Value>300</Value>
+        </Attribute>
+        <Attribute name="wantAssertionSigned">
+            <Value>true</Value>
+        </Attribute>
+        <Attribute name="cotlist"/>
+    </SPSSOConfig>
+</FederationConfig>

Modified: incubator/stonehenge/trunk/stocktrader/metro/etc/order_processor/OrderProcessor.wsdl
URL: http://svn.apache.org/viewvc/incubator/stonehenge/trunk/stocktrader/metro/etc/order_processor/OrderProcessor.wsdl?rev=820332&r1=820331&r2=820332&view=diff
==============================================================================
--- incubator/stonehenge/trunk/stocktrader/metro/etc/order_processor/OrderProcessor.wsdl (original)
+++ incubator/stonehenge/trunk/stocktrader/metro/etc/order_processor/OrderProcessor.wsdl Wed Sep 30 16:21:08 2009
@@ -216,8 +216,8 @@
                 </sp:Trust10>
                 <wsaw:UsingAddressing/>
 
-                <sc:KeyStore xmlns:sc="http://schemas.sun.com/2006/03/wss/server" visibility="private" alias="mykey" storepass="changeit" type="JKS" location="server-keystore.jks"/>
-                <sc:TrustStore xmlns:sc="http://schemas.sun.com/2006/03/wss/server" visibility="private" peeralias="mykey" storepass="changeit" type="JKS" location="server-truststore.jks"/>
+                <sc:KeyStore xmlns:sc="http://schemas.sun.com/2006/03/wss/server" visibility="private" alias="mykey" storepass="changeit" type="JKS" location="stonehenge-keystore.jks"/>
+                <sc:TrustStore xmlns:sc="http://schemas.sun.com/2006/03/wss/server" visibility="private" peeralias="mykey" storepass="changeit" type="JKS" location="stonehenge-truststore.jks"/>
             </wsp:All>
         </wsp:ExactlyOne>
     </wsp:Policy>
@@ -259,6 +259,112 @@
             </wsp:All>
         </wsp:ExactlyOne>
     </wsp:Policy>
+	<wsp:Policy wsu:Id="SecureConversation_OrderProcessorService_policy" xmlns:wsu="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utility-1.0.xsd" xmlns:wsp="http://schemas.xmlsoap.org/ws/2004/09/policy">
+		<wsp:ExactlyOne>
+			<wsp:All>
+				<sp:TransportBinding xmlns:sp="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy">
+					<wsp:Policy>
+						<sp:TransportToken>
+							<wsp:Policy>
+								<sp:HttpsToken RequireClientCertificate="false"/>
+							</wsp:Policy>
+						</sp:TransportToken>
+						<sp:AlgorithmSuite>
+							<wsp:Policy>
+								<sp:Basic256/>
+							</wsp:Policy>
+						</sp:AlgorithmSuite>
+						<sp:Layout>
+							<wsp:Policy>
+								<sp:Lax/>
+							</wsp:Policy>
+						</sp:Layout>
+						<sp:IncludeTimestamp/>
+					</wsp:Policy>
+				</sp:TransportBinding>
+				<sp:EndorsingSupportingTokens xmlns:sp="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy">
+					<wsp:Policy>
+						<sp:SecureConversationToken sp:IncludeToken="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy/IncludeToken/AlwaysToRecipient">
+							<wsp:Policy>
+								<sp:BootstrapPolicy>
+									<wsp:Policy>
+										<sp:SignedParts>
+											<sp:Body/>
+											<sp:Header Name="To" Namespace="http://www.w3.org/2005/08/addressing"/>
+											<sp:Header Name="From" Namespace="http://www.w3.org/2005/08/addressing"/>
+											<sp:Header Name="FaultTo" Namespace="http://www.w3.org/2005/08/addressing"/>
+											<sp:Header Name="ReplyTo" Namespace="http://www.w3.org/2005/08/addressing"/>
+											<sp:Header Name="MessageID" Namespace="http://www.w3.org/2005/08/addressing"/>
+											<sp:Header Name="RelatesTo" Namespace="http://www.w3.org/2005/08/addressing"/>
+											<sp:Header Name="Action" Namespace="http://www.w3.org/2005/08/addressing"/>
+										</sp:SignedParts>
+										<sp:EncryptedParts>
+											<sp:Body/>
+										</sp:EncryptedParts>
+										<sp:TransportBinding>
+											<wsp:Policy>
+												<sp:TransportToken>
+													<wsp:Policy>
+														<sp:HttpsToken RequireClientCertificate="false"/>
+													</wsp:Policy>
+												</sp:TransportToken>
+												<sp:AlgorithmSuite>
+													<wsp:Policy>
+														<sp:Basic256/>
+													</wsp:Policy>
+												</sp:AlgorithmSuite>
+												<sp:Layout>
+													<wsp:Policy>
+														<sp:Strict/>
+													</wsp:Policy>
+												</sp:Layout>
+												<sp:IncludeTimestamp/>
+											</wsp:Policy>
+										</sp:TransportBinding>
+										<sp:SignedSupportingTokens>
+											<wsp:Policy>
+												<sp:UsernameToken sp:IncludeToken="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy/IncludeToken/AlwaysToRecipient">
+													<wsp:Policy>
+														<sp:WssUsernameToken10/>
+													</wsp:Policy>
+												</sp:UsernameToken>
+											</wsp:Policy>
+										</sp:SignedSupportingTokens>
+										<sp:Wss11>
+											<wsp:Policy>
+												<sp:MustSupportRefKeyIdentifier/>
+												<sp:MustSupportRefIssuerSerial/>
+												<sp:MustSupportRefThumbprint/>
+												<sp:MustSupportRefEncryptedKey/>
+											</wsp:Policy>
+										</sp:Wss11>
+										<sp:Trust10>
+											<wsp:Policy>
+												<sp:MustSupportIssuedTokens/>
+												<sp:RequireClientEntropy/>
+												<sp:RequireServerEntropy/>
+											</wsp:Policy>
+										</sp:Trust10>
+									</wsp:Policy>
+								</sp:BootstrapPolicy>
+							</wsp:Policy>
+						</sp:SecureConversationToken>
+					</wsp:Policy>
+				</sp:EndorsingSupportingTokens>
+				<sp:Trust10 xmlns:sp="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy">
+					<wsp:Policy>
+						<sp:MustSupportIssuedTokens/>
+						<sp:RequireClientEntropy/>
+						<sp:RequireServerEntropy/>
+					</wsp:Policy>
+				</sp:Trust10>
+				<wsap:UsingAddressing/>
+				<sc:ValidatorConfiguration wspp:visibility="private" xmlns:wspp="http://java.sun.com/xml/ns/wsit/policy" xmlns:sc="http://schemas.sun.com/2006/03/wss/server">
+					<sc:Validator name="usernameValidator" classname="org.apache.stonehenge.stocktrader.UsernamePasswordValidator"/>
+				</sc:ValidatorConfiguration>
+			</wsp:All>
+		</wsp:ExactlyOne>
+	</wsp:Policy>
     <wsdl:import namespace="http://Trade.TraderOrderHost"
                  location="wsdl0.wsdl"/>
     <wsdl:types/>
@@ -313,6 +419,24 @@
             </wsdl:input>
         </wsdl:operation>
     </wsdl:binding>
+    <wsdl:binding name="SecureConversationBinding_OrderProcessorService" type="i0:OrderProcessorService">
+        <wsp:PolicyReference URI="#SecureConversation_OrderProcessorService_policy"/>
+        <soap12:binding transport="http://schemas.xmlsoap.org/soap/http"/>
+        <wsdl:operation name="SubmitOrder">
+            <soap12:operation soapAction="SubmitOrder" style="document"/>
+            <wsdl:input>
+                <wsp:PolicyReference URI="#CustomBinding_OrderProcessorService_SubmitOrder_Input_policy"/>
+                <soap12:body use="literal"/>
+            </wsdl:input>
+        </wsdl:operation>
+        <wsdl:operation name="isOnline">
+            <soap12:operation soapAction="isOnline" style="document"/>
+            <wsdl:input>
+                <wsp:PolicyReference URI="#CustomBinding_OrderProcessorService_isOnline_Input_policy"/>
+                <soap12:body use="literal"/>
+            </wsdl:input>
+        </wsdl:operation>
+    </wsdl:binding>
     <wsdl:service name="OrderProcessor">
         <wsdl:port name="BasicHttpBinding_OrderProcessorService" binding="tns:BasicHttpBinding_OrderProcessorService">
             <soap:address location="http://stocktrader:8000/tradeorderprocessor"/>
@@ -347,5 +471,20 @@
                 </Identity>
             </wsa10:EndpointReference>
         </wsdl:port>
+        <wsdl:port name="SecureConversationBinding_OrderProcessorService" binding="tns:SecureConversationBinding_OrderProcessorService">
+            <soap12:address location="http://stocktrader:8000/tradeorderprocessor/sec"/>
+            <wsa10:EndpointReference>
+                <wsa10:Address>http://stocktrader:8000/tradeorderprocessor/sec</wsa10:Address>
+                <Identity xmlns="http://schemas.xmlsoap.org/ws/2006/02/addressingidentity">
+                    <KeyInfo xmlns="http://www.w3.org/2000/09/xmldsig#">
+                        <X509Data>
+                            <X509Certificate>
+                                MIIB8DCCAVmgAwIBAgIQ1ELWkagtIaZA+rGlQ0DB/DANBgkqhkiG9w0BAQQFADASMRAwDgYDVQQDEwdPUFMuQ29tMB4XDTA4MDUyMTA0NDUwMVoXDTM5MTIzMTIzNTk1OVowEjEQMA4GA1UEAxMHT1BTLkNvbTCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEAxwk9moHNb3pwAFdolsVrNRCypa9MAH9NOblGJRW6av93sC5oubfjbzfIgURycVgOYoI/6G3AZijENC//tR8CiNuwfc338j4gGJCYQMKF80f0v+wsOChbWA/jSMmW0XeZ2mtn28kUzZwBN+auK+iUurYmUfZlNCIzLrM49KKqLRMCAwEAAaNHMEUwQwYDVR0BBDwwOoAQGGhusN6c4j/7WSnvieRMbKEUMBIxEDAOBgNVBAMTB09QUy5Db22CENRC1pGoLSGmQPqxpUNAwfwwDQYJKoZIhvcNAQEEBQADgYEAZ8xVxioCvG8t8iCx5Xy7JgUyGVnTgxVhP3+uMGSca0u1wqnfoPethXkykPkCP5ZEYSS5SoBLdCKhn1HqICdTBkR2m0ebo50CoXT1lAy+5MELdzlR8SH9KV6nokwCPAW3RURk1huaDi3FO1oFDVm6146rAByZrG/PjDe3w+MUaHg=
+                            </X509Certificate>
+                        </X509Data>
+                    </KeyInfo>
+                </Identity>
+            </wsa10:EndpointReference>
+        </wsdl:port>
     </wsdl:service>
 </wsdl:definitions>
\ No newline at end of file

Added: incubator/stonehenge/trunk/stocktrader/metro/etc/web.non-sts.xml
URL: http://svn.apache.org/viewvc/incubator/stonehenge/trunk/stocktrader/metro/etc/web.non-sts.xml?rev=820332&view=auto
==============================================================================
--- incubator/stonehenge/trunk/stocktrader/metro/etc/web.non-sts.xml (added)
+++ incubator/stonehenge/trunk/stocktrader/metro/etc/web.non-sts.xml Wed Sep 30 16:21:08 2009
@@ -0,0 +1,121 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<web-app xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://java.sun.com/xml/ns/javaee"
+         xmlns:web="http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd"
+         xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd"
+         version="2.5">
+    <!-- Use Documents Saved as *.xhtml -->
+    <context-param>
+        <param-name>javax.faces.DEFAULT_SUFFIX</param-name>
+        <param-value>.xhtml</param-value>
+    </context-param>
+
+    <!-- Special Debug Output for Development -->
+    <context-param>
+        <param-name>facelets.DEVELOPMENT</param-name>
+        <param-value>true</param-value>
+    </context-param>
+
+    <!-- Optional JSF-RI Parameters to Help Debug -->
+    <context-param>
+        <param-name>com.sun.faces.validateXml</param-name>
+        <param-value>true</param-value>
+    </context-param>
+    <context-param>
+        <param-name>com.sun.faces.verifyObjects</param-name>
+        <param-value>true</param-value>
+    </context-param>
+    <context-param>
+        <param-name>com.sun.faces.disableVersionTracking</param-name>
+        <param-value>true</param-value>
+    </context-param>
+
+    <context-param>
+        <param-name>facelets.LIBRARIES</param-name>
+        <param-value>
+            /WEB-INF/facelets/tags/stonehenge.taglib.xml
+        </param-value>
+    </context-param>
+
+    <!--<filter>-->
+        <!--<filter-name>Agent</filter-name>-->
+        <!--<filter-class>com.sun.identity.agents.filter.AmAgentFilter</filter-class>-->
+    <!--</filter>-->
+
+    <filter>
+        <filter-name>Login Filter</filter-name>
+        <filter-class>org.apache.stonehenge.stocktrader.filter.LoginFilter</filter-class>
+    </filter>
+
+    <filter>
+        <display-name>RichFaces Filter</display-name>
+        <filter-name>richfaces</filter-name>
+        <filter-class>org.ajax4jsf.Filter</filter-class>
+    </filter>
+
+    <!--<filter>-->
+        <!--<filter-name>STSFilter</filter-name>-->
+        <!--<filter-class>org.apache.stonehenge.stocktrader.filter.STSFilter</filter-class>-->
+    <!--</filter>-->
+
+    <!--<filter-mapping>-->
+        <!--<filter-name>Agent</filter-name>-->
+        <!--<url-pattern>/*</url-pattern>-->
+        <!--<dispatcher>REQUEST</dispatcher>-->
+        <!--<dispatcher>INCLUDE</dispatcher>-->
+        <!--<dispatcher>FORWARD</dispatcher>-->
+        <!--<dispatcher>ERROR</dispatcher>-->
+    <!--</filter-mapping>-->
+
+    <!--<filter-mapping>-->
+        <!--<filter-name>STSFilter</filter-name>-->
+        <!--<url-pattern>/*</url-pattern>-->
+    <!--</filter-mapping>-->
+
+    <filter-mapping>
+        <filter-name>richfaces</filter-name>
+        <servlet-name>Faces Servlet</servlet-name>
+        <dispatcher>REQUEST</dispatcher>
+        <dispatcher>FORWARD</dispatcher>
+        <dispatcher>INCLUDE</dispatcher>
+    </filter-mapping>
+
+    <filter-mapping>
+        <filter-name>Login Filter</filter-name>
+        <url-pattern>*.faces</url-pattern>
+        <dispatcher>REQUEST</dispatcher>
+    </filter-mapping>
+
+    <servlet>
+        <servlet-name>Faces Servlet</servlet-name>
+        <servlet-class>javax.faces.webapp.FacesServlet</servlet-class>
+        <load-on-startup>1</load-on-startup>
+    </servlet>
+
+    <servlet>
+        <servlet-name>Token Output</servlet-name>
+        <servlet-class>org.apache.stonehenge.stocktrader.service.SamlAssertionRequest</servlet-class>
+    </servlet>
+
+    <servlet-mapping>
+        <servlet-name>Token Output</servlet-name>
+        <url-pattern>/tokenOutput</url-pattern>
+    </servlet-mapping>
+
+    <servlet-mapping>
+        <servlet-name>Faces Servlet</servlet-name>
+        <url-pattern>/faces/*</url-pattern>
+    </servlet-mapping>
+    <servlet-mapping>
+        <servlet-name>Faces Servlet</servlet-name>
+        <url-pattern>*.faces</url-pattern>
+    </servlet-mapping>
+    <servlet-mapping>
+        <servlet-name>Faces Servlet</servlet-name>
+        <url-pattern>*.jsf</url-pattern>
+    </servlet-mapping>
+
+    <welcome-file-list>
+        <welcome-file>faces/welcome.xhtml</welcome-file>
+    </welcome-file-list>
+
+</web-app>
\ No newline at end of file

Added: incubator/stonehenge/trunk/stocktrader/metro/etc/web.sts.xml
URL: http://svn.apache.org/viewvc/incubator/stonehenge/trunk/stocktrader/metro/etc/web.sts.xml?rev=820332&view=auto
==============================================================================
--- incubator/stonehenge/trunk/stocktrader/metro/etc/web.sts.xml (added)
+++ incubator/stonehenge/trunk/stocktrader/metro/etc/web.sts.xml Wed Sep 30 16:21:08 2009
@@ -0,0 +1,121 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<web-app xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://java.sun.com/xml/ns/javaee"
+         xmlns:web="http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd"
+         xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd"
+         version="2.5">
+    <!-- Use Documents Saved as *.xhtml -->
+    <context-param>
+        <param-name>javax.faces.DEFAULT_SUFFIX</param-name>
+        <param-value>.xhtml</param-value>
+    </context-param>
+
+    <!-- Special Debug Output for Development -->
+    <context-param>
+        <param-name>facelets.DEVELOPMENT</param-name>
+        <param-value>true</param-value>
+    </context-param>
+
+    <!-- Optional JSF-RI Parameters to Help Debug -->
+    <context-param>
+        <param-name>com.sun.faces.validateXml</param-name>
+        <param-value>true</param-value>
+    </context-param>
+    <context-param>
+        <param-name>com.sun.faces.verifyObjects</param-name>
+        <param-value>true</param-value>
+    </context-param>
+    <context-param>
+        <param-name>com.sun.faces.disableVersionTracking</param-name>
+        <param-value>true</param-value>
+    </context-param>
+
+    <context-param>
+        <param-name>facelets.LIBRARIES</param-name>
+        <param-value>
+            /WEB-INF/facelets/tags/stonehenge.taglib.xml
+        </param-value>
+    </context-param>
+
+    <filter>
+        <filter-name>Agent</filter-name>
+        <filter-class>com.sun.identity.agents.filter.AmAgentFilter</filter-class>
+    </filter>
+
+    <!--<filter>
+        <filter-name>Login Filter</filter-name>
+        <filter-class>org.apache.stonehenge.stocktrader.filter.LoginFilter</filter-class>
+    </filter>-->
+
+    <filter>
+        <display-name>RichFaces Filter</display-name>
+        <filter-name>richfaces</filter-name>
+        <filter-class>org.ajax4jsf.Filter</filter-class>
+    </filter>
+
+    <filter>
+        <filter-name>STSFilter</filter-name>
+        <filter-class>org.apache.stonehenge.stocktrader.filter.STSFilter</filter-class>
+    </filter>
+
+    <filter-mapping>
+        <filter-name>Agent</filter-name>
+        <url-pattern>/*</url-pattern>
+        <dispatcher>REQUEST</dispatcher>
+        <dispatcher>INCLUDE</dispatcher>
+        <dispatcher>FORWARD</dispatcher>
+        <dispatcher>ERROR</dispatcher>
+    </filter-mapping>
+
+    <filter-mapping>
+        <filter-name>STSFilter</filter-name>
+        <url-pattern>/*</url-pattern>
+    </filter-mapping>
+
+    <filter-mapping>
+        <filter-name>richfaces</filter-name>
+        <servlet-name>Faces Servlet</servlet-name>
+        <dispatcher>REQUEST</dispatcher>
+        <dispatcher>FORWARD</dispatcher>
+        <dispatcher>INCLUDE</dispatcher>
+    </filter-mapping>
+
+<!--    <filter-mapping>
+        <filter-name>Login Filter</filter-name>
+        <url-pattern>*.faces</url-pattern>
+        <dispatcher>REQUEST</dispatcher>
+    </filter-mapping>-->
+
+    <servlet>
+        <servlet-name>Faces Servlet</servlet-name>
+        <servlet-class>javax.faces.webapp.FacesServlet</servlet-class>
+        <load-on-startup>1</load-on-startup>
+    </servlet>
+
+    <servlet>
+        <servlet-name>Token Output</servlet-name>
+        <servlet-class>org.apache.stonehenge.stocktrader.service.SamlAssertionRequest</servlet-class>
+    </servlet>
+
+    <servlet-mapping>
+        <servlet-name>Token Output</servlet-name>
+        <url-pattern>/tokenOutput</url-pattern>
+    </servlet-mapping>
+
+    <servlet-mapping>
+        <servlet-name>Faces Servlet</servlet-name>
+        <url-pattern>/faces/*</url-pattern>
+    </servlet-mapping>
+    <servlet-mapping>
+        <servlet-name>Faces Servlet</servlet-name>
+        <url-pattern>*.faces</url-pattern>
+    </servlet-mapping>
+    <servlet-mapping>
+        <servlet-name>Faces Servlet</servlet-name>
+        <url-pattern>*.jsf</url-pattern>
+    </servlet-mapping>
+
+    <welcome-file-list>
+        <welcome-file>faces/welcome.xhtml</welcome-file>
+    </welcome-file-list>
+
+</web-app>
\ No newline at end of file

Modified: incubator/stonehenge/trunk/stocktrader/metro/order_processor/build.xml
URL: http://svn.apache.org/viewvc/incubator/stonehenge/trunk/stocktrader/metro/order_processor/build.xml?rev=820332&r1=820331&r2=820332&view=diff
==============================================================================
--- incubator/stonehenge/trunk/stocktrader/metro/order_processor/build.xml (original)
+++ incubator/stonehenge/trunk/stocktrader/metro/order_processor/build.xml Wed Sep 30 16:21:08 2009
@@ -1,18 +1,17 @@
 <project basedir="." default="war" name="order_processor">
     <import file="../etc/as.xml"/>
 
+    <property name="common.src.dir" value="${basedir}/../common/src"/>
     <property name="src.dir" value="${basedir}/src"/>
     <property name="build.home" value="${basedir}/build"/>
     <property name="build.classes.home" value="${build.home}/classes"/>
     <property name="build.war.home" value="${build.home}/war"/>
+
     <property name="war.name" value="${ant.project.name}.war"/>
     <property name="war.file" value="${build.war.home}/${war.name}"/>
     <property name="lib.home" value="${basedir}/../lib"/>
     <property name="lib.metro.home" value="${lib.home}/metro"/>
-    <property name="deploy.war" value="${deploy.dir}/${war.name}"/>
-    <property name="server.keystore" value="${basedir}/etc/server-keystore.jks"/>
-    <property name="server.truststore" value="${basedir}/etc/server-truststore.jks"/>
-
+   
     <path id="metro.classpath">
         <pathelement location="${java.home}/../lib/tools.jar"/>
         <fileset dir="${lib.metro.home}">
@@ -39,7 +38,7 @@
     <target name="clean">
         <delete dir="${build.home}" includeEmptyDirs="true"/>
     </target>
-    
+
     <target name="import-ws" depends="setup">
         <wsimport
                 debug="${debug}"
@@ -57,12 +56,23 @@
         <copy todir="${build.classes.home}">
             <fileset dir="../resources/conf" includes="*.properties"/>
         </copy>
+
         <javac
                 fork="true"
-                srcdir="${src.dir}"
+                srcdir="${common.src.dir}"
                 destdir="${build.classes.home}">
             <classpath refid="all.classpath"/>
         </javac>
+
+        <javac
+                fork="true"
+                srcdir="${src.dir}"
+                destdir="${build.classes.home}">
+            <classpath>
+                <dirset dir="${build.classes.home}"/>
+                <path refid="all.classpath"/>
+            </classpath>
+        </javac>
     </target>
 
     <target name="war" depends="build">
@@ -80,13 +90,8 @@
         </war>
     </target>
 
-    <target name="deploy-keystore">
-        <copy file="${server.keystore}" todir="${keystore.dir}"/>
-        <copy file="${server.truststore}" todir="${keystore.dir}"/>
-    </target>
-
     <target name="deploy" depends="war, deploy-keystore">
-        <copy file="${war.file}" tofile="${deploy.war}"/>
+        <copy file="${war.file}" todir="${deploy.dir}"/>
     </target>
 
     <target name="undeploy">

Modified: incubator/stonehenge/trunk/stocktrader/metro/order_processor/etc/sun-jaxws.xml
URL: http://svn.apache.org/viewvc/incubator/stonehenge/trunk/stocktrader/metro/order_processor/etc/sun-jaxws.xml?rev=820332&r1=820331&r2=820332&view=diff
==============================================================================
--- incubator/stonehenge/trunk/stocktrader/metro/order_processor/etc/sun-jaxws.xml (original)
+++ incubator/stonehenge/trunk/stocktrader/metro/order_processor/etc/sun-jaxws.xml Wed Sep 30 16:21:08 2009
@@ -57,4 +57,14 @@
         port="{http://tempuri.org/}BasicHttpBinding_OrderProcessorService"
         url-pattern="/OrderProcessor"/>
 
+    <endpoint
+        name="OrderProcessorSC"
+        interface="org.tempuri.OrderProcessorService"
+        implementation="org.apache.stonehenge.stocktrader.service.OrderProcessorImpl"
+        wsdl="OrderProcessor.wsdl"
+        service="{http://tempuri.org/}OrderProcessor"
+        port="{http://tempuri.org/}SecureConversationBinding_OrderProcessorService"
+        binding="http://www.w3.org/2003/05/soap/bindings/HTTP/"
+        url-pattern="/OrderProcessorSC"/>
+
 </endpoints>

Modified: incubator/stonehenge/trunk/stocktrader/metro/order_processor/etc/web.xml
URL: http://svn.apache.org/viewvc/incubator/stonehenge/trunk/stocktrader/metro/order_processor/etc/web.xml?rev=820332&r1=820331&r2=820332&view=diff
==============================================================================
--- incubator/stonehenge/trunk/stocktrader/metro/order_processor/etc/web.xml (original)
+++ incubator/stonehenge/trunk/stocktrader/metro/order_processor/etc/web.xml Wed Sep 30 16:21:08 2009
@@ -37,27 +37,31 @@
 -->
 
 <web-app version="2.4" mlns="http://java.sun.com/xml/ns/j2ee">
-  <display-name>wsit-jaxws-fromwsdl</display-name>
-  <description>wsit-jaxws-fromwsdl</description>
-  <listener>
-    <listener-class>com.sun.xml.ws.transport.http.servlet.WSServletContextListener</listener-class>
-  </listener>
-  <servlet>
-    <servlet-name>stocktrader</servlet-name>
-    <display-name>stocktrader</display-name>
-    <description>stocktrader endpoint</description>
-    <servlet-class>com.sun.xml.ws.transport.http.servlet.WSServlet</servlet-class>
-    <load-on-startup>1</load-on-startup>
-  </servlet>
-  <servlet-mapping>
-    <servlet-name>stocktrader</servlet-name>
-    <url-pattern>/OrderProcessor</url-pattern>
-  </servlet-mapping>
-  <servlet-mapping>
-    <servlet-name>stocktrader</servlet-name>
-    <url-pattern>/OrderProcessorSec</url-pattern>
-  </servlet-mapping>
-  <session-config>
-    <session-timeout>60</session-timeout>
-  </session-config>
+    <display-name>wsit-jaxws-fromwsdl</display-name>
+    <description>wsit-jaxws-fromwsdl</description>
+    <listener>
+        <listener-class>com.sun.xml.ws.transport.http.servlet.WSServletContextListener</listener-class>
+    </listener>
+    <servlet>
+        <servlet-name>stocktrader</servlet-name>
+        <display-name>stocktrader</display-name>
+        <description>stocktrader endpoint</description>
+        <servlet-class>com.sun.xml.ws.transport.http.servlet.WSServlet</servlet-class>
+        <load-on-startup>1</load-on-startup>
+    </servlet>
+    <servlet-mapping>
+        <servlet-name>stocktrader</servlet-name>
+        <url-pattern>/OrderProcessor</url-pattern>
+    </servlet-mapping>
+    <servlet-mapping>
+        <servlet-name>stocktrader</servlet-name>
+        <url-pattern>/OrderProcessorSec</url-pattern>
+    </servlet-mapping>
+    <servlet-mapping>
+        <servlet-name>stocktrader</servlet-name>
+        <url-pattern>/OrderProcessorSC</url-pattern>
+    </servlet-mapping>
+    <session-config>
+        <session-timeout>60</session-timeout>
+    </session-config>
 </web-app>

Added: incubator/stonehenge/trunk/stocktrader/metro/order_processor/src/org/apache/stonehenge/stocktrader/BeanFactory.java
URL: http://svn.apache.org/viewvc/incubator/stonehenge/trunk/stocktrader/metro/order_processor/src/org/apache/stonehenge/stocktrader/BeanFactory.java?rev=820332&view=auto
==============================================================================
--- incubator/stonehenge/trunk/stocktrader/metro/order_processor/src/org/apache/stonehenge/stocktrader/BeanFactory.java (added)
+++ incubator/stonehenge/trunk/stocktrader/metro/order_processor/src/org/apache/stonehenge/stocktrader/BeanFactory.java Wed Sep 30 16:21:08 2009
@@ -0,0 +1,13 @@
+package org.apache.stonehenge.stocktrader;
+
+import com.ibm.websphere.samples.trade.OrderDataBean;
+
+public class BeanFactory {
+    public CustomOrderBean toCustomOrderBean(OrderDataBean bean) {
+        return new CustomOrderBean(bean.getOrderID(),
+                bean.getOrderType(), bean.getOrderStatus(),
+                bean.getOpenDate(), bean.getCompletionDate(),
+                bean.getQuantity(),
+                bean.getPrice(), bean.getOrderFee(), bean.getSymbol());
+    }
+}
\ No newline at end of file

Added: incubator/stonehenge/trunk/stocktrader/metro/order_processor/src/org/apache/stonehenge/stocktrader/UsernamePasswordValidator.java
URL: http://svn.apache.org/viewvc/incubator/stonehenge/trunk/stocktrader/metro/order_processor/src/org/apache/stonehenge/stocktrader/UsernamePasswordValidator.java?rev=820332&view=auto
==============================================================================
--- incubator/stonehenge/trunk/stocktrader/metro/order_processor/src/org/apache/stonehenge/stocktrader/UsernamePasswordValidator.java (added)
+++ incubator/stonehenge/trunk/stocktrader/metro/order_processor/src/org/apache/stonehenge/stocktrader/UsernamePasswordValidator.java Wed Sep 30 16:21:08 2009
@@ -0,0 +1,25 @@
+package org.apache.stonehenge.stocktrader;
+
+import com.sun.xml.wss.impl.callback.PasswordValidationCallback;
+import org.apache.stonehenge.stocktrader.dal.CustomerDAO;
+import org.apache.stonehenge.stocktrader.dal.DAOException;
+import org.apache.stonehenge.stocktrader.dal.DAOFactory;
+
+public class UsernamePasswordValidator implements PasswordValidationCallback.PasswordValidator {
+    public boolean validate(PasswordValidationCallback.Request request) throws
+            PasswordValidationCallback.PasswordValidationException {
+        PasswordValidationCallback.PlainTextPasswordRequest plainTextRequest =
+                (PasswordValidationCallback.PlainTextPasswordRequest) request;
+        try {
+            CustomerDAO user = DAOFactory.getFacotry().getCustomerDAO();
+            CustomAccountProfileBean profileBean = user.getAccountProfileData(plainTextRequest.getUsername());
+            if (profileBean != null && profileBean.getPassword().equals(plainTextRequest.getPassword())) {
+                return true;
+            }
+        } catch (DAOException e) {
+            e.printStackTrace();
+            return false;
+        }
+        return false;
+    }
+}

Modified: incubator/stonehenge/trunk/stocktrader/metro/order_processor/src/org/apache/stonehenge/stocktrader/service/OrderProcessorImpl.java
URL: http://svn.apache.org/viewvc/incubator/stonehenge/trunk/stocktrader/metro/order_processor/src/org/apache/stonehenge/stocktrader/service/OrderProcessorImpl.java?rev=820332&r1=820331&r2=820332&view=diff
==============================================================================
--- incubator/stonehenge/trunk/stocktrader/metro/order_processor/src/org/apache/stonehenge/stocktrader/service/OrderProcessorImpl.java (original)
+++ incubator/stonehenge/trunk/stocktrader/metro/order_processor/src/org/apache/stonehenge/stocktrader/service/OrderProcessorImpl.java Wed Sep 30 16:21:08 2009
@@ -22,6 +22,7 @@
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.apache.stonehenge.stocktrader.CustomOrderBean;
+import org.apache.stonehenge.stocktrader.BeanFactory;
 import org.apache.stonehenge.stocktrader.util.OrderProcessorUtility;
 import org.apache.stonehenge.stocktrader.dal.DAOException;
 
@@ -38,11 +39,12 @@
 			.getLog(OrderProcessorImpl.class);
 	// OrderProcessManager is the controller for managing order processing.
 	private final OrderProcessManager orderProcessManager = new OrderProcessManager();
+    private final BeanFactory factory = new BeanFactory();
 
     public void submitOrder(@WebParam(name = "SubmitOrder", targetNamespace = "http://Trade.TraderOrderHost", partName =
             "parameters") SubmitOrder submitOrder) {
         OrderDataBean order = submitOrder.getOrder();
-		CustomOrderBean orderData = new CustomOrderBean(order);
+		CustomOrderBean orderData = factory.toCustomOrderBean(order);
 		try {
 			processOrder(orderData);
 		} catch (DAOException e) {

Modified: incubator/stonehenge/trunk/stocktrader/metro/resources/conf/TradeServiceConfig.properties
URL: http://svn.apache.org/viewvc/incubator/stonehenge/trunk/stocktrader/metro/resources/conf/TradeServiceConfig.properties?rev=820332&r1=820331&r2=820332&view=diff
==============================================================================
--- incubator/stonehenge/trunk/stocktrader/metro/resources/conf/TradeServiceConfig.properties (original)
+++ incubator/stonehenge/trunk/stocktrader/metro/resources/conf/TradeServiceConfig.properties Wed Sep 30 16:21:08 2009
@@ -1 +1 @@
-org.apache.stonehenge.stocktrader.TradeConfigService.url=http://localhost:8090/config_service/ConfigService
\ No newline at end of file
+org.apache.stonehenge.stocktrader.TradeConfigService.url=http://localhost:8091/config_service/ConfigService
\ No newline at end of file

Modified: incubator/stonehenge/trunk/stocktrader/metro/trader_client/build.xml
URL: http://svn.apache.org/viewvc/incubator/stonehenge/trunk/stocktrader/metro/trader_client/build.xml?rev=820332&r1=820331&r2=820332&view=diff
==============================================================================
--- incubator/stonehenge/trunk/stocktrader/metro/trader_client/build.xml (original)
+++ incubator/stonehenge/trunk/stocktrader/metro/trader_client/build.xml Wed Sep 30 16:21:08 2009
@@ -1,6 +1,6 @@
 <project basedir="." default="war" name="trader_client">
     <import file="../etc/as.xml"/>
-    
+
     <property name="src.dir" value="${basedir}/src"/>
     <property name="build.home" value="${basedir}/build"/>
     <property name="build.classes.home" value="${build.home}/classes"/>
@@ -12,6 +12,17 @@
     <property name="war.file" value="${build.war.home}/${war.name}"/>
 
 
+    <property name="web.dir" value="${basedir}/web/WEB-INF"/>
+    <target name="NONSTS">
+        <echo message="copy non-sts web file"/>
+        <copy file="../etc/web.non-sts.xml" tofile="${web.dir}/web.xml" overwrite="true"/>
+    </target>
+
+    <target name="STS">
+        <echo message="copy sts web file"/>
+         <copy file="../etc/web.sts.xml" tofile="${web.dir}/web.xml" overwrite="true"/>
+    </target>
+
     <path id="all.classpath">
         <fileset dir="${lib.home}">
             <include name="**/*.jar"/>
@@ -69,6 +80,15 @@
         <copy todir="${build.classes.home}">
             <fileset dir="../resources/conf" includes="*.properties"/>
         </copy>
+        <copy todir="${build.classes.home}">
+            <fileset file="${src.dir}/wsit-client.xml"/>
+        </copy>
+        <copy todir="${build.classes.home}">
+            <fileset file="${basedir}/../etc/business_service/wsdl0.wsdl"/>
+        </copy>
+        <javac fork="true" srcdir="${config.service.common.dal.dir}" destdir="${build.classes.home}">
+            <classpath refid="all.classpath"/>
+        </javac>
         <javac fork="true" srcdir="${src.dir}" destdir="${build.classes.home}">
             <classpath refid="all.classpath"/>
         </javac>
@@ -88,6 +108,10 @@
             <zipfileset dir="${basedir}/web/images" prefix="images"/>
             <classes dir="${build.classes.home}"/>
             <lib dir="${lib.home}/facelets"/>
+            <lib dir="${lib.home}/commons"/>
+            <lib dir="${lib.home}/agent"/>
+            <lib dir="${lib.home}/mysql"/>
+            <lib dir="${lib.home}/mssql"/>
         </war>
     </target>
 

Modified: incubator/stonehenge/trunk/stocktrader/metro/trader_client/src/org/apache/stonehenge/stocktrader/bean/ConfigServiceBean.java
URL: http://svn.apache.org/viewvc/incubator/stonehenge/trunk/stocktrader/metro/trader_client/src/org/apache/stonehenge/stocktrader/bean/ConfigServiceBean.java?rev=820332&r1=820331&r2=820332&view=diff
==============================================================================
--- incubator/stonehenge/trunk/stocktrader/metro/trader_client/src/org/apache/stonehenge/stocktrader/bean/ConfigServiceBean.java (original)
+++ incubator/stonehenge/trunk/stocktrader/metro/trader_client/src/org/apache/stonehenge/stocktrader/bean/ConfigServiceBean.java Wed Sep 30 16:21:08 2009
@@ -1,42 +1,107 @@
 package org.apache.stonehenge.stocktrader.bean;
 
+import static org.apache.stonehenge.stocktrader.bean.Service.service;
+import org.apache.stonehenge.stocktrader.dal.ConfigServiceDaoFactory;
 import org.apache.stonehenge.stocktrader.service.ConfigServiceClient;
 import org.datacontract.schemas._2004._07.trade.ServiceLocation;
 
+import javax.faces.application.FacesMessage;
+import javax.faces.component.UIComponent;
+import javax.faces.context.FacesContext;
 import javax.faces.model.SelectItem;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
+import javax.faces.validator.ValidatorException;
+import javax.servlet.http.HttpServletRequest;
+import java.util.*;
 
 public class ConfigServiceBean {
 
     private ConfigServiceClient configServiceClient;
+    private ConfigServiceDaoFactory daoFactory;
+    private Service selectedBS = new Service();
+    private Service selectedOPS = new Service();
+    private Service newService = new Service();
 
-    private String selectedBS;
-    private String selectedOPS;
+    private String result;
 
-    public ConfigServiceBean() {
-        configServiceClient = ConfigServiceClient.getInstance();
-        selectedBS = configServiceClient.getSelectedBS();
-        selectedOPS = configServiceClient.getSelectedOPS();
+    private String configServiceUrl;
+
+    private Map<String, Service> bsServices;
+
+    private Map<String, Service> opsServices;
+
+    private String serviceTypeValue;
+
+    public String getConfigServiceUrl() {
+        return configServiceUrl;
     }
 
-    public String getSelectedBS() {
-        return selectedBS;
+    public void setConfigServiceUrl(String configServiceUrl) {
+        this.configServiceUrl = configServiceUrl;
     }
 
-    public String getSelectedOPS() {
-        return selectedOPS;
+    public String getServiceTypeValue() {
+        return serviceTypeValue;
+    }
+
+    public void setServiceTypeValue(String serviceTypeValue) {
+        this.serviceTypeValue = serviceTypeValue;
+    }
+
+    public Service getNewService() {
+        return newService;
+    }
+
+    public void setNewService(Service newService) {
+        this.newService = newService;
+    }
+
+    public Map<String, Service> getBsServices() {
+        return bsServices;
+    }
+
+    public Map<String, Service> getOpsServices() {
+        return opsServices;
+    }
+
+    public String getResult() {
+        return result;
     }
 
-    public void setSelectedBS(String selectedBS) {
+    public Service getSelectedBS() {
+        return selectedBS;
+    }
+
+    public void setSelectedBS(Service selectedBS) {
         this.selectedBS = selectedBS;
     }
 
-    public void setSelectedOPS(String selectedOPS) {
+    public Service getSelectedOPS() {
+        return selectedOPS;
+    }
+
+    public void setSelectedOPS(Service selectedOPS) {
         this.selectedOPS = selectedOPS;
     }
 
+    public ConfigServiceBean() {
+        configServiceClient = ConfigServiceClient.getInstance();
+        selectedBS = service(configServiceClient.getCurrentBSService());
+        selectedOPS = service(configServiceClient.getCurrentOPSService());
+        bsServices = convertFromListToMap(configServiceClient.getBSLocations());
+        opsServices = convertFromListToMap(configServiceClient.getOPSLocations());
+        newService = new Service("", "", false);
+        daoFactory = ConfigServiceDaoFactory.getFacotry();
+        configServiceUrl = daoFactory.getConfigServiceDAO().getConfigService();
+    }
+
+    private Map<String, Service> convertFromListToMap(List<ServiceLocation> bsLocations) {
+        Map<String, Service> map = new HashMap<String, Service>();
+        for (ServiceLocation location : bsLocations) {
+            map.put(location.getServiceName(), service(location));
+        }
+        return map;
+    }
+
     public Collection getBsNames() {
         Collection bs = new ArrayList();
         List<ServiceLocation> bsServiceLocationList = configServiceClient.getBSLocations();
@@ -56,11 +121,140 @@
         return ops;
     }
 
-    public String setBSAndOPS() {
-        if (configServiceClient.setConfig("METRO_CLIENT", selectedBS, selectedOPS)) {
+    public void setConfigUrl() {
+        boolean setUrl = daoFactory.getConfigServiceDAO().updateConfigService(configServiceUrl);
+        if (setUrl) {
+            configServiceClient.setConfigServiceURL(configServiceUrl);
+            result = "Config Service URL successfully changed";
+        } else {
+            result = "Unsuccessful Configuration";
+        }
+    }
+
+    public void setBasicBSAndOPS() {
+        boolean setBSToOPS = configServiceClient
+                .setConfig("METRO_CLIENT", selectedBS.getServiceName(), selectedOPS.getServiceName());
+        if (setBSToOPS) {
+            result = "Configuration successfully changed to: METRO__CLIENT -> " + selectedBS
+                    .getServiceName() + " -> " + selectedOPS.getServiceName();
+        } else {
+            result = "Unsuccessful Configuration";
+        }
+    }
+
+    public void setAdvancedBSAndOPS() {
+        boolean succeedInSetBS = setBSLocation();
+
+        if (!succeedInSetBS) return;
+
+        boolean succeedInSetOPS = setOPSLocation();
+
+        if (!succeedInSetOPS) return;
+
+        setBasicBSAndOPS();
+    }
+
+    private boolean setOPSLocation() {
+        boolean updateOPS = configServiceClient
+                .setServiceLocation(selectedOPS.getServiceName(), selectedOPS.getServiceURL(), selectedOPS.getIsSec());
+        if (updateOPS) {
+            return true;
+        }
+        result = "Unsuccessful Configuration";
+        return false;
+    }
+
+    private boolean setBSLocation() {
+        boolean updateBS = configServiceClient
+                .setServiceLocation(selectedBS.getServiceName(), selectedBS.getServiceURL(), selectedBS.getIsSec());
+        if (updateBS) {
+            return true;
+        }
+        result = "Unsuccessful Configuration";
+        return false;
+    }
+
+    public void restoreDefaults() {
+        String bsName = "METRO_BS";
+        String opsName = "METRO_OPS";
+        selectedBS = new Service(bsName, bsServices.get(bsName).getServiceURL(), false);
+        selectedOPS = new Service(opsName, opsServices.get(opsName).getServiceURL(), false);
+    }
+
+    public void restoreDefaultConfigServiceUrl() {
+        configServiceUrl = "http://localhost:8090/config_service/ConfigService";
+        daoFactory.getConfigServiceDAO().updateConfigService(configServiceUrl);
+    }
+
+    public void updateBS() {
+        this.selectedBS = bsServices.get(this.selectedBS.getServiceName());
+    }
+
+    public void updateOPS() {
+        this.selectedOPS = opsServices.get(this.selectedOPS.getServiceName());
+    }
+
+    public String addNew() {
+        serviceTypeValue = FacesContext.getCurrentInstance().getExternalContext().getRequestParameterMap()
+                .get("serviceTypeId");
+        return "success";
+    }
+
+    public String addService() {
+        boolean addNewService = configServiceClient
+                .setServiceLocation(newService.getServiceName(), newService.getServiceURL(), newService.getIsSec());
+        if (addNewService) {
+            if (newService.getServiceName().indexOf("_BS") != -1) {
+                bsServices.put(newService.getServiceName(), newService);
+            } else {
+                opsServices.put(newService.getServiceName(), newService);
+            }
+            newService = new Service("", "", false);
             return "success";
         }
         return "failure";
     }
 
+    public void validateServiceName(FacesContext context, UIComponent component, Object value) {
+        HttpServletRequest request = (HttpServletRequest) context.getExternalContext().getRequest();
+        String name = (String) value;
+        String ending = "_";
+        boolean sec = false;
+        String secValue = request.getParameter("newServiceForm:sec");
+        String serviceType = request.getParameter("newServiceForm:serType");
+        if (secValue != null) {
+            sec = true;
+        }
+        ending += serviceType;
+        if (sec) {
+            ending += "SEC";
+        }
+        boolean verifyFamate = name.endsWith(ending);
+        if (!verifyFamate) {
+            FacesMessage message = new FacesMessage();
+            message.setSeverity(FacesMessage.SEVERITY_ERROR);
+            message.setSummary("Must end in: " + ending);
+            throw new ValidatorException(message);
+        }
+    }
+
+    public String advancedConfig() {
+        return "success";
+    }
+
+    public String nextConfig() {
+        return "success";
+    }
+
+    public String basicConfig() {
+        return "success";
+    }
+
+    public String cancelAddService() {
+        return "success";
+    }
+
+    public String selectorPage() {
+        return "success";
+    }
 }

Modified: incubator/stonehenge/trunk/stocktrader/metro/trader_client/src/org/apache/stonehenge/stocktrader/bean/LoginBean.java
URL: http://svn.apache.org/viewvc/incubator/stonehenge/trunk/stocktrader/metro/trader_client/src/org/apache/stonehenge/stocktrader/bean/LoginBean.java?rev=820332&r1=820331&r2=820332&view=diff
==============================================================================
--- incubator/stonehenge/trunk/stocktrader/metro/trader_client/src/org/apache/stonehenge/stocktrader/bean/LoginBean.java (original)
+++ incubator/stonehenge/trunk/stocktrader/metro/trader_client/src/org/apache/stonehenge/stocktrader/bean/LoginBean.java Wed Sep 30 16:21:08 2009
@@ -10,11 +10,13 @@
 
 public class LoginBean {
     private static final CookieManager cookieManager = new CookieManager();
+    private BusinessServiceClient businessServiceClient;
 
     private String username;
     private String password;
 
     public LoginBean() {
+        businessServiceClient = BusinessServiceClient.getInstance();
         String user = cookieManager.getCurrentUser();
         if (user != null) {
             logout(user);
@@ -23,12 +25,13 @@
     }
 
     private void logout(String username) {
-        ITradeServices service = BusinessServiceClient.getInstance().getBusinessService();
+        businessServiceClient.setSamlAssertion(cookieManager.getSamlAssertion());
+        ITradeServices service = businessServiceClient.getBusinessService();
         Logout logoutParam = new Logout();
         logoutParam.setUserID(username);
         service.logout(logoutParam);
     }
-    
+
     public String getUsername() {
     	return cookieManager.getCurrentUser();
     }
@@ -57,7 +60,8 @@
     }
 
     private boolean loginBusinessService(String username, String password) {
-        ITradeServices service = BusinessServiceClient.getInstance().getBusinessService();
+        businessServiceClient.setSamlAssertion(cookieManager.getSamlAssertion());
+        ITradeServices service = businessServiceClient.getBusinessService();
         Login loginParam = new Login();
         loginParam.setUserID(username);
         loginParam.setPassword(password);