[prev in list] [next in list] [prev in thread] [next in thread] 

List:       rampart-dev
Subject:    svn commit: r809574 - in
From:       nandana () apache ! org
Date:       2009-08-31 13:24:06
Message-ID: 20090831132406.3EF02238889B () eris ! apache ! org
[Download RAW message or body]

Author: nandana
Date: Mon Aug 31 13:24:05 2009
New Revision: 809574

URL: http://svn.apache.org/viewvc?rev=809574&view=rev
Log:
adding the two new files I missed in the commit :)

Added:
    webservices/rampart/trunk/java/modules/rampart-integration/src/test/resources/rampart/policy/29.xml
  webservices/rampart/trunk/java/modules/rampart-integration/src/test/resources/rampart/services-29.xml


Added: webservices/rampart/trunk/java/modules/rampart-integration/src/test/resources/rampart/policy/29.xml
                
URL: http://svn.apache.org/viewvc/webservices/rampart/trunk/java/modules/rampart-integration/src/test/resources/rampart/policy/29.xml?rev=809574&view=auto
 ==============================================================================
--- webservices/rampart/trunk/java/modules/rampart-integration/src/test/resources/rampart/policy/29.xml \
                (added)
+++ webservices/rampart/trunk/java/modules/rampart-integration/src/test/resources/rampart/policy/29.xml \
Mon Aug 31 13:24:05 2009 @@ -0,0 +1,152 @@
+<wsp:Policy wsu:Id="29"
+            xmlns:wsu="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utility-1.0.xsd"
 +            xmlns:wsp="http://schemas.xmlsoap.org/ws/2004/09/policy"
+            xmlns:sp="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy">
+    <wsp:ExactlyOne>
+        <wsp:All>
+            <sp:AsymmetricBinding>
+                <wsp:Policy>
+                    <sp:InitiatorToken>
+                        <wsp:Policy>
+                            <sp:X509Token
+                                    \
sp:IncludeToken="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy/IncludeToken/AlwaysToRecipient">
 +                                <wsp:Policy>
+                                    <sp:MustSupportRefThumbprint/>
+                                </wsp:Policy>
+                            </sp:X509Token>
+                        </wsp:Policy>
+                    </sp:InitiatorToken>
+                    <sp:RecipientToken>
+                        <wsp:Policy>
+                            <sp:X509Token
+                                    \
sp:IncludeToken="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy/IncludeToken/Never">
 +                                <wsp:Policy>
+                                    <sp:WssX509V3Token10/>
+                                </wsp:Policy>
+                            </sp:X509Token>
+                        </wsp:Policy>
+                    </sp:RecipientToken>
+                    <sp:AlgorithmSuite>
+                        <wsp:Policy>
+                            <sp:TripleDesRsa15/>
+                        </wsp:Policy>
+                    </sp:AlgorithmSuite>
+                    <sp:IncludeTimestamp/>
+                </wsp:Policy>
+            </sp:AsymmetricBinding>
+            <sp:Wss10>
+                <wsp:Policy>
+                    <sp:MustSupportRefThumbprint/>
+                </wsp:Policy>
+            </sp:Wss10>
+            <sp:SignedParts>
+                <sp:Body/>
+            </sp:SignedParts>
+            <sp:SignedSupportingTokens>
+                <wsp:Policy>
+                    <sp:UsernameToken
+                            \
sp:IncludeToken="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy/IncludeToken/AlwaysToRecipient"/>
 +                </wsp:Policy>
+            </sp:SignedSupportingTokens>
+            <ramp:RampartConfig xmlns:ramp="http://ws.apache.org/rampart/policy">
+                <ramp:user>alice</ramp:user>
+                <ramp:encryptionUser>bob</ramp:encryptionUser>
+                <ramp:passwordCallbackClass>org.apache.rampart.PWCallback</ramp:passwordCallbackClass>
 +                <ramp:signatureCrypto>
+                    <ramp:crypto \
provider="org.apache.ws.security.components.crypto.Merlin"> +                        \
<ramp:property name="org.apache.ws.security.crypto.merlin.keystore.type">JKS</ramp:property>
 +                        <ramp:property \
