You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@brooklyn.apache.org by he...@apache.org on 2014/07/01 12:40:04 UTC
[3/6] git commit: Always use forward slash as separator.
Always use forward slash as separator.
When building commands on Windows for remote UNIX system the current method will produce invalid results. Forward slash will work on all platforms.
Project: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/commit/67749054
Tree: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/tree/67749054
Diff: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/diff/67749054
Branch: refs/heads/master
Commit: 677490548eff3e42be1a1928a8a7ecd23729292a
Parents: f43d36c
Author: Svetoslav Neykov <sv...@cloudsoftcorp.com>
Authored: Mon Jun 30 19:36:56 2014 +0300
Committer: Svetoslav Neykov <sv...@cloudsoftcorp.com>
Committed: Tue Jul 1 10:33:59 2014 +0300
----------------------------------------------------------------------
utils/common/src/main/java/brooklyn/util/os/Os.java | 2 +-
utils/common/src/test/java/brooklyn/util/os/OsTest.java | 6 +++---
2 files changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/67749054/utils/common/src/main/java/brooklyn/util/os/Os.java
----------------------------------------------------------------------
diff --git a/utils/common/src/main/java/brooklyn/util/os/Os.java b/utils/common/src/main/java/brooklyn/util/os/Os.java
index 71504bb..f2ca037 100644
--- a/utils/common/src/main/java/brooklyn/util/os/Os.java
+++ b/utils/common/src/main/java/brooklyn/util/os/Os.java
@@ -181,7 +181,7 @@ public class Os {
/** merges paths using the local file separator */
public static String mergePaths(String ...items) {
- char separatorChar = File.separatorChar;
+ char separatorChar = '/';
StringBuilder result = new StringBuilder();
for (String item: items) {
if (Strings.isEmpty(item)) continue;
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/67749054/utils/common/src/test/java/brooklyn/util/os/OsTest.java
----------------------------------------------------------------------
diff --git a/utils/common/src/test/java/brooklyn/util/os/OsTest.java b/utils/common/src/test/java/brooklyn/util/os/OsTest.java
index 7e3f430..5ef694f 100644
--- a/utils/common/src/test/java/brooklyn/util/os/OsTest.java
+++ b/utils/common/src/test/java/brooklyn/util/os/OsTest.java
@@ -61,10 +61,10 @@ public class OsTest {
public void testMergePaths() throws Exception {
assertEquals(Os.mergePaths("a"), "a");
- assertEquals(Os.mergePaths("a", "b"), "a" + File.separator + "b");
+ assertEquals(Os.mergePaths("a", "b"), "a/b");
assertEquals(Os.mergePaths("a/", "b"), "a/b");
- assertEquals(Os.mergePaths("a", "b/"), "a" + File.separator + "b/");
- assertEquals(Os.mergePaths("/a", "b"), "/a" + File.separator + "b");
+ assertEquals(Os.mergePaths("a", "b/"), "a/b/");
+ assertEquals(Os.mergePaths("/a", "b"), "/a/b");
}
}