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 ma...@apache.org on 2007/11/20 05:27:02 UTC

svn commit: r596536 - in /webservices/axis2/trunk/c/neethi: include/neethi_constants.h src/engine.c src/secpolicy/builder/qname_matcher.c

Author: manjula
Date: Mon Nov 19 20:27:02 2007
New Revision: 596536

URL: http://svn.apache.org/viewvc?rev=596536&view=rev
Log:
Ignoring the prefix macthing and adding policy 1.5 
namespace to neethi_constants.

Modified:
    webservices/axis2/trunk/c/neethi/include/neethi_constants.h
    webservices/axis2/trunk/c/neethi/src/engine.c
    webservices/axis2/trunk/c/neethi/src/secpolicy/builder/qname_matcher.c

Modified: webservices/axis2/trunk/c/neethi/include/neethi_constants.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/neethi/include/neethi_constants.h?rev=596536&r1=596535&r2=596536&view=diff
==============================================================================
--- webservices/axis2/trunk/c/neethi/include/neethi_constants.h (original)
+++ webservices/axis2/trunk/c/neethi/include/neethi_constants.h Mon Nov 19 20:27:02 2007
@@ -25,6 +25,7 @@
 #define NEETHI_REFERENCE "PolicyReference"
 #define NEETHI_URI "URI"
 #define NEETHI_NAMESPACE "http://schemas.xmlsoap.org/ws/2004/09/policy"
+#define NEETHI_POLICY_15_NAMESPACE "http://www.w3.org/ns/ws-policy"
 #define NEETHI_PREFIX "wsp"
 #define NEETHI_WSU_NS "http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utility-1.0.xsd"
 #define NEETHI_ID "Id"

Modified: webservices/axis2/trunk/c/neethi/src/engine.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/neethi/src/engine.c?rev=596536&r1=596535&r2=596536&view=diff
==============================================================================
--- webservices/axis2/trunk/c/neethi/src/engine.c (original)
+++ webservices/axis2/trunk/c/neethi/src/engine.c Mon Nov 19 20:27:02 2007
@@ -283,7 +283,7 @@
 
         qname =
             axutil_qname_create(env, NEETHI_ID, NEETHI_WSU_NS,
-                                NEETHI_WSU_NS_PREFIX);
+                                NULL/*NEETHI_WSU_NS_PREFIX*/);
         if (!qname)
         {
             AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);

Modified: webservices/axis2/trunk/c/neethi/src/secpolicy/builder/qname_matcher.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/neethi/src/secpolicy/builder/qname_matcher.c?rev=596536&r1=596535&r2=596536&view=diff
==============================================================================
--- webservices/axis2/trunk/c/neethi/src/secpolicy/builder/qname_matcher.c (original)
+++ webservices/axis2/trunk/c/neethi/src/secpolicy/builder/qname_matcher.c Mon Nov 19 20:27:02 2007
@@ -39,7 +39,7 @@
     }
     else
     {
-        qname = axutil_qname_create(env, local_name, RP_SP_NS, RP_SP_PREFIX);
+        qname = axutil_qname_create(env, local_name, RP_SP_NS, NULL/*RP_SP_PREFIX*/);
         if (!qname)
             return AXIS2_FALSE;
     }
@@ -70,11 +70,6 @@
 
     AXIS2_ENV_CHECK(env, AXIS2_FALSE);
 
-    qname =
-        axutil_qname_create(env, local_name, RP_POLICY_NS, RP_POLICY_PREFIX);
-    if (!qname)
-        return AXIS2_FALSE;
-
     node_qname = axiom_element_get_qname(element, env, node);
 
     if (!node_qname)
@@ -85,7 +80,7 @@
     {
         qname =
             axutil_qname_create(env, local_name, RP_POLICY_NS,
-                                RP_POLICY_PREFIX);
+                                NULL/*RP_POLICY_PREFIX*/);
         if (!qname)
             return AXIS2_FALSE;
     }



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