You are viewing a plain text version of this content. The canonical link for it is here.
Posted to rampart-dev@ws.apache.org by sh...@apache.org on 2009/07/16 12:54:47 UTC

svn commit: r794623 - in /webservices/rampart/trunk/c/samples/secpolicy: ./ scenario1/ scenario10/ scenario11/ scenario12/ scenario13/ scenario14/ scenario17/ scenario18/ scenario19/ scenario2/ scenario23/ scenario25/ scenario26/ scenario27/ scenario28...

Author: shankar
Date: Thu Jul 16 10:54:46 2009
New Revision: 794623

URL: http://svn.apache.org/viewvc?rev=794623&view=rev
Log:
Modifying policies according to new signature processing 

Added:
    webservices/rampart/trunk/c/samples/secpolicy/scenario17/sts.xml
    webservices/rampart/trunk/c/samples/secpolicy/scenario18/sts.xml
    webservices/rampart/trunk/c/samples/secpolicy/scenario19/sts.xml
    webservices/rampart/trunk/c/samples/secpolicy/scenario25/rahas_module.xml
    webservices/rampart/trunk/c/samples/secpolicy/scenario26/rahas_module.xml
    webservices/rampart/trunk/c/samples/secpolicy/scenario27/rahas_module.xml
    webservices/rampart/trunk/c/samples/secpolicy/scenario28/rahas_module.xml
Modified:
    webservices/rampart/trunk/c/samples/secpolicy/deploy.bat
    webservices/rampart/trunk/c/samples/secpolicy/run_all.bat
    webservices/rampart/trunk/c/samples/secpolicy/scenario1/client-policy.xml
    webservices/rampart/trunk/c/samples/secpolicy/scenario1/services.xml
    webservices/rampart/trunk/c/samples/secpolicy/scenario10/services.xml
    webservices/rampart/trunk/c/samples/secpolicy/scenario11/services.xml
    webservices/rampart/trunk/c/samples/secpolicy/scenario12/services.xml
    webservices/rampart/trunk/c/samples/secpolicy/scenario13/services.xml
    webservices/rampart/trunk/c/samples/secpolicy/scenario14/services.xml
    webservices/rampart/trunk/c/samples/secpolicy/scenario17/client-policy.xml
    webservices/rampart/trunk/c/samples/secpolicy/scenario17/services.xml
    webservices/rampart/trunk/c/samples/secpolicy/scenario18/client-policy.xml
    webservices/rampart/trunk/c/samples/secpolicy/scenario19/client-policy.xml
    webservices/rampart/trunk/c/samples/secpolicy/scenario2/client-policy.xml
    webservices/rampart/trunk/c/samples/secpolicy/scenario2/services.xml
    webservices/rampart/trunk/c/samples/secpolicy/scenario23/services.xml
    webservices/rampart/trunk/c/samples/secpolicy/scenario25/client-policy.xml
    webservices/rampart/trunk/c/samples/secpolicy/scenario26/services.xml
    webservices/rampart/trunk/c/samples/secpolicy/scenario27/client-policy.xml
    webservices/rampart/trunk/c/samples/secpolicy/scenario28/client-policy.xml
    webservices/rampart/trunk/c/samples/secpolicy/scenario28/services.xml
    webservices/rampart/trunk/c/samples/secpolicy/scenario5/services.xml
    webservices/rampart/trunk/c/samples/secpolicy/scenario6/services.xml
    webservices/rampart/trunk/c/samples/secpolicy/scenario7/client-policy.xml
    webservices/rampart/trunk/c/samples/secpolicy/scenario7/services.xml
    webservices/rampart/trunk/c/samples/secpolicy/scenario9/services.xml

Modified: webservices/rampart/trunk/c/samples/secpolicy/deploy.bat
URL: http://svn.apache.org/viewvc/webservices/rampart/trunk/c/samples/secpolicy/deploy.bat?rev=794623&r1=794622&r2=794623&view=diff
==============================================================================
--- webservices/rampart/trunk/c/samples/secpolicy/deploy.bat (original)
+++ webservices/rampart/trunk/c/samples/secpolicy/deploy.bat Thu Jul 16 10:54:46 2009
@@ -8,4 +8,15 @@
 deploy.js %scn%\client-policy.xml %AXIS2C_HOME%\client_repo\policy.xml
 echo Copying %scn%\services.xml
 deploy.js %scn%\services.xml %AXIS2C_HOME%\services\sec_echo\services.xml
+
+if not exist  %scn%\sts.xml goto no_sts_policy
+echo Copying %scn%\sts.xml
+deploy.js %scn%\sts.xml %AXIS2C_HOME%\services\secconv_echo\services.xml
+
+:no_sts_policy
+if not exist %scn%\rahas_module.xml goto no_rahas_policy
+echo Copying %scn%\rahas_module.xml
+deploy.js %scn%\rahas_module.xml %AXIS2C_HOME%\modules\rahas\module.xml
+
+:no_rahas_policy
 @echo on

Modified: webservices/rampart/trunk/c/samples/secpolicy/run_all.bat
URL: http://svn.apache.org/viewvc/webservices/rampart/trunk/c/samples/secpolicy/run_all.bat?rev=794623&r1=794622&r2=794623&view=diff
==============================================================================
--- webservices/rampart/trunk/c/samples/secpolicy/run_all.bat (original)
+++ webservices/rampart/trunk/c/samples/secpolicy/run_all.bat Thu Jul 16 10:54:46 2009
@@ -7,7 +7,7 @@
 
 
 
-for %%i in (1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 21 22 23 25 26 27 28) do call test_scen.bat %_SCEN%%%i %_PORT% off
+for %%i in (1 2 3 4 5 6 7 8 9 10 11 12 13 15 16 17 18 19 21 22 23 25 26 27 28) do call test_scen.bat %_SCEN%%%i %_PORT% off
     
 taskkill /F /IM axis2_http_server.exe
 echo DONE

Modified: webservices/rampart/trunk/c/samples/secpolicy/scenario1/client-policy.xml
URL: http://svn.apache.org/viewvc/webservices/rampart/trunk/c/samples/secpolicy/scenario1/client-policy.xml?rev=794623&r1=794622&r2=794623&view=diff
==============================================================================
--- webservices/rampart/trunk/c/samples/secpolicy/scenario1/client-policy.xml (original)
+++ webservices/rampart/trunk/c/samples/secpolicy/scenario1/client-policy.xml Thu Jul 16 10:54:46 2009
@@ -21,6 +21,11 @@
                             </sp:X509Token>
                         </wsp:Policy>
                     </sp:RecipientToken>
+                    <sp:AlgorithmSuite>
+                        <wsp:Policy>
+                            <sp:Basic256Rsa15/>
+                        </wsp:Policy>
+                    </sp:AlgorithmSuite>
                     <sp:Layout>
                         <wsp:Policy>
                             <sp:Strict/>
@@ -33,6 +38,9 @@
                 <rampc:TimeToLive>360</rampc:TimeToLive>
 				<rampc:ClockSkewBuffer>60</rampc:ClockSkewBuffer>
 				<rampc:PrecisionInMilliseconds>False</rampc:PrecisionInMilliseconds>
+                <rampc:ReceiverCertificate>AXIS2C_HOME/samples/src/rampartc/data/keys/ahome/bob_cert.cert</rampc:ReceiverCertificate>
+                <rampc:Certificate>AXIS2C_HOME/samples/src/rampartc/data/keys/ahome/alice_cert.cert</rampc:Certificate>
+                <rampc:PrivateKey>AXIS2C_HOME/samples/src/rampartc/data/keys/ahome/alice_key.pem</rampc:PrivateKey>
             </rampc:RampartConfig>
         </wsp:All>
     </wsp:ExactlyOne>

Modified: webservices/rampart/trunk/c/samples/secpolicy/scenario1/services.xml
URL: http://svn.apache.org/viewvc/webservices/rampart/trunk/c/samples/secpolicy/scenario1/services.xml?rev=794623&r1=794622&r2=794623&view=diff
==============================================================================
--- webservices/rampart/trunk/c/samples/secpolicy/scenario1/services.xml (original)
+++ webservices/rampart/trunk/c/samples/secpolicy/scenario1/services.xml Thu Jul 16 10:54:46 2009
@@ -39,13 +39,27 @@
                                 <sp:Strict/>
                             </wsp:Policy>
                         </sp:Layout>
+                        <sp:AlgorithmSuite>
+                            <wsp:Policy>
+                                <sp:Basic256Rsa15/>
+                            </wsp:Policy>
+                        </sp:AlgorithmSuite>
                         <sp:IncludeTimestamp/>
                     </wsp:Policy>
                 </sp:AsymmetricBinding>
+                <sp:Wss10 xmlns:sp="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy">
+                    <wsp:Policy>
+                        <sp:MustSupportRefKeyIdentifier/>
+                        <sp:MustSupportRefEmbeddedToken/>
+                        <sp:MustSupportRefIssuerSerial/>
+                    </wsp:Policy>
+                </sp:Wss10>
                 <rampc:RampartConfig xmlns:rampc="http://ws.apache.org/rampart/c/policy">
                     <!--rampc:TimeToLive>360</rampc:TimeToLive-->
 					<rampc:ClockSkewBuffer>60</rampc:ClockSkewBuffer>
 					<rampc:PrecisionInMilliseconds>True</rampc:PrecisionInMilliseconds>
