You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@syncope.apache.org by ma...@apache.org on 2014/08/11 12:13:22 UTC
svn commit: r1617237 - in /syncope/trunk: ./
installer/src/main/java/org/apache/syncope/installer/processes/ArchetypeProcess.java
Author: massi
Date: Mon Aug 11 10:13:21 2014
New Revision: 1617237
URL: http://svn.apache.org/r1617237
Log:
merge from branch
Modified:
syncope/trunk/ (props changed)
syncope/trunk/installer/src/main/java/org/apache/syncope/installer/processes/ArchetypeProcess.java
Propchange: syncope/trunk/
------------------------------------------------------------------------------
Merged /syncope/branches/1_2_X:r1616810-1617236
Modified: syncope/trunk/installer/src/main/java/org/apache/syncope/installer/processes/ArchetypeProcess.java
URL: http://svn.apache.org/viewvc/syncope/trunk/installer/src/main/java/org/apache/syncope/installer/processes/ArchetypeProcess.java?rev=1617237&r1=1617236&r2=1617237&view=diff
==============================================================================
--- syncope/trunk/installer/src/main/java/org/apache/syncope/installer/processes/ArchetypeProcess.java (original)
+++ syncope/trunk/installer/src/main/java/org/apache/syncope/installer/processes/ArchetypeProcess.java Mon Aug 11 10:13:21 2014
@@ -42,24 +42,22 @@ public class ArchetypeProcess {
final String syncopeAdminPassword = args[10];
final FileSystemUtils fileSystemUtils = new FileSystemUtils(handler);
-
if (!new File(installPath).exists()) {
fileSystemUtils.createDirectory(installPath, null);
InstallLog.initialize(installPath, handler);
+ } else {
+ InstallLog.initialize(installPath, handler);
}
final MavenUtils mavenUtils = new MavenUtils(mavenDir, handler);
-
mavenUtils.archetypeGenerate(
syncopeVersion, groupId, artifactId, secretKey, anonymousKey, installPath);
fileSystemUtils.writeToFile(new File(installPath + "/" + artifactId + Pom.PATH),
String.format(Pom.FILE, syncopeVersion, syncopeVersion, groupId, artifactId));
-
fileSystemUtils.createDirectory(confDirectory, null);
fileSystemUtils.createDirectory(logsDirectory, null);
fileSystemUtils.createDirectory(bundlesDirectory, null);
-
mavenUtils.createPackage(installPath + "/" + artifactId, confDirectory, logsDirectory, bundlesDirectory);
}