Author: sanka
Date: Wed Sep 6 00:40:33 2006
New Revision: 440645
URL: http://svn.apache.org/viewvc?view=rev&rev=440645
Log:
Changing the return type of AssertionBuilder.getKnownElements() from QName to
QName[] since it allow the same AssertionBuilder to be used for multiple
elements
Modified:
webservices/commons/trunk/modules/neethi/src/main/java/org/apache/neethi/AbstractPolicyOperator.java
webservices/commons/trunk/modules/neethi/src/main/java/org/apache/neethi/AssertionBuilderFactory.java
webservices/commons/trunk/modules/neethi/src/main/java/org/apache/neethi/Policy.java
webservices/commons/trunk/modules/neethi/src/main/java/org/apache/neethi/PolicyEngine.java
webservices/commons/trunk/modules/neethi/src/main/java/org/apache/neethi/builders/AssertionBuilder.java
webservices/commons/trunk/modules/neethi/src/main/java/org/apache/neethi/builders/XMLPrimitiveAssertionBuilder.java
Modified:
webservices/commons/trunk/modules/neethi/src/main/java/org/apache/neethi/AbstractPolicyOperator.java
URL:
http://svn.apache.org/viewvc/webservices/commons/trunk/modules/neethi/src/main/java/org/apache/neethi/AbstractPolicyOperator.java?view=diff&rev=440645&r1=440644&r2=440645
==============================================================================
---
webservices/commons/trunk/modules/neethi/src/main/java/org/apache/neethi/AbstractPolicyOperator.java
(original)
+++
webservices/commons/trunk/modules/neethi/src/main/java/org/apache/neethi/AbstractPolicyOperator.java
Wed Sep 6 00:40:33 2006
@@ -119,7 +119,10 @@
policyComponent = (PolicyComponent) iterator.next();
if (policyComponent.getType() == PolicyComponent.ASSERTION) {
- policyComponent = ((Assertion) policyComponent).normalize();
+
+ if (deep) {
+ policyComponent = ((Assertion)
policyComponent).normalize();
+ }
if (policyComponent.getType() == PolicyComponent.POLICY) {
childComponentsList.add(((Policy)
policyComponent).getFirstPolicyComponent());
Modified:
webservices/commons/trunk/modules/neethi/src/main/java/org/apache/neethi/AssertionBuilderFactory.java
URL:
http://svn.apache.org/viewvc/webservices/commons/trunk/modules/neethi/src/main/java/org/apache/neethi/AssertionBuilderFactory.java?view=diff&rev=440645&r1=440644&r2=440645
==============================================================================
---
webservices/commons/trunk/modules/neethi/src/main/java/org/apache/neethi/AssertionBuilderFactory.java
(original)
+++
webservices/commons/trunk/modules/neethi/src/main/java/org/apache/neethi/AssertionBuilderFactory.java
Wed Sep 6 00:40:33 2006
@@ -54,7 +54,11 @@
for (Iterator providers = Service.providers(AssertionBuilder.class);
providers
.hasNext();) {
builder = (AssertionBuilder) providers.next();
- registerBuilder(builder.getKnownElement(), builder);
+
+ QName[] knownElements = builder.getKnownElements();
+ for (int i = 0; i < knownElements.length; i++) {
+ registerBuilder(knownElements[i], builder);
+ }
}
}
Modified:
webservices/commons/trunk/modules/neethi/src/main/java/org/apache/neethi/Policy.java
URL:
http://svn.apache.org/viewvc/webservices/commons/trunk/modules/neethi/src/main/java/org/apache/neethi/Policy.java?view=diff&rev=440645&r1=440644&r2=440645
==============================================================================
---
webservices/commons/trunk/modules/neethi/src/main/java/org/apache/neethi/Policy.java
(original)
+++
webservices/commons/trunk/modules/neethi/src/main/java/org/apache/neethi/Policy.java
Wed Sep 6 00:40:33 2006
@@ -66,6 +66,10 @@
public short getType() {
return PolicyComponent.POLICY;
}
+
+ public void addAlternatives(PolicyAlternatives policyAlternatives) {
+ policyComponents.add(policyAlternatives);
+ }
public Iterator getAlternatives() {
return new PolicyIterator(this);
Modified:
webservices/commons/trunk/modules/neethi/src/main/java/org/apache/neethi/PolicyEngine.java
URL:
http://svn.apache.org/viewvc/webservices/commons/trunk/modules/neethi/src/main/java/org/apache/neethi/PolicyEngine.java?view=diff&rev=440645&r1=440644&r2=440645
==============================================================================
---
webservices/commons/trunk/modules/neethi/src/main/java/org/apache/neethi/PolicyEngine.java
(original)
+++
webservices/commons/trunk/modules/neethi/src/main/java/org/apache/neethi/PolicyEngine.java
Wed Sep 6 00:40:33 2006
@@ -49,10 +49,15 @@
static {
AssertionBuilder builder;
+ QName[] knownElements;
for (Iterator iterator = Service.providers(AssertionBuilder.class);
iterator.hasNext(); ) {
builder = (AssertionBuilder) iterator.next();
- PolicyEngine.registerBuilder(builder.getKnownElement() , builder);
+ knownElements = builder.getKnownElements();
+
+ for (int i = 0; i < knownElements.length; i++) {
+ PolicyEngine.registerBuilder(knownElements[i], builder);
+ }
}
}
@@ -96,6 +101,7 @@
* @return
*/
public static Policy getPolicy(OMElement element) {
+
return getPolicyOperator(element);
}
Modified:
webservices/commons/trunk/modules/neethi/src/main/java/org/apache/neethi/builders/AssertionBuilder.java
URL:
http://svn.apache.org/viewvc/webservices/commons/trunk/modules/neethi/src/main/java/org/apache/neethi/builders/AssertionBuilder.java?view=diff&rev=440645&r1=440644&r2=440645
==============================================================================
---
webservices/commons/trunk/modules/neethi/src/main/java/org/apache/neethi/builders/AssertionBuilder.java
(original)
+++
webservices/commons/trunk/modules/neethi/src/main/java/org/apache/neethi/builders/AssertionBuilder.java
Wed Sep 6 00:40:33 2006
@@ -37,5 +37,5 @@
public Assertion build(OMElement element, AssertionBuilderFactory factory)
throws IllegalArgumentException;
- public QName getKnownElement();
+ public QName[] getKnownElements();
}
Modified:
webservices/commons/trunk/modules/neethi/src/main/java/org/apache/neethi/builders/XMLPrimitiveAssertionBuilder.java
URL:
http://svn.apache.org/viewvc/webservices/commons/trunk/modules/neethi/src/main/java/org/apache/neethi/builders/XMLPrimitiveAssertionBuilder.java?view=diff&rev=440645&r1=440644&r2=440645
==============================================================================
---
webservices/commons/trunk/modules/neethi/src/main/java/org/apache/neethi/builders/XMLPrimitiveAssertionBuilder.java
(original)
+++
webservices/commons/trunk/modules/neethi/src/main/java/org/apache/neethi/builders/XMLPrimitiveAssertionBuilder.java
Wed Sep 6 00:40:33 2006
@@ -28,7 +28,7 @@
return new XmlPrimtiveAssertion(element);
}
- public QName getKnownElement() {
- return new QName("UnknownElement");
+ public QName[] getKnownElements() {
+ return new QName[] {new QName("UnknownElement")};
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
