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/15 21:49:41 UTC
svn commit: r1071045 [1/2] - in /cxf/trunk:
api/src/main/java/org/apache/cxf/ws/policy/
api/src/main/java/org/apache/cxf/ws/policy/builder/jaxb/
api/src/main/java/org/apache/cxf/ws/policy/builder/primitive/
api/src/test/java/org/apache/cxf/ws/policy/bu...
Author: dkulp
Date: Tue Feb 15 20:49:38 2011
New Revision: 1071045
URL: http://svn.apache.org/viewvc?rev=1071045&view=rev
Log:
More work toward leveraging Neethi directly and not our fork of it.
Added:
cxf/trunk/rt/ws/addr/src/main/java/org/apache/cxf/ws/addressing/policy/UsingAddressingAssertionBuilder.java (with props)
Modified:
cxf/trunk/api/src/main/java/org/apache/cxf/ws/policy/AssertionBuilder.java
cxf/trunk/api/src/main/java/org/apache/cxf/ws/policy/builder/jaxb/JaxbAssertion.java
cxf/trunk/api/src/main/java/org/apache/cxf/ws/policy/builder/jaxb/JaxbAssertionBuilder.java
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/PrimitiveAssertionBuilder.java
cxf/trunk/api/src/test/java/org/apache/cxf/ws/policy/builder/jaxb/JaxbAssertionBuilderTest.java
cxf/trunk/api/src/test/java/org/apache/cxf/ws/policy/builder/primitive/NestedPrimitiveAssertionBuilderTest.java
cxf/trunk/common/common/src/main/java/org/apache/cxf/configuration/spring/AbstractSpringBeanMap.java
cxf/trunk/rt/ws/addr/src/main/java/org/apache/cxf/ws/addressing/policy/AddressingAssertionBuilder.java
cxf/trunk/rt/ws/addr/src/main/resources/META-INF/cxf/cxf-extension-addr.xml
cxf/trunk/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/AssertionBuilderRegistryImpl.java
cxf/trunk/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/mtom/MTOMAssertionBuilder.java
cxf/trunk/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/PolicyExtensionsTest.java
cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/builders/AlgorithmSuiteBuilder.java
cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/builders/AsymmetricBindingBuilder.java
cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/builders/ContentEncryptedElementsBuilder.java
cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/builders/EncryptedElementsBuilder.java
cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/builders/EncryptedPartsBuilder.java
cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/builders/HttpsTokenBuilder.java
cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/builders/InitiatorTokenBuilder.java
cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/builders/IssuedTokenBuilder.java
cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/builders/KeyValueTokenBuilder.java
cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/builders/LayoutBuilder.java
cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/builders/ProtectionTokenBuilder.java
cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/builders/RecipientTokenBuilder.java
cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/builders/RequiredElementsBuilder.java
cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/builders/RequiredPartsBuilder.java
cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/builders/SecureConversationTokenBuilder.java
cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/builders/SecurityContextTokenBuilder.java
cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/builders/SignedElementsBuilder.java
cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/builders/SignedPartsBuilder.java
cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/builders/SupportingTokens12Builder.java
cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/builders/SupportingTokensBuilder.java
cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/builders/SymmetricBindingBuilder.java
cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/builders/TransportBindingBuilder.java
cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/builders/TransportTokenBuilder.java
cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/builders/Trust10Builder.java
cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/builders/Trust13Builder.java
cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/builders/UsernameTokenBuilder.java
cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/builders/WSS10Builder.java
cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/builders/WSS11Builder.java
cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/builders/X509TokenBuilder.java
Modified: cxf/trunk/api/src/main/java/org/apache/cxf/ws/policy/AssertionBuilder.java
URL: http://svn.apache.org/viewvc/cxf/trunk/api/src/main/java/org/apache/cxf/ws/policy/AssertionBuilder.java?rev=1071045&r1=1071044&r2=1071045&view=diff
==============================================================================
--- cxf/trunk/api/src/main/java/org/apache/cxf/ws/policy/AssertionBuilder.java (original)
+++ cxf/trunk/api/src/main/java/org/apache/cxf/ws/policy/AssertionBuilder.java Tue Feb 15 20:49:38 2011
@@ -19,9 +19,6 @@
package org.apache.cxf.ws.policy;
-import java.util.Collection;
-
-import javax.xml.namespace.QName;
import org.w3c.dom.Element;
@@ -36,23 +33,7 @@ import org.w3c.dom.Element;
* Concrete implementations should access the AssertionBuilderRegistry as a
* Bus extension, so the registry need not passed as an argument here.
*/
-public interface AssertionBuilder {
+public interface AssertionBuilder extends org.apache.neethi.builders.AssertionBuilder<Element> {
- /**
- * Constructs an assertion from an xml element.
- *
- * @param element the element from which to build an assertion
- * @return an Assertion built from the given element
- */
- PolicyAssertion build(Element element);
-
-
- /**
- * Returns a collection of QNames describing the xml schema types for which this
- * builder can build assertions.
- *
- * @return collection of QNames of known schema types
- */
- Collection<QName> getKnownElements();
}
Modified: cxf/trunk/api/src/main/java/org/apache/cxf/ws/policy/builder/jaxb/JaxbAssertion.java
URL: http://svn.apache.org/viewvc/cxf/trunk/api/src/main/java/org/apache/cxf/ws/policy/builder/jaxb/JaxbAssertion.java?rev=1071045&r1=1071044&r2=1071045&view=diff
==============================================================================
--- cxf/trunk/api/src/main/java/org/apache/cxf/ws/policy/builder/jaxb/JaxbAssertion.java (original)
+++ cxf/trunk/api/src/main/java/org/apache/cxf/ws/policy/builder/jaxb/JaxbAssertion.java Tue Feb 15 20:49:38 2011
@@ -27,7 +27,6 @@ import javax.xml.stream.XMLStreamExcepti
import javax.xml.stream.XMLStreamWriter;
import org.apache.cxf.common.util.PackageUtils;
-import org.apache.cxf.ws.policy.PolicyAssertion;
import org.apache.cxf.ws.policy.builder.primitive.PrimitiveAssertion;
import org.apache.neethi.Assertion;
import org.apache.neethi.PolicyComponent;
@@ -76,12 +75,12 @@ public class JaxbAssertion<T> extends Pr
}
@SuppressWarnings("unchecked")
- public static <T> JaxbAssertion<T> cast(PolicyAssertion a) {
+ public static <T> JaxbAssertion<T> cast(Assertion a) {
return (JaxbAssertion<T>)a;
}
@SuppressWarnings("unchecked")
- public static <T> JaxbAssertion<T> cast(PolicyAssertion a, Class<T> type) {
+ public static <T> JaxbAssertion<T> cast(Assertion a, Class<T> type) {
return (JaxbAssertion<T>)a;
}
Modified: cxf/trunk/api/src/main/java/org/apache/cxf/ws/policy/builder/jaxb/JaxbAssertionBuilder.java
URL: http://svn.apache.org/viewvc/cxf/trunk/api/src/main/java/org/apache/cxf/ws/policy/builder/jaxb/JaxbAssertionBuilder.java?rev=1071045&r1=1071044&r2=1071045&view=diff
==============================================================================
--- cxf/trunk/api/src/main/java/org/apache/cxf/ws/policy/builder/jaxb/JaxbAssertionBuilder.java (original)
+++ cxf/trunk/api/src/main/java/org/apache/cxf/ws/policy/builder/jaxb/JaxbAssertionBuilder.java Tue Feb 15 20:49:38 2011
@@ -37,7 +37,8 @@ import org.apache.cxf.common.logging.Log
import org.apache.cxf.common.util.PackageUtils;
import org.apache.cxf.jaxb.JAXBUtils;
import org.apache.cxf.ws.policy.AssertionBuilder;
-import org.apache.cxf.ws.policy.PolicyAssertion;
+import org.apache.neethi.Assertion;
+import org.apache.neethi.AssertionBuilderFactory;
import org.apache.neethi.Constants;
import org.apache.neethi.builders.xml.XMLPrimitiveAssertionBuilder;
@@ -105,7 +106,7 @@ public class JaxbAssertionBuilder<T> imp
unmarshaller = context.createUnmarshaller();
}
- public PolicyAssertion build(Element element) {
+ public Assertion build(Element element, AssertionBuilderFactory factory) {
QName name = new QName(element.getNamespaceURI(), element.getLocalName());
JaxbAssertion<T> assertion = buildAssertion();
assertion.setName(name);
@@ -115,8 +116,8 @@ public class JaxbAssertionBuilder<T> imp
return assertion;
}
- public Collection<QName> getKnownElements() {
- return supportedTypes;
+ public QName[] getKnownElements() {
+ return supportedTypes.toArray(new QName[supportedTypes.size()]);
}
protected JaxbAssertion<T> buildAssertion() {
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=1071045&r1=1071044&r2=1071045&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 Tue Feb 15 20:49:38 2011
@@ -22,8 +22,9 @@ package org.apache.cxf.ws.policy.builder
import org.w3c.dom.Element;
import org.w3c.dom.Node;
-import org.apache.cxf.ws.policy.PolicyAssertion;
import org.apache.cxf.ws.policy.PolicyBuilder;
+import org.apache.neethi.Assertion;
+import org.apache.neethi.AssertionBuilderFactory;
import org.apache.neethi.Constants;
public class NestedPrimitiveAssertionBuilder extends PrimitiveAssertionBuilder {
@@ -40,10 +41,8 @@ public class NestedPrimitiveAssertionBui
builder = b;
}
-
-
@Override
- public PolicyAssertion build(Element element) {
+ public Assertion build(Element element, AssertionBuilderFactory factory) {
Node nd = element.getFirstChild();
int count = 0;
int policyCount = 0;
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=1071045&r1=1071044&r2=1071045&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 Tue Feb 15 20:49:38 2011
@@ -19,7 +19,6 @@
package org.apache.cxf.ws.policy.builder.primitive;
-import java.util.ArrayList;
import java.util.Collection;
import javax.xml.namespace.QName;
@@ -28,17 +27,20 @@ import org.w3c.dom.Element;
import org.apache.cxf.Bus;
import org.apache.cxf.ws.policy.AssertionBuilder;
-import org.apache.cxf.ws.policy.PolicyAssertion;
+import org.apache.neethi.Assertion;
+import org.apache.neethi.AssertionBuilderFactory;
public class PrimitiveAssertionBuilder implements AssertionBuilder {
protected Bus bus;
- private Collection<QName> knownElements = new ArrayList<QName>();
+ private QName knownElements[] = {};
public PrimitiveAssertionBuilder() {
- knownElements = new ArrayList<QName>();
}
public PrimitiveAssertionBuilder(Collection<QName> els) {
+ knownElements = els.toArray(new QName[els.size()]);
+ }
+ public PrimitiveAssertionBuilder(QName els[]) {
knownElements = els;
}
@@ -46,15 +48,18 @@ public class PrimitiveAssertionBuilder i
bus = b;
}
- public PolicyAssertion build(Element element) {
+ public Assertion build(Element element, AssertionBuilderFactory fact) {
return new PrimitiveAssertion(element);
}
- public Collection<QName> getKnownElements() {
+ public QName[] getKnownElements() {
return knownElements;
}
public void setKnownElements(Collection<QName> k) {
+ knownElements = k.toArray(new QName[k.size()]);
+ }
+ public void setKnownElements(QName k[]) {
knownElements = k;
}
Modified: cxf/trunk/api/src/test/java/org/apache/cxf/ws/policy/builder/jaxb/JaxbAssertionBuilderTest.java
URL: http://svn.apache.org/viewvc/cxf/trunk/api/src/test/java/org/apache/cxf/ws/policy/builder/jaxb/JaxbAssertionBuilderTest.java?rev=1071045&r1=1071044&r2=1071045&view=diff
==============================================================================
--- cxf/trunk/api/src/test/java/org/apache/cxf/ws/policy/builder/jaxb/JaxbAssertionBuilderTest.java (original)
+++ cxf/trunk/api/src/test/java/org/apache/cxf/ws/policy/builder/jaxb/JaxbAssertionBuilderTest.java Tue Feb 15 20:49:38 2011
@@ -28,7 +28,8 @@ import org.w3c.dom.Element;
import org.apache.cxf.helpers.DOMUtils;
import org.apache.cxf.test.assertions.foo.FooType;
-import org.apache.cxf.ws.policy.PolicyAssertion;
+import org.apache.neethi.Assertion;
+
import org.junit.Assert;
import org.junit.Test;
@@ -56,8 +57,8 @@ public class JaxbAssertionBuilderTest ex
QName qn = new QName("http://cxf.apache.org/test/assertions/foo", "FooType");
JaxbAssertionBuilder<FooType> ab = new JaxbAssertionBuilder<FooType>(FooType.class, qn);
assertNotNull(ab);
- assertEquals(1, ab.getKnownElements().size());
- assertSame(qn, ab.getKnownElements().iterator().next());
+ assertEquals(1, ab.getKnownElements().length);
+ assertSame(qn, ab.getKnownElements()[0]);
}
@Test
@@ -70,7 +71,7 @@ public class JaxbAssertionBuilderTest ex
Element elem = DOMUtils.findAllElementsByTagNameNS((Element)doc.getDocumentElement(),
"http://cxf.apache.org/test/assertions/foo",
"foo").get(0);
- PolicyAssertion a = ab.build(elem);
+ Assertion a = ab.build(elem, null);
JaxbAssertion<FooType> jba = JaxbAssertion.cast(a, FooType.class);
FooType foo = jba.getData();
assertEquals("CXF", foo.getName());
Modified: cxf/trunk/api/src/test/java/org/apache/cxf/ws/policy/builder/primitive/NestedPrimitiveAssertionBuilderTest.java
URL: http://svn.apache.org/viewvc/cxf/trunk/api/src/test/java/org/apache/cxf/ws/policy/builder/primitive/NestedPrimitiveAssertionBuilderTest.java?rev=1071045&r1=1071044&r2=1071045&view=diff
==============================================================================
--- cxf/trunk/api/src/test/java/org/apache/cxf/ws/policy/builder/primitive/NestedPrimitiveAssertionBuilderTest.java (original)
+++ cxf/trunk/api/src/test/java/org/apache/cxf/ws/policy/builder/primitive/NestedPrimitiveAssertionBuilderTest.java Tue Feb 15 20:49:38 2011
@@ -66,7 +66,7 @@ public class NestedPrimitiveAssertionBui
+ " xmlns:wsp=\"http://www.w3.org/2006/07/ws-policy\""
+ " xmlns:wsam=\"http://www.w3.org/2007/01/addressing/metadata\" />";
- npab.build(getElement(data));
+ npab.build(getElement(data), null);
}
@Test
@@ -80,7 +80,7 @@ public class NestedPrimitiveAssertionBui
Policy nested = control.createMock(Policy.class);
EasyMock.expect(builder.getPolicy(EasyMock.isA(Element.class))).andReturn(nested);
control.replay();
- NestedPrimitiveAssertion npc = (NestedPrimitiveAssertion)npab.build(getElement(data));
+ NestedPrimitiveAssertion npc = (NestedPrimitiveAssertion)npab.build(getElement(data), null);
assertEquals(TEST_NAME1, npc.getName());
assertSame(nested, npc.getPolicy());
assertTrue(npc.isOptional());
@@ -102,7 +102,7 @@ public class NestedPrimitiveAssertionBui
control.replay();
npab.setBus(bus);
- NestedPrimitiveAssertion npc = (NestedPrimitiveAssertion)npab.build(getElement(data));
+ NestedPrimitiveAssertion npc = (NestedPrimitiveAssertion)npab.build(getElement(data), null);
assertEquals(TEST_NAME1, npc.getName());
assertSame(nested, npc.getPolicy());
assertTrue(npc.isOptional());
Modified: cxf/trunk/common/common/src/main/java/org/apache/cxf/configuration/spring/AbstractSpringBeanMap.java
URL: http://svn.apache.org/viewvc/cxf/trunk/common/common/src/main/java/org/apache/cxf/configuration/spring/AbstractSpringBeanMap.java?rev=1071045&r1=1071044&r2=1071045&view=diff
==============================================================================
--- cxf/trunk/common/common/src/main/java/org/apache/cxf/configuration/spring/AbstractSpringBeanMap.java (original)
+++ cxf/trunk/common/common/src/main/java/org/apache/cxf/configuration/spring/AbstractSpringBeanMap.java Tue Feb 15 20:49:38 2011
@@ -23,6 +23,7 @@ import java.io.Serializable;
import java.lang.reflect.InvocationTargetException;
import java.lang.reflect.Method;
import java.util.ArrayList;
+import java.util.Arrays;
import java.util.Collection;
import java.util.LinkedHashSet;
import java.util.List;
@@ -71,13 +72,17 @@ abstract class AbstractSpringBeanMap<X,
return lst;
}
- protected Collection<String> getIds(Object bean) {
+ protected Collection<X> getIds(Object bean) {
try {
PropertyDescriptor pd = BeanUtils.getPropertyDescriptor(bean.getClass(), idsProperty);
Method method = pd.getReadMethod();
- Collection<String> c = CastUtils.cast((Collection<?>)method.invoke(bean, new Object[0]));
-
- return c;
+ Object o = method.invoke(bean, new Object[0]);
+ if (o instanceof Collection) {
+ return CastUtils.cast((Collection<?>)method.invoke(bean, new Object[0]));
+ }
+ @SuppressWarnings("unchecked")
+ X ar[] = (X[])o;
+ return Arrays.asList(ar);
} catch (IllegalArgumentException e) {
throw new BeanInitializationException("Could not retrieve ids.", e);
} catch (IllegalAccessException e) {
Modified: cxf/trunk/rt/ws/addr/src/main/java/org/apache/cxf/ws/addressing/policy/AddressingAssertionBuilder.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/ws/addr/src/main/java/org/apache/cxf/ws/addressing/policy/AddressingAssertionBuilder.java?rev=1071045&r1=1071044&r2=1071045&view=diff
==============================================================================
--- cxf/trunk/rt/ws/addr/src/main/java/org/apache/cxf/ws/addressing/policy/AddressingAssertionBuilder.java (original)
+++ cxf/trunk/rt/ws/addr/src/main/java/org/apache/cxf/ws/addressing/policy/AddressingAssertionBuilder.java Tue Feb 15 20:49:38 2011
@@ -19,8 +19,6 @@
package org.apache.cxf.ws.addressing.policy;
-import java.util.ArrayList;
-import java.util.Collection;
import javax.xml.namespace.QName;
@@ -29,34 +27,34 @@ import org.w3c.dom.Element;
import org.apache.cxf.Bus;
import org.apache.cxf.ws.policy.AssertionBuilder;
-import org.apache.cxf.ws.policy.PolicyAssertion;
import org.apache.cxf.ws.policy.PolicyBuilder;
import org.apache.cxf.ws.policy.PolicyConstants;
import org.apache.cxf.ws.policy.builder.primitive.NestedPrimitiveAssertion;
import org.apache.cxf.ws.policy.builder.primitive.PrimitiveAssertion;
+import org.apache.neethi.Assertion;
+import org.apache.neethi.AssertionBuilderFactory;
/**
*
*/
public class AddressingAssertionBuilder implements AssertionBuilder {
- private static final Collection<QName> KNOWN_ELEMENTS = new ArrayList<QName>();
+ private static final QName[] KNOWN_ELEMENTS = {
+ MetadataConstants.ADDRESSING_ASSERTION_QNAME,
+ MetadataConstants.ANON_RESPONSES_ASSERTION_QNAME,
+ MetadataConstants.NON_ANON_RESPONSES_ASSERTION_QNAME,
+ MetadataConstants.ADDRESSING_ASSERTION_QNAME_0705,
+ MetadataConstants.ANON_RESPONSES_ASSERTION_QNAME_0705,
+ MetadataConstants.NON_ANON_RESPONSES_ASSERTION_QNAME_0705
+ };
private Bus bus;
public AddressingAssertionBuilder(Bus b) {
bus = b;
}
- static {
- KNOWN_ELEMENTS.add(MetadataConstants.ADDRESSING_ASSERTION_QNAME);
- KNOWN_ELEMENTS.add(MetadataConstants.ANON_RESPONSES_ASSERTION_QNAME);
- KNOWN_ELEMENTS.add(MetadataConstants.NON_ANON_RESPONSES_ASSERTION_QNAME);
- KNOWN_ELEMENTS.add(MetadataConstants.ADDRESSING_ASSERTION_QNAME_0705);
- KNOWN_ELEMENTS.add(MetadataConstants.ANON_RESPONSES_ASSERTION_QNAME_0705);
- KNOWN_ELEMENTS.add(MetadataConstants.NON_ANON_RESPONSES_ASSERTION_QNAME_0705);
- }
- public PolicyAssertion build(Element elem) {
+ public Assertion build(Element elem, AssertionBuilderFactory factory) {
String localName = elem.getLocalName();
QName qn = new QName(elem.getNamespaceURI(), localName);
@@ -87,7 +85,7 @@ public class AddressingAssertionBuilder
return null;
}
- public Collection<QName> getKnownElements() {
+ public QName[] getKnownElements() {
return KNOWN_ELEMENTS;
}
Added: cxf/trunk/rt/ws/addr/src/main/java/org/apache/cxf/ws/addressing/policy/UsingAddressingAssertionBuilder.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/ws/addr/src/main/java/org/apache/cxf/ws/addressing/policy/UsingAddressingAssertionBuilder.java?rev=1071045&view=auto
==============================================================================
--- cxf/trunk/rt/ws/addr/src/main/java/org/apache/cxf/ws/addressing/policy/UsingAddressingAssertionBuilder.java (added)
+++ cxf/trunk/rt/ws/addr/src/main/java/org/apache/cxf/ws/addressing/policy/UsingAddressingAssertionBuilder.java Tue Feb 15 20:49:38 2011
@@ -0,0 +1,43 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you 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.
+ */
+
+package org.apache.cxf.ws.addressing.policy;
+
+
+import javax.xml.namespace.QName;
+
+import org.apache.cxf.ws.policy.builder.primitive.PrimitiveAssertionBuilder;
+
+/**
+ *
+ */
+public class UsingAddressingAssertionBuilder extends PrimitiveAssertionBuilder {
+
+ private static final QName[] KNOWN_ELEMENTS = {
+ MetadataConstants.USING_ADDRESSING_2004_QNAME,
+ MetadataConstants.USING_ADDRESSING_2005_QNAME,
+ MetadataConstants.USING_ADDRESSING_2006_QNAME,
+ };
+
+ public UsingAddressingAssertionBuilder() {
+ super(KNOWN_ELEMENTS);
+ }
+
+
+}
Propchange: cxf/trunk/rt/ws/addr/src/main/java/org/apache/cxf/ws/addressing/policy/UsingAddressingAssertionBuilder.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: cxf/trunk/rt/ws/addr/src/main/java/org/apache/cxf/ws/addressing/policy/UsingAddressingAssertionBuilder.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
Modified: cxf/trunk/rt/ws/addr/src/main/resources/META-INF/cxf/cxf-extension-addr.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/ws/addr/src/main/resources/META-INF/cxf/cxf-extension-addr.xml?rev=1071045&r1=1071044&r2=1071045&view=diff
==============================================================================
--- cxf/trunk/rt/ws/addr/src/main/resources/META-INF/cxf/cxf-extension-addr.xml (original)
+++ cxf/trunk/rt/ws/addr/src/main/resources/META-INF/cxf/cxf-extension-addr.xml Tue Feb 15 20:49:38 2011
@@ -27,30 +27,13 @@ http://www.springframework.org/schema/be
lazy-init="true">
<constructor-arg ref="cxf"/>
</bean>
+ <bean class="org.apache.cxf.ws.addressing.policy.UsingAddressingAssertionBuilder"
+ id="org.apache.cxf.ws.addressing.policy.UsingAddressingAssertionBuilder"
+ lazy-init="true"/>
<bean class="org.apache.cxf.ws.addressing.policy.AddressingPolicyInterceptorProvider"
id="org.apache.cxf.ws.addressing.policy.AddressingPolicyInterceptorProvider"
lazy-init="true"/>
- <bean id="org.apache.cxf.ws.addressing.policy.UsingAddressingAssertionBuilder"
- class="org.apache.cxf.ws.policy.builder.primitive.PrimitiveAssertionBuilder"
- lazy-init="true">
- <property name="knownElements">
- <set>
- <bean class="javax.xml.namespace.QName">
- <constructor-arg value="http://schemas.xmlsoap.org/ws/2004/08/addressing/policy"/>
- <constructor-arg value="UsingAddressing"/>
- </bean>
- <bean class="javax.xml.namespace.QName">
- <constructor-arg value="http://www.w3.org/2005/02/addressing/wsdl"/>
- <constructor-arg value="UsingAddressing"/>
- </bean>
- <bean class="javax.xml.namespace.QName">
- <constructor-arg value="http://www.w3.org/2006/05/addressing/wsdl"/>
- <constructor-arg value="UsingAddressing"/>
- </bean>
- </set>
- </property>
- </bean>
</beans>
\ No newline at end of file
Modified: cxf/trunk/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/AssertionBuilderRegistryImpl.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/AssertionBuilderRegistryImpl.java?rev=1071045&r1=1071044&r2=1071045&view=diff
==============================================================================
--- cxf/trunk/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/AssertionBuilderRegistryImpl.java (original)
+++ cxf/trunk/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/AssertionBuilderRegistryImpl.java Tue Feb 15 20:49:38 2011
@@ -20,7 +20,6 @@
package org.apache.cxf.ws.policy;
import java.util.ArrayList;
-import java.util.Collection;
import java.util.List;
import java.util.Map;
import java.util.ResourceBundle;
@@ -42,6 +41,7 @@ import org.apache.cxf.extension.BusExten
import org.apache.cxf.extension.RegistryImpl;
import org.apache.cxf.ws.policy.builder.primitive.NestedPrimitiveAssertionBuilder;
import org.apache.neethi.Assertion;
+import org.apache.neethi.AssertionBuilderFactory;
/**
*
@@ -90,7 +90,7 @@ public class AssertionBuilderRegistryImp
}
public void register(AssertionBuilder builder) {
- Collection<QName> names = builder.getKnownElements();
+ QName names[] = builder.getKnownElements();
for (QName n : names) {
super.register(n, builder);
}
@@ -114,6 +114,9 @@ public class AssertionBuilderRegistryImp
}
}
public Assertion build(Element element) {
+ return build(element, null);
+ }
+ public Assertion build(Element element, AssertionBuilderFactory factory) {
loadDynamic();
AssertionBuilder builder;
@@ -141,7 +144,7 @@ public class AssertionBuilderRegistryImp
}
}
- return builder.build(element);
+ return builder.build(element, factory);
}
}
Modified: cxf/trunk/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/mtom/MTOMAssertionBuilder.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/mtom/MTOMAssertionBuilder.java?rev=1071045&r1=1071044&r2=1071045&view=diff
==============================================================================
--- cxf/trunk/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/mtom/MTOMAssertionBuilder.java (original)
+++ cxf/trunk/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/mtom/MTOMAssertionBuilder.java Tue Feb 15 20:49:38 2011
@@ -19,8 +19,6 @@
package org.apache.cxf.ws.policy.mtom;
-import java.util.ArrayList;
-import java.util.Collection;
import javax.xml.namespace.QName;
@@ -28,17 +26,16 @@ import org.w3c.dom.Attr;
import org.w3c.dom.Element;
import org.apache.cxf.ws.policy.AssertionBuilder;
-import org.apache.cxf.ws.policy.PolicyAssertion;
import org.apache.cxf.ws.policy.PolicyConstants;
import org.apache.cxf.ws.policy.builder.primitive.PrimitiveAssertion;
+import org.apache.neethi.Assertion;
+import org.apache.neethi.AssertionBuilderFactory;
public class MTOMAssertionBuilder implements AssertionBuilder {
- private static final Collection<QName> KNOWN_ELEMENTS = new ArrayList<QName>();
- static {
- KNOWN_ELEMENTS.add(MetadataConstants.MTOM_ASSERTION_QNAME);
- }
+ private static final QName KNOWN_ELEMENTS[]
+ = {MetadataConstants.MTOM_ASSERTION_QNAME};
- public PolicyAssertion build(Element elem) {
+ public Assertion build(Element elem, AssertionBuilderFactory f) {
String localName = elem.getLocalName();
QName qn = new QName(elem.getNamespaceURI(), localName);
@@ -55,7 +52,7 @@ public class MTOMAssertionBuilder implem
return null;
}
- public Collection<QName> getKnownElements() {
+ public QName[] getKnownElements() {
return KNOWN_ELEMENTS;
}
Modified: cxf/trunk/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/PolicyExtensionsTest.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/PolicyExtensionsTest.java?rev=1071045&r1=1071044&r2=1071045&view=diff
==============================================================================
--- cxf/trunk/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/PolicyExtensionsTest.java (original)
+++ cxf/trunk/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/PolicyExtensionsTest.java Tue Feb 15 20:49:38 2011
@@ -19,7 +19,6 @@
package org.apache.cxf.ws.policy;
-import java.util.ArrayList;
import java.util.Collection;
import javax.xml.namespace.QName;
@@ -34,6 +33,9 @@ import org.apache.cxf.ws.policy.attachme
import org.apache.cxf.ws.policy.attachment.external.DomainExpressionBuilderRegistry;
import org.apache.cxf.ws.policy.attachment.external.ExternalAttachmentProvider;
import org.apache.cxf.ws.policy.attachment.wsdl11.Wsdl11AttachmentPolicyProvider;
+import org.apache.neethi.Assertion;
+import org.apache.neethi.AssertionBuilderFactory;
+
import org.junit.Assert;
import org.junit.Test;
@@ -114,21 +116,17 @@ public class PolicyExtensionsTest extend
public static class TestAssertionBuilder implements AssertionBuilder {
- Collection<QName> knownElements = new ArrayList<QName>();
+ QName knownElements[] = {KNOWN};
public TestAssertionBuilder() {
- knownElements.add(KNOWN);
}
- public PolicyAssertion build(Element arg0) {
+ public Assertion build(Element element, AssertionBuilderFactory factory) {
return null;
}
- public Collection<QName> getKnownElements() {
+ public QName[] getKnownElements() {
return knownElements;
}
- public PolicyAssertion buildCompatible(PolicyAssertion a, PolicyAssertion b) {
- return null;
- }
}
public static class TestPolicyInterceptorProvider extends AbstractPolicyInterceptorProvider {
Modified: cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/builders/AlgorithmSuiteBuilder.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/builders/AlgorithmSuiteBuilder.java?rev=1071045&r1=1071044&r2=1071045&view=diff
==============================================================================
--- cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/builders/AlgorithmSuiteBuilder.java (original)
+++ cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/builders/AlgorithmSuiteBuilder.java Tue Feb 15 20:49:38 2011
@@ -19,8 +19,6 @@
package org.apache.cxf.ws.security.policy.builders;
-import java.util.Arrays;
-import java.util.List;
import javax.xml.namespace.QName;
@@ -28,20 +26,21 @@ import org.w3c.dom.Element;
import org.apache.cxf.helpers.DOMUtils;
import org.apache.cxf.ws.policy.AssertionBuilder;
-import org.apache.cxf.ws.policy.PolicyAssertion;
import org.apache.cxf.ws.security.policy.SP11Constants;
import org.apache.cxf.ws.security.policy.SP12Constants;
import org.apache.cxf.ws.security.policy.SPConstants;
import org.apache.cxf.ws.security.policy.WSSPolicyException;
import org.apache.cxf.ws.security.policy.model.AlgorithmSuite;
+import org.apache.neethi.Assertion;
+import org.apache.neethi.AssertionBuilderFactory;
public class AlgorithmSuiteBuilder implements AssertionBuilder {
- private static final List<QName> KNOWN_ELEMENTS
- = Arrays.asList(SP11Constants.ALGORITHM_SUITE, SP12Constants.ALGORITHM_SUITE);
+ private static final QName KNOWN_ELEMENTS[]
+ = {SP11Constants.ALGORITHM_SUITE, SP12Constants.ALGORITHM_SUITE};
- public PolicyAssertion build(Element element)
+ public Assertion build(Element element, AssertionBuilderFactory factory)
throws IllegalArgumentException {
SPConstants consts = SP11Constants.SP_NS.equals(element.getNamespaceURI())
@@ -59,13 +58,8 @@ public class AlgorithmSuiteBuilder imple
return algorithmSuite;
}
- public List<QName> getKnownElements() {
+ public QName[] getKnownElements() {
return KNOWN_ELEMENTS;
}
-
- public PolicyAssertion buildCompatible(PolicyAssertion a, PolicyAssertion b) {
- // TODO Auto-generated method stub
- return null;
- }
}
Modified: cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/builders/AsymmetricBindingBuilder.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/builders/AsymmetricBindingBuilder.java?rev=1071045&r1=1071044&r2=1071045&view=diff
==============================================================================
--- cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/builders/AsymmetricBindingBuilder.java (original)
+++ cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/builders/AsymmetricBindingBuilder.java Tue Feb 15 20:49:38 2011
@@ -18,7 +18,6 @@
*/
package org.apache.cxf.ws.security.policy.builders;
-import java.util.Arrays;
import java.util.Iterator;
import java.util.List;
@@ -28,7 +27,6 @@ import org.w3c.dom.Element;
import org.apache.cxf.helpers.DOMUtils;
import org.apache.cxf.ws.policy.AssertionBuilder;
-import org.apache.cxf.ws.policy.PolicyAssertion;
import org.apache.cxf.ws.policy.PolicyBuilder;
import org.apache.cxf.ws.security.policy.SP11Constants;
import org.apache.cxf.ws.security.policy.SP12Constants;
@@ -39,21 +37,22 @@ import org.apache.cxf.ws.security.policy
import org.apache.cxf.ws.security.policy.model.Layout;
import org.apache.cxf.ws.security.policy.model.RecipientToken;
import org.apache.neethi.Assertion;
+import org.apache.neethi.AssertionBuilderFactory;
import org.apache.neethi.Policy;
public class AsymmetricBindingBuilder implements AssertionBuilder {
- private static final List<QName> KNOWN_ELEMENTS
- = Arrays.asList(SP11Constants.ASYMMETRIC_BINDING, SP12Constants.ASYMMETRIC_BINDING);
+ private static final QName KNOWN_ELEMENTS[]
+ = {SP11Constants.ASYMMETRIC_BINDING, SP12Constants.ASYMMETRIC_BINDING};
PolicyBuilder builder;
public AsymmetricBindingBuilder(PolicyBuilder b) {
builder = b;
}
- public List<QName> getKnownElements() {
+ public QName[] getKnownElements() {
return KNOWN_ELEMENTS;
}
- public PolicyAssertion build(Element element)
+ public Assertion build(Element element, AssertionBuilderFactory factory)
throws IllegalArgumentException {
SPConstants consts = SP11Constants.SP_NS.equals(element.getNamespaceURI())
@@ -127,10 +126,4 @@ public class AsymmetricBindingBuilder im
}
}
-
- public PolicyAssertion buildCompatible(PolicyAssertion a, PolicyAssertion b) {
- // TODO Auto-generated method stub
- return null;
- }
-
}
Modified: cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/builders/ContentEncryptedElementsBuilder.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/builders/ContentEncryptedElementsBuilder.java?rev=1071045&r1=1071044&r2=1071045&view=diff
==============================================================================
--- cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/builders/ContentEncryptedElementsBuilder.java (original)
+++ cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/builders/ContentEncryptedElementsBuilder.java Tue Feb 15 20:49:38 2011
@@ -18,9 +18,6 @@
*/
package org.apache.cxf.ws.security.policy.builders;
-import java.util.Collections;
-import java.util.List;
-
import javax.xml.namespace.QName;
import org.w3c.dom.Attr;
@@ -30,17 +27,18 @@ import org.w3c.dom.Node;
import org.apache.cxf.helpers.DOMUtils;
import org.apache.cxf.ws.policy.AssertionBuilder;
-import org.apache.cxf.ws.policy.PolicyAssertion;
import org.apache.cxf.ws.security.policy.SP12Constants;
import org.apache.cxf.ws.security.policy.SPConstants;
import org.apache.cxf.ws.security.policy.model.ContentEncryptedElements;
+import org.apache.neethi.Assertion;
+import org.apache.neethi.AssertionBuilderFactory;
public class ContentEncryptedElementsBuilder implements AssertionBuilder {
- public static final List<QName> KNOWN_ELEMENTS
- = Collections.singletonList(SP12Constants.CONTENT_ENCRYPTED_ELEMENTS);
+ public static final QName KNOWN_ELEMENTS[]
+ = {SP12Constants.CONTENT_ENCRYPTED_ELEMENTS};
- public PolicyAssertion build(Element element) {
+ public Assertion build(Element element, AssertionBuilderFactory factory) {
ContentEncryptedElements contentEncryptedElements
= new ContentEncryptedElements(SP12Constants.INSTANCE);
@@ -59,7 +57,7 @@ public class ContentEncryptedElementsBui
return contentEncryptedElements;
}
- public List<QName> getKnownElements() {
+ public QName[] getKnownElements() {
return KNOWN_ELEMENTS;
}
private void processElement(Element element, ContentEncryptedElements parent) {
@@ -84,9 +82,4 @@ public class ContentEncryptedElementsBui
}
}
- public PolicyAssertion buildCompatible(PolicyAssertion a, PolicyAssertion b) {
- // TODO Auto-generated method stub
- return null;
- }
-
}
Modified: cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/builders/EncryptedElementsBuilder.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/builders/EncryptedElementsBuilder.java?rev=1071045&r1=1071044&r2=1071045&view=diff
==============================================================================
--- cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/builders/EncryptedElementsBuilder.java (original)
+++ cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/builders/EncryptedElementsBuilder.java Tue Feb 15 20:49:38 2011
@@ -18,9 +18,6 @@
*/
package org.apache.cxf.ws.security.policy.builders;
-import java.util.Arrays;
-import java.util.List;
-
import javax.xml.namespace.QName;
import org.w3c.dom.Attr;
@@ -30,22 +27,23 @@ import org.w3c.dom.Node;
import org.apache.cxf.helpers.DOMUtils;
import org.apache.cxf.ws.policy.AssertionBuilder;
-import org.apache.cxf.ws.policy.PolicyAssertion;
import org.apache.cxf.ws.security.policy.SP11Constants;
import org.apache.cxf.ws.security.policy.SP12Constants;
import org.apache.cxf.ws.security.policy.SPConstants;
import org.apache.cxf.ws.security.policy.model.SignedEncryptedElements;
+import org.apache.neethi.Assertion;
+import org.apache.neethi.AssertionBuilderFactory;
public class EncryptedElementsBuilder implements AssertionBuilder {
- private static final List<QName> KNOWN_ELEMENTS
- = Arrays.asList(SP11Constants.ENCRYPTED_ELEMENTS, SP12Constants.ENCRYPTED_ELEMENTS);
+ private static final QName KNOWN_ELEMENTS[]
+ = {SP11Constants.ENCRYPTED_ELEMENTS, SP12Constants.ENCRYPTED_ELEMENTS};
- public List<QName> getKnownElements() {
+ public QName[] getKnownElements() {
return KNOWN_ELEMENTS;
}
- public PolicyAssertion build(Element element)
+ public Assertion build(Element element, AssertionBuilderFactory factory)
throws IllegalArgumentException {
SPConstants consts = SP11Constants.SP_NS.equals(element.getNamespaceURI())
@@ -91,11 +89,5 @@ public class EncryptedElementsBuilder im
}
}
}
-
-
- public PolicyAssertion buildCompatible(PolicyAssertion a, PolicyAssertion b) {
- // TODO Auto-generated method stub
- return null;
- }
}
Modified: cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/builders/EncryptedPartsBuilder.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/builders/EncryptedPartsBuilder.java?rev=1071045&r1=1071044&r2=1071045&view=diff
==============================================================================
--- cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/builders/EncryptedPartsBuilder.java (original)
+++ cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/builders/EncryptedPartsBuilder.java Tue Feb 15 20:49:38 2011
@@ -18,32 +18,30 @@
*/
package org.apache.cxf.ws.security.policy.builders;
-import java.util.Arrays;
-import java.util.List;
-
import javax.xml.namespace.QName;
import org.w3c.dom.Element;
import org.w3c.dom.Node;
import org.apache.cxf.ws.policy.AssertionBuilder;
-import org.apache.cxf.ws.policy.PolicyAssertion;
import org.apache.cxf.ws.security.policy.SP11Constants;
import org.apache.cxf.ws.security.policy.SP12Constants;
import org.apache.cxf.ws.security.policy.SPConstants;
import org.apache.cxf.ws.security.policy.model.Header;
import org.apache.cxf.ws.security.policy.model.SignedEncryptedParts;
+import org.apache.neethi.Assertion;
+import org.apache.neethi.AssertionBuilderFactory;
public class EncryptedPartsBuilder implements AssertionBuilder {
- private static final List<QName> KNOWN_ELEMENTS
- = Arrays.asList(SP11Constants.ENCRYPTED_PARTS, SP12Constants.ENCRYPTED_PARTS);
+ private static final QName KNOWN_ELEMENTS[]
+ = {SP11Constants.ENCRYPTED_PARTS, SP12Constants.ENCRYPTED_PARTS};
- public List<QName> getKnownElements() {
+ public QName[] getKnownElements() {
return KNOWN_ELEMENTS;
}
- public PolicyAssertion build(Element element)
+ public Assertion build(Element element, AssertionBuilderFactory factory)
throws IllegalArgumentException {
SPConstants consts = SP11Constants.SP_NS.equals(element.getNamespaceURI())
@@ -78,9 +76,4 @@ public class EncryptedPartsBuilder imple
parent.setBody(true);
}
}
-
- public PolicyAssertion buildCompatible(PolicyAssertion a, PolicyAssertion b) {
- // TODO Auto-generated method stub
- return null;
- }
}
Modified: cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/builders/HttpsTokenBuilder.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/builders/HttpsTokenBuilder.java?rev=1071045&r1=1071044&r2=1071045&view=diff
==============================================================================
--- cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/builders/HttpsTokenBuilder.java (original)
+++ cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/builders/HttpsTokenBuilder.java Tue Feb 15 20:49:38 2011
@@ -18,22 +18,20 @@
*/
package org.apache.cxf.ws.security.policy.builders;
-import java.util.Arrays;
-import java.util.List;
-
import javax.xml.namespace.QName;
import org.w3c.dom.Element;
import org.apache.cxf.helpers.DOMUtils;
import org.apache.cxf.ws.policy.AssertionBuilder;
-import org.apache.cxf.ws.policy.PolicyAssertion;
import org.apache.cxf.ws.policy.PolicyBuilder;
import org.apache.cxf.ws.policy.PolicyConstants;
import org.apache.cxf.ws.security.policy.SP11Constants;
import org.apache.cxf.ws.security.policy.SP12Constants;
import org.apache.cxf.ws.security.policy.SPConstants;
import org.apache.cxf.ws.security.policy.model.HttpsToken;
+import org.apache.neethi.Assertion;
+import org.apache.neethi.AssertionBuilderFactory;
/**
@@ -50,8 +48,8 @@ import org.apache.cxf.ws.security.policy
*
*/
public class HttpsTokenBuilder implements AssertionBuilder {
- private static final List<QName> KNOWN_ELEMENTS
- = Arrays.asList(SP11Constants.HTTPS_TOKEN, SP12Constants.HTTPS_TOKEN);
+ private static final QName KNOWN_ELEMENTS[]
+ = {SP11Constants.HTTPS_TOKEN, SP12Constants.HTTPS_TOKEN};
PolicyBuilder builder;
@@ -62,7 +60,7 @@ public class HttpsTokenBuilder implement
/**
* {@inheritDoc}
*/
- public PolicyAssertion build(Element element) {
+ public Assertion build(Element element, AssertionBuilderFactory factory) {
SPConstants consts = SP11Constants.SP_NS.equals(element.getNamespaceURI())
? SP11Constants.INSTANCE : SP12Constants.INSTANCE;
@@ -101,13 +99,8 @@ public class HttpsTokenBuilder implement
/**
* {@inheritDoc}
*/
- public List<QName> getKnownElements() {
+ public QName[] getKnownElements() {
return KNOWN_ELEMENTS;
}
-
- public PolicyAssertion buildCompatible(PolicyAssertion a, PolicyAssertion b) {
- // TODO Auto-generated method stub
- return null;
- }
}
Modified: cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/builders/InitiatorTokenBuilder.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/builders/InitiatorTokenBuilder.java?rev=1071045&r1=1071044&r2=1071045&view=diff
==============================================================================
--- cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/builders/InitiatorTokenBuilder.java (original)
+++ cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/builders/InitiatorTokenBuilder.java Tue Feb 15 20:49:38 2011
@@ -18,7 +18,6 @@
*/
package org.apache.cxf.ws.security.policy.builders;
-import java.util.Arrays;
import java.util.Iterator;
import java.util.List;
@@ -28,7 +27,6 @@ import org.w3c.dom.Element;
import org.apache.cxf.helpers.DOMUtils;
import org.apache.cxf.ws.policy.AssertionBuilder;
-import org.apache.cxf.ws.policy.PolicyAssertion;
import org.apache.cxf.ws.policy.PolicyBuilder;
import org.apache.cxf.ws.policy.PolicyConstants;
import org.apache.cxf.ws.security.policy.SP11Constants;
@@ -36,23 +34,25 @@ import org.apache.cxf.ws.security.policy
import org.apache.cxf.ws.security.policy.SPConstants;
import org.apache.cxf.ws.security.policy.model.InitiatorToken;
import org.apache.cxf.ws.security.policy.model.Token;
+import org.apache.neethi.Assertion;
+import org.apache.neethi.AssertionBuilderFactory;
import org.apache.neethi.Policy;
public class InitiatorTokenBuilder implements AssertionBuilder {
- private static final List<QName> KNOWN_ELEMENTS
- = Arrays.asList(SP11Constants.INITIATOR_TOKEN, SP12Constants.INITIATOR_TOKEN);
+ private static final QName KNOWN_ELEMENTS[]
+ = {SP11Constants.INITIATOR_TOKEN, SP12Constants.INITIATOR_TOKEN};
PolicyBuilder builder;
public InitiatorTokenBuilder(PolicyBuilder b) {
builder = b;
}
- public List<QName> getKnownElements() {
+ public QName[] getKnownElements() {
return KNOWN_ELEMENTS;
}
- public PolicyAssertion build(Element element)
+ public Assertion build(Element element, AssertionBuilderFactory factory)
throws IllegalArgumentException {
SPConstants consts = SP11Constants.SP_NS.equals(element.getNamespaceURI())
@@ -84,10 +84,5 @@ public class InitiatorTokenBuilder imple
}
}
}
- public PolicyAssertion buildCompatible(PolicyAssertion a, PolicyAssertion b) {
- // TODO Auto-generated method stub
- return null;
- }
-
}
Modified: cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/builders/IssuedTokenBuilder.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/builders/IssuedTokenBuilder.java?rev=1071045&r1=1071044&r2=1071045&view=diff
==============================================================================
--- cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/builders/IssuedTokenBuilder.java (original)
+++ cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/builders/IssuedTokenBuilder.java Tue Feb 15 20:49:38 2011
@@ -18,7 +18,6 @@
*/
package org.apache.cxf.ws.security.policy.builders;
-import java.util.Arrays;
import java.util.Iterator;
import java.util.List;
@@ -28,7 +27,6 @@ import org.w3c.dom.Element;
import org.apache.cxf.helpers.DOMUtils;
import org.apache.cxf.ws.policy.AssertionBuilder;
-import org.apache.cxf.ws.policy.PolicyAssertion;
import org.apache.cxf.ws.policy.PolicyBuilder;
import org.apache.cxf.ws.policy.PolicyConstants;
import org.apache.cxf.ws.security.policy.SP11Constants;
@@ -36,6 +34,7 @@ import org.apache.cxf.ws.security.policy
import org.apache.cxf.ws.security.policy.SPConstants;
import org.apache.cxf.ws.security.policy.model.IssuedToken;
import org.apache.neethi.Assertion;
+import org.apache.neethi.AssertionBuilderFactory;
import org.apache.neethi.Policy;
@@ -43,19 +42,19 @@ public class IssuedTokenBuilder implemen
private static final String WSA_NAMESPACE_SUB = "http://schemas.xmlsoap.org/ws/2004/08/addressing";
private static final String WSA_NAMESPACE = "http://www.w3.org/2005/08/addressing";
- private static final List<QName> KNOWN_ELEMENTS
- = Arrays.asList(SP11Constants.ISSUED_TOKEN, SP12Constants.ISSUED_TOKEN);
+ private static final QName KNOWN_ELEMENTS[]
+ = {SP11Constants.ISSUED_TOKEN, SP12Constants.ISSUED_TOKEN};
PolicyBuilder builder;
public IssuedTokenBuilder(PolicyBuilder b) {
builder = b;
}
- public List<QName> getKnownElements() {
+ public QName[] getKnownElements() {
return KNOWN_ELEMENTS;
}
- public PolicyAssertion build(Element element)
+ public Assertion build(Element element, AssertionBuilderFactory factory)
throws IllegalArgumentException {
SPConstants consts = SP11Constants.SP_NS.equals(element.getNamespaceURI())
@@ -137,8 +136,4 @@ public class IssuedTokenBuilder implemen
}
- public PolicyAssertion buildCompatible(PolicyAssertion a, PolicyAssertion b) {
- // TODO Auto-generated method stub
- return null;
- }
}
Modified: cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/builders/KeyValueTokenBuilder.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/builders/KeyValueTokenBuilder.java?rev=1071045&r1=1071044&r2=1071045&view=diff
==============================================================================
--- cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/builders/KeyValueTokenBuilder.java (original)
+++ cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/builders/KeyValueTokenBuilder.java Tue Feb 15 20:49:38 2011
@@ -18,9 +18,6 @@
*/
package org.apache.cxf.ws.security.policy.builders;
-import java.util.Arrays;
-import java.util.List;
-
import javax.xml.namespace.QName;
import org.w3c.dom.Element;
@@ -28,24 +25,23 @@ import org.w3c.dom.Element;
import org.apache.cxf.common.util.StringUtils;
import org.apache.cxf.helpers.DOMUtils;
import org.apache.cxf.ws.policy.AssertionBuilder;
-import org.apache.cxf.ws.policy.PolicyAssertion;
import org.apache.cxf.ws.policy.PolicyConstants;
import org.apache.cxf.ws.security.policy.SP11Constants;
import org.apache.cxf.ws.security.policy.SP12Constants;
import org.apache.cxf.ws.security.policy.SPConstants;
import org.apache.cxf.ws.security.policy.model.KeyValueToken;
-
+import org.apache.neethi.Assertion;
+import org.apache.neethi.AssertionBuilderFactory;
public class KeyValueTokenBuilder implements AssertionBuilder {
private static final String MS_NS = "http://schemas.microsoft.com/ws/2005/07/securitypolicy";
- private static final List<QName> KNOWN_ELEMENTS
- = Arrays.asList(SP12Constants.KEYVALUE_TOKEN,
- new QName(MS_NS, "RsaToken"));
+ private static final QName KNOWN_ELEMENTS[]
+ = {SP12Constants.KEYVALUE_TOKEN, new QName(MS_NS, "RsaToken")};
public KeyValueTokenBuilder() {
}
- public PolicyAssertion build(Element element) {
+ public Assertion build(Element element, AssertionBuilderFactory factory) {
SPConstants consts = MS_NS.equals(element.getNamespaceURI())
? SP11Constants.INSTANCE : SP12Constants.INSTANCE;
@@ -78,12 +74,8 @@ public class KeyValueTokenBuilder implem
return token;
}
- public List<QName> getKnownElements() {
+ public QName[] getKnownElements() {
return KNOWN_ELEMENTS;
}
- public PolicyAssertion buildCompatible(PolicyAssertion a, PolicyAssertion b) {
- // TODO Auto-generated method stub
- return null;
- }
}
Modified: cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/builders/LayoutBuilder.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/builders/LayoutBuilder.java?rev=1071045&r1=1071044&r2=1071045&view=diff
==============================================================================
--- cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/builders/LayoutBuilder.java (original)
+++ cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/builders/LayoutBuilder.java Tue Feb 15 20:49:38 2011
@@ -19,34 +19,32 @@
package org.apache.cxf.ws.security.policy.builders;
-import java.util.Arrays;
-import java.util.List;
-
import javax.xml.namespace.QName;
import org.w3c.dom.Element;
import org.apache.cxf.helpers.DOMUtils;
import org.apache.cxf.ws.policy.AssertionBuilder;
-import org.apache.cxf.ws.policy.PolicyAssertion;
import org.apache.cxf.ws.policy.PolicyConstants;
import org.apache.cxf.ws.security.policy.SP11Constants;
import org.apache.cxf.ws.security.policy.SP12Constants;
import org.apache.cxf.ws.security.policy.SPConstants;
import org.apache.cxf.ws.security.policy.model.Layout;
+import org.apache.neethi.Assertion;
+import org.apache.neethi.AssertionBuilderFactory;
public class LayoutBuilder implements AssertionBuilder {
- private static final List<QName> KNOWN_ELEMENTS
- = Arrays.asList(SP11Constants.LAYOUT, SP12Constants.LAYOUT);
+ private static final QName KNOWN_ELEMENTS[]
+ = {SP11Constants.LAYOUT, SP12Constants.LAYOUT};
public LayoutBuilder() {
}
- public List<QName> getKnownElements() {
+ public QName[] getKnownElements() {
return KNOWN_ELEMENTS;
}
- public PolicyAssertion build(Element element)
+ public Assertion build(Element element, AssertionBuilderFactory factory)
throws IllegalArgumentException {
SPConstants consts = SP11Constants.SP_NS.equals(element.getNamespaceURI())
@@ -67,8 +65,4 @@ public class LayoutBuilder implements As
}
}
}
- public PolicyAssertion buildCompatible(PolicyAssertion a, PolicyAssertion b) {
- // TODO Auto-generated method stub
- return null;
- }
}
Modified: cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/builders/ProtectionTokenBuilder.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/builders/ProtectionTokenBuilder.java?rev=1071045&r1=1071044&r2=1071045&view=diff
==============================================================================
--- cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/builders/ProtectionTokenBuilder.java (original)
+++ cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/builders/ProtectionTokenBuilder.java Tue Feb 15 20:49:38 2011
@@ -18,7 +18,6 @@
*/
package org.apache.cxf.ws.security.policy.builders;
-import java.util.Arrays;
import java.util.Iterator;
import java.util.List;
@@ -28,30 +27,31 @@ import org.w3c.dom.Element;
import org.apache.cxf.helpers.DOMUtils;
import org.apache.cxf.ws.policy.AssertionBuilder;
-import org.apache.cxf.ws.policy.PolicyAssertion;
import org.apache.cxf.ws.policy.PolicyBuilder;
import org.apache.cxf.ws.security.policy.SP11Constants;
import org.apache.cxf.ws.security.policy.SP12Constants;
import org.apache.cxf.ws.security.policy.SPConstants;
import org.apache.cxf.ws.security.policy.model.ProtectionToken;
import org.apache.cxf.ws.security.policy.model.Token;
+import org.apache.neethi.Assertion;
+import org.apache.neethi.AssertionBuilderFactory;
import org.apache.neethi.Policy;
public class ProtectionTokenBuilder implements AssertionBuilder {
- private static final List<QName> KNOWN_ELEMENTS
- = Arrays.asList(SP11Constants.PROTECTION_TOKEN, SP12Constants.PROTECTION_TOKEN);
+ private static final QName KNOWN_ELEMENTS[]
+ = {SP11Constants.PROTECTION_TOKEN, SP12Constants.PROTECTION_TOKEN};
PolicyBuilder builder;
public ProtectionTokenBuilder(PolicyBuilder b) {
builder = b;
}
- public List<QName> getKnownElements() {
+ public QName[] getKnownElements() {
return KNOWN_ELEMENTS;
}
- public PolicyAssertion build(Element element)
+ public Assertion build(Element element, AssertionBuilderFactory factory)
throws IllegalArgumentException {
SPConstants consts = SP11Constants.SP_NS.equals(element.getNamespaceURI())
? SP11Constants.INSTANCE : SP12Constants.INSTANCE;
@@ -78,8 +78,4 @@ public class ProtectionTokenBuilder impl
parent.setToken((Token)token);
}
}
- public PolicyAssertion buildCompatible(PolicyAssertion a, PolicyAssertion b) {
- // TODO Auto-generated method stub
- return null;
- }
}
Modified: cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/builders/RecipientTokenBuilder.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/builders/RecipientTokenBuilder.java?rev=1071045&r1=1071044&r2=1071045&view=diff
==============================================================================
--- cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/builders/RecipientTokenBuilder.java (original)
+++ cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/builders/RecipientTokenBuilder.java Tue Feb 15 20:49:38 2011
@@ -18,7 +18,6 @@
*/
package org.apache.cxf.ws.security.policy.builders;
-import java.util.Arrays;
import java.util.Iterator;
import java.util.List;
@@ -28,7 +27,6 @@ import org.w3c.dom.Element;
import org.apache.cxf.helpers.DOMUtils;
import org.apache.cxf.ws.policy.AssertionBuilder;
-import org.apache.cxf.ws.policy.PolicyAssertion;
import org.apache.cxf.ws.policy.PolicyBuilder;
import org.apache.cxf.ws.security.policy.SP11Constants;
import org.apache.cxf.ws.security.policy.SP12Constants;
@@ -36,22 +34,23 @@ import org.apache.cxf.ws.security.policy
import org.apache.cxf.ws.security.policy.model.RecipientToken;
import org.apache.cxf.ws.security.policy.model.Token;
import org.apache.neethi.Assertion;
+import org.apache.neethi.AssertionBuilderFactory;
import org.apache.neethi.Policy;
public class RecipientTokenBuilder implements AssertionBuilder {
- private static final List<QName> KNOWN_ELEMENTS
- = Arrays.asList(SP11Constants.RECIPIENT_TOKEN, SP12Constants.RECIPIENT_TOKEN);
+ private static final QName KNOWN_ELEMENTS[]
+ = {SP11Constants.RECIPIENT_TOKEN, SP12Constants.RECIPIENT_TOKEN};
PolicyBuilder builder;
public RecipientTokenBuilder(PolicyBuilder b) {
builder = b;
}
- public List<QName> getKnownElements() {
+ public QName[] getKnownElements() {
return KNOWN_ELEMENTS;
}
- public PolicyAssertion build(Element element)
+ public Assertion build(Element element, AssertionBuilderFactory factory)
throws IllegalArgumentException {
SPConstants consts = SP11Constants.SP_NS.equals(element.getNamespaceURI())
@@ -87,9 +86,4 @@ public class RecipientTokenBuilder imple
}
}
}
- public PolicyAssertion buildCompatible(PolicyAssertion a, PolicyAssertion b) {
- // TODO Auto-generated method stub
- return null;
- }
-
}
Modified: cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/builders/RequiredElementsBuilder.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/builders/RequiredElementsBuilder.java?rev=1071045&r1=1071044&r2=1071045&view=diff
==============================================================================
--- cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/builders/RequiredElementsBuilder.java (original)
+++ cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/builders/RequiredElementsBuilder.java Tue Feb 15 20:49:38 2011
@@ -18,9 +18,6 @@
*/
package org.apache.cxf.ws.security.policy.builders;
-import java.util.Arrays;
-import java.util.List;
-
import javax.xml.namespace.QName;
import org.w3c.dom.Attr;
@@ -30,22 +27,23 @@ import org.w3c.dom.Node;
import org.apache.cxf.helpers.DOMUtils;
import org.apache.cxf.ws.policy.AssertionBuilder;
-import org.apache.cxf.ws.policy.PolicyAssertion;
import org.apache.cxf.ws.security.policy.SP11Constants;
import org.apache.cxf.ws.security.policy.SP12Constants;
import org.apache.cxf.ws.security.policy.SPConstants;
import org.apache.cxf.ws.security.policy.model.RequiredElements;
+import org.apache.neethi.Assertion;
+import org.apache.neethi.AssertionBuilderFactory;
public class RequiredElementsBuilder implements AssertionBuilder {
- private static final List<QName> KNOWN_ELEMENTS
- = Arrays.asList(SP11Constants.REQUIRED_ELEMENTS, SP12Constants.REQUIRED_ELEMENTS);
+ private static final QName KNOWN_ELEMENTS[]
+ = {SP11Constants.REQUIRED_ELEMENTS, SP12Constants.REQUIRED_ELEMENTS};
- public List<QName> getKnownElements() {
+ public QName[] getKnownElements() {
return KNOWN_ELEMENTS;
}
- public PolicyAssertion build(Element element)
+ public Assertion build(Element element, AssertionBuilderFactory factory)
throws IllegalArgumentException {
SPConstants consts = SP11Constants.SP_NS.equals(element.getNamespaceURI())
@@ -91,9 +89,4 @@ public class RequiredElementsBuilder imp
}
}
- public PolicyAssertion buildCompatible(PolicyAssertion a, PolicyAssertion b) {
- // TODO Auto-generated method stub
- return null;
- }
-
}
Modified: cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/builders/RequiredPartsBuilder.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/builders/RequiredPartsBuilder.java?rev=1071045&r1=1071044&r2=1071045&view=diff
==============================================================================
--- cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/builders/RequiredPartsBuilder.java (original)
+++ cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/builders/RequiredPartsBuilder.java Tue Feb 15 20:49:38 2011
@@ -18,24 +18,23 @@
*/
package org.apache.cxf.ws.security.policy.builders;
-import java.util.Collections;
-import java.util.List;
-
import javax.xml.namespace.QName;
import org.w3c.dom.Element;
import org.w3c.dom.Node;
import org.apache.cxf.ws.policy.AssertionBuilder;
-import org.apache.cxf.ws.policy.PolicyAssertion;
import org.apache.cxf.ws.security.policy.SP12Constants;
import org.apache.cxf.ws.security.policy.SPConstants;
import org.apache.cxf.ws.security.policy.model.Header;
import org.apache.cxf.ws.security.policy.model.RequiredParts;
+import org.apache.neethi.Assertion;
+import org.apache.neethi.AssertionBuilderFactory;
public class RequiredPartsBuilder implements AssertionBuilder {
- public PolicyAssertion build(Element element) throws IllegalArgumentException {
+ public Assertion build(Element element, AssertionBuilderFactory factory)
+ throws IllegalArgumentException {
RequiredParts requiredParts = new RequiredParts(SP12Constants.INSTANCE);
Node nd = element.getFirstChild();
@@ -49,8 +48,8 @@ public class RequiredPartsBuilder implem
return requiredParts;
}
- public List<QName> getKnownElements() {
- return Collections.singletonList(SP12Constants.REQUIRED_PARTS);
+ public QName[] getKnownElements() {
+ return new QName[] {SP12Constants.REQUIRED_PARTS};
}
private void processElement(Element element, RequiredParts parent) {
@@ -65,9 +64,4 @@ public class RequiredPartsBuilder implem
parent.addHeader(new Header(nameAttribute, namespaceAttribute));
}
}
-
- public PolicyAssertion buildCompatible(PolicyAssertion a, PolicyAssertion b) {
- // TODO Auto-generated method stub
- return null;
- }
}
Modified: cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/builders/SecureConversationTokenBuilder.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/builders/SecureConversationTokenBuilder.java?rev=1071045&r1=1071044&r2=1071045&view=diff
==============================================================================
--- cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/builders/SecureConversationTokenBuilder.java (original)
+++ cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/builders/SecureConversationTokenBuilder.java Tue Feb 15 20:49:38 2011
@@ -18,38 +18,36 @@
*/
package org.apache.cxf.ws.security.policy.builders;
-import java.util.Arrays;
-import java.util.List;
-
import javax.xml.namespace.QName;
import org.w3c.dom.Element;
import org.apache.cxf.helpers.DOMUtils;
import org.apache.cxf.ws.policy.AssertionBuilder;
-import org.apache.cxf.ws.policy.PolicyAssertion;
import org.apache.cxf.ws.policy.PolicyBuilder;
import org.apache.cxf.ws.policy.PolicyConstants;
import org.apache.cxf.ws.security.policy.SP11Constants;
import org.apache.cxf.ws.security.policy.SP12Constants;
import org.apache.cxf.ws.security.policy.SPConstants;
import org.apache.cxf.ws.security.policy.model.SecureConversationToken;
+import org.apache.neethi.Assertion;
+import org.apache.neethi.AssertionBuilderFactory;
import org.apache.neethi.Policy;
public class SecureConversationTokenBuilder implements AssertionBuilder {
- private static final List<QName> KNOWN_ELEMENTS
- = Arrays.asList(SP11Constants.SECURE_CONVERSATION_TOKEN, SP12Constants.SECURE_CONVERSATION_TOKEN);
+ private static final QName KNOWN_ELEMENTS[]
+ = {SP11Constants.SECURE_CONVERSATION_TOKEN, SP12Constants.SECURE_CONVERSATION_TOKEN};
PolicyBuilder builder;
public SecureConversationTokenBuilder(PolicyBuilder b) {
builder = b;
}
- public List<QName> getKnownElements() {
+ public QName[] getKnownElements() {
return KNOWN_ELEMENTS;
}
- public PolicyAssertion build(Element element)
+ public Assertion build(Element element, AssertionBuilderFactory factory)
throws IllegalArgumentException {
SPConstants consts = SP11Constants.SP_NS.equals(element.getNamespaceURI())
@@ -121,9 +119,4 @@ public class SecureConversationTokenBuil
return conversationToken;
}
- public PolicyAssertion buildCompatible(PolicyAssertion a, PolicyAssertion b) {
- // TODO Auto-generated method stub
- return null;
- }
-
}
Modified: cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/builders/SecurityContextTokenBuilder.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/builders/SecurityContextTokenBuilder.java?rev=1071045&r1=1071044&r2=1071045&view=diff
==============================================================================
--- cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/builders/SecurityContextTokenBuilder.java (original)
+++ cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/builders/SecurityContextTokenBuilder.java Tue Feb 15 20:49:38 2011
@@ -18,32 +18,30 @@
*/
package org.apache.cxf.ws.security.policy.builders;
-import java.util.Arrays;
-import java.util.List;
-
import javax.xml.namespace.QName;
import org.w3c.dom.Element;
import org.apache.cxf.helpers.DOMUtils;
import org.apache.cxf.ws.policy.AssertionBuilder;
-import org.apache.cxf.ws.policy.PolicyAssertion;
import org.apache.cxf.ws.policy.PolicyConstants;
import org.apache.cxf.ws.security.policy.SP11Constants;
import org.apache.cxf.ws.security.policy.SP12Constants;
import org.apache.cxf.ws.security.policy.SPConstants;
import org.apache.cxf.ws.security.policy.model.SecurityContextToken;
+import org.apache.neethi.Assertion;
+import org.apache.neethi.AssertionBuilderFactory;
public class SecurityContextTokenBuilder implements AssertionBuilder {
- private static final List<QName> KNOWN_ELEMENTS
- = Arrays.asList(SP11Constants.SECURITY_CONTEXT_TOKEN, SP12Constants.SECURITY_CONTEXT_TOKEN);
+ private static final QName KNOWN_ELEMENTS[]
+ = {SP11Constants.SECURITY_CONTEXT_TOKEN, SP12Constants.SECURITY_CONTEXT_TOKEN};
- public List<QName> getKnownElements() {
+ public QName[] getKnownElements() {
return KNOWN_ELEMENTS;
}
- public PolicyAssertion build(Element element)
+ public Assertion build(Element element, AssertionBuilderFactory factory)
throws IllegalArgumentException {
SPConstants consts = SP11Constants.SP_NS.equals(element.getNamespaceURI())
@@ -83,10 +81,4 @@ public class SecurityContextTokenBuilder
return contextToken;
}
- public PolicyAssertion buildCompatible(PolicyAssertion a, PolicyAssertion b) {
- // TODO Auto-generated method stub
- return null;
- }
-
-
}
Modified: cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/builders/SignedElementsBuilder.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/builders/SignedElementsBuilder.java?rev=1071045&r1=1071044&r2=1071045&view=diff
==============================================================================
--- cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/builders/SignedElementsBuilder.java (original)
+++ cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/builders/SignedElementsBuilder.java Tue Feb 15 20:49:38 2011
@@ -18,9 +18,6 @@
*/
package org.apache.cxf.ws.security.policy.builders;
-import java.util.Arrays;
-import java.util.List;
-
import javax.xml.namespace.QName;
import org.w3c.dom.Attr;
@@ -30,22 +27,23 @@ import org.w3c.dom.Node;
import org.apache.cxf.helpers.DOMUtils;
import org.apache.cxf.ws.policy.AssertionBuilder;
-import org.apache.cxf.ws.policy.PolicyAssertion;
import org.apache.cxf.ws.security.policy.SP11Constants;
import org.apache.cxf.ws.security.policy.SP12Constants;
import org.apache.cxf.ws.security.policy.SPConstants;
import org.apache.cxf.ws.security.policy.model.SignedEncryptedElements;
+import org.apache.neethi.Assertion;
+import org.apache.neethi.AssertionBuilderFactory;
public class SignedElementsBuilder implements AssertionBuilder {
- private static final List<QName> KNOWN_ELEMENTS
- = Arrays.asList(SP11Constants.SIGNED_ELEMENTS, SP12Constants.SIGNED_ELEMENTS);
+ private static final QName KNOWN_ELEMENTS[]
+ = {SP11Constants.SIGNED_ELEMENTS, SP12Constants.SIGNED_ELEMENTS};
- public List<QName> getKnownElements() {
+ public QName[] getKnownElements() {
return KNOWN_ELEMENTS;
}
- public PolicyAssertion build(Element element)
+ public Assertion build(Element element, AssertionBuilderFactory factory)
throws IllegalArgumentException {
SPConstants consts = SP11Constants.SP_NS.equals(element.getNamespaceURI())
@@ -92,10 +90,4 @@ public class SignedElementsBuilder imple
}
}
-
- public PolicyAssertion buildCompatible(PolicyAssertion a, PolicyAssertion b) {
- // TODO Auto-generated method stub
- return null;
- }
-
}
Modified: cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/builders/SignedPartsBuilder.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/builders/SignedPartsBuilder.java?rev=1071045&r1=1071044&r2=1071045&view=diff
==============================================================================
--- cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/builders/SignedPartsBuilder.java (original)
+++ cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/builders/SignedPartsBuilder.java Tue Feb 15 20:49:38 2011
@@ -18,33 +18,31 @@
*/
package org.apache.cxf.ws.security.policy.builders;
-import java.util.Arrays;
-import java.util.List;
-
import javax.xml.namespace.QName;
import org.w3c.dom.Element;
import org.w3c.dom.Node;
import org.apache.cxf.ws.policy.AssertionBuilder;
-import org.apache.cxf.ws.policy.PolicyAssertion;
import org.apache.cxf.ws.security.policy.SP11Constants;
import org.apache.cxf.ws.security.policy.SP12Constants;
import org.apache.cxf.ws.security.policy.SPConstants;
import org.apache.cxf.ws.security.policy.model.Header;
import org.apache.cxf.ws.security.policy.model.SignedEncryptedParts;
+import org.apache.neethi.Assertion;
+import org.apache.neethi.AssertionBuilderFactory;
public class SignedPartsBuilder implements AssertionBuilder {
- private static final List<QName> KNOWN_ELEMENTS
- = Arrays.asList(SP11Constants.SIGNED_PARTS, SP12Constants.SIGNED_PARTS);
+ private static final QName KNOWN_ELEMENTS[]
+ = {SP11Constants.SIGNED_PARTS, SP12Constants.SIGNED_PARTS};
- public List<QName> getKnownElements() {
+ public QName[] getKnownElements() {
return KNOWN_ELEMENTS;
}
- public PolicyAssertion build(Element element)
+ public Assertion build(Element element, AssertionBuilderFactory factory)
throws IllegalArgumentException {
SPConstants consts = SP11Constants.SP_NS.equals(element.getNamespaceURI())
@@ -82,10 +80,4 @@ public class SignedPartsBuilder implemen
}
}
-
- public PolicyAssertion buildCompatible(PolicyAssertion a, PolicyAssertion b) {
- // TODO Auto-generated method stub
- return null;
- }
-
}
Modified: cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/builders/SupportingTokens12Builder.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/builders/SupportingTokens12Builder.java?rev=1071045&r1=1071044&r2=1071045&view=diff
==============================================================================
--- cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/builders/SupportingTokens12Builder.java (original)
+++ cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/builders/SupportingTokens12Builder.java Tue Feb 15 20:49:38 2011
@@ -18,7 +18,6 @@
*/
package org.apache.cxf.ws.security.policy.builders;
-import java.util.Arrays;
import java.util.Iterator;
import java.util.List;
@@ -28,7 +27,6 @@ import org.w3c.dom.Element;
import org.apache.cxf.helpers.DOMUtils;
import org.apache.cxf.ws.policy.AssertionBuilder;
-import org.apache.cxf.ws.policy.PolicyAssertion;
import org.apache.cxf.ws.policy.PolicyBuilder;
import org.apache.cxf.ws.security.policy.SP12Constants;
import org.apache.cxf.ws.security.policy.SPConstants.SupportTokenType;
@@ -38,32 +36,31 @@ import org.apache.cxf.ws.security.policy
import org.apache.cxf.ws.security.policy.model.SupportingToken;
import org.apache.cxf.ws.security.policy.model.Token;
import org.apache.neethi.Assertion;
+import org.apache.neethi.AssertionBuilderFactory;
import org.apache.neethi.Policy;
public class SupportingTokens12Builder implements AssertionBuilder {
- private static final List<QName> KNOWN_ELEMENTS
- = Arrays.asList(SP12Constants.SUPPORTING_TOKENS,
- SP12Constants.SIGNED_SUPPORTING_TOKENS,
- SP12Constants.ENDORSING_SUPPORTING_TOKENS,
- SP12Constants.SIGNED_ENDORSING_SUPPORTING_TOKENS,
- SP12Constants.ENCRYPTED_SUPPORTING_TOKENS,
- SP12Constants.SIGNED_ENCRYPTED_SUPPORTING_TOKENS,
- SP12Constants.ENDORSING_ENCRYPTED_SUPPORTING_TOKENS,
- SP12Constants.SIGNED_ENDORSING_ENCRYPTED_SUPPORTING_TOKENS
- );
-
+ private static final QName KNOWN_ELEMENTS[]
+ = {SP12Constants.SUPPORTING_TOKENS,
+ SP12Constants.SIGNED_SUPPORTING_TOKENS,
+ SP12Constants.ENDORSING_SUPPORTING_TOKENS,
+ SP12Constants.SIGNED_ENDORSING_SUPPORTING_TOKENS,
+ SP12Constants.ENCRYPTED_SUPPORTING_TOKENS,
+ SP12Constants.SIGNED_ENCRYPTED_SUPPORTING_TOKENS,
+ SP12Constants.ENDORSING_ENCRYPTED_SUPPORTING_TOKENS,
+ SP12Constants.SIGNED_ENDORSING_ENCRYPTED_SUPPORTING_TOKENS};
PolicyBuilder builder;
public SupportingTokens12Builder(PolicyBuilder b) {
builder = b;
}
- public List<QName> getKnownElements() {
+ public QName[] getKnownElements() {
return KNOWN_ELEMENTS;
}
- public PolicyAssertion build(Element element) {
+ public Assertion build(Element element, AssertionBuilderFactory factory) {
QName name = DOMUtils.getElementQName(element);
SupportingToken supportingToken = null;
@@ -155,8 +152,4 @@ public class SupportingTokens12Builder i
}
}
}
- public PolicyAssertion buildCompatible(PolicyAssertion a, PolicyAssertion b) {
- // TODO Auto-generated method stub
- return null;
- }
}
Modified: cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/builders/SupportingTokensBuilder.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/builders/SupportingTokensBuilder.java?rev=1071045&r1=1071044&r2=1071045&view=diff
==============================================================================
--- cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/builders/SupportingTokensBuilder.java (original)
+++ cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/builders/SupportingTokensBuilder.java Tue Feb 15 20:49:38 2011
@@ -18,7 +18,6 @@
*/
package org.apache.cxf.ws.security.policy.builders;
-import java.util.Arrays;
import java.util.Iterator;
import java.util.List;
@@ -28,7 +27,6 @@ import org.w3c.dom.Element;
import org.apache.cxf.helpers.DOMUtils;
import org.apache.cxf.ws.policy.AssertionBuilder;
-import org.apache.cxf.ws.policy.PolicyAssertion;
import org.apache.cxf.ws.policy.PolicyBuilder;
import org.apache.cxf.ws.security.policy.SP11Constants;
import org.apache.cxf.ws.security.policy.SP12Constants;
@@ -39,28 +37,27 @@ import org.apache.cxf.ws.security.policy
import org.apache.cxf.ws.security.policy.model.SupportingToken;
import org.apache.cxf.ws.security.policy.model.Token;
import org.apache.neethi.Assertion;
+import org.apache.neethi.AssertionBuilderFactory;
import org.apache.neethi.Policy;
public class SupportingTokensBuilder implements AssertionBuilder {
- private static final List<QName> KNOWN_ELEMENTS
- = Arrays.asList(SP11Constants.SUPPORTING_TOKENS,
- SP11Constants.SIGNED_SUPPORTING_TOKENS,
- SP11Constants.ENDORSING_SUPPORTING_TOKENS,
- SP11Constants.SIGNED_ENDORSING_SUPPORTING_TOKENS);
+ private static final QName KNOWN_ELEMENTS[]
+ = {SP11Constants.SUPPORTING_TOKENS,
+ SP11Constants.SIGNED_SUPPORTING_TOKENS,
+ SP11Constants.ENDORSING_SUPPORTING_TOKENS,
+ SP11Constants.SIGNED_ENDORSING_SUPPORTING_TOKENS};
PolicyBuilder builder;
public SupportingTokensBuilder(PolicyBuilder b) {
builder = b;
}
- public List<QName> getKnownElements() {
+ public QName[] getKnownElements() {
return KNOWN_ELEMENTS;
}
-
-
- public PolicyAssertion build(Element element)
+ public Assertion build(Element element, AssertionBuilderFactory factory)
throws IllegalArgumentException {
QName name = DOMUtils.getElementQName(element);
SupportingToken supportingToken = null;
@@ -125,11 +122,4 @@ public class SupportingTokensBuilder imp
}
}
}
-
-
-
- public PolicyAssertion buildCompatible(PolicyAssertion a, PolicyAssertion b) {
- // TODO Auto-generated method stub
- return null;
- }
}
Modified: cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/builders/SymmetricBindingBuilder.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/builders/SymmetricBindingBuilder.java?rev=1071045&r1=1071044&r2=1071045&view=diff
==============================================================================
--- cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/builders/SymmetricBindingBuilder.java (original)
+++ cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/builders/SymmetricBindingBuilder.java Tue Feb 15 20:49:38 2011
@@ -18,7 +18,6 @@
*/
package org.apache.cxf.ws.security.policy.builders;
-import java.util.Arrays;
import java.util.Iterator;
import java.util.List;
@@ -28,7 +27,6 @@ import org.w3c.dom.Element;
import org.apache.cxf.helpers.DOMUtils;
import org.apache.cxf.ws.policy.AssertionBuilder;
-import org.apache.cxf.ws.policy.PolicyAssertion;
import org.apache.cxf.ws.policy.PolicyBuilder;
import org.apache.cxf.ws.security.policy.SP11Constants;
import org.apache.cxf.ws.security.policy.SP12Constants;
@@ -38,22 +36,23 @@ import org.apache.cxf.ws.security.policy
import org.apache.cxf.ws.security.policy.model.ProtectionToken;
import org.apache.cxf.ws.security.policy.model.SymmetricBinding;
import org.apache.neethi.Assertion;
+import org.apache.neethi.AssertionBuilderFactory;
import org.apache.neethi.Policy;
public class SymmetricBindingBuilder implements AssertionBuilder {
- private static final List<QName> KNOWN_ELEMENTS
- = Arrays.asList(SP11Constants.SYMMETRIC_BINDING, SP12Constants.SYMMETRIC_BINDING);
+ private static final QName KNOWN_ELEMENTS[]
+ = {SP11Constants.SYMMETRIC_BINDING, SP12Constants.SYMMETRIC_BINDING};
PolicyBuilder builder;
public SymmetricBindingBuilder(PolicyBuilder b) {
builder = b;
}
- public List<QName> getKnownElements() {
+ public QName[] getKnownElements() {
return KNOWN_ELEMENTS;
}
- public PolicyAssertion build(Element element)
+ public Assertion build(Element element, AssertionBuilderFactory factory)
throws IllegalArgumentException {
SPConstants consts = SP11Constants.SP_NS.equals(element.getNamespaceURI())
@@ -114,8 +113,4 @@ public class SymmetricBindingBuilder imp
}
}
}
- public PolicyAssertion buildCompatible(PolicyAssertion a, PolicyAssertion b) {
- // TODO Auto-generated method stub
- return null;
- }
}