getGroups(String input, int options) throws RuntimeException;
+
+}
Index: src/lib/com/izforge/izpack/util/regex/RegexpMatcherFactory.java
===================================================================
--- src/lib/com/izforge/izpack/util/regex/RegexpMatcherFactory.java (revision 0)
+++ src/lib/com/izforge/izpack/util/regex/RegexpMatcherFactory.java (revision 0)
@@ -0,0 +1,105 @@
+/*
+ * IzPack - Copyright 2001-2010 Julien Ponge, All Rights Reserved.
+ *
+ * http://izpack.org/
+ * http://izpack.codehaus.org/
+ *
+ * Copyright 2010 Rene Krell
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.izforge.izpack.util.regex;
+
+/**
+ * Simple Factory Class that produces an implementation of
+ * RegexpMatcher based on the system property
+ * izpack.regexp.matcherimpl and the classes
+ * available.
+ *
+ * In a more general framework this class would be abstract and
+ * have a static newInstance method.
+ *
+ * @see Apache Ant
+ * @author René Krell - changes against the original implementation in Apache Ant 1.6.5
+ */
+public class RegexpMatcherFactory
+{
+ /***
+ * Create a new regular expression instance.
+ *
+ * @return the matcher
+ * @throws BuildException on error
+ */
+ public RegexpMatcher newRegexpMatcher() throws Exception
+ {
+ String systemDefault = System.getProperty("izpack.regexp.matcherimpl");
+ if (systemDefault != null) {
+ return createInstance(systemDefault);
+ }
+
+ try {
+ testAvailability("java.util.regex.Matcher");
+ return createInstance("com.izforge.izpack.util.regex.JavaRegexpMatcher");
+ } catch (Exception be) {
+ // ignore
+ }
+
+/* try {
+ testAvailability("org.apache.oro.text.regex.Pattern");
+ return createInstance("com.izforge.izpack.util.regex.JakartaOroMatcher");
+ } catch (Exception be) {
+ // ignore
+ }
+
+ try {
+ testAvailability("org.apache.regexp.RE");
+ return createInstance("com.izforge.izpack.util.regex.JakartaRegexpMatcher");
+ } catch (Exception be) {
+ // ignore
+ }
+*/
+ throw new Exception("No supported regular expression matcher found");
+ }
+
+ /**
+ * Create an instance of a matcher from a classname.
+ *
+ * @param className a String value
+ * @return a RegexpMatcher value
+ * @exception BuildException if an error occurs
+ */
+ protected RegexpMatcher createInstance(String className)
+ throws RuntimeException {
+ try {
+ Class implClass = Class.forName(className);
+ return (RegexpMatcher) implClass.newInstance();
+ } catch (Throwable t) {
+ throw new RuntimeException(t);
+ }
+ }
+
+ /**
+ * Test if a particular class is available to be used.
+ *
+ * @param className a String value
+ * @exception BuildException if an error occurs
+ */
+ protected void testAvailability(String className) throws Exception {
+ try {
+ Class.forName(className);
+ } catch (Throwable t) {
+ throw new Exception(t);
+ }
+ }
+}
Index: src/lib/com/izforge/izpack/util/regex/RegularExpression.java
===================================================================
--- src/lib/com/izforge/izpack/util/regex/RegularExpression.java (revision 0)
+++ src/lib/com/izforge/izpack/util/regex/RegularExpression.java (revision 0)
@@ -0,0 +1,116 @@
+/*
+ * IzPack - Copyright 2001-2010 Julien Ponge, All Rights Reserved.
+ *
+ * http://izpack.org/
+ * http://izpack.codehaus.org/
+ *
+ * Copyright 2010 Rene Krell
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.izforge.izpack.util.regex;
+
+/***
+ * A regular expression datatype. Keeps an instance of the
+ * compiled expression for speed purposes. This compiled
+ * expression is lazily evaluated (it is compiled the first
+ * time it is needed). The syntax is the dependent on which
+ * regular expression type you are using. The system property
+ * "izpack.regexp.regexpimpl" will be the classname of the implementation
+ * that will be used.
+ *
+ *
+ * For jdk <= 1.3, there are two available implementations:
+ * org.apache.tools.ant.util.regexp.JakartaOroRegexp (the default)
+ * Based on the jakarta-oro package
+ *
+ * org.apache.tools.ant.util.regexp.JakartaRegexpRegexp
+ * Based on the jakarta-regexp package
+ *
+ * For jdk >= 1.4 an additional implementation is available:
+ * org.apache.tools.ant.util.regexp.Jdk14RegexpRegexp
+ * Based on the jdk 1.4 built in regular expression package.
+ *
+ *
+ *
+ * <regexp [ [id="id"] pattern="expression" | refid="id" ]
+ * />
+ *
+ *
+ * @see org.apache.oro.text.regex.Perl5Compiler
+ * @see org.apache.regexp.RE
+ * @see java.util.regex.Pattern
+ *
+ * @see org.apache.tools.ant.util.regexp.Regexp
+ *
+ * @see Apache Ant
+ * @author René Krell - changes against the original implementation in Apache Ant 1.6.5
+ */
+public class RegularExpression {
+ private boolean alreadyInit = false;
+
+ // The regular expression factory
+ private static final RegexpFactory FACTORY = new RegexpFactory();
+
+ private Regexp regexp = null;
+ // temporary variable
+ private String myPattern;
+ private boolean setPatternPending = false;
+
+ private void init() {
+ if (!alreadyInit) {
+ this.regexp = FACTORY.newRegexp();
+ alreadyInit = true;
+ }
+ }
+ private void setPattern() {
+ if (setPatternPending) {
+ regexp.setPattern(myPattern);
+ setPatternPending = false;
+ }
+ }
+ /**
+ * sets the regular expression pattern
+ * @param pattern regular expression pattern
+ */
+ public void setPattern(String pattern) {
+ if (regexp == null) {
+ myPattern = pattern;
+ setPatternPending = true;
+ } else {
+ regexp.setPattern(pattern);
+ }
+ }
+
+ /***
+ * Gets the pattern string for this RegularExpression in the
+ * given project.
+ * @return pattern
+ */
+ public String getPattern() {
+ init();
+ setPattern();
+ return regexp.getPattern();
+ }
+
+ /**
+ * provides a reference to the Regexp contained in this
+ * @return Regexp instance associated with this RegularExpression instance
+ */
+ public Regexp getRegexp() {
+ init();
+ setPattern();
+ return this.regexp;
+ }
+}
Index: src/lib/com/izforge/izpack/util/variable/ConfigFileValue.java
===================================================================
--- src/lib/com/izforge/izpack/util/variable/ConfigFileValue.java (revision 0)
+++ src/lib/com/izforge/izpack/util/variable/ConfigFileValue.java (revision 0)
@@ -0,0 +1,181 @@
+/*
+ * IzPack - Copyright 2001-2010 Julien Ponge, All Rights Reserved.
+ *
+ * http://izpack.org/
+ * http://izpack.codehaus.org/
+ *
+ * Copyright 2010 Rene Krell
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.izforge.izpack.util.variable;
+
+import java.io.*;
+
+import javax.xml.parsers.*;
+import javax.xml.xpath.*;
+
+import org.ini4j.*;
+import org.w3c.dom.*;
+import org.xml.sax.SAXException;
+
+import com.izforge.izpack.util.VariableSubstitutorBase;
+
+public class ConfigFileValue extends Value implements Serializable
+{
+ /**
+ *
+ */
+ private static final long serialVersionUID = 6082215731362372562L;
+
+ public final static int CONFIGFILE_TYPE_PROPERTIES = 0;
+ public final static int CONFIGFILE_TYPE_INI = 1;
+ public final static int CONFIGFILE_TYPE_XML = 2;
+
+ public String location; // mandatory
+ public int type = CONFIGFILE_TYPE_PROPERTIES; // optional, default: property file
+ public String section; // mandatory for type = "ini"
+ public String key; // mandatory
+ public ConfigFileValue(String location, int type, String section, String key)
+ {
+ super();
+ this.location = location;
+ this.type = type;
+ this.section = section;
+ this.key = key;
+ }
+
+ public String getLocation()
+ {
+ return location;
+ }
+
+ public void setLocation(String location)
+ {
+ this.location = location;
+ }
+
+ public int getType()
+ {
+ return type;
+ }
+
+ public void setType(int type)
+ {
+ this.type = type;
+ }
+
+ public String getSection()
+ {
+ return section;
+ }
+
+ public void setSection(String section)
+ {
+ this.section = section;
+ }
+
+ public String getKey()
+ {
+ return key;
+ }
+
+ public void setKey(String key)
+ {
+ this.key = key;
+ }
+
+ @Override
+ public void validate() throws Exception
+ {
+ if (this.location == null || this.location.length() <= 0)
+ throw new Exception("No or empty file path");
+ if (this.type == CONFIGFILE_TYPE_INI && (this.section == null || this.section.length() <= 0))
+ throw new Exception("No INI file section defined");
+ if (this.type != CONFIGFILE_TYPE_INI && this.section != null)
+ throw new Exception("No INI file section expected for non-INI file types");
+ }
+
+ @Override
+ public String resolve() throws Exception
+ {
+ switch (type)
+ {
+ case CONFIGFILE_TYPE_PROPERTIES:
+ Options opts;
+ opts = new Options(new FileReader(location));
+ return opts.get(key);
+ case CONFIGFILE_TYPE_INI:
+ Ini ini;
+ ini = new Ini(new FileReader(location));
+ return ini.get(section, key);
+ case CONFIGFILE_TYPE_XML:
+ return parseXPath(
+ new FileInputStream(location), key,
+ System.getProperty("line.separator"));
+ default:
+ throw new Exception("Invalid configuration file type "+type);
+ }
+ }
+
+ @Override
+ public String resolve(VariableSubstitutorBase substitutor)
+ throws Exception
+ {
+ switch (type)
+ {
+ case CONFIGFILE_TYPE_PROPERTIES:
+ Options opts;
+ opts = new Options(new FileReader(substitutor.substitute(location, null)));
+ return opts.get(substitutor.substitute(key, null));
+ case CONFIGFILE_TYPE_INI:
+ Ini ini;
+ ini = new Ini(new FileReader(substitutor.substitute(location, null)));
+ return ini.get(substitutor.substitute(section, null), substitutor.substitute(key, null));
+ case CONFIGFILE_TYPE_XML:
+ return parseXPath(
+ new FileInputStream(substitutor.substitute(location, null)),
+ substitutor.substitute(key, null),
+ System.getProperty("line.separator"));
+ default:
+ throw new Exception("Invalid configuration file type "+type);
+ }
+ }
+
+ private static String parseXPath( InputStream in, String expression, String separator )
+ throws ParserConfigurationException, SAXException, IOException, XPathExpressionException
+ {
+ DocumentBuilderFactory domFactory = DocumentBuilderFactory.newInstance();
+ domFactory.setNamespaceAware(true);
+ DocumentBuilder builder;
+ builder = domFactory.newDocumentBuilder();
+ Document doc = builder.parse(in);
+ XPath xpath = XPathFactory.newInstance().newXPath();
+ // XPath Query for showing all nodes value
+ XPathExpression expr = xpath.compile(expression);
+ Object result = expr.evaluate(doc, XPathConstants.NODESET);
+ NodeList nodes = (NodeList) result;
+ StringBuffer sb = new StringBuffer();
+ for (int i = 0; i < nodes.getLength(); i++)
+ {
+ String value = nodes.item(i).getNodeValue();
+ if (value != null) {
+ if (sb.length()>0)
+ sb.append(separator);
+ sb.append(value);
+ }
+ }
+ return sb.toString();
+ }
+}
Index: src/lib/com/izforge/izpack/util/variable/EnvironmentValue.java
===================================================================
--- src/lib/com/izforge/izpack/util/variable/EnvironmentValue.java (revision 0)
+++ src/lib/com/izforge/izpack/util/variable/EnvironmentValue.java (revision 0)
@@ -0,0 +1,70 @@
+/*
+ * IzPack - Copyright 2001-2010 Julien Ponge, All Rights Reserved.
+ *
+ * http://izpack.org/
+ * http://izpack.codehaus.org/
+ *
+ * Copyright 2010 Rene Krell
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.izforge.izpack.util.variable;
+
+import java.io.Serializable;
+
+import com.izforge.izpack.util.*;
+
+public class EnvironmentValue extends Value implements Serializable
+{
+ /**
+ *
+ */
+ private static final long serialVersionUID = -658114236595736672L;
+
+ public String variable; // mandatory
+ public EnvironmentValue(String variable)
+ {
+ super();
+ this.variable = variable;
+ }
+ public String getVariable()
+ {
+ return this.variable;
+ }
+
+ public void setVariable(String variable)
+ {
+ this.variable = variable;
+ }
+
+ @Override
+ public void validate() throws Exception
+ {
+ if (this.variable == null || this.variable.length() <= 0)
+ throw new Exception("No or empty environment variable name");
+ }
+
+ @Override
+ public String resolve()
+ {
+ return IoHelper.getenv(variable);
+ }
+
+ @Override
+ public String resolve(VariableSubstitutorBase substitutor)
+ {
+ return IoHelper.getenv( substitutor.substitute(variable, null) );
+ }
+
+}
Index: src/lib/com/izforge/izpack/util/variable/ExecValue.java
===================================================================
--- src/lib/com/izforge/izpack/util/variable/ExecValue.java (revision 0)
+++ src/lib/com/izforge/izpack/util/variable/ExecValue.java (revision 0)
@@ -0,0 +1,97 @@
+/*
+ * IzPack - Copyright 2001-2010 Julien Ponge, All Rights Reserved.
+ *
+ * http://izpack.org/
+ * http://izpack.codehaus.org/
+ *
+ * Copyright 2010 Rene Krell
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.izforge.izpack.util.variable;
+
+import java.io.Serializable;
+
+import com.izforge.izpack.util.*;
+
+
+public class ExecValue extends Value implements Serializable
+{
+ /**
+ *
+ */
+ private static final long serialVersionUID = -6438593229737421526L;
+
+ private String cmd[];
+ public ExecValue(String[] command, boolean isShellCommand)
+ {
+ super();
+ if (isShellCommand) {
+ if (OsVersion.IS_WINDOWS)
+ {
+ this.cmd = new String[command.length+2];
+ this.cmd[0] = "cmd";
+ this.cmd[1] = "/C";
+ for (int i = 2; i < this.cmd.length; i++)
+ {
+ this.cmd[i] = command[i-2];
+ }
+ } else if (OsVersion.IS_UNIX)
+ {
+ this.cmd = new String[command.length+1];
+ this.cmd[0] = "sh";
+ for (int i = 1; i < this.cmd.length; i++)
+ {
+ this.cmd[i] = command[i-1];
+ }
+ } else
+ {
+ this.cmd = command;
+ }
+ } else
+ this.cmd = command;
+ }
+ public String[] getCmd()
+ {
+ return cmd;
+ }
+
+ public void setCmd(String[] cmd)
+ {
+ this.cmd = cmd;
+ }
+
+ @Override
+ public void validate() throws Exception
+ {
+ if (this.cmd == null || this.cmd.length <= 0)
+ throw new IllegalArgumentException("Bad command line");
+ }
+
+ @Override
+ public String resolve()
+ {
+ return FileExecutor.getExecOutput(cmd);
+ }
+
+ @Override
+ public String resolve(VariableSubstitutorBase substitutor)
+ {
+ for (int i = 0; i < cmd.length; i++)
+ {
+ cmd[i]=substitutor.substitute(cmd[i], null);
+ }
+ return FileExecutor.getExecOutput(cmd);
+ }
+}
Index: src/lib/com/izforge/izpack/util/variable/PlainValue.java
===================================================================
--- src/lib/com/izforge/izpack/util/variable/PlainValue.java (revision 0)
+++ src/lib/com/izforge/izpack/util/variable/PlainValue.java (revision 0)
@@ -0,0 +1,72 @@
+/*
+ * IzPack - Copyright 2001-2010 Julien Ponge, All Rights Reserved.
+ *
+ * http://izpack.org/
+ * http://izpack.codehaus.org/
+ *
+ * Copyright 2010 Rene Krell
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.izforge.izpack.util.variable;
+
+import java.io.Serializable;
+
+import com.izforge.izpack.util.VariableSubstitutorBase;
+
+
+public class PlainValue extends Value implements Serializable
+{
+ /**
+ *
+ */
+ private static final long serialVersionUID = -8081979859867523421L;
+
+ public String value; // mandatory
+
+ public PlainValue(String value)
+ {
+ super();
+ this.value = value;
+ }
+
+ public String getValue()
+ {
+ return this.value;
+ }
+
+ public void setValue(String value)
+ {
+ this.value = value;
+ }
+
+ @Override
+ public void validate() throws Exception
+ {
+ if (this.value == null || this.value.length() <= 0)
+ throw new Exception("None or empty plain value");
+ }
+
+ @Override
+ public String resolve()
+ {
+ return value;
+ }
+
+ @Override
+ public String resolve(VariableSubstitutorBase substitutor)
+ {
+ return substitutor.substitute(value, null);
+ }
+}
Index: src/lib/com/izforge/izpack/util/variable/RegistryValue.java
===================================================================
--- src/lib/com/izforge/izpack/util/variable/RegistryValue.java (revision 0)
+++ src/lib/com/izforge/izpack/util/variable/RegistryValue.java (revision 0)
@@ -0,0 +1,127 @@
+/*
+ * IzPack - Copyright 2001-2010 Julien Ponge, All Rights Reserved.
+ *
+ * http://izpack.org/
+ * http://izpack.codehaus.org/
+ *
+ * Copyright 2010 Rene Krell
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.izforge.izpack.util.variable;
+
+import java.io.*;
+
+import org.ini4j.Reg;
+
+import com.izforge.izpack.util.*;
+
+
+public class RegistryValue extends Value implements Serializable
+{
+ /**
+ *
+ */
+ private static final long serialVersionUID = 97879516787269847L;
+
+ public String root; // optional
+ public String key; // mandatory
+ public String value; // optional; if null -> use default value
+ public RegistryValue(String root, String key, String value)
+ {
+ super();
+ this.root = root;
+ this.key = key;
+ this.value = value;
+ }
+
+ public String getRoot()
+ {
+ return root;
+ }
+
+ public void setRoot(String root)
+ {
+ this.root = root;
+ }
+
+ public String getKey()
+ {
+ return key;
+ }
+
+ public void setKey(String key)
+ {
+ this.key = key;
+ }
+
+ public String getValue()
+ {
+ return this.value;
+ }
+
+ public void setValue(String value)
+ {
+ this.value = value;
+ }
+
+ @Override
+ public void validate() throws Exception
+ {
+ if ((this.root == null && this.key == null) ||
+ ((this.root != null && this.root.length() <= 0) &&
+ (this.key != null && this.key.length() <= 0)))
+ throw new Exception("No or empty registry key path");
+ }
+
+ @Override
+ public String resolve() throws Exception
+ {
+ if (!OsVersion.IS_WINDOWS)
+ throw new Exception("Registry access allowed only on Windows OS");
+
+ Reg reg = null;
+ Reg.Key regkey = null;
+ if (root != null) reg = new Reg(root);
+ if (key != null)
+ {
+ if (reg == null) reg = new Reg();
+ regkey = reg.get(key);
+ }
+ if (regkey != null)
+ return regkey.get(value);
+
+ return null;
+ }
+
+ @Override
+ public String resolve(VariableSubstitutorBase substitutor) throws Exception
+ {
+ if (!OsVersion.IS_WINDOWS)
+ throw new Exception("Registry access allowed only on Windows OS");
+
+ Reg reg = null;
+ Reg.Key regkey = null;
+ if (root != null) reg = new Reg(root);
+ if (key != null)
+ {
+ if (reg == null) reg = new Reg();
+ regkey = reg.get(substitutor.substitute(key, null));
+ }
+ if (regkey != null)
+ return regkey.get(substitutor.substitute(value, null));
+
+ return null;
+ }
+}
Index: src/lib/com/izforge/izpack/util/variable/RegularExpressionFilter.java
===================================================================
--- src/lib/com/izforge/izpack/util/variable/RegularExpressionFilter.java (revision 0)
+++ src/lib/com/izforge/izpack/util/variable/RegularExpressionFilter.java (revision 0)
@@ -0,0 +1,128 @@
+/*
+ * IzPack - Copyright 2001-2010 Julien Ponge, All Rights Reserved.
+ *
+ * http://izpack.org/
+ * http://izpack.codehaus.org/
+ *
+ * Copyright 2010 Rene Krell
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.izforge.izpack.util.variable;
+
+import java.io.Serializable;
+
+public class RegularExpressionFilter implements Serializable
+{
+ /**
+ *
+ */
+ private static final long serialVersionUID = -1405213251817336962L;
+
+ public String regexp;
+ public String select, replace;
+ public String defaultValue;
+ public Boolean casesensitive;
+ public Boolean global;
+ public RegularExpressionFilter(String regexp, String select, String replace, String defaultValue,
+ Boolean casesensitive, Boolean global)
+ {
+ super();
+ this.regexp = regexp;
+ this.select = select;
+ this.replace = replace;
+ this.defaultValue = defaultValue;
+ this.casesensitive = casesensitive;
+ this.global = global;
+ }
+ public RegularExpressionFilter(String regexp, String select, String defaultValue,
+ Boolean casesensitive)
+ {
+ this(regexp, select, null, defaultValue, casesensitive, null);
+ }
+ public RegularExpressionFilter(String regexp, String replace, String defaultValue,
+ Boolean casesensitive, Boolean global)
+ {
+ this(regexp, null, replace, defaultValue, casesensitive, global);
+ }
+ public void validate() throws Exception
+ {
+ if (this.regexp == null || this.regexp.length() <= 0)
+ throw new Exception("No or empty regular expression defined");
+ if (this.select == null && this.replace == null)
+ throw new Exception("Exactly one of both select or replace expression required");
+ if (this.select != null && this.replace != null)
+ throw new Exception("Expected only one of both select or replace expression");
+ }
+
+ public String getRegexp()
+ {
+ return regexp;
+ }
+
+ public void setRegexp(String regexp)
+ {
+ this.regexp = regexp;
+ }
+
+ public String getSelect()
+ {
+ return select;
+ }
+
+ public void setSelect(String select)
+ {
+ this.select = select;
+ }
+
+ public String getReplace()
+ {
+ return replace;
+ }
+
+ public void setReplace(String replace)
+ {
+ this.replace = replace;
+ }
+
+ public String getDefaultValue()
+ {
+ return defaultValue;
+ }
+
+ public void setDefaultValue(String defaultValue)
+ {
+ this.defaultValue = defaultValue;
+ }
+
+ public Boolean getCasesensitive()
+ {
+ return casesensitive;
+ }
+
+ public void setCasesensitive(Boolean casesensitive)
+ {
+ this.casesensitive = casesensitive;
+ }
+
+ public Boolean getGlobal()
+ {
+ return global;
+ }
+
+ public void setGlobal(Boolean global)
+ {
+ this.global = global;
+ }
+}
Index: src/lib/com/izforge/izpack/util/variable/Value.java
===================================================================
--- src/lib/com/izforge/izpack/util/variable/Value.java (revision 0)
+++ src/lib/com/izforge/izpack/util/variable/Value.java (revision 0)
@@ -0,0 +1,57 @@
+/*
+ * IzPack - Copyright 2001-2010 Julien Ponge, All Rights Reserved.
+ *
+ * http://izpack.org/
+ * http://izpack.codehaus.org/
+ *
+ * Copyright 2010 Rene Krell
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.izforge.izpack.util.variable;
+
+import com.izforge.izpack.util.*;
+
+public abstract class Value
+{
+ public abstract void validate() throws Exception;
+ public abstract String resolve() throws Exception;
+ public abstract String resolve(VariableSubstitutorBase substitutor) throws Exception;
+
+ public String resolve(VariableSubstitutorBase substitutor, RegularExpressionFilter regexp)
+ throws Exception
+ {
+ String newValue = resolve(substitutor);
+
+ if (regexp != null) {
+ String replace = substitutor.substitute(regexp.getReplace(), null);
+ String select = substitutor.substitute(regexp.getSelect(), null);
+ RegularExpressionProcessor processor = new RegularExpressionProcessor();
+ processor.setInput(substitutor.substitute(newValue, null));
+ processor.setRegexp(substitutor.substitute(regexp.getRegexp(), null));
+ processor.setCaseSensitive(regexp.getCasesensitive());
+ if (select != null) {
+ processor.setSelect(select);
+ } else
+ if (replace != null) {
+ processor.setReplace(replace);
+ processor.setGlobal(regexp.getGlobal());
+ }
+ newValue = processor.execute();
+ }
+
+ return newValue;
+ }
+
+}
Index: src/tests/com/izforge/izpack/adaptator/XMLParserTest.java
===================================================================
--- src/tests/com/izforge/izpack/adaptator/XMLParserTest.java (revision 2938)
+++ src/tests/com/izforge/izpack/adaptator/XMLParserTest.java (working copy)
@@ -80,7 +80,7 @@
assertEquals("shortcuts", spec.getName());
}
- public void testParseString() throws NoSuchMethodException, ResourceNotFoundException, IOException
+ public void testParseString() throws Exception
{
InputStream input = null;
IXMLElement spec;