Author: bendewey
Date: Thu Nov 12 22:31:57 2009
New Revision: 835610
URL: http://svn.apache.org/viewvc?rev=835610&view=rev
Log:
STONEHENGE-108:
Added a fix to the getHoldingInfo method of the UserBean class, and bindings to
dotnet BusinessServiceConsole config
Submitted by: Pablo Mariano Cibraro <Pablo.Cibraro.at.tellago.com>
Modified:
incubator/stonehenge/trunk/stocktrader/dotnet/business_service/BusinessServiceConsole/App.config
incubator/stonehenge/trunk/stocktrader/metro/trader_client/src/org/apache/stonehenge/stocktrader/bean/UserBean.java
incubator/stonehenge/trunk/stocktrader/metro/trader_client/src/wsit-client.xml
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=835610&r1=835609&r2=835610&view=diff
==============================================================================
---
incubator/stonehenge/trunk/stocktrader/dotnet/business_service/BusinessServiceConsole/App.config
(original)
+++
incubator/stonehenge/trunk/stocktrader/dotnet/business_service/BusinessServiceConsole/App.config
Thu Nov 12 22:31:57 2009
@@ -26,6 +26,7 @@
-->
<configuration>
<!---THIS IS A CONFIG SERVICE CUSTOM CONFIG SECTION USED TO SPECIFIY
individual ServiceEndpoint Identities, when desired-->
+
<appSettings>
<!--Possible values for logger mode: CONSOLE, EVENT_VIEWER-->
@@ -50,6 +51,8 @@
<add key="CS_DOTNET_ENDPOINT_CONFIG_HTTP"
value="ConfigClient_DotNet_BasicHttpBinding"/>
<add key="DOTNET_OPS" value="OpsClient_DotNet_BasicHttpBinding" />
<add key="DOTNET_OPSSEC" value="OpsClient_DotNet_WsHttpBinding_MSec" />
+ <add key="METRO_OPS" value="OpsClient_Metro_BasicHttpBinding" />
+ <add key="METRO_OPSSEC" value="OpsClient_Metro_WsHttpBinding_MSec" />
<add key="PHP_OPS" value="OpsClient_PHP_BasicHttpBinding" />
<add key="PHP_OPSSEC" value="OpsClient_PHP_WsHttpBinding_MSec" />
<add key="JAVA_OPS" value="OpsClient_WSAS_BasicHttpBinding" />
@@ -97,7 +100,7 @@
behaviorConfiguration="BsHost_ServiceBehavior">
<endpoint binding="customBinding"
bindingConfiguration="BsHost_FederatedBinding"
- contract ="Trade.BusinessServiceContract.ITradeServices"
+ contract="Trade.BusinessServiceContract.ITradeServices"
/>
<endpoint address="Mex"
binding="mexHttpBinding"
@@ -118,10 +121,15 @@
binding="basicHttpBinding"
name="ConfigClient_DotNet_BasicHttpBinding" />
+ <!--<endpoint
address="http://apps.stonehenge.com:1316/config_service/ConfigService";
+ contract="Trade.ConfigServiceContract.IConfigService"
+ binding="basicHttpBinding"
+ name="ConfigClient_DotNet_BasicHttpBinding" />-->
+
<!-- DotNet OPS Endpoints -->
- <endpoint address="http://localhost:8000/tradeorderprocessor";
+ <endpoint address="http://localhost:8000/tradeorderprocessor";
contract="Trade.OrderProcessorContract.IOrderProcessor"
- binding="basicHttpBinding"
bindingConfiguration="OpsClient_BasicHttpBinding"
+ binding="basicHttpBinding"
bindingConfiguration="OpsClient_BasicHttpBinding"
name="OpsClient_DotNet_BasicHttpBinding" />
<endpoint address="http://localhost:8000/tradeorderprocessor/msec";
@@ -133,6 +141,22 @@
<dns value="OPS.Com"/>
</identity>
</endpoint>
+
+ <!-- Metro OPS Endpoints -->
+ <endpoint
address="http://apps.stonehenge.com:1316/order_processor/OrderProcessor";
+ contract="Trade.OrderProcessorContract.IOrderProcessor"
+ binding="basicHttpBinding"
bindingConfiguration="OpsClient_BasicHttpBinding"
+ name="OpsClient_Metro_BasicHttpBinding" />
+
+ <endpoint
address="http://apps.stonehenge.com:1316/order_processor/OrderProcessorSec";
+ contract="Trade.OrderProcessorContract.IOrderProcessor"
+ binding="wsHttpBinding"
bindingConfiguration="OpsClient_WsHttpBinding_MSec"
+ behaviorConfiguration="OpsClient_DotNet_CertificateBehavior"
+ name="OpsClient_Metro_WsHttpBinding_MSec">
+ <identity>
+ <dns value="OPS.Com"/>
+ </identity>
+ </endpoint>
</client>
@@ -153,6 +177,7 @@
<issuerMetadata
address="http://localhost:9001/tradeactivests/mex"/>
</issuedTokenParameters>
</security>
+ <textMessageEncoding messageVersion="Soap11WSAddressing10"/>
<httpTransport/>
</binding>
</customBinding>
@@ -196,7 +221,8 @@
<serviceThrottling maxConcurrentInstances="400"
maxConcurrentCalls="400" maxConcurrentSessions="100" />
<serviceCredentials>
- <serviceCertificate findValue="CN=BSL.Com"
x509FindType="FindBySubjectDistinguishedName" storeLocation="LocalMachine"
storeName="TrustedPeople" />
+ <!--<serviceCertificate findValue="CN=BSL.Com"
x509FindType="FindBySubjectDistinguishedName" storeLocation="LocalMachine"
storeName="TrustedPeople" />-->
+ <serviceCertificate findValue="CN=OPS.Com"
x509FindType="FindBySubjectDistinguishedName" storeLocation="LocalMachine"
storeName="TrustedPeople" />
</serviceCredentials>
</behavior>
</serviceBehaviors>
@@ -218,6 +244,4 @@
</system.serviceModel>
-
-
</configuration>
Modified:
incubator/stonehenge/trunk/stocktrader/metro/trader_client/src/org/apache/stonehenge/stocktrader/bean/UserBean.java
URL:
http://svn.apache.org/viewvc/incubator/stonehenge/trunk/stocktrader/metro/trader_client/src/org/apache/stonehenge/stocktrader/bean/UserBean.java?rev=835610&r1=835609&r2=835610&view=diff
==============================================================================
---
incubator/stonehenge/trunk/stocktrader/metro/trader_client/src/org/apache/stonehenge/stocktrader/bean/UserBean.java
(original)
+++
incubator/stonehenge/trunk/stocktrader/metro/trader_client/src/org/apache/stonehenge/stocktrader/bean/UserBean.java
Thu Nov 12 22:31:57 2009
@@ -46,8 +46,10 @@
}
public HoldingInfo getHoldingInfo(){
- holdingInfo = new HoldingInfo(businessService, currentUser);
- return holdingInfo;
+ if(holdingInfo == null)
+ holdingInfo = new HoldingInfo(businessService, currentUser);
+
+ return holdingInfo;
}
public double getSumOfCashHolding() {
Modified:
incubator/stonehenge/trunk/stocktrader/metro/trader_client/src/wsit-client.xml
URL:
http://svn.apache.org/viewvc/incubator/stonehenge/trunk/stocktrader/metro/trader_client/src/wsit-client.xml?rev=835610&r1=835609&r2=835610&view=diff
==============================================================================
---
incubator/stonehenge/trunk/stocktrader/metro/trader_client/src/wsit-client.xml
(original)
+++
incubator/stonehenge/trunk/stocktrader/metro/trader_client/src/wsit-client.xml
Thu Nov 12 22:31:57 2009
@@ -36,7 +36,7 @@
wsdlLocation="http://localhost:8091/active_sts/ActiveSTS?wsdl";
serviceName="SecurityTokenService"
portName="ISecurityTokenService_Port"
- namespace="http://tempuri.org/";
shareToken="true">
+ namespace="http://tempuri.org/";
shareToken="false">
</tc:PreconfiguredSTS>
</wsp:All>
</wsp:ExactlyOne>