+					<rampc:Certificate>AXIS2C_HOME/samples/src/rampartc/data/keys/bhome/bob_cert.cert</rampc:Certificate>
+                    <rampc:PrivateKey>AXIS2C_HOME/samples/src/rampartc/data/keys/bhome/bob_key.pem</rampc:PrivateKey>
                 </rampc:RampartConfig>
             </wsp:All>
         </wsp:ExactlyOne>

Modified: webservices/rampart/trunk/c/samples/secpolicy/scenario10/services.xml
URL: http://svn.apache.org/viewvc/webservices/rampart/trunk/c/samples/secpolicy/scenario10/services.xml?rev=794623&r1=794622&r2=794623&view=diff
==============================================================================
--- webservices/rampart/trunk/c/samples/secpolicy/scenario10/services.xml (original)
+++ webservices/rampart/trunk/c/samples/secpolicy/scenario10/services.xml Thu Jul 16 10:54:46 2009
@@ -57,6 +57,7 @@
                 </sp:EncryptedParts>
                 <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>
                 <rampc:RampartConfig xmlns:rampc="http://ws.apache.org/rampart/c/policy">
                     <rampc:User>Bob</rampc:User>

Modified: webservices/rampart/trunk/c/samples/secpolicy/scenario11/services.xml
URL: http://svn.apache.org/viewvc/webservices/rampart/trunk/c/samples/secpolicy/scenario11/services.xml?rev=794623&r1=794622&r2=794623&view=diff
==============================================================================
--- webservices/rampart/trunk/c/samples/secpolicy/scenario11/services.xml (original)
+++ webservices/rampart/trunk/c/samples/secpolicy/scenario11/services.xml Thu Jul 16 10:54:46 2009
@@ -56,6 +56,7 @@
                 </sp:EncryptedParts>
                 <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>
                 <rampc:RampartConfig xmlns:rampc="http://ws.apache.org/rampart/c/policy">
                     <rampc:User>Bob</rampc:User>

Modified: webservices/rampart/trunk/c/samples/secpolicy/scenario12/services.xml
URL: http://svn.apache.org/viewvc/webservices/rampart/trunk/c/samples/secpolicy/scenario12/services.xml?rev=794623&r1=794622&r2=794623&view=diff
==============================================================================
--- webservices/rampart/trunk/c/samples/secpolicy/scenario12/services.xml (original)
+++ webservices/rampart/trunk/c/samples/secpolicy/scenario12/services.xml Thu Jul 16 10:54:46 2009
@@ -57,6 +57,7 @@
                 </sp:EncryptedParts>
                 <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>
                 <rampc:RampartConfig xmlns:rampc="http://ws.apache.org/rampart/c/policy">
                     <rampc:User>Bob</rampc:User>

Modified: webservices/rampart/trunk/c/samples/secpolicy/scenario13/services.xml
URL: http://svn.apache.org/viewvc/webservices/rampart/trunk/c/samples/secpolicy/scenario13/services.xml?rev=794623&r1=794622&r2=794623&view=diff
==============================================================================
--- webservices/rampart/trunk/c/samples/secpolicy/scenario13/services.xml (original)
+++ webservices/rampart/trunk/c/samples/secpolicy/scenario13/services.xml Thu Jul 16 10:54:46 2009
@@ -58,6 +58,7 @@
                 </sp:EncryptedParts>
                 <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>
                 <rampc:RampartConfig xmlns:rampc="http://ws.apache.org/rampart/c/policy">
                     <rampc:User>Bob</rampc:User>

Modified: webservices/rampart/trunk/c/samples/secpolicy/scenario14/services.xml
URL: http://svn.apache.org/viewvc/webservices/rampart/trunk/c/samples/secpolicy/scenario14/services.xml?rev=794623&r1=794622&r2=794623&view=diff
==============================================================================
--- webservices/rampart/trunk/c/samples/secpolicy/scenario14/services.xml (original)
+++ webservices/rampart/trunk/c/samples/secpolicy/scenario14/services.xml Thu Jul 16 10:54:46 2009
@@ -57,6 +57,7 @@
                 </sp:EncryptedParts>
                 <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>
                 <rampc:RampartConfig xmlns:rampc="http://ws.apache.org/rampart/c/policy">
                     <rampc:User>Bob</rampc:User>

Modified: webservices/rampart/trunk/c/samples/secpolicy/scenario17/client-policy.xml
URL: http://svn.apache.org/viewvc/webservices/rampart/trunk/c/samples/secpolicy/scenario17/client-policy.xml?rev=794623&r1=794622&r2=794623&view=diff
==============================================================================
--- webservices/rampart/trunk/c/samples/secpolicy/scenario17/client-policy.xml (original)
+++ webservices/rampart/trunk/c/samples/secpolicy/scenario17/client-policy.xml Thu Jul 16 10:54:46 2009
@@ -38,12 +38,19 @@
 																	<sp:Strict/>
 																</wsp:Policy>
 															</sp:Layout>
+															<sp:AlgorithmSuite>
+                                                                <wsp:Policy>
+                                                                    <sp:Basic256/>
+                                                                </wsp:Policy>
+                                                            </sp:AlgorithmSuite>
 															<sp:IncludeTimestamp/>
 														</wsp:Policy>
 													</sp:AsymmetricBinding>
 													<rampc:RampartConfig xmlns:rampc="http://ws.apache.org/rampart/c/policy">
-														<rampc:TimeToLive>360</rampc:TimeToLive>
-													</rampc:RampartConfig>
+                                                        <rampc:ReceiverCertificate>AXIS2C_HOME/samples/src/rampartc/data/keys/ahome/bob_cert.cert</rampc:ReceiverCertificate>
+                                                        <rampc:Certificate>AXIS2C_HOME/samples/src/rampartc/data/keys/ahome/alice_cert.cert</rampc:Certificate>
+                                                        <rampc:PrivateKey>AXIS2C_HOME/samples/src/rampartc/data/keys/ahome/alice_key.pem</rampc:PrivateKey>
+                                                    </rampc:RampartConfig>
 												</wsp:All>
 											</wsp:ExactlyOne>
 										</wsp:Policy>
@@ -97,6 +104,9 @@
                 <rampc:PasswordType>Digest</rampc:PasswordType>
                 <rampc:PasswordCallbackClass>AXIS2C_HOME/samples/lib/rampartc/libpwcb.so</rampc:PasswordCallbackClass>
 				<rampc:SecurityContextTokenProvider>AXIS2C_HOME/samples/lib/rampartc/libsctprovider_hashdb.so</rampc:SecurityContextTokenProvider>
+				<rampc:ReceiverCertificate>AXIS2C_HOME/samples/src/rampartc/data/keys/ahome/bob_cert.cert</rampc:ReceiverCertificate>
+                <rampc:Certificate>AXIS2C_HOME/samples/src/rampartc/data/keys/ahome/alice_cert.cert</rampc:Certificate>
+                <rampc:PrivateKey>AXIS2C_HOME/samples/src/rampartc/data/keys/ahome/alice_key.pem</rampc:PrivateKey>
             </rampc:RampartConfig>
         </wsp:All>
     </wsp:ExactlyOne>

Modified: webservices/rampart/trunk/c/samples/secpolicy/scenario17/services.xml
URL: http://svn.apache.org/viewvc/webservices/rampart/trunk/c/samples/secpolicy/scenario17/services.xml?rev=794623&r1=794622&r2=794623&view=diff
==============================================================================
--- webservices/rampart/trunk/c/samples/secpolicy/scenario17/services.xml (original)
+++ webservices/rampart/trunk/c/samples/secpolicy/scenario17/services.xml Thu Jul 16 10:54:46 2009
@@ -58,7 +58,6 @@
 												</wsp:All>
 											</wsp:ExactlyOne>
 										</wsp:Policy>
-
 									</sp:BootstrapPolicy>
 								</wsp:Policy>
                             </sp:SecureConversationToken>

Added: webservices/rampart/trunk/c/samples/secpolicy/scenario17/sts.xml
URL: http://svn.apache.org/viewvc/webservices/rampart/trunk/c/samples/secpolicy/scenario17/sts.xml?rev=794623&view=auto
==============================================================================
--- webservices/rampart/trunk/c/samples/secpolicy/scenario17/sts.xml (added)
+++ webservices/rampart/trunk/c/samples/secpolicy/scenario17/sts.xml Thu Jul 16 10:54:46 2009
@@ -0,0 +1,77 @@
+<service name="secconv_echo">
+	<parameter name="ServiceClass" locked="xsd:false">secconv_echo
+	</parameter>
+
+	<description>
+		This is a testing service , to test Rampart/C [Security] functionalities.
+	</description>
+	<!--Rampart configurations START -->
+	<module ref="rampart" />
+
+	<!--Rampart configurations END -->
+
+	<operation name="RequestSecurityToken">
+		<!--messageReceiver class="axis2_receivers" /-->
+	</operation>
+
+	<operation name="echoString">
+		<!--messageReceiver class="axis2_receivers" /-->
+		<parameter name="wsamapping">http://example.com/ws/2004/09/policy/Test/EchoRequest
+		</parameter>
+	</operation>
+
+	<wsp:Policy xmlns:wsp="http://schemas.xmlsoap.org/ws/2004/09/policy">
+		<wsp:ExactlyOne>
+			<wsp:All>
+				<sp:AsymmetricBinding
+					xmlns:sp="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy">
+					<wsp:Policy>
+						<sp:InitiatorToken>
+							<wsp:Policy>
+								<sp:X509Token
+									sp:IncludeToken="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy/IncludeToken/AlwaysToRecipient">
+									<wsp:Policy>
+										<sp:WssX509V3Token10 />
+									</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:Layout>
+							<wsp:Policy>
+								<sp:Strict />
+							</wsp:Policy>
+						</sp:Layout>
+						<sp:AlgorithmSuite>
+							<wsp:Policy>
+								<sp:Basic256 />
+							</wsp:Policy>
+						</sp:AlgorithmSuite>
+						<sp:IncludeTimestamp />
+					</wsp:Policy>
+				</sp:AsymmetricBinding>
+				<sp:Wss10 xmlns:sp="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy">
+                    <wsp:Policy>
+                        <sp:MustSupportRefKeyIdentifier/>
+                        <sp:MustSupportRefEmbeddedToken/>
+                        <sp:MustSupportRefIssuerSerial/>
+                    </wsp:Policy>
+                </sp:Wss10>
+				<rampc:RampartConfig xmlns:rampc="http://ws.apache.org/rampart/c/policy">
+					<rampc:ReceiverCertificate>AXIS2C_HOME/samples/src/rampartc/data/keys/ahome/alice_cert.cert</rampc:ReceiverCertificate>
+					<rampc:Certificate>AXIS2C_HOME/samples/src/rampartc/data/keys/ahome/bob_cert.cert</rampc:Certificate>
+					<rampc:PrivateKey>AXIS2C_HOME/samples/src/rampartc/data/keys/ahome/bob_key.pem</rampc:PrivateKey>
+				</rampc:RampartConfig>
+			</wsp:All>
+		</wsp:ExactlyOne>
+	</wsp:Policy>
+</service>
\ No newline at end of file

