diff -r 9ca02f0f6751 -r a72d55ff30c9 java/alt2xml-out-xpath/src/cz/frantovo/alt2xml/out/xpath/XPathAction.java --- a/java/alt2xml-out-xpath/src/cz/frantovo/alt2xml/out/xpath/XPathAction.java Sun Sep 07 00:26:38 2014 +0200 +++ b/java/alt2xml-out-xpath/src/cz/frantovo/alt2xml/out/xpath/XPathAction.java Sun Sep 07 01:28:07 2014 +0200 @@ -30,6 +30,7 @@ import javax.xml.xpath.XPathExpression; import javax.xml.xpath.XPathExpressionException; import javax.xml.xpath.XPathFactory; +import javax.xml.xpath.XPathVariableResolver; /** * @@ -39,8 +40,10 @@ public static final String PARAMETER_TYPED_PARAMETERS = "typed-parameters"; public static final String PARAMETER_LINE_BREAK = "line-break"; + public static final String PARAMETER_ENVIRONMENT_VARIABLES = "environment-variables"; private final boolean typedParameters; private final boolean lineBreak; + private final boolean environmentVariables; private final XPathFactory xpathFactory; private final XPath xpath; private final String expressionString; @@ -59,6 +62,7 @@ typedParameters = Boolean.parseBoolean(actionContext.getActionProperties().getProperty(PARAMETER_TYPED_PARAMETERS)); lineBreak = Boolean.parseBoolean(actionContext.getActionProperties().getProperty(PARAMETER_LINE_BREAK, Boolean.TRUE.toString())); + environmentVariables = Boolean.parseBoolean(actionContext.getActionProperties().getProperty(PARAMETER_ENVIRONMENT_VARIABLES, Boolean.FALSE.toString())); Map xpathParameters = new HashMap<>(); @@ -69,7 +73,10 @@ xpathParameters.put(parameterName, parameterValue); } - xpath.setXPathVariableResolver(new PropertiesVariableResolver(xpathParameters)); + XPathVariableResolver cliVariableResolver = new PropertiesVariableResolver(xpathParameters); + XPathVariableResolver variableResolver = environmentVariables ? new CompoundVariableResolver(cliVariableResolver, new EnvironmentVariableResolver()) : cliVariableResolver; + + xpath.setXPathVariableResolver(variableResolver); expressionString = actionData.get(0); try {