name="org.apache.ws.security.crypto.merlin.file">rampart/store.jks +                  \
</ramp:property> +                        <ramp:property \
name="org.apache.ws.security.crypto.merlin.keystore.password">password +              \
</ramp:property> +                    </ramp:crypto>
+                </ramp:signatureCrypto>
+                <ramp:encryptionCypto>
+                    <ramp:crypto \
provider="org.apache.ws.security.components.crypto.Merlin"> +                        \
<ramp:property name="org.apache.ws.security.crypto.merlin.keystore.type">JKS</ramp:property>
 +                        <ramp:property \
name="org.apache.ws.security.crypto.merlin.file">rampart/store.jks +                  \
</ramp:property> +                        <ramp:property \
name="org.apache.ws.security.crypto.merlin.keystore.password">password +              \
</ramp:property> +                    </ramp:crypto>
+                </ramp:encryptionCypto>
+            </ramp:RampartConfig>
+        </wsp:All>
+    </wsp:ExactlyOne>
+</wsp:Policy>
+<wsp:Policy wsu:Id="29"
+            xmlns:wsu="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utility-1.0.xsd"
 +            xmlns:wsp="http://schemas.xmlsoap.org/ws/2004/09/policy"
+            xmlns:sp="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy">
+    <wsp:ExactlyOne>
+        <wsp:All>
+            <sp:AsymmetricBinding>
+                <wsp:Policy>
+                    <sp:InitiatorToken>
+                        <wsp:Policy>
+                            <sp:X509Token
+                                    \
sp:IncludeToken="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy/IncludeToken/AlwaysToRecipient">
 +                                <wsp:Policy>
+                                    <sp:MustSupportRefThumbprint/>
+                                </wsp:Policy>
+                            </sp:X509Token>
+                        </wsp:Policy>
+                    </sp:InitiatorToken>
+                    <sp:RecipientToken>
+                        <wsp:Policy>
+                            <sp:X509Token
+                                    \
sp:IncludeToken="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy/IncludeToken/Never">
 +                                <wsp:Policy>
+                                    <sp:WssX509V3Token10/>
+                                </wsp:Policy>
+                            </sp:X509Token>
+                        </wsp:Policy>
+                    </sp:RecipientToken>
+                    <sp:AlgorithmSuite>
+                        <wsp:Policy>
+                            <sp:TripleDesRsa15/>
+                        </wsp:Policy>
+                    </sp:AlgorithmSuite>
+                    <sp:IncludeTimestamp/>
+                </wsp:Policy>
+            </sp:AsymmetricBinding>
+            <sp:Wss10>
+                <wsp:Policy>
+                    <sp:MustSupportRefThumbprint/>
+                </wsp:Policy>
+            </sp:Wss10>
+            <sp:SignedParts>
+                <sp:Body/>
+            </sp:SignedParts>
+            <sp:SignedSupportingTokens>
+                <wsp:Policy>
+                    <sp:UsernameToken
+                            \
sp:IncludeToken="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy/IncludeToken/AlwaysToRecipient"/>
 +                </wsp:Policy>
+            </sp:SignedSupportingTokens>
+            <ramp:RampartConfig xmlns:ramp="http://ws.apache.org/rampart/policy">
+                <ramp:user>alice</ramp:user>
+                <ramp:encryptionUser>bob</ramp:encryptionUser>
+                <ramp:passwordCallbackClass>org.apache.rampart.PWCallback</ramp:passwordCallbackClass>
 +                <ramp:signatureCrypto>
+                    <ramp:crypto \
provider="org.apache.ws.security.components.crypto.Merlin"> +                        \
<ramp:property name="org.apache.ws.security.crypto.merlin.keystore.type">JKS</ramp:property>
 +                        <ramp:property \
name="org.apache.ws.security.crypto.merlin.file">rampart/store.jks +                  \
</ramp:property> +                        <ramp:property \
name="org.apache.ws.security.crypto.merlin.keystore.password">password +              \
</ramp:property> +                    </ramp:crypto>
+                </ramp:signatureCrypto>
+                <ramp:encryptionCypto>
+                    <ramp:crypto \
provider="org.apache.ws.security.components.crypto.Merlin"> +                        \
<ramp:property name="org.apache.ws.security.crypto.merlin.keystore.type">JKS</ramp:property>
 +                        <ramp:property \
name="org.apache.ws.security.crypto.merlin.file">rampart/store.jks +                  \
</ramp:property> +                        <ramp:property \
name="org.apache.ws.security.crypto.merlin.keystore.password">password +              \
</ramp:property> +                    </ramp:crypto>
+                </ramp:encryptionCypto>
+            </ramp:RampartConfig>
+        </wsp:All>
+    </wsp:ExactlyOne>
+</wsp:Policy>