Modified: webservices/rampart/trunk/c/samples/secpolicy/scenario18/client-policy.xml
URL: http://svn.apache.org/viewvc/webservices/rampart/trunk/c/samples/secpolicy/scenario18/client-policy.xml?rev=794623&r1=794622&r2=794623&view=diff
==============================================================================
--- webservices/rampart/trunk/c/samples/secpolicy/scenario18/client-policy.xml (original)
+++ webservices/rampart/trunk/c/samples/secpolicy/scenario18/client-policy.xml Thu Jul 16 10:54:46 2009
@@ -38,11 +38,19 @@
 																	<sp:Strict/>
 																</wsp:Policy>
 															</sp:Layout>
+															<sp:AlgorithmSuite>
+                                                                <wsp:Policy>
+                                                                    <sp:Basic256/>
+                                                                </wsp:Policy>
+                                                            </sp:AlgorithmSuite>
 															<sp:IncludeTimestamp/>
 														</wsp:Policy>
 													</sp:AsymmetricBinding>
 													<rampc:RampartConfig xmlns:rampc="http://ws.apache.org/rampart/c/policy">
 														<rampc:TimeToLive>360</rampc:TimeToLive>
+                                                        <rampc:ReceiverCertificate>AXIS2C_HOME/samples/src/rampartc/data/keys/ahome/bob_cert.cert</rampc:ReceiverCertificate>
+                                                        <rampc:Certificate>AXIS2C_HOME/samples/src/rampartc/data/keys/ahome/alice_cert.cert</rampc:Certificate>
+                                                        <rampc:PrivateKey>AXIS2C_HOME/samples/src/rampartc/data/keys/ahome/alice_key.pem</rampc:PrivateKey>
 													</rampc:RampartConfig>
 												</wsp:All>
 											</wsp:ExactlyOne>
@@ -88,11 +96,19 @@
 																	<sp:Strict/>
 																</wsp:Policy>
 															</sp:Layout>
+															<sp:AlgorithmSuite>
+                                                                <wsp:Policy>
+                                                                    <sp:Basic256/>
+                                                                </wsp:Policy>
+                                                            </sp:AlgorithmSuite>
 															<sp:IncludeTimestamp/>
 														</wsp:Policy>
 													</sp:AsymmetricBinding>
 													<rampc:RampartConfig xmlns:rampc="http://ws.apache.org/rampart/c/policy">
 														<rampc:TimeToLive>360</rampc:TimeToLive>
+														<rampc:ReceiverCertificate>AXIS2C_HOME/samples/src/rampartc/data/keys/ahome/bob_cert.cert</rampc:ReceiverCertificate>
+                                                        <rampc:Certificate>AXIS2C_HOME/samples/src/rampartc/data/keys/ahome/alice_cert.cert</rampc:Certificate>
+                                                        <rampc:PrivateKey>AXIS2C_HOME/samples/src/rampartc/data/keys/ahome/alice_key.pem</rampc:PrivateKey>
 													</rampc:RampartConfig>
 												</wsp:All>
 											</wsp:ExactlyOne>

Added: webservices/rampart/trunk/c/samples/secpolicy/scenario18/sts.xml
URL: http://svn.apache.org/viewvc/webservices/rampart/trunk/c/samples/secpolicy/scenario18/sts.xml?rev=794623&view=auto
==============================================================================
--- webservices/rampart/trunk/c/samples/secpolicy/scenario18/sts.xml (added)
+++ webservices/rampart/trunk/c/samples/secpolicy/scenario18/sts.xml Thu Jul 16 10:54:46 2009
@@ -0,0 +1,77 @@
+<service name="secconv_echo">
+	<parameter name="ServiceClass" locked="xsd:false">secconv_echo
+	</parameter>
+
+	<description>
+		This is a testing service , to test Rampart/C [Security] functionalities.
+	</description>
+	<!--Rampart configurations START -->
+	<module ref="rampart" />
+
+	<!--Rampart configurations END -->
+
+	<operation name="RequestSecurityToken">
+		<!--messageReceiver class="axis2_receivers" /-->
+	</operation>
+
+	<operation name="echoString">
+		<!--messageReceiver class="axis2_receivers" /-->
+		<parameter name="wsamapping">http://example.com/ws/2004/09/policy/Test/EchoRequest
+		</parameter>
+	</operation>
+
+	<wsp:Policy xmlns:wsp="http://schemas.xmlsoap.org/ws/2004/09/policy">
+		<wsp:ExactlyOne>
+			<wsp:All>
+				<sp:AsymmetricBinding
+					xmlns:sp="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy">
+					<wsp:Policy>
+						<sp:InitiatorToken>
+							<wsp:Policy>
+								<sp:X509Token
+									sp:IncludeToken="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy/IncludeToken/AlwaysToRecipient">
+									<wsp:Policy>
+										<sp:WssX509V3Token10 />
+									</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:Layout>
+							<wsp:Policy>
+								<sp:Strict />
+							</wsp:Policy>
+						</sp:Layout>
+						<sp:AlgorithmSuite>
+							<wsp:Policy>
+								<sp:Basic256 />
+							</wsp:Policy>
+						</sp:AlgorithmSuite>
+						<sp:IncludeTimestamp />
+					</wsp:Policy>
+				</sp:AsymmetricBinding>
+				<sp:Wss10 xmlns:sp="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy">
+                    <wsp:Policy>
+                        <sp:MustSupportRefKeyIdentifier/>
+                        <sp:MustSupportRefEmbeddedToken/>
+                        <sp:MustSupportRefIssuerSerial/>
+                    </wsp:Policy>
+                </sp:Wss10>
+				<rampc:RampartConfig xmlns:rampc="http://ws.apache.org/rampart/c/policy">
+					<rampc:ReceiverCertificate>AXIS2C_HOME/samples/src/rampartc/data/keys/ahome/alice_cert.cert</rampc:ReceiverCertificate>
+					<rampc:Certificate>AXIS2C_HOME/samples/src/rampartc/data/keys/ahome/bob_cert.cert</rampc:Certificate>
+					<rampc:PrivateKey>AXIS2C_HOME/samples/src/rampartc/data/keys/ahome/bob_key.pem</rampc:PrivateKey>
+				</rampc:RampartConfig>
+			</wsp:All>
+		</wsp:ExactlyOne>
+	</wsp:Policy>
+</service>
\ No newline at end of file

Modified: webservices/rampart/trunk/c/samples/secpolicy/scenario19/client-policy.xml
URL: http://svn.apache.org/viewvc/webservices/rampart/trunk/c/samples/secpolicy/scenario19/client-policy.xml?rev=794623&r1=794622&r2=794623&view=diff
==============================================================================
--- webservices/rampart/trunk/c/samples/secpolicy/scenario19/client-policy.xml (original)
+++ webservices/rampart/trunk/c/samples/secpolicy/scenario19/client-policy.xml Thu Jul 16 10:54:46 2009
@@ -37,11 +37,19 @@
 																	<sp:Strict/>
 																</wsp:Policy>
 															</sp:Layout>
+															<sp:AlgorithmSuite>
+                                                                <wsp:Policy>
+                                                                    <sp:Basic256/>
+                                                                </wsp:Policy>
+                                                            </sp:AlgorithmSuite>
 															<sp:IncludeTimestamp/>
 														</wsp:Policy>
 													</sp:AsymmetricBinding>
 													<rampc:RampartConfig xmlns:rampc="http://ws.apache.org/rampart/c/policy">
 														<rampc:TimeToLive>360</rampc:TimeToLive>
+														<rampc:ReceiverCertificate>AXIS2C_HOME/samples/src/rampartc/data/keys/ahome/bob_cert.cert</rampc:ReceiverCertificate>
+                                                        <rampc:Certificate>AXIS2C_HOME/samples/src/rampartc/data/keys/ahome/alice_cert.cert</rampc:Certificate>
+                                                        <rampc:PrivateKey>AXIS2C_HOME/samples/src/rampartc/data/keys/ahome/alice_key.pem</rampc:PrivateKey>
 													</rampc:RampartConfig>
 												</wsp:All>
 											</wsp:ExactlyOne>
