You are viewing a plain text version of this content. The canonical link for it is here.
Posted to axis-cvs@ws.apache.org by ka...@apache.org on 2007/02/26 11:36:49 UTC

svn commit: r511773 [1/2] - in /webservices/axis2/trunk/c/rampart: include/ samples/secpolicy/scenario1/ samples/secpolicy/scenario2/ samples/secpolicy/scenario3/ samples/secpolicy/scenario4/ samples/secpolicy/scenario5/ samples/secpolicy/scenario6/ sa...

Author: kaushalye
Date: Mon Feb 26 02:36:47 2007
New Revision: 511773

URL: http://svn.apache.org/viewvc?view=rev&rev=511773
Log:
Applying the patch in AXIS2C-488 Jira.

Added:
    webservices/axis2/trunk/c/rampart/include/axis2_key_type.h
Modified:
    webservices/axis2/trunk/c/rampart/include/rampart_constants.h
    webservices/axis2/trunk/c/rampart/include/rampart_context.h
    webservices/axis2/trunk/c/rampart/include/rampart_engine.h
    webservices/axis2/trunk/c/rampart/include/rampart_handler_util.h
    webservices/axis2/trunk/c/rampart/include/rp_defines.h
    webservices/axis2/trunk/c/rampart/include/rp_policy_creator.h
    webservices/axis2/trunk/c/rampart/include/rp_qname_matcher.h
    webservices/axis2/trunk/c/rampart/include/rp_rampart_config.h
    webservices/axis2/trunk/c/rampart/include/rp_rampart_config_builder.h
    webservices/axis2/trunk/c/rampart/samples/secpolicy/scenario1/client-incoming-secpolicy.xml
    webservices/axis2/trunk/c/rampart/samples/secpolicy/scenario1/client-outgoing-secpolicy.xml
    webservices/axis2/trunk/c/rampart/samples/secpolicy/scenario1/service-incoming-secpolicy.xml
    webservices/axis2/trunk/c/rampart/samples/secpolicy/scenario1/service-outgoing-secpolicy.xml
    webservices/axis2/trunk/c/rampart/samples/secpolicy/scenario2/client-incoming-secpolicy.xml
    webservices/axis2/trunk/c/rampart/samples/secpolicy/scenario2/client-outgoing-secpolicy.xml
    webservices/axis2/trunk/c/rampart/samples/secpolicy/scenario2/service-incoming-secpolicy.xml
    webservices/axis2/trunk/c/rampart/samples/secpolicy/scenario2/service-outgoing-secpolicy.xml
    webservices/axis2/trunk/c/rampart/samples/secpolicy/scenario3/client-incoming-secpolicy.xml
    webservices/axis2/trunk/c/rampart/samples/secpolicy/scenario3/client-outgoing-secpolicy.xml
    webservices/axis2/trunk/c/rampart/samples/secpolicy/scenario3/service-incoming-secpolicy.xml
    webservices/axis2/trunk/c/rampart/samples/secpolicy/scenario3/service-outgoing-secpolicy.xml
    webservices/axis2/trunk/c/rampart/samples/secpolicy/scenario4/client-incoming-secpolicy.xml
    webservices/axis2/trunk/c/rampart/samples/secpolicy/scenario4/client-outgoing-secpolicy.xml
    webservices/axis2/trunk/c/rampart/samples/secpolicy/scenario4/service-incoming-secpolicy.xml
    webservices/axis2/trunk/c/rampart/samples/secpolicy/scenario4/service-outgoing-secpolicy.xml
    webservices/axis2/trunk/c/rampart/samples/secpolicy/scenario5/client-incoming-secpolicy.xml
    webservices/axis2/trunk/c/rampart/samples/secpolicy/scenario5/client-outgoing-secpolicy.xml
    webservices/axis2/trunk/c/rampart/samples/secpolicy/scenario5/service-incoming-secpolicy.xml
    webservices/axis2/trunk/c/rampart/samples/secpolicy/scenario5/service-outgoing-secpolicy.xml
    webservices/axis2/trunk/c/rampart/samples/secpolicy/scenario6/client-incoming-secpolicy.xml
    webservices/axis2/trunk/c/rampart/samples/secpolicy/scenario6/client-outgoing-secpolicy.xml
    webservices/axis2/trunk/c/rampart/samples/secpolicy/scenario6/service-incoming-secpolicy.xml
    webservices/axis2/trunk/c/rampart/samples/secpolicy/scenario6/service-outgoing-secpolicy.xml
    webservices/axis2/trunk/c/rampart/samples/secpolicy/scenario7/client-incoming-secpolicy.xml
    webservices/axis2/trunk/c/rampart/samples/secpolicy/scenario7/client-outgoing-secpolicy.xml
    webservices/axis2/trunk/c/rampart/samples/secpolicy/scenario7/service-incoming-secpolicy.xml
    webservices/axis2/trunk/c/rampart/samples/secpolicy/scenario7/service-outgoing-secpolicy.xml
    webservices/axis2/trunk/c/rampart/src/handlers/rampart_in_handler.c
    webservices/axis2/trunk/c/rampart/src/handlers/rampart_out_handler.c
    webservices/axis2/trunk/c/rampart/src/secpolicy/builder/Makefile.am
    webservices/axis2/trunk/c/rampart/src/secpolicy/builder/policy_creator.c
    webservices/axis2/trunk/c/rampart/src/secpolicy/builder/qname_matcher.c
    webservices/axis2/trunk/c/rampart/src/secpolicy/builder/rampart_config_builder.c
    webservices/axis2/trunk/c/rampart/src/secpolicy/model/Makefile.am
    webservices/axis2/trunk/c/rampart/src/secpolicy/model/rampart_config.c
    webservices/axis2/trunk/c/rampart/src/util/rampart_context.c
    webservices/axis2/trunk/c/rampart/src/util/rampart_encryption.c
    webservices/axis2/trunk/c/rampart/src/util/rampart_engine.c
    webservices/axis2/trunk/c/rampart/src/util/rampart_handler_util.c
    webservices/axis2/trunk/c/rampart/src/util/rampart_sec_header_builder.c
    webservices/axis2/trunk/c/rampart/src/util/rampart_sec_header_processor.c
    webservices/axis2/trunk/c/rampart/src/util/username_token.c

