svn commit: r345749 - in /webservices/commons/trunk/policy/src/org/apache/policy/model: PrimitiveAssertion.java WSPConstants.java

[sa...@apache.org]

Author: sanka
Date: Sun Nov 20 07:40:19 2005
New Revision: 345749

URL: http://svn.apache.org/viewcvs?rev=345749&view=rev
Log:
Moving the WSPConstants to org.apache.policy package. Some changes in PrimitiveAssertion class to use PolicyReader class instead of WSPolicyParser

Added:
    webservices/commons/trunk/policy/src/org/apache/policy/model/WSPConstants.java
Modified:
    webservices/commons/trunk/policy/src/org/apache/policy/model/PrimitiveAssertion.java

Modified: webservices/commons/trunk/policy/src/org/apache/policy/model/PrimitiveAssertion.java
URL: http://svn.apache.org/viewcvs/webservices/commons/trunk/policy/src/org/apache/policy/model/PrimitiveAssertion.java?rev=345749&r1=345748&r2=345749&view=diff
==============================================================================
--- webservices/commons/trunk/policy/src/org/apache/policy/model/PrimitiveAssertion.java (original)
+++ webservices/commons/trunk/policy/src/org/apache/policy/model/PrimitiveAssertion.java Sun Nov 20 07:40:19 2005
@@ -15,7 +15,6 @@
  */
 package org.apache.policy.model;
 
-import java.io.PrintWriter;
 import java.util.ArrayList;
 import java.util.Hashtable;
 import java.util.Iterator;
@@ -23,7 +22,6 @@
 
 import javax.xml.namespace.QName;
 
-import org.apache.policy.parser.WSPolicyParser;
 import org.apache.policy.util.PolicyRegistry;
 import org.apache.policy.util.WSPolicyUtil;
 
@@ -75,9 +73,6 @@
               
         PrimitiveAssertion arg = (PrimitiveAssertion) target;
         PrimitiveAssertion self = (PrimitiveAssertion) normalizedMe;
-        WSPolicyParser.getInstance().printAssertion(0, arg, new PrintWriter(System.out, true));
-        WSPolicyParser.getInstance().printAssertion(0, self, new PrintWriter(System.out, true));
-        
         
         if (!self.getName().equals(arg.getName())) {
             return new XorCompositeAssertion(); // no bahaviour is admisible            

Added: webservices/commons/trunk/policy/src/org/apache/policy/model/WSPConstants.java
URL: http://svn.apache.org/viewcvs/webservices/commons/trunk/policy/src/org/apache/policy/model/WSPConstants.java?rev=345749&view=auto
==============================================================================
--- webservices/commons/trunk/policy/src/org/apache/policy/model/WSPConstants.java (added)
+++ webservices/commons/trunk/policy/src/org/apache/policy/model/WSPConstants.java Sun Nov 20 07:40:19 2005
@@ -0,0 +1,46 @@
+package org.apache.policy.model;
+/*
+ * Copyright 2001-2004 The Apache Software Foundation.
+ * 
+ * Licensed 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.
+ */
+
+/**
+ * WSPConstants interfaces defines some CONST VALUES that are used in the 
+ * entier framework.
+ * 
+ */
+public interface WSPConstants {
+    
+    /** */
+    public static final String AND_COMPOSITE_ASSERTION = "All";
+    
+    /** */
+    public static final String XOR_COMPOSITE_ASSERTION = "ExactlyOne";
+    
+    /** */
+    public static final String WS_POLICY = "Policy";
+    
+    /** */
+    public static final String WS_POLICY_PREFIX = "wsp";
+    
+    /** */
+    public static final String WS_POLICY_REFERENCE = "PolicyReference";
+    
+    /** */
+    public static final String WS_POLICY_NAMESPACE_URI = "http://schemas.xmlsoap.org/ws/2004/09/policy";
+    
+    /** */
+    public static final String WSU_NAMESPACE_URI = "http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utility-1.0.xsd";
+    
+}