@@ -85,11 +93,19 @@
 																	<sp:Strict/>
 																</wsp:Policy>
 															</sp:Layout>
+															<sp:AlgorithmSuite>
+                                                                <wsp:Policy>
+                                                                    <sp:Basic256/>
+                                                                </wsp:Policy>
+                                                            </sp:AlgorithmSuite>
 															<sp:IncludeTimestamp/>
 														</wsp:Policy>
 													</sp:AsymmetricBinding>
 													<rampc:RampartConfig xmlns:rampc="http://ws.apache.org/rampart/c/policy">
 														<rampc:TimeToLive>360</rampc:TimeToLive>
+														<rampc:ReceiverCertificate>AXIS2C_HOME/samples/src/rampartc/data/keys/ahome/bob_cert.cert</rampc:ReceiverCertificate>
+                                                        <rampc:Certificate>AXIS2C_HOME/samples/src/rampartc/data/keys/ahome/alice_cert.cert</rampc:Certificate>
+                                                        <rampc:PrivateKey>AXIS2C_HOME/samples/src/rampartc/data/keys/ahome/alice_key.pem</rampc:PrivateKey>
 													</rampc:RampartConfig>
 												</wsp:All>
 											</wsp:ExactlyOne>

Added: webservices/rampart/trunk/c/samples/secpolicy/scenario19/sts.xml
URL: http://svn.apache.org/viewvc/webservices/rampart/trunk/c/samples/secpolicy/scenario19/sts.xml?rev=794623&view=auto
==============================================================================
--- webservices/rampart/trunk/c/samples/secpolicy/scenario19/sts.xml (added)
+++ webservices/rampart/trunk/c/samples/secpolicy/scenario19/sts.xml Thu Jul 16 10:54:46 2009
@@ -0,0 +1,77 @@
+<service name="secconv_echo">
+	<parameter name="ServiceClass" locked="xsd:false">secconv_echo
+	</parameter>
+
+	<description>
+		This is a testing service , to test Rampart/C [Security] functionalities.
+	</description>
+	<!--Rampart configurations START -->
+	<module ref="rampart" />
+
+	<!--Rampart configurations END -->
+
+	<operation name="RequestSecurityToken">
+		<!--messageReceiver class="axis2_receivers" /-->
+	</operation>
+
+	<operation name="echoString">
+		<!--messageReceiver class="axis2_receivers" /-->
+		<parameter name="wsamapping">http://example.com/ws/2004/09/policy/Test/EchoRequest
+		</parameter>
+	</operation>
+
+	<wsp:Policy xmlns:wsp="http://schemas.xmlsoap.org/ws/2004/09/policy">
+		<wsp:ExactlyOne>
+			<wsp:All>
+				<sp:AsymmetricBinding
+					xmlns:sp="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy">
+					<wsp:Policy>
+						<sp:InitiatorToken>
+							<wsp:Policy>
+								<sp:X509Token
+									sp:IncludeToken="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy/IncludeToken/AlwaysToRecipient">
+									<wsp:Policy>
+										<sp:WssX509V3Token10 />
+									</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:Layout>
+							<wsp:Policy>
+								<sp:Strict />
+							</wsp:Policy>
+						</sp:Layout>
+						<sp:AlgorithmSuite>
+							<wsp:Policy>
+								<sp:Basic256 />
+							</wsp:Policy>
+						</sp:AlgorithmSuite>
+						<sp:IncludeTimestamp />
+					</wsp:Policy>
+				</sp:AsymmetricBinding>
+				<sp:Wss10 xmlns:sp="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy">
+                    <wsp:Policy>
+                        <sp:MustSupportRefKeyIdentifier/>
+                        <sp:MustSupportRefEmbeddedToken/>
+                        <sp:MustSupportRefIssuerSerial/>
+                    </wsp:Policy>
+                </sp:Wss10>
+				<rampc:RampartConfig xmlns:rampc="http://ws.apache.org/rampart/c/policy">
+					<rampc:ReceiverCertificate>AXIS2C_HOME/samples/src/rampartc/data/keys/ahome/alice_cert.cert</rampc:ReceiverCertificate>
+					<rampc:Certificate>AXIS2C_HOME/samples/src/rampartc/data/keys/ahome/bob_cert.cert</rampc:Certificate>
+					<rampc:PrivateKey>AXIS2C_HOME/samples/src/rampartc/data/keys/ahome/bob_key.pem</rampc:PrivateKey>
+				</rampc:RampartConfig>
+			</wsp:All>
+		</wsp:ExactlyOne>
+	</wsp:Policy>
+</service>
\ No newline at end of file

Modified: webservices/rampart/trunk/c/samples/secpolicy/scenario2/client-policy.xml
URL: http://svn.apache.org/viewvc/webservices/rampart/trunk/c/samples/secpolicy/scenario2/client-policy.xml?rev=794623&r1=794622&r2=794623&view=diff
==============================================================================
--- webservices/rampart/trunk/c/samples/secpolicy/scenario2/client-policy.xml (original)
+++ webservices/rampart/trunk/c/samples/secpolicy/scenario2/client-policy.xml Thu Jul 16 10:54:46 2009
@@ -26,6 +26,11 @@
                             <sp:Strict/>
                         </wsp:Policy>
                     </sp:Layout>
+                    <sp:AlgorithmSuite>
+                        <wsp:Policy>
+                            <sp:Basic256Rsa15/>
+                        </wsp:Policy>
+                    </sp:AlgorithmSuite>
                 </wsp:Policy>
             </sp:AsymmetricBinding>
             <sp:SignedSupportingTokens xmlns:sp="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy">
@@ -37,6 +42,9 @@
                 <rampc:User>Alice</rampc:User>
                 <rampc:PasswordType>Digest</rampc:PasswordType>
                 <rampc:PasswordCallbackClass>AXIS2C_HOME/samples/lib/rampartc/libpwcb.so</rampc:PasswordCallbackClass>
+                <rampc:ReceiverCertificate>AXIS2C_HOME/samples/src/rampartc/data/keys/ahome/bob_cert.cert</rampc:ReceiverCertificate>
+                <rampc:Certificate>AXIS2C_HOME/samples/src/rampartc/data/keys/ahome/alice_cert.cert</rampc:Certificate>
+                <rampc:PrivateKey>AXIS2C_HOME/samples/src/rampartc/data/keys/ahome/alice_key.pem</rampc:PrivateKey>
             </rampc:RampartConfig>
         </wsp:All>
     </wsp:ExactlyOne>

Modified: webservices/rampart/trunk/c/samples/secpolicy/scenario2/services.xml
URL: http://svn.apache.org/viewvc/webservices/rampart/trunk/c/samples/secpolicy/scenario2/services.xml?rev=794623&r1=794622&r2=794623&view=diff
==============================================================================
--- webservices/rampart/trunk/c/samples/secpolicy/scenario2/services.xml (original)
+++ webservices/rampart/trunk/c/samples/secpolicy/scenario2/services.xml Thu Jul 16 10:54:46 2009
@@ -38,8 +38,20 @@
                                 <sp:Strict/>
                             </wsp:Policy>
                         </sp:Layout>
+                        <sp:AlgorithmSuite>
+                            <wsp:Policy>
+                                <sp:Basic256Rsa15/>
+                            </wsp:Policy>
+                        </sp:AlgorithmSuite>
                     </wsp:Policy>
                 </sp:AsymmetricBinding>
+                <sp:Wss10 xmlns:sp="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy">
+                    <wsp:Policy>
+                        <sp:MustSupportRefKeyIdentifier/>
+                        <sp:MustSupportRefEmbeddedToken/>
+                        <sp:MustSupportRefIssuerSerial/>
+                    </wsp:Policy>
+                </sp:Wss10>
                 <sp:SignedSupportingTokens xmlns:sp="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy">
                 <wsp:Policy>
                     <sp:UsernameToken sp:IncludeToken="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy/IncludeToken/Always"/>

Modified: webservices/rampart/trunk/c/samples/secpolicy/scenario23/services.xml
URL: http://svn.apache.org/viewvc/webservices/rampart/trunk/c/samples/secpolicy/scenario23/services.xml?rev=794623&r1=794622&r2=794623&view=diff
==============================================================================
--- webservices/rampart/trunk/c/samples/secpolicy/scenario23/services.xml (original)
+++ webservices/rampart/trunk/c/samples/secpolicy/scenario23/services.xml Thu Jul 16 10:54:46 2009
@@ -64,6 +64,7 @@
                 </sp:EncryptedParts>
                 <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>
                 <rampc:RampartConfig xmlns:rampc="http://ws.apache.org/rampart/c/policy">
                     <rampc:User>Alice</rampc:User>

Modified: webservices/rampart/trunk/c/samples/secpolicy/scenario25/client-policy.xml
URL: http://svn.apache.org/viewvc/webservices/rampart/trunk/c/samples/secpolicy/scenario25/client-policy.xml?rev=794623&r1=794622&r2=794623&view=diff
==============================================================================
--- webservices/rampart/trunk/c/samples/secpolicy/scenario25/client-policy.xml (original)
+++ webservices/rampart/trunk/c/samples/secpolicy/scenario25/client-policy.xml Thu Jul 16 10:54:46 2009
@@ -36,11 +36,19 @@
 																	<sp:Strict/>
 																</wsp:Policy>
 															</sp:Layout>
