Author: massi
Date: Tue Sep 30 14:35:11 2014
New Revision: 1628457
URL: http://svn.apache.org/r1628457
Log:
Fixed #SYNCOPE-552
Added:
syncope/branches/1_2_X/installer/src/main/java/org/apache/syncope/installer/files/ModelerPom.java
syncope/branches/1_2_X/installer/src/main/java/org/apache/syncope/installer/files/ModelerTokenValueMap.java
syncope/branches/1_2_X/installer/src/main/java/org/apache/syncope/installer/files/ParentPom.java
- copied, changed from r1628456,
syncope/branches/1_2_X/installer/src/main/java/org/apache/syncope/installer/files/Pom.java
Removed:
syncope/branches/1_2_X/installer/src/main/java/org/apache/syncope/installer/files/Pom.java
Modified:
syncope/branches/1_2_X/installer/src/main/java/org/apache/syncope/installer/processes/ArchetypeProcess.java
syncope/branches/1_2_X/installer/src/main/java/org/apache/syncope/installer/processes/ContainerProcess.java
syncope/branches/1_2_X/installer/src/main/java/org/apache/syncope/installer/utilities/MavenUtils.java
syncope/branches/1_2_X/installer/src/main/resources/izpack/ProcessPanel.Spec.xml
syncope/branches/1_2_X/installer/src/main/resources/izpack/userInputLang.xml_eng
syncope/branches/1_2_X/installer/src/main/resources/izpack/userInputLang.xml_ita
syncope/branches/1_2_X/installer/src/main/resources/izpack/userInputSpec.xml
Added:
syncope/branches/1_2_X/installer/src/main/java/org/apache/syncope/installer/files/ModelerPom.java
URL:
http://svn.apache.org/viewvc/syncope/branches/1_2_X/installer/src/main/java/org/apache/syncope/installer/files/ModelerPom.java?rev=1628457&view=auto
==============================================================================
---
syncope/branches/1_2_X/installer/src/main/java/org/apache/syncope/installer/files/ModelerPom.java
(added)
+++
syncope/branches/1_2_X/installer/src/main/java/org/apache/syncope/installer/files/ModelerPom.java
Tue Sep 30 14:35:11 2014
@@ -0,0 +1,80 @@
+/*
+ * 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 class ModelerPom {
+
+ public static final String PATH = "/pom.xml";
+
+ public static final String FILE = "<?xml version=\"1.0\"
encoding=\"UTF-8\"?>\n"
+ + "<project xmlns=\"http://maven.apache.org/POM/4.0.0\"\n";
+ + "
xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\"\n";
+ + "
xsi:schemaLocation=\"http://maven.apache.org/POM/4.0.0\n";
+ + "
http://maven.apache.org/xsd/maven-4.0.0.xsd\";>\n"
+ + " <modelVersion>4.0.0</modelVersion>\n" + " \n" + "
<groupId>org.apache.syncope</groupId>\n"
+ + " <artifactId>activitiModelerSetup</artifactId>\n" + "
<version>1.0-SNAPSHOT</version>\n"
+ + " <packaging>jar</packaging>\n" + " \n" + " <properties>\n"
+ + " <activiti.version>5.16.2</activiti.version>\n"
+ + "
<activiti-modeler.directory>%s</activiti-modeler.directory>\n"
+ + "
<tokenValueMap>%s/oryx.debug.js-tokenValueMap.properties</tokenValueMap>\n" + "
\n"
+ + "
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>\n" + "
</properties>\n" + " \n"
+ + " <dependencies>\n" + " <dependency>\n" + "
<groupId>org.activiti</groupId>\n"
+ + " <artifactId>activiti-webapp-explorer2</artifactId>
\n"
+ + " <version>${activiti.version}</version>\n" + "
<type>war</type>\n"
+ + " <scope>test</scope>\n" + " </dependency> \n" + "
</dependencies>\n" + " \n"
+ + " <build> \n" + " <plugins>\n" + " <plugin>\n"
+ + " <groupId>org.apache.maven.plugins</groupId>\n"
+ + " <artifactId>maven-antrun-plugin</artifactId>\n" + "
<version>1.7</version>\n"
+ + " <executions>\n" + " <execution>\n" + "
<id>setupActivitiModeler</id>\n"
+ + " <phase>process-resources</phase>\n" + "
<configuration>\n"
+ + " <target>\n"
+ + " <unzip
src=\"${settings.localRepository}/org/activiti/activiti-webapp-explorer2/${activiti.version}/activiti-webapp-explorer2-${activiti.version}.war\"\n"
+ + "
dest=\"${project.build.directory}/activiti-webapp-explorer2\" />\n"
+ + " \n" + " <mkdir
dir=\"${activiti-modeler.directory}\" />\n"
+ + " \n" + " <mkdir
dir=\"${activiti-modeler.directory}/editor\" />\n"
+ + " <copy
todir=\"${activiti-modeler.directory}/editor\">\n"
+ + " <fileset
dir=\"${project.build.directory}/activiti-webapp-explorer2/editor\">\n"
+ + " <exclude name=\"oryx.js\" />\n" + "
</fileset>\n"
+ + " </copy>\n"
+ + " <copy
file=\"${project.build.directory}/activiti-webapp-explorer2/WEB-INF/classes/plugins.xml\"\n"
+ + "
todir=\"${activiti-modeler.directory}/editor\" />\n"
+ + " <copy
file=\"${project.build.directory}/activiti-webapp-explorer2/WEB-INF/classes/stencilset.json\"\n"
+ + "
todir=\"${activiti-modeler.directory}/editor\" />\n" + " \n"
+ + " <mkdir
dir=\"${activiti-modeler.directory}/explorer\" />\n"
+ + " <copy
todir=\"${activiti-modeler.directory}/explorer\">\n"
+ + " <fileset
dir=\"${project.build.directory}/activiti-webapp-explorer2/explorer\" />\n"
+ + " </copy>\n" + " \n"
+ + " <mkdir
dir=\"${activiti-modeler.directory}/libs\" />\n"
+ + " <copy
todir=\"${activiti-modeler.directory}/libs\">\n"
+ + " <fileset
dir=\"${project.build.directory}/activiti-webapp-explorer2/libs\" />\n"
+ + " </copy>\n" + " </target>\n" + "
</configuration>\n"
+ + " <goals>\n" + " <goal>run</goal>\n" + "
</goals>\n"
+ + " </execution>\n" + " </executions>\n" + "
</plugin>\n" + " <plugin>\n"
+ + "
<groupId>com.google.code.maven-replacer-plugin</groupId>\n"
+ + " <artifactId>replacer</artifactId>\n" + "
<version>1.5.3</version>\n"
+ + " <executions>\n" + " <execution>\n" + "
<phase>process-resources</phase>\n"
+ + " <goals>\n" + " <goal>replace</goal>\n"
+ + " </goals> \n" + "
</execution>\n" + " </executions>\n"
+ + " <configuration>\n"
+ + "
<file>${activiti-modeler.directory}/editor/oryx.debug.js</file>\n"
+ + " <tokenValueMap>${tokenValueMap}</tokenValueMap>\n" +
" <unescape>true</unescape>\n"
+ + " <regex>false</regex>\n" + "
</configuration>\n" + " </plugin>\n"
+ + " </plugins>\n" + " </build>\n" + "</project>";
+
+}
Added:
syncope/branches/1_2_X/installer/src/main/java/org/apache/syncope/installer/files/ModelerTokenValueMap.java
URL:
http://svn.apache.org/viewvc/syncope/branches/1_2_X/installer/src/main/java/org/apache/syncope/installer/files/ModelerTokenValueMap.java?rev=1628457&view=auto
==============================================================================
---
syncope/branches/1_2_X/installer/src/main/java/org/apache/syncope/installer/files/ModelerTokenValueMap.java
(added)
+++
syncope/branches/1_2_X/installer/src/main/java/org/apache/syncope/installer/files/ModelerTokenValueMap.java
Tue Sep 30 14:35:11 2014
@@ -0,0 +1,58 @@
+/*
+ * 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 class ModelerTokenValueMap {
+
+ public static final String PATH =
"/oryx.debug.js-tokenValueMap.properties";
+
+ public static final String FILE = "# 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"
+ + "ORYX.CONFIG.ROOT_PATH \\=
\"../editor/\"; //TODO: Remove last slash!!=BASE_PATH =
window.location.toString().substr(0,
window.location.toString().indexOf('/wicket'));\\nORYX.CONFIG.ROOT_PATH =
BASE_PATH + \"/activiti-modeler/editor/\";\n"
+ + "ORYX.CONFIG.EXPLORER_PATH \\=
\"../explorer\";=ORYX.CONFIG.EXPLORER_PATH = BASE_PATH +
\"/activiti-modeler/explorer\";\n"
+ + "ORYX.CONFIG.LIBS_PATH \\=
\"../libs\";=ORYX.CONFIG.LIBS_PATH = BASE_PATH +
\"/activiti-modeler/libs\";\n"
+ + "ORYX.CONFIG.SYNTAXCHECKER_URL \\==ORYX.CONFIG.PLUGINS_CONFIG =
ORYX.CONFIG.ROOT_PATH +
\"plugins.xml\";\\nORYX.CONFIG.SYNTAXCHECKER_URL =\n"
+ + "this._baseUrl \\=
\"../editor/stencilsets/bpmn2.0/\";=this._baseUrl = ORYX.CONFIG.ROOT_PATH +
\"stencilsets/bpmn2.0/\";\n"
+ + "this._source \\=
\"../stencilsets/bpmn2.0/bpmn2.0.json\";=this._source = ORYX.CONFIG.ROOT_PATH +
\"stencilsets/bpmn2.0/bpmn2.0.json\";\n"
+ + "\"../service/editor/stencilset\"=ORYX.CONFIG.ROOT_PATH +
\"stencilset.json\"\n"
+ + "ORYX.Editor.createByUrl=modelUrl = BASE_PATH +
\"/workflowDefGET\";\\nORYX.Editor.createByUrl\n"
+ +
"../explorer/src/img/signavio/smoky/logo2.png=\"+ORYX.CONFIG.EXPLORER_PATH+\"/src/img/signavio/smoky/logo2.png\n"
+ + "<a href\\=\\\\\"\"+ORYX.CONFIG.WEB_URL+\"\\\\\"
target\\=\\\\\"_self\\\\\" title\\=\\\\\"close modeler\\\\\">=<a
href=\\\\\"#\\\\\" title=\\\\\"close modeler\\\\\"
onclick=\\\\\"window.close();\\\\\">\n"
+ +
"../editor/images/close_button.png=\"+ORYX.CONFIG.ROOT_PATH+\"images/close_button.png\n"
+ + "height:16px;width:16px;margin-bottom:-4px;background:
transparent url(../libs/ext-2.0.2/resources/images/default/tree/loading.gif)
no-repeat center;=height:16px;width:16px;margin-bottom:-4px;background:
transparent
url(\"+ORYX.CONFIG.LIBS_PATH+\"/ext-2.0.2/resources/images/default/tree/loading.gif)
no-repeat center;\n"
+ + "icon: '../editor/images/add.png',=icon: ORYX.CONFIG.ROOT_PATH +
'images/add.png',\n"
+ + "icon: '../editor/images/delete.png',=icon:
ORYX.CONFIG.ROOT_PATH + 'images/delete.png',\n"
+ + "id\\=\"edit_model_title\"=id=\"edit_model_title\"
readonly=\"readonly\"\n"
+ + "id\\=\"edit_model_summary\"=id=\"edit_model_summary\"
readonly=\"readonly\"\n"
+ + "\"../service/model/\" + modelMeta.modelId + \"/json\"=BASE_PATH
+ \"/workflowDefGET\"\n"
+ + "// Send the request to the server.=saveUri = BASE_PATH +
\"/workflowDefPUT\";\\n// Send the request to the server.\n"
+ + "'Accept':\"application/json\",
'Content-Type':'charset\\=UTF-8'='Accept':\"application/json\",
'Content-Type':'application/json'";
+
+}
Copied:
syncope/branches/1_2_X/installer/src/main/java/org/apache/syncope/installer/files/ParentPom.java
(from r1628456,
syncope/branches/1_2_X/installer/src/main/java/org/apache/syncope/installer/files/Pom.java)
URL:
http://svn.apache.org/viewvc/syncope/branches/1_2_X/installer/src/main/java/org/apache/syncope/installer/files/ParentPom.java?p2=syncope/branches/1_2_X/installer/src/main/java/org/apache/syncope/installer/files/ParentPom.java&p1=syncope/branches/1_2_X/installer/src/main/java/org/apache/syncope/installer/files/Pom.java&r1=1628456&r2=1628457&rev=1628457&view=diff
==============================================================================
---
syncope/branches/1_2_X/installer/src/main/java/org/apache/syncope/installer/files/Pom.java
(original)
+++
syncope/branches/1_2_X/installer/src/main/java/org/apache/syncope/installer/files/ParentPom.java
Tue Sep 30 14:35:11 2014
@@ -18,178 +18,82 @@
*/
package org.apache.syncope.installer.files;
-public class Pom {
+public class ParentPom {
public static final String PATH = "/pom.xml";
- public static final String FILE = "<?xml version=\"1.0\"
encoding=\"UTF-8\"?><!--\n" +
-"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" +
-"\n" +
-"--><project xmlns=\"http://maven.apache.org/POM/4.0.0\";
xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\";
xsi:schemaLocation=\"http://maven.apache.org/POM/4.0.0
http://maven.apache.org/maven-v4_0_0.xsd\";>\n" +
-"\n" +
-" <modelVersion>4.0.0</modelVersion>\n" +
-"\n" +
-" <parent>\n" +
-" <groupId>org.apache.syncope</groupId>\n" +
-" <artifactId>syncope</artifactId>\n" +
-" <version xmlns=\"\">%s</version>\n" +
-" </parent>\n" +
-"\n" +
-" <properties>\n" +
-" <syncope.version xmlns=\"\">%s</syncope.version>\n" +
-" <secretKey>ahsdgausygdausygduasygd</secretKey>\n" +
-" <anonymousKey>asdasdasdasd</anonymousKey>\n" +
-" </properties>\n" +
-"\n" +
-" <name>Apache Syncope sample project</name>\n" +
-" <groupId>%s</groupId>\n" +
-" <artifactId>%s</artifactId>\n" +
-" <version>1.0-SNAPSHOT</version>\n" +
-" <packaging>pom</packaging>\n" +
-"\n" +
-" <dependencyManagement>\n" +
-" <dependencies>\n" +
-" <dependency>\n" +
-" <groupId>org.apache.syncope</groupId>\n" +
-" <artifactId>syncope-common</artifactId>\n" +
-" <version>${syncope.version}</version>\n" +
-" </dependency> \n" +
-" \n" +
-" <dependency>\n" +
-" <groupId>org.apache.syncope</groupId>\n" +
-" <artifactId>syncope-common</artifactId>\n" +
-" <version>${syncope.version}</version>\n" +
-" <classifier>javadoc</classifier>\n" +
-" </dependency>\n" +
-"\n" +
-" <dependency>\n" +
-" <groupId>org.apache.syncope</groupId>\n" +
-" <artifactId>syncope-client</artifactId>\n" +
-" <version>${syncope.version}</version>\n" +
-" </dependency> \n" +
-"\n" +
-" <dependency>\n" +
-" <groupId>org.apache.syncope</groupId>\n" +
-" <artifactId>syncope-build-tools</artifactId>\n" +
-" <version>${syncope.version}</version>\n" +
-" <type>war</type>\n" +
-" <scope>test</scope>\n" +
-" </dependency> \n" +
-" \n" +
-" <dependency>\n" +
-" <groupId>org.apache.syncope</groupId>\n" +
-" <artifactId>syncope-core</artifactId>\n" +
-" <version>${syncope.version}</version>\n" +
-" <type>war</type>\n" +
-" </dependency> \n" +
-" <dependency>\n" +
-" <groupId>org.apache.syncope</groupId>\n" +
-" <artifactId>syncope-core</artifactId>\n" +
-" <version>${syncope.version}</version>\n" +
-" <classifier>classes</classifier>\n" +
-" <scope>provided</scope>\n" +
-" </dependency> \n" +
-"\n" +
-" <dependency>\n" +
-" <groupId>org.apache.syncope</groupId>\n" +
-" <artifactId>syncope-console</artifactId>\n" +
-" <version>${syncope.version}</version>\n" +
-" <type>war</type>\n" +
-" </dependency> \n" +
-" <dependency>\n" +
-" <groupId>org.apache.syncope</groupId>\n" +
-" <artifactId>syncope-console</artifactId>\n" +
-" <version>${syncope.version}</version>\n" +
-" <classifier>classes</classifier>\n" +
-" <scope>provided</scope>\n" +
-" </dependency> \n" +
-" </dependencies>\n" +
-" </dependencyManagement>\n" +
-" \n" +
-" <build>\n" +
-" \n" +
-" <pluginManagement>\n" +
-" <plugins>\n" +
-" <!-- Disable LICENSE / NOTICE inclusion: see SYNCOPE-84 -->\n" +
-" <plugin>\n" +
-" <groupId>org.apache.maven.plugins</groupId>\n" +
-" <artifactId>maven-war-plugin</artifactId>\n" +
-" <inherited>false</inherited>\n" +
-" <configuration>\n" +
-" <webResources>\n" +
-" <resource>\n" +
-" <directory>src/main/webapp</directory>\n" +
-" <includes>\n" +
-" <include>**/*.jsp</include>\n" +
-" </includes>\n" +
-" <filtering>true</filtering>\n" +
-" </resource>\n" +
-" </webResources>\n" +
-" </configuration>\n" +
-" </plugin>\n" +
-" </plugins>\n" +
-" </pluginManagement>\n" +
-" \n" +
-" <!-- Disable legal check for generated projects: see SYNCOPE-84 -->\n" +
-" <plugins>\n" +
-" <plugin>\n" +
-" <groupId>org.codehaus.mojo</groupId>\n" +
-" <artifactId>ianal-maven-plugin</artifactId>\n" +
-" <inherited>true</inherited>\n" +
-" <executions>\n" +
-" <execution> \n" +
-" <goals>\n" +
-" <goal>verify-legal-files</goal>\n" +
-" </goals>\n" +
-" <phase>none</phase>\n" +
-" </execution>\n" +
-" </executions>\n" +
-" </plugin>\n" +
-" <plugin>\n" +
-" <groupId>org.apache.rat</groupId>\n" +
-" <artifactId>apache-rat-plugin</artifactId>\n" +
-" <inherited>true</inherited>\n" +
-" <executions>\n" +
-" <execution>\n" +
-" <goals>\n" +
-" <goal>check</goal>\n" +
-" </goals>\n" +
-" <phase>none</phase>\n" +
-" </execution>\n" +
-" </executions>\n" +
-" </plugin>\n" +
-" </plugins>\n" +
-" </build>\n" +
-"<repositories>\n" +
-" <repository>\n" +
-" <id>ASF</id>\n" +
-"
<url>https://repository.apache.org/content/repositories/snapshots/</url>\n" +
-" <snapshots>\n" +
-" <enabled>true</enabled>\n" +
-" </snapshots>\n" +
-" </repository>\n" +
-"</repositories>\n" +
-" \n" +
-" <modules>\n" +
-" <module>core</module>\n" +
-" <module>console</module>\n" +
-" </modules>\n" +
-"\n" +
-"</project>";
+ public static final String FILE = "<?xml version=\"1.0\"
encoding=\"UTF-8\"?><!--\n"
+ + "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" + "\n"
+ + "--><project xmlns=\"http://maven.apache.org/POM/4.0.0\";
xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\";
xsi:schemaLocation=\"http://maven.apache.org/POM/4.0.0
http://maven.apache.org/maven-v4_0_0.xsd\";>\n"
+ + "\n" + " <modelVersion>4.0.0</modelVersion>\n" + "\n" + "
<parent>\n"
+ + " <groupId>org.apache.syncope</groupId>\n" + "
<artifactId>syncope</artifactId>\n"
+ + " <version xmlns=\"\">%s</version>\n" + " </parent>\n" +
"\n" + " <properties>\n"
+ + " <syncope.version xmlns=\"\">%s</syncope.version>\n"
+ + " <secretKey>ahsdgausygdausygduasygd</secretKey>\n" + "
<anonymousKey>asdasdasdasd</anonymousKey>\n"
+ + " </properties>\n" + "\n" + " <name>Apache Syncope sample
project</name>\n"
+ + " <groupId>%s</groupId>\n" + " <artifactId>%s</artifactId>\n"
+ " <version>1.0-SNAPSHOT</version>\n"
+ + " <packaging>pom</packaging>\n" + "\n" + "
<dependencyManagement>\n" + " <dependencies>\n"
+ + " <dependency>\n" + "
<groupId>org.apache.syncope</groupId>\n"
+ + " <artifactId>syncope-common</artifactId>\n" + "
<version>${syncope.version}</version>\n"
+ + " </dependency> \n" + " \n" + " <dependency>\n"
+ + " <groupId>org.apache.syncope</groupId>\n" + "
<artifactId>syncope-common</artifactId>\n"
+ + " <version>${syncope.version}</version>\n" + "
<classifier>javadoc</classifier>\n"
+ + " </dependency>\n" + "\n" + " <dependency>\n"
+ + " <groupId>org.apache.syncope</groupId>\n" + "
<artifactId>syncope-client</artifactId>\n"
+ + " <version>${syncope.version}</version>\n" + "
</dependency> \n" + "\n"
+ + " <dependency>\n" + "
<groupId>org.apache.syncope</groupId>\n"
+ + " <artifactId>syncope-build-tools</artifactId>\n"
+ + " <version>${syncope.version}</version>\n" + "
<type>war</type>\n"
+ + " <scope>test</scope>\n" + " </dependency> \n" + "
\n" + " <dependency>\n"
+ + " <groupId>org.apache.syncope</groupId>\n" + "
<artifactId>syncope-core</artifactId>\n"
+ + " <version>${syncope.version}</version>\n" + "
<type>war</type>\n"
+ + " </dependency> \n" + " <dependency>\n" + "
<groupId>org.apache.syncope</groupId>\n"
+ + " <artifactId>syncope-core</artifactId>\n" + "
<version>${syncope.version}</version>\n"
+ + " <classifier>classes</classifier>\n" + "
<scope>provided</scope>\n"
+ + " </dependency> \n" + "\n" + " <dependency>\n"
+ + " <groupId>org.apache.syncope</groupId>\n" + "
<artifactId>syncope-console</artifactId>\n"
+ + " <version>${syncope.version}</version>\n" + "
<type>war</type>\n"
+ + " </dependency> \n" + " <dependency>\n" + "
<groupId>org.apache.syncope</groupId>\n"
+ + " <artifactId>syncope-console</artifactId>\n" + "
<version>${syncope.version}</version>\n"
+ + " <classifier>classes</classifier>\n" + "
<scope>provided</scope>\n"
+ + " </dependency> \n" + " </dependencies>\n" + "
</dependencyManagement>\n" + " \n"
+ + " <build>\n" + " \n" + " <pluginManagement>\n" + "
<plugins>\n"
+ + " <!-- Disable LICENSE / NOTICE inclusion: see SYNCOPE-84
-->\n" + " <plugin>\n"
+ + " <groupId>org.apache.maven.plugins</groupId>\n"
+ + " <artifactId>maven-war-plugin</artifactId>\n" + "
<inherited>false</inherited>\n"
+ + " <configuration>\n" + " <webResources>\n" +
" <resource>\n"
+ + " <directory>src/main/webapp</directory>\n" + "
<includes>\n"
+ + " <include>**/*.jsp</include>\n" + "
</includes>\n"
+ + " <filtering>true</filtering>\n" + "
</resource>\n"
+ + " </webResources>\n" + " </configuration>\n"
+ " </plugin>\n"
+ + " </plugins>\n" + " </pluginManagement>\n" + " \n"
+ + " <!-- Disable legal check for generated projects: see
SYNCOPE-84 -->\n" + " <plugins>\n"
+ + " <plugin>\n" + "
<groupId>org.codehaus.mojo</groupId>\n"
+ + " <artifactId>ianal-maven-plugin</artifactId>\n" + "
<inherited>true</inherited>\n"
+ + " <executions>\n" + " <execution> \n"
+ " <goals>\n"
+ + " <goal>verify-legal-files</goal>\n" + "
</goals>\n"
+ + " <phase>none</phase>\n" + " </execution>\n"
+ " </executions>\n"
+ + " </plugin>\n" + " <plugin>\n" + "
<groupId>org.apache.rat</groupId>\n"
+ + " <artifactId>apache-rat-plugin</artifactId>\n" + "
<inherited>true</inherited>\n"
+ + " <executions>\n" + " <execution>\n" + "
<goals>\n"
+ + " <goal>check</goal>\n" + " </goals>\n"
+ " <phase>none</phase>\n"
+ + " </execution>\n" + " </executions>\n" + "
</plugin>\n" + " </plugins>\n"
+ + " </build>\n" + "<repositories>\n" + " <repository>\n" + "
<id>ASF</id>\n"
+ + "
<url>https://repository.apache.org/content/repositories/snapshots/</url>\n" + "
<snapshots>\n"
+ + " <enabled>true</enabled>\n" + " </snapshots>\n" + "
</repository>\n" + "</repositories>\n"
+ + " \n" + " <modules>\n" + " <module>core</module>\n" + "
<module>console</module>\n"
+ + " </modules>\n" + "\n" + "</project>";
}
Modified:
syncope/branches/1_2_X/installer/src/main/java/org/apache/syncope/installer/processes/ArchetypeProcess.java
URL:
http://svn.apache.org/viewvc/syncope/branches/1_2_X/installer/src/main/java/org/apache/syncope/installer/processes/ArchetypeProcess.java?rev=1628457&r1=1628456&r2=1628457&view=diff
==============================================================================
---
syncope/branches/1_2_X/installer/src/main/java/org/apache/syncope/installer/processes/ArchetypeProcess.java
(original)
+++
syncope/branches/1_2_X/installer/src/main/java/org/apache/syncope/installer/processes/ArchetypeProcess.java
Tue Sep 30 14:35:11 2014
@@ -24,7 +24,9 @@ import java.io.File;
import java.io.IOException;
import javax.xml.parsers.ParserConfigurationException;
import javax.xml.transform.TransformerException;
-import org.apache.syncope.installer.files.Pom;
+import org.apache.syncope.installer.files.ModelerPom;
+import org.apache.syncope.installer.files.ModelerTokenValueMap;
+import org.apache.syncope.installer.files.ParentPom;
import org.apache.syncope.installer.utilities.InstallLog;
import org.apache.syncope.installer.utilities.MavenUtils;
import org.xml.sax.SAXException;
@@ -41,14 +43,15 @@ public class ArchetypeProcess {
final String confDirectory = args[6];
final String logsDirectory = args[7];
final String bundlesDirectory = args[8];
- final String syncopeVersion = args[9];
- final String syncopeAdminPassword = args[10];
- final boolean isProxyEnabled = Boolean.valueOf(args[11]);
- final String proxyHost = args[12];
- final String proxyPort = args[13];
- final String proxyUser = args[14];
- final String proxyPwd = args[15];
- final boolean mavenProxyAutoconf = Boolean.valueOf(args[16]);
+ final String modelerDirectory = args[9];
+ final String syncopeVersion = args[10];
+ final String syncopeAdminPassword = args[11];
+ final boolean isProxyEnabled = Boolean.valueOf(args[12]);
+ final String proxyHost = args[13];
+ final String proxyPort = args[14];
+ final String proxyUser = args[15];
+ final String proxyPwd = args[16];
+ final boolean mavenProxyAutoconf = Boolean.valueOf(args[17]);
final FileSystemUtils fileSystemUtils = new FileSystemUtils(handler);
fileSystemUtils.createDirectory(installPath);
@@ -92,12 +95,17 @@ public class ArchetypeProcess {
mavenUtils.archetypeGenerate(
syncopeVersion, groupId, artifactId, secretKey, anonymousKey,
installPath, customMavenProxySettings);
- fileSystemUtils.writeToFile(new File(installPath + "/" + artifactId +
Pom.PATH),
- String.format(Pom.FILE, syncopeVersion, syncopeVersion,
groupId, artifactId));
+ fileSystemUtils.writeToFile(new File(installPath + "/" + artifactId +
ParentPom.PATH),
+ String.format(ParentPom.FILE, syncopeVersion, syncopeVersion,
groupId, artifactId));
fileSystemUtils.createDirectory(confDirectory);
fileSystemUtils.createDirectory(logsDirectory);
fileSystemUtils.createDirectory(bundlesDirectory);
- mavenUtils.createPackage(installPath + "/" + artifactId,
confDirectory, logsDirectory, bundlesDirectory,
- customMavenProxySettings);
+ fileSystemUtils.createDirectory(modelerDirectory);
+ fileSystemUtils.writeToFile(new File(modelerDirectory +
ModelerPom.PATH),
+ String.format(ModelerPom.FILE, modelerDirectory,
modelerDirectory));
+ fileSystemUtils.writeToFile(new File(modelerDirectory +
ModelerTokenValueMap.PATH), ModelerTokenValueMap.FILE);
+ mavenUtils.mvnCleanPackage(modelerDirectory, customMavenProxySettings);
+ mavenUtils.mvnCleanPackageWithProperties(
+ installPath + "/" + artifactId, confDirectory, logsDirectory,
bundlesDirectory, customMavenProxySettings);
}
}
Modified:
syncope/branches/1_2_X/installer/src/main/java/org/apache/syncope/installer/processes/ContainerProcess.java
URL:
http://svn.apache.org/viewvc/syncope/branches/1_2_X/installer/src/main/java/org/apache/syncope/installer/processes/ContainerProcess.java?rev=1628457&r1=1628456&r2=1628457&view=diff
==============================================================================
---
syncope/branches/1_2_X/installer/src/main/java/org/apache/syncope/installer/processes/ContainerProcess.java
(original)
+++
syncope/branches/1_2_X/installer/src/main/java/org/apache/syncope/installer/processes/ContainerProcess.java
Tue Sep 30 14:35:11 2014
@@ -178,7 +178,7 @@ public class ContainerProcess {
InstallLog.getInstance().error(messageError.append(ex.getMessage()
== null ? "" : ex.getMessage()).
toString());
}
- mavenUtils.createPackage(installPath + "/" + artifactId,
confDirectory, logsDirectory, bundlesDirectory,
+ mavenUtils.mvnCleanPackageWithProperties(installPath + "/" +
artifactId, confDirectory, logsDirectory, bundlesDirectory,
customMavenProxySettings);
if (isProxyEnabled && mavenProxyAutoconf) {
FileSystemUtils.delete(customMavenProxySettings);
Modified:
syncope/branches/1_2_X/installer/src/main/java/org/apache/syncope/installer/utilities/MavenUtils.java
URL:
http://svn.apache.org/viewvc/syncope/branches/1_2_X/installer/src/main/java/org/apache/syncope/installer/utilities/MavenUtils.java?rev=1628457&r1=1628456&r2=1628457&view=diff
==============================================================================
---
syncope/branches/1_2_X/installer/src/main/java/org/apache/syncope/installer/utilities/MavenUtils.java
(original)
+++
syncope/branches/1_2_X/installer/src/main/java/org/apache/syncope/installer/utilities/MavenUtils.java
Tue Sep 30 14:35:11 2014
@@ -86,7 +86,21 @@ public class MavenUtils {
return properties;
}
- public void createPackage(final String path, final String confDirectory,
+ public void mvnCleanPackage(final String path, final File
customSettingsFile) {
+ final InvocationRequest request = new DefaultInvocationRequest();
+ if (customSettingsFile != null && FileUtils.sizeOf(customSettingsFile)
> 0) {
+ request.setUserSettingsFile(customSettingsFile);
+ }
+ final List<String> mavenGoals = new ArrayList<String>();
+ mavenGoals.add("clean");
+ mavenGoals.add("package");
+ request.setGoals(mavenGoals);
+ logToHandler(request.getGoals(), new Properties());
+ logToFile(request.getGoals(), new Properties());
+ invoke(request, path);
+ }
+
+ public void mvnCleanPackageWithProperties(final String path, final String
confDirectory,
final String logDirectory, final String bundlesDirectory, final
File customSettingsFile) {
final InvocationRequest request = new DefaultInvocationRequest();
final Properties properties = packageProperties(confDirectory,
logDirectory, bundlesDirectory);
Modified:
syncope/branches/1_2_X/installer/src/main/resources/izpack/ProcessPanel.Spec.xml
URL:
http://svn.apache.org/viewvc/syncope/branches/1_2_X/installer/src/main/resources/izpack/ProcessPanel.Spec.xml?rev=1628457&r1=1628456&r2=1628457&view=diff
==============================================================================
---
syncope/branches/1_2_X/installer/src/main/resources/izpack/ProcessPanel.Spec.xml
(original)
+++
syncope/branches/1_2_X/installer/src/main/resources/izpack/ProcessPanel.Spec.xml
Tue Sep 30 14:35:11 2014
@@ -21,23 +21,24 @@ under the License.
<logfiledir>$INSTALL_PATH</logfiledir>
<job name="Archetype creation...">
<executeclass
name="org.apache.syncope.installer.processes.ArchetypeProcess">
- <arg>$INSTALL_PATH</arg>
- <arg>$mvn.directory</arg>
- <arg>$mvn.groupid</arg>
- <arg>$mvn.artifactid</arg>
- <arg>$mvn.secretkey</arg>
- <arg>$mvn.anonymous.key</arg>
- <arg>$mvn.conf.directory</arg>
- <arg>$mvn.log.directory</arg>
- <arg>$mvn.bundle.directory</arg>
- <arg>$mvn.syncope.version</arg>
- <arg>$mvn.syncope.admin.password</arg>
- <arg>$mvn.proxy</arg><!-- 11 -->
- <arg>$mvn.proxy.host</arg><!-- 12 -->
- <arg>$mvn.proxy.port</arg><!-- 13 -->
- <arg>$mvn.proxy.user</arg><!-- 14 -->
- <arg>$mvn.proxy.pwd</arg><!-- 15 -->
- <arg>$mvn.proxy.autoconf</arg><!-- 16 -->
+ <arg>$INSTALL_PATH</arg><!-- 0 -->
+ <arg>$mvn.directory</arg><!-- 1 -->
+ <arg>$mvn.groupid</arg><!-- 2 -->
+ <arg>$mvn.artifactid</arg><!-- 3 -->
+ <arg>$mvn.secretkey</arg><!-- 4 -->
+ <arg>$mvn.anonymous.key</arg><!-- 5 -->
+ <arg>$mvn.conf.directory</arg><!-- 6 -->
+ <arg>$mvn.log.directory</arg><!-- 7 -->
+ <arg>$mvn.bundle.directory</arg><!-- 8 -->
+ <arg>$mvn.modeler.directory</arg><!-- 9 -->
+ <arg>$mvn.syncope.version</arg><!-- 10 -->
+ <arg>$mvn.syncope.admin.password</arg><!-- 11 -->
+ <arg>$mvn.proxy</arg><!-- 12 -->
+ <arg>$mvn.proxy.host</arg><!-- 13 -->
+ <arg>$mvn.proxy.port</arg><!-- 14 -->
+ <arg>$mvn.proxy.user</arg><!-- 15 -->
+ <arg>$mvn.proxy.pwd</arg><!-- 16 -->
+ <arg>$mvn.proxy.autoconf</arg><!-- 17 -->
</executeclass>
</job>
<job name="Persistence configuration...">
Modified:
syncope/branches/1_2_X/installer/src/main/resources/izpack/userInputLang.xml_eng
URL:
http://svn.apache.org/viewvc/syncope/branches/1_2_X/installer/src/main/resources/izpack/userInputLang.xml_eng?rev=1628457&r1=1628456&r2=1628457&view=diff
==============================================================================
---
syncope/branches/1_2_X/installer/src/main/resources/izpack/userInputLang.xml_eng
(original)
+++
syncope/branches/1_2_X/installer/src/main/resources/izpack/userInputLang.xml_eng
Tue Sep 30 14:35:11 2014
@@ -26,6 +26,7 @@ under the License.
<str id="archetype.mvn.conf.directory" txt="Conf directory name:"/>
<str id="archetype.mvn.log.directory" txt="Log directory name:"/>
<str id="archetype.mvn.bundle.directory" txt="Bundle directory name:"/>
+ <str id="archetype.mvn.modeler.directory" txt="Activity modeler directory
name:"/>
<str id="mvn.syncope.version.id" txt="Syncope Version:"/>
<str id="mvn.syncope.admin.password.id" txt="Admin Password:"/>
<str id="mvn.proxy.id" txt="Use Proxy Server:"/>
Modified:
syncope/branches/1_2_X/installer/src/main/resources/izpack/userInputLang.xml_ita
URL:
http://svn.apache.org/viewvc/syncope/branches/1_2_X/installer/src/main/resources/izpack/userInputLang.xml_ita?rev=1628457&r1=1628456&r2=1628457&view=diff
==============================================================================
---
syncope/branches/1_2_X/installer/src/main/resources/izpack/userInputLang.xml_ita
(original)
+++
syncope/branches/1_2_X/installer/src/main/resources/izpack/userInputLang.xml_ita
Tue Sep 30 14:35:11 2014
@@ -26,6 +26,7 @@ under the License.
<str id="archetype.mvn.conf.directory" txt="Conf directory name:"/>
<str id="archetype.mvn.log.directory" txt="Log directory name:"/>
<str id="archetype.mvn.bundle.directory" txt="Bundle directory name:"/>
+ <str id="archetype.mvn.modeler.directory" txt="Activity modeler directory
name:"/>
<str id="mvn.syncope.version.id" txt="Syncope Version:"/>
<str id="mvn.syncope.admin.password.id" txt="Admin Password:"/>
<str id="mvn.proxy.id" txt="Usa un Server Proxy:"/>
Modified:
syncope/branches/1_2_X/installer/src/main/resources/izpack/userInputSpec.xml
URL:
http://svn.apache.org/viewvc/syncope/branches/1_2_X/installer/src/main/resources/izpack/userInputSpec.xml?rev=1628457&r1=1628456&r2=1628457&view=diff
==============================================================================
---
syncope/branches/1_2_X/installer/src/main/resources/izpack/userInputSpec.xml
(original)
+++
syncope/branches/1_2_X/installer/src/main/resources/izpack/userInputSpec.xml
Tue Sep 30 14:35:11 2014
@@ -52,6 +52,10 @@ under the License.
<spec id="archetype.mvn.log.directory" size="20"
set="/var/tmp/syncope/log" mustExist="false" create="true"/>
</field>
<field type="space"/>
+ <field type="dir" variable="mvn.modeler.directory">
+ <spec id="archetype.mvn.modeler.directory" size="20"
set="/var/tmp/syncope/modeler" mustExist="false" create="true"/>
+ </field>
+ <field type="space"/>
<field type="dir" variable="mvn.bundle.directory">
<spec id="archetype.mvn.bundle.directory" size="20"
set="/var/tmp/syncope/bundles" mustExist="false" create="true"/>
</field>