Added: webservices/axis2/trunk/c/rampart/include/axis2_key_type.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/rampart/include/axis2_key_type.h?view=auto&rev=511773
==============================================================================
--- webservices/axis2/trunk/c/rampart/include/axis2_key_type.h (added)
+++ webservices/axis2/trunk/c/rampart/include/axis2_key_type.h Mon Feb 26 02:36:47 2007
@@ -0,0 +1,54 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#ifndef AXIS2_KEY_TYPE_H
+#define AXIS2_KEY_TYPE_H
+
+
+/**
+  * @file axis2_key_file_type.h
+  * @defines the key file type. 
+  */
+
+#include <axis2_defines.h>
+#include <axis2_env.h>
+
+#ifdef __cplusplus
+extern "C"
+{
+#endif
+
+/** @defgroup key_file_type 
+ * @ingroup 
+ * @{
+ */
+
+    typedef enum 
+    {
+        AXIS2_KEY_TYPE_UNKNOWN = 0,
+        AXIS2_KEY_TYPE_PEM,
+        AXIS2_KEY_TYPE_DER
+    }axis2_key_type_t;
+
+    
+
+/** @} */
+#ifdef __cplusplus
+}
+#endif
+
+#endif                          

Modified: webservices/axis2/trunk/c/rampart/include/rampart_constants.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/rampart/include/rampart_constants.h?view=diff&rev=511773&r1=511772&r2=511773
==============================================================================
--- webservices/axis2/trunk/c/rampart/include/rampart_constants.h (original)
+++ webservices/axis2/trunk/c/rampart/include/rampart_constants.h Mon Feb 26 02:36:47 2007
@@ -96,8 +96,15 @@
 #define RAMPART_INFLOW_SECURITY_POLICY              "InflowSecurityPolicy"
 #define RAMPART_OUTFLOW_SECURITY_POLICY             "OutflowSecurityPolicy"
 
+#define INFLOW_RAMPART_CONTEXT                      "InflowRampartContext"
+#define OUTFLOW_RAMPART_CONTEXT                     "OutflowRampartContext"    
+/*
 #define RAMPART_PASSWORD_TEXT                       "passwordText"
 #define RAMPART_PASSWORD_DIGEST                     "passwordDigest"
+*/
+#define RAMPART_PASSWORD_TEXT                       "plainText"
+#define RAMPART_PASSWORD_DIGEST                     "Digest"
+
 #define RAMPART_ACTION                              "action"
 /*These are the parameters of actions in the axis2.xml file*/
 #define RAMPART_ACTION_ITEMS                        "items"
@@ -169,6 +176,7 @@
 #define RAMPART_STR_EXTERNAL_URI        OXS_STR_EXTERNAL_URI
 #define RAMPART_STR_ENCRYPTED_KEY       OXS_STR_ENCRYPTED_KEY
 