+															<sp:AlgorithmSuite>
+                                                                <wsp:Policy>
+                                                                    <sp:Basic256/>
+                                                                </wsp:Policy>
+                                                            </sp:AlgorithmSuite>
 															<sp:IncludeTimestamp/>
 														</wsp:Policy>
 													</sp:AsymmetricBinding>
 													<rampc:RampartConfig xmlns:rampc="http://ws.apache.org/rampart/c/policy">
 														<rampc:TimeToLive>360</rampc:TimeToLive>
+														<rampc:ReceiverCertificate>AXIS2C_HOME/samples/src/rampartc/data/keys/ahome/bob_cert.cert</rampc:ReceiverCertificate>
+                                                        <rampc:Certificate>AXIS2C_HOME/samples/src/rampartc/data/keys/ahome/alice_cert.cert</rampc:Certificate>
+                                                        <rampc:PrivateKey>AXIS2C_HOME/samples/src/rampartc/data/keys/ahome/alice_key.pem</rampc:PrivateKey>
 													</rampc:RampartConfig>
 												</wsp:All>
 											</wsp:ExactlyOne>
@@ -83,11 +91,19 @@
 																	<sp:Strict/>
 																</wsp:Policy>
 															</sp:Layout>
+															<sp:AlgorithmSuite>
+                                                                <wsp:Policy>
+                                                                    <sp:Basic256/>
+                                                                </wsp:Policy>
+                                                            </sp:AlgorithmSuite>
 															<sp:IncludeTimestamp/>
 														</wsp:Policy>
 													</sp:AsymmetricBinding>
 													<rampc:RampartConfig xmlns:rampc="http://ws.apache.org/rampart/c/policy">
 														<rampc:TimeToLive>360</rampc:TimeToLive>
+														<rampc:ReceiverCertificate>AXIS2C_HOME/samples/src/rampartc/data/keys/ahome/bob_cert.cert</rampc:ReceiverCertificate>
+                                                        <rampc:Certificate>AXIS2C_HOME/samples/src/rampartc/data/keys/ahome/alice_cert.cert</rampc:Certificate>
+                                                        <rampc:PrivateKey>AXIS2C_HOME/samples/src/rampartc/data/keys/ahome/alice_key.pem</rampc:PrivateKey>
 													</rampc:RampartConfig>
 												</wsp:All>
 											</wsp:ExactlyOne>

Added: webservices/rampart/trunk/c/samples/secpolicy/scenario25/rahas_module.xml
URL: http://svn.apache.org/viewvc/webservices/rampart/trunk/c/samples/secpolicy/scenario25/rahas_module.xml?rev=794623&view=auto
==============================================================================
--- webservices/rampart/trunk/c/samples/secpolicy/scenario25/rahas_module.xml (added)
+++ webservices/rampart/trunk/c/samples/secpolicy/scenario25/rahas_module.xml Thu Jul 16 10:54:46 2009
@@ -0,0 +1,120 @@
+<module name="rahas" class="mod_rahas">
+    <inflow>
+        <handler name="RahasInHandler" class="mod_rahas">
+            <order phase="Rahas"/>
+        </handler>
+    </inflow>
+
+	<operation name="SecConv10Issue">
+		<actionMapping>http://schemas.xmlsoap.org/ws/2005/02/trust/RST/SCT</actionMapping>
+		<wsp:Policy xmlns:wsp="http://schemas.xmlsoap.org/ws/2004/09/policy">
+			<wsp:ExactlyOne>
+				<wsp:All>
+					<sp:AsymmetricBinding xmlns:sp="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy">
+						<wsp:Policy>
+							<sp:InitiatorToken>
+								<wsp:Policy>
+									<sp:X509Token sp:IncludeToken="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy/IncludeToken/AlwaysToRecipient">
+										<wsp:Policy>
+											<sp:WssX509V3Token10/>
+										</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:Layout>
+								<wsp:Policy>
+									<sp:Strict/>
+								</wsp:Policy>
+							</sp:Layout>
+							<sp:AlgorithmSuite>
+                                <wsp:Policy>
+                                    <sp:Basic256 />
+                                </wsp:Policy>
+                            </sp:AlgorithmSuite>
+							<sp:IncludeTimestamp/>
+						</wsp:Policy>
+					</sp:AsymmetricBinding>
+					<sp:Wss10 xmlns:sp="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy">
+                        <wsp:Policy>
+	                        <sp:MustSupportRefKeyIdentifier/>
+	                        <sp:MustSupportRefEmbeddedToken/>
+	                        <sp:MustSupportRefIssuerSerial/>
+	                    </wsp:Policy>
+	                </sp:Wss10>
+					<rampc:RampartConfig xmlns:rampc="http://ws.apache.org/rampart/c/policy">
+						<rampc:TimeToLive>360</rampc:TimeToLive>
+						<rampc:ReceiverCertificate>AXIS2C_HOME/samples/src/rampartc/data/keys/ahome/alice_cert.cert</rampc:ReceiverCertificate>
+						<rampc:Certificate>AXIS2C_HOME/samples/src/rampartc/data/keys/ahome/bob_cert.cert</rampc:Certificate>
+						<rampc:PrivateKey>AXIS2C_HOME/samples/src/rampartc/data/keys/ahome/bob_key.pem</rampc:PrivateKey>
+					</rampc:RampartConfig>
+				</wsp:All>
+			</wsp:ExactlyOne>
+		</wsp:Policy>
+	</operation>
+
+	<operation name="SecConv13Issue">
+		<actionMapping>http://docs.oasis-open.org/ws-sx/ws-trust/200512/RST/SCT</actionMapping>
+		<wsp:Policy xmlns:wsp="http://schemas.xmlsoap.org/ws/2004/09/policy">
+			<wsp:ExactlyOne>
+				<wsp:All>
+					<sp:AsymmetricBinding xmlns:sp="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy">
+						<wsp:Policy>
+							<sp:InitiatorToken>
+								<wsp:Policy>
+									<sp:X509Token sp:IncludeToken="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy/IncludeToken/AlwaysToRecipient">
+										<wsp:Policy>
+											<sp:WssX509V3Token10/>
+										</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:Layout>
+								<wsp:Policy>
+									<sp:Strict/>
+								</wsp:Policy>
+							</sp:Layout>
+							<sp:AlgorithmSuite>
+								<wsp:Policy>
+									<sp:Basic256 />
+								</wsp:Policy>
+							</sp:AlgorithmSuite>
+							<sp:IncludeTimestamp/>
+						</wsp:Policy>
+					</sp:AsymmetricBinding>
+					<sp:Wss10 xmlns:sp="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy">
+                        <wsp:Policy>
+                            <sp:MustSupportRefKeyIdentifier/>
+                            <sp:MustSupportRefEmbeddedToken/>
+                            <sp:MustSupportRefIssuerSerial/>
+                        </wsp:Policy>
+                    </sp:Wss10>
+					<rampc:RampartConfig xmlns:rampc="http://ws.apache.org/rampart/c/policy">
+						<rampc:TimeToLive>360</rampc:TimeToLive>
+						<rampc:ReceiverCertificate>AXIS2C_HOME/samples/src/rampartc/data/keys/ahome/alice_cert.cert</rampc:ReceiverCertificate>
+                        <rampc:Certificate>AXIS2C_HOME/samples/src/rampartc/data/keys/ahome/bob_cert.cert</rampc:Certificate>
+                        <rampc:PrivateKey>AXIS2C_HOME/samples/src/rampartc/data/keys/ahome/bob_key.pem</rampc:PrivateKey>
+					</rampc:RampartConfig>
+				</wsp:All>
+			</wsp:ExactlyOne>
+		</wsp:Policy>
+	</operation>
+
+</module>

