You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@karaf.apache.org by ja...@apache.org on 2015/09/30 21:09:43 UTC
[1/3] karaf git commit: KARAF-4026 - add check for amd64 arch on
solaris platform
Repository: karaf
Updated Branches:
refs/heads/karaf-2.x 85048b574 -> f491fc72c
refs/heads/karaf-3.0.x 637f12ee6 -> 9ff6f3762
refs/heads/master c6b0be15c -> 57df26d10
KARAF-4026 - add check for amd64 arch on solaris platform
Project: http://git-wip-us.apache.org/repos/asf/karaf/repo
Commit: http://git-wip-us.apache.org/repos/asf/karaf/commit/f491fc72
Tree: http://git-wip-us.apache.org/repos/asf/karaf/tree/f491fc72
Diff: http://git-wip-us.apache.org/repos/asf/karaf/diff/f491fc72
Branch: refs/heads/karaf-2.x
Commit: f491fc72c79af352699e6f981edd10263b44dc5c
Parents: 85048b5
Author: Jonathan Anstey <ja...@gmail.com>
Authored: Wed Sep 30 15:58:54 2015 -0230
Committer: Jonathan Anstey <ja...@gmail.com>
Committed: Wed Sep 30 15:58:54 2015 -0230
----------------------------------------------------------------------
.../main/java/org/apache/karaf/shell/wrapper/InstallCommand.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/karaf/blob/f491fc72/shell/wrapper/src/main/java/org/apache/karaf/shell/wrapper/InstallCommand.java
----------------------------------------------------------------------
diff --git a/shell/wrapper/src/main/java/org/apache/karaf/shell/wrapper/InstallCommand.java b/shell/wrapper/src/main/java/org/apache/karaf/shell/wrapper/InstallCommand.java
index 94c2473..2c8e109 100644
--- a/shell/wrapper/src/main/java/org/apache/karaf/shell/wrapper/InstallCommand.java
+++ b/shell/wrapper/src/main/java/org/apache/karaf/shell/wrapper/InstallCommand.java
@@ -237,7 +237,7 @@ public class InstallCommand extends AbstractAction {
mkdir(lib);
copyResourceTo(new File(lib, "libwrapper.so"), "solaris/x86/libwrapper.so", false);
- } else if (arch.equalsIgnoreCase("x86_64")) {
+ } else if (arch.equalsIgnoreCase("amd64") || arch.equalsIgnoreCase("x86_64")) {
mkdir(bin);
File file = new File(bin, name + "-wrapper");
[3/3] karaf git commit: KARAF-4026 - add check for amd64 arch on
solaris platform
Posted by ja...@apache.org.
KARAF-4026 - add check for amd64 arch on solaris platform
Project: http://git-wip-us.apache.org/repos/asf/karaf/repo
Commit: http://git-wip-us.apache.org/repos/asf/karaf/commit/57df26d1
Tree: http://git-wip-us.apache.org/repos/asf/karaf/tree/57df26d1
Diff: http://git-wip-us.apache.org/repos/asf/karaf/diff/57df26d1
Branch: refs/heads/master
Commit: 57df26d10f76a268daf94ae11545998dbc1fbf03
Parents: c6b0be1
Author: Jonathan Anstey <ja...@gmail.com>
Authored: Wed Sep 30 16:39:17 2015 -0230
Committer: Jonathan Anstey <ja...@gmail.com>
Committed: Wed Sep 30 16:39:17 2015 -0230
----------------------------------------------------------------------
.../java/org/apache/karaf/wrapper/internal/WrapperServiceImpl.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/karaf/blob/57df26d1/wrapper/src/main/java/org/apache/karaf/wrapper/internal/WrapperServiceImpl.java
----------------------------------------------------------------------
diff --git a/wrapper/src/main/java/org/apache/karaf/wrapper/internal/WrapperServiceImpl.java b/wrapper/src/main/java/org/apache/karaf/wrapper/internal/WrapperServiceImpl.java
index cb9e4fe..e5e71da 100644
--- a/wrapper/src/main/java/org/apache/karaf/wrapper/internal/WrapperServiceImpl.java
+++ b/wrapper/src/main/java/org/apache/karaf/wrapper/internal/WrapperServiceImpl.java
@@ -231,7 +231,7 @@ public class WrapperServiceImpl implements WrapperService {
mkdir(lib);
copyResourceTo(new File(lib, "libwrapper.so"), "solaris/x86/libwrapper.so", false);
- } else if (arch.equalsIgnoreCase("x86_64")) {
+ } else if (arch.equalsIgnoreCase("amd64") || arch.equalsIgnoreCase("x86_64")) {
mkdir(bin);
File file = new File(bin, name + "-wrapper");
[2/3] karaf git commit: KARAF-4026 - add check for amd64 arch on
solaris platform
Posted by ja...@apache.org.
KARAF-4026 - add check for amd64 arch on solaris platform
Project: http://git-wip-us.apache.org/repos/asf/karaf/repo
Commit: http://git-wip-us.apache.org/repos/asf/karaf/commit/9ff6f376
Tree: http://git-wip-us.apache.org/repos/asf/karaf/tree/9ff6f376
Diff: http://git-wip-us.apache.org/repos/asf/karaf/diff/9ff6f376
Branch: refs/heads/karaf-3.0.x
Commit: 9ff6f3762e7fd592a0de90219acae58df23f1e43
Parents: 637f12e
Author: Jonathan Anstey <ja...@gmail.com>
Authored: Wed Sep 30 16:33:17 2015 -0230
Committer: Jonathan Anstey <ja...@gmail.com>
Committed: Wed Sep 30 16:33:17 2015 -0230
----------------------------------------------------------------------
.../java/org/apache/karaf/wrapper/internal/WrapperServiceImpl.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/karaf/blob/9ff6f376/wrapper/core/src/main/java/org/apache/karaf/wrapper/internal/WrapperServiceImpl.java
----------------------------------------------------------------------
diff --git a/wrapper/core/src/main/java/org/apache/karaf/wrapper/internal/WrapperServiceImpl.java b/wrapper/core/src/main/java/org/apache/karaf/wrapper/internal/WrapperServiceImpl.java
index 887073f..3edffa6 100644
--- a/wrapper/core/src/main/java/org/apache/karaf/wrapper/internal/WrapperServiceImpl.java
+++ b/wrapper/core/src/main/java/org/apache/karaf/wrapper/internal/WrapperServiceImpl.java
@@ -231,7 +231,7 @@ public class WrapperServiceImpl implements WrapperService {
mkdir(lib);
copyResourceTo(new File(lib, "libwrapper.so"), "solaris/x86/libwrapper.so", false);
- } else if (arch.equalsIgnoreCase("x86_64")) {
+ } else if (arch.equalsIgnoreCase("amd64") || arch.equalsIgnoreCase("x86_64")) {
mkdir(bin);
File file = new File(bin, name + "-wrapper");