Author: drewbai
Date: Fri Jun 12 23:36:00 2009
New Revision: 784314

URL: http://svn.apache.org/viewvc?rev=784314&view=rev
Log:
STONEHENGE-57 Remove the InProcess Mode from .NET
COMMIT FOR BEN DEWEY.

Thanks Ben!

Modified:
    
incubator/stonehenge/trunk/stocktrader/dotnet/business_service/BusinessServiceConfigurationSettings/Settings.cs
    
incubator/stonehenge/trunk/stocktrader/dotnet/business_service/BusinessServiceConsole/App.config
    
incubator/stonehenge/trunk/stocktrader/dotnet/business_service/BusinessServiceConsole/BusinessServiceConsole.csproj
    
incubator/stonehenge/trunk/stocktrader/dotnet/business_service/BusinessServiceImplementation/TradeService.cs
    
incubator/stonehenge/trunk/stocktrader/dotnet/common/BasicClient/BasicClient.cs
    
incubator/stonehenge/trunk/stocktrader/dotnet/common/BasicClient/BasicClient.csproj
    
incubator/stonehenge/trunk/stocktrader/dotnet/common/ServiceConfigurationSettings/Settings.cs
    
incubator/stonehenge/trunk/stocktrader/dotnet/common/StockTraderUtility/Utility.cs
    
incubator/stonehenge/trunk/stocktrader/dotnet/common/StockTraderUtility/Utility.csproj
    
incubator/stonehenge/trunk/stocktrader/dotnet/trader_client/StockTraderWebAppSolution.sln
    
incubator/stonehenge/trunk/stocktrader/dotnet/trader_client/StockTraderWebApplicationClients/BSLClient.cs
    
incubator/stonehenge/trunk/stocktrader/dotnet/trader_client/StockTraderWebApplicationClients/StockTraderWebApplicationServiceClient.csproj
    
incubator/stonehenge/trunk/stocktrader/dotnet/trader_client/Trade/Global.asax
    incubator/stonehenge/trunk/stocktrader/dotnet/trader_client/Trade/Web.config

Modified: 
incubator/stonehenge/trunk/stocktrader/dotnet/business_service/BusinessServiceConfigurationSettings/Settings.cs
URL: 
http://svn.apache.org/viewvc/incubator/stonehenge/trunk/stocktrader/dotnet/business_service/BusinessServiceConfigurationSettings/Settings.cs?rev=784314&r1=784313&r2=784314&view=diff
==============================================================================
--- 
incubator/stonehenge/trunk/stocktrader/dotnet/business_service/BusinessServiceConfigurationSettings/Settings.cs
 (original)
+++ 
incubator/stonehenge/trunk/stocktrader/dotnet/business_service/BusinessServiceConfigurationSettings/Settings.cs
 Fri Jun 12 23:36:00 2009