Added: webservices/rampart/trunk/c/samples/secpolicy/scenario26/rahas_module.xml
URL: http://svn.apache.org/viewvc/webservices/rampart/trunk/c/samples/secpolicy/scenario26/rahas_module.xml?rev=794623&view=auto
==============================================================================
--- webservices/rampart/trunk/c/samples/secpolicy/scenario26/rahas_module.xml (added)
+++ webservices/rampart/trunk/c/samples/secpolicy/scenario26/rahas_module.xml Thu Jul 16 10:54:46 2009
@@ -0,0 +1,120 @@
+<module name="rahas" class="mod_rahas">
+    <inflow>
+        <handler name="RahasInHandler" class="mod_rahas">
+            <order phase="Rahas"/>
+        </handler>
+    </inflow>
+
+	<operation name="SecConv10Issue">
+		<actionMapping>http://schemas.xmlsoap.org/ws/2005/02/trust/RST/SCT</actionMapping>
+		<wsp:Policy xmlns:wsp="http://schemas.xmlsoap.org/ws/2004/09/policy">
+			<wsp:ExactlyOne>
+				<wsp:All>
+					<sp:AsymmetricBinding xmlns:sp="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy">
+						<wsp:Policy>
+							<sp:InitiatorToken>
+								<wsp:Policy>
+									<sp:X509Token sp:IncludeToken="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy/IncludeToken/AlwaysToRecipient">
+										<wsp:Policy>
+											<sp:WssX509V3Token10/>
+										</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:Layout>
+								<wsp:Policy>
+									<sp:Strict/>
+								</wsp:Policy>
+							</sp:Layout>
+							<sp:AlgorithmSuite>
+                                <wsp:Policy>
+                                    <sp:Basic256 />
+                                </wsp:Policy>
+                            </sp:AlgorithmSuite>
+							<sp:IncludeTimestamp/>
+						</wsp:Policy>
+					</sp:AsymmetricBinding>
+					<sp:Wss10 xmlns:sp="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy">
+                        <wsp:Policy>
+	                        <sp:MustSupportRefKeyIdentifier/>
+	                        <sp:MustSupportRefEmbeddedToken/>
+	                        <sp:MustSupportRefIssuerSerial/>
+	                    </wsp:Policy>
+	                </sp:Wss10>
+					<rampc:RampartConfig xmlns:rampc="http://ws.apache.org/rampart/c/policy">
+						<rampc:TimeToLive>360</rampc:TimeToLive>
+						<rampc:ReceiverCertificate>AXIS2C_HOME/samples/src/rampartc/data/keys/ahome/alice_cert.cert</rampc:ReceiverCertificate>
+						<rampc:Certificate>AXIS2C_HOME/samples/src/rampartc/data/keys/ahome/bob_cert.cert</rampc:Certificate>
+						<rampc:PrivateKey>AXIS2C_HOME/samples/src/rampartc/data/keys/ahome/bob_key.pem</rampc:PrivateKey>
+					</rampc:RampartConfig>
+				</wsp:All>
+			</wsp:ExactlyOne>
+		</wsp:Policy>
+	</operation>
+
+	<operation name="SecConv13Issue">
+		<actionMapping>http://docs.oasis-open.org/ws-sx/ws-trust/200512/RST/SCT</actionMapping>
+		<wsp:Policy xmlns:wsp="http://schemas.xmlsoap.org/ws/2004/09/policy">
+			<wsp:ExactlyOne>
+				<wsp:All>
+					<sp:AsymmetricBinding xmlns:sp="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy">
+						<wsp:Policy>
+							<sp:InitiatorToken>
+								<wsp:Policy>
+									<sp:X509Token sp:IncludeToken="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy/IncludeToken/AlwaysToRecipient">
+										<wsp:Policy>
+											<sp:WssX509V3Token10/>
+										</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:Layout>
+								<wsp:Policy>
+									<sp:Strict/>
+								</wsp:Policy>
+							</sp:Layout>
+							<sp:AlgorithmSuite>
+								<wsp:Policy>
+									<sp:Basic256 />
+								</wsp:Policy>
+							</sp:AlgorithmSuite>
+							<sp:IncludeTimestamp/>
+						</wsp:Policy>
+					</sp:AsymmetricBinding>
+					<sp:Wss10 xmlns:sp="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy">
+                        <wsp:Policy>
+                            <sp:MustSupportRefKeyIdentifier/>
+                            <sp:MustSupportRefEmbeddedToken/>
+                            <sp:MustSupportRefIssuerSerial/>
+                        </wsp:Policy>
+                    </sp:Wss10>
+					<rampc:RampartConfig xmlns:rampc="http://ws.apache.org/rampart/c/policy">
+						<rampc:TimeToLive>360</rampc:TimeToLive>
+						<rampc:ReceiverCertificate>AXIS2C_HOME/samples/src/rampartc/data/keys/ahome/alice_cert.cert</rampc:ReceiverCertificate>
+                        <rampc:Certificate>AXIS2C_HOME/samples/src/rampartc/data/keys/ahome/bob_cert.cert</rampc:Certificate>
+                        <rampc:PrivateKey>AXIS2C_HOME/samples/src/rampartc/data/keys/ahome/bob_key.pem</rampc:PrivateKey>
+					</rampc:RampartConfig>
+				</wsp:All>
+			</wsp:ExactlyOne>
+		</wsp:Policy>
+	</operation>
+
+</module>

Modified: webservices/rampart/trunk/c/samples/secpolicy/scenario26/services.xml
URL: http://svn.apache.org/viewvc/webservices/rampart/trunk/c/samples/secpolicy/scenario26/services.xml?rev=794623&r1=794622&r2=794623&view=diff
==============================================================================
--- webservices/rampart/trunk/c/samples/secpolicy/scenario26/services.xml (original)
+++ webservices/rampart/trunk/c/samples/secpolicy/scenario26/services.xml Thu Jul 16 10:54:46 2009
@@ -57,6 +57,7 @@
 					</sp:EncryptedParts>
 					<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>
 					<rampc:RampartConfig xmlns:rampc="http://ws.apache.org/rampart/c/policy">
 						<rampc:User>Bob</rampc:User>

Modified: webservices/rampart/trunk/c/samples/secpolicy/scenario27/client-policy.xml
URL: http://svn.apache.org/viewvc/webservices/rampart/trunk/c/samples/secpolicy/scenario27/client-policy.xml?rev=794623&r1=794622&r2=794623&view=diff
==============================================================================
--- webservices/rampart/trunk/c/samples/secpolicy/scenario27/client-policy.xml (original)
+++ webservices/rampart/trunk/c/samples/secpolicy/scenario27/client-policy.xml Thu Jul 16 10:54:46 2009
@@ -31,11 +31,11 @@
 																	</sp:X509Token>
 																</wsp:Policy>
 															</sp:RecipientToken>
-                    <sp:AlgorithmSuite>
-                        <wsp:Policy>
-                            <sp:Basic256/>
-                        </wsp:Policy>
-                    </sp:AlgorithmSuite>
+										                    <sp:AlgorithmSuite>
+										                        <wsp:Policy>
+										                            <sp:Basic256/>
+										                        </wsp:Policy>
+										                    </sp:AlgorithmSuite>
 															<sp:Layout>
 																<wsp:Policy>
 																	<sp:Strict/>
@@ -46,6 +46,9 @@
 													</sp:AsymmetricBinding>
 													<rampc:RampartConfig xmlns:rampc="http://ws.apache.org/rampart/c/policy">
 														<rampc:TimeToLive>360</rampc:TimeToLive>
+														<rampc:ReceiverCertificate>AXIS2C_HOME/samples/src/rampartc/data/keys/ahome/bob_cert.cert</rampc:ReceiverCertificate>
+                                                        <rampc:Certificate>AXIS2C_HOME/samples/src/rampartc/data/keys/ahome/alice_cert.cert</rampc:Certificate>
+                                                        <rampc:PrivateKey>AXIS2C_HOME/samples/src/rampartc/data/keys/ahome/alice_key.pem</rampc:PrivateKey>
 													</rampc:RampartConfig>
 												</wsp:All>
 											</wsp:ExactlyOne>
@@ -83,11 +86,11 @@
 																	</sp:X509Token>
 																</wsp:Policy>
 															</sp:RecipientToken>
-                    <sp:AlgorithmSuite>
-                        <wsp:Policy>
-                            <sp:Basic256/>
-                        </wsp:Policy>
-                    </sp:AlgorithmSuite>
+											                    <sp:AlgorithmSuite>
+											                        <wsp:Policy>
+											                            <sp:Basic256/>
+											                        </wsp:Policy>
+											                    </sp:AlgorithmSuite>
 															<sp:Layout>
 																<wsp:Policy>
 																	<sp:Strict/>
@@ -98,6 +101,9 @@
 													</sp:AsymmetricBinding>
 													<rampc:RampartConfig xmlns:rampc="http://ws.apache.org/rampart/c/policy">
 														<rampc:TimeToLive>360</rampc:TimeToLive>
+														<rampc:ReceiverCertificate>AXIS2C_HOME/samples/src/rampartc/data/keys/ahome/bob_cert.cert</rampc:ReceiverCertificate>
+                                                        <rampc:Certificate>AXIS2C_HOME/samples/src/rampartc/data/keys/ahome/alice_cert.cert</rampc:Certificate>
+                                                        <rampc:PrivateKey>AXIS2C_HOME/samples/src/rampartc/data/keys/ahome/alice_key.pem</rampc:PrivateKey>
 													</rampc:RampartConfig>
 												</wsp:All>
 											</wsp:ExactlyOne>