+#define AXIS2_PEM 10    
     
 #ifdef __cplusplus
 }

Modified: webservices/axis2/trunk/c/rampart/include/rampart_context.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/rampart/include/rampart_context.h?view=diff&rev=511773&r1=511772&r2=511773
==============================================================================
--- webservices/axis2/trunk/c/rampart/include/rampart_context.h (original)
+++ webservices/axis2/trunk/c/rampart/include/rampart_context.h Mon Feb 26 02:36:47 2007
@@ -30,6 +30,7 @@
 #include <rampart_constants.h>
 #include <rampart_callback.h>
 #include <rampart_authn_provider.h>
+#include <axis2_key_type.h>
 
 #ifdef __cplusplus
 extern "C"
@@ -37,9 +38,9 @@
 #endif
    
     typedef axis2_char_t *(AXIS2_CALL*
-            pfunc)(const axis2_env_t *env,
+            password_callback_fn)(const axis2_env_t *env,
             const axis2_char_t *username,
-            void *param);
+            void *ctx);
 
     typedef rampart_authn_provider_status_t (AXIS2_CALL*
             auth_password_func)(const axis2_env_t* env,
@@ -62,6 +63,130 @@
     rampart_context_free(rampart_context_t *rampart_context,
             const axis2_env_t *env);
 
+
+    /*Following functions are the interface between rampart and PHP
+     *extension */
+        
+
+    AXIS2_EXTERN axis2_status_t AXIS2_CALL
+    rampart_context_set_policy_node(rampart_context_t *rampart_context,
+            const axis2_env_t *env,
+            axiom_node_t *policy_node);
+                    
+    AXIS2_EXTERN axis2_status_t AXIS2_CALL
+    rampart_context_set_prv_key(rampart_context_t *rampart_context,
+            const axis2_env_t *env,
+            void *prv_key);
+
+    AXIS2_EXTERN axis2_status_t AXIS2_CALL
+    rampart_context_set_prv_key_type(rampart_context_t *rampart_context,
+            const axis2_env_t *env,
+            axis2_key_type_t type);
+
+    AXIS2_EXTERN axis2_status_t AXIS2_CALL
+    rampart_context_set_pub_key(rampart_context_t *rampart_context,
+            const axis2_env_t *env,
+            void *pub_key);
+    
+    AXIS2_EXTERN axis2_status_t AXIS2_CALL
+    rampart_context_set_pub_key_type(rampart_context_t *rampart_context,
+            const axis2_env_t *env,
+            axis2_key_type_t type);
+
+    AXIS2_EXTERN axis2_status_t AXIS2_CALL
+    rampart_context_set_user(rampart_context_t *rampart_context,
+            const axis2_env_t *env,
+            axis2_char_t *user);
+    
+    AXIS2_EXTERN axis2_status_t AXIS2_CALL
+    rampart_context_set_password(rampart_context_t *rampart_context,
+            const axis2_env_t *env,
+            axis2_char_t *password);
+    
+    AXIS2_EXTERN axis2_status_t AXIS2_CALL
+    rampart_context_set_prv_key_password(rampart_context_t *rampart_context,
+            const axis2_env_t *env,
+            axis2_char_t *prv_key_password);
+    
+    AXIS2_EXTERN axis2_status_t AXIS2_CALL
+    rampart_context_set_pwcb_function(rampart_context_t *rampart_context,
+            const axis2_env_t *env,
+            password_callback_fn pwcb_function,
+            void *ctx);
+
+    AXIS2_EXTERN axis2_status_t AXIS2_CALL
+    rampart_context_set_password_type(rampart_context_t *rampart_context,
+            const axis2_env_t *env,
+            axis2_char_t *password_type);
+
+    AXIS2_EXTERN axis2_status_t AXIS2_CALL
+    rampart_context_set_ttl(rampart_context_t *rampart_context,
+            const axis2_env_t *env,
+            int ttl);
+
+    /*End of the PHP extension-rampart interface*/
+
+    /*Getters of the above set functions*/
+
+    AXIS2_EXTERN axiom_node_t *AXIS2_CALL
+    rampart_context_get_policy_node(
+            rampart_context_t *rampart_context,
+            const axis2_env_t *env);
+                    
+    AXIS2_EXTERN void *AXIS2_CALL
+    rampart_context_get_prv_key(
+            rampart_context_t *rampart_context,
+            const axis2_env_t *env);
+
+    AXIS2_EXTERN axis2_key_type_t AXIS2_CALL
+    rampart_context_get_prv_key_type(
+            rampart_context_t *rampart_context,
+            const axis2_env_t *env);
+
+    AXIS2_EXTERN void *AXIS2_CALL
+    rampart_context_get_pub_key(
+            rampart_context_t *rampart_context,
+            const axis2_env_t *env);
+
+    AXIS2_EXTERN axis2_key_type_t AXIS2_CALL
+    rampart_context_get_pub_key_type(
+            rampart_context_t *rampart_context,
+            const axis2_env_t *env);
+
+    AXIS2_EXTERN axis2_char_t *AXIS2_CALL
+    rampart_context_get_user(
+            rampart_context_t *rampart_context,
+            const axis2_env_t *env);
+       
+    AXIS2_EXTERN axis2_char_t *AXIS2_CALL
+    rampart_context_get_password(
+            rampart_context_t *rampart_context,
+            const axis2_env_t *env);
+    
+    AXIS2_EXTERN axis2_char_t *AXIS2_CALL
+    rampart_context_get_prv_key_password(
+            rampart_context_t *rampart_context,
+            const axis2_env_t *env);
+
+    AXIS2_EXTERN password_callback_fn AXIS2_CALL
+    rampart_context_get_pwcb_function(
+            rampart_context_t *rampart_context,
+            const axis2_env_t *env);
+
+    AXIS2_EXTERN int AXIS2_CALL
+    rampart_context_get_ttl(
+            rampart_context_t *rampart_context,
+            const axis2_env_t *env);
+
+    AXIS2_EXTERN axis2_char_t *AXIS2_CALL
+    rampart_context_get_password_type(
+            rampart_context_t *rampart_context,
+            const axis2_env_t *env);
+
+
+    /*End of Getters */
+
+/*Rampart specific functions */
     AXIS2_EXTERN rp_secpolicy_t *AXIS2_CALL
     rampart_context_get_secpolicy(
             rampart_context_t *rampart_context,
@@ -82,16 +207,6 @@
             const axis2_env_t *env,
             rampart_callback_t *password_callback_module);
 
-    AXIS2_EXTERN pfunc AXIS2_CALL
-    rampart_context_get_password_function(
-            rampart_context_t *rampart_context,
-            const axis2_env_t *env);
-
-    AXIS2_EXTERN axis2_status_t AXIS2_CALL
-    rampart_context_set_password_function(rampart_context_t *rampart_context,
-            const axis2_env_t *env,
-            pfunc password_func);
-
     AXIS2_EXTERN auth_password_func AXIS2_CALL
     rampart_context_get_auth_password_function(
             rampart_context_t *rampart_context,
@@ -138,11 +253,6 @@
             const axis2_env_t *env);
 
     AXIS2_EXTERN axis2_char_t *AXIS2_CALL
-    rampart_context_get_user(
-            rampart_context_t *rampart_context,
-            const axis2_env_t *env);
-
-    AXIS2_EXTERN axis2_char_t *AXIS2_CALL
     rampart_context_get_password_callback_class(
             rampart_context_t *rampart_context,
             const axis2_env_t *env);
@@ -153,11 +263,6 @@
             const axis2_env_t *env);
 
     AXIS2_EXTERN axis2_bool_t AXIS2_CALL