Added: webservices/rampart/trunk/java/modules/rampart-integration/src/test/resources/rampart/services-29.xml
                
URL: http://svn.apache.org/viewvc/webservices/rampart/trunk/java/modules/rampart-integration/src/test/resources/rampart/services-29.xml?rev=809574&view=auto
 ==============================================================================
--- webservices/rampart/trunk/java/modules/rampart-integration/src/test/resources/rampart/services-29.xml \
                (added)
+++ webservices/rampart/trunk/java/modules/rampart-integration/src/test/resources/rampart/services-29.xml \
Mon Aug 31 13:24:05 2009 @@ -0,0 +1,174 @@
+<service name="SecureService29">
+    <!--No timestamp test-->
+    <module ref="addressing"/>
+    <module ref="rampart"/>
+
+    <parameter locked="false" \
name="ServiceClass">org.apache.rampart.Service</parameter> +
+    <operation name="echo">
+        <messageReceiver \
class="org.apache.axis2.receivers.RawXMLINOutMessageReceiver"/> +        \
<actionMapping>urn:echo</actionMapping> +    </operation>
+
+    <operation name="returnError">
+        <messageReceiver \
class="org.apache.axis2.receivers.RawXMLINOutMessageReceiver"/> +        \
<actionMapping>urn:returnError</actionMapping> +    </operation>
+
+    <wsp:Policy wsu:Id="SigOnly"
+                xmlns:wsu="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utility-1.0.xsd"
 +                xmlns:wsp="http://schemas.xmlsoap.org/ws/2004/09/policy"
+                xmlns:sp="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy">
+        <wsp:ExactlyOne>
+            <wsp:All>
+                <sp:AsymmetricBinding>
+                    <wsp:Policy>
+                        <sp:InitiatorToken>
+                            <wsp:Policy>
+                                <sp:X509Token
+                                        \
sp:IncludeToken="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy/IncludeToken/AlwaysToRecipient">
 +                                    <wsp:Policy>
+                                        <sp:MustSupportRefThumbprint/>
+                                    </wsp:Policy>
+                                </sp:X509Token>
+                            </wsp:Policy>
+                        </sp:InitiatorToken>
+
+                        <sp:RecipientToken>
+                            <wsp:Policy>
+                                <sp:X509Token
+                                        \
sp:IncludeToken="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy/IncludeToken/Never">
 +                                    <wsp:Policy>
+                                        <sp:WssX509V3Token10/>
+                                    </wsp:Policy>
+                                </sp:X509Token>
+                            </wsp:Policy>
+                        </sp:RecipientToken>
+                        <sp:AlgorithmSuite>
+                            <wsp:Policy>
+                                <sp:TripleDesRsa15/>
+                            </wsp:Policy>
+                        </sp:AlgorithmSuite>
+                        <sp:IncludeTimestamp/>
+                    </wsp:Policy>
+                </sp:AsymmetricBinding>
+                <sp:Wss10>
+                    <wsp:Policy>
+                        <sp:MustSupportRefThumbprint/>
+                    </wsp:Policy>
+                </sp:Wss10>
+                <sp:SignedParts>
+                    <sp:Body/>
+                </sp:SignedParts>
+                <sp:SignedSupportingTokens>
+                    <wsp:Policy>
+                        <sp:UsernameToken
+                                \
sp:IncludeToken="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy/IncludeToken/AlwaysToRecipient"/>
 +                    </wsp:Policy>
+                </sp:SignedSupportingTokens>
+                <ramp:RampartConfig \
xmlns:ramp="http://ws.apache.org/rampart/policy"> +                    \
<ramp:user>alice</ramp:user> +                    \
<ramp:encryptionUser>bob</ramp:encryptionUser> +                    \
<ramp:passwordCallbackClass>org.apache.rampart.PWCallback</ramp:passwordCallbackClass>
 +                    <ramp:signatureCrypto>
+                        <ramp:crypto \
provider="org.apache.ws.security.components.crypto.Merlin"> +                         \
<ramp:property name="org.apache.ws.security.crypto.merlin.keystore.type">JKS</ramp:property>
 +                            <ramp:property \
