From stonehenge-commits-return-410-apmail-incubator-stonehenge-commits-archive=incubator.apache.org@incubator.apache.org Thu Jul 09 03:38:21 2009 Return-Path: Delivered-To: apmail-incubator-stonehenge-commits-archive@minotaur.apache.org Received: (qmail 16789 invoked from network); 9 Jul 2009 03:38:21 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.3) by minotaur.apache.org with SMTP; 9 Jul 2009 03:38:21 -0000 Received: (qmail 6656 invoked by uid 500); 9 Jul 2009 03:38:31 -0000 Delivered-To: apmail-incubator-stonehenge-commits-archive@incubator.apache.org Received: (qmail 6570 invoked by uid 500); 9 Jul 2009 03:38:30 -0000 Mailing-List: contact stonehenge-commits-help@incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: stonehenge-dev@incubator.apache.org Delivered-To: mailing list stonehenge-commits@incubator.apache.org Received: (qmail 6551 invoked by uid 99); 9 Jul 2009 03:38:29 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 09 Jul 2009 03:38:29 +0000 X-ASF-Spam-Status: No, hits=-1998.5 required=10.0 tests=ALL_TRUSTED,WEIRD_PORT X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 09 Jul 2009 03:38:21 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id BD3302388896; Thu, 9 Jul 2009 03:38:01 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: svn commit: r792384 [1/4] - in /incubator/stonehenge/trunk/stocktrader/dotnet: ./ business_service/ business_service/BusinessServiceConfigurationSettings/ business_service/BusinessServiceConsole/ business_service/BusinessServiceImplementation/ business... Date: Thu, 09 Jul 2009 03:37:58 -0000 To: stonehenge-commits@incubator.apache.org From: bendewey@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20090709033801.BD3302388896@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: bendewey Date: Thu Jul 9 03:37:55 2009 New Revision: 792384 URL: http://svn.apache.org/viewvc?rev=792384&view=rev Log: STONEHENGE-67 commit for Avantika, thanks Drew for testing. Great work Avantika, this is a huge patch and I the new UI is great. This will drastically improve the interop demo. Please note developers with existing setups will need to run the new DB Scripts. Added: incubator/stonehenge/trunk/stocktrader/dotnet/common/ConfigClient/ incubator/stonehenge/trunk/stocktrader/dotnet/common/ConfigClient/ConfigClient.cs incubator/stonehenge/trunk/stocktrader/dotnet/common/ConfigClient/ConfigClient.csproj incubator/stonehenge/trunk/stocktrader/dotnet/common/ConfigClient/Properties/ incubator/stonehenge/trunk/stocktrader/dotnet/common/ConfigClient/Properties/AssemblyInfo.cs incubator/stonehenge/trunk/stocktrader/dotnet/common/ConfigClient/stocktrader.snk (with props) incubator/stonehenge/trunk/stocktrader/dotnet/common/DALFactory/Config.cs incubator/stonehenge/trunk/stocktrader/dotnet/common/DALSQLServer/Config.cs incubator/stonehenge/trunk/stocktrader/dotnet/common/IDAL/IConfig.cs incubator/stonehenge/trunk/stocktrader/dotnet/config_service/ incubator/stonehenge/trunk/stocktrader/dotnet/config_service/ConfigServiceConfigurationSettings/ incubator/stonehenge/trunk/stocktrader/dotnet/config_service/ConfigServiceConfigurationSettings/ConfigServiceConfigurationSettings.csproj incubator/stonehenge/trunk/stocktrader/dotnet/config_service/ConfigServiceConfigurationSettings/ConfigServiceConfigurationSettings.sln incubator/stonehenge/trunk/stocktrader/dotnet/config_service/ConfigServiceConfigurationSettings/Properties/ incubator/stonehenge/trunk/stocktrader/dotnet/config_service/ConfigServiceConfigurationSettings/Properties/AssemblyInfo.cs incubator/stonehenge/trunk/stocktrader/dotnet/config_service/ConfigServiceConfigurationSettings/Settings.cs incubator/stonehenge/trunk/stocktrader/dotnet/config_service/ConfigServiceConfigurationSettings/stocktrader.snk (with props) incubator/stonehenge/trunk/stocktrader/dotnet/config_service/ConfigServiceConsoleHost/ incubator/stonehenge/trunk/stocktrader/dotnet/config_service/ConfigServiceConsoleHost/App.config incubator/stonehenge/trunk/stocktrader/dotnet/config_service/ConfigServiceConsoleHost/ConfigServiceConsoleHost.csproj incubator/stonehenge/trunk/stocktrader/dotnet/config_service/ConfigServiceConsoleHost/Program.cs incubator/stonehenge/trunk/stocktrader/dotnet/config_service/ConfigServiceConsoleHost/Properties/ incubator/stonehenge/trunk/stocktrader/dotnet/config_service/ConfigServiceConsoleHost/Properties/AssemblyInfo.cs incubator/stonehenge/trunk/stocktrader/dotnet/config_service/ConfigServiceConsoleHost/nettradericon.ico (with props) incubator/stonehenge/trunk/stocktrader/dotnet/config_service/ConfigServiceConsoleHost/stocktrader.snk (with props) incubator/stonehenge/trunk/stocktrader/dotnet/config_service/ConfigServiceContract/ incubator/stonehenge/trunk/stocktrader/dotnet/config_service/ConfigServiceContract/ConfigServiceContract.csproj incubator/stonehenge/trunk/stocktrader/dotnet/config_service/ConfigServiceContract/IConfigService.cs incubator/stonehenge/trunk/stocktrader/dotnet/config_service/ConfigServiceContract/Properties/ incubator/stonehenge/trunk/stocktrader/dotnet/config_service/ConfigServiceContract/Properties/AssemblyInfo.cs incubator/stonehenge/trunk/stocktrader/dotnet/config_service/ConfigServiceContract/stocktrader.snk (with props) incubator/stonehenge/trunk/stocktrader/dotnet/config_service/ConfigServiceDataContract/ incubator/stonehenge/trunk/stocktrader/dotnet/config_service/ConfigServiceDataContract/BSConfigRequest.cs incubator/stonehenge/trunk/stocktrader/dotnet/config_service/ConfigServiceDataContract/BSConfigResponse.cs incubator/stonehenge/trunk/stocktrader/dotnet/config_service/ConfigServiceDataContract/BSToOPS.cs incubator/stonehenge/trunk/stocktrader/dotnet/config_service/ConfigServiceDataContract/ClientConfigRequest.cs incubator/stonehenge/trunk/stocktrader/dotnet/config_service/ConfigServiceDataContract/ClientConfigResponse.cs incubator/stonehenge/trunk/stocktrader/dotnet/config_service/ConfigServiceDataContract/ClientToBS.cs incubator/stonehenge/trunk/stocktrader/dotnet/config_service/ConfigServiceDataContract/ConfigServiceDataContract.csproj incubator/stonehenge/trunk/stocktrader/dotnet/config_service/ConfigServiceDataContract/DBConfig.cs incubator/stonehenge/trunk/stocktrader/dotnet/config_service/ConfigServiceDataContract/OPSConfigRequest.cs incubator/stonehenge/trunk/stocktrader/dotnet/config_service/ConfigServiceDataContract/OPSConfigResponse.cs incubator/stonehenge/trunk/stocktrader/dotnet/config_service/ConfigServiceDataContract/Properties/ incubator/stonehenge/trunk/stocktrader/dotnet/config_service/ConfigServiceDataContract/Properties/AssemblyInfo.cs incubator/stonehenge/trunk/stocktrader/dotnet/config_service/ConfigServiceDataContract/ServiceLocation.cs incubator/stonehenge/trunk/stocktrader/dotnet/config_service/ConfigServiceDataContract/stocktrader.snk (with props) incubator/stonehenge/trunk/stocktrader/dotnet/config_service/ConfigServiceImplementation/ incubator/stonehenge/trunk/stocktrader/dotnet/config_service/ConfigServiceImplementation/ConfigService.cs incubator/stonehenge/trunk/stocktrader/dotnet/config_service/ConfigServiceImplementation/ConfigServiceImplementation.csproj incubator/stonehenge/trunk/stocktrader/dotnet/config_service/ConfigServiceImplementation/CustomCertValidator.cs incubator/stonehenge/trunk/stocktrader/dotnet/config_service/ConfigServiceImplementation/Properties/ incubator/stonehenge/trunk/stocktrader/dotnet/config_service/ConfigServiceImplementation/Properties/AssemblyInfo.cs incubator/stonehenge/trunk/stocktrader/dotnet/config_service/ConfigServiceImplementation/stocktrader.snk (with props) incubator/stonehenge/trunk/stocktrader/dotnet/config_service/ConfigServiceSolution.sln incubator/stonehenge/trunk/stocktrader/dotnet/setup_utilities/DataLoad/createdbconfig.sql incubator/stonehenge/trunk/stocktrader/dotnet/setup_utilities/DataLoad/insertdbconfig.sql incubator/stonehenge/trunk/stocktrader/dotnet/trader_client/Trade/Configuration.aspx incubator/stonehenge/trunk/stocktrader/dotnet/trader_client/Trade/Configuration.aspx.cs Modified: incubator/stonehenge/trunk/stocktrader/dotnet/BuildDotNet.cmd incubator/stonehenge/trunk/stocktrader/dotnet/RunServices.bat 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/BusinessServiceConsole/Program.cs incubator/stonehenge/trunk/stocktrader/dotnet/business_service/BusinessServiceImplementation/BusinessServiceImplementation.csproj incubator/stonehenge/trunk/stocktrader/dotnet/business_service/BusinessServiceImplementation/TradeService.cs incubator/stonehenge/trunk/stocktrader/dotnet/business_service/BusinessServiceSolution.sln incubator/stonehenge/trunk/stocktrader/dotnet/business_service/OrderProcessorASyncClient/OrderProcessorAsyncClient.cs incubator/stonehenge/trunk/stocktrader/dotnet/business_service/OrderProcessorASyncClient/OrderProcessorAsyncClient.csproj incubator/stonehenge/trunk/stocktrader/dotnet/common/BasicClient/BasicClient.cs incubator/stonehenge/trunk/stocktrader/dotnet/common/BasicClient/BasicClient.csproj incubator/stonehenge/trunk/stocktrader/dotnet/common/DALFactory/StockTraderDALFactory.csproj incubator/stonehenge/trunk/stocktrader/dotnet/common/DALSQLServer/StockTraderDALSQLServer.csproj incubator/stonehenge/trunk/stocktrader/dotnet/common/IDAL/StockTraderIDAL.csproj incubator/stonehenge/trunk/stocktrader/dotnet/common/OrderProcessorServiceConfigurationSettings/OrderProcessorServiceConfigurationSettings.csproj incubator/stonehenge/trunk/stocktrader/dotnet/common/OrderProcessorServiceConfigurationSettings/Settings.cs incubator/stonehenge/trunk/stocktrader/dotnet/common/ServiceConfigurationSettings/Settings.cs incubator/stonehenge/trunk/stocktrader/dotnet/common/ServiceConfigurationSettings/StockTraderWebApplicationSettings.csproj incubator/stonehenge/trunk/stocktrader/dotnet/common/StockTraderUtility/SQLHelper.cs incubator/stonehenge/trunk/stocktrader/dotnet/common/StockTraderUtility/Utility.cs incubator/stonehenge/trunk/stocktrader/dotnet/order_processor/OrderProcessorConsoleServiceHost/App.config incubator/stonehenge/trunk/stocktrader/dotnet/order_processor/OrderProcessorConsoleServiceHost/OrderProcessorConsoleHost.csproj incubator/stonehenge/trunk/stocktrader/dotnet/order_processor/OrderProcessorImplementation/OrderProcessorImplementation.csproj incubator/stonehenge/trunk/stocktrader/dotnet/order_processor/OrderProcessorImplementation/ProcessOrder.cs incubator/stonehenge/trunk/stocktrader/dotnet/order_processor/OrderProcessorSolution.sln incubator/stonehenge/trunk/stocktrader/dotnet/setup_utilities/SetupActions/SetupAction.cs incubator/stonehenge/trunk/stocktrader/dotnet/trader_client/StockTraderWebAppSolution.sln incubator/stonehenge/trunk/stocktrader/dotnet/trader_client/StockTraderWebApplicationClients/BusinessServiceClient.cs incubator/stonehenge/trunk/stocktrader/dotnet/trader_client/StockTraderWebApplicationClients/StockTraderWebApplicationServiceClient.csproj incubator/stonehenge/trunk/stocktrader/dotnet/trader_client/Trade/Site.master incubator/stonehenge/trunk/stocktrader/dotnet/trader_client/Trade/Web.config incubator/stonehenge/trunk/stocktrader/dotnet/trader_client/Trade/style.css Modified: incubator/stonehenge/trunk/stocktrader/dotnet/BuildDotNet.cmd URL: http://svn.apache.org/viewvc/incubator/stonehenge/trunk/stocktrader/dotnet/BuildDotNet.cmd?rev=792384&r1=792383&r2=792384&view=diff ============================================================================== --- incubator/stonehenge/trunk/stocktrader/dotnet/BuildDotNet.cmd (original) +++ incubator/stonehenge/trunk/stocktrader/dotnet/BuildDotNet.cmd Thu Jul 9 03:37:55 2009 @@ -43,14 +43,14 @@ "%MSBuildToolsPath%msbuild" SetupActions.sln /t:Build /p:Configuration=Debug;Platform="Any CPU" "%MSBuildToolsPath%msbuild" SetupActions.sln /t:Build /p:Configuration=release;Platform="Any CPU" -cd ..\..\order_processor -@if not exist OrderProcessorSolution.sln Goto :Error1 +cd ..\..\config_service +@if not exist ConfigServiceSolution.sln Goto :Error1 -@echo Build order_processor -"%MSBuildToolsPath%msbuild" OrderProcessorSolution.sln /t:Clean /p:Configuration=Debug -"%MSBuildToolsPath%msbuild" OrderProcessorSolution.sln /t:Clean /p:Configuration=release -"%MSBuildToolsPath%msbuild" OrderProcessorSolution.sln /t:Build /p:Configuration=Debug;Platform="Any CPU" -"%MSBuildToolsPath%msbuild" OrderProcessorSolution.sln /t:Build /p:Configuration=release;Platform="Any CPU" +@echo Build config_service +"%MSBuildToolsPath%msbuild" ConfigServiceSolution.sln /t:Clean /p:Configuration=Debug +"%MSBuildToolsPath%msbuild" ConfigServiceSolution.sln /t:Clean /p:Configuration=release +"%MSBuildToolsPath%msbuild" ConfigServiceSolution.sln /t:Build /p:Configuration=Debug;Platform="Any CPU" +"%MSBuildToolsPath%msbuild" ConfigServiceSolution.sln /t:Build /p:Configuration=release;Platform="Any CPU" cd ..\business_service @if not exist BusinessServiceSolution.sln Goto :Error1 @@ -61,6 +61,15 @@ "%MSBuildToolsPath%msbuild" BusinessServiceSolution.sln /t:Build /p:Configuration=Debug;Platform="Any CPU" "%MSBuildToolsPath%msbuild" BusinessServiceSolution.sln /t:Build /p:Configuration=release;Platform="Any CPU" +cd ..\order_processor +@if not exist OrderProcessorSolution.sln Goto :Error1 + +@echo Build order_processor +"%MSBuildToolsPath%msbuild" OrderProcessorSolution.sln /t:Clean /p:Configuration=Debug +"%MSBuildToolsPath%msbuild" OrderProcessorSolution.sln /t:Clean /p:Configuration=release +"%MSBuildToolsPath%msbuild" OrderProcessorSolution.sln /t:Build /p:Configuration=Debug;Platform="Any CPU" +"%MSBuildToolsPath%msbuild" OrderProcessorSolution.sln /t:Build /p:Configuration=release;Platform="Any CPU" + cd ..\trader_client @if not exist StockTraderWebAppSolution.sln Goto :Error1 @@ -79,6 +88,7 @@ @echo Are you missing required solutions/directories? Cannot find the solution files (.sln) @echo This build script expects to build from the [dotnet] dir @echo .\setup_utilities\SetupActions\ +@echo ..\config_service @echo ..\..\order_processor @echo ..\business_service @echo ..\trader_client\ Modified: incubator/stonehenge/trunk/stocktrader/dotnet/RunServices.bat URL: http://svn.apache.org/viewvc/incubator/stonehenge/trunk/stocktrader/dotnet/RunServices.bat?rev=792384&r1=792383&r2=792384&view=diff ============================================================================== --- incubator/stonehenge/trunk/stocktrader/dotnet/RunServices.bat (original) +++ incubator/stonehenge/trunk/stocktrader/dotnet/RunServices.bat Thu Jul 9 03:37:55 2009 @@ -30,6 +30,10 @@ choice /c:12 /n if errorlevel 2 SET runMode=release +:CsHost +IF NOT EXIST "%~dp0config_service\bin\%runMode%\Trade.ConfigServiceConsoleHost.exe" GOTO NoCsHost +START ".NET Configuration Service" "%~dp0config_service\bin\%runMode%\Trade.ConfigServiceConsoleHost.exe" + :OpsHost IF NOT EXIST "%~dp0order_processor\bin\%runMode%\Trade.orderProcessorConsoleHost.exe" GOTO NoOpsHost START ".NET Order Processing Service" "%~dp0order_processor\bin\%runMode%\Trade.orderProcessorConsoleHost.exe" @@ -39,6 +43,11 @@ START ".NET Business Service" "%~dp0business_service\bin\%runMode%\Trade.BusinessServiceConsole.exe" GOTO Complete +:NoCsHost +@echo No Configuration Service Host available in %runMode% +SET erroroccurred=1 +GOTO OpsHost + :NoOpsHost @echo No Order Processor Host available in %runMode% SET errorOccurred=1 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=792384&r1=792383&r2=792384&view=diff ============================================================================== --- incubator/stonehenge/trunk/stocktrader/dotnet/business_service/BusinessServiceConfigurationSettings/Settings.cs (original) +++ incubator/stonehenge/trunk/stocktrader/dotnet/business_service/BusinessServiceConfigurationSettings/Settings.cs Thu Jul 9 03:37:55 2009 @@ -75,13 +75,13 @@ // REPOSITORY CONFIGURATION KEYS TO MAP THE REPOSITORY SETTING TO A CUSTOM (APP-SPECIFIC) FIELD NAME IN THE SETTINGS CLASS, AS // WELL AS UPDATE SETTINGS ON LIVE CLUSTERED SYSTEMS WITHOUT APP RESTARTS. public static string EVENT_LOG; + public static string CS_DOTNET_ENDPOINT_CONFIG_HTTP; public static string OPS_DOTNET_ENDPOINT_CONFIG_HTTP; public static string OPS_DOTNET_ENDPOINT_CONFIG_WSHTTP; public static string OPS_PHP_ENDPOINT_CONFIG_HTTP; public static string OPS_PHP_ENDPOINT_CONFIG_WSHTTP; public static string OPS_WSAS_ENDPOINT_CONFIG_HTTP; public static string OPS_WSAS_ENDPOINT_CONFIG_WSHTTP; - public static string ORDER_PROCESSING_MODE; public static string DBServer; public static string Database; public static string UserID; @@ -111,21 +111,12 @@ //set on startup based on config settings from repository public static int TRANSACTION_MODEL = -1; - public static int orderMode = -1; public Settings() { - if (Settings.ORDER_PROCESSING_MODE != null) - { - ConfigurationManager.RefreshSection("appSettings"); - } - Settings.ORDER_PROCESSING_MODE = ConfigurationManager.AppSettings.Get("ORDER_PROCESSING_MODE"); + Settings.CS_DOTNET_ENDPOINT_CONFIG_HTTP = ConfigurationManager.AppSettings.Get("CS_DOTNET_ENDPOINT_CONFIG_HTTP"); Settings.EVENT_LOG = ConfigurationManager.AppSettings.Get("EVENT_LOG"); - Settings.DBServer = ConfigurationManager.AppSettings.Get("DBServer"); - Settings.Database = ConfigurationManager.AppSettings.Get("Database"); - Settings.UserID = ConfigurationManager.AppSettings.Get("UserID"); - Settings.Password = ConfigurationManager.AppSettings.Get("Password"); Settings.MinDBConnections = Convert.ToInt32(ConfigurationManager.AppSettings.Get("MinDBConnections")); Settings.MaxDBConnections = Convert.ToInt32(ConfigurationManager.AppSettings.Get("MaxDBConnections")); Settings.TRADEDB_SQL_CONN_STRING = ConfigurationManager.AppSettings.Get("TRADEDB_SQL_CONN_STRING"); @@ -145,61 +136,10 @@ Settings.BSL_VALID_USERID = ConfigurationManager.AppSettings.Get("BSL_VALID_USERID"); Settings.BSL_VALID_PASSWORD = ConfigurationManager.AppSettings.Get("BSL_VALID_PASSWORD"); buildConnString(); - setOrderMode(); setTxModel(); } /// - /// Sets the selected OrderMode to an int constant. Faster for switch statements than parsing a string. - /// - public static void setOrderMode() - { - switch (ORDER_PROCESSING_MODE) - { - - case StockTraderUtility.ORDER_STRING_ASync_DotNet_Http: - { - orderMode = StockTraderUtility.ORDER_ASync_DotNet_Http; - break; - } - case StockTraderUtility.ORDER_STRING_ASync_DotNet_WsHttp_MSec: - { - orderMode = StockTraderUtility.ORDER_ASync_DotNet_WsHttp_MSec; - break; - } - - case StockTraderUtility.ORDER_STRING_ASync_PHP_Http: - { - orderMode = StockTraderUtility.ORDER_ASync_PHP_Http; - break; - } - - case StockTraderUtility.ORDER_STRING_ASync_PHP_WsHttp_MSec: - { - orderMode = StockTraderUtility.ORDER_ASync_PHP_WsHttp_MSec; - break; - } - - case StockTraderUtility.ORDER_STRING_ASync_WSAS_Http: - { - orderMode = StockTraderUtility.ORDER_ASync_WSAS_Http; - break; - } - - case StockTraderUtility.ORDER_STRING_ASync_WSAS_WsHttp_MSec: - { - orderMode = StockTraderUtility.ORDER_ASync_WSAS_WsHttp_MSec; - break; - } - default: - { - throw new Exception(ORDER_PROCESSING_MODE + ": " + StockTraderUtility.EXCEPTION_MESSAGE_INVALID_ORDERMODE_CONFIG); - } - } - return; - } - - /// /// Sets the selected transaction model to use to an int constant. /// public static void setTxModel() 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=792384&r1=792383&r2=792384&view=diff ============================================================================== --- incubator/stonehenge/trunk/stocktrader/dotnet/business_service/BusinessServiceConsole/App.config (original) +++ incubator/stonehenge/trunk/stocktrader/dotnet/business_service/BusinessServiceConsole/App.config Thu Jul 9 03:37:55 2009 @@ -28,23 +28,9 @@ - - - - - - @@ -57,6 +43,7 @@ + @@ -110,7 +97,13 @@ *********************************************************--> - + + + + - +