Installer also works

Project: http://git-wip-us.apache.org/repos/asf/syncope/repo
Commit: http://git-wip-us.apache.org/repos/asf/syncope/commit/e2c7754a
Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/e2c7754a
Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/e2c7754a

Branch: refs/heads/SYNCOPE-156
Commit: e2c7754a531a1e46bcc86c02b840d8667ced30e1
Parents: 7a81609
Author: Francesco Chicchiriccò <[email protected]>
Authored: Fri Sep 4 13:00:44 2015 +0200
Committer: Francesco Chicchiriccò <[email protected]>
Committed: Fri Sep 4 13:00:44 2015 +0200

----------------------------------------------------------------------
 installer/pom.xml                               |   4 +-
 .../installer/files/MasterDomainXml.java        |  35 ++++++
 .../installer/files/MasterProperties.java       |  97 +++++++++++++++
 .../files/PersistenceContextEMFactoryXml.java   |  34 ------
 .../installer/files/PersistenceProperties.java  | 110 -----------------
 .../installer/files/ProvisioningProperties.java |  69 +++++++++++
 .../installer/processes/ArchetypeProcess.java   |  64 +++++-----
 .../installer/processes/BaseProcess.java        |   8 +-
 .../installer/processes/ContainerProcess.java   | 119 ++++++++-----------
 .../installer/processes/PersistenceProcess.java |  59 +++++----
 .../installer/utilities/FileSystemUtils.java    |   1 +
 .../syncope/installer/utilities/MavenUtils.java |   8 +-
 .../src/main/resources/installer.properties     |   6 +-
 .../main/resources/izpack/ProcessPanel.Spec.xml |   2 -
 installer/src/main/resources/modelerPom.xml     |   2 +-
 15 files changed, 324 insertions(+), 294 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/syncope/blob/e2c7754a/installer/pom.xml
----------------------------------------------------------------------
diff --git a/installer/pom.xml b/installer/pom.xml
index 0012bc5..4aed304 100644
--- a/installer/pom.xml
+++ b/installer/pom.xml
@@ -183,9 +183,9 @@ under the License.
         <filtering>true</filtering>
       </resource>
       <resource>
-        
<directory>${basedir}/../fit/core-reference/src/main/resources/jboss</directory>
+        
<directory>${basedir}/../fit/core-reference/src/main/resources/jboss/domains</directory>
         <includes>
-          <include>**/persistenceContextEMFactory.xml</include>
+          <include>**/MasterDomain.xml</include>
         </includes>
       </resource>
       <resource>

http://git-wip-us.apache.org/repos/asf/syncope/blob/e2c7754a/installer/src/main/java/org/apache/syncope/installer/files/MasterDomainXml.java
----------------------------------------------------------------------
diff --git 
a/installer/src/main/java/org/apache/syncope/installer/files/MasterDomainXml.java
 
b/installer/src/main/java/org/apache/syncope/installer/files/MasterDomainXml.java
new file mode 100644
index 0000000..beaac41
--- /dev/null
+++ 
b/installer/src/main/java/org/apache/syncope/installer/files/MasterDomainXml.java
@@ -0,0 +1,35 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you 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 org.apache.syncope.installer.files;
+
+public final class MasterDomainXml {
+
+    public static final String PLACEHOLDER = ""
+            + "<entry key=\"openjpa.MetaDataFactory\" \n               "
+            + 
"value=\"jpa(URLs=vfs:${project.build.directory}/cargo/configurations/wildfly9x/deployments/syncope.war"
+            + "/WEB-INF/classes, Resources=${Master.orm})\"/>\n";
+
+    public static final String JBOSS =
+            "<entry key=\"openjpa.MetaDataFactory\" 
value=\"jpa(URLs=vfs:/content/${project.build.finalName}.war/"
+            + "WEB-INF/classes/, Resources=${Master.orm})\"/>";
+
+    private MasterDomainXml() {
+        // private constructor for static utility class
+    }
+}

http://git-wip-us.apache.org/repos/asf/syncope/blob/e2c7754a/installer/src/main/java/org/apache/syncope/installer/files/MasterProperties.java
----------------------------------------------------------------------
diff --git 
a/installer/src/main/java/org/apache/syncope/installer/files/MasterProperties.java
 
b/installer/src/main/java/org/apache/syncope/installer/files/MasterProperties.java
new file mode 100644
index 0000000..b1fb223
--- /dev/null
+++ 
b/installer/src/main/java/org/apache/syncope/installer/files/MasterProperties.java
@@ -0,0 +1,97 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you 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 org.apache.syncope.installer.files;
+
+public final class MasterProperties {
+
+    public static final String HEADER = "# Licensed to the Apache Software 
Foundation (ASF) under one\n"
+            + "# or more contributor license agreements.  See the NOTICE 
file\n"
+            + "# distributed with this work for additional information\n"
+            + "# regarding copyright ownership.  The ASF licenses this file\n"
+            + "# to you under the Apache License, Version 2.0 (the\n"
+            + "# \"License\"); you may not use this file except in 
compliance\n"
+            + "# with the License.  You may obtain a copy of the License at\n" 
+ "#\n"
+            + "#   http://www.apache.org/licenses/LICENSE-2.0\n"; + "#\n"
+            + "# Unless required by applicable law or agreed to in writing,\n"
+            + "# software distributed under the License is distributed on an\n"
+            + "# \"AS IS\" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY\n"
+            + "# KIND, either express or implied.  See the License for the\n"
+            + "# specific language governing permissions and limitations\n"
+            + "# under the License.\n";
+
+    public static final String POSTGRES = ""
+            + "Master.driverClassName=org.postgresql.Driver\n"
+            + "Master.url=%s\n"
+            + "Master.schema=\n"
+            + "Master.username=%s\n"
+            + "Master.password=%s\n"
+            + 
"Master.databasePlatform=org.apache.openjpa.jdbc.sql.PostgresDictionary\n"
+            + "Master.orm=META-INF/spring-orm.xml\n"
+            + "Master.pool.validationQuery=SELECT 1\n"
+            + "Master.audit.sql=audit.sql\n";
+
+    public static final String MYSQL = ""
+            + "Master.driverClassName=com.mysql.jdbc.Driver\n"
+            + "Master.url=%s\n"
+            + "Master.schema=\n"
+            + "Master.username=%s\n"
+            + "Master.password=%s\n"
+            + 
"Master.databasePlatform=org.apache.openjpa.jdbc.sql.MySQLDictionary\n"
+            + "Master.orm=META-INF/spring-orm.xml\n"
+            + "Master.pool.validationQuery=SELECT 1\n"
+            + "Master.audit.sql=audit.sql\n";
+
+    public static final String MARIADB = ""
+            + "Master.driverClassName=org.mariadb.jdbc.Driver\n"
+            + "Master.url=%s\n"
+            + "Master.schema=\n"
+            + "Master.username=%s\n"
+            + "Master.password=%s\n"
+            + 
"Master.databasePlatform=org.apache.openjpa.jdbc.sql.MariaDBDictionary\n"
+            + "Master.orm=META-INF/spring-orm.xml\n"
+            + "Master.pool.validationQuery=SELECT 1\n"
+            + "Master.audit.sql=audit.sql\n";
+
+    public static final String ORACLE = ""
+            + "Master.driverClassName=oracle.jdbc.OracleDriver\n"
+            + "Master.url=jdbc:oracle:thin:@pioppo:1521:orcl\n"
+            + "Master.schema=%s\n"
+            + "Master.username=%s\n"
+            + "Master.password=%s\n"
+            + 
"Master.databasePlatform=org.apache.openjpa.jdbc.sql.OracleDictionary\n"
+            + "Master.orm=META-INF/spring-orm-oracle.xml\n"
+            + "Master.pool.validationQuery=SELECT 1 FROM DUAL\n"
+            + "Master.audit.sql=audit_oracle.sql\n";
+
+    public static final String SQLSERVER = ""
+            + 
"Master.driverClassName=com.microsoft.sqlserver.jdbc.SQLServerDriver\n"
+            + 
"Master.url=jdbc:sqlserver://acacia:1433;database=syncope;selectMethod=cursor;"
+            + "sendStringParametersAsUnicode=false\n"
+            + "Master.schema=%s\n"
+            + "Master.username=%s\n"
+            + "Master.password=%s\n"
+            + 
"Master.databasePlatform=org.apache.openjpa.jdbc.sql.SQLServerDictionary\n"
+            + "Master.orm=META-INF/spring-orm-sqlserver.xml\n"
+            + "Master.pool.validationQuery=SELECT 1\n"
+            + "Master.audit.sql=audit_sqlserver.sql\n";
+
+    private MasterProperties() {
+        // private constructor for static utility class
+    }
+}