name="org.apache.ws.security.crypto.merlin.file">rampart/store.jks +                  \
</ramp:property> +                            <ramp:property \
name="org.apache.ws.security.crypto.merlin.keystore.password">password +              \
</ramp:property> +                        </ramp:crypto>
+                    </ramp:signatureCrypto>
+                </ramp:RampartConfig>
+            </wsp:All>
+        </wsp:ExactlyOne>
+    </wsp:Policy>
+
+</service>
+<service name="SecureService29">
+    <!--No timestamp test-->
+    <module ref="addressing"/>
+    <module ref="rampart"/>
+
+    <parameter locked="false" \
name="ServiceClass">org.apache.rampart.Service</parameter> +
+    <operation name="echo">
+        <messageReceiver \
class="org.apache.axis2.receivers.RawXMLINOutMessageReceiver"/> +        \
<actionMapping>urn:echo</actionMapping> +    </operation>
+
+    <operation name="returnError">
+        <messageReceiver \
class="org.apache.axis2.receivers.RawXMLINOutMessageReceiver"/> +        \
<actionMapping>urn:returnError</actionMapping> +    </operation>
+
+    <wsp:Policy wsu:Id="SigOnly"
+                xmlns:wsu="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utility-1.0.xsd"
 +                xmlns:wsp="http://schemas.xmlsoap.org/ws/2004/09/policy"
+                xmlns:sp="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy">
+        <wsp:ExactlyOne>
+            <wsp:All>
+                <sp:AsymmetricBinding>
+                    <wsp:Policy>
+                        <sp:InitiatorToken>
+                            <wsp:Policy>
+                                <sp:X509Token
+                                        \
sp:IncludeToken="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy/IncludeToken/AlwaysToRecipient">
 +                                    <wsp:Policy>
+                                        <sp:MustSupportRefThumbprint/>
+                                    </wsp:Policy>
+                                </sp:X509Token>
+                            </wsp:Policy>
+                        </sp:InitiatorToken>
+
+                        <sp:RecipientToken>
+                            <wsp:Policy>
+                                <sp:X509Token
+                                        \
sp:IncludeToken="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy/IncludeToken/Never">
 +                                    <wsp:Policy>
+                                        <sp:WssX509V3Token10/>
+                                    </wsp:Policy>
+                                </sp:X509Token>
+                            </wsp:Policy>
+                        </sp:RecipientToken>
+                        <sp:AlgorithmSuite>
+                            <wsp:Policy>
+                                <sp:TripleDesRsa15/>
+                            </wsp:Policy>
+                        </sp:AlgorithmSuite>
+                        <sp:IncludeTimestamp/>
+                    </wsp:Policy>
+                </sp:AsymmetricBinding>
+                <sp:Wss10>
+                    <wsp:Policy>
+                        <sp:MustSupportRefThumbprint/>
+                    </wsp:Policy>
+                </sp:Wss10>
+                <sp:SignedParts>
+                    <sp:Body/>
+                </sp:SignedParts>
+                <sp:SignedSupportingTokens>
+                    <wsp:Policy>
+                        <sp:UsernameToken
+                                \
sp:IncludeToken="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy/IncludeToken/AlwaysToRecipient"/>
 +                    </wsp:Policy>
+                </sp:SignedSupportingTokens>
+                <ramp:RampartConfig \
xmlns:ramp="http://ws.apache.org/rampart/policy"> +                    \
<ramp:user>alice</ramp:user> +                    \
<ramp:encryptionUser>bob</ramp:encryptionUser> +                    \
<ramp:passwordCallbackClass>org.apache.rampart.PWCallback</ramp:passwordCallbackClass>
 +                    <ramp:signatureCrypto>
+                        <ramp:crypto \
provider="org.apache.ws.security.components.crypto.Merlin"> +                         \
<ramp:property name="org.apache.ws.security.crypto.merlin.keystore.type">JKS</ramp:property>
 +                            <ramp:property \
name="org.apache.ws.security.crypto.merlin.file">rampart/store.jks +                  \
</ramp:property> +                            <ramp:property \
name="org.apache.ws.security.crypto.merlin.keystore.password">password +              \
</ramp:property> +                        </ramp:crypto>
+                    </ramp:signatureCrypto>
+                </ramp:RampartConfig>
+            </wsp:All>
+        </wsp:ExactlyOne>
+    </wsp:Policy>
+
+</service>


[prev in list] [next in list] [prev in thread] [next in thread] 

Configure | About | News | Add a list | Sponsored by KoreLogic