You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by dk...@apache.org on 2011/02/10 02:04:37 UTC
svn commit: r1069185 - in /cxf/trunk:
api/src/main/java/org/apache/cxf/ws/policy/builder/primitive/
rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/
rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/builder/primitive/
rt/ws/security/src/main/java...
Author: dkulp
Date: Thu Feb 10 01:04:36 2011
New Revision: 1069185
URL: http://svn.apache.org/viewvc?rev=1069185&view=rev
Log:
Start updating a few things for next version of Neethi
Modified:
cxf/trunk/api/src/main/java/org/apache/cxf/ws/policy/builder/primitive/NestedPrimitiveAssertionBuilder.java
cxf/trunk/api/src/main/java/org/apache/cxf/ws/policy/builder/primitive/PrimitiveAssertion.java
cxf/trunk/api/src/main/java/org/apache/cxf/ws/policy/builder/primitive/PrimitiveAssertionBuilder.java
cxf/trunk/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/TestAssertion.java
cxf/trunk/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/builder/primitive/NestedPrimitiveAssertionTest.java
cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/model/AbstractSecurityAssertion.java
Modified: cxf/trunk/api/src/main/java/org/apache/cxf/ws/policy/builder/primitive/NestedPrimitiveAssertionBuilder.java
URL: http://svn.apache.org/viewvc/cxf/trunk/api/src/main/java/org/apache/cxf/ws/policy/builder/primitive/NestedPrimitiveAssertionBuilder.java?rev=1069185&r1=1069184&r2=1069185&view=diff
==============================================================================
--- cxf/trunk/api/src/main/java/org/apache/cxf/ws/policy/builder/primitive/NestedPrimitiveAssertionBuilder.java (original)
+++ cxf/trunk/api/src/main/java/org/apache/cxf/ws/policy/builder/primitive/NestedPrimitiveAssertionBuilder.java Thu Feb 10 01:04:36 2011
@@ -49,7 +49,7 @@ public class NestedPrimitiveAssertionBui
/**
* If the nested policies in both assertions are empty, the compatible policy
* .
- * The compatible policy is optional iff both assertions are optional.
+ * The compatible policy is optional if both assertions are optional.
*/
public PolicyAssertion buildCompatible(PolicyAssertion a, PolicyAssertion b) {
if (!getKnownElements().contains(a.getName()) || !a.getName().equals(b.getName())) {
Modified: cxf/trunk/api/src/main/java/org/apache/cxf/ws/policy/builder/primitive/PrimitiveAssertion.java
URL: http://svn.apache.org/viewvc/cxf/trunk/api/src/main/java/org/apache/cxf/ws/policy/builder/primitive/PrimitiveAssertion.java?rev=1069185&r1=1069184&r2=1069185&view=diff
==============================================================================
--- cxf/trunk/api/src/main/java/org/apache/cxf/ws/policy/builder/primitive/PrimitiveAssertion.java (original)
+++ cxf/trunk/api/src/main/java/org/apache/cxf/ws/policy/builder/primitive/PrimitiveAssertion.java Thu Feb 10 01:04:36 2011
@@ -46,7 +46,8 @@ public class PrimitiveAssertion implemen
protected QName name;
protected boolean optional;
-
+ protected boolean ignorable;
+
public PrimitiveAssertion() {
this((QName)null);
}
@@ -103,6 +104,13 @@ public class PrimitiveAssertion implemen
public void setOptional(boolean o) {
optional = o;
}
+ public boolean isIgnorable() {
+ return ignorable;
+ }
+
+ public void setIgnorable(boolean o) {
+ ignorable = o;
+ }
public PolicyComponent normalize() {
if (isOptional()) {
Modified: cxf/trunk/api/src/main/java/org/apache/cxf/ws/policy/builder/primitive/PrimitiveAssertionBuilder.java
URL: http://svn.apache.org/viewvc/cxf/trunk/api/src/main/java/org/apache/cxf/ws/policy/builder/primitive/PrimitiveAssertionBuilder.java?rev=1069185&r1=1069184&r2=1069185&view=diff
==============================================================================
--- cxf/trunk/api/src/main/java/org/apache/cxf/ws/policy/builder/primitive/PrimitiveAssertionBuilder.java (original)
+++ cxf/trunk/api/src/main/java/org/apache/cxf/ws/policy/builder/primitive/PrimitiveAssertionBuilder.java Thu Feb 10 01:04:36 2011
@@ -60,7 +60,7 @@ public class PrimitiveAssertionBuilder i
/**
* If the two assertions are equal, they are also compatible.
- * The compatible policy is optional iff both assertions are optional.
+ * The compatible policy is optional if both assertions are optional.
*/
public PolicyAssertion buildCompatible(PolicyAssertion a, PolicyAssertion b) {
if (knownElements.contains(a.getName()) && a.getName().equals(b.getName())) {
Modified: cxf/trunk/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/TestAssertion.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/TestAssertion.java?rev=1069185&r1=1069184&r2=1069185&view=diff
==============================================================================
--- cxf/trunk/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/TestAssertion.java (original)
+++ cxf/trunk/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/TestAssertion.java Thu Feb 10 01:04:36 2011
@@ -75,4 +75,8 @@ public class TestAssertion implements Po
// TODO Auto-generated method stub
return false;
}
+
+ public boolean isIgnorable() {
+ return false;
+ }
}
Modified: cxf/trunk/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/builder/primitive/NestedPrimitiveAssertionTest.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/builder/primitive/NestedPrimitiveAssertionTest.java?rev=1069185&r1=1069184&r2=1069185&view=diff
==============================================================================
--- cxf/trunk/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/builder/primitive/NestedPrimitiveAssertionTest.java (original)
+++ cxf/trunk/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/builder/primitive/NestedPrimitiveAssertionTest.java Thu Feb 10 01:04:36 2011
@@ -31,9 +31,9 @@ import org.apache.cxf.ws.policy.Assertio
import org.apache.cxf.ws.policy.AssertionBuilderRegistryImpl;
import org.apache.cxf.ws.policy.PolicyAssertion;
import org.apache.cxf.ws.policy.PolicyBuilderImpl;
-import org.apache.cxf.ws.policy.util.PolicyComparator;
import org.apache.neethi.Policy;
import org.apache.neethi.PolicyComponent;
+import org.apache.neethi.util.PolicyComparator;
import org.easymock.classextension.EasyMock;
import org.easymock.classextension.IMocksControl;
import org.junit.After;
Modified: cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/model/AbstractSecurityAssertion.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/model/AbstractSecurityAssertion.java?rev=1069185&r1=1069184&r2=1069185&view=diff
==============================================================================
--- cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/model/AbstractSecurityAssertion.java (original)
+++ cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/model/AbstractSecurityAssertion.java Thu Feb 10 01:04:36 2011
@@ -31,6 +31,7 @@ public abstract class AbstractSecurityAs
protected final SPConstants constants;
private boolean isOptional;
+ private boolean ignorable;
private boolean normalized;
@@ -48,6 +49,13 @@ public abstract class AbstractSecurityAs
public void setOptional(boolean optional) {
this.isOptional = optional;
}
+ public boolean isIgnorable() {
+ return ignorable;
+ }
+
+ public void setIgnorable(boolean ignorable) {
+ this.ignorable = ignorable;
+ }
public short getType() {
return org.apache.neethi.Constants.TYPE_ASSERTION;