-    rampart_context_get_password_type(
-            rampart_context_t *rampart_context,
-            const axis2_env_t *env);
-
-    AXIS2_EXTERN axis2_bool_t AXIS2_CALL
     rampart_context_is_encrypt_before_sign(
             rampart_context_t *rampart_context,
             const axis2_env_t *env);
@@ -192,11 +297,6 @@
             const axis2_env_t *env);
 
     AXIS2_EXTERN axis2_char_t *AXIS2_CALL
-    rampart_context_get_encryption_prop_file(
-            rampart_context_t *rampart_context,
-            const axis2_env_t *env);
-
-    AXIS2_EXTERN axis2_char_t *AXIS2_CALL
     rampart_context_get_encryption_user(
             rampart_context_t *rampart_context,
             const axis2_env_t *env);
@@ -213,16 +313,36 @@
             rampart_context_t *rampart_context,
             const axis2_env_t *env);
 
-    AXIS2_EXTERN axis2_char_t *AXIS2_CALL
-    rampart_context_get_decryption_prop_file(
+    AXIS2_EXTERN axis2_bool_t AXIS2_CALL
+    rampart_context_check_whether_to_encrypt(
             rampart_context_t *rampart_context,
             const axis2_env_t *env);
 
-    AXIS2_EXTERN axis2_bool_t AXIS2_CALL
-    rampart_context_check_whether_to_encrypt(
+    AXIS2_EXTERN axis2_status_t AXIS2_CALL
+    rampart_context_set_user_from_file(
             rampart_context_t *rampart_context,
             const axis2_env_t *env);
 
+    AXIS2_EXTERN axis2_status_t AXIS2_CALL
+    rampart_context_set_password_type_from_file(
+            rampart_context_t *rampart_context,
+            const axis2_env_t *env);
+
+    AXIS2_EXTERN axis2_char_t *AXIS2_CALL
+    rampart_context_get_public_key_file(
+            rampart_context_t *rampart_context,
+            const axis2_env_t *env);
+
+    AXIS2_EXTERN axis2_char_t *AXIS2_CALL
+    rampart_context_get_private_key_file(
+            rampart_context_t *rampart_context,
+            const axis2_env_t *env);
+            
+    AXIS2_EXTERN axis2_status_t AXIS2_CALL
+    rampart_context_set_ttl_from_file(
+            rampart_context_t *rampart_context,
+            const axis2_env_t *env);
+        
 
 #ifdef __cplusplus
 }

Modified: webservices/axis2/trunk/c/rampart/include/rampart_engine.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/rampart/include/rampart_engine.h?view=diff&rev=511773&r1=511772&r2=511773
==============================================================================
--- webservices/axis2/trunk/c/rampart/include/rampart_engine.h (original)
+++ webservices/axis2/trunk/c/rampart/include/rampart_engine.h Mon Feb 26 02:36:47 2007
@@ -43,8 +43,12 @@
     AXIS2_EXTERN rampart_context_t* AXIS2_CALL
     rampart_engine_init(const axis2_env_t *env,
             axis2_msg_ctx_t *msg_ctx,
-            axis2_char_t *x_flow_policy);
-   
+            axis2_bool_t is_inflow);
+
+    AXIS2_EXTERN axis2_status_t AXIS2_CALL
+    rampart_engine_shutdown(const axis2_env_t *env,
+            rampart_context_t *rampart_context);
+    
 
 #ifdef __cplusplus
 }

