[SYNCOPE-637] Removing (incomplete) support for selecting Camel Provisioning Manager, as keep adding support for future extensions might not be simply feasible
Project: http://git-wip-us.apache.org/repos/asf/syncope/repo Commit: http://git-wip-us.apache.org/repos/asf/syncope/commit/9d0442e5 Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/9d0442e5 Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/9d0442e5 Branch: refs/heads/master Commit: 9d0442e5ee8c8d7d88efa9e89ce3a5b779f2e014 Parents: 5069b32 Author: Francesco Chicchiriccò <ilgro...@apache.org> Authored: Mon Mar 27 17:24:18 2017 +0200 Committer: Francesco Chicchiriccò <ilgro...@apache.org> Committed: Mon Mar 27 17:42:58 2017 +0200 ---------------------------------------------------------------------- .../apache/syncope/installer/files/CorePom.java | 19 ------------------- .../installer/processes/ArchetypeProcess.java | 16 ---------------- .../main/resources/izpack/ProcessPanel.Spec.xml | 1 - .../main/resources/izpack/userInputLang.xml_eng | 7 +++---- .../main/resources/izpack/userInputLang.xml_ita | 7 +++---- .../src/main/resources/izpack/userInputSpec.xml | 3 --- 6 files changed, 6 insertions(+), 47 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/syncope/blob/9d0442e5/installer/src/main/java/org/apache/syncope/installer/files/CorePom.java ---------------------------------------------------------------------- diff --git a/installer/src/main/java/org/apache/syncope/installer/files/CorePom.java b/installer/src/main/java/org/apache/syncope/installer/files/CorePom.java index 36b4d37..5a9f392 100644 --- a/installer/src/main/java/org/apache/syncope/installer/files/CorePom.java +++ b/installer/src/main/java/org/apache/syncope/installer/files/CorePom.java @@ -29,25 +29,6 @@ public final class CorePom { + " </dependency>\n" + " </dependencies>\n"; - public static final String CAMEL_PLACEHOLDER = "</dependencies>"; - - public static final String CAMEL_CONTENT_TO_ADD = " <dependency>\n" - + " <groupId>org.apache.syncope.ext.camel</groupId>\n" - + " <artifactId>syncope-ext-camel-rest-cxf</artifactId>\n" - + " <version>${syncope.version}</version>\n" - + " </dependency>\n" - + " <dependency>\n" - + " <groupId>org.apache.syncope.ext.camel</groupId>\n" - + " <artifactId>syncope-ext-camel-persistence-jpa</artifactId>\n" - + " <version>${syncope.version}</version>\n" - + " </dependency>\n" - + " <dependency>\n" - + " <groupId>org.apache.syncope.ext.camel</groupId>\n" - + " <artifactId>syncope-ext-camel-provisioning</artifactId>\n" - + " <version>${syncope.version}</version>\n" - + " </dependency>\n" - + " </dependencies>\n"; - public static final String ACTIVITI_PLACEHOLDER = " <dependency>\n" + " <groupId>org.apache.syncope.core</groupId>\n" + " <artifactId>syncope-core-workflow-activiti</artifactId>\n" http://git-wip-us.apache.org/repos/asf/syncope/blob/9d0442e5/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 fcf0429..810295b 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 @@ -55,7 +55,6 @@ public class ArchetypeProcess extends BaseProcess { final boolean mavenProxyAutoconf = Boolean.valueOf(args[17]); final boolean swagger = Boolean.valueOf(args[18]); final boolean activiti = Boolean.valueOf(args[19]); - final boolean camel = Boolean.valueOf(args[20]); setSyncopeInstallDir(installPath, artifactId); @@ -117,21 +116,6 @@ public class ArchetypeProcess extends BaseProcess { fileSystemUtils.writeToFile(pomFile, contentPomFile); } - if (camel) { - final File pomFile = new File( - syncopeInstallDir - + File.separator - + "core" - + File.separator - + PROPERTIES.getProperty("pomFile")); - String contentPomFile = fileSystemUtils.readFile(pomFile); - contentPomFile = contentPomFile.replace(CorePom.CAMEL_PLACEHOLDER, CorePom.CAMEL_CONTENT_TO_ADD); - - fileSystemUtils.writeToFile(pomFile, contentPomFile); - fileSystemUtils.copyFileFromResources("/provisioning.properties", - syncopeInstallDir + PROPERTIES.getProperty("provisioningPropertiesFile"), handler); - } - fileSystemUtils.createDirectory(confDirectory); fileSystemUtils.createDirectory(logsDirectory); fileSystemUtils.createDirectory(bundlesDirectory); http://git-wip-us.apache.org/repos/asf/syncope/blob/9d0442e5/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 fed9b7b..075c2a1 100644 --- a/installer/src/main/resources/izpack/ProcessPanel.Spec.xml +++ b/installer/src/main/resources/izpack/ProcessPanel.Spec.xml @@ -46,7 +46,6 @@ under the License. <arg>$mvn.proxy.autoconf</arg><!-- 17 --> <arg>$options.swagger</arg><!-- 18 --> <arg>$options.activiti.workflow.adapter</arg><!-- 19 --> - <arg>$options.camel</arg><!-- 20 --> </executeclass> </job> <job name="Persistence configuration..."> http://git-wip-us.apache.org/repos/asf/syncope/blob/9d0442e5/installer/src/main/resources/izpack/userInputLang.xml_eng ---------------------------------------------------------------------- diff --git a/installer/src/main/resources/izpack/userInputLang.xml_eng b/installer/src/main/resources/izpack/userInputLang.xml_eng index 0bbc4b9..74a1469 100644 --- a/installer/src/main/resources/izpack/userInputLang.xml_eng +++ b/installer/src/main/resources/izpack/userInputLang.xml_eng @@ -18,9 +18,9 @@ specific language governing permissions and limitations under the License. --> <izpack:langpack version="5.0" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; - xmlns:izpack="http://izpack.org/schema/langpack"; - xsi:schemaLocation="http://izpack.org/schema/langpack + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; + xmlns:izpack="http://izpack.org/schema/langpack"; + xsi:schemaLocation="http://izpack.org/schema/langpack http://izpack.org/schema/5.0/izpack-langpack-5.0.xsd";> <str id="mvn.directory.id" txt="Maven home directory:"/> @@ -44,7 +44,6 @@ under the License. <str id="options.swagger.id" txt="Swagger"/> <str id="options.activiti.workflow.adapter.id" txt="Activiti workflow adapter"/> - <str id="options.camel.id" txt="Apache Camel provisioning manager"/> <str id="persistence.jdbc.url" txt="Database JDBC url:"/> <str id="persistence.db.user" txt="Username:"/> http://git-wip-us.apache.org/repos/asf/syncope/blob/9d0442e5/installer/src/main/resources/izpack/userInputLang.xml_ita ---------------------------------------------------------------------- diff --git a/installer/src/main/resources/izpack/userInputLang.xml_ita b/installer/src/main/resources/izpack/userInputLang.xml_ita index d92e478..b7c068a 100644 --- a/installer/src/main/resources/izpack/userInputLang.xml_ita +++ b/installer/src/main/resources/izpack/userInputLang.xml_ita @@ -18,9 +18,9 @@ specific language governing permissions and limitations under the License. --> <izpack:langpack version="5.0" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; - xmlns:izpack="http://izpack.org/schema/langpack"; - xsi:schemaLocation="http://izpack.org/schema/langpack + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; + xmlns:izpack="http://izpack.org/schema/langpack"; + xsi:schemaLocation="http://izpack.org/schema/langpack http://izpack.org/schema/5.0/izpack-langpack-5.0.xsd";> <str id="mvn.directory.id" txt="Maven home directory:"/> @@ -44,7 +44,6 @@ under the License. <str id="options.swagger.id" txt="Swagger"/> <str id="options.activiti.workflow.adapter.id" txt="Activiti workflow adapter"/> - <str id="options.camel.id" txt="Apache Camel provisioning manager"/> <str id="persistence.jdbc.url" txt="Database JDBC url:"/> <str id="persistence.db.user" txt="Username:"/> http://git-wip-us.apache.org/repos/asf/syncope/blob/9d0442e5/installer/src/main/resources/izpack/userInputSpec.xml ---------------------------------------------------------------------- diff --git a/installer/src/main/resources/izpack/userInputSpec.xml b/installer/src/main/resources/izpack/userInputSpec.xml index bb3241d..cc921bc 100644 --- a/installer/src/main/resources/izpack/userInputSpec.xml +++ b/installer/src/main/resources/izpack/userInputSpec.xml @@ -110,9 +110,6 @@ under the License. <field type="check" variable="options.swagger"> <spec id="options.swagger.id" true="true" false="false" set="false"/> </field> - <field type="check" variable="options.camel"> - <spec id="options.camel.id" true="true" false="false" set="false"/> - </field> <field type="check" variable="options.activiti.workflow.adapter"> <spec id="options.activiti.workflow.adapter.id" true="true" false="false" set="true"/> </field>
