IZPACK-1421: Provide variable value overrides from property file

- Functional implementation
iamfariba · Jul 23, 2016 · b4d6467 · b4d6467
1 parent 3fd54b0
commit b4d6467
Show file tree

Hide file tree

Showing 115 changed files with 1,212 additions and 1,027 deletions.
diff --git a/...zpack/util/config/base/BasicMultiMap.java → ...orge/izpack/api/config/BasicMultiMap.java b/...zpack/util/config/base/BasicMultiMap.java → ...orge/izpack/api/config/BasicMultiMap.java
@@ -19,18 +19,12 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.izforge.izpack.util.config.base;
+package com.izforge.izpack.api.config;
+
+import com.izforge.izpack.api.config.spi.Warnings;
 
 import java.io.Serializable;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.HashSet;
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-
-import com.izforge.izpack.util.config.base.spi.Warnings;
+import java.util.*;
 
 public class BasicMultiMap<K, V> implements MultiMap<K, V>, Serializable
 {

diff --git a/...pack/util/config/base/BasicOptionMap.java → ...rge/izpack/api/config/BasicOptionMap.java b/...pack/util/config/base/BasicOptionMap.java → ...rge/izpack/api/config/BasicOptionMap.java
@@ -19,15 +19,15 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.izforge.izpack.util.config.base;
+package com.izforge.izpack.api.config;
 
 import java.lang.reflect.Array;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
-import com.izforge.izpack.util.config.base.spi.BeanAccess;
-import com.izforge.izpack.util.config.base.spi.BeanTool;
-import com.izforge.izpack.util.config.base.spi.Warnings;
+import com.izforge.izpack.api.config.spi.BeanAccess;
+import com.izforge.izpack.api.config.spi.BeanTool;
+import com.izforge.izpack.api.config.spi.Warnings;
 
 public class BasicOptionMap extends CommonMultiMap<String, String> implements OptionMap
 {

diff --git a/...izpack/util/config/base/BasicProfile.java → ...forge/izpack/api/config/BasicProfile.java b/...izpack/util/config/base/BasicProfile.java → ...forge/izpack/api/config/BasicProfile.java
@@ -19,17 +19,17 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.izforge.izpack.util.config.base;
+package com.izforge.izpack.api.config;
 
 import java.lang.reflect.Array;
 import java.lang.reflect.Proxy;
 import java.util.List;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
-import com.izforge.izpack.util.config.base.spi.AbstractBeanInvocationHandler;
-import com.izforge.izpack.util.config.base.spi.BeanTool;
-import com.izforge.izpack.util.config.base.spi.IniHandler;
+import com.izforge.izpack.api.config.spi.AbstractBeanInvocationHandler;
+import com.izforge.izpack.api.config.spi.BeanTool;
+import com.izforge.izpack.api.config.spi.IniHandler;
 
 public class BasicProfile extends CommonMultiMap<String, Profile.Section> implements Profile
 {

diff --git a/...util/config/base/BasicProfileSection.java → ...zpack/api/config/BasicProfileSection.java b/...util/config/base/BasicProfileSection.java → ...zpack/api/config/BasicProfileSection.java
@@ -19,7 +19,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.izforge.izpack.util.config.base;
+package com.izforge.izpack.api.config;
 
 import java.util.ArrayList;
 import java.util.List;

diff --git a/...zpack/util/config/base/BasicRegistry.java → ...orge/izpack/api/config/BasicRegistry.java b/...zpack/util/config/base/BasicRegistry.java → ...orge/izpack/api/config/BasicRegistry.java
@@ -19,11 +19,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.izforge.izpack.util.config.base;
+package com.izforge.izpack.api.config;
 
-import com.izforge.izpack.util.config.base.spi.IniHandler;
-import com.izforge.izpack.util.config.base.spi.RegEscapeTool;
-import com.izforge.izpack.util.config.base.spi.TypeValuesPair;
+import com.izforge.izpack.api.config.spi.IniHandler;
+import com.izforge.izpack.api.config.spi.RegEscapeTool;
+import com.izforge.izpack.api.config.spi.TypeValuesPair;
 
 public class BasicRegistry extends BasicProfile implements Registry
 {

diff --git a/...ck/util/config/base/BasicRegistryKey.java → ...e/izpack/api/config/BasicRegistryKey.java b/...ck/util/config/base/BasicRegistryKey.java → ...e/izpack/api/config/BasicRegistryKey.java
@@ -19,9 +19,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.izforge.izpack.util.config.base;
+package com.izforge.izpack.api.config;
 
-import com.izforge.izpack.util.config.base.Registry.Key;
+import com.izforge.izpack.api.config.Registry.Key;
 
 class BasicRegistryKey extends BasicProfileSection implements Registry.Key
 {

diff --git a/...izpack/util/config/base/CommentedMap.java → ...forge/izpack/api/config/CommentedMap.java b/...izpack/util/config/base/CommentedMap.java → ...forge/izpack/api/config/CommentedMap.java
@@ -19,7 +19,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.izforge.izpack.util.config.base;
+package com.izforge.izpack.api.config;
 
 import java.util.List;
 import java.util.Map;

diff --git a/...pack/util/config/base/CommonMultiMap.java → ...rge/izpack/api/config/CommonMultiMap.java b/...pack/util/config/base/CommonMultiMap.java → ...rge/izpack/api/config/CommonMultiMap.java
@@ -19,7 +19,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.izforge.izpack.util.config.base;
+package com.izforge.izpack.api.config;
 
 import java.util.List;
 import java.util.Map;

diff --git a/...forge/izpack/util/config/base/Config.java → ...com/izforge/izpack/api/config/Config.java b/...forge/izpack/util/config/base/Config.java → ...com/izforge/izpack/api/config/Config.java
@@ -19,7 +19,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.izforge.izpack.util.config.base;
+package com.izforge.izpack.api.config;
+
+import com.izforge.izpack.api.data.InstallData;
 
 import java.io.Serializable;
 import java.nio.charset.Charset;
@@ -98,10 +100,9 @@ public class Config implements Cloneable, Serializable
     private boolean _emptyLines;
     private boolean _autoNumbering;
 
-    public Config()
-    {
-        reset();
-    }
+    private InstallData installData;
+
+    public Config() { reset(); }
 
     public static String getEnvironment(String name)
     {
@@ -165,10 +166,7 @@ public boolean isEscapeNewline()
         return _escapeNewline;
     }
 
-    public boolean isInclude()
-    {
-        return _include;
-    }
+    public boolean isInclude() { return _include; }
 
     public boolean isTree()
     {
@@ -200,10 +198,7 @@ public Charset getFileEncoding()
         return _fileEncoding;
     }
 
-    public void setFileEncoding(Charset value)
-    {
-        _fileEncoding = value;
-    }
+    public void setFileEncoding(Charset value) { _fileEncoding = value; }
 
     public void setGlobalSection(boolean value)
     {
@@ -380,6 +375,17 @@ public void setUnnamedSection(boolean value)
         _unnamedSection = value;
     }
 
+    public InstallData getInstallData()
+    {
+        return installData;
+    }
+
+    public void setInstallData(InstallData installData)
+    {
+        this.installData = installData;
+    }
+
+
     @Override public Config clone()
     {
         try

diff --git a/...izpack/util/config/base/ConfigParser.java → ...forge/izpack/api/config/ConfigParser.java b/...izpack/util/config/base/ConfigParser.java → ...forge/izpack/api/config/ConfigParser.java
@@ -19,7 +19,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.izforge.izpack.util.config.base;
+package com.izforge.izpack.api.config;
 
 import java.io.*;
 import java.net.URL;
@@ -31,8 +31,8 @@
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
-import com.izforge.izpack.util.config.base.spi.IniHandler;
-import com.izforge.izpack.util.config.base.spi.Warnings;
+import com.izforge.izpack.api.config.spi.IniHandler;
+import com.izforge.izpack.api.config.spi.Warnings;
 
 public class ConfigParser implements Serializable
 {

diff --git a/...izpack/util/config/base/Configurable.java → ...forge/izpack/api/config/Configurable.java b/...izpack/util/config/base/Configurable.java → ...forge/izpack/api/config/Configurable.java
@@ -19,7 +19,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.izforge.izpack.util.config.base;
+package com.izforge.izpack.api.config;
 
 public interface Configurable
 {

diff --git a/.../izforge/izpack/util/config/base/Ini.java → ...va/com/izforge/izpack/api/config/Ini.java b/.../izforge/izpack/util/config/base/Ini.java → ...va/com/izforge/izpack/api/config/Ini.java
@@ -19,15 +19,15 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.izforge.izpack.util.config.base;
+package com.izforge.izpack.api.config;
 
 import java.io.*;
 import java.net.URL;
 
-import com.izforge.izpack.util.config.base.spi.IniBuilder;
-import com.izforge.izpack.util.config.base.spi.IniFormatter;
-import com.izforge.izpack.util.config.base.spi.IniHandler;
-import com.izforge.izpack.util.config.base.spi.IniParser;
+import com.izforge.izpack.api.config.spi.IniBuilder;
+import com.izforge.izpack.api.config.spi.IniFormatter;
+import com.izforge.izpack.api.config.spi.IniHandler;
+import com.izforge.izpack.api.config.spi.IniParser;
 
 public class Ini extends BasicProfile implements Persistable, Configurable
 {

diff --git a/...pack/util/config/base/IniPreferences.java → ...rge/izpack/api/config/IniPreferences.java b/...pack/util/config/base/IniPreferences.java → ...rge/izpack/api/config/IniPreferences.java
@@ -19,7 +19,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.izforge.izpack.util.config.base;
+package com.izforge.izpack.api.config;
 
 import java.io.IOException;
 import java.io.InputStream;
@@ -99,7 +99,7 @@ public IniPreferences(URL input) throws IOException, InvalidFileFormatException
     }
 
     /**
-     * Provide access to underlaying {@link org.ini4j.Ini} implementation.
+     * Provide access to underlaying {@link Ini} implementation.
      *
      * @return <code>Ini</code> implementation
      */

diff --git a/...il/config/base/IniPreferencesFactory.java → ...ack/api/config/IniPreferencesFactory.java b/...il/config/base/IniPreferencesFactory.java → ...ack/api/config/IniPreferencesFactory.java
@@ -19,7 +19,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.izforge.izpack.util.config.base;
+package com.izforge.izpack.api.config;
+
+import com.izforge.izpack.api.config.Ini;
+import com.izforge.izpack.api.config.IniPreferences;
 
 import java.io.InputStream;
 import java.net.URI;

diff --git a/...nfig/base/InvalidFileFormatException.java → ...pi/config/InvalidFileFormatException.java b/...nfig/base/InvalidFileFormatException.java → ...pi/config/InvalidFileFormatException.java
@@ -19,7 +19,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.izforge.izpack.util.config.base;
+package com.izforge.izpack.api.config;
 
 import java.io.IOException;
 

diff --git a/...rge/izpack/util/config/base/MultiMap.java → ...m/izforge/izpack/api/config/MultiMap.java b/...rge/izpack/util/config/base/MultiMap.java → ...m/izforge/izpack/api/config/MultiMap.java
@@ -19,7 +19,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.izforge.izpack.util.config.base;
+package com.izforge.izpack.api.config;
 
 import java.util.List;
 import java.util.Map;