http://git-wip-us.apache.org/repos/asf/syncope/blob/e2c7754a/installer/src/main/java/org/apache/syncope/installer/files/PersistenceContextEMFactoryXml.java
----------------------------------------------------------------------
diff --git 
a/installer/src/main/java/org/apache/syncope/installer/files/PersistenceContextEMFactoryXml.java
 
b/installer/src/main/java/org/apache/syncope/installer/files/PersistenceContextEMFactoryXml.java
deleted file mode 100644
index 876f0db..0000000
--- 
a/installer/src/main/java/org/apache/syncope/installer/files/PersistenceContextEMFactoryXml.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you 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 org.apache.syncope.installer.files;
-
-public final class PersistenceContextEMFactoryXml {
-
-    public static final String PLACEHOLDER = "<entry 
key=\"openjpa.MetaDataFactory\"\n"
-            + "               
value=\"jpa(URLs=vfs:${project.build.directory}/cargo/configurations/wildfly8x/"
-            + "deployments/${project.build.finalName}.war/WEB-INF/classes/, 
Resources=META-INF/orm.xml)\"/>";
-
-    public static final String JBOSS =
-            "<entry key=\"openjpa.MetaDataFactory\" 
value=\"jpa(URLs=vfs:/content/${project.build.finalName}.war/"
-            + "WEB-INF/classes/, Resources=META-INF/orm.xml)\"/>";
-
-    private PersistenceContextEMFactoryXml() {
-        // private constructor for static utility class
-    }
-}

http://git-wip-us.apache.org/repos/asf/syncope/blob/e2c7754a/installer/src/main/java/org/apache/syncope/installer/files/PersistenceProperties.java
----------------------------------------------------------------------
diff --git 
a/installer/src/main/java/org/apache/syncope/installer/files/PersistenceProperties.java
 
