You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commons-dev@ws.apache.org by sa...@apache.org on 2006/09/26 11:04:08 UTC

svn commit: r449953 - in /webservices/commons/trunk/modules/neethi: examples/wsse/src/org/apache/ws/security/policy/builders/Test.java src/main/java/org/apache/neethi/PolicyEngine.java src/test/test3/org/apache/neethi/PolicyTestCase.java

Author: saminda
Date: Tue Sep 26 02:04:05 2006
New Revision: 449953

URL: http://svn.apache.org/viewvc?view=rev&rev=449953
Log:
1. removed unncessary static block. This is alerady handled in 
AssersionBuilderFactory
2. Improvements to PolicyTestCase and Test

Modified:
    webservices/commons/trunk/modules/neethi/examples/wsse/src/org/apache/ws/security/policy/builders/Test.java
    webservices/commons/trunk/modules/neethi/src/main/java/org/apache/neethi/PolicyEngine.java
    webservices/commons/trunk/modules/neethi/src/test/test3/org/apache/neethi/PolicyTestCase.java

Modified: webservices/commons/trunk/modules/neethi/examples/wsse/src/org/apache/ws/security/policy/builders/Test.java
URL: http://svn.apache.org/viewvc/webservices/commons/trunk/modules/neethi/examples/wsse/src/org/apache/ws/security/policy/builders/Test.java?view=diff&rev=449953&r1=449952&r2=449953
==============================================================================
--- webservices/commons/trunk/modules/neethi/examples/wsse/src/org/apache/ws/security/policy/builders/Test.java (original)
+++ webservices/commons/trunk/modules/neethi/examples/wsse/src/org/apache/ws/security/policy/builders/Test.java Tue Sep 26 02:04:05 2006
@@ -31,45 +31,51 @@
 
 
 public class Test {
-    
+
     public static void main(String[] args) throws Exception {
-        
-        OMElement element = OMXMLBuilderFactory.createStAXOMBuilder(OMAbstractFactory.getOMFactory(),
-                XMLInputFactory.newInstance().createXMLStreamReader(new FileInputStream("/home/sanka/testpolicy.xml"))).getDocumentElement();
-        
+
+        OMElement element =
+                OMXMLBuilderFactory.
+                createStAXOMBuilder(OMAbstractFactory.getOMFactory(),
+                                   XMLInputFactory.newInstance().createXMLStreamReader(
+                                   new FileInputStream("/home/sanka/testpolicy.xml")))
+                                   .getDocumentElement();
+
         AssertionBuilderFactory factory = new AssertionBuilderFactory();
         AssertionBuilder builder;
-        
+
         builder = new TransportBindingBuilder();
         PolicyEngine.registerBuilder(new QName(Constants.SP_NS, "TransportBinding"), builder);
-        
+
         builder = new AlgorithmSuiteBuilder();
-        PolicyEngine.registerBuilder(new QName(Constants.SP_NS,"AlgorithmSuite"),builder);
-        
+        PolicyEngine.registerBuilder(new QName(Constants.SP_NS, "AlgorithmSuite"), builder);
+
         builder = new TransportTokenBuilder();
         PolicyEngine.registerBuilder(new QName(Constants.SP_NS, "TransportToken"), builder);
-        
+
         builder = new LayoutBuilder();
         PolicyEngine.registerBuilder(new QName(Constants.SP_NS, "Layout"), builder);
-        
+
         builder = new SignedElementsBuilder();
         PolicyEngine.registerBuilder(new QName(Constants.SP_NS, "SignedElements"), builder);
-                
+
         builder = new SignedPartsBuilder();
         PolicyEngine.registerBuilder(new QName(Constants.SP_NS, "SignedParts"), builder);
-        
+
         builder = new SupportingTokensBuilder();
         PolicyEngine.registerBuilder(new QName(Constants.SP_NS, "SupportingTokens"), builder);
         PolicyEngine.registerBuilder(new QName(Constants.SP_NS, "SignedSupportingTokens"), builder);
-        PolicyEngine.registerBuilder(new QName(Constants.SP_NS, "EndorsingSupportingTokens"), builder);
-        PolicyEngine.registerBuilder(new QName(Constants.SP_NS, "SignedEndorsingSupportingTokens"), builder);
-        
-                
+        PolicyEngine
+                .registerBuilder(new QName(Constants.SP_NS, "EndorsingSupportingTokens"), builder);
+        PolicyEngine.registerBuilder(new QName(Constants.SP_NS, "SignedEndorsingSupportingTokens"),
+                                     builder);
+
+
         builder = new UsernameTokenBuilder();
         PolicyEngine.registerBuilder(new QName(Constants.SP_NS, "UsernameToken"), builder);
-        
+
         Policy p = PolicyEngine.getPolicy(element);
         System.out.println(p + "done");
-        
+
     }
 }

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=449953&r1=449952&r2=449953
==============================================================================
--- 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 Sep 26 02:04:05 2006
@@ -15,19 +15,16 @@
  */
 package org.apache.neethi;
 