Modified: webservices/axis2/trunk/c/rampart/include/rampart_handler_util.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/rampart/include/rampart_handler_util.h?view=diff&rev=511773&r1=511772&r2=511773
==============================================================================
--- webservices/axis2/trunk/c/rampart/include/rampart_handler_util.h (original)
+++ webservices/axis2/trunk/c/rampart/include/rampart_handler_util.h Mon Feb 26 02:36:47 2007
@@ -153,9 +153,8 @@
                                 axis2_msg_ctx_t *msg_ctx,
                                 axiom_node_t *sec_node);  
 
-
-AXIS2_EXTERN axis2_char_t *AXIS2_CALL
-rampart_get_policy_location(const axis2_env_t *env,
+AXIS2_EXTERN void *AXIS2_CALL
+rampart_get_rampart_configuration(const axis2_env_t *env,
         axis2_msg_ctx_t *msg_ctx,
         axis2_char_t *param_name);
 

Modified: webservices/axis2/trunk/c/rampart/include/rp_defines.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/rampart/include/rp_defines.h?view=diff&rev=511773&r1=511772&r2=511773
==============================================================================
--- webservices/axis2/trunk/c/rampart/include/rp_defines.h (original)
+++ webservices/axis2/trunk/c/rampart/include/rp_defines.h Mon Feb 26 02:36:47 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/trunk/c/rampart/include/rp_policy_creator.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/rampart/include/rp_policy_creator.h?view=diff&rev=511773&r1=511772&r2=511773
==============================================================================
--- webservices/axis2/trunk/c/rampart/include/rp_policy_creator.h (original)
+++ webservices/axis2/trunk/c/rampart/include/rp_policy_creator.h Mon Feb 26 02:36:47 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/trunk/c/rampart/include/rp_qname_matcher.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/rampart/include/rp_qname_matcher.h?view=diff&rev=511773&r1=511772&r2=511773
==============================================================================
--- webservices/axis2/trunk/c/rampart/include/rp_qname_matcher.h (original)
+++ webservices/axis2/trunk/c/rampart/include/rp_qname_matcher.h Mon Feb 26 02:36:47 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/trunk/c/rampart/include/rp_rampart_config.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/rampart/include/rp_rampart_config.h?view=diff&rev=511773&r1=511772&r2=511773
==============================================================================
--- webservices/axis2/trunk/c/rampart/include/rp_rampart_config.h (original)
+++ webservices/axis2/trunk/c/rampart/include/rp_rampart_config.h Mon Feb 26 02:36:47 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/trunk/c/rampart/include/rp_rampart_config_builder.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/rampart/include/rp_rampart_config_builder.h?view=diff&rev=511773&r1=511772&r2=511773
==============================================================================
--- webservices/axis2/trunk/c/rampart/include/rp_rampart_config_builder.h (original)
+++ webservices/axis2/trunk/c/rampart/include/rp_rampart_config_builder.h Mon Feb 26 02:36:47 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/trunk/c/rampart/samples/secpolicy/scenario1/client-incoming-secpolicy.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/rampart/samples/secpolicy/scenario1/client-incoming-secpolicy.xml?view=diff&rev=511773&r1=511772&r2=511773
==============================================================================
--- webservices/axis2/trunk/c/rampart/samples/secpolicy/scenario1/client-incoming-secpolicy.xml (original)
+++ webservices/axis2/trunk/c/rampart/samples/secpolicy/scenario1/client-incoming-secpolicy.xml Mon Feb 26 02:36:47 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/trunk/c/rampart/samples/secpolicy/scenario1/client-outgoing-secpolicy.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/rampart/samples/secpolicy/scenario1/client-outgoing-secpolicy.xml?view=diff&rev=511773&r1=511772&r2=511773
==============================================================================
--- webservices/axis2/trunk/c/rampart/samples/secpolicy/scenario1/client-outgoing-secpolicy.xml (original)
+++ webservices/axis2/trunk/c/rampart/samples/secpolicy/scenario1/client-outgoing-secpolicy.xml Mon Feb 26 02:36:47 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/trunk/c/rampart/samples/secpolicy/scenario1/service-incoming-secpolicy.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/rampart/samples/secpolicy/scenario1/service-incoming-secpolicy.xml?view=diff&rev=511773&r1=511772&r2=511773
==============================================================================
--- webservices/axis2/trunk/c/rampart/samples/secpolicy/scenario1/service-incoming-secpolicy.xml (original)
+++ webservices/axis2/trunk/c/rampart/samples/secpolicy/scenario1/service-incoming-secpolicy.xml Mon Feb 26 02:36:47 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/trunk/c/rampart/samples/secpolicy/scenario1/service-outgoing-secpolicy.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/rampart/samples/secpolicy/scenario1/service-outgoing-secpolicy.xml?view=diff&rev=511773&r1=511772&r2=511773
==============================================================================
--- webservices/axis2/trunk/c/rampart/samples/secpolicy/scenario1/service-outgoing-secpolicy.xml (original)
+++ webservices/axis2/trunk/c/rampart/samples/secpolicy/scenario1/service-outgoing-secpolicy.xml Mon Feb 26 02:36:47 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/trunk/c/rampart/samples/secpolicy/scenario2/client-incoming-secpolicy.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/rampart/samples/secpolicy/scenario2/client-incoming-secpolicy.xml?view=diff&rev=511773&r1=511772&r2=511773
==============================================================================
--- webservices/axis2/trunk/c/rampart/samples/secpolicy/scenario2/client-incoming-secpolicy.xml (original)
+++ webservices/axis2/trunk/c/rampart/samples/secpolicy/scenario2/client-incoming-secpolicy.xml Mon Feb 26 02:36:47 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/trunk/c/rampart/samples/secpolicy/scenario2/client-outgoing-secpolicy.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/rampart/samples/secpolicy/scenario2/client-outgoing-secpolicy.xml?view=diff&rev=511773&r1=511772&r2=511773
==============================================================================
--- webservices/axis2/trunk/c/rampart/samples/secpolicy/scenario2/client-outgoing-secpolicy.xml (original)
+++ webservices/axis2/trunk/c/rampart/samples/secpolicy/scenario2/client-outgoing-secpolicy.xml Mon Feb 26 02:36:47 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/trunk/c/rampart/samples/secpolicy/scenario2/service-incoming-secpolicy.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/rampart/samples/secpolicy/scenario2/service-incoming-secpolicy.xml?view=diff&rev=511773&r1=511772&r2=511773
==============================================================================
--- webservices/axis2/trunk/c/rampart/samples/secpolicy/scenario2/service-incoming-secpolicy.xml (original)
+++ webservices/axis2/trunk/c/rampart/samples/secpolicy/scenario2/service-incoming-secpolicy.xml Mon Feb 26 02:36:47 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/trunk/c/rampart/samples/secpolicy/scenario2/service-outgoing-secpolicy.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/rampart/samples/secpolicy/scenario2/service-outgoing-secpolicy.xml?view=diff&rev=511773&r1=511772&r2=511773
==============================================================================
--- webservices/axis2/trunk/c/rampart/samples/secpolicy/scenario2/service-outgoing-secpolicy.xml (original)
+++ webservices/axis2/trunk/c/rampart/samples/secpolicy/scenario2/service-outgoing-secpolicy.xml Mon Feb 26 02:36:47 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/trunk/c/rampart/samples/secpolicy/scenario3/client-incoming-secpolicy.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/rampart/samples/secpolicy/scenario3/client-incoming-secpolicy.xml?view=diff&rev=511773&r1=511772&r2=511773
==============================================================================
--- webservices/axis2/trunk/c/rampart/samples/secpolicy/scenario3/client-incoming-secpolicy.xml (original)
+++ webservices/axis2/trunk/c/rampart/samples/secpolicy/scenario3/client-incoming-secpolicy.xml Mon Feb 26 02:36:47 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/trunk/c/rampart/samples/secpolicy/scenario3/client-outgoing-secpolicy.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/rampart/samples/secpolicy/scenario3/client-outgoing-secpolicy.xml?view=diff&rev=511773&r1=511772&r2=511773
==============================================================================
--- webservices/axis2/trunk/c/rampart/samples/secpolicy/scenario3/client-outgoing-secpolicy.xml (original)
+++ webservices/axis2/trunk/c/rampart/samples/secpolicy/scenario3/client-outgoing-secpolicy.xml Mon Feb 26 02:36:47 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/trunk/c/rampart/samples/secpolicy/scenario3/service-incoming-secpolicy.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/rampart/samples/secpolicy/scenario3/service-incoming-secpolicy.xml?view=diff&rev=511773&r1=511772&r2=511773
==============================================================================
--- webservices/axis2/trunk/c/rampart/samples/secpolicy/scenario3/service-incoming-secpolicy.xml (original)
+++ webservices/axis2/trunk/c/rampart/samples/secpolicy/scenario3/service-incoming-secpolicy.xml Mon Feb 26 02:36:47 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/trunk/c/rampart/samples/secpolicy/scenario3/service-outgoing-secpolicy.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/rampart/samples/secpolicy/scenario3/service-outgoing-secpolicy.xml?view=diff&rev=511773&r1=511772&r2=511773
==============================================================================
--- webservices/axis2/trunk/c/rampart/samples/secpolicy/scenario3/service-outgoing-secpolicy.xml (original)
+++ webservices/axis2/trunk/c/rampart/samples/secpolicy/scenario3/service-outgoing-secpolicy.xml Mon Feb 26 02:36:47 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/trunk/c/rampart/samples/secpolicy/scenario4/client-incoming-secpolicy.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/rampart/samples/secpolicy/scenario4/client-incoming-secpolicy.xml?view=diff&rev=511773&r1=511772&r2=511773
==============================================================================
--- webservices/axis2/trunk/c/rampart/samples/secpolicy/scenario4/client-incoming-secpolicy.xml (original)
+++ webservices/axis2/trunk/c/rampart/samples/secpolicy/scenario4/client-incoming-secpolicy.xml Mon Feb 26 02:36:47 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/trunk/c/rampart/samples/secpolicy/scenario4/client-outgoing-secpolicy.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/rampart/samples/secpolicy/scenario4/client-outgoing-secpolicy.xml?view=diff&rev=511773&r1=511772&r2=511773
==============================================================================
--- webservices/axis2/trunk/c/rampart/samples/secpolicy/scenario4/client-outgoing-secpolicy.xml (original)
+++ webservices/axis2/trunk/c/rampart/samples/secpolicy/scenario4/client-outgoing-secpolicy.xml Mon Feb 26 02:36:47 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/trunk/c/rampart/samples/secpolicy/scenario4/service-incoming-secpolicy.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/rampart/samples/secpolicy/scenario4/service-incoming-secpolicy.xml?view=diff&rev=511773&r1=511772&r2=511773
==============================================================================
--- webservices/axis2/trunk/c/rampart/samples/secpolicy/scenario4/service-incoming-secpolicy.xml (original)
+++ webservices/axis2/trunk/c/rampart/samples/secpolicy/scenario4/service-incoming-secpolicy.xml Mon Feb 26 02:36:47 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/trunk/c/rampart/samples/secpolicy/scenario4/service-outgoing-secpolicy.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/rampart/samples/secpolicy/scenario4/service-outgoing-secpolicy.xml?view=diff&rev=511773&r1=511772&r2=511773
==============================================================================
--- webservices/axis2/trunk/c/rampart/samples/secpolicy/scenario4/service-outgoing-secpolicy.xml (original)
+++ webservices/axis2/trunk/c/rampart/samples/secpolicy/scenario4/service-outgoing-secpolicy.xml Mon Feb 26 02:36:47 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/trunk/c/rampart/samples/secpolicy/scenario5/client-incoming-secpolicy.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/rampart/samples/secpolicy/scenario5/client-incoming-secpolicy.xml?view=diff&rev=511773&r1=511772&r2=511773
==============================================================================
--- webservices/axis2/trunk/c/rampart/samples/secpolicy/scenario5/client-incoming-secpolicy.xml (original)
+++ webservices/axis2/trunk/c/rampart/samples/secpolicy/scenario5/client-incoming-secpolicy.xml Mon Feb 26 02:36:47 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/trunk/c/rampart/samples/secpolicy/scenario5/client-outgoing-secpolicy.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/rampart/samples/secpolicy/scenario5/client-outgoing-secpolicy.xml?view=diff&rev=511773&r1=511772&r2=511773
==============================================================================
--- webservices/axis2/trunk/c/rampart/samples/secpolicy/scenario5/client-outgoing-secpolicy.xml (original)
+++ webservices/axis2/trunk/c/rampart/samples/secpolicy/scenario5/client-outgoing-secpolicy.xml Mon Feb 26 02:36:47 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/trunk/c/rampart/samples/secpolicy/scenario5/service-incoming-secpolicy.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/rampart/samples/secpolicy/scenario5/service-incoming-secpolicy.xml?view=diff&rev=511773&r1=511772&r2=511773
==============================================================================
--- webservices/axis2/trunk/c/rampart/samples/secpolicy/scenario5/service-incoming-secpolicy.xml (original)
+++ webservices/axis2/trunk/c/rampart/samples/secpolicy/scenario5/service-incoming-secpolicy.xml Mon Feb 26 02:36:47 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/trunk/c/rampart/samples/secpolicy/scenario5/service-outgoing-secpolicy.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/rampart/samples/secpolicy/scenario5/service-outgoing-secpolicy.xml?view=diff&rev=511773&r1=511772&r2=511773
==============================================================================
--- webservices/axis2/trunk/c/rampart/samples/secpolicy/scenario5/service-outgoing-secpolicy.xml (original)
+++ webservices/axis2/trunk/c/rampart/samples/secpolicy/scenario5/service-outgoing-secpolicy.xml Mon Feb 26 02:36:47 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/trunk/c/rampart/samples/secpolicy/scenario6/client-incoming-secpolicy.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/rampart/samples/secpolicy/scenario6/client-incoming-secpolicy.xml?view=diff&rev=511773&r1=511772&r2=511773
==============================================================================
--- webservices/axis2/trunk/c/rampart/samples/secpolicy/scenario6/client-incoming-secpolicy.xml (original)
+++ webservices/axis2/trunk/c/rampart/samples/secpolicy/scenario6/client-incoming-secpolicy.xml Mon Feb 26 02:36:47 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/trunk/c/rampart/samples/secpolicy/scenario6/client-outgoing-secpolicy.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/rampart/samples/secpolicy/scenario6/client-outgoing-secpolicy.xml?view=diff&rev=511773&r1=511772&r2=511773
==============================================================================
--- webservices/axis2/trunk/c/rampart/samples/secpolicy/scenario6/client-outgoing-secpolicy.xml (original)
+++ webservices/axis2/trunk/c/rampart/samples/secpolicy/scenario6/client-outgoing-secpolicy.xml Mon Feb 26 02:36:47 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/trunk/c/rampart/samples/secpolicy/scenario6/service-incoming-secpolicy.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/rampart/samples/secpolicy/scenario6/service-incoming-secpolicy.xml?view=diff&rev=511773&r1=511772&r2=511773
==============================================================================
--- webservices/axis2/trunk/c/rampart/samples/secpolicy/scenario6/service-incoming-secpolicy.xml (original)
+++ webservices/axis2/trunk/c/rampart/samples/secpolicy/scenario6/service-incoming-secpolicy.xml Mon Feb 26 02:36:47 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/trunk/c/rampart/samples/secpolicy/scenario6/service-outgoing-secpolicy.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/rampart/samples/secpolicy/scenario6/service-outgoing-secpolicy.xml?view=diff&rev=511773&r1=511772&r2=511773
==============================================================================
--- webservices/axis2/trunk/c/rampart/samples/secpolicy/scenario6/service-outgoing-secpolicy.xml (original)
+++ webservices/axis2/trunk/c/rampart/samples/secpolicy/scenario6/service-outgoing-secpolicy.xml Mon Feb 26 02:36:47 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>



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