Author: sanka
Date: Tue Aug 22 11:57:18 2006
New Revision: 433723
URL: http://svn.apache.org/viewvc?rev=433723&view=rev
Log:
Apply the changes that were reverted last time due to an Axis2 build failure
Modified:
webservices/commons/trunk/modules/neethi/src/main/java/org/apache/neethi/AssertionBuilderFactory.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
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?rev=433723&r1=433722&r2=433723&view=diff
==============================================================================
---
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
Tue Aug 22 11:57:18 2006
@@ -21,7 +21,6 @@
import javax.xml.namespace.QName;
import org.apache.axiom.om.OMElement;
-import org.apache.axiom.om.OMNamespace;
import org.apache.neethi.builders.AssertionBuilder;
import sun.misc.Service;
@@ -35,54 +34,52 @@
*
*/
public class AssertionBuilderFactory {
-
+
public static final String POLICY_NAMESPACE =
"http://schemas.xmlsoap.org/ws/2004/09/policy";;
-
+
public static final String POLICY = "Policy";
-
+
public static final String EXACTLY_ONE = "ExactlyOne";
-
+
public static final String ALL = "All";
-
+
private final QName XML_ASSERTION_BUILDER = new QName(
"http://test.org/test";, "test");
private static HashMap registeredBuilders = new HashMap();
-
+
static {
AssertionBuilder builder;
-
- for (Iterator providers = Service.providers(AssertionBuilder.class);
providers.hasNext();) {
+
+ for (Iterator providers = Service.providers(AssertionBuilder.class);
providers
+ .hasNext();) {
builder = (AssertionBuilder) providers.next();
- //registerBuilder(builder.getKnownElement(), builder);
+ registerBuilder(builder.getKnownElement(), builder);
}
-
}
public static void registerBuilder(QName key, AssertionBuilder builder) {
registeredBuilders.put(key, builder);
}
-
+
public AssertionBuilderFactory() {
}
-
+
/**
* Returns an assertion
+ *
* @param element
* @return
*/
public Assertion build(OMElement element) {
- OMNamespace namespace = element.getNamespace();
AssertionBuilder builder;
- if (namespace != null) {
- QName qname = new QName(namespace.getNamespaceURI(),
element.getLocalName());
- builder = (AssertionBuilder) registeredBuilders.get(qname);
-
- if (builder != null) {
- return builder.build(element, this);
- }
+ QName qname = element.getQName();
+ builder = (AssertionBuilder) registeredBuilders.get(qname);
+
+ if (builder != null) {
+ return builder.build(element, this);
}
builder = (AssertionBuilder) registeredBuilders
@@ -93,6 +90,5 @@
public AssertionBuilder getBuilder(QName qname) {
return (AssertionBuilder) registeredBuilders.get(qname);
}
-
}
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?rev=433723&r1=433722&r2=433723&view=diff
==============================================================================
---
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
Tue Aug 22 11:57:18 2006
@@ -26,6 +26,8 @@
import org.apache.axiom.om.impl.llom.factory.OMXMLBuilderFactory;
import org.apache.neethi.builders.AssertionBuilder;
+import sun.misc.Service;
+
/**
* PolicyEngine provides set of methods to create a Policy object from an
* InputStream, OMElement, .. etc. It maintains an instance of
@@ -46,7 +48,12 @@
private static AssertionBuilderFactory factory = new
AssertionBuilderFactory();
static {
-// factory.registerBuilder(, builder)
+ AssertionBuilder builder;
+
+ for (Iterator iterator = Service.providers(AssertionBuilder.class);
iterator.hasNext(); ) {
+ builder = (AssertionBuilder) iterator.next();
+ PolicyEngine.registerBuilder(builder.getKnownElement() , builder);
+ }
}
/**
@@ -59,7 +66,7 @@
* @param builder
*/
public static void registerBuilder(QName qname, AssertionBuilder builder) {
- factory.registerBuilder(qname, builder);
+ AssertionBuilderFactory.registerBuilder(qname, builder);
}
/**
@@ -113,8 +120,7 @@
.hasNext();) {
childElement = (OMElement) iterator.next();
- if (PolicyOperator.NAMESPACE.equals(childElement.getNamespace()
- .getName())) {
+ if
(PolicyOperator.NAMESPACE.equals(childElement.getNamespace().getNamespaceURI()))
{
if (PolicyOperator.POLICY.equals(childElement.getLocalName()))
{
operator
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?rev=433723&r1=433722&r2=433723&view=diff
==============================================================================
---
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
Tue Aug 22 11:57:18 2006
@@ -37,5 +37,5 @@
public Assertion build(OMElement element, AssertionBuilderFactory factory)
throws IllegalArgumentException;
- //public QName getKnownElement();
+ public QName getKnownElement();
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
