Author: bendewey
Date: Sat Sep 5 17:12:04 2009
New Revision: 811681
URL: http://svn.apache.org/viewvc?rev=811681&view=rev
Log:
STONEHENGE-70 update dotnet code to work with new metro code in trunk
Modified:
incubator/stonehenge/trunk/stocktrader/dotnet/business_service/BusinessServiceConsole/App.config
incubator/stonehenge/trunk/stocktrader/dotnet/setup_utilities/DataLoad/insertdbconfig.sql
incubator/stonehenge/trunk/stocktrader/dotnet/trader_client/Trade/Web.config
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=811681&r1=811680&r2=811681&view=diff
==============================================================================
---
incubator/stonehenge/trunk/stocktrader/dotnet/business_service/BusinessServiceConsole/App.config
(original)
+++
incubator/stonehenge/trunk/stocktrader/dotnet/business_service/BusinessServiceConsole/App.config
Sat Sep 5 17:12:04 2009
@@ -54,6 +54,8 @@
<add key="PHP_OPSSEC" value="OpsClient_PHP_WsHttpBinding_MSec" />
<add key="WSAS_OPS" value="OpsClient_WSAS_BasicHttpBinding" />
<add key="WSAS_OPSSEC" value="OpsClient_WSAS_WsHttpBinding_MSec" />
+ <add key="METRO_OPS" value="OpsClient_Metro_BasicHttpBinding" />
+ <add key="METRO_OPSSEC" value="OpsClient_Metro_WsHttpBinding_MSec" />
<add key="ClientSettingsProvider.ServiceUri" value="" />
<add key="BS_LABEL" value="DOTNET_BS"/>
@@ -154,7 +156,25 @@
<identity>
<certificate
encodedValue="MIIB8DCCAVmgAwIBAgIQ1ELWkagtIaZA+rGlQ0DB/DANBgkqhkiG9w0BAQQFADASMRAwDgYDVQQDEwdPUFMuQ29tMB4XDTA4MDUyMTA0NDUwMVoXDTM5MTIzMTIzNTk1OVowEjEQMA4GA1UEAxMHT1BTLkNvbTCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEAxwk9moHNb3pwAFdolsVrNRCypa9MAH9NOblGJRW6av93sC5oubfjbzfIgURycVgOYoI/6G3AZijENC//tR8CiNuwfc338j4gGJCYQMKF80f0v+wsOChbWA/jSMmW0XeZ2mtn28kUzZwBN+auK+iUurYmUfZlNCIzLrM49KKqLRMCAwEAAaNHMEUwQwYDVR0BBDwwOoAQGGhusN6c4j/7WSnvieRMbKEUMBIxEDAOBgNVBAMTB09QUy5Db22CENRC1pGoLSGmQPqxpUNAwfwwDQYJKoZIhvcNAQEEBQADgYEAZ8xVxioCvG8t8iCx5Xy7JgUyGVnTgxVhP3+uMGSca0u1wqnfoPethXkykPkCP5ZEYSS5SoBLdCKhn1HqICdTBkR2m0ebo50CoXT1lAy+5MELdzlR8SH9KV6nokwCPAW3RURk1huaDi3FO1oFDVm6146rAByZrG/PjDe3w+MUaHg="
/>
</identity>
+
</endpoint>
+
+ <!-- METRO Endpoints -->
+ <endpoint address="http://localhost:8090/order_processor/OrderProcessor";
+ contract="Trade.OrderProcessorContract.IOrderProcessor"
+ binding="basicHttpBinding"
bindingConfiguration="OpsClient_BasicHttpBinding"
+ name="OpsClient_Metro_BasicHttpBinding" />
+
+ <endpoint
address="http://localhost:8090/order_processor/OrderProcessorSec";
+ contract="Trade.OrderProcessorContract.IOrderProcessor"
+ binding="customBinding"
bindingConfiguration="OpsClient_Sun_CustomBinding_MSec"
+ behaviorConfiguration="OpsClient_Sun_CertificateBehavior"
+ name="OpsClient_Metro_WsHttpBinding_MSec">
+ <identity>
+ <certificate
encodedValue="MIIB8DCCAVmgAwIBAgIQ1ELWkagtIaZA+rGlQ0DB/DANBgkqhkiG9w0BAQQFADASMRAwDgYDVQQDEwdPUFMuQ29tMB4XDTA4MDUyMTA0NDUwMVoXDTM5MTIzMTIzNTk1OVowEjEQMA4GA1UEAxMHT1BTLkNvbTCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEAxwk9moHNb3pwAFdolsVrNRCypa9MAH9NOblGJRW6av93sC5oubfjbzfIgURycVgOYoI/6G3AZijENC//tR8CiNuwfc338j4gGJCYQMKF80f0v+wsOChbWA/jSMmW0XeZ2mtn28kUzZwBN+auK+iUurYmUfZlNCIzLrM49KKqLRMCAwEAAaNHMEUwQwYDVR0BBDwwOoAQGGhusN6c4j/7WSnvieRMbKEUMBIxEDAOBgNVBAMTB09QUy5Db22CENRC1pGoLSGmQPqxpUNAwfwwDQYJKoZIhvcNAQEEBQADgYEAZ8xVxioCvG8t8iCx5Xy7JgUyGVnTgxVhP3+uMGSca0u1wqnfoPethXkykPkCP5ZEYSS5SoBLdCKhn1HqICdTBkR2m0ebo50CoXT1lAy+5MELdzlR8SH9KV6nokwCPAW3RURk1huaDi3FO1oFDVm6146rAByZrG/PjDe3w+MUaHg="
/>
+ </identity>
+ </endpoint>
+
</client>
@@ -243,7 +263,43 @@
<httpTransport />
</binding>
+ <binding name="OpsClient_Sun_CustomBinding_MSec">
+ <security defaultAlgorithmSuite="Default"
authenticationMode="AnonymousForCertificate"
+
requireDerivedKeys="false" securityHeaderLayout="Lax" includeTimestamp="true"
+
keyEntropyMode="CombinedEntropy" messageProtectionOrder="SignBeforeEncrypt"
+
messageSecurityVersion="WSSecurity11WSTrustFebruary2005WSSecureConversationFebruary2005WSSecurityPolicy11BasicSecurityProfile10"
+
requireSignatureConfirmation="true">
+
+ <localClientSettings cacheCookies="true" detectReplays="true"
+
replayCacheSize="900000" maxClockSkew="00:05:00" maxCookieCachingTime="Infinite"
+ replayWindow="00:05:00"
sessionKeyRenewalInterval="10:00:00"
+
sessionKeyRolloverInterval="00:05:00" reconnectTransportOnFailure="true"
+
timestampValidityDuration="00:05:00" cookieRenewalThresholdPercentage="60" />
+ <localServiceSettings detectReplays="true"
issuedCookieLifetime="10:00:00"
+
maxStatefulNegotiations="128" replayCacheSize="900000" maxClockSkew="00:05:00"
+
negotiationTimeout="00:01:00" replayWindow="00:05:00"
inactivityTimeout="00:02:00"
+
sessionKeyRenewalInterval="15:00:00" sessionKeyRolloverInterval="00:05:00"
+
reconnectTransportOnFailure="true" maxPendingSessions="128"
+ maxCachedCookies="1000"
timestampValidityDuration="00:05:00" />
+ <secureConversationBootstrap />
+ </security>
+ <textMessageEncoding maxReadPoolSize="64" maxWritePoolSize="16"
+ messageVersion="Default"
writeEncoding="utf-8">
+ <readerQuotas maxDepth="32" maxStringContentLength="8192"
maxArrayLength="16384"
+ maxBytesPerRead="4096"
maxNameTableCharCount="16384" />
+ </textMessageEncoding>
+
+ <httpTransport manualAddressing="false" maxBufferPoolSize="524288"
+ maxReceivedMessageSize="65536"
allowCookies="false" authenticationScheme="Anonymous"
+ bypassProxyOnLocal="false"
hostNameComparisonMode="StrongWildcard"
+ keepAliveEnabled="true"
maxBufferSize="65536" proxyAuthenticationScheme="Anonymous"
+ realm=""
transferMode="Buffered" unsafeConnectionNtlmAuthentication="false"
+ useDefaultWebProxy="true" />
+ </binding>
+
</customBinding>
+
+
</bindings>
@@ -313,7 +369,15 @@
</serviceCertificate>
</clientCredentials>
</behavior>
-
+
+ <behavior name="OpsClient_Sun_CertificateBehavior">
+ <clientCredentials>
+ <serviceCertificate>
+ <authentication certificateValidationMode="PeerOrChainTrust" />
+ </serviceCertificate>
+ </clientCredentials>
+ </behavior>
+
</endpointBehaviors>
</behaviors>
@@ -331,4 +395,4 @@
</providers>
</roleManager>
</system.web>
-</configuration>
+</configuration>
\ No newline at end of file
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=811681&r1=811680&r2=811681&view=diff
==============================================================================
---
incubator/stonehenge/trunk/stocktrader/dotnet/setup_utilities/DataLoad/insertdbconfig.sql
(original)
+++
incubator/stonehenge/trunk/stocktrader/dotnet/setup_utilities/DataLoad/insertdbconfig.sql
Sat Sep 5 17:12:04 2009
@@ -36,17 +36,25 @@
VALUES ('DOTNET_OPS','http://localhost:8000/TradeOrderProcessor',
'False');
INSERT INTO [StockTraderDB].[dbo].[SERVICE]([SERVICENAME],[URL], [SEC])
VALUES ('DOTNET_OPSSEC','http://localhost:8000/TradeOrderProcessor/sec',
'True');
+INSERT INTO [StockTraderDB].[dbo].[SERVICE]([SERVICENAME],[URL], [SEC])
+ VALUES
('METRO_BS','http://localhost:8090/business_service/TradeServiceWsas', 'False');
+INSERT INTO [StockTraderDB].[dbo].[SERVICE]([SERVICENAME],[URL], [SEC])
+ VALUES
('METRO_OPS','http://localhost:8090/order_processor/OrderProcessor', 'False');
+INSERT INTO [StockTraderDB].[dbo].[SERVICE]([SERVICENAME],[URL], [SEC])
+ VALUES
('METRO_OPSSEC','http://localhost:8090/order_processor/OrderProcessorSec',
'True');
INSERT INTO
[StockTraderDB].[dbo].[DBCONFIG]([DBNAME],[HOSTNAME],[PORT],[ACTIVE])
VALUES ('MSSQL', '127.0.0.1', 1433, 'Y');
INSERT INTO [StockTraderDB].[dbo].[CLIENTTOBS]([CLIENT],[BS])
VALUES ('DOTNET_CLIENT','DOTNET_BS');
INSERT INTO [StockTraderDB].[dbo].[CLIENTTOBS]([CLIENT],[BS])
VALUES ('PHP_CLIENT','PHP_BS');
+INSERT INTO [StockTraderDB].[dbo].[CLIENTTOBS]([CLIENT],[BS])
+ VALUES ('METRO_CLIENT','METRO_BS');
INSERT INTO [StockTraderDB].[dbo].[BSTOOPS]([BS],[OPS])
VALUES ('DOTNET_BS', 'DOTNET_OPS');
INSERT INTO [StockTraderDB].[dbo].[BSTOOPS]([BS],[OPS])
VALUES ('PHP_BS', 'PHP_OPS');
INSERT INTO [StockTraderDB].[dbo].[BSTOOPS]([BS],[OPS])
VALUES ('WSAS_BS', 'WSAS_OPS');
-
-
+INSERT INTO [StockTraderDB].[dbo].[BSTOOPS]([BS],[OPS])
+ VALUES ('METRO_BS', 'METRO_OPS');
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=811681&r1=811680&r2=811681&view=diff
==============================================================================
---
incubator/stonehenge/trunk/stocktrader/dotnet/trader_client/Trade/Web.config
(original)
+++
incubator/stonehenge/trunk/stocktrader/dotnet/trader_client/Trade/Web.config
Sat Sep 5 17:12:04 2009
@@ -44,6 +44,7 @@
<add key="DOTNET_BSSEC" value="BsClient_DotNet_WsHttpBinding"/>
<add key="PHP_BS" value="BsClient_PHP_BasicHttpBinding"/>
<add key="WSAS_BS" value="BsClient_WSAS_BasicHttpBinding"/>
+ <add key="METRO_BS" value="BsClient_Metro_BasicHttpBinding"/>
<add key="BSL_USERID" value="bsloperationuser"/>
<add key="BSL_PASSWORD" value="yyy"/>
<add key="CLIENT_LABEL" value="DOTNET_CLIENT"/>
@@ -107,6 +108,12 @@
contract="Trade.BusinessServiceContract.ITradeServices"
binding="basicHttpBinding"
bindingConfiguration="BsClient_BasicHttpBinding"
name="BsClient_WSAS_BasicHttpBinding"/>
+
+ <!-- Sun Metro Client -->
+ <endpoint
address="http://localhost:8090/business_service/TradeServiceWsas";
+
contract="Trade.BusinessServiceContract.ITradeServices"
+ binding="basicHttpBinding"
bindingConfiguration="BsClient_BasicHttpBinding"
+ name="BsClient_Metro_BasicHttpBinding"/>
</client>
<!--********************************************************
@@ -296,4 +303,4 @@
</caching>
</system.webServer>
-->
-</configuration>
+</configuration>
\ No newline at end of file
