You are viewing a plain text version of this content. The canonical link for it is here.
Posted to java-dev@axis.apache.org by di...@apache.org on 2007/03/01 06:58:08 UTC

svn commit: r513155 [2/5] - in /webservices/axis2/scratch/c/dinesh/532/c: ./ axiom/ axiom/src/attachments/ axiom/test/om/ axiom/test/soap/ build/win32/ ides/studio/ ides/vc/axis2c/ ides/vc/axis2c/axis2_engine/ ides/vc/axis2c/axis2_http_common/ ides/vc/...

Modified: webservices/axis2/scratch/c/dinesh/532/c/rampart/include/rp_defines.h
URL: http://svn.apache.org/viewvc/webservices/axis2/scratch/c/dinesh/532/c/rampart/include/rp_defines.h?view=diff&rev=513155&r1=513154&r2=513155
==============================================================================
--- webservices/axis2/scratch/c/dinesh/532/c/rampart/include/rp_defines.h (original)
+++ webservices/axis2/scratch/c/dinesh/532/c/rampart/include/rp_defines.h Wed Feb 28 21:58:03 2007
@@ -25,7 +25,11 @@
 extern "C"
 {
 #endif
-    
+
+    #define RP_POLICY "Policy"
+    #define RP_EXACTLY_ONE "ExactlyOne"
+    #define RP_ALL "All"
+
     #define RP_TOKEN_USERNAME 1
     #define RP_TOKEN_X509 2
     #define RP_TOKEN_SECURITY_CONTEXT 3
@@ -181,22 +185,22 @@
     #define RP_REQUIRE_CLIENT_CERTIFICATE "RequireClientCertificate"
 
     #define RP_RAMPART_CONFIG "RampartConfig"
-    #define RP_USER "user"
-    #define RP_ENCRYPTION_USER "encryptionUser"
-    #define RP_PASSWORD_CALLBACK_CLASS "passwordCallbackClass"
-    #define RP_AUTHN_MODULE_NAME "authnModuleName"
-    #define RP_PASSWORD_TYPE "passwordType"
+    #define RP_USER "User"
+    #define RP_ENCRYPTION_USER "EncryptionUser"
+    #define RP_PASSWORD_CALLBACK_CLASS "PasswordCallbackClass"
+    #define RP_AUTHN_MODULE_NAME "AuthnModuleName"
+    #define RP_PASSWORD_TYPE "PasswordType"
     #define RP_PLAINTEXT "plainText"
     #define RP_DIGEST "Digest"
-    #define RP_SIGNATURE_CRYPTO "signatureCrypto"
-    #define RP_SIGNATURE_PROP_FILE "signaturePropFile"
-    #define RP_ENCRYPTION_CRYPTO "encryptionCypto"
-    #define RP_ENCRYPTION_PROP_FILE "encryptionPropFile"
-    #define RP_DECRYPTION_PROP_FILE "decryptionPropFile"
+    #define RP_PUBLIC_KEY "PublicKey"
+    #define RP_PRIVATE_KEY "PrivateKey"
+    #define RP_TIME_TO_LIVE "TimeToLive"
 
     #define RP_SP_NS "http://schemas.xmlsoap.org/ws/2005/07/securitypolicy"
     #define RP_SECURITY_NS "http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-secext-1.0.xsd"
+    #define RP_POLICY_NS "http://schemas.xmlsoap.org/ws/2004/09/policy"
     #define RP_RAMPART_NS "http://ws.apache.org/rampart/c/policy"
+    #define RP_POLICY_PREFIX "wsp"
     #define RP_RAMPART_PREFIX "rampc"
     #define RP_SP_PREFIX "sp"
 

Modified: webservices/axis2/scratch/c/dinesh/532/c/rampart/include/rp_policy_creator.h
URL: http://svn.apache.org/viewvc/webservices/axis2/scratch/c/dinesh/532/c/rampart/include/rp_policy_creator.h?view=diff&rev=513155&r1=513154&r2=513155
==============================================================================
--- webservices/axis2/scratch/c/dinesh/532/c/rampart/include/rp_policy_creator.h (original)
+++ webservices/axis2/scratch/c/dinesh/532/c/rampart/include/rp_policy_creator.h Wed Feb 28 21:58:03 2007
@@ -40,6 +40,11 @@
     const axis2_env_t *env,
     axis2_char_t *filename);
 
+AXIS2_EXTERN rp_secpolicy_t *AXIS2_CALL
+rp_policy_create_from_om_node(
+    const axis2_env_t *env,
+    axiom_node_t *root);
+
 
 #ifdef __cplusplus
 }

Modified: webservices/axis2/scratch/c/dinesh/532/c/rampart/include/rp_qname_matcher.h
URL: http://svn.apache.org/viewvc/webservices/axis2/scratch/c/dinesh/532/c/rampart/include/rp_qname_matcher.h?view=diff&rev=513155&r1=513154&r2=513155
==============================================================================
--- webservices/axis2/scratch/c/dinesh/532/c/rampart/include/rp_qname_matcher.h (original)
+++ webservices/axis2/scratch/c/dinesh/532/c/rampart/include/rp_qname_matcher.h Wed Feb 28 21:58:03 2007
@@ -37,6 +37,13 @@
         axiom_element_t *element);
 
     AXIS2_EXTERN axis2_bool_t AXIS2_CALL
+    rp_match_policy_qname(
+        const axis2_env_t *env,
+        const axis2_char_t *local_name,
+        axiom_node_t *node,
+        axiom_element_t *element);
+    
+    AXIS2_EXTERN axis2_bool_t AXIS2_CALL
     rp_match_rampart_config_qname(
         const axis2_env_t *env,
         const axis2_char_t *local_name,

Modified: webservices/axis2/scratch/c/dinesh/532/c/rampart/include/rp_rampart_config.h
URL: http://svn.apache.org/viewvc/webservices/axis2/scratch/c/dinesh/532/c/rampart/include/rp_rampart_config.h?view=diff&rev=513155&r1=513154&r2=513155
==============================================================================
--- webservices/axis2/scratch/c/dinesh/532/c/rampart/include/rp_rampart_config.h (original)
+++ webservices/axis2/scratch/c/dinesh/532/c/rampart/include/rp_rampart_config.h Wed Feb 28 21:58:03 2007
@@ -23,8 +23,6 @@
  */
 
 #include <rp_includes.h>
-#include <rp_signature_crypto.h>
-#include <rp_encryption_crypto.h>
 
 #ifdef __cplusplus
 extern "C"
@@ -90,26 +88,35 @@
             const axis2_env_t *env,
             axis2_char_t *password_type);
 
+    AXIS2_EXTERN axis2_char_t *AXIS2_CALL
+    rp_rampart_config_get_private_key_file(
+            rp_rampart_config_t *rampart_config,
+            const axis2_env_t *env);
+
+    AXIS2_EXTERN axis2_status_t AXIS2_CALL
+    rp_rampart_config_set_private_key_file(rp_rampart_config_t *rampart_config,
+            const axis2_env_t *env,
+            axis2_char_t *private_key_file);
 