-import java.io.InputStream;
-import java.util.Iterator;
-
-import javax.xml.namespace.QName;
-import javax.xml.stream.XMLInputFactory;
-
 import org.apache.axiom.om.OMAbstractFactory;
 import org.apache.axiom.om.OMElement;
 import org.apache.axiom.om.impl.llom.factory.OMXMLBuilderFactory;
 import org.apache.neethi.builders.AssertionBuilder;
 import org.apache.neethi.builders.xml.XmlPrimtiveAssertion;
 
-import sun.misc.Service;
+import javax.xml.namespace.QName;
+import javax.xml.stream.XMLInputFactory;
+import java.io.InputStream;
+import java.util.Iterator;
 
 /**
  * PolicyEngine provides set of methods to create a Policy object from an
@@ -50,21 +47,6 @@
 
     private static AssertionBuilderFactory factory = new AssertionBuilderFactory();
 
-    static {
-        AssertionBuilder builder;
-        QName[] knownElements;
-
-        for (Iterator iterator = Service.providers(AssertionBuilder.class); iterator
-                .hasNext();) {
-            builder = (AssertionBuilder) iterator.next();
-            knownElements = builder.getKnownElements();
-
-            for (int i = 0; i < knownElements.length; i++) {
-                PolicyEngine.registerBuilder(knownElements[i], builder);
-            }
-        }
-    }
-
     /**
      * Registers an AssertionBuilder instances and associates it with a QName.
      * PolicyManager or other AssertionBuilders instances can use this
@@ -95,14 +77,14 @@
         } catch (Exception ex) {
             ex.printStackTrace();
         }
-        
+
         // TODO throw an IllegalArgumentException
         return null;
     }
-    
-    
+
+
     public static PolicyReference getPolicyReferene(InputStream inputStream) {
-        
+
         try {
             OMElement element = OMXMLBuilderFactory.createStAXOMBuilder(
                     OMAbstractFactory.getOMFactory(),
@@ -113,15 +95,15 @@
         } catch (Exception ex) {
             ex.printStackTrace();
         }
-        
+
         // TODO throw an IllegalArgumentException
         return null;
-        
+
     }
 
     /**
      * Creates a Policy object from an OMElement.
-     * 
+     *
      * @param element
      * @return
      */
@@ -129,7 +111,7 @@
 
         return getPolicyOperator(element);
     }
-    
+
     public static PolicyReference getPolicyReference(OMElement element) {
 
         if (!(Constants.URI_POLICY_NS.equals(element.getNamespace()
@@ -141,7 +123,7 @@
         }
 
         PolicyReference reference = new PolicyReference();
-        
+
         // setting the URI value
         reference.setURI(element.getAttributeValue(new QName("URI")));
         return reference;
@@ -158,7 +140,7 @@
     private static All getAllOperator(OMElement element) {
         return (All) processOperationElement(element, new All());
     }
-    
+
     private static PolicyOperator processOperationElement(
             OMElement operationElement, PolicyOperator operator) {
 

Modified: webservices/commons/trunk/modules/neethi/src/test/test3/org/apache/neethi/PolicyTestCase.java
URL: http://svn.apache.org/viewvc/webservices/commons/trunk/modules/neethi/src/test/test3/org/apache/neethi/PolicyTestCase.java?view=diff&rev=449953&r1=449952&r2=449953
==============================================================================
--- webservices/commons/trunk/modules/neethi/src/test/test3/org/apache/neethi/PolicyTestCase.java (original)
+++ webservices/commons/trunk/modules/neethi/src/test/test3/org/apache/neethi/PolicyTestCase.java Tue Sep 26 02:04:05 2006
@@ -25,20 +25,22 @@
 
 
 public class PolicyTestCase extends org.apache.ws.policy.PolicyTestCase {
-	public PolicyTestCase(String name) {
-		super(name);
-	}	
-	
-	public OMElement getResourceAsElement(String name) {
-		try {
-			InputStream in = getResource(name);
-            OMElement element = OMXMLBuilderFactory.createStAXOMBuilder(OMAbstractFactory.getOMFactory(), XMLInputFactory.newInstance().createXMLStreamReader(in)).getDocumentElement();
+    public PolicyTestCase(String name) {
+        super(name);
+    }
+
+    public OMElement getResourceAsElement(String name) {
+        try {
+            InputStream in = getResource(name);
+            OMElement element = OMXMLBuilderFactory.createStAXOMBuilder(
+                    OMAbstractFactory.getOMFactory(),
+                    XMLInputFactory.newInstance().createXMLStreamReader(in)).getDocumentElement();
             return element;
-            
-		} catch (Exception e) {
-			fail("Cannot get resource: " + e.getMessage());
-			throw new RuntimeException();
-		}
-	}
+
+        } catch (Exception e) {
+            fail("Cannot get resource: " + e.getMessage());
+            throw new RuntimeException();
+        }
+    }
 }
 



---------------------------------------------------------------------
To unsubscribe, e-mail: commons-dev-unsubscribe@ws.apache.org
For additional commands, e-mail: commons-dev-help@ws.apache.org