Author: shankar
Date: Mon May 4 07:49:08 2009
New Revision: 771226
URL: http://svn.apache.org/viewvc?rev=771226&view=rev
Log:
Changing keys to get work with .NET OPSSEC
Added:
incubator/stonehenge/trunk/stocktrader/wsas/resources/conf/OPS.jks (with
props)
Removed:
incubator/stonehenge/trunk/stocktrader/wsas/resources/conf/sec.jks
Modified:
incubator/stonehenge/trunk/stocktrader/wsas/order_processor/resources/msec/META-INF/services.xml
incubator/stonehenge/trunk/stocktrader/wsas/resources/conf/security-policy.xml
Modified:
incubator/stonehenge/trunk/stocktrader/wsas/order_processor/resources/msec/META-INF/services.xml
URL:
http://svn.apache.org/viewvc/incubator/stonehenge/trunk/stocktrader/wsas/order_processor/resources/msec/META-INF/services.xml?rev=771226&r1=771225&r2=771226&view=diff
==============================================================================
---
incubator/stonehenge/trunk/stocktrader/wsas/order_processor/resources/msec/META-INF/services.xml
(original)
+++
incubator/stonehenge/trunk/stocktrader/wsas/order_processor/resources/msec/META-INF/services.xml
Mon May 4 07:49:08 2009
@@ -83,6 +83,7 @@
</sp:SymmetricBinding>
<sp:SignedParts
xmlns:sp="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy";>
<sp:Body />
+ <sp:Header
Namespace="http://www.w3.org/2005/08/addressing"/>
</sp:SignedParts>
<sp:EncryptedParts
xmlns:sp="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy";>
<sp:Body />
@@ -111,48 +112,21 @@
<rampart:signatureCrypto>
<rampart:crypto
provider="org.apache.ws.security.components.crypto.Merlin">
<rampart:property
name="org.apache.ws.security.crypto.merlin.keystore.type">JKS</rampart:property>
-
<rampart:property
name="org.apache.ws.security.crypto.merlin.file">sec.jks</rampart:property>
+
<rampart:property
name="org.apache.ws.security.crypto.merlin.file">OPS.jks</rampart:property>
<rampart:property
name="org.apache.ws.security.crypto.merlin.keystore.password">password</rampart:property>
</rampart:crypto>
</rampart:signatureCrypto>
<rampart:encryptionCypto>
<rampart:crypto
provider="org.apache.ws.security.components.crypto.Merlin">
<rampart:property
name="org.apache.ws.security.crypto.merlin.keystore.type">JKS</rampart:property>
-
<rampart:property
name="org.apache.ws.security.crypto.merlin.file">sec.jks</rampart:property>
+
<rampart:property
name="org.apache.ws.security.crypto.merlin.file">OPS.jks</rampart:property>
<rampart:property
name="org.apache.ws.security.crypto.merlin.keystore.password">password</rampart:property>
</rampart:crypto>
</rampart:encryptionCypto>
<rampart:passwordCallbackClass>org.apache.stonehenge.stocktrader.service.OrderProcessorServicePasswordCB</rampart:passwordCallbackClass>
</rampart:RampartConfig>
- <!--rampart:RampartConfig
xmlns:rampart="http://ws.apache.org/rampart/policy";>
-
<rampart:user>bob</rampart:user>
-
<rampart:encryptionUser>useReqSigCert</rampart:encryptionUser>
-
<rampart:timestampPrecisionInMilliseconds>true</rampart:timestampPrecisionInMilliseconds>
-
<rampart:timestampTTL>300</rampart:timestampTTL>
-
<rampart:timestampMaxSkew>300</rampart:timestampMaxSkew>
- <rampart:encryptionCrypto>
- <rampart:crypto
provider="org.wso2.carbon.security.util.ServerCrypto">
-
<rampart:property
name="org.wso2.carbon.security.crypto.privatestore">sec.jks</rampart:property>
-
<rampart:property
name="org.wso2.carbon.security.crypto.truststores">sec.jks</rampart:property>
-
<rampart:property
name="org.wso2.carbon.security.crypto.alias">bob</rampart:property>
-
<rampart:property name="rampart.config.user">bob</rampart:property>
- </rampart:crypto>
- </rampart:encryptionCrypto>
- <rampart:signatureCrypto>
- <rampart:crypto
provider="org.wso2.carbon.security.util.ServerCrypto">
-
<rampart:property
name="org.wso2.carbon.security.crypto.privatestore">sec.jks</rampart:property>
-
<rampart:property
name="org.wso2.carbon.security.crypto.truststores">sec.jks</rampart:property>
-
<rampart:property
name="org.wso2.carbon.security.crypto.alias">bob</rampart:property>
-
<rampart:property name="rampart.config.user">bob</rampart:property>
- </rampart:crypto>
- </rampart:signatureCrypto>
-
<rampart:passwordCallbackClass>org.wso2.stocktrader.service.OrderProcessorServicePasswordCB</rampart:passwordCallbackClass>
- </rampart:RampartConfig>-->
</wsp:All>
</wsp:ExactlyOne>
</wsp:Policy>
-
- <!--</wsp:PolicyAttachment>-->
-
</service>
</serviceGroup>
Added: incubator/stonehenge/trunk/stocktrader/wsas/resources/conf/OPS.jks
URL:
http://svn.apache.org/viewvc/incubator/stonehenge/trunk/stocktrader/wsas/resources/conf/OPS.jks?rev=771226&view=auto
==============================================================================
Binary file - no diff available.
Propchange: incubator/stonehenge/trunk/stocktrader/wsas/resources/conf/OPS.jks
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Modified:
incubator/stonehenge/trunk/stocktrader/wsas/resources/conf/security-policy.xml
URL:
http://svn.apache.org/viewvc/incubator/stonehenge/trunk/stocktrader/wsas/resources/conf/security-policy.xml?rev=771226&r1=771225&r2=771226&view=diff
==============================================================================
---
incubator/stonehenge/trunk/stocktrader/wsas/resources/conf/security-policy.xml
(original)
+++
incubator/stonehenge/trunk/stocktrader/wsas/resources/conf/security-policy.xml
Mon May 4 07:49:08 2009
@@ -45,6 +45,7 @@
</sp:SymmetricBinding>
<sp:SignedParts
xmlns:sp="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy";>
<sp:Body />
+ <sp:Header
Namespace="http://www.w3.org/2005/08/addressing"/>
</sp:SignedParts>
<sp:EncryptedParts
xmlns:sp="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy";>
<sp:Body />
@@ -73,14 +74,14 @@
<rampart:signatureCrypto>
<rampart:crypto
provider="org.apache.ws.security.components.crypto.Merlin">
<rampart:property
name="org.apache.ws.security.crypto.merlin.keystore.type">JKS</rampart:property>
-
<rampart:property
name="org.apache.ws.security.crypto.merlin.file">sec.jks</rampart:property>
+
<rampart:property
name="org.apache.ws.security.crypto.merlin.file">OPS.jks</rampart:property>
<rampart:property
name="org.apache.ws.security.crypto.merlin.keystore.password">password</rampart:property>
</rampart:crypto>
</rampart:signatureCrypto>
<rampart:encryptionCypto>
<rampart:crypto
provider="org.apache.ws.security.components.crypto.Merlin">
<rampart:property
name="org.apache.ws.security.crypto.merlin.keystore.type">JKS</rampart:property>
-
<rampart:property
name="org.apache.ws.security.crypto.merlin.file">sec.jks</rampart:property>
+
<rampart:property
name="org.apache.ws.security.crypto.merlin.file">OPS.jks</rampart:property>
<rampart:property
name="org.apache.ws.security.crypto.merlin.keystore.password">password</rampart:property>
</rampart:crypto>
</rampart:encryptionCypto>
