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

SWS-544 - Add test framework for Spring WS client

Browse Source
This commit is contained in:
Arjen Poutsma
2010-07-16 14:05:32 +00:00
parent 61af77d06e
commit 78d41170f3
4 changed files with 14 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -41,25 +41,11 @@ public abstract class XPathExpressionFactory {
private static final Log logger = LogFactory.getLog(XPathExpressionFactory.class);
private static final String JAXEN_CLASS_NAME = "org.jaxen.XPath";
private static boolean jaxp13Available = JaxpVersion.isAtLeastJaxp13();
private static boolean jaxp13Available;
private static boolean jaxenAvailable =
ClassUtils.isPresent("org.jaxen.XPath", XPathExpressionFactory.class.getClassLoader());
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);
jaxenAvailable = true;
}
catch (ClassNotFoundException ex) {
jaxenAvailable = false;
}
}
/**
* Create a compiled XPath expression using the given string.
@@ -87,6 +73,9 @@ public abstract class XPathExpressionFactory {
public static XPathExpression createXPathExpression(String expression, Map<String, String> namespaces)
throws IllegalStateException, XPathParseException {
Assert.hasLength(expression, "expression is empty");
if (namespaces == null) {
namespaces = Collections.emptyMap();
}
if (jaxp13Available) {
try {
logger.trace("Creating [javax.xml.xpath.XPathExpression]");