svn commit: r637154 - /incubator/tuscany/java/sca/modules/policy/src/main/java/org/apache/tuscany/sca/policy/util/PolicyComputationUtils.java

[svkrish]

Author: svkrish
Date: Fri Mar 14 09:40:08 2008
New Revision: 637154

URL: http://svn.apache.org/viewvc?rev=637154&view=rev
Log:
copying over Raymond's xpath related changes in r636985

Modified:
    
incubator/tuscany/java/sca/modules/policy/src/main/java/org/apache/tuscany/sca/policy/util/PolicyComputationUtils.java

Modified: 
incubator/tuscany/java/sca/modules/policy/src/main/java/org/apache/tuscany/sca/policy/util/PolicyComputationUtils.java
URL: 
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/policy/src/main/java/org/apache/tuscany/sca/policy/util/PolicyComputationUtils.java?rev=637154&r1=637153&r2=637154&view=diff
==============================================================================
--- 
incubator/tuscany/java/sca/modules/policy/src/main/java/org/apache/tuscany/sca/policy/util/PolicyComputationUtils.java
 (original)
+++ 
incubator/tuscany/java/sca/modules/policy/src/main/java/org/apache/tuscany/sca/policy/util/PolicyComputationUtils.java
 Fri Mar 14 09:40:08 2008
@@ -99,18 +99,16 @@
 
     private static byte[] addApplicablePolicySets(Document doc, 
Collection<PolicySet> policySets)
         throws XPathExpressionException, TransformerConfigurationException, 
TransformerException {
-        XPathFactory xpathFactory = XPathFactory.newInstance();
-        XPath path = xpathFactory.newXPath();
-        path.setNamespaceContext(new DOMNamespaceContext(doc));
+        
         int prefixCount = 1;
 
         for (PolicySet policySet : policySets) {
             if (policySet.getAppliesTo() != null) {
-                addApplicablePolicySets(policySet, path, doc, prefixCount);
+                addApplicablePolicySets(policySet, doc, prefixCount);
             }
 
             if (policySet.getAlwaysAppliesTo() != null) {
-                addAlwaysApplicablePolicySets(policySet, path, doc, 
prefixCount);
+                addAlwaysApplicablePolicySets(policySet, doc, prefixCount);
             }
         }
 
@@ -124,10 +122,9 @@
     }
 
     private static void addAlwaysApplicablePolicySets(PolicySet policySet,
-                                               XPath path,
-                                               Document doc,
-                                               int prefixCount) throws 
XPathExpressionException {
-        XPathExpression expression = 
path.compile(policySet.getAlwaysAppliesTo());
+                                                      Document doc,
+                                                      int prefixCount) throws 
XPathExpressionException {
+        XPathExpression expression = 
policySet.getAlwaysAppliesToXPathExpression();
         NodeList result = (NodeList)expression.evaluate(doc, 
XPathConstants.NODESET);
 
         if (result != null) {
@@ -165,10 +162,9 @@
     }
 
     private static void addApplicablePolicySets(PolicySet policySet,
-                                         XPath path,
                                          Document doc,
                                          int prefixCount) throws 
XPathExpressionException {
-        XPathExpression expression = path.compile(policySet.getAppliesTo());
+        XPathExpression expression = policySet.getAppliesToXPathExpression();
         NodeList result = (NodeList)expression.evaluate(doc, 
XPathConstants.NODESET);
 
         if (result != null) {



---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]