You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@syncope.apache.org by il...@apache.org on 2016/04/20 17:30:34 UTC
syncope git commit: [SYNCOPE-781] Fix
Repository: syncope
Updated Branches:
refs/heads/master 67d12d48b -> 49533dcea
[SYNCOPE-781] Fix
Project: http://git-wip-us.apache.org/repos/asf/syncope/repo
Commit: http://git-wip-us.apache.org/repos/asf/syncope/commit/49533dce
Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/49533dce
Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/49533dce
Branch: refs/heads/master
Commit: 49533dcead2543d298dce9b825c6fb7792c71c12
Parents: 67d12d4
Author: Francesco Chicchiriccò <il...@apache.org>
Authored: Wed Apr 20 15:51:29 2016 +0200
Committer: Francesco Chicchiriccò <il...@apache.org>
Committed: Wed Apr 20 15:51:29 2016 +0200
----------------------------------------------------------------------
installer/pom.xml | 1 -
.../syncope/installer/processes/ArchetypeProcess.java | 13 +++++++------
.../syncope/installer/utilities/FileSystemUtils.java | 7 ++-----
installer/src/main/resources/modelerPom.xml | 14 +++++++++-----
4 files changed, 18 insertions(+), 17 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/syncope/blob/49533dce/installer/pom.xml
----------------------------------------------------------------------
diff --git a/installer/pom.xml b/installer/pom.xml
index 76ea3e8..debc8ff 100644
--- a/installer/pom.xml
+++ b/installer/pom.xml
@@ -180,7 +180,6 @@ under the License.
<include>installer.properties</include>
<include>modelerPom.xml</include>
</includes>
- <filtering>true</filtering>
</resource>
<resource>
<directory>${basedir}/../fit/core-reference/src/main/resources/jboss/domains</directory>
http://git-wip-us.apache.org/repos/asf/syncope/blob/49533dce/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 66ca035..fcf0429 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
@@ -138,14 +138,15 @@ public class ArchetypeProcess extends BaseProcess {
fileSystemUtils.createDirectory(modelerDirectory);
if (activiti) {
- fileSystemUtils.copyFileFromResources(File.separator + PROPERTIES.getProperty("modelerPomFile"),
+ fileSystemUtils.copyFileFromResources(
+ File.separator + PROPERTIES.getProperty("modelerPomFile"),
modelerDirectory + File.separator + PROPERTIES.getProperty("pomFile"), handler);
- final File modelerPomFile = new File(modelerDirectory + File.separator + PROPERTIES.getProperty("pomFile"));
+ File modelerPomFile = new File(modelerDirectory + File.separator + PROPERTIES.getProperty("pomFile"));
- final String contentModelerPomFile = fileSystemUtils.readFile(modelerPomFile);
- fileSystemUtils.
- writeToFile(modelerPomFile, String.format(contentModelerPomFile, modelerDirectory));
+ String contentModelerPomFile =
+ fileSystemUtils.readFile(modelerPomFile).replace("${syncope.version}", syncopeVersion);
+ fileSystemUtils.writeToFile(modelerPomFile, String.format(contentModelerPomFile, modelerDirectory));
fileSystemUtils.copyFile(
syncopeInstallDir
+ PROPERTIES.getProperty("consoleResDirectory")
@@ -158,7 +159,7 @@ public class ArchetypeProcess extends BaseProcess {
modelerDirectory + File.separator + PROPERTIES.getProperty("saveModel"));
final Properties modelerProperties = new Properties();
- modelerProperties.setProperty("modeler.directory", modelerDirectory);
+ modelerProperties.setProperty("activiti-modeler.directory", modelerDirectory);
mavenUtils.mvnCleanPackageWithProperties(modelerDirectory, modelerProperties, customMavenProxySettings);
FileSystemUtils.delete(new File(modelerDirectory + File.separator + PROPERTIES.getProperty("saveModel")));
FileSystemUtils.delete(new File(modelerDirectory + File.separator + PROPERTIES.getProperty("urlConfig")));
http://git-wip-us.apache.org/repos/asf/syncope/blob/49533dce/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 9ae37a9..a822a2b 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
@@ -29,7 +29,6 @@ import java.io.InputStreamReader;
import java.io.OutputStream;
import java.io.OutputStreamWriter;
import java.io.PrintWriter;
-import java.net.URL;
import java.nio.charset.Charset;
import javax.xml.transform.OutputKeys;
import javax.xml.transform.Transformer;
@@ -161,11 +160,9 @@ public class FileSystemUtils {
final String destination, final AbstractUIProcessHandler handler) {
try {
- final URL url = getClass().getResource(filePath);
- final File dest = new File(destination);
- FileUtils.copyURLToFile(url, dest);
+ FileUtils.copyURLToFile(getClass().getResource(filePath), new File(destination));
} catch (IOException ex) {
- final String errorMessage = "Error copy file " + filePath;
+ String errorMessage = "Error copying file " + filePath + " to + " + destination;
handler.emitError(errorMessage, errorMessage);
InstallLog.getInstance().error(errorMessage);
}
http://git-wip-us.apache.org/repos/asf/syncope/blob/49533dce/installer/src/main/resources/modelerPom.xml
----------------------------------------------------------------------
diff --git a/installer/src/main/resources/modelerPom.xml b/installer/src/main/resources/modelerPom.xml
index b22bc3d..4d1faa7 100644
--- a/installer/src/main/resources/modelerPom.xml
+++ b/installer/src/main/resources/modelerPom.xml
@@ -22,15 +22,20 @@ under the License.
<modelVersion>4.0.0</modelVersion>
+ <parent>
+ <groupId>org.apache.syncope</groupId>
+ <artifactId>syncope</artifactId>
+ <version>${syncope.version}</version>
+ </parent>
+
<groupId>org.apache.syncope</groupId>
<artifactId>activitiModelerSetup</artifactId>
<version>1.0-SNAPSHOT</version>
<packaging>jar</packaging>
-
+
<properties>
- <activiti-modeler.version>${activiti.version}</activiti-modeler.version>
- <activiti-modeler.directory>%s</activiti-modeler.directory>
-
+ <activiti-modeler.directory>%s</activiti-modeler.directory>
+
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
</properties>
@@ -38,7 +43,6 @@ under the License.
<dependency>
<groupId>org.activiti</groupId>
<artifactId>activiti-webapp-explorer2</artifactId>
- <version>${activiti-modeler.version}</version>
<type>war</type>
<scope>test</scope>
</dependency>