1.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     1.2 +++ b/java/alt2xml-out-xpath/src/cz/frantovo/alt2xml/out/xpath/CompoundVariableResolver.java	Sun Sep 07 01:28:07 2014 +0200
     1.3 @@ -0,0 +1,45 @@
     1.4 +/**
     1.5 + * Alt2XML
     1.6 + * Copyright © 2014 František Kučera (frantovo.cz)
     1.7 + *
     1.8 + * This program is free software: you can redistribute it and/or modify
     1.9 + * it under the terms of the GNU General Public License as published by
    1.10 + * the Free Software Foundation, either version 3 of the License, or
    1.11 + * (at your option) any later version.
    1.12 + *
    1.13 + * This program is distributed in the hope that it will be useful,
    1.14 + * but WITHOUT ANY WARRANTY; without even the implied warranty of
    1.15 + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
    1.16 + * GNU General Public License for more details.
    1.17 + *
    1.18 + * You should have received a copy of the GNU General Public License
    1.19 + * along with this program. If not, see <http://www.gnu.org/licenses/>.
    1.20 + */
    1.21 +package cz.frantovo.alt2xml.out.xpath;
    1.22 +
    1.23 +import javax.xml.namespace.QName;
    1.24 +import javax.xml.xpath.XPathVariableResolver;
    1.25 +
    1.26 +/**
    1.27 + *
    1.28 + * @author Ing. František Kučera (frantovo.cz)
    1.29 + */
    1.30 +public class CompoundVariableResolver implements XPathVariableResolver {
    1.31 +
    1.32 +	private final XPathVariableResolver[] resolvers;
    1.33 +
    1.34 +	public CompoundVariableResolver(XPathVariableResolver... resolvers) {
    1.35 +		this.resolvers = resolvers;
    1.36 +	}
    1.37 +
    1.38 +	@Override
    1.39 +	public Object resolveVariable(QName variableName) {
    1.40 +		for (XPathVariableResolver r : resolvers) {
    1.41 +			Object value = r.resolveVariable(variableName);
    1.42 +			if (value != null) {
    1.43 +				return value;
    1.44 +			}
    1.45 +		}
    1.46 +		return null;
    1.47 +	}
    1.48 +}

     2.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     2.2 +++ b/java/alt2xml-out-xpath/src/cz/frantovo/alt2xml/out/xpath/EnvironmentVariableResolver.java	Sun Sep 07 01:28:07 2014 +0200
     2.3 @@ -0,0 +1,33 @@
     2.4 +/**
     2.5 + * Alt2XML
     2.6 + * Copyright © 2014 František Kučera (frantovo.cz)
     2.7 + *
     2.8 + * This program is free software: you can redistribute it and/or modify
     2.9 + * it under the terms of the GNU General Public License as published by
    2.10 + * the Free Software Foundation, either version 3 of the License, or
    2.11 + * (at your option) any later version.
    2.12 + *
    2.13 + * This program is distributed in the hope that it will be useful,
    2.14 + * but WITHOUT ANY WARRANTY; without even the implied warranty of
    2.15 + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
    2.16 + * GNU General Public License for more details.
    2.17 + *
    2.18 + * You should have received a copy of the GNU General Public License
    2.19 + * along with this program. If not, see <http://www.gnu.org/licenses/>.
    2.20 + */
    2.21 +package cz.frantovo.alt2xml.out.xpath;
    2.22 +
    2.23 +import javax.xml.namespace.QName;
    2.24 +import javax.xml.xpath.XPathVariableResolver;
    2.25 +
    2.26 +/**
    2.27 + *
    2.28 + * @author Ing. František Kučera (frantovo.cz)
    2.29 + */
    2.30 +public class EnvironmentVariableResolver implements XPathVariableResolver {
    2.31 +
    2.32 +	@Override
    2.33 +	public Object resolveVariable(QName variableName) {
    2.34 +		return System.getenv(variableName.getLocalPart());
    2.35 +	}
    2.36 +}

     3.1 --- a/java/alt2xml-out-xpath/src/cz/frantovo/alt2xml/out/xpath/XPathAction.java	Sun Sep 07 00:26:38 2014 +0200
     3.2 +++ b/java/alt2xml-out-xpath/src/cz/frantovo/alt2xml/out/xpath/XPathAction.java	Sun Sep 07 01:28:07 2014 +0200
     3.3 @@ -30,6 +30,7 @@
     3.4  import javax.xml.xpath.XPathExpression;
     3.5  import javax.xml.xpath.XPathExpressionException;
     3.6  import javax.xml.xpath.XPathFactory;
     3.7 +import javax.xml.xpath.XPathVariableResolver;
     3.8  
     3.9  /**
    3.10   *
    3.11 @@ -39,8 +40,10 @@
    3.12  
    3.13  	public static final String PARAMETER_TYPED_PARAMETERS = "typed-parameters";
    3.14  	public static final String PARAMETER_LINE_BREAK = "line-break";
    3.15 +	public static final String PARAMETER_ENVIRONMENT_VARIABLES = "environment-variables";
    3.16  	private final boolean typedParameters;
    3.17  	private final boolean lineBreak;
    3.18 +	private final boolean environmentVariables;
    3.19  	private final XPathFactory xpathFactory;
    3.20  	private final XPath xpath;
    3.21  	private final String expressionString;
    3.22 @@ -59,6 +62,7 @@
    3.23  
    3.24  			typedParameters = Boolean.parseBoolean(actionContext.getActionProperties().getProperty(PARAMETER_TYPED_PARAMETERS));
    3.25  			lineBreak = Boolean.parseBoolean(actionContext.getActionProperties().getProperty(PARAMETER_LINE_BREAK, Boolean.TRUE.toString()));
    3.26 +			environmentVariables = Boolean.parseBoolean(actionContext.getActionProperties().getProperty(PARAMETER_ENVIRONMENT_VARIABLES, Boolean.FALSE.toString()));
    3.27  
    3.28  			Map<String, Object> xpathParameters = new HashMap<>();
    3.29  
    3.30 @@ -69,7 +73,10 @@
    3.31  				xpathParameters.put(parameterName, parameterValue);
    3.32  			}
    3.33  
    3.34 -			xpath.setXPathVariableResolver(new PropertiesVariableResolver(xpathParameters));
    3.35 +			XPathVariableResolver cliVariableResolver = new PropertiesVariableResolver(xpathParameters);
    3.36 +			XPathVariableResolver variableResolver = environmentVariables ? new CompoundVariableResolver(cliVariableResolver, new EnvironmentVariableResolver()) : cliVariableResolver;
    3.37 +
    3.38 +			xpath.setXPathVariableResolver(variableResolver);
    3.39  
    3.40  			expressionString = actionData.get(0);
    3.41  			try {