svn commit: r811357 - in /ode/branches/APACHE_ODE_1.X: bpel-compiler/src/main/java/org/apache/ode/bpel/elang/xpath20/compiler/ bpel-runtime/src/main/java/org/apache/ode/bpel/elang/xpath20/runtime/

[rr]

Author: rr
Date: Fri Sep  4 11:58:56 2009
New Revision: 811357

URL: http://svn.apache.org/viewvc?rev=811357&view=rev
Log:
SMX4 support - fixed selection failures caused by System.setProperty for 
XPathFactory setup

Modified:
    
ode/branches/APACHE_ODE_1.X/bpel-compiler/src/main/java/org/apache/ode/bpel/elang/xpath20/compiler/XPath20ExpressionCompilerImpl.java
    
ode/branches/APACHE_ODE_1.X/bpel-runtime/src/main/java/org/apache/ode/bpel/elang/xpath20/runtime/XPath20ExpressionRuntime.java

Modified: 
ode/branches/APACHE_ODE_1.X/bpel-compiler/src/main/java/org/apache/ode/bpel/elang/xpath20/compiler/XPath20ExpressionCompilerImpl.java
URL: 
http://svn.apache.org/viewvc/ode/branches/APACHE_ODE_1.X/bpel-compiler/src/main/java/org/apache/ode/bpel/elang/xpath20/compiler/XPath20ExpressionCompilerImpl.java?rev=811357&r1=811356&r2=811357&view=diff
==============================================================================
--- 
ode/branches/APACHE_ODE_1.X/bpel-compiler/src/main/java/org/apache/ode/bpel/elang/xpath20/compiler/XPath20ExpressionCompilerImpl.java
 (original)
+++ 
ode/branches/APACHE_ODE_1.X/bpel-compiler/src/main/java/org/apache/ode/bpel/elang/xpath20/compiler/XPath20ExpressionCompilerImpl.java
 Fri Sep  4 11:58:56 2009
@@ -140,10 +140,7 @@
         out.xpath = xpathStr;
         try {          
             __log.debug("Compiling expression " + xpathStr);            
-            System.setProperty(
-                       "javax.xml.xpath.XPathFactory:" + 
NamespaceConstant.OBJECT_MODEL_SAXON,
-                       "net.sf.saxon.xpath.XPathFactoryImpl");
-            XPathFactory xpf = 
XPathFactory.newInstance(NamespaceConstant.OBJECT_MODEL_SAXON);
+            XPathFactory xpf = new XPathFactoryImpl();
             JaxpFunctionResolver funcResolver = new JaxpFunctionResolver(
                     _compilerContext, out, source.getNamespaceContext(), 
_bpelNS);
             JaxpVariableResolver varResolver = new 
JaxpVariableResolver(_compilerContext, out);
@@ -166,9 +163,6 @@
                        // swallow errors caused by uninitialized variable 
                }
             }
-        } catch (XPathFactoryConfigurationException xpfce) {
-            __log.debug(xpfce);
-            __log.info("Couldn't validate properly expression " + xpathStr);
         } catch (XPathExpressionException e) {
             __log.debug(e);
             __log.info("Couldn't validate properly expression " + xpathStr);

Modified: 
ode/branches/APACHE_ODE_1.X/bpel-runtime/src/main/java/org/apache/ode/bpel/elang/xpath20/runtime/XPath20ExpressionRuntime.java
URL: 
http://svn.apache.org/viewvc/ode/branches/APACHE_ODE_1.X/bpel-runtime/src/main/java/org/apache/ode/bpel/elang/xpath20/runtime/XPath20ExpressionRuntime.java?rev=811357&r1=811356&r2=811357&view=diff
==============================================================================
--- 
ode/branches/APACHE_ODE_1.X/bpel-runtime/src/main/java/org/apache/ode/bpel/elang/xpath20/runtime/XPath20ExpressionRuntime.java
 (original)
+++ 
ode/branches/APACHE_ODE_1.X/bpel-runtime/src/main/java/org/apache/ode/bpel/elang/xpath20/runtime/XPath20ExpressionRuntime.java
 Fri Sep  4 11:58:56 2009
@@ -213,18 +213,8 @@
     private Object evaluate(OExpression cexp, EvaluationContext ctx, QName 
type) throws FaultException, EvaluationException {
         try {
             OXPath20ExpressionBPEL20 oxpath20 = ((OXPath20ExpressionBPEL20) 
cexp);
-            
System.setProperty("javax.xml.xpath.XPathFactory:"+NamespaceConstant.OBJECT_MODEL_SAXON,
-                           "net.sf.saxon.xpath.XPathFactoryImpl");
-                   
System.setProperty("javax.xml.xpath.XPathFactory:"+XPathConstants.DOM_OBJECT_MODEL,
-                           "net.sf.saxon.xpath.XPathFactoryImpl");
-                   
System.setProperty("javax.xml.xpath.XPathFactory:"+NamespaceConstant.OBJECT_MODEL_JDOM,
-                           "net.sf.saxon.xpath.XPathFactoryImpl");
-                   
System.setProperty("javax.xml.xpath.XPathFactory:"+NamespaceConstant.OBJECT_MODEL_XOM,
-                           "net.sf.saxon.xpath.XPathFactoryImpl");
-                   
System.setProperty("javax.xml.xpath.XPathFactory:"+NamespaceConstant.OBJECT_MODEL_DOM4J,
-                           "net.sf.saxon.xpath.XPathFactoryImpl");
-    
-            XPathFactory xpf = 
XPathFactory.newInstance(NamespaceConstant.OBJECT_MODEL_SAXON);
+            XPathFactory xpf = new XPathFactoryImpl();
+
             JaxpFunctionResolver funcResolver = new JaxpFunctionResolver(
                     ctx, oxpath20);
             JaxpVariableResolver varResolver = new JaxpVariableResolver(ctx, 
oxpath20, ((XPathFactoryImpl) xpf).getConfiguration());