b/installer/src/main/java/org/apache/syncope/installer/files/PersistenceProperties.java
deleted file mode 100644
index 769722f..0000000
--- 
a/installer/src/main/java/org/apache/syncope/installer/files/PersistenceProperties.java
+++ /dev/null
@@ -1,110 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you 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 org.apache.syncope.installer.files;
-
-public final class PersistenceProperties {
-
-    public static final String HEADER = "# Licensed to the Apache Software 
Foundation (ASF) under one\n"
-            + "# or more contributor license agreements.  See the NOTICE 
file\n"
-            + "# distributed with this work for additional information\n"
-            + "# regarding copyright ownership.  The ASF licenses this file\n"
-            + "# to you under the Apache License, Version 2.0 (the\n"
-            + "# \"License\"); you may not use this file except in 
compliance\n"
-            + "# with the License.  You may obtain a copy of the License at\n" 
+ "#\n"
-            + "#   http://www.apache.org/licenses/LICENSE-2.0\n"; + "#\n"
-            + "# Unless required by applicable law or agreed to in writing,\n"
-            + "# software distributed under the License is distributed on an\n"
-            + "# \"AS IS\" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY\n"
-            + "# KIND, either express or implied.  See the License for the\n"
-            + "# specific language governing permissions and limitations\n" + 
"# under the License.\n";
-
-    public static final String POSTGRES = ""
-            + "jpa.driverClassName=org.postgresql.Driver\n"
-            + "jpa.url=%s\n"
-            + "jpa.username=%s\n"
-            + "jpa.password=%s\n"
-            + "jpa.dialect=org.apache.openjpa.jdbc.sql.PostgresDictionary\n"
-            + "jpa.pool.validationQuery=SELECT 1\n"
-            + "jpa.orm=META-INF/spring-orm.xml\n"
-            + 
"quartz.jobstore=org.quartz.impl.jdbcjobstore.PostgreSQLDelegate\n"
-            + "quartz.sql=tables_postgres.sql\n"
-            + "audit.sql=audit.sql\n"
-            + "database.schema=\n";
-
-    public static final String MYSQL = ""
-            + "jpa.driverClassName=com.mysql.jdbc.Driver\n"
-            + "jpa.url=%s\n"
-            + "jpa.username=%s\n"
-            + "jpa.password=%s\n"
-            + "jpa.dialect=org.apache.openjpa.jdbc.sql.MySQLDictionary\n"
-            + "jpa.pool.validationQuery=SELECT 1\n"
-            + "jpa.orm=META-INF/spring-orm.xml\n"
-            + "quartz.jobstore=org.quartz.impl.jdbcjobstore.StdJDBCDelegate\n"
-            + "audit.sql=audit.sql\n"
-            + "database.schema=\n";
-
-    public static final String MARIADB = ""
-            + "jpa.driverClassName=org.mariadb.jdbc.Driver\n"
-            + "jpa.url=%s\n"
-            + "jpa.username=%s\n"
-            + "jpa.password=%s\n"
-            + "jpa.dialect=org.apache.openjpa.jdbc.sql.MariaDBDictionary\n"
-            + "jpa.pool.validationQuery=SELECT 1\n"
-            + "quartz.jobstore=org.quartz.impl.jdbcjobstore.StdJDBCDelegate\n"
-            + "quartz.sql=tables_mariadb.sql\n"
-            + "audit.sql=audit.sql\n"
-            + "database.schema=\n";
-
-    public static final String ORACLE = ""
-            + "jpa.driverClassName=oracle.jdbc.OracleDriver\n"
-            + "jpa.url=%s\n"
-            + "jpa.username=%s\n"
-            + "jpa.password=%s\n"
-            + "jpa.dialect=org.apache.openjpa.jdbc.sql.OracleDictionary\n"
-            + "jpa.pool.validationQuery=SELECT 1 FROM DUAL\n"
-            + "jpa.orm=META-INF/spring-orm-oracle.xml\n"
-            + "#note: other connection pool settings can also be configured 
here, see persistenceContext.xml\n"
-            + 
"quartz.jobstore=org.quartz.impl.jdbcjobstore.oracle.OracleDelegate\n"
-            + "quartz.scheduler.idleWaitTime=5000\n"
-            + "quartz.sql=tables_oracle.sql\n"
-            + "audit.sql=audit_oracle.sql\n"
-            + "database.schema=%s\n";
-
-    public static final String SQLSERVER = 
"jpa.driverClassName=com.microsoft.sqlserver.jdbc.SQLServerDriver\n"
-            + "jpa.url=%s\n"
-            + "jpa.username=%s\n"
-            + "jpa.password=%s\n"
-            + "jpa.dialect=org.apache.openjpa.jdbc.sql.SQLServerDictionary\n"
-            + "jpa.pool.validationQuery=SELECT 1\n"
-            + "jpa.orm=META-INF/spring-orm-sqlserver.xml\n"
-            + "#note: other connection pool settings can also be configured 
here, see persistenceContext.xml\n"
-            + "quartz.jobstore=org.quartz.impl.jdbcjobstore.MSSQLDelegate\n"
-            + "quartz.scheduler.idleWaitTime=5000\n"
-            + "quartz.sql=tables_sqlServer.sql\n"
-            + "audit.sql=audit_sqlserver.sql\n"
-            + "database.schema=";
-
-    public static final String MYSQL_QUARTZ_INNO_DB = 
"quartz.sql=tables_mysql_innodb.sql";
-
-    public static final String MYSQL_QUARTZ = "quartz.sql=tables_mysql.sql";
-
-    private PersistenceProperties() {
-        // private constructor for static utility class
-    }
-}

http://git-wip-us.apache.org/repos/asf/syncope/blob/e2c7754a/installer/src/main/java/org/apache/syncope/installer/files/ProvisioningProperties.java
----------------------------------------------------------------------
diff --git 
a/installer/src/main/java/org/apache/syncope/installer/files/ProvisioningProperties.java
 
b/installer/src/main/java/org/apache/syncope/installer/files/ProvisioningProperties.java
new file mode 100644
index 0000000..020efcb
--- /dev/null
+++ 
b/installer/src/main/java/org/apache/syncope/installer/files/ProvisioningProperties.java
@@ -0,0 +1,69 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you 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 org.apache.syncope.installer.files;
+
+public final class ProvisioningProperties {
+
+    public static final String HEADER = "# Licensed to the Apache Software 
Foundation (ASF) under one\n"
+            + "# or more contributor license agreements.  See the NOTICE 
file\n"
+            + "# distributed with this work for additional information\n"
+            + "# regarding copyright ownership.  The ASF licenses this file\n"
+            + "# to you under the Apache License, Version 2.0 (the\n"
+            + "# \"License\"); you may not use this file except in 
compliance\n"
+            + "# with the License.  You may obtain a copy of the License at\n" 
+ "#\n"
+            + "#   http://www.apache.org/licenses/LICENSE-2.0\n"; + "#\n"
+            + "# Unless required by applicable law or agreed to in writing,\n"
+            + "# software distributed under the License is distributed on an\n"
+            + "# \"AS IS\" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY\n"
+            + "# KIND, either express or implied.  See the License for the\n"
+            + "# specific language governing permissions and limitations\n"
+            + "# under the License.\n"
+            + 
"userProvisioningManager=org.apache.syncope.core.provisioning.java.DefaultUserProvisioningManager\n"
+            + 
"groupProvisioningManager=org.apache.syncope.core.provisioning.java.DefaultGroupProvisioningManager\n"
+            + "anyObjectProvisioningManager="
+            + 
"org.apache.syncope.core.provisioning.java.DefaultAnyObjectProvisioningManager\n"
+            + 
"virAttrCache=org.apache.syncope.core.provisioning.java.cache.MemoryVirAttrCache\n";
+
+    public static final String POSTGRES = ""
+            + 
"quartz.jobstore=org.quartz.impl.jdbcjobstore.PostgreSQLDelegate\n"
+            + "quartz.sql=tables_postgres.sql\n";
+
+    public static final String MYSQL = ""
+            + "quartz.jobstore=org.quartz.impl.jdbcjobstore.StdJDBCDelegate\n";
+
+    public static final String MYSQL_QUARTZ_INNO_DB = 
"quartz.sql=tables_mysql_innodb.sql";
+
+    public static final String MYSQL_QUARTZ = "quartz.sql=tables_mysql.sql";
+
+    public static final String MARIADB = ""
+            + "quartz.jobstore=org.quartz.impl.jdbcjobstore.StdJDBCDelegate\n"
+            + "quartz.sql=tables_mariadb.sql\n";
+
+    public static final String ORACLE = ""
+            + 
"quartz.jobstore=org.quartz.impl.jdbcjobstore.oracle.OracleDelegate\n"
+            + "quartz.sql=tables_oracle.sql\n";
+
+    public static final String SQLSERVER = ""
+            + "quartz.jobstore=org.quartz.impl.jdbcjobstore.MSSQLDelegate\n"
+            + "quartz.sql=tables_sqlServer.sql\n";
+
+    private ProvisioningProperties() {
+        // private constructor for static utility class
+    }
+}

