Repository: syncope Updated Branches: refs/heads/master eaf5110aa -> 1d48e5f29
Bugfix: why there was those copy operations? I don't know Project: http://git-wip-us.apache.org/repos/asf/syncope/repo Commit: http://git-wip-us.apache.org/repos/asf/syncope/commit/1d48e5f2 Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/1d48e5f2 Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/1d48e5f2 Branch: refs/heads/master Commit: 1d48e5f29ceabdee460325f061709d5ded7b3847 Parents: eaf5110 Author: Massimiliano Perrone <massimiliano.perr...@tirasa.net> Authored: Mon Dec 14 15:15:07 2015 +0100 Committer: Massimiliano Perrone <massimiliano.perr...@tirasa.net> Committed: Mon Dec 14 15:15:07 2015 +0100 ---------------------------------------------------------------------- .../syncope/installer/processes/ArchetypeProcess.java | 11 ----------- .../syncope/installer/utilities/FileSystemUtils.java | 2 +- .../apache/syncope/installer/utilities/MavenUtils.java | 1 + installer/src/main/resources/modelerPom.xml | 7 ++++--- 4 files changed, 6 insertions(+), 15 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/syncope/blob/1d48e5f2/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 d0a3f62..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 @@ -119,17 +119,6 @@ public class ArchetypeProcess extends BaseProcess { + File.separator + PROPERTIES.getProperty("saveModel"), modelerDirectory + File.separator + PROPERTIES.getProperty("saveModel")); - fileSystemUtils.copyFile( - syncopeInstallDir - + PROPERTIES.getProperty("enduserResDirectory") - + File.separator + PROPERTIES.getProperty("urlConfig"), - modelerDirectory + File.separator + PROPERTIES.getProperty("urlConfig")); - fileSystemUtils.copyFile( - syncopeInstallDir - + PROPERTIES.getProperty("enduserResDirectory") - + File.separator + PROPERTIES.getProperty("saveModel"), - modelerDirectory + File.separator + PROPERTIES.getProperty("saveModel")); - final Properties modelerProperties = new Properties(); modelerProperties.setProperty("modeler.directory", modelerDirectory); mavenUtils.mvnCleanPackageWithProperties(modelerDirectory, modelerProperties, customMavenProxySettings); http://git-wip-us.apache.org/repos/asf/syncope/blob/1d48e5f2/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 45b43d5..9ae37a9 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 @@ -61,7 +61,7 @@ public class FileSystemUtils { FileUtils.copyFile(new File(sourceFilePath), new File(targetFilePath)); } catch (final IOException ex) { final String errorMessage = - "Error copy file " + sourceFilePath + " to " + targetFilePath; + "Error copying file " + sourceFilePath + " to " + targetFilePath; handler.emitError(errorMessage, errorMessage); InstallLog.getInstance().error(errorMessage); } http://git-wip-us.apache.org/repos/asf/syncope/blob/1d48e5f2/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 3a8319f..cb47f04 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 @@ -92,6 +92,7 @@ public class MavenUtils { properties.setProperty("artifactId", artifactId); properties.setProperty("secretKey", secretKey); properties.setProperty("anonymousKey", anonymousKey); + properties.setProperty("version", "1.0-SNAPSHOT"); return properties; } http://git-wip-us.apache.org/repos/asf/syncope/blob/1d48e5f2/installer/src/main/resources/modelerPom.xml ---------------------------------------------------------------------- diff --git a/installer/src/main/resources/modelerPom.xml b/installer/src/main/resources/modelerPom.xml index 9209a9d..af1704e 100644 --- a/installer/src/main/resources/modelerPom.xml +++ b/installer/src/main/resources/modelerPom.xml @@ -17,7 +17,8 @@ KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. --> -<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/xsd/maven-4.0.0.xsd"> +<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/xsd/maven-4.0.0.xsd"> <modelVersion>4.0.0</modelVersion> @@ -27,7 +28,7 @@ under the License. <packaging>jar</packaging> <properties> - <activiti.version>5.18.0</activiti.version> + <activiti.version>5.19.0.1</activiti.version> <activiti-modeler.directory>${modeler.directory}</activiti-modeler.directory> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> @@ -36,7 +37,7 @@ under the License. <dependencies> <dependency> <groupId>org.activiti</groupId> - <artifactId>activiti-webapp-explorer2</artifactId> + <artifactId>activiti-webapp-explorer2</artifactId> <version>${activiti.version}</version> <type>war</type> <scope>test</scope>