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/05 13:51:34 UTC
[1/2] karaf git commit: [KARAF-3761] Build and test fail on Windows
Repository: karaf
Updated Branches:
refs/heads/master 6676cf489 -> 36d667b9e
[KARAF-3761] Build and test fail on Windows
Project: http://git-wip-us.apache.org/repos/asf/karaf/repo
Commit: http://git-wip-us.apache.org/repos/asf/karaf/commit/34788625
Tree: http://git-wip-us.apache.org/repos/asf/karaf/tree/34788625
Diff: http://git-wip-us.apache.org/repos/asf/karaf/diff/34788625
Branch: refs/heads/master
Commit: 34788625b2ae92441b973ffa94281e3261b1bb9f
Parents: edf72c7
Author: Morgan Hautman <mo...@iadvise.eu>
Authored: Thu Jun 4 08:52:37 2015 +0200
Committer: Morgan Hautman <mo...@iadvise.eu>
Committed: Thu Jun 4 08:52:37 2015 +0200
----------------------------------------------------------------------
.../apache/karaf/profile/assembly/CustomSimpleDownloadTask.java | 3 +++
.../src/test/java/org/apache/karaf/profile/impl/ProfilesTest.java | 2 +-
2 files changed, 4 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/karaf/blob/34788625/profile/src/main/java/org/apache/karaf/profile/assembly/CustomSimpleDownloadTask.java
----------------------------------------------------------------------
diff --git a/profile/src/main/java/org/apache/karaf/profile/assembly/CustomSimpleDownloadTask.java b/profile/src/main/java/org/apache/karaf/profile/assembly/CustomSimpleDownloadTask.java
index 94f5475..7d12034 100644
--- a/profile/src/main/java/org/apache/karaf/profile/assembly/CustomSimpleDownloadTask.java
+++ b/profile/src/main/java/org/apache/karaf/profile/assembly/CustomSimpleDownloadTask.java
@@ -73,6 +73,9 @@ public class CustomSimpleDownloadTask extends AbstractRetryableDownloadTask {
}
private URLStreamHandler getUrlStreamHandler(String url) throws URISyntaxException {
+ if(url.contains("\\")){
+ url = url.replace("\\","/");
+ }
String scheme = new URI(url).getScheme();
switch (scheme) {
case WRAP_URI_PREFIX:
http://git-wip-us.apache.org/repos/asf/karaf/blob/34788625/profile/src/test/java/org/apache/karaf/profile/impl/ProfilesTest.java
----------------------------------------------------------------------
diff --git a/profile/src/test/java/org/apache/karaf/profile/impl/ProfilesTest.java b/profile/src/test/java/org/apache/karaf/profile/impl/ProfilesTest.java
index 0b4ccd3..056332c 100644
--- a/profile/src/test/java/org/apache/karaf/profile/impl/ProfilesTest.java
+++ b/profile/src/test/java/org/apache/karaf/profile/impl/ProfilesTest.java
@@ -85,6 +85,6 @@ public class ProfilesTest {
Profile overlay = Profiles.getOverlay(profile, profiles);
String outPid1 = new String(overlay.getFileConfiguration("pid1.cfg"));
- assertEquals("# My comment\nfoo = bar2\n", outPid1);
+ assertEquals(String.format("%1$s%n%2$s%n","# My comment","foo = bar2"), outPid1);
}
}
[2/2] karaf git commit: Merge branch 'ShellTableTest-fix' of
https://github.com/mhautman/karaf
Posted by jb...@apache.org.
Merge branch 'ShellTableTest-fix' of https://github.com/mhautman/karaf
Project: http://git-wip-us.apache.org/repos/asf/karaf/repo
Commit: http://git-wip-us.apache.org/repos/asf/karaf/commit/36d667b9
Tree: http://git-wip-us.apache.org/repos/asf/karaf/tree/36d667b9
Diff: http://git-wip-us.apache.org/repos/asf/karaf/diff/36d667b9
Branch: refs/heads/master
Commit: 36d667b9e195d522225a9fbce26d19eafc8df48b
Parents: 6676cf4 3478862
Author: Jean-Baptiste Onofré <jb...@apache.org>
Authored: Thu Jun 4 12:59:44 2015 +0200
Committer: Jean-Baptiste Onofré <jb...@apache.org>
Committed: Thu Jun 4 12:59:44 2015 +0200
----------------------------------------------------------------------
.../apache/karaf/profile/assembly/CustomSimpleDownloadTask.java | 3 +++
.../src/test/java/org/apache/karaf/profile/impl/ProfilesTest.java | 2 +-
2 files changed, 4 insertions(+), 1 deletion(-)
----------------------------------------------------------------------