Added: webservices/rampart/trunk/c/samples/secpolicy/scenario27/rahas_module.xml
URL: http://svn.apache.org/viewvc/webservices/rampart/trunk/c/samples/secpolicy/scenario27/rahas_module.xml?rev=794623&view=auto
==============================================================================
--- webservices/rampart/trunk/c/samples/secpolicy/scenario27/rahas_module.xml (added)
+++ webservices/rampart/trunk/c/samples/secpolicy/scenario27/rahas_module.xml Thu Jul 16 10:54:46 2009
@@ -0,0 +1,120 @@
+<module name="rahas" class="mod_rahas">
+    <inflow>
+        <handler name="RahasInHandler" class="mod_rahas">
+            <order phase="Rahas"/>
+        </handler>
+    </inflow>
+
+	<operation name="SecConv10Issue">
+		<actionMapping>http://schemas.xmlsoap.org/ws/2005/02/trust/RST/SCT</actionMapping>
+		<wsp:Policy xmlns:wsp="http://www.w3.org/ns/ws-policy">
+			<wsp:ExactlyOne>
+				<wsp:All>
+					<sp:AsymmetricBinding xmlns:sp="http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200702">
+						<wsp:Policy>
+							<sp:InitiatorToken>
+								<wsp:Policy>
+									<sp:X509Token sp:IncludeToken="http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200702/IncludeToken/AlwaysToRecipient">
+										<wsp:Policy>
+											<sp:WssX509V3Token10/>
+										</wsp:Policy>
+									</sp:X509Token>
+								</wsp:Policy>
+							</sp:InitiatorToken>
+							<sp:RecipientToken>
+								<wsp:Policy>
+									<sp:X509Token sp:IncludeToken="http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200702/IncludeToken/Never">
+										<wsp:Policy>
+											<sp:WssX509V3Token10/>
+										</wsp:Policy>
+									</sp:X509Token>
+								</wsp:Policy>
+							</sp:RecipientToken>
+							<sp:Layout>
+								<wsp:Policy>
+									<sp:Strict/>
+								</wsp:Policy>
+							</sp:Layout>
+							<sp:AlgorithmSuite>
+                                <wsp:Policy>
+                                    <sp:Basic256 />
+                                </wsp:Policy>
+                            </sp:AlgorithmSuite>
+							<sp:IncludeTimestamp/>
+						</wsp:Policy>
+					</sp:AsymmetricBinding>
+					<sp:Wss10 xmlns:sp="http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200702">
+                        <wsp:Policy>
+	                        <sp:MustSupportRefKeyIdentifier/>
+	                        <sp:MustSupportRefEmbeddedToken/>
+	                        <sp:MustSupportRefIssuerSerial/>
+	                    </wsp:Policy>
+	                </sp:Wss10>
+					<rampc:RampartConfig xmlns:rampc="http://ws.apache.org/rampart/c/policy">
+						<rampc:TimeToLive>360</rampc:TimeToLive>
+						<rampc:ReceiverCertificate>AXIS2C_HOME/samples/src/rampartc/data/keys/ahome/alice_cert.cert</rampc:ReceiverCertificate>
+						<rampc:Certificate>AXIS2C_HOME/samples/src/rampartc/data/keys/ahome/bob_cert.cert</rampc:Certificate>
+						<rampc:PrivateKey>AXIS2C_HOME/samples/src/rampartc/data/keys/ahome/bob_key.pem</rampc:PrivateKey>
+					</rampc:RampartConfig>
+				</wsp:All>
+			</wsp:ExactlyOne>
+		</wsp:Policy>
+	</operation>
+
+	<operation name="SecConv13Issue">
+		<actionMapping>http://docs.oasis-open.org/ws-sx/ws-trust/200512/RST/SCT</actionMapping>
+		<wsp:Policy xmlns:wsp="http://schemas.xmlsoap.org/ws/2004/09/policy">
+			<wsp:ExactlyOne>
+				<wsp:All>
+					<sp:AsymmetricBinding xmlns:sp="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy">
+						<wsp:Policy>
+							<sp:InitiatorToken>
+								<wsp:Policy>
+									<sp:X509Token sp:IncludeToken="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy/IncludeToken/AlwaysToRecipient">
+										<wsp:Policy>
+											<sp:WssX509V3Token10/>
+										</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:Layout>
+								<wsp:Policy>
+									<sp:Strict/>
+								</wsp:Policy>
+							</sp:Layout>
+							<sp:AlgorithmSuite>
+								<wsp:Policy>
+									<sp:Basic256 />
+								</wsp:Policy>
+							</sp:AlgorithmSuite>
+							<sp:IncludeTimestamp/>
+						</wsp:Policy>
+					</sp:AsymmetricBinding>
+					<sp:Wss10 xmlns:sp="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy">
+                        <wsp:Policy>
+                            <sp:MustSupportRefKeyIdentifier/>
+                            <sp:MustSupportRefEmbeddedToken/>
+                            <sp:MustSupportRefIssuerSerial/>
+                        </wsp:Policy>
+                    </sp:Wss10>
+					<rampc:RampartConfig xmlns:rampc="http://ws.apache.org/rampart/c/policy">
+						<rampc:TimeToLive>360</rampc:TimeToLive>
+						<rampc:ReceiverCertificate>AXIS2C_HOME/samples/src/rampartc/data/keys/ahome/alice_cert.cert</rampc:ReceiverCertificate>
+                        <rampc:Certificate>AXIS2C_HOME/samples/src/rampartc/data/keys/ahome/bob_cert.cert</rampc:Certificate>
+                        <rampc:PrivateKey>AXIS2C_HOME/samples/src/rampartc/data/keys/ahome/bob_key.pem</rampc:PrivateKey>
+					</rampc:RampartConfig>
+				</wsp:All>
+			</wsp:ExactlyOne>
+		</wsp:Policy>
+	</operation>
+
+</module>

Modified: webservices/rampart/trunk/c/samples/secpolicy/scenario28/client-policy.xml
URL: http://svn.apache.org/viewvc/webservices/rampart/trunk/c/samples/secpolicy/scenario28/client-policy.xml?rev=794623&r1=794622&r2=794623&view=diff
==============================================================================
--- webservices/rampart/trunk/c/samples/secpolicy/scenario28/client-policy.xml (original)
+++ webservices/rampart/trunk/c/samples/secpolicy/scenario28/client-policy.xml Thu Jul 16 10:54:46 2009
@@ -49,12 +49,12 @@
 														</wsp:Policy>
 													</sp:SignedSupportingTokens>
 													<sp:Trust13 xmlns:sp="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy">
-				<wsp:Policy>
-					<sp:MustSupportIssuedTokens /> 
-					<sp:RequireClientEntropy /> 
-					<sp:RequireServerEntropy /> 
-				</wsp:Policy>
-			</sp:Trust13>
+														<wsp:Policy>
+															<sp:MustSupportIssuedTokens /> 
+															<sp:RequireClientEntropy /> 
+															<sp:RequireServerEntropy /> 
+														</wsp:Policy>
+													</sp:Trust13>
 													<sp:Wss11 xmlns:sp="http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200702">
 														<wsp:Policy>
 															<sp:MustSupportRefKeyIdentifier/>
@@ -134,12 +134,12 @@
 														</wsp:Policy>
 													</sp:SignedSupportingTokens>
 													<sp:Trust13 xmlns:sp="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy">
-				<wsp:Policy>
-					<sp:MustSupportIssuedTokens /> 
-					<sp:RequireClientEntropy /> 
-					<sp:RequireServerEntropy /> 
-				</wsp:Policy>
-			</sp:Trust13>
+														<wsp:Policy>
+															<sp:MustSupportIssuedTokens /> 
+															<sp:RequireClientEntropy /> 
+															<sp:RequireServerEntropy /> 
+														</wsp:Policy>
+													</sp:Trust13>
 													<sp:Wss11 xmlns:sp="http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200702">
 														<wsp:Policy>
 															<sp:MustSupportRefKeyIdentifier/>

Added: webservices/rampart/trunk/c/samples/secpolicy/scenario28/rahas_module.xml
URL: http://svn.apache.org/viewvc/webservices/rampart/trunk/c/samples/secpolicy/scenario28/rahas_module.xml?rev=794623&view=auto
==============================================================================
--- webservices/rampart/trunk/c/samples/secpolicy/scenario28/rahas_module.xml (added)
+++ webservices/rampart/trunk/c/samples/secpolicy/scenario28/rahas_module.xml Thu Jul 16 10:54:46 2009
@@ -0,0 +1,120 @@
+<module name="rahas" class="mod_rahas">
+    <inflow>
+        <handler name="RahasInHandler" class="mod_rahas">
+            <order phase="Rahas"/>
+        </handler>
+    </inflow>
+
+	<operation name="SecConv10Issue">
+		<actionMapping>http://schemas.xmlsoap.org/ws/2005/02/trust/RST/SCT</actionMapping>
+		<wsp:Policy xmlns:wsp="http://www.w3.org/ns/ws-policy">
+			<wsp:ExactlyOne>
+				<wsp:All>
+					<sp:AsymmetricBinding xmlns:sp="http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200702">
+						<wsp:Policy>
+							<sp:InitiatorToken>
+								<wsp:Policy>
+									<sp:X509Token sp:IncludeToken="http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200702/IncludeToken/AlwaysToRecipient">
+										<wsp:Policy>
+											<sp:WssX509V3Token10/>
+										</wsp:Policy>
+									</sp:X509Token>
+								</wsp:Policy>
+							</sp:InitiatorToken>
+							<sp:RecipientToken>
+								<wsp:Policy>
+									<sp:X509Token sp:IncludeToken="http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200702/IncludeToken/Never">
+										<wsp:Policy>
+											<sp:WssX509V3Token10/>
+										</wsp:Policy>
+									</sp:X509Token>
+								</wsp:Policy>
+							</sp:RecipientToken>
+							<sp:Layout>
+								<wsp:Policy>
+									<sp:Strict/>
+								</wsp:Policy>
+							</sp:Layout>
+							<sp:AlgorithmSuite>
+                                <wsp:Policy>
+                                    <sp:Basic256 />
+                                </wsp:Policy>
+                            </sp:AlgorithmSuite>
+							<sp:IncludeTimestamp/>
+						</wsp:Policy>
+					</sp:AsymmetricBinding>
+					<sp:Wss10 xmlns:sp="http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200702">
+                        <wsp:Policy>
+	                        <sp:MustSupportRefKeyIdentifier/>
+	                        <sp:MustSupportRefEmbeddedToken/>
+	                        <sp:MustSupportRefIssuerSerial/>
+	                    </wsp:Policy>
+	                </sp:Wss10>
+					<rampc:RampartConfig xmlns:rampc="http://ws.apache.org/rampart/c/policy">
+						<rampc:TimeToLive>360</rampc:TimeToLive>
+						<rampc:ReceiverCertificate>AXIS2C_HOME/samples/src/rampartc/data/keys/ahome/alice_cert.cert</rampc:ReceiverCertificate>
+						<rampc:Certificate>AXIS2C_HOME/samples/src/rampartc/data/keys/ahome/bob_cert.cert</rampc:Certificate>
+						<rampc:PrivateKey>AXIS2C_HOME/samples/src/rampartc/data/keys/ahome/bob_key.pem</rampc:PrivateKey>
+					</rampc:RampartConfig>
+				</wsp:All>
+			</wsp:ExactlyOne>
+		</wsp:Policy>
+	</operation>
+
+	<operation name="SecConv13Issue">
+		<actionMapping>http://docs.oasis-open.org/ws-sx/ws-trust/200512/RST/SCT</actionMapping>
+		<wsp:Policy xmlns:wsp="http://schemas.xmlsoap.org/ws/2004/09/policy">
+			<wsp:ExactlyOne>
+				<wsp:All>
+					<sp:AsymmetricBinding xmlns:sp="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy">
+						<wsp:Policy>
+							<sp:InitiatorToken>
+								<wsp:Policy>
+									<sp:X509Token sp:IncludeToken="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy/IncludeToken/AlwaysToRecipient">
+										<wsp:Policy>
+											<sp:WssX509V3Token10/>
+										</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:Layout>
+								<wsp:Policy>
+									<sp:Strict/>
+								</wsp:Policy>
+							</sp:Layout>
+							<sp:AlgorithmSuite>
+								<wsp:Policy>
+									<sp:Basic256 />
+								</wsp:Policy>
+							</sp:AlgorithmSuite>
+							<sp:IncludeTimestamp/>
+						</wsp:Policy>
+					</sp:AsymmetricBinding>
+					<sp:Wss10 xmlns:sp="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy">
+                        <wsp:Policy>
+                            <sp:MustSupportRefKeyIdentifier/>
+                            <sp:MustSupportRefEmbeddedToken/>
+                            <sp:MustSupportRefIssuerSerial/>
+                        </wsp:Policy>
+                    </sp:Wss10>
+					<rampc:RampartConfig xmlns:rampc="http://ws.apache.org/rampart/c/policy">
+						<rampc:TimeToLive>360</rampc:TimeToLive>
+						<rampc:ReceiverCertificate>AXIS2C_HOME/samples/src/rampartc/data/keys/ahome/alice_cert.cert</rampc:ReceiverCertificate>
+                        <rampc:Certificate>AXIS2C_HOME/samples/src/rampartc/data/keys/ahome/bob_cert.cert</rampc:Certificate>
+                        <rampc:PrivateKey>AXIS2C_HOME/samples/src/rampartc/data/keys/ahome/bob_key.pem</rampc:PrivateKey>
+					</rampc:RampartConfig>
+				</wsp:All>
+			</wsp:ExactlyOne>
+		</wsp:Policy>
+	</operation>
+
+</module>

