You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commons-dev@ws.apache.org by sa...@apache.org on 2006/02/06 09:08:45 UTC

svn commit: r375217 - in /webservices/commons/modules/policy/src/org/apache/ws/policy: Policy.java PolicyConstants.java util/StAXPolicyWriter.java

Author: sanka
Date: Mon Feb  6 00:08:43 2006
New Revision: 375217

URL: http://svn.apache.org/viewcvs?rev=375217&view=rev
Log:
Fixed: Assigned the proper namespace for 'wsu' prefix

Modified:
    webservices/commons/modules/policy/src/org/apache/ws/policy/Policy.java
    webservices/commons/modules/policy/src/org/apache/ws/policy/PolicyConstants.java
    webservices/commons/modules/policy/src/org/apache/ws/policy/util/StAXPolicyWriter.java

Modified: webservices/commons/modules/policy/src/org/apache/ws/policy/Policy.java
URL: http://svn.apache.org/viewcvs/webservices/commons/modules/policy/src/org/apache/ws/policy/Policy.java?rev=375217&r1=375216&r2=375217&view=diff
==============================================================================
--- webservices/commons/modules/policy/src/org/apache/ws/policy/Policy.java (original)
+++ webservices/commons/modules/policy/src/org/apache/ws/policy/Policy.java Mon Feb  6 00:08:43 2006
@@ -69,7 +69,13 @@
     }
 
     public String getPolicyURI() {
-        return (xmlBase != null) ? xmlBase + "#" + id : "#" + id;
+    	if (id != null) {
+    		if (xmlBase != null) {
+    			return xmlBase + "#" + id;
+    		}
+    		return "#" + id;
+    	}
+    	return null;
     }
 
     public Assertion normalize() {

Modified: webservices/commons/modules/policy/src/org/apache/ws/policy/PolicyConstants.java
URL: http://svn.apache.org/viewcvs/webservices/commons/modules/policy/src/org/apache/ws/policy/PolicyConstants.java?rev=375217&r1=375216&r2=375217&view=diff
==============================================================================
--- webservices/commons/modules/policy/src/org/apache/ws/policy/PolicyConstants.java (original)
+++ webservices/commons/modules/policy/src/org/apache/ws/policy/PolicyConstants.java Mon Feb  6 00:08:43 2006
@@ -35,6 +35,9 @@
     public static final String WS_POLICY_PREFIX = "wsp";
     
     /** */
+    public static final String WSU_NAMESPACE_PREFIX = "wsu";
+    
+    /** */
     public static final String WS_POLICY_REFERENCE = "PolicyReference";
     
     /** */

Modified: webservices/commons/modules/policy/src/org/apache/ws/policy/util/StAXPolicyWriter.java
URL: http://svn.apache.org/viewcvs/webservices/commons/modules/policy/src/org/apache/ws/policy/util/StAXPolicyWriter.java?rev=375217&r1=375216&r2=375217&view=diff
==============================================================================
--- webservices/commons/modules/policy/src/org/apache/ws/policy/util/StAXPolicyWriter.java (original)
+++ webservices/commons/modules/policy/src/org/apache/ws/policy/util/StAXPolicyWriter.java Mon Feb  6 00:08:43 2006
@@ -79,6 +79,13 @@
         }
 
         if (policy.getId() != null) {
+        	
+        	
+        	writer.writeNamespace(PolicyConstants.WSU_NAMESPACE_PREFIX,
+                    PolicyConstants.WSU_NAMESPACE_URI);
+            writer.setPrefix(PolicyConstants.WSU_NAMESPACE_PREFIX,
+                    PolicyConstants.WSU_NAMESPACE_URI);
+        	
             writer.writeAttribute("wsu", PolicyConstants.WSU_NAMESPACE_URI,
                     "Id", policy.getId());
         }