http://git-wip-us.apache.org/repos/asf/syncope/blob/e2c7754a/installer/src/main/java/org/apache/syncope/installer/processes/ArchetypeProcess.java
----------------------------------------------------------------------
diff --git 
a/installer/src/main/java/org/apache/syncope/installer/processes/ArchetypeProcess.java
 
b/installer/src/main/java/org/apache/syncope/installer/processes/ArchetypeProcess.java
index 7176dd6..4f17035 100644
--- 
a/installer/src/main/java/org/apache/syncope/installer/processes/ArchetypeProcess.java
+++ 
b/installer/src/main/java/org/apache/syncope/installer/processes/ArchetypeProcess.java
@@ -32,6 +32,7 @@ import org.xml.sax.SAXException;
 
 public class ArchetypeProcess extends BaseProcess {
 
+    @Override
     public void run(final AbstractUIProcessHandler handler, final String[] 
args) {
         final String installPath = args[0];
         final String mavenDir = args[1];
@@ -54,45 +55,37 @@ public class ArchetypeProcess extends BaseProcess {
 
         setSyncopeInstallDir(installPath, artifactId);
 
-        final FileSystemUtils fileSystemUtils = new FileSystemUtils(handler);
+        FileSystemUtils fileSystemUtils = new FileSystemUtils(handler);
         fileSystemUtils.createDirectory(installPath);
         InstallLog.initialize(installPath, handler);
-        final MavenUtils mavenUtils = new MavenUtils(mavenDir, handler);
+        MavenUtils mavenUtils = new MavenUtils(mavenDir, handler);
         File customMavenProxySettings = null;
         try {
             if (isProxyEnabled && mavenProxyAutoconf) {
                 customMavenProxySettings = 
MavenUtils.createSettingsWithProxy(installPath, proxyHost, proxyPort,
                         proxyUser, proxyPwd);
             }
-        } catch (IOException ex) {
-            final StringBuilder messageError = new StringBuilder(
-                    "I/O error during creation of Maven custom settings.xml");
-            final String emittedError = messageError.toString();
-            handler.emitError(emittedError, emittedError);
-            InstallLog.getInstance().error(messageError.append(ex.getMessage() 
== null ? "" : ex.getMessage()).
-                    toString());
-        } catch (ParserConfigurationException ex) {
-            final StringBuilder messageError = new StringBuilder(
+        } catch (IOException e) {
+            StringBuilder message = new StringBuilder("I/O error during 
creation of Maven custom settings.xml");
+            handler.emitError(message.toString(), e.getMessage());
+            
InstallLog.getInstance().error(message.append('\n').append(e.getMessage()).toString());
+        } catch (ParserConfigurationException e) {
+            StringBuilder message = new StringBuilder(
                     "Parser configuration error during creation of Maven 
custom settings.xml");
-            final String emittedError = messageError.toString();
-            handler.emitError(emittedError, emittedError);
-            InstallLog.getInstance().error(messageError.append(ex.getMessage() 
== null ? "" : ex.getMessage()).
-                    toString());
-        } catch (TransformerException ex) {
-            final StringBuilder messageError = new StringBuilder(
+            handler.emitError(message.toString(), e.getMessage());
+            
InstallLog.getInstance().error(message.append('\n').append(e.getMessage()).toString());
+        } catch (TransformerException e) {
+            StringBuilder message = new StringBuilder(
                     "Transformer error during creation of Maven custom 
settings.xml");
-            final String emittedError = messageError.toString();
-            handler.emitError(emittedError, emittedError);
-            InstallLog.getInstance().error(messageError.append(ex.getMessage() 
== null ? "" : ex.getMessage()).
-                    toString());
-        } catch (SAXException ex) {
-            final StringBuilder messageError = new StringBuilder(
+            handler.emitError(message.toString(), e.getMessage());
+            
InstallLog.getInstance().error(message.append('\n').append(e.getMessage()).toString());
+        } catch (SAXException e) {
+            StringBuilder message = new StringBuilder(
                     "XML parsing error during creation of Maven custom 
settings.xml");
-            final String emittedError = messageError.toString();
-            handler.emitError(emittedError, emittedError);
-            InstallLog.getInstance().error(messageError.append(ex.getMessage() 
== null ? "" : ex.getMessage()).
-                    toString());
+            handler.emitError(message.toString(), e.getMessage());
+            
InstallLog.getInstance().error(message.append('\n').append(e.getMessage()).toString());
         }
+
         handler.logOutput("########################## IMPORTANT 
##########################", true);
         handler.logOutput("See " + 
InstallLog.getInstance().getFileAbsolutePath() + " for the maven logs", true);
         handler.logOutput("########################## IMPORTANT 
##########################", true);
@@ -103,7 +96,8 @@ public class ArchetypeProcess extends BaseProcess {
             final File pomFile =
                     new File(syncopeInstallDir + 
PROPERTIES.getProperty("pomFile"));
             String contentPomFile = fileSystemUtils.readFile(pomFile);
-            fileSystemUtils.writeToFile(pomFile, 
contentPomFile.replace(ParentPom.PLACEHOLDER, ParentPom.REPOSITORY));
+            fileSystemUtils.
+                    writeToFile(pomFile, 
contentPomFile.replace(ParentPom.PLACEHOLDER, ParentPom.REPOSITORY));
         }
 
         fileSystemUtils.createDirectory(confDirectory);
@@ -111,19 +105,19 @@ public class ArchetypeProcess extends BaseProcess {
         fileSystemUtils.createDirectory(bundlesDirectory);
         fileSystemUtils.createDirectory(modelerDirectory);
 
-        fileSystemUtils.copyFileFromResources("/" + 
PROPERTIES.getProperty("modelerPomFile"),
-                modelerDirectory + "/" + PROPERTIES.getProperty("pomFile"), 
handler);
+        fileSystemUtils.copyFileFromResources(File.separator + 
PROPERTIES.getProperty("modelerPomFile"),
+                modelerDirectory + File.separator + 
PROPERTIES.getProperty("pomFile"), handler);
 
         fileSystemUtils.copyFile(
                 syncopeInstallDir
                 + PROPERTIES.getProperty("consoleResDirectory")
-                + "/" + PROPERTIES.getProperty("urlConfig"),
-                modelerDirectory + "/" + PROPERTIES.getProperty("urlConfig"));
+                + File.separator + PROPERTIES.getProperty("urlConfig"),
+                modelerDirectory + File.separator + 
PROPERTIES.getProperty("urlConfig"));
         fileSystemUtils.copyFile(
                 syncopeInstallDir
                 + PROPERTIES.getProperty("consoleResDirectory")
-                + "/" + PROPERTIES.getProperty("saveModel"),
-                modelerDirectory + "/" + PROPERTIES.getProperty("saveModel"));
+                + File.separator + PROPERTIES.getProperty("saveModel"),
+                modelerDirectory + File.separator + 
PROPERTIES.getProperty("saveModel"));
 
         final Properties modelerProperties = new Properties();
         modelerProperties.setProperty("modeler.directory", modelerDirectory);
@@ -134,6 +128,6 @@ public class ArchetypeProcess extends BaseProcess {
         syncopeProperties.setProperty("log.directory", logsDirectory);
         syncopeProperties.setProperty("bundles.directory", bundlesDirectory);
         mavenUtils.mvnCleanPackageWithProperties(
-                installPath + "/" + artifactId, syncopeProperties, 
customMavenProxySettings);
+                installPath + File.separator + artifactId, syncopeProperties, 
customMavenProxySettings);
     }
 }

http://git-wip-us.apache.org/repos/asf/syncope/blob/e2c7754a/installer/src/main/java/org/apache/syncope/installer/processes/BaseProcess.java
----------------------------------------------------------------------
diff --git 
a/installer/src/main/java/org/apache/syncope/installer/processes/BaseProcess.java
 
b/installer/src/main/java/org/apache/syncope/installer/processes/BaseProcess.java
index 01dd3c7..c1846cc 100644
--- 
a/installer/src/main/java/org/apache/syncope/installer/processes/BaseProcess.java
+++ 
b/installer/src/main/java/org/apache/syncope/installer/processes/BaseProcess.java
@@ -20,12 +20,13 @@ package org.apache.syncope.installer.processes;
 
 import static 
org.apache.syncope.installer.processes.ArchetypeProcess.PROPERTIES;
 
+import com.izforge.izpack.panels.process.AbstractUIProcessHandler;
 import java.io.IOException;
 import java.io.InputStream;
 import java.util.Properties;
 import org.apache.commons.io.IOUtils;
 
-public class BaseProcess {
+public abstract class BaseProcess {
 
     protected static final Properties PROPERTIES = new Properties();
 
@@ -51,7 +52,6 @@ public class BaseProcess {
                 append("/").toString();
     }
 
-    protected BaseProcess() {
-        // protected constructor for static utility class
-    }
+    public abstract void run(AbstractUIProcessHandler handler, String[] args);
+
 }

http://git-wip-us.apache.org/repos/asf/syncope/blob/e2c7754a/installer/src/main/java/org/apache/syncope/installer/processes/ContainerProcess.java
----------------------------------------------------------------------
diff --git 
a/installer/src/main/java/org/apache/syncope/installer/processes/ContainerProcess.java
 
b/installer/src/main/java/org/apache/syncope/installer/processes/ContainerProcess.java
index 77391c3..e7e5148 100644
--- 
a/installer/src/main/java/org/apache/syncope/installer/processes/ContainerProcess.java
+++ 
b/installer/src/main/java/org/apache/syncope/installer/processes/ContainerProcess.java
@@ -31,7 +31,7 @@ import org.apache.syncope.installer.containers.jboss.JBoss;
 import org.apache.syncope.installer.enums.Containers;
 import org.apache.syncope.installer.files.ConsoleProperties;
 import org.apache.syncope.installer.files.GlassfishCoreWebXml;
-import org.apache.syncope.installer.files.PersistenceContextEMFactoryXml;
+import org.apache.syncope.installer.files.MasterDomainXml;
 import org.apache.syncope.installer.utilities.InstallLog;
 import org.apache.syncope.installer.utilities.MavenUtils;
 import org.xml.sax.SAXException;
@@ -104,12 +104,12 @@ public final class ContainerProcess extends BaseProcess {
 
     private boolean mavenProxyAutoconf;
 
+    @Override
     public void run(final AbstractUIProcessHandler handler, final String[] 
args) {
-
         installPath = args[0];
         mavenDir = args[1];
         artifactId = args[2];
-        final Containers selectedContainer = 
Containers.fromContainerName(args[3]);
+        Containers selectedContainer = Containers.fromContainerName(args[3]);
         tomcatSsl = Boolean.valueOf(args[4]);
         tomcatHost = args[5];
         tomcatPort = args[6];
@@ -135,34 +135,26 @@ public final class ContainerProcess extends BaseProcess {
         proxyPort = args[26];
         proxyUser = args[27];
         proxyPwd = args[28];
-        mavenProxyAutoconf = Boolean.valueOf(args[28]);
-
-        final FileSystemUtils fileSystemUtils = new FileSystemUtils(handler);
+        mavenProxyAutoconf = Boolean.valueOf(args[29]);
 
         handler.logOutput("Configure web.xml file according to " + 
selectedContainer + " properties", true);
         InstallLog.getInstance().info("Configure web.xml file according to " + 
selectedContainer + " properties");
 
+        FileSystemUtils fileSystemUtils = new FileSystemUtils(handler);
         setSyncopeInstallDir(installPath, artifactId);
 
-        if (withDataSource) {
-            switch (selectedContainer) {
-                case GLASSFISH:
-                    final File glassfishCoreWebXmlFile =
-                            new File(syncopeInstallDir + 
PROPERTIES.getProperty("glassfishCoreWebXmlFile"));
-                    final String contentGlassfishWebXmlFile = 
fileSystemUtils.readFile(glassfishCoreWebXmlFile);
-                    fileSystemUtils.writeToFile(glassfishCoreWebXmlFile,
-                            
contentGlassfishWebXmlFile.replace(GlassfishCoreWebXml.PLACEHOLDER,
-                                    GlassfishCoreWebXml.DATA_SOURCE));
-                    break;
-
-                default:
-            }
+        if (withDataSource && selectedContainer == Containers.GLASSFISH) {
+            File glassfishCoreWebXmlFile =
+                    new File(syncopeInstallDir + 
PROPERTIES.getProperty("glassfishCoreWebXmlFile"));
+            String contentGlassfishWebXmlFile = 
fileSystemUtils.readFile(glassfishCoreWebXmlFile);
+            fileSystemUtils.writeToFile(glassfishCoreWebXmlFile,
+                    
contentGlassfishWebXmlFile.replace(GlassfishCoreWebXml.PLACEHOLDER,
+                            GlassfishCoreWebXml.DATA_SOURCE));
         }
 
-        final File consolePropertiesFile = new File(syncopeInstallDir
-                + PROPERTIES.getProperty("consoleResDirectory")
+        File consolePropertiesFile = new File(syncopeInstallDir + 
PROPERTIES.getProperty("consoleResDirectory")
                 + File.separator + 
PROPERTIES.getProperty("consolePropertiesFile"));
-        final String contentConsolePropertiesFile = 
fileSystemUtils.readFile(consolePropertiesFile);
+        String contentConsolePropertiesFile = 
fileSystemUtils.readFile(consolePropertiesFile);
 
         final String scheme;
         final String host;
@@ -194,49 +186,40 @@ public final class ContainerProcess extends BaseProcess {
                 
contentConsolePropertiesFile.replace(ConsoleProperties.PLACEHOLDER,
                         String.format(ConsoleProperties.CONSOLE, scheme, host, 
port)));
 
-        final MavenUtils mavenUtils = new MavenUtils(mavenDir, handler);
+        MavenUtils mavenUtils = new MavenUtils(mavenDir, handler);
         File customMavenProxySettings = null;
         try {
             if (isProxyEnabled && mavenProxyAutoconf) {
-                customMavenProxySettings = 
MavenUtils.createSettingsWithProxy(installPath, proxyHost, proxyPort,
-                        proxyUser, proxyPwd);
+                customMavenProxySettings = MavenUtils.createSettingsWithProxy(
+                        installPath, proxyHost, proxyPort, proxyUser, 
proxyPwd);
             }
-        } catch (IOException ex) {
-            final StringBuilder messageError = new StringBuilder(
-                    "I/O error during creation of Maven custom settings.xml");
-            final String emittedError = messageError.toString();
-            handler.emitError(emittedError, emittedError);
-            InstallLog.getInstance().error(messageError.append(ex.getMessage() 
== null ? "" : ex.getMessage()).
-                    toString());
-        } catch (ParserConfigurationException ex) {
-            final StringBuilder messageError = new StringBuilder(
+        } catch (IOException e) {
+            StringBuilder message = new StringBuilder("I/O error during 
creation of Maven custom settings.xml");
+            handler.emitError(message.toString(), e.getMessage());
+            
InstallLog.getInstance().error(message.append('\n').append(e.getMessage()).toString());
+        } catch (ParserConfigurationException e) {
+            StringBuilder message = new StringBuilder(
                     "Parser configuration error during creation of Maven 
custom settings.xml");
-            final String emittedError = messageError.toString();
-            handler.emitError(emittedError, emittedError);
-            InstallLog.getInstance().error(messageError.append(ex.getMessage() 
== null ? "" : ex.getMessage()).
-                    toString());
-        } catch (TransformerException ex) {
-            final StringBuilder messageError = new StringBuilder(
+            handler.emitError(message.toString(), e.getMessage());
+            
InstallLog.getInstance().error(message.append('\n').append(e.getMessage()).toString());
+        } catch (TransformerException e) {
+            StringBuilder message = new StringBuilder(
                     "Transformer error during creation of Maven custom 
settings.xml");
-            final String emittedError = messageError.toString();
-            handler.emitError(emittedError, emittedError);
-            InstallLog.getInstance().error(messageError.append(ex.getMessage() 
== null ? "" : ex.getMessage()).
-                    toString());
-        } catch (SAXException ex) {
-            final StringBuilder messageError = new StringBuilder(
+            handler.emitError(message.toString(), e.getMessage());
+            
InstallLog.getInstance().error(message.append('\n').append(e.getMessage()).toString());
+        } catch (SAXException e) {
+            StringBuilder message = new StringBuilder(
                     "XML parsing error during creation of Maven custom 
settings.xml");
-            final String emittedError = messageError.toString();
-            handler.emitError(emittedError, emittedError);
-            InstallLog.getInstance().error(messageError.append(ex.getMessage() 
== null ? "" : ex.getMessage()).
-                    toString());
+            handler.emitError(message.toString(), e.getMessage());
+            
InstallLog.getInstance().error(message.append('\n').append(e.getMessage()).toString());
         }
 
-        final Properties mvnProperties = new Properties();
+        Properties mvnProperties = new Properties();
         mvnProperties.setProperty("conf.directory", confDirectory);
         mvnProperties.setProperty("log.directory", logsDirectory);
         mvnProperties.setProperty("bundles.directory", bundlesDirectory);
         mavenUtils.mvnCleanPackageWithProperties(
-                installPath + "/" + artifactId, mvnProperties, 
customMavenProxySettings);
+                installPath + File.separator + artifactId, mvnProperties, 
customMavenProxySettings);
 
         if (isProxyEnabled && mavenProxyAutoconf) {
             FileSystemUtils.delete(customMavenProxySettings);
@@ -244,7 +227,7 @@ public final class ContainerProcess extends BaseProcess {
 
         switch (selectedContainer) {
             case TOMCAT:
-                final Tomcat tomcat = new Tomcat(
+                Tomcat tomcat = new Tomcat(
                         tomcatSsl, tomcatHost, tomcatPort, installPath, 
artifactId, tomcatUser, tomcatPassword,
                         handler);
                 boolean deployCoreResult = tomcat.deployCore();
@@ -252,7 +235,7 @@ public final class ContainerProcess extends BaseProcess {
                     handler.logOutput("Core successfully deployed ", true);
                     InstallLog.getInstance().info("Core successfully deployed 
");
                 } else {
-                    final String messageError = "Deploy core on Tomcat failed";
+                    String messageError = "Deploy core on Tomcat failed";
                     handler.emitError(messageError, messageError);
                     InstallLog.getInstance().error(messageError);
                 }
@@ -269,7 +252,7 @@ public final class ContainerProcess extends BaseProcess {
                 break;
 
             case JBOSS:
-                final JBoss jBoss = new JBoss(
+                JBoss jBoss = new JBoss(
                         jbossSsl, jbossHost, jbossManagementPort, 
jbossAdminUsername,
                         jbossAdminPassword, installPath, artifactId, handler);
 
@@ -295,10 +278,10 @@ public final class ContainerProcess extends BaseProcess {
                 break;
 
             case GLASSFISH:
-                final String createJavaOptCommand = "sh " + glassfishDir + 
Glassfish.CREATE_JAVA_OPT_COMMAND;
+                String createJavaOptCommand = "sh " + glassfishDir + 
Glassfish.CREATE_JAVA_OPT_COMMAND;
                 fileSystemUtils.exec(createJavaOptCommand, null);
 
-                final Glassfish glassfish = new Glassfish(installPath, 
artifactId);
+                Glassfish glassfish = new Glassfish(installPath, artifactId);
 
                 fileSystemUtils.exec("sh " + glassfishDir
                         + Glassfish.DEPLOY_COMMAND + glassfish.deployCore(), 
null);
@@ -312,20 +295,14 @@ public final class ContainerProcess extends BaseProcess {
 
     private void persistenceContextEMFactory(
             final FileSystemUtils fileSystemUtils, final 
AbstractUIProcessHandler handler) {
-        
fileSystemUtils.copyFileFromResources("/jboss/persistenceContextEMFactory.xml",
-                syncopeInstallDir
-                + PROPERTIES.getProperty("persistenceContextEMFactoryFile"), 
handler);
-        final File persistenceContextEMFactoryFile = new File(
-                syncopeInstallDir + 
PROPERTIES.getProperty("persistenceContextEMFactoryFile"));
-        final String contentPersistenceContextEMFactory = 
fileSystemUtils.readFile(persistenceContextEMFactoryFile);
-        fileSystemUtils.writeToFile(
-                persistenceContextEMFactoryFile,
-                
contentPersistenceContextEMFactory.replace(PersistenceContextEMFactoryXml.PLACEHOLDER,
-                        PersistenceContextEMFactoryXml.JBOSS));
-    }
 
-    private ContainerProcess() {
-        super();
-        // private constructor for static utility class
+        fileSystemUtils.copyFileFromResources("/MasterDomain.xml",
+                syncopeInstallDir + 
PROPERTIES.getProperty("masterDomainFile"), handler);
+        File masterDomainFile = new File(
+                syncopeInstallDir + 
PROPERTIES.getProperty("masterDomainFile"));
+        String contentPersistenceContextEMFactory = 
fileSystemUtils.readFile(masterDomainFile);
+        fileSystemUtils.writeToFile(masterDomainFile,
+                
contentPersistenceContextEMFactory.replace(MasterDomainXml.PLACEHOLDER, 
MasterDomainXml.JBOSS));
     }
+
 }

http://git-wip-us.apache.org/repos/asf/syncope/blob/e2c7754a/installer/src/main/java/org/apache/syncope/installer/processes/PersistenceProcess.java
----------------------------------------------------------------------
diff --git 
a/installer/src/main/java/org/apache/syncope/installer/processes/PersistenceProcess.java
 
b/installer/src/main/java/org/apache/syncope/installer/processes/PersistenceProcess.java
index af5adbf..8cc528b 100644
--- 
a/installer/src/main/java/org/apache/syncope/installer/processes/PersistenceProcess.java
+++ 
b/installer/src/main/java/org/apache/syncope/installer/processes/PersistenceProcess.java
@@ -22,7 +22,8 @@ import org.apache.syncope.installer.utilities.FileSystemUtils;
 import com.izforge.izpack.panels.process.AbstractUIProcessHandler;
 import java.io.File;
 import org.apache.syncope.installer.enums.DBs;
-import org.apache.syncope.installer.files.PersistenceProperties;
+import org.apache.syncope.installer.files.MasterProperties;
+import org.apache.syncope.installer.files.ProvisioningProperties;
 import org.apache.syncope.installer.utilities.InstallLog;
 
 public class PersistenceProcess extends BaseProcess {
@@ -41,10 +42,10 @@ public class PersistenceProcess extends BaseProcess {
 
     private boolean mysqlInnoDB;
 
-    private String oracleTableSpace;
+    private String schema;
 
+    @Override
     public void run(final AbstractUIProcessHandler handler, final String[] 
args) {
-
         installPath = args[0];
         artifactId = args[1];
         dbSelected = DBs.fromDbName(args[2]);
@@ -52,52 +53,58 @@ public class PersistenceProcess extends BaseProcess {
         persistenceUser = args[4];
         persistencePassword = args[5];
         mysqlInnoDB = Boolean.valueOf(args[6]);
-        oracleTableSpace = args[7];
+        schema = args[7];
 
-        final FileSystemUtils fileSystemUtils = new FileSystemUtils(handler);
-        final StringBuilder persistenceProperties = new 
StringBuilder(PersistenceProperties.HEADER);
+        FileSystemUtils fileSystemUtils = new FileSystemUtils(handler);
+        StringBuilder provisioningProperties = new 
StringBuilder(ProvisioningProperties.HEADER);
+        StringBuilder masterProperties = new 
StringBuilder(MasterProperties.HEADER);
         setSyncopeInstallDir(installPath, artifactId);
 
-        handler.logOutput("Configure persistence file according to " + 
dbSelected + " properties", true);
-        InstallLog.getInstance().info("Configure persistence file according to 
" + dbSelected + " properties");
+        handler.logOutput("Configure persistence for " + dbSelected, false);
+        InstallLog.getInstance().info("Configure persistence for " + 
dbSelected);
 
         switch (dbSelected) {
             case POSTGRES:
-                persistenceProperties.append(String.format(
-                        PersistenceProperties.POSTGRES, persistenceUrl, 
persistenceUser, persistencePassword));
+                provisioningProperties.append(ProvisioningProperties.POSTGRES);
+                masterProperties.append(String.format(
+                        MasterProperties.POSTGRES, persistenceUrl, 
persistenceUser, persistencePassword));
                 break;
 
             case MYSQL:
-                persistenceProperties.append(String.format(
-                        PersistenceProperties.MYSQL, persistenceUrl, 
persistenceUser, persistencePassword));
-                if (mysqlInnoDB) {
-                    
persistenceProperties.append(PersistenceProperties.MYSQL_QUARTZ_INNO_DB);
-                } else {
-                    
persistenceProperties.append(PersistenceProperties.MYSQL_QUARTZ);
-                }
+                provisioningProperties.append(ProvisioningProperties.MYSQL);
+                provisioningProperties.append(mysqlInnoDB
+                        ? ProvisioningProperties.MYSQL_QUARTZ_INNO_DB
+                        : ProvisioningProperties.MYSQL_QUARTZ);
+                masterProperties.append(String.format(
+                        MasterProperties.MYSQL, persistenceUrl, 
persistenceUser, persistencePassword));
                 break;
 
             case MARIADB:
-                persistenceProperties.append(String.format(
-                        PersistenceProperties.MARIADB, persistenceUrl, 
persistenceUser, persistencePassword));
+                provisioningProperties.append(ProvisioningProperties.MARIADB);
+                masterProperties.append(String.format(
+                        MasterProperties.MARIADB, persistenceUrl, 
persistenceUser, persistencePassword));
                 break;
 
             case ORACLE:
-                persistenceProperties.append(String.format(
-                        PersistenceProperties.ORACLE, persistenceUrl, 
persistenceUser, persistencePassword,
-                        oracleTableSpace));
+                provisioningProperties.append(ProvisioningProperties.ORACLE);
+                masterProperties.append(String.format(
+                        MasterProperties.ORACLE, schema, persistenceUrl, 
persistenceUser, persistencePassword));
                 break;
 
             case SQLSERVER:
-                persistenceProperties.append(String.format(
-                        PersistenceProperties.SQLSERVER, persistenceUrl, 
persistenceUser, persistencePassword));
+                
provisioningProperties.append(ProvisioningProperties.SQLSERVER);
+                masterProperties.append(String.format(
+                        MasterProperties.SQLSERVER, schema, persistenceUrl, 
persistenceUser, persistencePassword));
                 break;
 
             default:
         }
 
         fileSystemUtils.writeToFile(new File(
-                syncopeInstallDir + 
PROPERTIES.getProperty("persistencePropertiesFile")),
-                persistenceProperties.toString());
+                syncopeInstallDir + 
PROPERTIES.getProperty("provisioningPropertiesFile")),
+                provisioningProperties.toString());
+        fileSystemUtils.writeToFile(new File(
+                syncopeInstallDir + 
PROPERTIES.getProperty("masterPropertiesFile")),
+                masterProperties.toString());
     }
 }

http://git-wip-us.apache.org/repos/asf/syncope/blob/e2c7754a/installer/src/main/java/org/apache/syncope/installer/utilities/FileSystemUtils.java
----------------------------------------------------------------------
diff --git 
a/installer/src/main/java/org/apache/syncope/installer/utilities/FileSystemUtils.java
 
b/installer/src/main/java/org/apache/syncope/installer/utilities/FileSystemUtils.java
index b44af43..45b43d5 100644
--- 
a/installer/src/main/java/org/apache/syncope/installer/utilities/FileSystemUtils.java
+++ 
b/installer/src/main/java/org/apache/syncope/installer/utilities/FileSystemUtils.java
@@ -159,6 +159,7 @@ public class FileSystemUtils {
 
     public void copyFileFromResources(final String filePath,
             final String destination, final AbstractUIProcessHandler handler) {
+
         try {
             final URL url = getClass().getResource(filePath);
             final File dest = new File(destination);

http://git-wip-us.apache.org/repos/asf/syncope/blob/e2c7754a/installer/src/main/java/org/apache/syncope/installer/utilities/MavenUtils.java
----------------------------------------------------------------------
diff --git 
a/installer/src/main/java/org/apache/syncope/installer/utilities/MavenUtils.java
 
b/installer/src/main/java/org/apache/syncope/installer/utilities/MavenUtils.java
index 24f85dc..3a8319f 100644
--- 
a/installer/src/main/java/org/apache/syncope/installer/utilities/MavenUtils.java
+++ 
b/installer/src/main/java/org/apache/syncope/installer/utilities/MavenUtils.java
@@ -103,7 +103,7 @@ public class MavenUtils {
         if (customSettingsFile != null && FileUtils.sizeOf(customSettingsFile) 
> 0) {
             request.setUserSettingsFile(customSettingsFile);
         }
-        final List<String> mavenGoals = new ArrayList<String>();
+        final List<String> mavenGoals = new ArrayList<>();
         mavenGoals.add("clean");
         mavenGoals.add("package");
         request.setGoals(mavenGoals);
@@ -146,11 +146,7 @@ public class MavenUtils {
                     new 
PrintStream(InstallLog.getInstance().getFileAbsolutePath()), true));
             invoker.setWorkingDirectory(new File(path));
             result = invoker.execute(request);
-        } catch (MavenInvocationException ex) {
-            final String messageError = "Maven exception: " + ex.getMessage();
-            handler.emitError(messageError, messageError);
-            InstallLog.getInstance().info(messageError);
-        } catch (FileNotFoundException ex) {
+        } catch (MavenInvocationException | FileNotFoundException ex) {
             final String messageError = "Maven exception: " + ex.getMessage();
             handler.emitError(messageError, messageError);
             InstallLog.getInstance().info(messageError);

http://git-wip-us.apache.org/repos/asf/syncope/blob/e2c7754a/installer/src/main/resources/installer.properties
----------------------------------------------------------------------
diff --git a/installer/src/main/resources/installer.properties 
b/installer/src/main/resources/installer.properties
index 47a8aa6..97d07e1 100644
--- a/installer/src/main/resources/installer.properties
+++ b/installer/src/main/resources/installer.properties
@@ -20,9 +20,9 @@ urlConfig=url-config.js
 saveModel=save-model.html
 consoleResDirectory=console/src/main/resources
 pomFile=pom.xml
-persistenceContextEMFactoryFile=core/src/main/resources/persistenceContextEMFactory.xml
+masterDomainFile=core/src/main/resources/domains/MasterDomain.xml
 coreMetaInfDirectory=core/src/main/resources/META-INF
-persistencePropertiesFile=core/src/main/resources/persistence.properties
+provisioningPropertiesFile=core/src/main/resources/provisioning.properties
+masterPropertiesFile=core/src/main/resources/domains/Master.properties
 consolePropertiesFile=console.properties
 modelerPomFile=modelerPom.xml
-

http://git-wip-us.apache.org/repos/asf/syncope/blob/e2c7754a/installer/src/main/resources/izpack/ProcessPanel.Spec.xml
----------------------------------------------------------------------
diff --git a/installer/src/main/resources/izpack/ProcessPanel.Spec.xml 
b/installer/src/main/resources/izpack/ProcessPanel.Spec.xml
index 859ec18..1f8e272 100644
--- a/installer/src/main/resources/izpack/ProcessPanel.Spec.xml
+++ b/installer/src/main/resources/izpack/ProcessPanel.Spec.xml
@@ -85,8 +85,6 @@ under the License.
       <arg>$mvn.proxy.user</arg><!-- 27 -->
       <arg>$mvn.proxy.pwd</arg><!-- 28 -->
       <arg>$mvn.proxy.autoconf</arg><!-- 29 -->
-      <arg>$mvn.proxy.autoconf</arg><!-- 30 -->
-      <arg>$mvn.proxy.autoconf</arg><!-- 31 -->
     </executeclass>
   </job>
   <onFail previous="true" next="false" />

http://git-wip-us.apache.org/repos/asf/syncope/blob/e2c7754a/installer/src/main/resources/modelerPom.xml
----------------------------------------------------------------------
diff --git a/installer/src/main/resources/modelerPom.xml 
b/installer/src/main/resources/modelerPom.xml
index 56841bb..9209a9d 100644
--- a/installer/src/main/resources/modelerPom.xml
+++ b/installer/src/main/resources/modelerPom.xml
@@ -27,7 +27,7 @@ under the License.
   <packaging>jar</packaging>
    
   <properties>
-    <activiti.version>5.17</activiti.version>
+    <activiti.version>5.18.0</activiti.version>
     
<activiti-modeler.directory>${modeler.directory}</activiti-modeler.directory>
      
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>

Reply via email to