Modified: webservices/rampart/trunk/c/samples/secpolicy/scenario28/services.xml
URL: http://svn.apache.org/viewvc/webservices/rampart/trunk/c/samples/secpolicy/scenario28/services.xml?rev=794623&r1=794622&r2=794623&view=diff
==============================================================================
--- webservices/rampart/trunk/c/samples/secpolicy/scenario28/services.xml (original)
+++ webservices/rampart/trunk/c/samples/secpolicy/scenario28/services.xml Thu Jul 16 10:54:46 2009
@@ -64,6 +64,7 @@
 					</sp:EncryptedParts-->
 					<sp:SignedParts xmlns:sp="http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200702">
 						<sp:Body/>
+						<sp:Header Namespace="http://www.w3.org/2005/08/addressing"/>
 					</sp:SignedParts>
 					<rampc:RampartConfig xmlns:rampc="http://ws.apache.org/rampart/c/policy">
 						<rampc:User>Bob</rampc:User>

Modified: webservices/rampart/trunk/c/samples/secpolicy/scenario5/services.xml
URL: http://svn.apache.org/viewvc/webservices/rampart/trunk/c/samples/secpolicy/scenario5/services.xml?rev=794623&r1=794622&r2=794623&view=diff
==============================================================================
--- webservices/rampart/trunk/c/samples/secpolicy/scenario5/services.xml (original)
+++ webservices/rampart/trunk/c/samples/secpolicy/scenario5/services.xml Thu Jul 16 10:54:46 2009
@@ -64,6 +64,7 @@
                 </sp:EncryptedParts>
                 <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>
                 <rampc:RampartConfig xmlns:rampc="http://ws.apache.org/rampart/c/policy">
                     <rampc:User>Bob</rampc:User>

Modified: webservices/rampart/trunk/c/samples/secpolicy/scenario6/services.xml
URL: http://svn.apache.org/viewvc/webservices/rampart/trunk/c/samples/secpolicy/scenario6/services.xml?rev=794623&r1=794622&r2=794623&view=diff
==============================================================================
--- webservices/rampart/trunk/c/samples/secpolicy/scenario6/services.xml (original)
+++ webservices/rampart/trunk/c/samples/secpolicy/scenario6/services.xml Thu Jul 16 10:54:46 2009
@@ -64,6 +64,7 @@
                 </sp:EncryptedParts>
                 <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>
                 <rampc:RampartConfig xmlns:rampc="http://ws.apache.org/rampart/c/policy">
                     <rampc:User>Bob</rampc:User>

Modified: webservices/rampart/trunk/c/samples/secpolicy/scenario7/client-policy.xml
URL: http://svn.apache.org/viewvc/webservices/rampart/trunk/c/samples/secpolicy/scenario7/client-policy.xml?rev=794623&r1=794622&r2=794623&view=diff
==============================================================================
--- webservices/rampart/trunk/c/samples/secpolicy/scenario7/client-policy.xml (original)
+++ webservices/rampart/trunk/c/samples/secpolicy/scenario7/client-policy.xml Thu Jul 16 10:54:46 2009
@@ -26,10 +26,18 @@
                             <sp:Strict/>
                         </wsp:Policy>
                     </sp:Layout>
+                    <sp:AlgorithmSuite>
+                        <wsp:Policy>
+                            <sp:Basic256Rsa15/>
+                        </wsp:Policy>
+                    </sp:AlgorithmSuite>
                     <sp:IncludeTimestamp/>
                 </wsp:Policy>
             </sp:AsymmetricBinding>
             <rampc:RampartConfig xmlns:rampc="http://ws.apache.org/rampart/c/policy">
+                <rampc:ReceiverCertificate>AXIS2C_HOME/samples/src/rampartc/data/keys/ahome/bob_cert.cert</rampc:ReceiverCertificate>
+                <rampc:Certificate>AXIS2C_HOME/samples/src/rampartc/data/keys/ahome/alice_cert.cert</rampc:Certificate>
+                <rampc:PrivateKey>AXIS2C_HOME/samples/src/rampartc/data/keys/ahome/alice_key.pem</rampc:PrivateKey>
             </rampc:RampartConfig>
         </wsp:All>
     </wsp:ExactlyOne>

Modified: webservices/rampart/trunk/c/samples/secpolicy/scenario7/services.xml
URL: http://svn.apache.org/viewvc/webservices/rampart/trunk/c/samples/secpolicy/scenario7/services.xml?rev=794623&r1=794622&r2=794623&view=diff
==============================================================================
--- webservices/rampart/trunk/c/samples/secpolicy/scenario7/services.xml (original)
+++ webservices/rampart/trunk/c/samples/secpolicy/scenario7/services.xml Thu Jul 16 10:54:46 2009
@@ -39,12 +39,27 @@
                                 <sp:Strict/>
                             </wsp:Policy>
                         </sp:Layout>
+                        <sp:AlgorithmSuite>
+                            <wsp:Policy>
+                                <sp:Basic256Rsa15/>
+                            </wsp:Policy>
+                        </sp:AlgorithmSuite>
                         <sp:IncludeTimestamp/>
                     </wsp:Policy>
                 </sp:AsymmetricBinding>
+                <sp:Wss10 xmlns:sp="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy">
+                    <wsp:Policy>
+                        <sp:MustSupportRefKeyIdentifier/>
+                        <sp:MustSupportRefEmbeddedToken/>
+                        <sp:MustSupportRefIssuerSerial/>
+                    </wsp:Policy>
+                </sp:Wss10>
                 <rampc:RampartConfig xmlns:rampc="http://ws.apache.org/rampart/c/policy">
 					<rampc:ReplayDetection>5</rampc:ReplayDetection>
 					<rampc:ReplayDetectionModule>AXIS2C_HOME/samples/lib/rampartc/librdflatfile.so</rampc:ReplayDetectionModule>
+					<rampc:ReceiverCertificate>AXIS2C_HOME/samples/src/rampartc/data/keys/bhome/alice_cert.cert</rampc:ReceiverCertificate>
+                    <rampc:Certificate>AXIS2C_HOME/samples/src/rampartc/data/keys/bhome/bob_cert.cert</rampc:Certificate>
+                    <rampc:PrivateKey>AXIS2C_HOME/samples/src/rampartc/data/keys/bhome/bob_key.pem</rampc:PrivateKey>
                 </rampc:RampartConfig>
             </wsp:All>
         </wsp:ExactlyOne>

Modified: webservices/rampart/trunk/c/samples/secpolicy/scenario9/services.xml
URL: http://svn.apache.org/viewvc/webservices/rampart/trunk/c/samples/secpolicy/scenario9/services.xml?rev=794623&r1=794622&r2=794623&view=diff
==============================================================================
--- webservices/rampart/trunk/c/samples/secpolicy/scenario9/services.xml (original)
+++ webservices/rampart/trunk/c/samples/secpolicy/scenario9/services.xml Thu Jul 16 10:54:46 2009
@@ -53,6 +53,7 @@
                 </sp:Wss10>
                 <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>
                 <rampc:RampartConfig xmlns:rampc="http://ws.apache.org/rampart/c/policy">
                     <rampc:User>Bob</rampc:User>