Modified: incubator/stonehenge/trunk/stocktrader/dotnet/common/StockTraderUtility/SQLHelper.cs URL: http://svn.apache.org/viewvc/incubator/stonehenge/trunk/stocktrader/dotnet/common/StockTraderUtility/SQLHelper.cs?rev=815924&r1=815923&r2=815924&view=diff ============================================================================== --- incubator/stonehenge/trunk/stocktrader/dotnet/common/StockTraderUtility/SQLHelper.cs (original) +++ incubator/stonehenge/trunk/stocktrader/dotnet/common/StockTraderUtility/SQLHelper.cs Wed Sep 16 18:46:07 2009 @@ -38,300 +38,6 @@ public abstract class SQLHelper { - // Hashtable to store cached parameters - private static Hashtable parmCache = Hashtable.Synchronized(new Hashtable()); - - - /// <summary> - /// Create and execute a command to return DataReader after binding to a single parameter. - /// </summary> - /// <param name="conn">Connection to execute against. If not open, it will be here.</param> - /// <param name="trans">ADO transaction. If null, will not be attached to the command</param> - /// <param name="cmdType">Type of ADO command; such as Text or Procedure</param> - /// <param name="cmdText">The actual SQL or the name of the Stored Procedure depending on command type</param> - /// <param name="singleParm">The single SqlParameter object to bind to the query.</param> - public static SqlDataReader ExecuteReaderSingleParm(SqlConnection conn, SqlTransaction trans, CommandType cmdType, string cmdText, SqlParameter singleParm) - { - SqlCommand cmd = new SqlCommand(); - if (conn.State != ConnectionState.Open) - conn.Open(); - cmd.Connection = conn; - if (trans != null) - cmd.Transaction = trans; - cmd.CommandText = cmdText; - cmd.Parameters.Add(singleParm); - SqlDataReader rdr = cmd.ExecuteReader(CommandBehavior.SingleResult); - return rdr; - } - - /// <summary> - /// Create and execute a command to return a single-row DataReader after binding to a single parameter. - /// </summary> - /// <param name="conn">Connection to execute against. If not open, it will be here.</param> - /// <param name="trans">ADO transaction. If null, will not be attached to the command</param> - /// <param name="cmdType">Type of ADO command; such as Text or Procedure</param> - /// <param name="cmdText">The actual SQL or the name of the Stored Procedure depending on command type</param> - /// <param name="singleParm">The single SqlParameter object to bind to the query.</param> - public static SqlDataReader ExecuteReaderSingleRowSingleParm(SqlConnection conn, SqlTransaction trans, CommandType cmdType, string cmdText, SqlParameter singleParm) - { - if (conn.State != ConnectionState.Open) - conn.Open(); - SqlCommand cmd = new SqlCommand(); - cmd.Connection = conn; - if (trans != null) - cmd.Transaction = trans; - cmd.CommandText = cmdText; - cmd.Parameters.Add(singleParm); - SqlDataReader rdr = cmd.ExecuteReader(CommandBehavior.SingleRow); - return rdr; - } - - /// <summary> - /// Create and execute a command to return a single-row DataReader after binding to multiple parameters. - /// </summary> - /// <param name="conn">Connection to execute against. If not open, it will be here.</param> - /// <param name="trans">ADO transaction. If null, will not be attached to the command</param> - /// <param name="cmdType">Type of ADO command; such as Text or Procedure</param> - /// <param name="cmdText">The actual SQL or the name of the Stored Procedure depending on command type</param> - /// <param name="cmdParms">An array of SqlParameter objects to bind to the query.</param> - public static SqlDataReader ExecuteReaderSingleRow(SqlConnection conn, SqlTransaction trans, CommandType cmdType, string cmdText, SqlParameter[] cmdParms) - { - if (conn.State != ConnectionState.Open) - conn.Open(); - SqlCommand cmd = new SqlCommand(); - cmd.Connection = conn; - if (trans != null) - cmd.Transaction = trans; - cmd.CommandText = cmdText; - PrepareCommand(cmd, cmdParms); - SqlDataReader rdr = cmd.ExecuteReader(CommandBehavior.SingleRow); - return rdr; - } - - /// <summary> - /// Create and execute a command to return a DataReader, no parameters used in the command. - /// </summary> - /// <param name="conn">Connection to execute against. If not open, it will be here.</param> - /// <param name="trans">ADO transaction. If null, will not be attached to the command</param> - /// <param name="cmdType">Type of ADO command; such as Text or Procedure</param> - /// <param name="cmdText">The actual SQL or the name of the Stored Procedure depending on command type</param> - public static SqlDataReader ExecuteReaderNoParm(SqlConnection conn, SqlTransaction trans, CommandType cmdType, string cmdText) - { - if (conn.State != ConnectionState.Open) - conn.Open(); - SqlCommand cmd = new SqlCommand(); - cmd.Connection = conn; - if (trans != null) - cmd.Transaction = trans; - cmd.CommandText = cmdText; - SqlDataReader rdr = cmd.ExecuteReader(CommandBehavior.SingleResult); - return rdr; - } - - /// <summary> - /// Create and execute a command to return a DataReader after binding to multiple parameters. - /// </summary> - /// <param name="conn">Connection to execute against. If not open, it will be here.</param> - /// <param name="trans">ADO transaction. If null, will not be attached to the command</param> - /// <param name="cmdType">Type of ADO command; such as Text or Procedure</param> - /// <param name="cmdText">The actual SQL or the name of the Stored Procedure depending on command type</param> - /// <param name="cmdParms">An array of SqlParameter objects to bind to the query.</param> - public static SqlDataReader ExecuteReader(SqlConnection conn, SqlTransaction trans, CommandType cmdType, string cmdText, params SqlParameter[] cmdParms) - { - if (conn.State != ConnectionState.Open) - conn.Open(); - SqlCommand cmd = new SqlCommand(); - cmd.Connection = conn; - if (trans != null) - cmd.Transaction = trans; - cmd.CommandText = cmdText; - PrepareCommand(cmd, cmdParms); - SqlDataReader rdr = cmd.ExecuteReader(CommandBehavior.SingleResult); - return rdr; - } - - /// <summary> - /// Create and execute a command to return a single scalar (int) value after binding to multiple parameters. - /// </summary> - /// <param name="conn">Connection to execute against. If not open, it will be here.</param> - /// <param name="trans">ADO transaction. If null, will not be attached to the command</param> - /// <param name="cmdType">Type of ADO command; such as Text or Procedure</param> - /// <param name="cmdText">The actual SQL or the name of the Stored Procedure depending on command type</param> - /// <param name="cmdParms">An array of SqlParameter objects to bind to the query.</param> - public static int ExecuteScalar(SqlConnection conn, SqlTransaction trans, CommandType cmdType, string cmdText, params SqlParameter[] cmdParms) - { - if (conn.State != ConnectionState.Open) - conn.Open(); - SqlCommand cmd = new SqlCommand(); - cmd.CommandText = cmdText; - cmd.Connection = conn; - if (trans != null) - cmd.Transaction = trans; - PrepareCommand(cmd, cmdParms); - int val = Convert.ToInt32(cmd.ExecuteScalar()); - return val; - } - - - /// <summary> - /// Create and execute a command to return a single scalar (int) value after binding to a single parameter. - /// </summary> - /// <param name="conn">Connection to execute against. If not open, it will be here.</param> - /// <param name="trans">ADO transaction. If null, will not be attached to the command</param> - /// <param name="cmdType">Type of ADO command; such as Text or Procedure</param> - /// <param name="cmdText">The actual SQL or the name of the Stored Procedure depending on command type</param> - /// <param name="singleParm">A SqlParameter object to bind to the query.</param> - public static int ExecuteScalarSingleParm(SqlConnection conn, SqlTransaction trans, CommandType cmdType, string cmdText, SqlParameter singleParm) - { - if (conn.State != ConnectionState.Open) - conn.Open(); - SqlCommand cmd = new SqlCommand(); - cmd.CommandText = cmdText; - cmd.Connection = conn; - if (trans != null) - cmd.Transaction = trans; - cmd.Parameters.Add(singleParm); - int val = Convert.ToInt32(cmd.ExecuteScalar()); - return val; - } - - /// <summary> - /// Create and execute a command to return a single scalar (int) value. No parameters will be bound to the command. - /// </summary> - /// <param name="conn">Connection to execute against. If not open, it will be here.</param> - /// <param name="trans">ADO transaction. If null, will not be attached to the command</param> - /// <param name="cmdType">Type of ADO command; such as Text or Procedure</param> - /// <param name="cmdText">The actual SQL or the name of the Stored Procedure depending on command type</param> - /// <param name="singleParm">A SqlParameter object to bind to the query.</param> - public static object ExecuteScalarNoParm(SqlConnection conn, SqlTransaction trans, CommandType cmdType, string cmdText) - { - if (conn.State != ConnectionState.Open) - conn.Open(); - SqlCommand cmd = new SqlCommand(); - cmd.CommandText = cmdText; - cmd.Connection = conn; - if (trans != null) - cmd.Transaction = trans; - object val = cmd.ExecuteScalar(); - return val; - } - - /// <summary> - /// Create and execute a command that returns no result set after binding to multiple parameters. - /// </summary> - /// <param name="conn">Connection to execute against. If not open, it will be here.</param> - /// <param name="trans">ADO transaction. If null, will not be attached to the command</param> - /// <param name="cmdType">Type of ADO command; such as Text or Procedure</param> - /// <param name="cmdText">The actual SQL or the name of the Stored Procedure depending on command type</param> - /// <param name="cmdParms">An array of SqlParameter objects to bind to the query.</param> - public static int ExecuteNonQuery(SqlConnection conn, SqlTransaction trans, CommandType cmdType, string cmdText, params SqlParameter[] cmdParms) - { - if (conn.State != ConnectionState.Open) - conn.Open(); - SqlCommand cmd = new SqlCommand(); - cmd.Connection = conn; - if (trans != null) - cmd.Transaction = trans; - cmd.CommandText = cmdText; - PrepareCommand(cmd, cmdParms); - int val = cmd.ExecuteNonQuery(); - return val; - } - - /// <summary> - /// Create and execute a command that returns no result set after binding to a single parameter. - /// </summary> - /// <param name="conn">Connection to execute against. If not open, it will be here.</param> - /// <param name="trans">ADO transaction. If null, will not be attached to the command</param> - /// <param name="cmdType">Type of ADO command; such as Text or Procedure</param> - /// <param name="cmdText">The actual SQL or the name of the Stored Procedure depending on command type</param> - /// <param name="singleParam">A SqlParameter object to bind to the query.</param> - public static int ExecuteNonQuerySingleParm(SqlConnection conn, SqlTransaction trans, CommandType cmdType, string cmdText, SqlParameter singleParam) - { - if (conn.State != ConnectionState.Open) - conn.Open(); - SqlCommand cmd = new SqlCommand(); - cmd.Connection = conn; - if (trans != null) - cmd.Transaction = trans; - cmd.CommandText = cmdText; - cmd.Parameters.Add(singleParam); - int val = cmd.ExecuteNonQuery(); - return val; - } - - /// <summary> - /// Create and execute a command that returns no result set after binding to a single parameter. - /// </summary> - /// <param name="conn">Connection to execute against. If not open, it will be here.</param> - /// <param name="trans">ADO transaction. If null, will not be attached to the command</param> - /// <param name="cmdType">Type of ADO command; such as Text or Procedure</param> - /// <param name="cmdText">The actual SQL or the name of the Stored Procedure depending on command type</param> - /// <param name="singleParam">A SqlParameter object to bind to the query.</param> - public static int ExecuteNonQueryNoParm(SqlConnection conn, SqlTransaction trans, CommandType cmdType, string cmdText) - { - if (conn.State != ConnectionState.Open) - conn.Open(); - SqlCommand cmd = new SqlCommand(); - cmd.Connection = conn; - if (trans != null) - cmd.Transaction = trans; - cmd.CommandText = cmdText; - int val = cmd.ExecuteNonQuery(); - return val; - } - - /// <summary> - /// add parameter array to the cache - /// </summary> - /// <param name="cacheKey">Key to the parameter cache</param> - /// <param name="cmdParms">an array of SqlParamters to be cached</param> - public static void CacheParameters(string cacheKey, params SqlParameter[] cmdParms) - { - parmCache[cacheKey] = cmdParms; - } - - /// <summary> - /// Retrieve cached parameters - /// </summary> - /// <param name="cacheKey">key used to lookup parameters</param> - /// <returns>Cached SqlParamters array</returns> - public static SqlParameter[] GetCacheParameters(string cacheKey) - { - SqlParameter[] cachedParms = (SqlParameter[])parmCache[cacheKey]; - - if (cachedParms == null) - return null; - - SqlParameter[] clonedParms = new SqlParameter[cachedParms.Length]; - - for (int i = 0, j = cachedParms.Length; i < j; i++) - clonedParms[i] = (SqlParameter)((ICloneable)cachedParms[i]).Clone(); - - return clonedParms; - } - - /// <summary> - /// Prepare a command for execution - /// </summary> - /// <param name="cmd">SqlCommand object</param> - /// <param name="conn">SqlConnection object</param> - /// <param name="trans">SqlTransaction object</param> - /// <param name="cmdType">Cmd type e.g. stored procedure or text</param> - /// <param name="cmdText">Command text, e.g. Select * from Products</param> - /// <param name="cmdParms">SqlParameters to use in the command</param> - private static void PrepareCommand(SqlCommand cmd, SqlParameter[] cmdParms) - { - if (cmdParms != null) - { - for (int i = 0; i < cmdParms.Length; i++) - { - SqlParameter parm = (SqlParameter)cmdParms[i]; - cmd.Parameters.Add(parm); - } - } - } - /// <summary> /// Prepares a SQL Server Connection String from the host IP address /// and the port @@ -345,15 +51,19 @@ { return string.Format("server={0}", host) + ";database=StockTraderDB" - + ";user id=trade;password=yyy"; + + ";user id=trade;password=yyy;"; + //+ string.Format("port={0}", port); } public static string GetAssemblyNameFromDBName(string DBName) { - if (DBName.Equals("MSSQL")) + if (DBName.Equals("MSSQL")) return "Trade.DALSQLServer"; - else - throw new Exception("Database name, "+ DBName+", not supported"); + else if (DBName.Equals("MySQL")) + return "Trade.DALMySQL"; + else + throw new Exception("Database name, " + DBName + ", not supported"); } } + } \ No newline at end of file
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=815924&r1=815923&r2=815924&view=diff ============================================================================== --- incubator/stonehenge/trunk/stocktrader/dotnet/common/StockTraderUtility/Utility.cs (original) +++ incubator/stonehenge/trunk/stocktrader/dotnet/common/StockTraderUtility/Utility.cs Wed Sep 16 18:46:07 2009 @@ -138,6 +138,7 @@ public static readonly string ORDER_STATUS_COMPLETED = "completed"; public const string DAL_SQLSERVER = "Trade.DALSQLServer"; + public const string DAL_MYSQL = "Trade.DALMySQL"; public const string DAL_ORACLE = "Trade.DALOracle"; public const string DAL_DB2 = "Trade.DALDB2"; Modified: incubator/stonehenge/trunk/stocktrader/dotnet/config_service/ConfigServiceConfigurationSettings/Settings.cs URL: http://svn.apache.org/viewvc/incubator/stonehenge/trunk/stocktrader/dotnet/config_service/ConfigServiceConfigurationSettings/Settings.cs?rev=815924&r1=815923&r2=815924&view=diff ============================================================================== --- incubator/stonehenge/trunk/stocktrader/dotnet/config_service/ConfigServiceConfigurationSettings/Settings.cs (original) +++ incubator/stonehenge/trunk/stocktrader/dotnet/config_service/ConfigServiceConfigurationSettings/Settings.cs Wed Sep 16 18:46:07 2009 @@ -102,17 +102,12 @@ break; } - case Trade.Utility.StockTraderUtility.DAL_ORACLE: + case Trade.Utility.StockTraderUtility.DAL_MYSQL: { - Settings.TRADEDB_SQL_CONN_STRING = "Data Source=" + Settings.Database + ";user id=" + Settings.UserID + ";password=" + Settings.Password + ";min pool size=" + Settings.MinDBConnections + ";max pool size=" + Settings.MaxDBConnections + ";enlist=dynamic;"; + Settings.TRADEDB_SQL_CONN_STRING = "server=" + Settings.DBServer + ";database=" + Settings.Database + ";user id=" + Settings.UserID + ";password=" + Settings.Password + ";pooling=false;"; break; } - case Trade.Utility.StockTraderUtility.DAL_DB2: - { - Settings.TRADEDB_SQL_CONN_STRING = "Network Transport Library=TCPIP;Network Address=" + Settings.DBServer + ";Initial Catalog=" + Settings.Database + ";Package Collection=" + Settings.Database + ";Default Schema=Schema;User ID=" + Settings.UserID + ";Password=" + Settings.Password + ";network port=50000;Units of Work=RUW; Connection Pooling=True;defer prepare=false;CCSID=37;PC Code Page=1252"; - break; - } } } Modified: incubator/stonehenge/trunk/stocktrader/dotnet/config_service/ConfigServiceConsoleHost/App.config URL: http://svn.apache.org/viewvc/incubator/stonehenge/trunk/stocktrader/dotnet/config_service/ConfigServiceConsoleHost/App.config?rev=815924&r1=815923&r2=815924&view=diff ============================================================================== --- incubator/stonehenge/trunk/stocktrader/dotnet/config_service/ConfigServiceConsoleHost/App.config (original) +++ incubator/stonehenge/trunk/stocktrader/dotnet/config_service/ConfigServiceConsoleHost/App.config Wed Sep 16 18:46:07 2009 @@ -32,6 +32,7 @@ <add key="MinDBConnections" value="20" /> <add key="MaxDBConnections" value="20" /> <add key="DAL" value="Trade.DALSQLServer" /> + <!--<add key="DAL" value="Trade.DALMySQL" />--> <add key="ClientSettingsProvider.ServiceUri" value="" /> <add key="CLIENT_LABEL" value="DOTNET_CLIENT"/> <add key="BS_LABEL" value="DOTNET_BS"/> Modified: incubator/stonehenge/trunk/stocktrader/dotnet/config_service/ConfigServiceConsoleHost/ConfigServiceConsoleHost.csproj URL: http://svn.apache.org/viewvc/incubator/stonehenge/trunk/stocktrader/dotnet/config_service/ConfigServiceConsoleHost/ConfigServiceConsoleHost.csproj?rev=815924&r1=815923&r2=815924&view=diff ============================================================================== --- incubator/stonehenge/trunk/stocktrader/dotnet/config_service/ConfigServiceConsoleHost/ConfigServiceConsoleHost.csproj (original) +++ incubator/stonehenge/trunk/stocktrader/dotnet/config_service/ConfigServiceConsoleHost/ConfigServiceConsoleHost.csproj Wed Sep 16 18:46:07 2009 @@ -67,6 +67,10 @@ <Project>{34C5AB90-E195-4BEE-A895-7AB1F81D552D}</Project> <Name>StockTraderDALSQLServer</Name> </ProjectReference> + <ProjectReference Include="..\..\common\StockTraderDALMySQL\StockTraderDALMySQL.csproj"> + <Project>{DD924D91-04C2-4EBB-AFB9-E96E305E1F07}</Project> + <Name>StockTraderDALMySQL</Name> + </ProjectReference> <ProjectReference Include="..\..\common\StockTraderUtility\Utility.csproj"> <Project>{382E6E1C-E430-4F6C-BC41-5D84A3798B02}</Project> <Name>Utility</Name> Modified: incubator/stonehenge/trunk/stocktrader/dotnet/config_service/ConfigServiceSolution.sln URL: http://svn.apache.org/viewvc/incubator/stonehenge/trunk/stocktrader/dotnet/config_service/ConfigServiceSolution.sln?rev=815924&r1=815923&r2=815924&view=diff ============================================================================== --- incubator/stonehenge/trunk/stocktrader/dotnet/config_service/ConfigServiceSolution.sln (original) +++ incubator/stonehenge/trunk/stocktrader/dotnet/config_service/ConfigServiceSolution.sln Wed Sep 16 18:46:07 2009 @@ -31,6 +31,8 @@ EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "StockTraderDAL", "StockTraderDAL", "{0C646E73-E3B4-45C2-9634-B6C92D3D48FB}" EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "StockTraderDALMySQL", "..\common\DALMySQL\StockTraderDALMySQL.csproj", "{DD924D91-04C2-4EBB-AFB9-E96E305E1F07}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -77,14 +79,19 @@ {EBB1604B-3F50-4A81-87C3-1AE4029EEEC6}.Debug|Any CPU.Build.0 = Debug|Any CPU {EBB1604B-3F50-4A81-87C3-1AE4029EEEC6}.Release|Any CPU.ActiveCfg = Release|Any CPU {EBB1604B-3F50-4A81-87C3-1AE4029EEEC6}.Release|Any CPU.Build.0 = Release|Any CPU + {DD924D91-04C2-4EBB-AFB9-E96E305E1F07}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {DD924D91-04C2-4EBB-AFB9-E96E305E1F07}.Debug|Any CPU.Build.0 = Debug|Any CPU + {DD924D91-04C2-4EBB-AFB9-E96E305E1F07}.Release|Any CPU.ActiveCfg = Release|Any CPU + {DD924D91-04C2-4EBB-AFB9-E96E305E1F07}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE EndGlobalSection GlobalSection(NestedProjects) = preSolution - {F67C8D85-6DC0-45CD-A748-636E3881E2F5} = {0C646E73-E3B4-45C2-9634-B6C92D3D48FB} - {509EB16A-6586-4200-8323-32438C9B47DC} = {0C646E73-E3B4-45C2-9634-B6C92D3D48FB} {34C5AB90-E195-4BEE-A895-7AB1F81D552D} = {0C646E73-E3B4-45C2-9634-B6C92D3D48FB} + {509EB16A-6586-4200-8323-32438C9B47DC} = {0C646E73-E3B4-45C2-9634-B6C92D3D48FB} {EBB1604B-3F50-4A81-87C3-1AE4029EEEC6} = {0C646E73-E3B4-45C2-9634-B6C92D3D48FB} + {F67C8D85-6DC0-45CD-A748-636E3881E2F5} = {0C646E73-E3B4-45C2-9634-B6C92D3D48FB} + {DD924D91-04C2-4EBB-AFB9-E96E305E1F07} = {0C646E73-E3B4-45C2-9634-B6C92D3D48FB} EndGlobalSection EndGlobal Modified: incubator/stonehenge/trunk/stocktrader/dotnet/order_processor/OrderProcessorConsoleServiceHost/App.config URL: http://svn.apache.org/viewvc/incubator/stonehenge/trunk/stocktrader/dotnet/order_processor/OrderProcessorConsoleServiceHost/App.config?rev=815924&r1=815923&r2=815924&view=diff ============================================================================== --- incubator/stonehenge/trunk/stocktrader/dotnet/order_processor/OrderProcessorConsoleServiceHost/App.config (original) +++ incubator/stonehenge/trunk/stocktrader/dotnet/order_processor/OrderProcessorConsoleServiceHost/App.config Wed Sep 16 18:46:07 2009 @@ -29,6 +29,7 @@ <add key="MinDBConnections" value="20" /> <add key="MaxDBConnections" value="20" /> <add key="DAL" value="Trade.DALSQLServer" /> + <!--<add key="DAL" value="Trade.DALMySQL" />--> <add key="ENABLE_GLOBAL_SYSTEM_DOT_TRANSACTIONS_CONFIGSTRING" value="true" /> <add key="SYSTEMDOTTRANSACTION_TIMEOUT" value="30" /> <add key="DISPLAYNUMBERORDERITERATIONS" value="3" /> Modified: incubator/stonehenge/trunk/stocktrader/dotnet/order_processor/OrderProcessorConsoleServiceHost/OrderProcessorConsoleHost.csproj URL: http://svn.apache.org/viewvc/incubator/stonehenge/trunk/stocktrader/dotnet/order_processor/OrderProcessorConsoleServiceHost/OrderProcessorConsoleHost.csproj?rev=815924&r1=815923&r2=815924&view=diff ============================================================================== --- incubator/stonehenge/trunk/stocktrader/dotnet/order_processor/OrderProcessorConsoleServiceHost/OrderProcessorConsoleHost.csproj (original) +++ incubator/stonehenge/trunk/stocktrader/dotnet/order_processor/OrderProcessorConsoleServiceHost/OrderProcessorConsoleHost.csproj Wed Sep 16 18:46:07 2009 @@ -89,6 +89,10 @@ <Project>{B28867CC-DD77-4F17-BA01-92625C235F6C}</Project> <Name>OrderProcessorServiceConfigurationSettings</Name> </ProjectReference> + <ProjectReference Include="..\..\common\StockTraderDALMySQL\StockTraderDALMySQL.csproj"> + <Project>{DD924D91-04C2-4EBB-AFB9-E96E305E1F07}</Project> + <Name>StockTraderDALMySQL</Name> + </ProjectReference> <ProjectReference Include="..\..\common\StockTraderUtility\Utility.csproj"> <Project>{382E6E1C-E430-4F6C-BC41-5D84A3798B02}</Project> <Name>Utility</Name> Modified: incubator/stonehenge/trunk/stocktrader/dotnet/order_processor/OrderProcessorSolution.sln URL: http://svn.apache.org/viewvc/incubator/stonehenge/trunk/stocktrader/dotnet/order_processor/OrderProcessorSolution.sln?rev=815924&r1=815923&r2=815924&view=diff ============================================================================== --- incubator/stonehenge/trunk/stocktrader/dotnet/order_processor/OrderProcessorSolution.sln (original) +++ incubator/stonehenge/trunk/stocktrader/dotnet/order_processor/OrderProcessorSolution.sln Wed Sep 16 18:46:07 2009 @@ -38,6 +38,8 @@ EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ConfigServiceDataContract", "..\config_service\ConfigServiceDataContract\ConfigServiceDataContract.csproj", "{82B5FA73-8A82-4DC0-B473-43B78543668B}" EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "StockTraderDALMySQL", "..\common\DALMySQL\StockTraderDALMySQL.csproj", "{DD924D91-04C2-4EBB-AFB9-E96E305E1F07}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -100,6 +102,10 @@ {82B5FA73-8A82-4DC0-B473-43B78543668B}.Debug|Any CPU.Build.0 = Debug|Any CPU {82B5FA73-8A82-4DC0-B473-43B78543668B}.Release|Any CPU.ActiveCfg = Release|Any CPU {82B5FA73-8A82-4DC0-B473-43B78543668B}.Release|Any CPU.Build.0 = Release|Any CPU + {DD924D91-04C2-4EBB-AFB9-E96E305E1F07}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {DD924D91-04C2-4EBB-AFB9-E96E305E1F07}.Debug|Any CPU.Build.0 = Debug|Any CPU + {DD924D91-04C2-4EBB-AFB9-E96E305E1F07}.Release|Any CPU.ActiveCfg = Release|Any CPU + {DD924D91-04C2-4EBB-AFB9-E96E305E1F07}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE Modified: incubator/stonehenge/trunk/stocktrader/dotnet/setup_utilities/DataLoad/insertdbconfig.sql URL: http://svn.apache.org/viewvc/incubator/stonehenge/trunk/stocktrader/dotnet/setup_utilities/DataLoad/insertdbconfig.sql?rev=815924&r1=815923&r2=815924&view=diff ============================================================================== --- incubator/stonehenge/trunk/stocktrader/dotnet/setup_utilities/DataLoad/insertdbconfig.sql (original) +++ incubator/stonehenge/trunk/stocktrader/dotnet/setup_utilities/DataLoad/insertdbconfig.sql Wed Sep 16 18:46:07 2009 @@ -27,10 +27,6 @@ INSERT INTO [StockTraderDB].[dbo].[SERVICE]([SERVICENAME],[URL], [SEC]) VALUES ('PHP_OPSSEC','http://localhost:8080/php_stocktrader/order_processor/order_processor_svc_msec.php', 'True'); INSERT INTO [StockTraderDB].[dbo].[SERVICE]([SERVICENAME],[URL], [SEC]) - VALUES ('RUBY_OPS','http://localhost:3005/OrderService', 'False'); -INSERT INTO [StockTraderDB].[dbo].[SERVICE]([SERVICENAME],[URL], [SEC]) - VALUES ('RUBY_OPSSEC','http://localhost:3005/OrderServiceMsec', 'True'); -INSERT INTO [StockTraderDB].[dbo].[SERVICE]([SERVICENAME],[URL], [SEC]) VALUES ('DOTNET_BS','http://localhost:9000/TradeBusinessService', 'False'); INSERT INTO [StockTraderDB].[dbo].[SERVICE]([SERVICENAME],[URL], [SEC]) VALUES ('DOTNET_OPS','http://localhost:8000/TradeOrderProcessor', 'False'); Modified: incubator/stonehenge/trunk/stocktrader/php/resources/db_scripts/mysql/InsertScript.sql URL: http://svn.apache.org/viewvc/incubator/stonehenge/trunk/stocktrader/php/resources/db_scripts/mysql/InsertScript.sql?rev=815924&r1=815923&r2=815924&view=diff ============================================================================== --- incubator/stonehenge/trunk/stocktrader/php/resources/db_scripts/mysql/InsertScript.sql (original) +++ incubator/stonehenge/trunk/stocktrader/php/resources/db_scripts/mysql/InsertScript.sql Wed Sep 16 18:46:07 2009 @@ -15,41 +15,45 @@ * limitations under the License. */ INSERT INTO service(servicename,url) - VALUES ('WSAS_BS','http://localhost:9763/services/TradeServiceWsas'); + VALUES ('WSAS_BS','http://localhost:9763/services/TradeServiceWsas', 'N'); INSERT INTO service(servicename,url) - VALUES ('WSAS_OPS','http://localhost:9763/services/OrderProcessor'); + VALUES ('WSAS_OPS','http://localhost:9763/services/OrderProcessor', 'N'); INSERT INTO service(servicename,url) - VALUES ('WSAS_OPSSEC','http://localhost:9763/services/OrderProcessorMsec'); + VALUES ('WSAS_OPSSEC','http://localhost:9763/services/OrderProcessorMsec', 'Y'); INSERT INTO service(servicename,url) - VALUES ('PHP_BS','http://localhost:8080/php_stocktrader/business_service/business_svc.php'); + VALUES ('PHP_BS','http://localhost:8080/php_stocktrader/business_service/business_svc.php', 'N'); INSERT INTO service(servicename,url) - VALUES ('PHP_OPS','http://localhost:8080/php_stocktrader/order_processor/order_processor_svc.php'); + VALUES ('PHP_OPS','http://localhost:8080/php_stocktrader/order_processor/order_processor_svc.php', 'N'); INSERT INTO service(servicename,url) - VALUES ('PHP_OPSSEC','http://localhost:8080/php_stocktrader/order_processor/order_processor_svc_msec.php'); + VALUES ('PHP_OPSSEC','http://localhost:8080/php_stocktrader/order_processor/order_processor_svc_msec.php', 'Y'); INSERT INTO service(servicename,url) - VALUES ('SPRING_BS','http://localhost:8070/StockTrader/services/TradeService'); + VALUES ('METRO_BS','http://localhost:8090/business_service/TradeServiceWsas', 'N'); INSERT INTO service(servicename,url) - VALUES ('SPRING_OPS','http://localhost:8060/StockTrader/services/OrderService'); + VALUES ('METRO_OPS','http://localhost:8090/order_processor/OrderProcessor', 'N'); INSERT INTO service(servicename,url) - VALUES ('SPRING_OPSSEC','http://localhost:8060/StockTrader/services/OrderServiceMsec'); + VALUES ('METRO_OPSSEC','http://localhost:8090/order_processor/OrderProcessorSec', 'Y'); INSERT INTO service(servicename,url) - VALUES ('RUBY_OPS','http://localhost:3005/OrderService'); + VALUES ('DOTNET_BS','http://localhost:9000/TradeBusinessService', 'N'); INSERT INTO service(servicename,url) - VALUES ('RUBY_OPSSEC','http://localhost:3005/OrderServiceMsec'); + VALUES ('DOTNET_OPS','http://localhost:8000/TradeOrderProcessor', 'N'); INSERT INTO service(servicename,url) - VALUES ('DOTNET_BS','http://localhost:9000/TradeBusinessService'); -INSERT INTO service(servicename,url) - VALUES ('DOTNET_OPS','http://localhost:8000/TradeOrderProcessor'); -INSERT INTO service(servicename,url) - VALUES ('DOTNET_OPSSEC','http://localhost:8000/TradeOrderProcessor/sec'); + VALUES ('DOTNET_OPSSEC','http://localhost:8000/TradeOrderProcessor/sec', 'Y'); INSERT INTO dbconfig(dbname,hostname,port,active) VALUES ('MSSQL', '127.0.0.1', 1433, 'Y'); INSERT INTO clienttobs(client,bs) VALUES ('PHP_CLIENT','PHP_BS'); +INSERT INTO clienttobs(client,bs) + VALUES ('DOTNET_CLIENT','DOTNET_BS'); +INSERT INTO clienttobs(client,bs) + VALUES ('METRO_CLIENT','METRO_BS'); INSERT INTO bstoops(bs,ops) VALUES ('PHP_BS', 'PHP_OPS'); INSERT INTO bstoops(bs,ops) VALUES ('WSAS_BS', 'WSAS_OPS'); +INSERT INTO bstoops(bs,ops) + VALUES ('DOTNET_BS', 'DOTNET_OPS'); +INSERT INTO bstoops(bs,ops) + VALUES ('METRO_BS', 'METRO_OPS'); @@ -57,7 +61,7 @@ INSERT INTO account(creationdate, openbalance, logoutcount, balance, lastlogin, logincount, profile_userid) VALUES ('2008-01-01 00:00:00', 10000, 1, 10000, '2008-01-01 00:00:00', 1, 'uid:0'); INSERT INTO accountprofile(address,password,userid,email,creditcard,fullname) - VALUES ('111 First Street, Redmond, WA33', 'xxx', 'uid:0', 'us...@company.com', '469023-0320', 'Full Name 0'); + VALUES ('111 First Street, Redmond, WA 33333', 'xxx', 'uid:0', 'us...@company.com', '469023-0320', 'Full Name 0'); INSERT INTO quote (low,open1,volume,price,high,companyname,symbol,change1) VALUES (100, 100, 1000, 100, 100, 'S0 Incorp', 's:0', 0); Modified: incubator/stonehenge/trunk/stocktrader/php/resources/db_scripts/mysql/TableCreate.sql URL: http://svn.apache.org/viewvc/incubator/stonehenge/trunk/stocktrader/php/resources/db_scripts/mysql/TableCreate.sql?rev=815924&r1=815923&r2=815924&view=diff ============================================================================== --- incubator/stonehenge/trunk/stocktrader/php/resources/db_scripts/mysql/TableCreate.sql (original) +++ incubator/stonehenge/trunk/stocktrader/php/resources/db_scripts/mysql/TableCreate.sql Wed Sep 16 18:46:07 2009 @@ -84,6 +84,7 @@ CREATE TABLE IF NOT EXISTS service( servicename varchar(50) NOT NULL, url varchar(500) NOT NULL, + sec varchar(1) NOT NULL, PRIMARY KEY (servicename)); CREATE TABLE IF NOT EXISTS clienttobs(