Return-Path: X-Original-To: apmail-brooklyn-commits-archive@minotaur.apache.org Delivered-To: apmail-brooklyn-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 70E8F1099D for ; Tue, 1 Jul 2014 10:40:27 +0000 (UTC) Received: (qmail 70569 invoked by uid 500); 1 Jul 2014 10:40:27 -0000 Delivered-To: apmail-brooklyn-commits-archive@brooklyn.apache.org Received: (qmail 70546 invoked by uid 500); 1 Jul 2014 10:40:27 -0000 Mailing-List: contact commits-help@brooklyn.incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@brooklyn.incubator.apache.org Delivered-To: mailing list commits@brooklyn.incubator.apache.org Received: (qmail 70537 invoked by uid 99); 1 Jul 2014 10:40:27 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 01 Jul 2014 10:40:27 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED,T_RP_MATCHES_RCVD X-Spam-Check-By: apache.org Received: from [140.211.11.3] (HELO mail.apache.org) (140.211.11.3) by apache.org (qpsmtpd/0.29) with SMTP; Tue, 01 Jul 2014 10:40:28 +0000 Received: (qmail 68880 invoked by uid 99); 1 Jul 2014 10:40:02 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 01 Jul 2014 10:40:02 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 182C8990DD1; Tue, 1 Jul 2014 10:40:02 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: heneveld@apache.org To: commits@brooklyn.incubator.apache.org Date: Tue, 01 Jul 2014 10:40:04 -0000 Message-Id: In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [3/6] git commit: Always use forward slash as separator. X-Virus-Checked: Checked by ClamAV on apache.org 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 Authored: Mon Jun 30 19:36:56 2014 +0300 Committer: Svetoslav Neykov 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"); } }