You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@syncope.apache.org by md...@apache.org on 2015/01/05 11:09:50 UTC
[1/4] syncope git commit: Merge branch '1_2_X' of
https://git-wip-us.apache.org/repos/asf/syncope into 1_2_X
Repository: syncope
Updated Branches:
refs/heads/master 44b21af61 -> 1d58c5006
Merge branch '1_2_X' of https://git-wip-us.apache.org/repos/asf/syncope into 1_2_X
Project: http://git-wip-us.apache.org/repos/asf/syncope/repo
Commit: http://git-wip-us.apache.org/repos/asf/syncope/commit/fde8f4d3
Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/fde8f4d3
Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/fde8f4d3
Branch: refs/heads/master
Commit: fde8f4d365f3f3cda5cc9169406ca275793977e2
Parents: 5e013aa 257be98
Author: Marco Di Sabatino Di Diodoro <md...@apache.org>
Authored: Mon Jan 5 09:08:37 2015 +0100
Committer: Marco Di Sabatino Di Diodoro <md...@apache.org>
Committed: Mon Jan 5 09:08:37 2015 +0100
----------------------------------------------------------------------
pom.xml | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
[2/4] syncope git commit: [SYNCOPE-625] Replaced java.nio for Java 6
Posted by md...@apache.org.
[SYNCOPE-625] Replaced java.nio for Java 6
Project: http://git-wip-us.apache.org/repos/asf/syncope/repo
Commit: http://git-wip-us.apache.org/repos/asf/syncope/commit/069b56f9
Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/069b56f9
Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/069b56f9
Branch: refs/heads/master
Commit: 069b56f92aee2cfc79c326993ac8bf894bb07b04
Parents: fde8f4d
Author: Marco Di Sabatino Di Diodoro <md...@apache.org>
Authored: Mon Jan 5 11:07:36 2015 +0100
Committer: Marco Di Sabatino Di Diodoro <md...@apache.org>
Committed: Mon Jan 5 11:07:36 2015 +0100
----------------------------------------------------------------------
.../syncope/installer/utilities/FileSystemUtils.java | 10 +---------
1 file changed, 1 insertion(+), 9 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/syncope/blob/069b56f9/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 4381c1e..7e9f7b8 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
@@ -30,10 +30,6 @@ import java.io.OutputStream;
import java.io.OutputStreamWriter;
import java.io.PrintWriter;
import java.net.URL;
-import java.nio.file.CopyOption;
-import java.nio.file.Files;
-import java.nio.file.Paths;
-import java.nio.file.StandardCopyOption;
import javax.xml.transform.OutputKeys;
import javax.xml.transform.Transformer;
import javax.xml.transform.TransformerException;
@@ -61,11 +57,7 @@ public class FileSystemUtils {
public void copyFile(final String sourceFilePath, final String targetFilePath) {
try {
- final CopyOption[] options = new CopyOption[] {
- StandardCopyOption.REPLACE_EXISTING,
- StandardCopyOption.COPY_ATTRIBUTES
- };
- Files.copy(Paths.get(sourceFilePath), Paths.get(targetFilePath), options);
+ FileUtils.copyFile(new File(sourceFilePath), new File(targetFilePath));
} catch (final IOException ex) {
final String errorMessage =
"Error copy file " + sourceFilePath + " to " + targetFilePath;
[3/4] syncope git commit: Merge branch '1_2_X'
Posted by md...@apache.org.
Merge branch '1_2_X'
Project: http://git-wip-us.apache.org/repos/asf/syncope/repo
Commit: http://git-wip-us.apache.org/repos/asf/syncope/commit/286d5cbb
Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/286d5cbb
Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/286d5cbb
Branch: refs/heads/master
Commit: 286d5cbbef4ad373461465deac28cd34d0343df9
Parents: b907a4e 069b56f
Author: Marco Di Sabatino Di Diodoro <md...@apache.org>
Authored: Mon Jan 5 11:08:29 2015 +0100
Committer: Marco Di Sabatino Di Diodoro <md...@apache.org>
Committed: Mon Jan 5 11:08:29 2015 +0100
----------------------------------------------------------------------
.../syncope/installer/utilities/FileSystemUtils.java | 10 +---------
1 file changed, 1 insertion(+), 9 deletions(-)
----------------------------------------------------------------------
[4/4] syncope git commit: Merge branch 'master' of
https://git-wip-us.apache.org/repos/asf/syncope
Posted by md...@apache.org.
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/syncope
Project: http://git-wip-us.apache.org/repos/asf/syncope/repo
Commit: http://git-wip-us.apache.org/repos/asf/syncope/commit/1d58c500
Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/1d58c500
Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/1d58c500
Branch: refs/heads/master
Commit: 1d58c50063c4fe0be08db994815671dcc89ff096
Parents: 286d5cb 44b21af
Author: Marco Di Sabatino Di Diodoro <md...@apache.org>
Authored: Mon Jan 5 11:09:30 2015 +0100
Committer: Marco Di Sabatino Di Diodoro <md...@apache.org>
Committed: Mon Jan 5 11:09:30 2015 +0100
----------------------------------------------------------------------
pom.xml | 11 +++++++++++
src/site/site.xml | 3 ---
2 files changed, 11 insertions(+), 3 deletions(-)
----------------------------------------------------------------------