-    AXIS2_EXTERN rp_signature_crypto_t *AXIS2_CALL
-    rp_rampart_config_get_signature_crypto(
+    AXIS2_EXTERN axis2_char_t *AXIS2_CALL
+    rp_rampart_config_get_public_key_file(
             rp_rampart_config_t *rampart_config,
             const axis2_env_t *env);
 
     AXIS2_EXTERN axis2_status_t AXIS2_CALL
-    rp_rampart_config_set_signature_crypto(rp_rampart_config_t *rampart_config,
+    rp_rampart_config_set_public_key_file(rp_rampart_config_t *rampart_config,
             const axis2_env_t *env,
-            rp_signature_crypto_t *signature_crypto);
+            axis2_char_t *public_key_file);
 
-    AXIS2_EXTERN rp_encryption_crypto_t *AXIS2_CALL
-    rp_rampart_config_get_encryption_crypto(
+    AXIS2_EXTERN axis2_char_t *AXIS2_CALL
+    rp_rampart_config_get_time_to_live(
             rp_rampart_config_t *rampart_config,
             const axis2_env_t *env);
 
     AXIS2_EXTERN axis2_status_t AXIS2_CALL
-    rp_rampart_config_set_encryption_crypto(rp_rampart_config_t *rampart_config,
+    rp_rampart_config_set_time_to_live(rp_rampart_config_t *rampart_config,
             const axis2_env_t *env,
-            rp_encryption_crypto_t *encryption_crypto);
+            axis2_char_t *time_to_live);
 
 #ifdef __cplusplus
 }

Modified: webservices/axis2/scratch/c/dinesh/532/c/rampart/include/rp_rampart_config_builder.h
URL: http://svn.apache.org/viewvc/webservices/axis2/scratch/c/dinesh/532/c/rampart/include/rp_rampart_config_builder.h?view=diff&rev=513155&r1=513154&r2=513155
==============================================================================
--- webservices/axis2/scratch/c/dinesh/532/c/rampart/include/rp_rampart_config_builder.h (original)
+++ webservices/axis2/scratch/c/dinesh/532/c/rampart/include/rp_rampart_config_builder.h Wed Feb 28 21:58:03 2007
@@ -24,8 +24,6 @@
 
 #include <rp_includes.h>
 #include <rp_qname_matcher.h>
-#include <rp_signature_crypto_builder.h>
-#include <rp_encryption_crypto_builder.h>
 #include <rp_rampart_config.h>
 
 #ifdef __cplusplus

Modified: webservices/axis2/scratch/c/dinesh/532/c/rampart/samples/secpolicy/scenario1/client-incoming-secpolicy.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/scratch/c/dinesh/532/c/rampart/samples/secpolicy/scenario1/client-incoming-secpolicy.xml?view=diff&rev=513155&r1=513154&r2=513155
==============================================================================
--- webservices/axis2/scratch/c/dinesh/532/c/rampart/samples/secpolicy/scenario1/client-incoming-secpolicy.xml (original)
+++ webservices/axis2/scratch/c/dinesh/532/c/rampart/samples/secpolicy/scenario1/client-incoming-secpolicy.xml Wed Feb 28 21:58:03 2007
@@ -21,39 +21,12 @@
 							</sp:X509Token>
 						</wsp:Policy>
 					</sp:RecipientToken>
-					<sp:AlgorithmSuite>
-						<wsp:Policy>
-							<sp:Basic256Rsa15/>
-						</wsp:Policy>
-					</sp:AlgorithmSuite>
-					<sp:Layout>
-						<wsp:Policy>
-							<sp:Strict/>
-						</wsp:Policy>
-					</sp:Layout>
                     <sp:IncludeTimestamp/>
-                    <sp:EncryptBeforeSigning/>
-					<sp:OnlySignEntireHeadersAndBody/>
 				</wsp:Policy>
             </sp:AsymmetricBinding>
-			<sp:Wss10 xmlns:sp="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy">
-				<wsp:Policy>
-					<sp:MustSupportRefIssuerSerial/>
-				</wsp:Policy>
-            </sp:Wss10>
             <rampc:RampartConfig xmlns:rampc="http://ws.apache.org/rampart/c/policy">
-                <rampc:user>Gampola</rampc:user>
-                <rampc:encryptionUser>a</rampc:encryptionUser>
-                <rampc:passwordType>Digest</rampc:passwordType>
-                <rampc:passwordCallbackClass>/home/AXIS2_USER/axis2/c/deploy/bin/samples/rampart/callback/libpwcb.so</rampc:passwordCallbackClass>
-                <rampc:signatureCrypto>
-                    <rampc:signaturePropFile>/home/AXIS2_USER/axis2/c/deploy/bin/samples/rampart/keys/ahome/b_cert.cert</rampc:signaturePropFile>
-                </rampc:signatureCrypto>
-                <rampc:encryptionCypto>
-                    <rampc:encryptionPropFile>/home/AXIS2_USER/axis2/c/deploy/bin/samples/rampart/keys/ahome/b_cert.cert</rampc:encryptionPropFile>
-                    <rampc:decryptionPropFile>/home/AXIS2_USER/axis2/c/deploy/bin/samples/rampart/keys/ahome/a_store.pfx</rampc:decryptionPropFile>
-                </rampc:encryptionCypto>
-        </rampc:RampartConfig>
+                <rampc:TimeToLive>360</rampc:TimeToLive>    
+            </rampc:RampartConfig>
 		</wsp:All>
 	</wsp:ExactlyOne>
 </wsp:Policy>

Modified: webservices/axis2/scratch/c/dinesh/532/c/rampart/samples/secpolicy/scenario1/client-outgoing-secpolicy.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/scratch/c/dinesh/532/c/rampart/samples/secpolicy/scenario1/client-outgoing-secpolicy.xml?view=diff&rev=513155&r1=513154&r2=513155
==============================================================================
--- webservices/axis2/scratch/c/dinesh/532/c/rampart/samples/secpolicy/scenario1/client-outgoing-secpolicy.xml (original)
+++ webservices/axis2/scratch/c/dinesh/532/c/rampart/samples/secpolicy/scenario1/client-outgoing-secpolicy.xml Wed Feb 28 21:58:03 2007
@@ -21,39 +21,12 @@
 							</sp:X509Token>
 						</wsp:Policy>
 					</sp:RecipientToken>
-					<sp:AlgorithmSuite>
-						<wsp:Policy>
-							<sp:Basic256Rsa15/>
-						</wsp:Policy>
-					</sp:AlgorithmSuite>
-					<sp:Layout>
-						<wsp:Policy>
-							<sp:Strict/>
-						</wsp:Policy>
-					</sp:Layout>
                     <sp:IncludeTimestamp/>
-                    <sp:EncryptBeforeSigning/>
-					<sp:OnlySignEntireHeadersAndBody/>
 				</wsp:Policy>
             </sp:AsymmetricBinding>
-			<sp:Wss10 xmlns:sp="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy">
-				<wsp:Policy>
-					<sp:MustSupportRefIssuerSerial/>
-				</wsp:Policy>
-			</sp:Wss10>
             <rampc:RampartConfig xmlns:rampc="http://ws.apache.org/rampart/c/policy">
-                <rampc:user>Gampola</rampc:user>
-                <rampc:encryptionUser>a</rampc:encryptionUser>
-                <rampc:passwordType>Digest</rampc:passwordType>
-                <rampc:passwordCallbackClass>/home/AXIS2_USER/axis2/c/deploy/bin/samples/rampart/callback/libpwcb.so</rampc:passwordCallbackClass>
-                <rampc:signatureCrypto>
-                    <rampc:signaturePropFile>/home/AXIS2_USER/axis2/c/deploy/bin/samples/rampart/keys/ahome/b_cert.cert</rampc:signaturePropFile>
-                </rampc:signatureCrypto>
-                <rampc:encryptionCypto>
-                    <rampc:encryptionPropFile>/home/AXIS2_USER/axis2/c/deploy/bin/samples/rampart/keys/ahome/b_cert.cert</rampc:encryptionPropFile>
-                    <rampc:decryptionPropFile>/home/AXIS2_USER/axis2/c/deploy/bin/samples/rampart/keys/ahome/a_store.pfx</rampc:decryptionPropFile>
-                </rampc:encryptionCypto>
-        </rampc:RampartConfig>
+                <rampc:TimeToLive>360</rampc:TimeToLive>    
+            </rampc:RampartConfig>
 		</wsp:All>
 	</wsp:ExactlyOne>
 </wsp:Policy>

Modified: webservices/axis2/scratch/c/dinesh/532/c/rampart/samples/secpolicy/scenario1/service-incoming-secpolicy.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/scratch/c/dinesh/532/c/rampart/samples/secpolicy/scenario1/service-incoming-secpolicy.xml?view=diff&rev=513155&r1=513154&r2=513155
==============================================================================
--- webservices/axis2/scratch/c/dinesh/532/c/rampart/samples/secpolicy/scenario1/service-incoming-secpolicy.xml (original)
+++ webservices/axis2/scratch/c/dinesh/532/c/rampart/samples/secpolicy/scenario1/service-incoming-secpolicy.xml Wed Feb 28 21:58:03 2007
@@ -21,39 +21,12 @@
 							</sp:X509Token>
 						</wsp:Policy>
 					</sp:RecipientToken>
-					<sp:AlgorithmSuite>
-						<wsp:Policy>
-							<sp:Basic256Rsa15/>
-						</wsp:Policy>
-					</sp:AlgorithmSuite>
-					<sp:Layout>
-						<wsp:Policy>
-							<sp:Strict/>
-						</wsp:Policy>
-					</sp:Layout>
                     <sp:IncludeTimestamp/>
-                    <sp:EncryptBeforeSigning/>
-					<sp:OnlySignEntireHeadersAndBody/>
 				</wsp:Policy>
             </sp:AsymmetricBinding>
-			<sp:Wss10 xmlns:sp="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy">
-				<wsp:Policy>
-					<sp:MustSupportRefIssuerSerial/>
-				</wsp:Policy>
-            </sp:Wss10>
             <rampc:RampartConfig xmlns:rampc="http://ws.apache.org/rampart/c/policy">
-                <rampc:user>Gampola</rampc:user>
-                <rampc:encryptionUser>b</rampc:encryptionUser>
-                <rampc:passwordType>Digest</rampc:passwordType>
-                <rampc:passwordCallbackClass>/home/AXIS2_USER/axis2/c/deploy/bin/samples/rampart/callback/libpwcb.so</rampc:passwordCallbackClass>
-                <rampc:signatureCrypto>
-                    <rampc:signaturePropFile>/home/AXIS2_USER/axis2/c/deploy/bin/samples/rampart/keys/ahome/b_cert.cert</rampc:signaturePropFile>
-                </rampc:signatureCrypto>
-                <rampc:encryptionCypto>
-                    <rampc:encryptionPropFile>/home/AXIS2_USER/axis2/c/deploy/bin/samples/rampart/keys/bhome/a_cert.cert</rampc:encryptionPropFile>
-                    <rampc:decryptionPropFile>/home/AXIS2_USER/axis2/c/deploy/bin/samples/rampart/keys/bhome/b_store.pfx</rampc:decryptionPropFile>
-                </rampc:encryptionCypto>
-        </rampc:RampartConfig>
+                <rampc:TimeToLive>360</rampc:TimeToLive>    
+            </rampc:RampartConfig>
 		</wsp:All>
 	</wsp:ExactlyOne>
 </wsp:Policy>

Modified: webservices/axis2/scratch/c/dinesh/532/c/rampart/samples/secpolicy/scenario1/service-outgoing-secpolicy.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/scratch/c/dinesh/532/c/rampart/samples/secpolicy/scenario1/service-outgoing-secpolicy.xml?view=diff&rev=513155&r1=513154&r2=513155
==============================================================================
--- webservices/axis2/scratch/c/dinesh/532/c/rampart/samples/secpolicy/scenario1/service-outgoing-secpolicy.xml (original)
+++ webservices/axis2/scratch/c/dinesh/532/c/rampart/samples/secpolicy/scenario1/service-outgoing-secpolicy.xml Wed Feb 28 21:58:03 2007
@@ -21,39 +21,12 @@
 							</sp:X509Token>
 						</wsp:Policy>
 					</sp:RecipientToken>
-					<sp:AlgorithmSuite>
-						<wsp:Policy>
-							<sp:Basic256Rsa15/>
-						</wsp:Policy>
-					</sp:AlgorithmSuite>
-					<sp:Layout>
-						<wsp:Policy>
-							<sp:Strict/>
-						</wsp:Policy>
-					</sp:Layout>
                     <sp:IncludeTimestamp/>
-                    <sp:EncryptBeforeSigning/>
-					<sp:OnlySignEntireHeadersAndBody/>
 				</wsp:Policy>
             </sp:AsymmetricBinding>
-			<sp:Wss10 xmlns:sp="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy">
-				<wsp:Policy>
-					<sp:MustSupportRefIssuerSerial/>
-				</wsp:Policy>
-            </sp:Wss10>
             <rampc:RampartConfig xmlns:rampc="http://ws.apache.org/rampart/c/policy">
-                <rampc:user>Gampola</rampc:user>
-                <rampc:encryptionUser>b</rampc:encryptionUser>
-                <rampc:passwordType>Digest</rampc:passwordType>
-                <rampc:passwordCallbackClass>/home/AXIS2_USER/axis2/c/deploy/bin/samples/rampart/callback/libpwcb.so</rampc:passwordCallbackClass>
-                <rampc:signatureCrypto>
-                    <rampc:signaturePropFile>/home/AXIS2_USER/axis2/c/deploy/bin/samples/rampart/keys/ahome/b_cert.cert</rampc:signaturePropFile>
-                </rampc:signatureCrypto>
-                <rampc:encryptionCypto>
-                    <rampc:encryptionPropFile>/home/AXIS2_USER/axis2/c/deploy/bin/samples/rampart/keys/bhome/a_cert.cert</rampc:encryptionPropFile>
-                    <rampc:decryptionPropFile>/home/AXIS2_USER/axis2/c/deploy/bin/samples/rampart/keys/bhome/b_store.pfx</rampc:decryptionPropFile>
-                </rampc:encryptionCypto>
-        </rampc:RampartConfig>
+                <rampc:TimeToLive>360</rampc:TimeToLive>    
+            </rampc:RampartConfig>
 		</wsp:All>
 	</wsp:ExactlyOne>
 </wsp:Policy>

Modified: webservices/axis2/scratch/c/dinesh/532/c/rampart/samples/secpolicy/scenario2/client-incoming-secpolicy.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/scratch/c/dinesh/532/c/rampart/samples/secpolicy/scenario2/client-incoming-secpolicy.xml?view=diff&rev=513155&r1=513154&r2=513155
==============================================================================
--- webservices/axis2/scratch/c/dinesh/532/c/rampart/samples/secpolicy/scenario2/client-incoming-secpolicy.xml (original)
+++ webservices/axis2/scratch/c/dinesh/532/c/rampart/samples/secpolicy/scenario2/client-incoming-secpolicy.xml Wed Feb 28 21:58:03 2007
@@ -21,39 +21,12 @@
 							</sp:X509Token>
 						</wsp:Policy>
 					</sp:RecipientToken>
-					<sp:AlgorithmSuite>
-						<wsp:Policy>
-							<sp:Basic256Rsa15/>
-						</wsp:Policy>
-					</sp:AlgorithmSuite>
-					<sp:Layout>
-						<wsp:Policy>
-							<sp:Strict/>
-						</wsp:Policy>
-					</sp:Layout>
                     <sp:IncludeTimestamp/>
-                    <sp:EncryptBeforeSigning/>
-					<sp:OnlySignEntireHeadersAndBody/>
 				</wsp:Policy>
             </sp:AsymmetricBinding>
-			<sp:Wss10 xmlns:sp="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy">
-				<wsp:Policy>
-					<sp:MustSupportRefIssuerSerial/>
-				</wsp:Policy>
-            </sp:Wss10>
             <rampc:RampartConfig xmlns:rampc="http://ws.apache.org/rampart/c/policy">
-                <rampc:user>Gampola</rampc:user>
-                <rampc:encryptionUser>a</rampc:encryptionUser>
-                <rampc:passwordType>Digest</rampc:passwordType>
-                <rampc:passwordCallbackClass>/home/AXIS2_USER/axis2/c/deploy/bin/samples/rampart/callback/libpwcb.so</rampc:passwordCallbackClass>
-                <rampc:signatureCrypto>
-                    <rampc:signaturePropFile>/home/AXIS2_USER/axis2/c/rampart/samples/keys/ahome/b_cert.cert</rampc:signaturePropFile>
-                </rampc:signatureCrypto>
-                <rampc:encryptionCypto>
-                    <rampc:encryptionPropFile>/home/AXIS2_USER/axis2/c/rampart/samples/keys/ahome/b_cert.cert</rampc:encryptionPropFile>
-                    <rampc:decryptionPropFile>/home/AXIS2_USER/axis2/c/rampart/samples/keys/ahome/a_store.pfx</rampc:decryptionPropFile>
-                </rampc:encryptionCypto>
-        </rampc:RampartConfig>
+                <rampc:TimeToLive>360</rampc:TimeToLive>
+            </rampc:RampartConfig>
 		</wsp:All>
 	</wsp:ExactlyOne>
 </wsp:Policy>

Modified: webservices/axis2/scratch/c/dinesh/532/c/rampart/samples/secpolicy/scenario2/client-outgoing-secpolicy.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/scratch/c/dinesh/532/c/rampart/samples/secpolicy/scenario2/client-outgoing-secpolicy.xml?view=diff&rev=513155&r1=513154&r2=513155
==============================================================================
--- webservices/axis2/scratch/c/dinesh/532/c/rampart/samples/secpolicy/scenario2/client-outgoing-secpolicy.xml (original)
+++ webservices/axis2/scratch/c/dinesh/532/c/rampart/samples/secpolicy/scenario2/client-outgoing-secpolicy.xml Wed Feb 28 21:58:03 2007
@@ -21,19 +21,7 @@
 							</sp:X509Token>
 						</wsp:Policy>
 					</sp:RecipientToken>
-					<sp:AlgorithmSuite>
-						<wsp:Policy>
-							<sp:Basic256Rsa15/>
-						</wsp:Policy>
-					</sp:AlgorithmSuite>
-					<sp:Layout>
-						<wsp:Policy>
-							<sp:Strict/>
-						</wsp:Policy>
-					</sp:Layout>
                     <sp:IncludeTimestamp/>
-                    <sp:EncryptBeforeSigning/>
-					<sp:OnlySignEntireHeadersAndBody/>
 				</wsp:Policy>
             </sp:AsymmetricBinding>
             <sp:SignedSupportingTokens xmlns:sp="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy">
@@ -41,24 +29,12 @@
                 <sp:UsernameToken sp:IncludeToken="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy/IncludeToken/Always"/>
             </wsp:Policy>
             </sp:SignedSupportingTokens>
-			<sp:Wss10 xmlns:sp="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy">
-				<wsp:Policy>
-					<sp:MustSupportRefIssuerSerial/>
-				</wsp:Policy>
-			</sp:Wss10>
             <rampc:RampartConfig xmlns:rampc="http://ws.apache.org/rampart/c/policy">
-                <rampc:user>Gampola</rampc:user>
-                <rampc:encryptionUser>a</rampc:encryptionUser>
-                <rampc:passwordType>Digest</rampc:passwordType>
-                <rampc:passwordCallbackClass>/home/AXIS2_USER/axis2/c/deploy/bin/samples/rampart/callback/libpwcb.so</rampc:passwordCallbackClass>
-                <rampc:signatureCrypto>
-                    <rampc:signaturePropFile>/home/AXIS2_USER/axis2/c/rampart/samples/keys/ahome/b_cert.cert</rampc:signaturePropFile>
-                </rampc:signatureCrypto>
-                <rampc:encryptionCypto>
-                    <rampc:encryptionPropFile>/home/AXIS2_USER/axis2/c/rampart/samples/keys/ahome/b_cert.cert</rampc:encryptionPropFile>
-                    <rampc:decryptionPropFile>/home/AXIS2_USER/axis2/c/rampart/samples/keys/ahome/a_store.pfx</rampc:decryptionPropFile>
-                </rampc:encryptionCypto>
-        </rampc:RampartConfig>
+                <rampc:TimeToLive>360</rampc:TimeToLive>
+                <rampc:User>Gampola</rampc:User>
+                <rampc:PasswordType>Digest</rampc:PasswordType>
+                <rampc:PasswordCallbackClass>/home/AXIS2_USER/axis2/c/deploy/bin/samples/rampart/callback/libpwcb.so</rampc:PasswordCallbackClass>
+            </rampc:RampartConfig>
 		</wsp:All>
 	</wsp:ExactlyOne>
 </wsp:Policy>

Modified: webservices/axis2/scratch/c/dinesh/532/c/rampart/samples/secpolicy/scenario2/service-incoming-secpolicy.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/scratch/c/dinesh/532/c/rampart/samples/secpolicy/scenario2/service-incoming-secpolicy.xml?view=diff&rev=513155&r1=513154&r2=513155
==============================================================================
--- webservices/axis2/scratch/c/dinesh/532/c/rampart/samples/secpolicy/scenario2/service-incoming-secpolicy.xml (original)
+++ webservices/axis2/scratch/c/dinesh/532/c/rampart/samples/secpolicy/scenario2/service-incoming-secpolicy.xml Wed Feb 28 21:58:03 2007
@@ -21,19 +21,7 @@
 							</sp:X509Token>
 						</wsp:Policy>
 					</sp:RecipientToken>
-					<sp:AlgorithmSuite>
-						<wsp:Policy>
-							<sp:Basic256Rsa15/>
-						</wsp:Policy>
-					</sp:AlgorithmSuite>
-					<sp:Layout>
-						<wsp:Policy>
-							<sp:Strict/>
-						</wsp:Policy>
-					</sp:Layout>
                     <sp:IncludeTimestamp/>
-                    <sp:EncryptBeforeSigning/>
-					<sp:OnlySignEntireHeadersAndBody/>
 				</wsp:Policy>
             </sp:AsymmetricBinding>
             <sp:SignedSupportingTokens xmlns:sp="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy">
@@ -41,23 +29,11 @@
                 <sp:UsernameToken sp:IncludeToken="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy/IncludeToken/Always"/>
             </wsp:Policy>
             </sp:SignedSupportingTokens>
-			<sp:Wss10 xmlns:sp="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy">
-				<wsp:Policy>
-					<sp:MustSupportRefIssuerSerial/>
-				</wsp:Policy>
-            </sp:Wss10>
             <rampc:RampartConfig xmlns:rampc="http://ws.apache.org/rampart/c/policy">
-                <rampc:user>Gampola</rampc:user>
-                <rampc:encryptionUser>b</rampc:encryptionUser>
-                <rampc:passwordType>Digest</rampc:passwordType>
-                <rampc:passwordCallbackClass>/home/AXIS2_USER/axis2/c/deploy/bin/samples/rampart/callback/libpwcb.so</rampc:passwordCallbackClass>
-                <rampc:signatureCrypto>
-                    <rampc:signaturePropFile>/home/AXIS2_USER/axis2/c/rampart/samples/keys/ahome/b_cert.cert</rampc:signaturePropFile>
-                </rampc:signatureCrypto>
-                <rampc:encryptionCypto>
-                    <rampc:encryptionPropFile>/home/AXIS2_USER/axis2/c/rampart/samples/keys/bhome/a_cert.cert</rampc:encryptionPropFile>
-                    <rampc:decryptionPropFile>/home/AXIS2_USER/axis2/c/rampart/samples/keys/bhome/b_store.pfx</rampc:decryptionPropFile>
-                </rampc:encryptionCypto>
+                <rampc:TimeToLive>360</rampc:TimeToLive>
+                <rampc:User>Gampola</rampc:User>
+                <rampc:PasswordType>Digest</rampc:PasswordType>
+                <rampc:PasswordCallbackClass>/home/AXIS2_USER/axis2/c/deploy/bin/samples/rampart/callback/libpwcb.so</rampc:PasswordCallbackClass>
         </rampc:RampartConfig>
 		</wsp:All>
 	</wsp:ExactlyOne>

Modified: webservices/axis2/scratch/c/dinesh/532/c/rampart/samples/secpolicy/scenario2/service-outgoing-secpolicy.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/scratch/c/dinesh/532/c/rampart/samples/secpolicy/scenario2/service-outgoing-secpolicy.xml?view=diff&rev=513155&r1=513154&r2=513155
==============================================================================
--- webservices/axis2/scratch/c/dinesh/532/c/rampart/samples/secpolicy/scenario2/service-outgoing-secpolicy.xml (original)
+++ webservices/axis2/scratch/c/dinesh/532/c/rampart/samples/secpolicy/scenario2/service-outgoing-secpolicy.xml Wed Feb 28 21:58:03 2007
@@ -21,38 +21,11 @@
 							</sp:X509Token>
 						</wsp:Policy>
 					</sp:RecipientToken>
-					<sp:AlgorithmSuite>
-						<wsp:Policy>
-							<sp:Basic256Rsa15/>
-						</wsp:Policy>
-					</sp:AlgorithmSuite>
-					<sp:Layout>
-						<wsp:Policy>
-							<sp:Strict/>
-						</wsp:Policy>
-					</sp:Layout>
                     <sp:IncludeTimestamp/>
-                    <sp:EncryptBeforeSigning/>
-					<sp:OnlySignEntireHeadersAndBody/>
 				</wsp:Policy>
             </sp:AsymmetricBinding>
-			<sp:Wss10 xmlns:sp="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy">
-				<wsp:Policy>
-					<sp:MustSupportRefIssuerSerial/>
-				</wsp:Policy>
-            </sp:Wss10>
             <rampc:RampartConfig xmlns:rampc="http://ws.apache.org/rampart/c/policy">
-                <rampc:user>Gampola</rampc:user>
-                <rampc:encryptionUser>b</rampc:encryptionUser>
-                <rampc:passwordType>Digest</rampc:passwordType>
-                <rampc:passwordCallbackClass>/home/AXIS2_USER/axis2/c/deploy/bin/samples/rampart/callback/libpwcb.so</rampc:passwordCallbackClass>
-                <rampc:signatureCrypto>
-                    <rampc:signaturePropFile>/home/AXIS2_USER/axis2/c/rampart/samples/keys/ahome/b_cert.cert</rampc:signaturePropFile>
-                </rampc:signatureCrypto>
-                <rampc:encryptionCypto>
-                    <rampc:encryptionPropFile>/home/AXIS2_USER/axis2/c/rampart/samples/keys/bhome/a_cert.cert</rampc:encryptionPropFile>
-                    <rampc:decryptionPropFile>/home/AXIS2_USER/axis2/c/rampart/samples/keys/bhome/b_store.pfx</rampc:decryptionPropFile>
-                </rampc:encryptionCypto>
+                <rampc:TimeToLive>360</rampc:TimeToLive>
         </rampc:RampartConfig>
 		</wsp:All>
 	</wsp:ExactlyOne>

Modified: webservices/axis2/scratch/c/dinesh/532/c/rampart/samples/secpolicy/scenario3/client-incoming-secpolicy.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/scratch/c/dinesh/532/c/rampart/samples/secpolicy/scenario3/client-incoming-secpolicy.xml?view=diff&rev=513155&r1=513154&r2=513155
==============================================================================
--- webservices/axis2/scratch/c/dinesh/532/c/rampart/samples/secpolicy/scenario3/client-incoming-secpolicy.xml (original)
+++ webservices/axis2/scratch/c/dinesh/532/c/rampart/samples/secpolicy/scenario3/client-incoming-secpolicy.xml Wed Feb 28 21:58:03 2007
@@ -21,39 +21,12 @@
 							</sp:X509Token>
 						</wsp:Policy>
 					</sp:RecipientToken>
-					<sp:AlgorithmSuite>
-						<wsp:Policy>
-							<sp:Basic256Rsa15/>
-						</wsp:Policy>
-					</sp:AlgorithmSuite>
-					<sp:Layout>
-						<wsp:Policy>
-							<sp:Strict/>
-						</wsp:Policy>
-					</sp:Layout>
                     <sp:IncludeTimestamp/>
-                    <sp:EncryptBeforeSigning/>
-					<sp:OnlySignEntireHeadersAndBody/>
 				</wsp:Policy>
             </sp:AsymmetricBinding>
-			<sp:Wss10 xmlns:sp="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy">
-				<wsp:Policy>
-					<sp:MustSupportRefIssuerSerial/>
-				</wsp:Policy>
-            </sp:Wss10>
             <rampc:RampartConfig xmlns:rampc="http://ws.apache.org/rampart/c/policy">
-                <rampc:user>Gampola</rampc:user>
-                <rampc:encryptionUser>a</rampc:encryptionUser>
-                <rampc:passwordType>Digest</rampc:passwordType>
-                <rampc:passwordCallbackClass>/home/AXIS2_USER/axis2/c/deploy/bin/samples/rampart/callback/libpwcb.so</rampc:passwordCallbackClass>
-                <rampc:signatureCrypto>
-                    <rampc:signaturePropFile>/home/AXIS2_USER/axis2/c/rampart/samples/keys/ahome/b_cert.cert</rampc:signaturePropFile>
-                </rampc:signatureCrypto>
-                <rampc:encryptionCypto>
-                    <rampc:encryptionPropFile>/home/AXIS2_USER/axis2/c/rampart/samples/keys/ahome/b_cert.cert</rampc:encryptionPropFile>
-                    <rampc:decryptionPropFile>/home/AXIS2_USER/axis2/c/rampart/samples/keys/ahome/a_store.pfx</rampc:decryptionPropFile>
-                </rampc:encryptionCypto>
-        </rampc:RampartConfig>
+                <rampc:TimeToLive>360</rampc:TimeToLive>
+            </rampc:RampartConfig>
 		</wsp:All>
 	</wsp:ExactlyOne>
 </wsp:Policy>

Modified: webservices/axis2/scratch/c/dinesh/532/c/rampart/samples/secpolicy/scenario3/client-outgoing-secpolicy.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/scratch/c/dinesh/532/c/rampart/samples/secpolicy/scenario3/client-outgoing-secpolicy.xml?view=diff&rev=513155&r1=513154&r2=513155
==============================================================================
--- webservices/axis2/scratch/c/dinesh/532/c/rampart/samples/secpolicy/scenario3/client-outgoing-secpolicy.xml (original)
+++ webservices/axis2/scratch/c/dinesh/532/c/rampart/samples/secpolicy/scenario3/client-outgoing-secpolicy.xml Wed Feb 28 21:58:03 2007
@@ -33,7 +33,6 @@
 					</sp:Layout>
                     <sp:IncludeTimestamp/>
                     <sp:EncryptBeforeSigning/>
-					<sp:OnlySignEntireHeadersAndBody/>
 				</wsp:Policy>
             </sp:AsymmetricBinding>
             <sp:SignedSupportingTokens xmlns:sp="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy">
@@ -50,18 +49,14 @@
 				<sp:Body/>
             </sp:EncryptedParts>
             <rampc:RampartConfig xmlns:rampc="http://ws.apache.org/rampart/c/policy">
-                <rampc:user>Gampola</rampc:user>
-                <rampc:encryptionUser>a</rampc:encryptionUser>
-                <rampc:passwordType>Digest</rampc:passwordType>
-                <rampc:passwordCallbackClass>/home/AXIS2_USER/axis2/c/deploy/bin/samples/rampart/callback/libpwcb.so</rampc:passwordCallbackClass>
-                <rampc:signatureCrypto>
-                    <rampc:signaturePropFile>/home/AXIS2_USER/axis2/c/rampart/samples/keys/ahome/b_cert.cert</rampc:signaturePropFile>
-                </rampc:signatureCrypto>
-                <rampc:encryptionCypto>
-                    <rampc:encryptionPropFile>/home/AXIS2_USER/axis2/c/rampart/samples/keys/ahome/b_cert.cert</rampc:encryptionPropFile>
-                    <rampc:decryptionPropFile>/home/AXIS2_USER/axis2/c/rampart/samples/keys/ahome/a_store.pfx</rampc:decryptionPropFile>
-                </rampc:encryptionCypto>
-        </rampc:RampartConfig>
+                <rampc:User>Gampola</rampc:User>
+                <rampc:TimeToLive>360</rampc:TimeToLive>
+                <rampc:EncryptionUser>a</rampc:EncryptionUser>
+                <rampc:PasswordType>Digest</rampc:PasswordType>
+                <rampc:PasswordCallbackClass>/home/AXIS2_USER/axis2/c/deploy/bin/samples/rampart/callback/libpwcb.so</rampc:PasswordCallbackClass>
+                <rampc:PublicKey>/home/AXIS2_USER/axis2/c/rampart/samples/keys/ahome/b_cert.cert</rampc:PublicKey>
+                <rampc:PrivateKey>/home/AXIS2_USER/axis2/c/rampart/samples/keys/ahome/a_store.pfx</rampc:PrivateKey>
+            </rampc:RampartConfig>
 		</wsp:All>
 	</wsp:ExactlyOne>
 </wsp:Policy>

Modified: webservices/axis2/scratch/c/dinesh/532/c/rampart/samples/secpolicy/scenario3/service-incoming-secpolicy.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/scratch/c/dinesh/532/c/rampart/samples/secpolicy/scenario3/service-incoming-secpolicy.xml?view=diff&rev=513155&r1=513154&r2=513155
==============================================================================
--- webservices/axis2/scratch/c/dinesh/532/c/rampart/samples/secpolicy/scenario3/service-incoming-secpolicy.xml (original)
+++ webservices/axis2/scratch/c/dinesh/532/c/rampart/samples/secpolicy/scenario3/service-incoming-secpolicy.xml Wed Feb 28 21:58:03 2007
@@ -33,7 +33,6 @@
 					</sp:Layout>
                     <sp:IncludeTimestamp/>
                     <sp:EncryptBeforeSigning/>
-					<sp:OnlySignEntireHeadersAndBody/>
 				</wsp:Policy>
             </sp:AsymmetricBinding>
             <sp:SignedSupportingTokens xmlns:sp="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy">
@@ -43,25 +42,21 @@
             </sp:SignedSupportingTokens>
 			<sp:Wss10 xmlns:sp="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy">
 				<wsp:Policy>
-					<sp:MustSupportRefIssuerSerial/>
+                    <sp:MustSupportRefIssuerSerial/>
 				</wsp:Policy>
-            </sp:Wss10>
-            <sp:EncryptedParts xmlns:sp="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy">
-                <sp:Body/>
+			</sp:Wss10>
+			<sp:EncryptedParts xmlns:sp="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy">
+				<sp:Body/>
             </sp:EncryptedParts>
             <rampc:RampartConfig xmlns:rampc="http://ws.apache.org/rampart/c/policy">
-                <rampc:user>Gampola</rampc:user>
-                <rampc:encryptionUser>b</rampc:encryptionUser>
-                <rampc:passwordType>Digest</rampc:passwordType>
-                <rampc:passwordCallbackClass>/home/AXIS2_USER/axis2/c/deploy/bin/samples/rampart/callback/libpwcb.so</rampc:passwordCallbackClass>
-                <rampc:signatureCrypto>
-                    <rampc:signaturePropFile>/home/AXIS2_USER/axis2/c/rampart/samples/keys/ahome/b_cert.cert</rampc:signaturePropFile>
-                </rampc:signatureCrypto>
-                <rampc:encryptionCypto>
-                    <rampc:encryptionPropFile>/home/AXIS2_USER/axis2/c/rampart/samples/keys/bhome/a_cert.cert</rampc:encryptionPropFile>
-                    <rampc:decryptionPropFile>/home/AXIS2_USER/axis2/c/rampart/samples/keys/bhome/b_store.pfx</rampc:decryptionPropFile>
-                </rampc:encryptionCypto>
-        </rampc:RampartConfig>
+                <rampc:User>Gampola</rampc:User>
+                <rampc:TimeToLive>360</rampc:TimeToLive>
+                <rampc:EncryptionUser>b</rampc:EncryptionUser>
+                <rampc:PasswordType>Digest</rampc:PasswordType>
+                <rampc:PasswordCallbackClass>/home/AXIS2_USER/axis2/c/deploy/bin/samples/rampart/callback/libpwcb.so</rampc:PasswordCallbackClass>
+                <rampc:PublicKey>/home/AXIS2_USER/axis2/c/rampart/samples/keys/bhome/a_cert.cert</rampc:PublicKey>
+                <rampc:PrivateKey>/home/AXIS2_USER/axis2/c/rampart/samples/keys/bhome/b_store.pfx</rampc:PrivateKey>
+            </rampc:RampartConfig>
 		</wsp:All>
 	</wsp:ExactlyOne>
 </wsp:Policy>

Modified: webservices/axis2/scratch/c/dinesh/532/c/rampart/samples/secpolicy/scenario3/service-outgoing-secpolicy.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/scratch/c/dinesh/532/c/rampart/samples/secpolicy/scenario3/service-outgoing-secpolicy.xml?view=diff&rev=513155&r1=513154&r2=513155
==============================================================================
--- webservices/axis2/scratch/c/dinesh/532/c/rampart/samples/secpolicy/scenario3/service-outgoing-secpolicy.xml (original)
+++ webservices/axis2/scratch/c/dinesh/532/c/rampart/samples/secpolicy/scenario3/service-outgoing-secpolicy.xml Wed Feb 28 21:58:03 2007
@@ -21,39 +21,12 @@
 							</sp:X509Token>
 						</wsp:Policy>
 					</sp:RecipientToken>
-					<sp:AlgorithmSuite>
-						<wsp:Policy>
-							<sp:Basic256Rsa15/>
-						</wsp:Policy>
-					</sp:AlgorithmSuite>
-					<sp:Layout>
-						<wsp:Policy>
-							<sp:Strict/>
-						</wsp:Policy>
-					</sp:Layout>
                     <sp:IncludeTimestamp/>
-                    <sp:EncryptBeforeSigning/>
-					<sp:OnlySignEntireHeadersAndBody/>
 				</wsp:Policy>
             </sp:AsymmetricBinding>
-			<sp:Wss10 xmlns:sp="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy">
-				<wsp:Policy>
-					<sp:MustSupportRefIssuerSerial/>
-				</wsp:Policy>
-            </sp:Wss10>
             <rampc:RampartConfig xmlns:rampc="http://ws.apache.org/rampart/c/policy">
-                <rampc:user>Gampola</rampc:user>
-                <rampc:encryptionUser>b</rampc:encryptionUser>
-                <rampc:passwordType>Digest</rampc:passwordType>
-                <rampc:passwordCallbackClass>/home/AXIS2_USER/axis2/c/deploy/bin/samples/rampart/callback/libpwcb.so</rampc:passwordCallbackClass>
-                <rampc:signatureCrypto>
-                    <rampc:signaturePropFile>/home/AXIS2_USER/axis2/c/rampart/samples/keys/ahome/b_cert.cert</rampc:signaturePropFile>
-                </rampc:signatureCrypto>
-                <rampc:encryptionCypto>
-                    <rampc:encryptionPropFile>/home/AXIS2_USER/axis2/c/rampart/samples/keys/bhome/a_cert.cert</rampc:encryptionPropFile>
-                    <rampc:decryptionPropFile>/home/AXIS2_USER/axis2/c/rampart/samples/keys/bhome/b_store.pfx</rampc:decryptionPropFile>
-                </rampc:encryptionCypto>
-        </rampc:RampartConfig>
+                <rampc:TimeToLive>360</rampc:TimeToLive>
+            </rampc:RampartConfig>
 		</wsp:All>
 	</wsp:ExactlyOne>
 </wsp:Policy>

Modified: webservices/axis2/scratch/c/dinesh/532/c/rampart/samples/secpolicy/scenario4/client-incoming-secpolicy.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/scratch/c/dinesh/532/c/rampart/samples/secpolicy/scenario4/client-incoming-secpolicy.xml?view=diff&rev=513155&r1=513154&r2=513155
==============================================================================
--- webservices/axis2/scratch/c/dinesh/532/c/rampart/samples/secpolicy/scenario4/client-incoming-secpolicy.xml (original)
+++ webservices/axis2/scratch/c/dinesh/532/c/rampart/samples/secpolicy/scenario4/client-incoming-secpolicy.xml Wed Feb 28 21:58:03 2007
@@ -21,39 +21,12 @@
 							</sp:X509Token>
 						</wsp:Policy>
 					</sp:RecipientToken>
-					<sp:AlgorithmSuite>
-						<wsp:Policy>
-							<sp:Basic256Rsa15/>
-						</wsp:Policy>
-					</sp:AlgorithmSuite>
-					<sp:Layout>
-						<wsp:Policy>
-							<sp:Strict/>
-						</wsp:Policy>
-					</sp:Layout>
                     <sp:IncludeTimestamp/>
-                    <sp:EncryptBeforeSigning/>
-					<sp:OnlySignEntireHeadersAndBody/>
 				</wsp:Policy>
             </sp:AsymmetricBinding>
-			<sp:Wss10 xmlns:sp="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy">
-                <wsp:Policy>
-                    <sp:MustSupportRefKeyIdentifier/>
-				</wsp:Policy>
-            </sp:Wss10>
             <rampc:RampartConfig xmlns:rampc="http://ws.apache.org/rampart/c/policy">
-                <rampc:user>Gampola</rampc:user>
-                <rampc:encryptionUser>a</rampc:encryptionUser>
-                <rampc:passwordType>Digest</rampc:passwordType>
-                <rampc:passwordCallbackClass>/home/AXIS2_USER/axis2/c/deploy/bin/samples/rampart/callback/libpwcb.so</rampc:passwordCallbackClass>
-                <rampc:signatureCrypto>
-                    <rampc:signaturePropFile>/home/AXIS2_USER/axis2/c/rampart/samples/keys/ahome/b_cert.cert</rampc:signaturePropFile>
-                </rampc:signatureCrypto>
-                <rampc:encryptionCypto>
-                    <rampc:encryptionPropFile>/home/AXIS2_USER/axis2/c/rampart/samples/keys/ahome/b_cert.cert</rampc:encryptionPropFile>
-                    <rampc:decryptionPropFile>/home/AXIS2_USER/axis2/c/rampart/samples/keys/ahome/a_store.pfx</rampc:decryptionPropFile>
-                </rampc:encryptionCypto>
-        </rampc:RampartConfig>
+                <rampc:TimeToLive>360</rampc:TimeToLive>
+            </rampc:RampartConfig>
 		</wsp:All>
 	</wsp:ExactlyOne>
 </wsp:Policy>

Modified: webservices/axis2/scratch/c/dinesh/532/c/rampart/samples/secpolicy/scenario4/client-outgoing-secpolicy.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/scratch/c/dinesh/532/c/rampart/samples/secpolicy/scenario4/client-outgoing-secpolicy.xml?view=diff&rev=513155&r1=513154&r2=513155
==============================================================================
--- webservices/axis2/scratch/c/dinesh/532/c/rampart/samples/secpolicy/scenario4/client-outgoing-secpolicy.xml (original)
+++ webservices/axis2/scratch/c/dinesh/532/c/rampart/samples/secpolicy/scenario4/client-outgoing-secpolicy.xml Wed Feb 28 21:58:03 2007
@@ -33,7 +33,6 @@
 					</sp:Layout>
                     <sp:IncludeTimestamp/>
                     <sp:EncryptBeforeSigning/>
-					<sp:OnlySignEntireHeadersAndBody/>
 				</wsp:Policy>
             </sp:AsymmetricBinding>
             <sp:SignedSupportingTokens xmlns:sp="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy">
@@ -43,25 +42,21 @@
             </sp:SignedSupportingTokens>
 			<sp:Wss10 xmlns:sp="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy">
 				<wsp:Policy>
-					<sp:MustSupportRefKeyIdentifier/>
+                    <sp:MustSupportRefKeyIdentifier/>
 				</wsp:Policy>
 			</sp:Wss10>
 			<sp:EncryptedParts xmlns:sp="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy">
 				<sp:Body/>
             </sp:EncryptedParts>
             <rampc:RampartConfig xmlns:rampc="http://ws.apache.org/rampart/c/policy">
-                <rampc:user>Gampola</rampc:user>
-                <rampc:encryptionUser>a</rampc:encryptionUser>
-                <rampc:passwordType>Digest</rampc:passwordType>
-                <rampc:passwordCallbackClass>/home/AXIS2_USER/axis2/c/deploy/bin/samples/rampart/callback/libpwcb.so</rampc:passwordCallbackClass>
-                <rampc:signatureCrypto>
-                    <rampc:signaturePropFile>/home/AXIS2_USER/axis2/c/rampart/samples/keys/ahome/b_cert.cert</rampc:signaturePropFile>
-                </rampc:signatureCrypto>
-                <rampc:encryptionCypto>
-                    <rampc:encryptionPropFile>/home/AXIS2_USER/axis2/c/rampart/samples/keys/ahome/b_cert.cert</rampc:encryptionPropFile>
-                    <rampc:decryptionPropFile>/home/AXIS2_USER/axis2/c/rampart/samples/keys/ahome/a_store.pfx</rampc:decryptionPropFile>
-                </rampc:encryptionCypto>
-        </rampc:RampartConfig>
+                <rampc:User>Gampola</rampc:User>
+                <rampc:TimeToLive>360</rampc:TimeToLive>
+                <rampc:EncryptionUser>a</rampc:EncryptionUser>
+                <rampc:PasswordType>Digest</rampc:PasswordType>
+                <rampc:PasswordCallbackClass>/home/AXIS2_USER/axis2/c/deploy/bin/samples/rampart/callback/libpwcb.so</rampc:PasswordCallbackClass>
+                <rampc:PublicKey>/home/AXIS2_USER/axis2/c/rampart/samples/keys/ahome/b_cert.cert</rampc:PublicKey>
+                <rampc:PrivateKey>/home/AXIS2_USER/axis2/c/rampart/samples/keys/ahome/a_store.pfx</rampc:PrivateKey>
+            </rampc:RampartConfig>
 		</wsp:All>
 	</wsp:ExactlyOne>
 </wsp:Policy>

Modified: webservices/axis2/scratch/c/dinesh/532/c/rampart/samples/secpolicy/scenario4/service-incoming-secpolicy.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/scratch/c/dinesh/532/c/rampart/samples/secpolicy/scenario4/service-incoming-secpolicy.xml?view=diff&rev=513155&r1=513154&r2=513155
==============================================================================
--- webservices/axis2/scratch/c/dinesh/532/c/rampart/samples/secpolicy/scenario4/service-incoming-secpolicy.xml (original)
+++ webservices/axis2/scratch/c/dinesh/532/c/rampart/samples/secpolicy/scenario4/service-incoming-secpolicy.xml Wed Feb 28 21:58:03 2007
@@ -33,7 +33,6 @@
 					</sp:Layout>
                     <sp:IncludeTimestamp/>
                     <sp:EncryptBeforeSigning/>
-					<sp:OnlySignEntireHeadersAndBody/>
 				</wsp:Policy>
             </sp:AsymmetricBinding>
             <sp:SignedSupportingTokens xmlns:sp="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy">
@@ -42,27 +41,22 @@
             </wsp:Policy>
             </sp:SignedSupportingTokens>
 			<sp:Wss10 xmlns:sp="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy">
-                <wsp:Policy>
+				<wsp:Policy>
                     <sp:MustSupportRefKeyIdentifier/>
-					<sp:MustSupportRefIssuerSerial/>
 				</wsp:Policy>
-            </sp:Wss10>
-            <sp:EncryptedParts xmlns:sp="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy">
-                <sp:Body/>
+			</sp:Wss10>
+			<sp:EncryptedParts xmlns:sp="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy">
+				<sp:Body/>
             </sp:EncryptedParts>
             <rampc:RampartConfig xmlns:rampc="http://ws.apache.org/rampart/c/policy">
-                <rampc:user>Gampola</rampc:user>
-                <rampc:encryptionUser>b</rampc:encryptionUser>
-                <rampc:passwordType>Digest</rampc:passwordType>
-                <rampc:passwordCallbackClass>/home/AXIS2_USER/axis2/c/deploy/bin/samples/rampart/callback/libpwcb.so</rampc:passwordCallbackClass>
-                <rampc:signatureCrypto>
-                    <rampc:signaturePropFile>/home/AXIS2_USER/axis2/c/rampart/samples/keys/ahome/b_cert.cert</rampc:signaturePropFile>
-                </rampc:signatureCrypto>
-                <rampc:encryptionCypto>
-                    <rampc:encryptionPropFile>/home/AXIS2_USER/axis2/c/rampart/samples/keys/bhome/a_cert.cert</rampc:encryptionPropFile>
-                    <rampc:decryptionPropFile>/home/AXIS2_USER/axis2/c/rampart/samples/keys/bhome/b_store.pfx</rampc:decryptionPropFile>
-                </rampc:encryptionCypto>
-        </rampc:RampartConfig>
+                <rampc:User>Gampola</rampc:User>
+                <rampc:TimeToLive>360</rampc:TimeToLive>
+                <rampc:EncryptionUser>b</rampc:EncryptionUser>
+                <rampc:PasswordType>Digest</rampc:PasswordType>
+                <rampc:PasswordCallbackClass>/home/AXIS2_USER/axis2/c/deploy/bin/samples/rampart/callback/libpwcb.so</rampc:PasswordCallbackClass>
+                <rampc:PublicKey>/home/AXIS2_USER/axis2/c/rampart/samples/keys/bhome/a_cert.cert</rampc:PublicKey>
+                <rampc:PrivateKey>/home/AXIS2_USER/axis2/c/rampart/samples/keys/bhome/b_store.pfx</rampc:PrivateKey>
+            </rampc:RampartConfig>
 		</wsp:All>
 	</wsp:ExactlyOne>
 </wsp:Policy>

Modified: webservices/axis2/scratch/c/dinesh/532/c/rampart/samples/secpolicy/scenario4/service-outgoing-secpolicy.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/scratch/c/dinesh/532/c/rampart/samples/secpolicy/scenario4/service-outgoing-secpolicy.xml?view=diff&rev=513155&r1=513154&r2=513155
==============================================================================
--- webservices/axis2/scratch/c/dinesh/532/c/rampart/samples/secpolicy/scenario4/service-outgoing-secpolicy.xml (original)
+++ webservices/axis2/scratch/c/dinesh/532/c/rampart/samples/secpolicy/scenario4/service-outgoing-secpolicy.xml Wed Feb 28 21:58:03 2007
@@ -21,40 +21,12 @@
 							</sp:X509Token>
 						</wsp:Policy>
 					</sp:RecipientToken>
-					<sp:AlgorithmSuite>
-						<wsp:Policy>
-							<sp:Basic256Rsa15/>
-						</wsp:Policy>
-					</sp:AlgorithmSuite>
-					<sp:Layout>
-						<wsp:Policy>
-							<sp:Strict/>
-						</wsp:Policy>
-					</sp:Layout>
                     <sp:IncludeTimestamp/>
-                    <sp:EncryptBeforeSigning/>
-					<sp:OnlySignEntireHeadersAndBody/>
 				</wsp:Policy>
             </sp:AsymmetricBinding>
-			<sp:Wss10 xmlns:sp="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy">
-                <wsp:Policy>
-                    <sp:MustSupportRefKeyIdentifier/>
-                    <sp:MustSupportRefIssuerSerial/>
-				</wsp:Policy>
-            </sp:Wss10>
             <rampc:RampartConfig xmlns:rampc="http://ws.apache.org/rampart/c/policy">
-                <rampc:user>Gampola</rampc:user>
-                <rampc:encryptionUser>b</rampc:encryptionUser>
-                <rampc:passwordType>Digest</rampc:passwordType>
-                <rampc:passwordCallbackClass>/home/AXIS2_USER/axis2/c/deploy/bin/samples/rampart/callback/libpwcb.so</rampc:passwordCallbackClass>
-                <rampc:signatureCrypto>
-                    <rampc:signaturePropFile>/home/AXIS2_USER/axis2/c/rampart/samples/keys/ahome/b_cert.cert</rampc:signaturePropFile>
-                </rampc:signatureCrypto>
-                <rampc:encryptionCypto>
-                    <rampc:encryptionPropFile>/home/AXIS2_USER/axis2/c/rampart/samples/keys/bhome/a_cert.cert</rampc:encryptionPropFile>
-                    <rampc:decryptionPropFile>/home/AXIS2_USER/axis2/c/rampart/samples/keys/bhome/b_store.pfx</rampc:decryptionPropFile>
-                </rampc:encryptionCypto>
-        </rampc:RampartConfig>
+                <rampc:TimeToLive>360</rampc:TimeToLive>
+            </rampc:RampartConfig>
 		</wsp:All>
 	</wsp:ExactlyOne>
 </wsp:Policy>

Modified: webservices/axis2/scratch/c/dinesh/532/c/rampart/samples/secpolicy/scenario5/client-incoming-secpolicy.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/scratch/c/dinesh/532/c/rampart/samples/secpolicy/scenario5/client-incoming-secpolicy.xml?view=diff&rev=513155&r1=513154&r2=513155
==============================================================================
--- webservices/axis2/scratch/c/dinesh/532/c/rampart/samples/secpolicy/scenario5/client-incoming-secpolicy.xml (original)
+++ webservices/axis2/scratch/c/dinesh/532/c/rampart/samples/secpolicy/scenario5/client-incoming-secpolicy.xml Wed Feb 28 21:58:03 2007
@@ -21,39 +21,12 @@
 							</sp:X509Token>
 						</wsp:Policy>
 					</sp:RecipientToken>
-					<sp:AlgorithmSuite>
-						<wsp:Policy>
-							<sp:Basic256Rsa15/>
-						</wsp:Policy>
-					</sp:AlgorithmSuite>
-					<sp:Layout>
-						<wsp:Policy>
-							<sp:Strict/>
-						</wsp:Policy>
-					</sp:Layout>
                     <sp:IncludeTimestamp/>
-                    <sp:EncryptBeforeSigning/>
-					<sp:OnlySignEntireHeadersAndBody/>
 				</wsp:Policy>
             </sp:AsymmetricBinding>
-			<sp:Wss10 xmlns:sp="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy">
-                <wsp:Policy>
-                    <sp:MustSupportRefEmbeddedToken/>
-				</wsp:Policy>
-            </sp:Wss10>
             <rampc:RampartConfig xmlns:rampc="http://ws.apache.org/rampart/c/policy">
-                <rampc:user>Gampola</rampc:user>
-                <rampc:encryptionUser>a</rampc:encryptionUser>
-                <rampc:passwordType>Digest</rampc:passwordType>
-                <rampc:passwordCallbackClass>/home/AXIS2_USER/axis2/c/deploy/bin/samples/rampart/callback/libpwcb.so</rampc:passwordCallbackClass>
-                <rampc:signatureCrypto>
-                    <rampc:signaturePropFile>/home/AXIS2_USER/axis2/c/rampart/samples/keys/ahome/b_cert.cert</rampc:signaturePropFile>
-                </rampc:signatureCrypto>
-                <rampc:encryptionCypto>
-                    <rampc:encryptionPropFile>/home/AXIS2_USER/axis2/c/rampart/samples/keys/ahome/b_cert.cert</rampc:encryptionPropFile>
-                    <rampc:decryptionPropFile>/home/AXIS2_USER/axis2/c/rampart/samples/keys/ahome/a_store.pfx</rampc:decryptionPropFile>
-                </rampc:encryptionCypto>
-        </rampc:RampartConfig>
+                <rampc:TimeToLive>360</rampc:TimeToLive>
+            </rampc:RampartConfig>
 		</wsp:All>
 	</wsp:ExactlyOne>
 </wsp:Policy>

Modified: webservices/axis2/scratch/c/dinesh/532/c/rampart/samples/secpolicy/scenario5/client-outgoing-secpolicy.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/scratch/c/dinesh/532/c/rampart/samples/secpolicy/scenario5/client-outgoing-secpolicy.xml?view=diff&rev=513155&r1=513154&r2=513155
==============================================================================
--- webservices/axis2/scratch/c/dinesh/532/c/rampart/samples/secpolicy/scenario5/client-outgoing-secpolicy.xml (original)
+++ webservices/axis2/scratch/c/dinesh/532/c/rampart/samples/secpolicy/scenario5/client-outgoing-secpolicy.xml Wed Feb 28 21:58:03 2007
@@ -33,7 +33,6 @@
 					</sp:Layout>
                     <sp:IncludeTimestamp/>
                     <sp:EncryptBeforeSigning/>
-					<sp:OnlySignEntireHeadersAndBody/>
 				</wsp:Policy>
             </sp:AsymmetricBinding>
             <sp:SignedSupportingTokens xmlns:sp="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy">
@@ -43,25 +42,21 @@
             </sp:SignedSupportingTokens>
 			<sp:Wss10 xmlns:sp="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy">
 				<wsp:Policy>
-					<sp:MustSupportRefEmbeddedToken/>
+                    <sp:MustSupportRefEmbeddedToken/>
 				</wsp:Policy>
 			</sp:Wss10>
 			<sp:EncryptedParts xmlns:sp="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy">
 				<sp:Body/>
             </sp:EncryptedParts>
             <rampc:RampartConfig xmlns:rampc="http://ws.apache.org/rampart/c/policy">
-                <rampc:user>Gampola</rampc:user>
-                <rampc:encryptionUser>a</rampc:encryptionUser>
-                <rampc:passwordType>Digest</rampc:passwordType>
-                <rampc:passwordCallbackClass>/home/AXIS2_USER/axis2/c/deploy/bin/samples/rampart/callback/libpwcb.so</rampc:passwordCallbackClass>
-                <rampc:signatureCrypto>
-                    <rampc:signaturePropFile>/home/AXIS2_USER/axis2/c/rampart/samples/keys/ahome/b_cert.cert</rampc:signaturePropFile>
-                </rampc:signatureCrypto>
-                <rampc:encryptionCypto>
-                    <rampc:encryptionPropFile>/home/AXIS2_USER/axis2/c/rampart/samples/keys/ahome/b_cert.cert</rampc:encryptionPropFile>
-                    <rampc:decryptionPropFile>/home/AXIS2_USER/axis2/c/rampart/samples/keys/ahome/a_store.pfx</rampc:decryptionPropFile>
-                </rampc:encryptionCypto>
-        </rampc:RampartConfig>
+                <rampc:User>Gampola</rampc:User>
+                <rampc:TimeToLive>360</rampc:TimeToLive>
+                <rampc:EncryptionUser>a</rampc:EncryptionUser>
+                <rampc:PasswordType>Digest</rampc:PasswordType>
+                <rampc:PasswordCallbackClass>/home/AXIS2_USER/axis2/c/deploy/bin/samples/rampart/callback/libpwcb.so</rampc:PasswordCallbackClass>
+                <rampc:PublicKey>/home/AXIS2_USER/axis2/c/rampart/samples/keys/ahome/b_cert.cert</rampc:PublicKey>
+                <rampc:PrivateKey>/home/AXIS2_USER/axis2/c/rampart/samples/keys/ahome/a_store.pfx</rampc:PrivateKey>
+            </rampc:RampartConfig>
 		</wsp:All>
 	</wsp:ExactlyOne>
 </wsp:Policy>

Modified: webservices/axis2/scratch/c/dinesh/532/c/rampart/samples/secpolicy/scenario5/service-incoming-secpolicy.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/scratch/c/dinesh/532/c/rampart/samples/secpolicy/scenario5/service-incoming-secpolicy.xml?view=diff&rev=513155&r1=513154&r2=513155
==============================================================================
--- webservices/axis2/scratch/c/dinesh/532/c/rampart/samples/secpolicy/scenario5/service-incoming-secpolicy.xml (original)
+++ webservices/axis2/scratch/c/dinesh/532/c/rampart/samples/secpolicy/scenario5/service-incoming-secpolicy.xml Wed Feb 28 21:58:03 2007
@@ -33,7 +33,6 @@
 					</sp:Layout>
                     <sp:IncludeTimestamp/>
                     <sp:EncryptBeforeSigning/>
-					<sp:OnlySignEntireHeadersAndBody/>
 				</wsp:Policy>
             </sp:AsymmetricBinding>
             <sp:SignedSupportingTokens xmlns:sp="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy">
@@ -42,27 +41,22 @@
             </wsp:Policy>
             </sp:SignedSupportingTokens>
 			<sp:Wss10 xmlns:sp="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy">
-                <wsp:Policy>
+				<wsp:Policy>
                     <sp:MustSupportRefEmbeddedToken/>
-					<sp:MustSupportRefIssuerSerial/>
 				</wsp:Policy>
-            </sp:Wss10>
-            <sp:EncryptedParts xmlns:sp="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy">
-                <sp:Body/>
+			</sp:Wss10>
+			<sp:EncryptedParts xmlns:sp="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy">
+				<sp:Body/>
             </sp:EncryptedParts>
             <rampc:RampartConfig xmlns:rampc="http://ws.apache.org/rampart/c/policy">
-                <rampc:user>Gampola</rampc:user>
-                <rampc:encryptionUser>b</rampc:encryptionUser>
-                <rampc:passwordType>Digest</rampc:passwordType>
-                <rampc:passwordCallbackClass>/home/AXIS2_USER/axis2/c/deploy/bin/samples/rampart/callback/libpwcb.so</rampc:passwordCallbackClass>
-                <rampc:signatureCrypto>
-                    <rampc:signaturePropFile>/home/AXIS2_USER/axis2/c/rampart/samples/keys/ahome/b_cert.cert</rampc:signaturePropFile>
-                </rampc:signatureCrypto>
-                <rampc:encryptionCypto>
-                    <rampc:encryptionPropFile>/home/AXIS2_USER/axis2/c/rampart/samples/keys/bhome/a_cert.cert</rampc:encryptionPropFile>
-                    <rampc:decryptionPropFile>/home/AXIS2_USER/axis2/c/rampart/samples/keys/bhome/b_store.pfx</rampc:decryptionPropFile>
-                </rampc:encryptionCypto>
-        </rampc:RampartConfig>
+                <rampc:User>Gampola</rampc:User>
+                <rampc:TimeToLive>360</rampc:TimeToLive>
+                <rampc:EncryptionUser>b</rampc:EncryptionUser>
+                <rampc:PasswordType>Digest</rampc:PasswordType>
+                <rampc:PasswordCallbackClass>/home/AXIS2_USER/axis2/c/deploy/bin/samples/rampart/callback/libpwcb.so</rampc:PasswordCallbackClass>
+                <rampc:PublicKey>/home/AXIS2_USER/axis2/c/rampart/samples/keys/bhome/a_cert.cert</rampc:PublicKey>
+                <rampc:PrivateKey>/home/AXIS2_USER/axis2/c/rampart/samples/keys/bhome/b_store.pfx</rampc:PrivateKey>
+            </rampc:RampartConfig>
 		</wsp:All>
 	</wsp:ExactlyOne>
 </wsp:Policy>

Modified: webservices/axis2/scratch/c/dinesh/532/c/rampart/samples/secpolicy/scenario5/service-outgoing-secpolicy.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/scratch/c/dinesh/532/c/rampart/samples/secpolicy/scenario5/service-outgoing-secpolicy.xml?view=diff&rev=513155&r1=513154&r2=513155
==============================================================================
--- webservices/axis2/scratch/c/dinesh/532/c/rampart/samples/secpolicy/scenario5/service-outgoing-secpolicy.xml (original)
+++ webservices/axis2/scratch/c/dinesh/532/c/rampart/samples/secpolicy/scenario5/service-outgoing-secpolicy.xml Wed Feb 28 21:58:03 2007
@@ -21,40 +21,12 @@
 							</sp:X509Token>
 						</wsp:Policy>
 					</sp:RecipientToken>
-					<sp:AlgorithmSuite>
-						<wsp:Policy>
-							<sp:Basic256Rsa15/>
-						</wsp:Policy>
-					</sp:AlgorithmSuite>
-					<sp:Layout>
-						<wsp:Policy>
-							<sp:Strict/>
-						</wsp:Policy>
-					</sp:Layout>
                     <sp:IncludeTimestamp/>
-                    <sp:EncryptBeforeSigning/>
-					<sp:OnlySignEntireHeadersAndBody/>
 				</wsp:Policy>
             </sp:AsymmetricBinding>
-			<sp:Wss10 xmlns:sp="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy">
-                <wsp:Policy>
-                    <sp:MustSupportRefEmbeddedToken/>
-                    <sp:MustSupportRefIssuerSerial/>
-				</wsp:Policy>
-            </sp:Wss10>
             <rampc:RampartConfig xmlns:rampc="http://ws.apache.org/rampart/c/policy">
-                <rampc:user>Gampola</rampc:user>
-                <rampc:encryptionUser>b</rampc:encryptionUser>
-                <rampc:passwordType>Digest</rampc:passwordType>
-                <rampc:passwordCallbackClass>/home/AXIS2_USER/axis2/c/deploy/bin/samples/rampart/callback/libpwcb.so</rampc:passwordCallbackClass>
-                <rampc:signatureCrypto>
-                    <rampc:signaturePropFile>/home/AXIS2_USER/axis2/c/rampart/samples/keys/ahome/b_cert.cert</rampc:signaturePropFile>
-                </rampc:signatureCrypto>
-                <rampc:encryptionCypto>
-                    <rampc:encryptionPropFile>/home/AXIS2_USER/axis2/c/rampart/samples/keys/bhome/a_cert.cert</rampc:encryptionPropFile>
-                    <rampc:decryptionPropFile>/home/AXIS2_USER/axis2/c/rampart/samples/keys/bhome/b_store.pfx</rampc:decryptionPropFile>
-                </rampc:encryptionCypto>
-        </rampc:RampartConfig>
+                <rampc:TimeToLive>360</rampc:TimeToLive>
+            </rampc:RampartConfig>
 		</wsp:All>
 	</wsp:ExactlyOne>
 </wsp:Policy>

Modified: webservices/axis2/scratch/c/dinesh/532/c/rampart/samples/secpolicy/scenario6/client-incoming-secpolicy.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/scratch/c/dinesh/532/c/rampart/samples/secpolicy/scenario6/client-incoming-secpolicy.xml?view=diff&rev=513155&r1=513154&r2=513155
==============================================================================
--- webservices/axis2/scratch/c/dinesh/532/c/rampart/samples/secpolicy/scenario6/client-incoming-secpolicy.xml (original)
+++ webservices/axis2/scratch/c/dinesh/532/c/rampart/samples/secpolicy/scenario6/client-incoming-secpolicy.xml Wed Feb 28 21:58:03 2007
@@ -21,34 +21,12 @@
 							</sp:X509Token>
 						</wsp:Policy>
 					</sp:RecipientToken>
-					<sp:AlgorithmSuite>
-						<wsp:Policy>
-							<sp:Basic256Rsa15/>
-						</wsp:Policy>
-					</sp:AlgorithmSuite>
-					<sp:Layout>
-						<wsp:Policy>
-							<sp:Strict/>
-						</wsp:Policy>
-					</sp:Layout>
                     <sp:IncludeTimestamp/>
-                    <sp:EncryptBeforeSigning/>
-					<sp:OnlySignEntireHeadersAndBody/>
 				</wsp:Policy>
             </sp:AsymmetricBinding>
             <rampc:RampartConfig xmlns:rampc="http://ws.apache.org/rampart/c/policy">
-                <rampc:user>Gampola</rampc:user>
-                <rampc:encryptionUser>a</rampc:encryptionUser>
-                <rampc:passwordType>Digest</rampc:passwordType>
-                <rampc:passwordCallbackClass>/home/AXIS2_USER/axis2/c/deploy/bin/samples/rampart/callback/libpwcb.so</rampc:passwordCallbackClass>
-                <rampc:signatureCrypto>
-                    <rampc:signaturePropFile>/home/AXIS2_USER/axis2/c/rampart/samples/keys/ahome/b_cert.cert</rampc:signaturePropFile>
-                </rampc:signatureCrypto>
-                <rampc:encryptionCypto>
-                    <rampc:encryptionPropFile>/home/AXIS2_USER/axis2/c/rampart/samples/keys/ahome/b_cert.cert</rampc:encryptionPropFile>
-                    <rampc:decryptionPropFile>/home/AXIS2_USER/axis2/c/rampart/samples/keys/ahome/a_store.pfx</rampc:decryptionPropFile>
-                </rampc:encryptionCypto>
-        </rampc:RampartConfig>
+                <rampc:TimeToLive>360</rampc:TimeToLive>
+            </rampc:RampartConfig>
 		</wsp:All>
 	</wsp:ExactlyOne>
 </wsp:Policy>

Modified: webservices/axis2/scratch/c/dinesh/532/c/rampart/samples/secpolicy/scenario6/client-outgoing-secpolicy.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/scratch/c/dinesh/532/c/rampart/samples/secpolicy/scenario6/client-outgoing-secpolicy.xml?view=diff&rev=513155&r1=513154&r2=513155
==============================================================================
--- webservices/axis2/scratch/c/dinesh/532/c/rampart/samples/secpolicy/scenario6/client-outgoing-secpolicy.xml (original)
+++ webservices/axis2/scratch/c/dinesh/532/c/rampart/samples/secpolicy/scenario6/client-outgoing-secpolicy.xml Wed Feb 28 21:58:03 2007
@@ -33,7 +33,6 @@
 					</sp:Layout>
                     <sp:IncludeTimestamp/>
                     <sp:EncryptBeforeSigning/>
-					<sp:OnlySignEntireHeadersAndBody/>
 				</wsp:Policy>
             </sp:AsymmetricBinding>
             <sp:SignedSupportingTokens xmlns:sp="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy">
@@ -45,18 +44,14 @@
 				<sp:Body/>
             </sp:EncryptedParts>
             <rampc:RampartConfig xmlns:rampc="http://ws.apache.org/rampart/c/policy">
-                <rampc:user>Gampola</rampc:user>
-                <rampc:encryptionUser>a</rampc:encryptionUser>
-                <rampc:passwordType>Digest</rampc:passwordType>
-                <rampc:passwordCallbackClass>/home/AXIS2_USER/axis2/c/deploy/bin/samples/rampart/callback/libpwcb.so</rampc:passwordCallbackClass>
-                <rampc:signatureCrypto>
-                    <rampc:signaturePropFile>/home/AXIS2_USER/axis2/c/rampart/samples/keys/ahome/b_cert.cert</rampc:signaturePropFile>
-                </rampc:signatureCrypto>
-                <rampc:encryptionCypto>
-                    <rampc:encryptionPropFile>/home/AXIS2_USER/axis2/c/rampart/samples/keys/ahome/b_cert.cert</rampc:encryptionPropFile>
-                    <rampc:decryptionPropFile>/home/AXIS2_USER/axis2/c/rampart/samples/keys/ahome/a_store.pfx</rampc:decryptionPropFile>
-                </rampc:encryptionCypto>
-        </rampc:RampartConfig>
+                <rampc:User>Gampola</rampc:User>
+                <rampc:TimeToLive>360</rampc:TimeToLive>
+                <rampc:EncryptionUser>a</rampc:EncryptionUser>
+                <rampc:PasswordType>Digest</rampc:PasswordType>
+                <rampc:PasswordCallbackClass>/home/AXIS2_USER/axis2/c/deploy/bin/samples/rampart/callback/libpwcb.so</rampc:PasswordCallbackClass>
+                <rampc:PublicKey>/home/AXIS2_USER/axis2/c/rampart/samples/keys/ahome/b_cert.cert</rampc:PublicKey>
+                <rampc:PrivateKey>/home/AXIS2_USER/axis2/c/rampart/samples/keys/ahome/a_store.pfx</rampc:PrivateKey>
+            </rampc:RampartConfig>
 		</wsp:All>
 	</wsp:ExactlyOne>
 </wsp:Policy>

Modified: webservices/axis2/scratch/c/dinesh/532/c/rampart/samples/secpolicy/scenario6/service-incoming-secpolicy.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/scratch/c/dinesh/532/c/rampart/samples/secpolicy/scenario6/service-incoming-secpolicy.xml?view=diff&rev=513155&r1=513154&r2=513155
==============================================================================
--- webservices/axis2/scratch/c/dinesh/532/c/rampart/samples/secpolicy/scenario6/service-incoming-secpolicy.xml (original)
+++ webservices/axis2/scratch/c/dinesh/532/c/rampart/samples/secpolicy/scenario6/service-incoming-secpolicy.xml Wed Feb 28 21:58:03 2007
@@ -33,7 +33,6 @@
 					</sp:Layout>
                     <sp:IncludeTimestamp/>
                     <sp:EncryptBeforeSigning/>
-					<sp:OnlySignEntireHeadersAndBody/>
 				</wsp:Policy>
             </sp:AsymmetricBinding>
             <sp:SignedSupportingTokens xmlns:sp="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy">
@@ -41,22 +40,18 @@
                 <sp:UsernameToken sp:IncludeToken="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy/IncludeToken/Always"/>
             </wsp:Policy>
             </sp:SignedSupportingTokens>
-            <sp:EncryptedParts xmlns:sp="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy">
-                <sp:Body/>
+			<sp:EncryptedParts xmlns:sp="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy">
+				<sp:Body/>
             </sp:EncryptedParts>
             <rampc:RampartConfig xmlns:rampc="http://ws.apache.org/rampart/c/policy">
-                <rampc:user>Gampola</rampc:user>
-                <rampc:encryptionUser>b</rampc:encryptionUser>
-                <rampc:passwordType>Digest</rampc:passwordType>
-                <rampc:passwordCallbackClass>/home/AXIS2_USER/axis2/c/deploy/bin/samples/rampart/callback/libpwcb.so</rampc:passwordCallbackClass>
-                <rampc:signatureCrypto>
-                    <rampc:signaturePropFile>/home/AXIS2_USER/axis2/c/rampart/samples/keys/ahome/b_cert.cert</rampc:signaturePropFile>
-                </rampc:signatureCrypto>
-                <rampc:encryptionCypto>
-                    <rampc:encryptionPropFile>/home/AXIS2_USER/axis2/c/rampart/samples/keys/bhome/a_cert.cert</rampc:encryptionPropFile>
-                    <rampc:decryptionPropFile>/home/AXIS2_USER/axis2/c/rampart/samples/keys/bhome/b_store.pfx</rampc:decryptionPropFile>
-                </rampc:encryptionCypto>
-        </rampc:RampartConfig>
+                <rampc:User>Gampola</rampc:User>
+                <rampc:TimeToLive>360</rampc:TimeToLive>
+                <rampc:EncryptionUser>b</rampc:EncryptionUser>
+                <rampc:PasswordType>Digest</rampc:PasswordType>
+                <rampc:PasswordCallbackClass>/home/AXIS2_USER/axis2/c/deploy/bin/samples/rampart/callback/libpwcb.so</rampc:PasswordCallbackClass>
+                <rampc:PublicKey>/home/AXIS2_USER/axis2/c/rampart/samples/keys/bhome/a_cert.cert</rampc:PublicKey>
+                <rampc:PrivateKey>/home/AXIS2_USER/axis2/c/rampart/samples/keys/bhome/b_store.pfx</rampc:PrivateKey>
+            </rampc:RampartConfig>
 		</wsp:All>
 	</wsp:ExactlyOne>
 </wsp:Policy>

Modified: webservices/axis2/scratch/c/dinesh/532/c/rampart/samples/secpolicy/scenario6/service-outgoing-secpolicy.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/scratch/c/dinesh/532/c/rampart/samples/secpolicy/scenario6/service-outgoing-secpolicy.xml?view=diff&rev=513155&r1=513154&r2=513155
==============================================================================
--- webservices/axis2/scratch/c/dinesh/532/c/rampart/samples/secpolicy/scenario6/service-outgoing-secpolicy.xml (original)
+++ webservices/axis2/scratch/c/dinesh/532/c/rampart/samples/secpolicy/scenario6/service-outgoing-secpolicy.xml Wed Feb 28 21:58:03 2007
@@ -21,34 +21,12 @@
 							</sp:X509Token>
 						</wsp:Policy>
 					</sp:RecipientToken>
-					<sp:AlgorithmSuite>
-						<wsp:Policy>
-							<sp:Basic256Rsa15/>
-						</wsp:Policy>
-					</sp:AlgorithmSuite>
-					<sp:Layout>
-						<wsp:Policy>
-							<sp:Strict/>
-						</wsp:Policy>
-					</sp:Layout>
                     <sp:IncludeTimestamp/>
-                    <sp:EncryptBeforeSigning/>
-					<sp:OnlySignEntireHeadersAndBody/>
 				</wsp:Policy>
             </sp:AsymmetricBinding>
             <rampc:RampartConfig xmlns:rampc="http://ws.apache.org/rampart/c/policy">
-                <rampc:user>Gampola</rampc:user>
-                <rampc:encryptionUser>b</rampc:encryptionUser>
-                <rampc:passwordType>Digest</rampc:passwordType>
-                <rampc:passwordCallbackClass>/home/AXIS2_USER/axis2/c/deploy/bin/samples/rampart/callback/libpwcb.so</rampc:passwordCallbackClass>
-                <rampc:signatureCrypto>
-                    <rampc:signaturePropFile>/home/AXIS2_USER/axis2/c/rampart/samples/keys/ahome/b_cert.cert</rampc:signaturePropFile>
-                </rampc:signatureCrypto>
-                <rampc:encryptionCypto>
-                    <rampc:encryptionPropFile>/home/AXIS2_USER/axis2/c/rampart/samples/keys/bhome/a_cert.cert</rampc:encryptionPropFile>
-                    <rampc:decryptionPropFile>/home/AXIS2_USER/axis2/c/rampart/samples/keys/bhome/b_store.pfx</rampc:decryptionPropFile>
-                </rampc:encryptionCypto>
-        </rampc:RampartConfig>
+                <rampc:TimeToLive>360</rampc:TimeToLive>
+            </rampc:RampartConfig>
 		</wsp:All>
 	</wsp:ExactlyOne>
 </wsp:Policy>

Modified: webservices/axis2/scratch/c/dinesh/532/c/rampart/samples/secpolicy/scenario7/client-incoming-secpolicy.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/scratch/c/dinesh/532/c/rampart/samples/secpolicy/scenario7/client-incoming-secpolicy.xml?view=diff&rev=513155&r1=513154&r2=513155
==============================================================================
--- webservices/axis2/scratch/c/dinesh/532/c/rampart/samples/secpolicy/scenario7/client-incoming-secpolicy.xml (original)
+++ webservices/axis2/scratch/c/dinesh/532/c/rampart/samples/secpolicy/scenario7/client-incoming-secpolicy.xml Wed Feb 28 21:58:03 2007
@@ -33,30 +33,30 @@
 					</sp:Layout>
                     <sp:IncludeTimestamp/>
                     <sp:EncryptBeforeSigning/>
-					<sp:OnlySignEntireHeadersAndBody/>
 				</wsp:Policy>
             </sp:AsymmetricBinding>
+            <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"/>
+            </wsp:Policy>
+            </sp:SignedSupportingTokens>
 			<sp:Wss10 xmlns:sp="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy">
-                <wsp:Policy>
+				<wsp:Policy>
                     <sp:MustSupportRefEmbeddedToken/>
 				</wsp:Policy>
-            </sp:Wss10>
-            <sp:EncryptedParts xmlns:sp="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy">
-                <sp:Body/>
+			</sp:Wss10>
+			<sp:EncryptedParts xmlns:sp="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy">
+				<sp:Body/>
             </sp:EncryptedParts>
             <rampc:RampartConfig xmlns:rampc="http://ws.apache.org/rampart/c/policy">
-                <rampc:user>Gampola</rampc:user>
-                <rampc:encryptionUser>a</rampc:encryptionUser>
-                <rampc:passwordType>Digest</rampc:passwordType>
-                <rampc:passwordCallbackClass>/home/AXIS2_USER/axis2/c/deploy/bin/samples/rampart/callback/libpwcb.so</rampc:passwordCallbackClass>
-                <rampc:signatureCrypto>
-                    <rampc:signaturePropFile>/home/AXIS2_USER/axis2/c/rampart/samples/keys/ahome/b_cert.cert</rampc:signaturePropFile>
-                </rampc:signatureCrypto>
-                <rampc:encryptionCypto>
-                    <rampc:encryptionPropFile>/home/AXIS2_USER/axis2/c/rampart/samples/keys/ahome/b_cert.cert</rampc:encryptionPropFile>
-                    <rampc:decryptionPropFile>/home/AXIS2_USER/axis2/c/rampart/samples/keys/ahome/a_store.pfx</rampc:decryptionPropFile>
-                </rampc:encryptionCypto>
-        </rampc:RampartConfig>
+                <rampc:User>Gampola</rampc:User>
+                <rampc:TimeToLive>360</rampc:TimeToLive>
+                <rampc:EncryptionUser>a</rampc:EncryptionUser>
+                <rampc:PasswordType>Digest</rampc:PasswordType>
+                <rampc:PasswordCallbackClass>/home/AXIS2_USER/axis2/c/deploy/bin/samples/rampart/callback/libpwcb.so</rampc:PasswordCallbackClass>
+                <rampc:PublicKey>/home/AXIS2_USER/axis2/c/rampart/samples/keys/ahome/b_cert.cert</rampc:PublicKey>
+                <rampc:PrivateKey>/home/AXIS2_USER/axis2/c/rampart/samples/keys/ahome/a_store.pfx</rampc:PrivateKey>
+            </rampc:RampartConfig>
 		</wsp:All>
 	</wsp:ExactlyOne>
 </wsp:Policy>

Modified: webservices/axis2/scratch/c/dinesh/532/c/rampart/samples/secpolicy/scenario7/client-outgoing-secpolicy.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/scratch/c/dinesh/532/c/rampart/samples/secpolicy/scenario7/client-outgoing-secpolicy.xml?view=diff&rev=513155&r1=513154&r2=513155
==============================================================================
--- webservices/axis2/scratch/c/dinesh/532/c/rampart/samples/secpolicy/scenario7/client-outgoing-secpolicy.xml (original)
+++ webservices/axis2/scratch/c/dinesh/532/c/rampart/samples/secpolicy/scenario7/client-outgoing-secpolicy.xml Wed Feb 28 21:58:03 2007
@@ -33,7 +33,6 @@
 					</sp:Layout>
                     <sp:IncludeTimestamp/>
                     <sp:EncryptBeforeSigning/>
-					<sp:OnlySignEntireHeadersAndBody/>
 				</wsp:Policy>
             </sp:AsymmetricBinding>
             <sp:SignedSupportingTokens xmlns:sp="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy">
@@ -43,25 +42,21 @@
             </sp:SignedSupportingTokens>
 			<sp:Wss10 xmlns:sp="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy">
 				<wsp:Policy>
-					<sp:MustSupportRefEmbeddedToken/>
+                    <sp:MustSupportRefEmbeddedToken/>
 				</wsp:Policy>
 			</sp:Wss10>
 			<sp:EncryptedParts xmlns:sp="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy">
 				<sp:Body/>
             </sp:EncryptedParts>
             <rampc:RampartConfig xmlns:rampc="http://ws.apache.org/rampart/c/policy">
-                <rampc:user>Gampola</rampc:user>
-                <rampc:encryptionUser>a</rampc:encryptionUser>
-                <rampc:passwordType>Digest</rampc:passwordType>
-                <rampc:passwordCallbackClass>/home/AXIS2_USER/axis2/c/deploy/bin/samples/rampart/callback/libpwcb.so</rampc:passwordCallbackClass>
-                <rampc:signatureCrypto>
-                    <rampc:signaturePropFile>/home/AXIS2_USER/axis2/c/rampart/samples/keys/ahome/b_cert.cert</rampc:signaturePropFile>
-                </rampc:signatureCrypto>
-                <rampc:encryptionCypto>
-                    <rampc:encryptionPropFile>/home/AXIS2_USER/axis2/c/rampart/samples/keys/ahome/b_cert.cert</rampc:encryptionPropFile>
-                    <rampc:decryptionPropFile>/home/AXIS2_USER/axis2/c/rampart/samples/keys/ahome/a_store.pfx</rampc:decryptionPropFile>
-                </rampc:encryptionCypto>
-        </rampc:RampartConfig>
+                <rampc:User>Gampola</rampc:User>
+                <rampc:TimeToLive>360</rampc:TimeToLive>
+                <rampc:EncryptionUser>a</rampc:EncryptionUser>
+                <rampc:PasswordType>Digest</rampc:PasswordType>
+                <rampc:PasswordCallbackClass>/home/AXIS2_USER/axis2/c/deploy/bin/samples/rampart/callback/libpwcb.so</rampc:PasswordCallbackClass>
+                <rampc:PublicKey>/home/AXIS2_USER/axis2/c/rampart/samples/keys/ahome/b_cert.cert</rampc:PublicKey>
+                <rampc:PrivateKey>/home/AXIS2_USER/axis2/c/rampart/samples/keys/ahome/a_store.pfx</rampc:PrivateKey>
+            </rampc:RampartConfig>
 		</wsp:All>
 	</wsp:ExactlyOne>
 </wsp:Policy>

Modified: webservices/axis2/scratch/c/dinesh/532/c/rampart/samples/secpolicy/scenario7/service-incoming-secpolicy.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/scratch/c/dinesh/532/c/rampart/samples/secpolicy/scenario7/service-incoming-secpolicy.xml?view=diff&rev=513155&r1=513154&r2=513155
==============================================================================
--- webservices/axis2/scratch/c/dinesh/532/c/rampart/samples/secpolicy/scenario7/service-incoming-secpolicy.xml (original)
+++ webservices/axis2/scratch/c/dinesh/532/c/rampart/samples/secpolicy/scenario7/service-incoming-secpolicy.xml Wed Feb 28 21:58:03 2007
@@ -33,7 +33,6 @@
 					</sp:Layout>
                     <sp:IncludeTimestamp/>
                     <sp:EncryptBeforeSigning/>
-					<sp:OnlySignEntireHeadersAndBody/>
 				</wsp:Policy>
             </sp:AsymmetricBinding>
             <sp:SignedSupportingTokens xmlns:sp="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy">
@@ -42,27 +41,22 @@
             </wsp:Policy>
             </sp:SignedSupportingTokens>
 			<sp:Wss10 xmlns:sp="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy">
-                <wsp:Policy>
+				<wsp:Policy>
                     <sp:MustSupportRefEmbeddedToken/>
-					<sp:MustSupportRefIssuerSerial/>
 				</wsp:Policy>
-            </sp:Wss10>
-            <sp:EncryptedParts xmlns:sp="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy">
-                <sp:Body/>
+			</sp:Wss10>
+			<sp:EncryptedParts xmlns:sp="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy">
+				<sp:Body/>
             </sp:EncryptedParts>
             <rampc:RampartConfig xmlns:rampc="http://ws.apache.org/rampart/c/policy">
-                <rampc:user>Gampola</rampc:user>
-                <rampc:encryptionUser>b</rampc:encryptionUser>
-                <rampc:passwordType>Digest</rampc:passwordType>
-                <rampc:passwordCallbackClass>/home/AXIS2_USER/axis2/c/deploy/bin/samples/rampart/callback/libpwcb.so</rampc:passwordCallbackClass>
-                <rampc:signatureCrypto>
-                    <rampc:signaturePropFile>/home/AXIS2_USER/axis2/c/rampart/samples/keys/ahome/b_cert.cert</rampc:signaturePropFile>
-                </rampc:signatureCrypto>
-                <rampc:encryptionCypto>
-                    <rampc:encryptionPropFile>/home/AXIS2_USER/axis2/c/rampart/samples/keys/bhome/a_cert.cert</rampc:encryptionPropFile>
-                    <rampc:decryptionPropFile>/home/AXIS2_USER/axis2/c/rampart/samples/keys/bhome/b_store.pfx</rampc:decryptionPropFile>
-                </rampc:encryptionCypto>
-        </rampc:RampartConfig>
+                <rampc:User>Gampola</rampc:User>
+                <rampc:TimeToLive>360</rampc:TimeToLive>
+                <rampc:EncryptionUser>b</rampc:EncryptionUser>
+                <rampc:PasswordType>Digest</rampc:PasswordType>
+                <rampc:PasswordCallbackClass>/home/AXIS2_USER/axis2/c/deploy/bin/samples/rampart/callback/libpwcb.so</rampc:PasswordCallbackClass>
+                <rampc:PublicKey>/home/AXIS2_USER/axis2/c/rampart/samples/keys/bhome/a_cert.cert</rampc:PublicKey>
+                <rampc:PrivateKey>/home/AXIS2_USER/axis2/c/rampart/samples/keys/bhome/b_store.pfx</rampc:PrivateKey>
+            </rampc:RampartConfig>
 		</wsp:All>
 	</wsp:ExactlyOne>
 </wsp:Policy>

Modified: webservices/axis2/scratch/c/dinesh/532/c/rampart/samples/secpolicy/scenario7/service-outgoing-secpolicy.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/scratch/c/dinesh/532/c/rampart/samples/secpolicy/scenario7/service-outgoing-secpolicy.xml?view=diff&rev=513155&r1=513154&r2=513155
==============================================================================
--- webservices/axis2/scratch/c/dinesh/532/c/rampart/samples/secpolicy/scenario7/service-outgoing-secpolicy.xml (original)
+++ webservices/axis2/scratch/c/dinesh/532/c/rampart/samples/secpolicy/scenario7/service-outgoing-secpolicy.xml Wed Feb 28 21:58:03 2007
@@ -33,31 +33,30 @@
 					</sp:Layout>
                     <sp:IncludeTimestamp/>
                     <sp:EncryptBeforeSigning/>
-					<sp:OnlySignEntireHeadersAndBody/>
 				</wsp:Policy>
             </sp:AsymmetricBinding>
+            <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"/>
+            </wsp:Policy>
+            </sp:SignedSupportingTokens>
 			<sp:Wss10 xmlns:sp="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy">
-                <wsp:Policy>
+				<wsp:Policy>
                     <sp:MustSupportRefEmbeddedToken/>
-                    <sp:MustSupportRefIssuerSerial/>
 				</wsp:Policy>
-            </sp:Wss10>
-            <sp:EncryptedParts xmlns:sp="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy">
-                <sp:Body/>
+			</sp:Wss10>
+			<sp:EncryptedParts xmlns:sp="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy">
+				<sp:Body/>
             </sp:EncryptedParts>
             <rampc:RampartConfig xmlns:rampc="http://ws.apache.org/rampart/c/policy">
-                <rampc:user>Gampola</rampc:user>
-                <rampc:encryptionUser>b</rampc:encryptionUser>
-                <rampc:passwordType>Digest</rampc:passwordType>
-                <rampc:passwordCallbackClass>/home/AXIS2_USER/axis2/c/deploy/bin/samples/rampart/callback/libpwcb.so</rampc:passwordCallbackClass>
-                <rampc:signatureCrypto>
-                    <rampc:signaturePropFile>/home/AXIS2_USER/axis2/c/rampart/samples/keys/ahome/b_cert.cert</rampc:signaturePropFile>
-                </rampc:signatureCrypto>
-                <rampc:encryptionCypto>
-                    <rampc:encryptionPropFile>/home/AXIS2_USER/axis2/c/rampart/samples/keys/bhome/a_cert.cert</rampc:encryptionPropFile>
-                    <rampc:decryptionPropFile>/home/AXIS2_USER/axis2/c/rampart/samples/keys/bhome/b_store.pfx</rampc:decryptionPropFile>
-                </rampc:encryptionCypto>
-        </rampc:RampartConfig>
+                <rampc:User>Gampola</rampc:User>
+                <rampc:TimeToLive>360</rampc:TimeToLive>
+                <rampc:EncryptionUser>b</rampc:EncryptionUser>
+                <rampc:PasswordType>Digest</rampc:PasswordType>
+                <rampc:PasswordCallbackClass>/home/AXIS2_USER/axis2/c/deploy/bin/samples/rampart/callback/libpwcb.so</rampc:PasswordCallbackClass>
+                <rampc:PublicKey>/home/AXIS2_USER/axis2/c/rampart/samples/keys/bhome/a_cert.cert</rampc:PublicKey>
+                <rampc:PrivateKey>/home/AXIS2_USER/axis2/c/rampart/samples/keys/bhome/b_store.pfx</rampc:PrivateKey>
+            </rampc:RampartConfig>
 		</wsp:All>
 	</wsp:ExactlyOne>
 </wsp:Policy>

Modified: webservices/axis2/scratch/c/dinesh/532/c/rampart/src/handlers/rampart_in_handler.c
URL: http://svn.apache.org/viewvc/webservices/axis2/scratch/c/dinesh/532/c/rampart/src/handlers/rampart_in_handler.c?view=diff&rev=513155&r1=513154&r2=513155
==============================================================================
--- webservices/axis2/scratch/c/dinesh/532/c/rampart/src/handlers/rampart_in_handler.c (original)
+++ webservices/axis2/scratch/c/dinesh/532/c/rampart/src/handlers/rampart_in_handler.c Wed Feb 28 21:58:03 2007
@@ -108,7 +108,17 @@
     }
     AXIS2_LOG_TRACE(env->log, AXIS2_LOG_SI, "SOAP header found");
 
-    rampart_context = rampart_engine_init(env,msg_ctx,RAMPART_INFLOW_SECURITY_POLICY);
+    /*since rampart in handler is a global handler we should
+    first check whether the rampart module is engaged.If not engaged we 
+    should not process the message but return success.*/    
+
+    /*This method is implemented in rampart_handler utils.*/
+    if(!rampart_is_rampart_engaged(env,msg_ctx))
+    {
+        AXIS2_LOG_INFO(env->log, "[rampart][rampart_in_handler] Not intended for processing in Rampart");
+        return AXIS2_SUCCESS;
+    }
+    rampart_context = rampart_engine_init(env,msg_ctx,AXIS2_TRUE);
     if(!rampart_context)
         return AXIS2_FAILURE;
 
@@ -130,7 +140,9 @@
     
     status = rampart_shp_process_message(env, msg_ctx, rampart_context, 
 						soap_envelope, sec_node);
-        
+    
+    status = rampart_engine_shutdown(env,rampart_context);
+
 /*    
     rampart_context_free(rampart_context,env);
     rampart_context = NULL;



---------------------------------------------------------------------
To unsubscribe, e-mail: axis-cvs-unsubscribe@ws.apache.org
For additional commands, e-mail: axis-cvs-help@ws.apache.org