Spring/spring-ws
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

SWS-264

Browse Source
This commit is contained in:
Arjen Poutsma
2008-01-21 11:11:00 +00:00
parent 96e1657975
commit a1d72b6495
2 changed files with 31 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
xml/src/main/java/org/springframework/xml/JaxpVersion.java
View File

@@ -81,6 +81,17 @@ public abstract class JaxpVersion {
return jaxpVersion;
}
/**
* Convenience method to determine if the current JAXP version is at least 1.3 (packaged with JDK 1.5).
*
* @return <code>true</code> if the current JAXP version is at least JAXP 1.3
* @see #getJaxpVersion()
* @see #JAXP_13
*/
public static boolean isAtLeastJaxp13() {
return getJaxpVersion() >= JAXP_13;
}
/**
* Convenience method to determine if the current JAXP version is at least 1.4 (packaged with JDK 1.6).
*

28
xml/src/main/java/org/springframework/xml/xpath/XPathExpressionFactory.java
View File

@@ -21,6 +21,7 @@ import java.util.Map;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.springframework.util.Assert;
import org.springframework.util.ClassUtils;
import org.springframework.xml.JaxpVersion;
@@ -42,9 +43,14 @@ public abstract class XPathExpressionFactory {
private static final String JAXEN_CLASS_NAME = "org.jaxen.XPath";
private static boolean jaxp13Available;
private static boolean jaxenAvailable;
static {
// Check whether JAXP 1.3 is available
jaxp13Available = JaxpVersion.isAtLeastJaxp13();
// Check whether Jaxen is available
try {
ClassUtils.forName(JAXEN_CLASS_NAME);
@@ -81,18 +87,24 @@ public abstract class XPathExpressionFactory {
public static XPathExpression createXPathExpression(String expression, Map namespaces)
throws IllegalStateException, XPathParseException {
Assert.hasLength(expression, "expression is empty");
if (JaxpVersion.getJaxpVersion() >= JaxpVersion.JAXP_13) {
logger.trace("Creating [javax.xml.xpath.XPathExpression]");
return Jaxp13XPathExpressionFactory.createXPathExpression(expression, namespaces);
if (jaxp13Available) {
try {
logger.trace("Creating [javax.xml.xpath.XPathExpression]");
return Jaxp13XPathExpressionFactory.createXPathExpression(expression, namespaces);
}
catch (XPathException e) {
throw e;
}
catch (Throwable e) {
jaxp13Available = false;
}
}
else if (jaxenAvailable) {
if (jaxenAvailable) {
logger.trace("Creating [org.jaxen.XPath]");
return JaxenXPathExpressionFactory.createXPathExpression(expression, namespaces);
}
else {
throw new IllegalStateException(
"Could not create XPathExpression: could not locate JAXP 1.3, or Jaxen on the class path");
}
throw new IllegalStateException(
"Could not create XPathExpression: could not locate JAXP 1.3, or Jaxen on the class path");
}