You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@karaf.apache.org by jb...@apache.org on 2015/06/19 14:49:14 UTC
[1/2] karaf git commit: Avoid exception if the symlink already exists
Repository: karaf
Updated Branches:
refs/heads/master 9a1dd45bf -> 90b00bcb5
Avoid exception if the symlink already exists
Project: http://git-wip-us.apache.org/repos/asf/karaf/repo
Commit: http://git-wip-us.apache.org/repos/asf/karaf/commit/8b46ad26
Tree: http://git-wip-us.apache.org/repos/asf/karaf/tree/8b46ad26
Diff: http://git-wip-us.apache.org/repos/asf/karaf/diff/8b46ad26
Branch: refs/heads/master
Commit: 8b46ad268a5a2f47e280d6cf831680c7827d177b
Parents: e0254b6
Author: Jean-Baptiste Onofré <jb...@apache.org>
Authored: Fri Jun 19 14:47:38 2015 +0200
Committer: Jean-Baptiste Onofré <jb...@apache.org>
Committed: Fri Jun 19 14:47:38 2015 +0200
----------------------------------------------------------------------
.../org/apache/karaf/profile/assembly/Builder.java | 14 ++++----------
1 file changed, 4 insertions(+), 10 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/karaf/blob/8b46ad26/profile/src/main/java/org/apache/karaf/profile/assembly/Builder.java
----------------------------------------------------------------------
diff --git a/profile/src/main/java/org/apache/karaf/profile/assembly/Builder.java b/profile/src/main/java/org/apache/karaf/profile/assembly/Builder.java
index ea5c6d7..53eb178 100644
--- a/profile/src/main/java/org/apache/karaf/profile/assembly/Builder.java
+++ b/profile/src/main/java/org/apache/karaf/profile/assembly/Builder.java
@@ -24,15 +24,7 @@ import java.io.InputStream;
import java.net.MalformedURLException;
import java.net.URI;
import java.nio.charset.StandardCharsets;
-import java.nio.file.FileSystem;
-import java.nio.file.FileSystemNotFoundException;
-import java.nio.file.FileSystems;
-import java.nio.file.Files;
-import java.nio.file.OpenOption;
-import java.nio.file.Path;
-import java.nio.file.Paths;
-import java.nio.file.StandardCopyOption;
-import java.nio.file.StandardOpenOption;
+import java.nio.file.*;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collection;
@@ -623,7 +615,9 @@ public class Builder {
Files.createDirectories(sysOutput.getParent());
Files.copy(input, sysOutput, StandardCopyOption.REPLACE_EXISTING);
Path libOutput = homeDirectory.resolve(path).resolve(name);
- Files.createSymbolicLink(libOutput, libOutput.getParent().relativize(sysOutput));
+ if (Files.notExists(libOutput, LinkOption.NOFOLLOW_LINKS)) {
+ Files.createSymbolicLink(libOutput, libOutput.getParent().relativize(sysOutput));
+ }
} else {
Path output = homeDirectory.resolve(path).resolve(name);
Files.copy(input, output, StandardCopyOption.REPLACE_EXISTING);
[2/2] karaf git commit: Merge branch 'master' of
https://git-wip-us.apache.org/repos/asf/karaf
Posted by jb...@apache.org.
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/karaf
Project: http://git-wip-us.apache.org/repos/asf/karaf/repo
Commit: http://git-wip-us.apache.org/repos/asf/karaf/commit/90b00bcb
Tree: http://git-wip-us.apache.org/repos/asf/karaf/tree/90b00bcb
Diff: http://git-wip-us.apache.org/repos/asf/karaf/diff/90b00bcb
Branch: refs/heads/master
Commit: 90b00bcb5f7ada6bb4f3217d18078d66de74cd4c
Parents: 8b46ad2 9a1dd45
Author: Jean-Baptiste Onofré <jb...@apache.org>
Authored: Fri Jun 19 14:49:08 2015 +0200
Committer: Jean-Baptiste Onofré <jb...@apache.org>
Committed: Fri Jun 19 14:49:08 2015 +0200
----------------------------------------------------------------------
.../enterprise/src/main/feature/feature.xml | 42 ++++++++++++--------
pom.xml | 2 +-
2 files changed, 27 insertions(+), 17 deletions(-)
----------------------------------------------------------------------