You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@ws.apache.org by we...@apache.org on 2005/12/11 11:07:27 UTC
svn commit: r355952 - in
/webservices/commons/trunk/policy/src/org/apache/ws/policy/model:
AndCompositeAssertion.java Policy.java PrimitiveAssertion.java
XorCompositeAssertion.java
Author: werner
Date: Sun Dec 11 02:07:18 2005
New Revision: 355952
URL: http://svn.apache.org/viewcvs?rev=355952&view=rev
Log:
Add some trace information.
Modified:
webservices/commons/trunk/policy/src/org/apache/ws/policy/model/AndCompositeAssertion.java
webservices/commons/trunk/policy/src/org/apache/ws/policy/model/Policy.java
webservices/commons/trunk/policy/src/org/apache/ws/policy/model/PrimitiveAssertion.java
webservices/commons/trunk/policy/src/org/apache/ws/policy/model/XorCompositeAssertion.java
Modified: webservices/commons/trunk/policy/src/org/apache/ws/policy/model/AndCompositeAssertion.java
URL: http://svn.apache.org/viewcvs/webservices/commons/trunk/policy/src/org/apache/ws/policy/model/AndCompositeAssertion.java?rev=355952&r1=355951&r2=355952&view=diff
==============================================================================
--- webservices/commons/trunk/policy/src/org/apache/ws/policy/model/AndCompositeAssertion.java (original)
+++ webservices/commons/trunk/policy/src/org/apache/ws/policy/model/AndCompositeAssertion.java Sun Dec 11 02:07:18 2005
@@ -22,6 +22,8 @@
import javax.xml.namespace.QName;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
import org.apache.ws.policy.util.PolicyRegistry;
/**
@@ -31,6 +33,9 @@
public class AndCompositeAssertion extends CompositeAssertion implements
Assertion {
+ private Log log =
+ LogFactory.getLog(this.getClass().getName());
+
public AndCompositeAssertion() {
}
@@ -59,6 +64,7 @@
* between self and the argument
*/
public Assertion intersect(Assertion assertion, PolicyRegistry reg) {
+ log.debug("Enter: AndCompositeAssertion::intersect");
CompositeAssertion normalizedMe = (CompositeAssertion) ((isNormalized()) ? this
: normalize(reg));
@@ -165,7 +171,8 @@
* self and argument
*/
public Assertion merge(Assertion assertion, PolicyRegistry reg) {
-
+ log.debug("Enter: AndCompositeAssertion::merge");
+
CompositeAssertion normalizedMe = (CompositeAssertion) ((isNormalized()) ? this
: normalize(reg));
@@ -223,6 +230,8 @@
* @return an Assertion which is the normalized form of self
*/
public Assertion normalize(PolicyRegistry reg) {
+ log.debug("Enter: AndCompositeAssertion::normalize");
+
AndCompositeAssertion AND = new AndCompositeAssertion();
XorCompositeAssertion XOR = new XorCompositeAssertion();
Modified: webservices/commons/trunk/policy/src/org/apache/ws/policy/model/Policy.java
URL: http://svn.apache.org/viewcvs/webservices/commons/trunk/policy/src/org/apache/ws/policy/model/Policy.java?rev=355952&r1=355951&r2=355952&view=diff
==============================================================================
--- webservices/commons/trunk/policy/src/org/apache/ws/policy/model/Policy.java (original)
+++ webservices/commons/trunk/policy/src/org/apache/ws/policy/model/Policy.java Sun Dec 11 02:07:18 2005
@@ -20,6 +20,8 @@
import java.util.Iterator;
import java.util.List;
+import org.apache.commons.logging.LogFactory;
+import org.apache.commons.logging.Log;
import org.apache.ws.policy.util.PolicyRegistry;
@@ -29,6 +31,9 @@
*
*/
public class Policy extends AndCompositeAssertion implements Assertion {
+ private Log log =
+ LogFactory.getLog(this.getClass().getName());
+
private String policyURI = null;
private String xmlBase = null;
@@ -75,7 +80,7 @@
}
public Assertion normalize(PolicyRegistry reg) {
-
+ log.debug("Enter: Policy::normalize");
String xmlBase = getBase();
String id = getId();
@@ -192,7 +197,8 @@
}
public Assertion intersect(Assertion assertion, PolicyRegistry reg) {
-
+ log.debug("Enter: Policy::intersect");
+
Policy result = new Policy(getBase(), getId());
Policy normalizedMe = (Policy) ((isNormalized()) ? this
: normalize(reg));
@@ -222,6 +228,8 @@
}
public Assertion merge(Assertion assertion, PolicyRegistry reg) {
+ log.debug("Enter: Policy::merge");
+
Policy result = new Policy(getBase(), getId());
Policy normalizedMe = (Policy) ((isNormalized()) ? this
: normalize(reg));
Modified: webservices/commons/trunk/policy/src/org/apache/ws/policy/model/PrimitiveAssertion.java
URL: http://svn.apache.org/viewcvs/webservices/commons/trunk/policy/src/org/apache/ws/policy/model/PrimitiveAssertion.java?rev=355952&r1=355951&r2=355952&view=diff
==============================================================================
--- webservices/commons/trunk/policy/src/org/apache/ws/policy/model/PrimitiveAssertion.java (original)
+++ webservices/commons/trunk/policy/src/org/apache/ws/policy/model/PrimitiveAssertion.java Sun Dec 11 02:07:18 2005
@@ -22,6 +22,8 @@
import javax.xml.namespace.QName;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
import org.apache.ws.policy.util.PolicyRegistry;
import org.apache.ws.policy.util.PolicyUtil;
@@ -33,6 +35,9 @@
* @author Sanka Samaranayake (sanka@apache.org)
*/
public class PrimitiveAssertion implements Assertion {
+ private Log log =
+ LogFactory.getLog(this.getClass().getName());
+
private Assertion owner = null;
private QName qname;
private List terms = new ArrayList();
@@ -59,6 +64,7 @@
}
public Assertion intersect(Assertion assertion, PolicyRegistry reg) {
+ log.debug("Enter: PrimitveAssertion:intersect");
Assertion normalizedMe = normalize(reg);
Assertion target = assertion.normalize(reg);
@@ -125,6 +131,8 @@
}
public Assertion merge(Assertion assertion, PolicyRegistry reg) {
+ log.debug("Enter: PrimitveAssertion:merge");
+
Assertion normalizedMe = normalize(reg);
Assertion target = assertion.normalize(reg);
@@ -152,10 +160,10 @@
}
public Assertion normalize(PolicyRegistry reg) {
- String isOptional;
-
+ log.debug("Enter: PrimitveAssertion:normalize");
+
if (isOptional()) {
-
+ System.out.println("PA is optional");
XorCompositeAssertion xorCompositeAssertion = new XorCompositeAssertion();
AndCompositeAssertion andCompositeAssertion = new AndCompositeAssertion();
Modified: webservices/commons/trunk/policy/src/org/apache/ws/policy/model/XorCompositeAssertion.java
URL: http://svn.apache.org/viewcvs/webservices/commons/trunk/policy/src/org/apache/ws/policy/model/XorCompositeAssertion.java?rev=355952&r1=355951&r2=355952&view=diff
==============================================================================
--- webservices/commons/trunk/policy/src/org/apache/ws/policy/model/XorCompositeAssertion.java (original)
+++ webservices/commons/trunk/policy/src/org/apache/ws/policy/model/XorCompositeAssertion.java Sun Dec 11 02:07:18 2005
@@ -18,6 +18,9 @@
import java.util.Iterator;
+import org.apache.commons.logging.LogFactory;
+import org.apache.commons.logging.Log;
+
import org.apache.ws.policy.util.PolicyRegistry;
/**
@@ -27,6 +30,9 @@
*/
public class XorCompositeAssertion extends CompositeAssertion implements
Assertion {
+
+ private Log log =
+ LogFactory.getLog(this.getClass().getName());
public XorCompositeAssertion() {
}
@@ -40,6 +46,8 @@
}
public Assertion normalize(PolicyRegistry reg) {
+ log.debug("Enter: XorCompositeAssertion::normalize");
+
XorCompositeAssertion XOR = new XorCompositeAssertion();
if (isEmpty()) {
@@ -90,6 +98,8 @@
}
public Assertion intersect(Assertion assertion, PolicyRegistry reg) {
+ log.debug("Enter: XorCompositeAssertion::intersect");
+
CompositeAssertion normalizedMe = (CompositeAssertion) ((isNormalized()) ? this
: normalize(reg));
@@ -150,6 +160,8 @@
}
public Assertion merge(Assertion assertion, PolicyRegistry reg) {
+ log.debug("Enter: XorCompositeAssertion::merge");
+
CompositeAssertion normalizedMe = (CompositeAssertion) ((isNormalized()) ? this
: normalize(reg));