@@ -156,12 +156,6 @@
         {
             switch (ORDER_PROCESSING_MODE)
             {
-               
-                case StockTraderUtility.ORDER_STRING_Sync:
-                    {
-                        orderMode = StockTraderUtility.ORDER_Sync;
-                        break;
-                    }
 
                 case StockTraderUtility.ORDER_STRING_ASync_DotNet_Http:
                     {

Modified: 
incubator/stonehenge/trunk/stocktrader/dotnet/business_service/BusinessServiceConsole/App.config
URL: 
http://svn.apache.org/viewvc/incubator/stonehenge/trunk/stocktrader/dotnet/business_service/BusinessServiceConsole/App.config?rev=784314&r1=784313&r2=784314&view=diff
==============================================================================
--- 
incubator/stonehenge/trunk/stocktrader/dotnet/business_service/BusinessServiceConsole/App.config
 (original)
+++ 
incubator/stonehenge/trunk/stocktrader/dotnet/business_service/BusinessServiceConsole/App.config
 Fri Jun 12 23:36:00 2009
@@ -31,7 +31,6 @@
     <add key="ORDER_PROCESSING_MODE" value="ASync_DotNet_Http" />
     <!--
        //Valid Config Values for user-set "OrderMode" config setting.
-        public const string ORDER_STRING_Sync = "Sync_InProcess";
         public const string ORDER_STRING_ASync_DotNet_Http = 
"ASync_DotNet_Http";
         public const string ORDER_STRING_ASync_DotNet_WsHttp_MSec = 
"ASync_DotNet_WsHttp_MSecurity";
         public const string ORDER_STRING_ASync_PHP_Http = "ASync_PHP_Http";

Modified: 
incubator/stonehenge/trunk/stocktrader/dotnet/business_service/BusinessServiceConsole/BusinessServiceConsole.csproj
URL: 
http://svn.apache.org/viewvc/incubator/stonehenge/trunk/stocktrader/dotnet/business_service/BusinessServiceConsole/BusinessServiceConsole.csproj?rev=784314&r1=784313&r2=784314&view=diff
==============================================================================
--- 
incubator/stonehenge/trunk/stocktrader/dotnet/business_service/BusinessServiceConsole/BusinessServiceConsole.csproj
 (original)
+++ 
incubator/stonehenge/trunk/stocktrader/dotnet/business_service/BusinessServiceConsole/BusinessServiceConsole.csproj
 Fri Jun 12 23:36:00 2009
@@ -17,10 +17,14 @@
     <UpgradeBackupLocation>
     </UpgradeBackupLocation>
     <OldToolsVersion>2.0</OldToolsVersion>
-    <SccProjectName>Svn</SccProjectName>
-    <SccLocalPath>Svn</SccLocalPath>
-    <SccAuxPath>Svn</SccAuxPath>
-    <SccProvider>SubversionScc</SccProvider>
+    <SccProjectName>
+    </SccProjectName>
+    <SccLocalPath>
+    </SccLocalPath>
+    <SccAuxPath>
+    </SccAuxPath>
+    <SccProvider>
+    </SccProvider>
     <PublishUrl>publish\</PublishUrl>
     <Install>true</Install>
     <InstallFrom>Disk</InstallFrom>

Modified: 
incubator/stonehenge/trunk/stocktrader/dotnet/business_service/BusinessServiceImplementation/TradeService.cs
URL: 
http://svn.apache.org/viewvc/incubator/stonehenge/trunk/stocktrader/dotnet/business_service/BusinessServiceImplementation/TradeService.cs?rev=784314&r1=784313&r2=784314&view=diff
==============================================================================
--- 
incubator/stonehenge/trunk/stocktrader/dotnet/business_service/BusinessServiceImplementation/TradeService.cs
 (original)
+++ 
incubator/stonehenge/trunk/stocktrader/dotnet/business_service/BusinessServiceImplementation/TradeService.cs
 Fri Jun 12 23:36:00 2009
@@ -538,17 +538,12 @@
 
         /// <summary>
         /// Performs a holding sell operation.
-        /// Note orderProcessing mode param is not used by StockTrader or IBM 
Trade 6.1; instead
-        /// both apps pick this up from the application configuration.
         /// </summary>
         /// <param name="userID">User id to create/submit order for.</param>
         /// <param name="holdingID">Holding id to sell off.</param>
         /// <param name="orderProcessingMode">Not used, set to zero.</param>
         public OrderDataModel sell(string userID, int holdingID, int 
orderProcessingMode)
         {
-            //In the case of running in 'Sync_InProcess' mode, then the 
PlaceOrder method 
-            //will synchronously invoke the processOrder method as part of 
this service, and not make an 
-            //additional remote service-to-sevice call via WCF. See 
ProcessOrder.cs.
             //note, this method always sells entire holding, quantity is not 
passed in.  This is default behavior of WebSphere Trade 6.1
             return placeOrder(StockTraderUtility.ORDER_TYPE_SELL, userID, 
holdingID, null, (double)0);
         }
@@ -617,39 +612,31 @@
                                 //Business Step 1:  create the order header.
                                 order = createOrder(orderType, userID, 
holdingID, symbol, quantity, ref holding);
 
-                                //Business Step 2:  Determine which order 
processing mode to use,
-                                //and either process order right away (sync) 
and in-process with 
-                                //calling ASP.NET Web app; or interface with 
the
-                                //async WCF Order Processing Service (cooler) 
via a service-to-service call,
+                                //Business Step 2:  Sets up the interface with 
the
+                                //async WCF Order Processing Service via a 
service-to-service call,
                                 //distributed/remote.
-                                if (Settings.orderMode != 
StockTraderUtility.ORDER_Sync)
-                                {
-                                    //Fire up our async client;  we follow the 
same model here as with the
-                                    //StockTrader Web App in that we do not 
talk 'directly' to the generated proxy
-                                    //for the service; rather we channel all 
calls through a single 
-                                    //class that then talks to the service 
proxy.  This will aid in more
-                                    //easily knowing where communication and 
proxy logic sits; and make changes to services
-                                    //you might want to interface with vs. 
littering proxy calls throughout the
-                                    //business tier itself.
-                                    TradeOrderServiceAsyncClient asyncclient = 
new TradeOrderServiceAsyncClient(Settings.orderMode);
-                                       asyncclient.processOrderASync(order);
-                                }
-                                else
-                                {
-                                    processOrderSync(order, holding);
-                                }
+
+                                //Fire up our async client;  we follow the 
same model here as with the
+                                //StockTrader Web App in that we do not talk 
'directly' to the generated proxy
+                                //for the service; rather we channel all calls 
through a single 
+                                //class that then talks to the service proxy.  
This will aid in more
+                                //easily knowing where communication and proxy 
logic sits; and make changes to services
+                                //you might want to interface with vs. 
littering proxy calls throughout the
+                                //business tier itself.
+                                TradeOrderServiceAsyncClient asyncclient = new 
TradeOrderServiceAsyncClient(Settings.orderMode);
+                                asyncclient.processOrderASync(order);
 
                                 tx.Complete();
                                 Console.WriteLine("Order placed of type " + 
orderType + " for the user " + userID + " in the quantity of " + quantity);
                                 return order;
                             }
-                            //If per chance you are doing step-through 
debugging through here and are getting a
-                            // "TRANSACTION HAS ABORTED" exception and do not 
know why,
-                            //it's quite likely you are hitting the 15-second 
timeout we set in
-                            //ConfigurationSettings for the System.Transaction 
options so its just doing what we told it to. 
-                            //Simply adjust timeout higher, recompile if you 
need to.
                             catch
                             {
+                                //If per chance you are doing step-through 
debugging through here and are getting a
+                                // "TRANSACTION HAS ABORTED" exception and do 
not know why,
+                                //it's quite likely you are hitting the 
15-second timeout we set in
+                                //ConfigurationSettings for the 
System.Transaction options so its just doing what we told it to. 
+                                //Simply adjust timeout higher, recompile if 
you need to.
                                 throw;
                             }
                             finally
@@ -669,30 +656,22 @@
                             //Business Step 1:  create the order header.
                             order = createOrder(orderType, userID, holdingID, 
symbol, quantity, ref holding);
 
-                            //Business Step 2:  Determine which order 
processing mode to use,
-                            //and either process order right away (sync); or 
interface with the
-                            //async WCF Order Processing Service (cooler) via 
a service-to-service call.
-                            if (Settings.orderMode != 
StockTraderUtility.ORDER_Sync)
-                            {
-                                //Fire up our async client;  we follow the 
same model here as with the
-                                //StockTrader Web App in that we do not talk 
'directly' to the generated proxy
-                                //for the service; rather we channel all calls 
through a single 
-                                //class that then talks to the service proxy.  
This will aid in more
-                                //easily knowing where communication and proxy 
logic sits; and make changes to services
-                                //you might want to interface with vs. 
littering proxy calls throughout the
-                                //business tier itself.
-                                TradeOrderServiceAsyncClient asyncclient = new 
TradeOrderServiceAsyncClient(Settings.orderMode);
-                                    asyncclient.processOrderASync(order);
-                                dalOrder.CommitADOTransaction();
-                            }
-                            else
-                            {
-                                processOrderSync(order, holding);
-                            }
+                            //Business Step 2:  Sets up an interface with the
+                            //async WCF Order Processing Service via a 
service-to-service call.
+
+                            //Fire up our async client;  we follow the same 
model here as with the
+                            //StockTrader Web App in that we do not talk 
'directly' to the generated proxy
+                            //for the service; rather we channel all calls 
through a single 
+                            //class that then talks to the service proxy.  
This will aid in more
+                            //easily knowing where communication and proxy 
logic sits; and make changes to services
+                            //you might want to interface with vs. littering 
proxy calls throughout the
+                            //business tier itself.
+                            TradeOrderServiceAsyncClient asyncclient = new 
TradeOrderServiceAsyncClient(Settings.orderMode);
+                            asyncclient.processOrderASync(order);
                             dalOrder.CommitADOTransaction();
                             return order;
                         }
-                        catch 
+                        catch
                         {
                             dalOrder.RollBackTransaction();
                             throw;

Modified: 
incubator/stonehenge/trunk/stocktrader/dotnet/common/BasicClient/BasicClient.cs
URL: 
http://svn.apache.org/viewvc/incubator/stonehenge/trunk/stocktrader/dotnet/common/BasicClient/BasicClient.cs?rev=784314&r1=784313&r2=784314&view=diff
==============================================================================
--- 
incubator/stonehenge/trunk/stocktrader/dotnet/common/BasicClient/BasicClient.cs 
(original)
+++ 
incubator/stonehenge/trunk/stocktrader/dotnet/common/BasicClient/BasicClient.cs 
Fri Jun 12 23:36:00 2009
@@ -38,7 +38,6 @@
 using System.Reflection;
 using Trade.Utility;
 using Trade.BusinessServiceContract;
-using Trade.OrderProcessorContract;
 
 
 namespace Trade.Client

Modified: 
incubator/stonehenge/trunk/stocktrader/dotnet/common/BasicClient/BasicClient.csproj
URL: 
http://svn.apache.org/viewvc/incubator/stonehenge/trunk/stocktrader/dotnet/common/BasicClient/BasicClient.csproj?rev=784314&r1=784313&r2=784314&view=diff
==============================================================================
--- 
incubator/stonehenge/trunk/stocktrader/dotnet/common/BasicClient/BasicClient.csproj
 (original)
+++ 
incubator/stonehenge/trunk/stocktrader/dotnet/common/BasicClient/BasicClient.csproj
 Fri Jun 12 23:36:00 2009
@@ -70,10 +70,6 @@
       <Project>{36FA3564-9AF5-496A-805B-6ED262CAAE2B}</Project>
       <Name>BusinessServiceContract</Name>
     </ProjectReference>
-    <ProjectReference 
Include="..\..\order_processor\OrderProcessorContract\OrderProcessorContract.csproj">
-      <Project>{1AD6DBB4-CA83-460F-BDCD-45E1ECE318B4}</Project>
-      <Name>OrderProcessorContract</Name>
-    </ProjectReference>
     <ProjectReference Include="..\StockTraderUtility\Utility.csproj">
       <Project>{382E6E1C-E430-4F6C-BC41-5D84A3798B02}</Project>
       <Name>Utility</Name>

Modified: 
incubator/stonehenge/trunk/stocktrader/dotnet/common/ServiceConfigurationSettings/Settings.cs
URL: 
http://svn.apache.org/viewvc/incubator/stonehenge/trunk/stocktrader/dotnet/common/ServiceConfigurationSettings/Settings.cs?rev=784314&r1=784313&r2=784314&view=diff
==============================================================================
--- 
incubator/stonehenge/trunk/stocktrader/dotnet/common/ServiceConfigurationSettings/Settings.cs
 (original)
+++ 
incubator/stonehenge/trunk/stocktrader/dotnet/common/ServiceConfigurationSettings/Settings.cs
 Fri Jun 12 23:36:00 2009
@@ -128,12 +128,6 @@
         {
             switch (ACCESS_MODE)
             {
-                case StockTraderUtility.ACCESS_STRING_InProcess:
-                    {
-                        //no endpoint needs to be set in this mode.
-                        interfaceMode = StockTraderUtility.ACCESS_Direct;
-                         break;
-                    }
                 case StockTraderUtility.ACCESS_STRING_DotNet_Http_WcfService:
                     {
                         interfaceMode = 
StockTraderUtility.ACCESS_DotNet_Http_WcfService;

Modified: 
incubator/stonehenge/trunk/stocktrader/dotnet/common/StockTraderUtility/Utility.cs
URL: 
http://svn.apache.org/viewvc/incubator/stonehenge/trunk/stocktrader/dotnet/common/StockTraderUtility/Utility.cs?rev=784314&r1=784313&r2=784314&view=diff
==============================================================================
--- 
incubator/stonehenge/trunk/stocktrader/dotnet/common/StockTraderUtility/Utility.cs
 (original)
+++ 
incubator/stonehenge/trunk/stocktrader/dotnet/common/StockTraderUtility/Utility.cs
 Fri Jun 12 23:36:00 2009
@@ -56,7 +56,7 @@
         public static readonly string 
EXCEPTION_WEBSPHERE_DUPLICATE_PRIMARY_KEY = 
"org.omg.CORBA.portable.UnknownException";
         public static readonly string 
EXCEPTION_MESSAGE_INVALID_ORDERMODE_CONFIG = "This 'OrderMode' setting is not a 
valid setting (settings are case-sensitive).";
         public static readonly string 
EXCEPTION_MESSAGE_INVALID_TXMMODEL_CONFIG = "This 'Use System.Transactions 
Globally' setting is not a valid setting.  Valid settings are 'true' or 
'false'. Please fix in: ";
-        public static readonly string EXCEPTION_MESSAGE_VALID_ORDERMODEVALUES 
= "Valid values are: 'Sync_InProcess', 'ASync_Msmq', 'ASync_Msmq_Volatile', 
'ASync_Tcp', 'ASync_Http'.";
+        public static readonly string EXCEPTION_MESSAGE_VALID_ORDERMODEVALUES 
= "Valid values are: 'ASync_DotNet_Http', 'ASync_DotNet_WsHttp_MSecurity', 
'ASync_PHP_Http', 'ASync_PHP_WsHttp_MSecurity', 'ASync_WSAS_Http', 
'ASync_WSAS_WsHttp_MSecurity'.";
         public static readonly string 
EXCEPTION_MESSAGE_INVALID_HOLDING_BAD_QUOTE = "Holding with non-valid Quote 
Symbol: holdingID=";
         public static readonly string 
EXCEPTION_MESSAGE_INVALID_HOLDING_NOT_FOUND = "Holding not found!";
         public static readonly string 
EXCEPTION_MESSAGE_INVALID_HOLDING_ZERO_BASIS = "Holding with zero basis!: 
holdingID=";
@@ -70,12 +70,12 @@
         public static readonly string EXCEPTION_MESSAGE_BADORDERTYPE = "Sorry, 
this order type is not allowed.";
         public static readonly string 
EXCEPTION_MESSAGE_INVALID_ORDERFORWARDBEHAVIOR_CONFIG = "This 'Order Processing 
Behavior' setting is not a valid setting (settings are case-sensitive). Please 
fix in: ";
         public static readonly string 
EXCEPTION_MESSAGE_INVALID_ORDERFORWARDMODE_CONFIG = "This 'OrderForwardMode' 
setting is not a valid setting (settings are case-sensitive). Please fix in: ";
-        public static readonly string 
EXCEPTION_MESSAGE_VALID_ORDERFORWARDMODEVALUES = "Valid values are: 
'ASync_Msmq', 'ASync_Msmq_Volatile', 'ASync_Tcp', 'ASync_Http'.";
+        public static readonly string 
EXCEPTION_MESSAGE_VALID_ORDERFORWARDMODEVALUES = "Valid values are: 
'ASync_DotNet_Http', 'ASync_DotNet_WsHttp_MSecurity', 'ASync_PHP_Http', 
'ASync_PHP_WsHttp_MSecurity', 'ASync_WSAS_Http', 
'ASync_WSAS_WsHttp_MSecurity'.";
         public static readonly string 
EXCEPTION_MESSAGE_VALID_ORDERFORWARDBEHAVIORVALUES = "Valid values are: 
'Forward' and 'Standard'.";
         public static readonly string EXCEPTION_WEBSPHERE_USERID_NOTFOUND = 
"javax.ejb.ObjectNotFoundException";
         public static readonly string EXCEPTION_WEBSPHERE_INVALID_PASSWORD = 
"Incorrect password";
         public static readonly string 
EXCEPTION_MESSAGE_INVALID_ACCESSMODE_CONFIG = "This 'AccessMode' setting is not 
a valid setting (settings are case-sensitive).";
-        public static readonly string EXCEPTION_MESSAGE_VALID_ACCESSMODEVALUES 
= "Valid values are: 'InProcess' (for in-process activation), 'Http_WebService' 
(for SOA activation via WCF Self-Host/Http), 'Tcp_WebService' (for SOA 
activation via WCF Self-Host/Tcp), 'Asmx_WebService' (for SOA activation via 
ASMX) and 'WebSphere_WebService' (for SOA activation via WCF against IBM Trade 
6.1 services).";
+        public static readonly string EXCEPTION_MESSAGE_VALID_ACCESSMODEVALUES 
= "Valid values are: 'DotNet_Http_WcfService' (for SOA activation via WCF 
Self-Host/Http), 'DotNet_WsHttp_WcfService' (for SOA activation via WCF 
Self-Host/WsHttp), 'PHP_Http_WebService' (for SOA activation via WCF against 
PHP (WSF) services) and 'WSAS_Http_WebService' (for SOA activation via WCF 
against WSAS services).";
         public static readonly string EXCEPTION_MESSAGE_DUPLICATE_PRIMARY_KEY 
= "User ID Already Exists! Please Try a Different User ID.";
         public static readonly string EXCEPTION_MESSAGE_INVALID_LOGIN = "Error 
Logging In. Invalid Username or Password!";
        
@@ -103,21 +103,18 @@
 
         //Valid Config Values for user-set "AccessMode" config setting.  Note 
in all cases, the same
         //WCF client (that inherits from LoadBalancingClient) is used.  Just 
the binding and service host name varies.
-        public const string ACCESS_STRING_InProcess = "InProcess";
         public const string ACCESS_STRING_DotNet_Http_WcfService = 
"DotNet_Http_WcfService";
         public const string ACCESS_STRING_DotNet_WsHttp_WcfService = 
"DotNet_WsHttp_WcfService";
         public const string ACCESS_STRING_PHP_Http_WebService = 
"PHP_Http_WebService";
         public const string ACCESS_STRING_WSAS_Http_WebService = 
"WSAS_Http_WebService";
        
         //Map string/user-friendly modes to ints for faster lookups
-        public const int ACCESS_Direct = 0;
         public const int ACCESS_DotNet_Http_WcfService = 1;
         public const int ACCESS_DotNet_WsHttp_WcfService = 2;
         public const int ACCESS_PHP_Http_WebService = 3;
         public const int ACCESS_WSAS_Http_WebService = 4;
 
         //Valid Config Values for user-set "OrderMode" config setting.
-        public const string ORDER_STRING_Sync = "Sync_InProcess";
         public const string ORDER_STRING_ASync_DotNet_Http = 
"ASync_DotNet_Http";
         public const string ORDER_STRING_ASync_DotNet_WsHttp_MSec = 
"ASync_DotNet_WsHttp_MSecurity";
         public const string ORDER_STRING_ASync_PHP_Http = "ASync_PHP_Http";
@@ -126,7 +123,6 @@
         public const string ORDER_STRING_ASync_WSAS_WsHttp_MSec = 
"ASync_WSAS_WsHttp_MSecurity";
 
         //OrderMode constants
-        public const int ORDER_Sync = 0;
         public const int ORDER_ASync_DotNet_Http = 1;
         public const int ORDER_ASync_DotNet_WsHttp_MSec = 2;
         public const int ORDER_ASync_PHP_Http = 3;

Modified: 
incubator/stonehenge/trunk/stocktrader/dotnet/common/StockTraderUtility/Utility.csproj
URL: 
http://svn.apache.org/viewvc/incubator/stonehenge/trunk/stocktrader/dotnet/common/StockTraderUtility/Utility.csproj?rev=784314&r1=784313&r2=784314&view=diff
==============================================================================
--- 
incubator/stonehenge/trunk/stocktrader/dotnet/common/StockTraderUtility/Utility.csproj
 (original)
+++ 
incubator/stonehenge/trunk/stocktrader/dotnet/common/StockTraderUtility/Utility.csproj
 Fri Jun 12 23:36:00 2009
@@ -16,10 +16,14 @@
     <UpgradeBackupLocation>
     </UpgradeBackupLocation>
     <OldToolsVersion>2.0</OldToolsVersion>
-    <SccProjectName>Svn</SccProjectName>
-    <SccLocalPath>Svn</SccLocalPath>
-    <SccAuxPath>Svn</SccAuxPath>
-    <SccProvider>SubversionScc</SccProvider>
+    <SccProjectName>
+    </SccProjectName>
+    <SccLocalPath>
+    </SccLocalPath>
+    <SccAuxPath>
+    </SccAuxPath>
+    <SccProvider>
+    </SccProvider>
     <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' 
">

Modified: 
incubator/stonehenge/trunk/stocktrader/dotnet/trader_client/StockTraderWebAppSolution.sln
URL: 
http://svn.apache.org/viewvc/incubator/stonehenge/trunk/stocktrader/dotnet/trader_client/StockTraderWebAppSolution.sln?rev=784314&r1=784313&r2=784314&view=diff
==============================================================================
--- 
incubator/stonehenge/trunk/stocktrader/dotnet/trader_client/StockTraderWebAppSolution.sln
 (original)
+++ 
incubator/stonehenge/trunk/stocktrader/dotnet/trader_client/StockTraderWebAppSolution.sln
 Fri Jun 12 23:36:00 2009
@@ -2,20 +2,15 @@
 Microsoft Visual Studio Solution File, Format Version 10.00
 # Visual Studio 2008
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = 
"StockTraderWebApplicationServiceClient", 
"StockTraderWebApplicationClients\StockTraderWebApplicationServiceClient.csproj",
 "{3A1AB418-60B7-44BF-AE17-E74F425CD5C9}"
-       ProjectSection(ProjectDependencies) = postProject
-               {623BC346-84FA-4B9E-B043-811DB7FBEC2A} = 
{623BC346-84FA-4B9E-B043-811DB7FBEC2A}
-               {1AD6DBB4-CA83-460F-BDCD-45E1ECE318B4} = 
{1AD6DBB4-CA83-460F-BDCD-45E1ECE318B4}
-               {B28867CC-DD77-4F17-BA01-92625C235F6C} = 
{B28867CC-DD77-4F17-BA01-92625C235F6C}
-       EndProjectSection
 EndProject
-Project("{E24C65DC-7377-472B-9ABA-BC803B73C61A}") = "Trade", "Trade", 
"{7550FE25-72BF-4059-8786-08741D8E7154}"
+Project("{E24C65DC-7377-472B-9ABA-BC803B73C61A}") = "Trade", "Trade\", 
"{7550FE25-72BF-4059-8786-08741D8E7154}"
        ProjectSection(WebsiteProperties) = preProject
                SccProjectName = ""
                SccAuxPath = ""
                SccLocalPath = ""
                SccProvider = ""
                TargetFramework = "3.5"
-               ProjectReferences = 
"{97F8A696-9918-4DC4-8D6E-9E574B9A4059}|Trade.StockTraderWebApplicationModelClasses.dll;{3A1AB418-60B7-44BF-AE17-E74F425CD5C9}|Trade.StockTraderWebApplicationServiceClient.dll;{D8E1ECD5-2D86-4994-A37B-BF4D24334A2E}|Trade.StockTraderWebApplicationSettings.dll;{382E6E1C-E430-4F6C-BC41-5D84A3798B02}|Trade.Utility.dll;{A4759510-6CE9-4692-B348-B8483BCD1447}|BasicClient.dll;{B28867CC-DD77-4F17-BA01-92625C235F6C}|Trade.OrderProcessorServiceConfigurationSettings.dll;{018CF591-E45C-4E74-B613-CA5C1FCAFE89}|Trade.BusinessServiceImplementation.dll;{36FA3564-9AF5-496A-805B-6ED262CAAE2B}|Trade.BusinessServiceContract.dll;{EBB1604B-3F50-4A81-87C3-1AE4029EEEC6}|Trade.BusinessServiceDataContract.dll;{1AD6DBB4-CA83-460F-BDCD-45E1ECE318B4}|Trade.OrderProcessorContract.dll;{F67C8D85-6DC0-45CD-A748-636E3881E2F5}|Trade.DALFactory.dll;{509EB16A-6586-4200-8323-32438C9B47DC}|Trade.IDAL.dll;{ED14B721-A6F1-4B65-89FA-18B78345CB5A}|Trade.BusinessServiceConfigurationSettings.dll;{62
 3BC346-84FA-4B9E-B043-811DB7FBEC2A}|Trade.OrderProcessorAsyncClient.dll;"
+               ProjectReferences = 
"{97F8A696-9918-4DC4-8D6E-9E574B9A4059}|Trade.StockTraderWebApplicationModelClasses.dll;{3A1AB418-60B7-44BF-AE17-E74F425CD5C9}|Trade.StockTraderWebApplicationServiceClient.dll;{D8E1ECD5-2D86-4994-A37B-BF4D24334A2E}|Trade.StockTraderWebApplicationSettings.dll;{382E6E1C-E430-4F6C-BC41-5D84A3798B02}|Trade.Utility.dll;{A4759510-6CE9-4692-B348-B8483BCD1447}|BasicClient.dll;{36FA3564-9AF5-496A-805B-6ED262CAAE2B}|Trade.BusinessServiceContract.dll;{EBB1604B-3F50-4A81-87C3-1AE4029EEEC6}|Trade.BusinessServiceDataContract.dll;"
                Debug.AspNetCompiler.VirtualPath = "/Trade"
                Debug.AspNetCompiler.PhysicalPath = "Trade\"
                Debug.AspNetCompiler.TargetPath = "PrecompiledWeb\Trade\"
@@ -37,28 +32,14 @@
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "BasicClient", 
"..\common\BasicClient\BasicClient.csproj", 
"{A4759510-6CE9-4692-B348-B8483BCD1447}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = 
"BusinessServiceConfigurationSettings", 
"..\business_service\BusinessServiceConfigurationSettings\BusinessServiceConfigurationSettings.csproj",
 "{ED14B721-A6F1-4B65-89FA-18B78345CB5A}"
-EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "BusinessServiceContract", 
"..\business_service\BusinessServiceContract\BusinessServiceContract.csproj", 
"{36FA3564-9AF5-496A-805B-6ED262CAAE2B}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = 
"BusinessServiceDataContract", 
"..\business_service\BusinessServiceDataContract\BusinessServiceDataContract.csproj",
 "{EBB1604B-3F50-4A81-87C3-1AE4029EEEC6}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = 
"BusinessServiceImplementation", 
"..\business_service\BusinessServiceImplementation\BusinessServiceImplementation.csproj",
 "{018CF591-E45C-4E74-B613-CA5C1FCAFE89}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = 
"OrderProcessorAsyncClient", 
"..\business_service\OrderProcessorASyncClient\OrderProcessorAsyncClient.csproj",
 "{623BC346-84FA-4B9E-B043-811DB7FBEC2A}"
-EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Utility", 
"..\common\StockTraderUtility\Utility.csproj", 
"{382E6E1C-E430-4F6C-BC41-5D84A3798B02}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = 
"StockTraderWebApplicationSettings", 
"..\common\ServiceConfigurationSettings\StockTraderWebApplicationSettings.csproj",
 "{D8E1ECD5-2D86-4994-A37B-BF4D24334A2E}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OrderProcessorContract", 
"..\order_processor\OrderProcessorContract\OrderProcessorContract.csproj", 
"{1AD6DBB4-CA83-460F-BDCD-45E1ECE318B4}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "StockTraderDALFactory", 
"..\common\DALFactory\StockTraderDALFactory.csproj", 
"{F67C8D85-6DC0-45CD-A748-636E3881E2F5}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "StockTraderIDAL", 
"..\common\IDAL\StockTraderIDAL.csproj", 
"{509EB16A-6586-4200-8323-32438C9B47DC}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = 
"OrderProcessorServiceConfigurationSettings", 
"..\common\OrderProcessorServiceConfigurationSettings\OrderProcessorServiceConfigurationSettings.csproj",
 "{B28867CC-DD77-4F17-BA01-92625C235F6C}"
-EndProject
 Global
        GlobalSection(SolutionConfigurationPlatforms) = preSolution
                Debug|.NET = Debug|.NET
@@ -109,16 +90,6 @@
                {A4759510-6CE9-4692-B348-B8483BCD1447}.Release|Any CPU.Build.0 
= Release|Any CPU
                {A4759510-6CE9-4692-B348-B8483BCD1447}.Release|Mixed 
Platforms.ActiveCfg = Release|Any CPU
                {A4759510-6CE9-4692-B348-B8483BCD1447}.Release|Mixed 
Platforms.Build.0 = Release|Any CPU
-               {ED14B721-A6F1-4B65-89FA-18B78345CB5A}.Debug|.NET.ActiveCfg = 
Debug|Any CPU
-               {ED14B721-A6F1-4B65-89FA-18B78345CB5A}.Debug|Any CPU.ActiveCfg 
= Debug|Any CPU
-               {ED14B721-A6F1-4B65-89FA-18B78345CB5A}.Debug|Any CPU.Build.0 = 
Debug|Any CPU
-               {ED14B721-A6F1-4B65-89FA-18B78345CB5A}.Debug|Mixed 
Platforms.ActiveCfg = Debug|Any CPU
-               {ED14B721-A6F1-4B65-89FA-18B78345CB5A}.Debug|Mixed 
Platforms.Build.0 = Debug|Any CPU
-               {ED14B721-A6F1-4B65-89FA-18B78345CB5A}.Release|.NET.ActiveCfg = 
Release|Any CPU
-               {ED14B721-A6F1-4B65-89FA-18B78345CB5A}.Release|Any 
CPU.ActiveCfg = Release|Any CPU
-               {ED14B721-A6F1-4B65-89FA-18B78345CB5A}.Release|Any CPU.Build.0 
= Release|Any CPU
-               {ED14B721-A6F1-4B65-89FA-18B78345CB5A}.Release|Mixed 
Platforms.ActiveCfg = Release|Any CPU
-               {ED14B721-A6F1-4B65-89FA-18B78345CB5A}.Release|Mixed 
Platforms.Build.0 = Release|Any CPU
                {36FA3564-9AF5-496A-805B-6ED262CAAE2B}.Debug|.NET.ActiveCfg = 
Debug|Any CPU
                {36FA3564-9AF5-496A-805B-6ED262CAAE2B}.Debug|Any CPU.ActiveCfg 
= Debug|Any CPU
                {36FA3564-9AF5-496A-805B-6ED262CAAE2B}.Debug|Any CPU.Build.0 = 
Debug|Any CPU
@@ -139,26 +110,6 @@
                {EBB1604B-3F50-4A81-87C3-1AE4029EEEC6}.Release|Any CPU.Build.0 
= Release|Any CPU
                {EBB1604B-3F50-4A81-87C3-1AE4029EEEC6}.Release|Mixed 
Platforms.ActiveCfg = Release|Any CPU
                {EBB1604B-3F50-4A81-87C3-1AE4029EEEC6}.Release|Mixed 
Platforms.Build.0 = Release|Any CPU
-               {018CF591-E45C-4E74-B613-CA5C1FCAFE89}.Debug|.NET.ActiveCfg = 
Debug|Any CPU
-               {018CF591-E45C-4E74-B613-CA5C1FCAFE89}.Debug|Any CPU.ActiveCfg 
= Debug|Any CPU
-               {018CF591-E45C-4E74-B613-CA5C1FCAFE89}.Debug|Any CPU.Build.0 = 
Debug|Any CPU
-               {018CF591-E45C-4E74-B613-CA5C1FCAFE89}.Debug|Mixed 
Platforms.ActiveCfg = Debug|Any CPU
-               {018CF591-E45C-4E74-B613-CA5C1FCAFE89}.Debug|Mixed 
Platforms.Build.0 = Debug|Any CPU
-               {018CF591-E45C-4E74-B613-CA5C1FCAFE89}.Release|.NET.ActiveCfg = 
Release|Any CPU
-               {018CF591-E45C-4E74-B613-CA5C1FCAFE89}.Release|Any 
CPU.ActiveCfg = Release|Any CPU
-               {018CF591-E45C-4E74-B613-CA5C1FCAFE89}.Release|Any CPU.Build.0 
= Release|Any CPU
-               {018CF591-E45C-4E74-B613-CA5C1FCAFE89}.Release|Mixed 
Platforms.ActiveCfg = Release|Any CPU
-               {018CF591-E45C-4E74-B613-CA5C1FCAFE89}.Release|Mixed 
Platforms.Build.0 = Release|Any CPU
-               {623BC346-84FA-4B9E-B043-811DB7FBEC2A}.Debug|.NET.ActiveCfg = 
Debug|Any CPU
-               {623BC346-84FA-4B9E-B043-811DB7FBEC2A}.Debug|Any CPU.ActiveCfg 
= Debug|Any CPU
-               {623BC346-84FA-4B9E-B043-811DB7FBEC2A}.Debug|Any CPU.Build.0 = 
Debug|Any CPU
-               {623BC346-84FA-4B9E-B043-811DB7FBEC2A}.Debug|Mixed 
Platforms.ActiveCfg = Debug|Any CPU
-               {623BC346-84FA-4B9E-B043-811DB7FBEC2A}.Debug|Mixed 
Platforms.Build.0 = Debug|Any CPU
-               {623BC346-84FA-4B9E-B043-811DB7FBEC2A}.Release|.NET.ActiveCfg = 
Release|Any CPU
-               {623BC346-84FA-4B9E-B043-811DB7FBEC2A}.Release|Any 
CPU.ActiveCfg = Release|Any CPU
-               {623BC346-84FA-4B9E-B043-811DB7FBEC2A}.Release|Any CPU.Build.0 
= Release|Any CPU
-               {623BC346-84FA-4B9E-B043-811DB7FBEC2A}.Release|Mixed 
Platforms.ActiveCfg = Release|Any CPU
-               {623BC346-84FA-4B9E-B043-811DB7FBEC2A}.Release|Mixed 
Platforms.Build.0 = Release|Any CPU
                {382E6E1C-E430-4F6C-BC41-5D84A3798B02}.Debug|.NET.ActiveCfg = 
Debug|Any CPU
                {382E6E1C-E430-4F6C-BC41-5D84A3798B02}.Debug|Any CPU.ActiveCfg 
= Debug|Any CPU
                {382E6E1C-E430-4F6C-BC41-5D84A3798B02}.Debug|Any CPU.Build.0 = 
Debug|Any CPU
@@ -179,52 +130,8 @@
                {D8E1ECD5-2D86-4994-A37B-BF4D24334A2E}.Release|Any CPU.Build.0 
= Release|Any CPU
                {D8E1ECD5-2D86-4994-A37B-BF4D24334A2E}.Release|Mixed 
Platforms.ActiveCfg = Release|Any CPU
                {D8E1ECD5-2D86-4994-A37B-BF4D24334A2E}.Release|Mixed 
Platforms.Build.0 = Release|Any CPU
-               {1AD6DBB4-CA83-460F-BDCD-45E1ECE318B4}.Debug|.NET.ActiveCfg = 
Debug|Any CPU
-               {1AD6DBB4-CA83-460F-BDCD-45E1ECE318B4}.Debug|Any CPU.ActiveCfg 
= Debug|Any CPU
-               {1AD6DBB4-CA83-460F-BDCD-45E1ECE318B4}.Debug|Any CPU.Build.0 = 
Debug|Any CPU
-               {1AD6DBB4-CA83-460F-BDCD-45E1ECE318B4}.Debug|Mixed 
Platforms.ActiveCfg = Debug|Any CPU
-               {1AD6DBB4-CA83-460F-BDCD-45E1ECE318B4}.Debug|Mixed 
Platforms.Build.0 = Debug|Any CPU
-               {1AD6DBB4-CA83-460F-BDCD-45E1ECE318B4}.Release|.NET.ActiveCfg = 
Release|Any CPU
-               {1AD6DBB4-CA83-460F-BDCD-45E1ECE318B4}.Release|Any 
CPU.ActiveCfg = Release|Any CPU
-               {1AD6DBB4-CA83-460F-BDCD-45E1ECE318B4}.Release|Any CPU.Build.0 
= Release|Any CPU
-               {1AD6DBB4-CA83-460F-BDCD-45E1ECE318B4}.Release|Mixed 
Platforms.ActiveCfg = Release|Any CPU
-               {1AD6DBB4-CA83-460F-BDCD-45E1ECE318B4}.Release|Mixed 
Platforms.Build.0 = Release|Any CPU
-               {F67C8D85-6DC0-45CD-A748-636E3881E2F5}.Debug|.NET.ActiveCfg = 
Debug|Any CPU
-               {F67C8D85-6DC0-45CD-A748-636E3881E2F5}.Debug|Any CPU.ActiveCfg 
= Debug|Any CPU
-               {F67C8D85-6DC0-45CD-A748-636E3881E2F5}.Debug|Any CPU.Build.0 = 
Debug|Any CPU
-               {F67C8D85-6DC0-45CD-A748-636E3881E2F5}.Debug|Mixed 
Platforms.ActiveCfg = Debug|Any CPU
-               {F67C8D85-6DC0-45CD-A748-636E3881E2F5}.Debug|Mixed 
Platforms.Build.0 = Debug|Any CPU
-               {F67C8D85-6DC0-45CD-A748-636E3881E2F5}.Release|.NET.ActiveCfg = 
Release|Any CPU
-               {F67C8D85-6DC0-45CD-A748-636E3881E2F5}.Release|Any 
CPU.ActiveCfg = Release|Any CPU
-               {F67C8D85-6DC0-45CD-A748-636E3881E2F5}.Release|Any CPU.Build.0 
= Release|Any CPU
-               {F67C8D85-6DC0-45CD-A748-636E3881E2F5}.Release|Mixed 
Platforms.ActiveCfg = Release|Any CPU
-               {F67C8D85-6DC0-45CD-A748-636E3881E2F5}.Release|Mixed 
Platforms.Build.0 = Release|Any CPU
-               {509EB16A-6586-4200-8323-32438C9B47DC}.Debug|.NET.ActiveCfg = 
Debug|Any CPU
-               {509EB16A-6586-4200-8323-32438C9B47DC}.Debug|Any CPU.ActiveCfg 
= Debug|Any CPU
-               {509EB16A-6586-4200-8323-32438C9B47DC}.Debug|Any CPU.Build.0 = 
Debug|Any CPU
-               {509EB16A-6586-4200-8323-32438C9B47DC}.Debug|Mixed 
Platforms.ActiveCfg = Debug|Any CPU
-               {509EB16A-6586-4200-8323-32438C9B47DC}.Debug|Mixed 
Platforms.Build.0 = Debug|Any CPU
-               {509EB16A-6586-4200-8323-32438C9B47DC}.Release|.NET.ActiveCfg = 
Release|Any CPU
-               {509EB16A-6586-4200-8323-32438C9B47DC}.Release|Any 
CPU.ActiveCfg = Release|Any CPU
-               {509EB16A-6586-4200-8323-32438C9B47DC}.Release|Any CPU.Build.0 
= Release|Any CPU
-               {509EB16A-6586-4200-8323-32438C9B47DC}.Release|Mixed 
Platforms.ActiveCfg = Release|Any CPU
-               {509EB16A-6586-4200-8323-32438C9B47DC}.Release|Mixed 
Platforms.Build.0 = Release|Any CPU
-               {B28867CC-DD77-4F17-BA01-92625C235F6C}.Debug|.NET.ActiveCfg = 
Debug|Any CPU
-               {B28867CC-DD77-4F17-BA01-92625C235F6C}.Debug|Any CPU.ActiveCfg 
= Debug|Any CPU
-               {B28867CC-DD77-4F17-BA01-92625C235F6C}.Debug|Any CPU.Build.0 = 
Debug|Any CPU
-               {B28867CC-DD77-4F17-BA01-92625C235F6C}.Debug|Mixed 
Platforms.ActiveCfg = Debug|Any CPU
-               {B28867CC-DD77-4F17-BA01-92625C235F6C}.Debug|Mixed 
Platforms.Build.0 = Debug|Any CPU
-               {B28867CC-DD77-4F17-BA01-92625C235F6C}.Release|.NET.ActiveCfg = 
Release|Any CPU
-               {B28867CC-DD77-4F17-BA01-92625C235F6C}.Release|Any 
CPU.ActiveCfg = Release|Any CPU
-               {B28867CC-DD77-4F17-BA01-92625C235F6C}.Release|Any CPU.Build.0 
= Release|Any CPU
-               {B28867CC-DD77-4F17-BA01-92625C235F6C}.Release|Mixed 
Platforms.ActiveCfg = Release|Any CPU
-               {B28867CC-DD77-4F17-BA01-92625C235F6C}.Release|Mixed 
Platforms.Build.0 = Release|Any CPU
        EndGlobalSection
        GlobalSection(SolutionProperties) = preSolution
                HideSolutionNode = FALSE
        EndGlobalSection
-       GlobalSection(SubversionScc) = preSolution
-               Svn-Managed = True
-               Manager = AnkhSVN - Subversion Support for Visual Studio
-       EndGlobalSection
 EndGlobal

Modified: 
incubator/stonehenge/trunk/stocktrader/dotnet/trader_client/StockTraderWebApplicationClients/BSLClient.cs
URL: 
http://svn.apache.org/viewvc/incubator/stonehenge/trunk/stocktrader/dotnet/trader_client/StockTraderWebApplicationClients/BSLClient.cs?rev=784314&r1=784313&r2=784314&view=diff
==============================================================================
--- 
incubator/stonehenge/trunk/stocktrader/dotnet/trader_client/StockTraderWebApplicationClients/BSLClient.cs
 (original)
+++ 
incubator/stonehenge/trunk/stocktrader/dotnet/trader_client/StockTraderWebApplicationClients/BSLClient.cs
 Fri Jun 12 23:36:00 2009
@@ -29,7 +29,6 @@
 using System.Web;
 using Trade.StockTraderWebApplicationSettings;
 using Trade.StockTraderWebApplicationModelClasses;
-using Trade.BusinessServiceImplementation;
 using Trade.BusinessServiceDataContract;
 using Trade.BusinessServiceContract;
 using Trade.Utility;
@@ -37,44 +36,28 @@
 namespace Trade.StockTraderWebApplicationServiceClient
 {
     /// <summary>
-    /// This is the business services client class that is called from 
StockTrader Web pages. It will actually
-    /// call into our WCF BusinessServiceClient class, if configured for 
remote activation.  
+    /// This is the business services client class that is called from 
StockTrader Web pages. 
     /// </summary>
     public class BSLClient 
     {
 
-        ITradeServices BSL;
+        private readonly ITradeServices BSL;
 
         /// <summary>
-        /// Depending on AccessMode, this constructor returns an instance of 
our WCF client class, or
-        /// a direct instance of our TradeServices implementation class.  
+        /// Creating an Instance of BSLClient initializes the WCF Business 
Service from Config
         /// </summary>
         public BSLClient()
         {
-            switch (Settings.interfaceMode)
-            {
-                //In-process activation---instantiate BSL directly, no need 
for client interface.
-                case StockTraderUtility.ACCESS_Direct: 
-                    { 
-                        BSL = new TradeService();
-                        break;
-                    }
-
-                //Remote activation.
-                //Note the same WCF client is used regardless of the 
-                //specific webservice implementation platform.  For 
StockTrader, our client
-                //interface for SOA modes is always the same:  
BusinessServiceClient.
-                //We differentiate WebSphere only becuase StockTrader has some 
additional UI and
-                //backend service functionality not provided by J2EE/Trade 
6.1, and we need to detect
-                //in just a couple of places in the Web app so we do not make 
method calls to an 
-                //implementation that has not implemented those methods. But 
as you see here, the 
-                //WCF client is always the same regardless.
-                default: 
-                        {
-                            BSL = new BusinessServiceClient();
-                            break;
-                        }
-            }
+            //Remote activation.
+            //Note the same WCF client is used regardless of the 
+            //specific webservice implementation platform.  For StockTrader, 
our client
+            //interface for SOA modes is always the same:  
BusinessServiceClient.
+            //We differentiate WebSphere only becuase StockTrader has some 
additional UI and
+            //backend service functionality not provided by J2EE/Trade 6.1, 
and we need to detect
+            //in just a couple of places in the Web app so we do not make 
method calls to an 
+            //implementation that has not implemented those methods. But as 
you see here, the 
+            //WCF client is always the same regardless.
+            BSL = new BusinessServiceClient();
             
         }
 

Modified: 
incubator/stonehenge/trunk/stocktrader/dotnet/trader_client/StockTraderWebApplicationClients/StockTraderWebApplicationServiceClient.csproj
URL: 
http://svn.apache.org/viewvc/incubator/stonehenge/trunk/stocktrader/dotnet/trader_client/StockTraderWebApplicationClients/StockTraderWebApplicationServiceClient.csproj?rev=784314&r1=784313&r2=784314&view=diff
==============================================================================
--- 
incubator/stonehenge/trunk/stocktrader/dotnet/trader_client/StockTraderWebApplicationClients/StockTraderWebApplicationServiceClient.csproj
 (original)
+++ 
incubator/stonehenge/trunk/stocktrader/dotnet/trader_client/StockTraderWebApplicationClients/StockTraderWebApplicationServiceClient.csproj
 Fri Jun 12 23:36:00 2009
@@ -94,10 +94,6 @@
       <Project>{EBB1604B-3F50-4A81-87C3-1AE4029EEEC6}</Project>
       <Name>BusinessServiceDataContract</Name>
     </ProjectReference>
-    <ProjectReference 
Include="..\..\business_service\BusinessServiceImplementation\BusinessServiceImplementation.csproj">
-      <Project>{018CF591-E45C-4E74-B613-CA5C1FCAFE89}</Project>
-      <Name>BusinessServiceImplementation</Name>
-    </ProjectReference>
     <ProjectReference Include="..\..\common\BasicClient\BasicClient.csproj">
       <Project>{A4759510-6CE9-4692-B348-B8483BCD1447}</Project>
       <Name>BasicClient</Name>

Modified: 
incubator/stonehenge/trunk/stocktrader/dotnet/trader_client/Trade/Global.asax
URL: 
http://svn.apache.org/viewvc/incubator/stonehenge/trunk/stocktrader/dotnet/trader_client/Trade/Global.asax?rev=784314&r1=784313&r2=784314&view=diff
==============================================================================
--- 
incubator/stonehenge/trunk/stocktrader/dotnet/trader_client/Trade/Global.asax 
(original)
+++ 
incubator/stonehenge/trunk/stocktrader/dotnet/trader_client/Trade/Global.asax 
Fri Jun 12 23:36:00 2009
@@ -16,8 +16,6 @@
   limitations under the License.
 --%>
 <%@ Import Namespace = "Trade.StockTraderWebApplicationSettings" %>
-<%@ Import Namespace = "Trade.BusinessServiceConfigurationSettings" %>
-<%@ Import Namespace = "Trade.OrderProcessorServiceConfigurationSettings" %>
 <%@ Import Namespace = "Trade.Utility" %>
 
 <script runat="server">
@@ -25,9 +23,6 @@
     void Application_Start(object sender, EventArgs e) 
     {
         Trade.StockTraderWebApplicationSettings.Settings settings = new 
Trade.StockTraderWebApplicationSettings.Settings();
-        //This will initialize Business Service settings in case we are 
running with ACCESS_MODE=InProcess
-        Trade.BusinessServiceConfigurationSettings.Settings thisSettings = new 
Trade.BusinessServiceConfigurationSettings.Settings();
-        Trade.OrderProcessorServiceConfigurationSettings.Settings 
thisOPSSettings = new 
Trade.OrderProcessorServiceConfigurationSettings.Settings();
     }
 
     void Application_End(object sender, EventArgs e)

Modified: 
incubator/stonehenge/trunk/stocktrader/dotnet/trader_client/Trade/Web.config
URL: 
http://svn.apache.org/viewvc/incubator/stonehenge/trunk/stocktrader/dotnet/trader_client/Trade/Web.config?rev=784314&r1=784313&r2=784314&view=diff
==============================================================================
--- 
incubator/stonehenge/trunk/stocktrader/dotnet/trader_client/Trade/Web.config 
(original)
+++ 
incubator/stonehenge/trunk/stocktrader/dotnet/trader_client/Trade/Web.config 
Fri Jun 12 23:36:00 2009
@@ -31,7 +31,6 @@
     <add key="ACCESS_MODE" value="DotNet_Http_WcfService"/>
     <!-- 
         //Valid Config Values for user-set "AccessMode" config setting. 
-        public const string ACCESS_STRING_InProcess = "InProcess";
         public const string ACCESS_STRING_DotNet_Http_WcfService = 
"DotNet_Http_WcfService";
         public const string ACCESS_STRING_DotNet_WsHttp_WcfService = 
"DotNet_WsHttp_WcfService";
         public const string ACCESS_STRING_PHP_Http_WebService = 
"PHP_Http_WebService";
@@ -49,28 +48,6 @@
     <add key="BSL_WSAS_ENDPOINT_CONFIG_HTTP" 
value="BsClient_WSAS_BasicHttpBinding"/>
     <add key="BSL_USERID" value="bsloperationuser"/>
     <add key="BSL_PASSWORD" value="yyy"/>
-
-    <!-- This is duplicated from Business Service to support 
ACCESS_MODE=InProcess-->
-    <add key="ORDER_PROCESSING_MODE" value="Sync_InProcess"/>
-
-    <add key="BSL_VALID_USERID" value="bsloperationuser"/>
-    <add key="BSL__VALID_PASSWORD" value="yyy"/>
-    <add key="DBServer" value="localhost"/>
-    <add key="Database" value="StockTraderDB"/>
-    <add key="UserID" value="trade"/>
-    <add key="Password" value="yyy"/>
-    <add key="MinDBConnections" value="20"/>
-    <add key="MaxDBConnections" value="20"/>
-    <add key="DAL" value="Trade.DALSQLServer"/>
-    <add key="ENABLE_GLOBAL_SYSTEM_DOT_TRANSACTIONS_CONFIGSTRING" 
value="true"/>
-    <add key="SYSTEMDOTTRANSACTION_TIMEOUT" value="0"/>
-    <add key="MAX_QUERY_ORDERS" value="10"/>
-    <add key="MAX_QUERY_TOP_ORDERS" value="10"/>
-    <add key="DISPLAY_WEBSERVICE_LOGINS" value="true"/>
-    <add key="LOGIN_ITERATIONSTO_DISPLAY" value="5"/>
-    <!--Can't be ZERO-->
-    <add key="DISPLAYNUMBERORDERITERATIONS" value="3"/>
-    <!--Can't be ZERO-->
   </appSettings>
   <runtime>
     <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">


Reply via email to