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 2014/03/27 20:09:07 UTC
[1/3] git commit: KARAF-2857 - Add Solaris x86_64 support to wrapper
Repository: karaf
Updated Branches:
refs/heads/karaf-2.x c4e1aec20 -> af2798290
refs/heads/karaf-3.0.x bd8753b18 -> df41bc048
refs/heads/master a4b2d3f7b -> 99bbb9e39
KARAF-2857 - Add Solaris x86_64 support to wrapper
Project: http://git-wip-us.apache.org/repos/asf/karaf/repo
Commit: http://git-wip-us.apache.org/repos/asf/karaf/commit/99bbb9e3
Tree: http://git-wip-us.apache.org/repos/asf/karaf/tree/99bbb9e3
Diff: http://git-wip-us.apache.org/repos/asf/karaf/diff/99bbb9e3
Branch: refs/heads/master
Commit: 99bbb9e39cb873e14e4a6f89a3119818af2f4a5e
Parents: a4b2d3f
Author: Jonathan Anstey <ja...@gmail.com>
Authored: Thu Mar 27 16:23:45 2014 -0230
Committer: Jonathan Anstey <ja...@gmail.com>
Committed: Thu Mar 27 16:25:44 2014 -0230
----------------------------------------------------------------------
.../wrapper/internal/WrapperServiceImpl.java | 16 ++++++++++++++++
.../wrapper/internal/solaris/x86_64/karaf-wrapper | Bin 0 -> 160000 bytes
.../wrapper/internal/solaris/x86_64/libwrapper.so | Bin 0 -> 19072 bytes
3 files changed, 16 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/karaf/blob/99bbb9e3/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 4503fd8..ad4aa4a 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
@@ -217,6 +217,22 @@ public class WrapperServiceImpl implements WrapperService {
mkdir(lib);
copyResourceTo(new File(lib, "libwrapper.so"), "solaris/x86/libwrapper.so", false);
+ } else if (arch.equalsIgnoreCase("x86_64")) {
+ mkdir(bin);
+
+ File file = new File(bin, name + "-wrapper");
+ copyResourceTo(file, "solaris/x86_64/karaf-wrapper", false);
+ chmod(file, "a+x");
+
+ serviceFile = new File(bin, name + "-service");
+ copyFilteredResourceTo(serviceFile, "unix/karaf-service", props);
+ chmod(serviceFile, "a+x");
+
+ wrapperConf = new File(etc, name + "-wrapper.conf");
+ copyFilteredResourceTo(wrapperConf, "unix/karaf-wrapper.conf", props);
+
+ mkdir(lib);
+ copyResourceTo(new File(lib, "libwrapper.so"), "solaris/x86_64/libwrapper.so", false);
} else {
mkdir(bin);
http://git-wip-us.apache.org/repos/asf/karaf/blob/99bbb9e3/wrapper/core/src/main/resources/org/apache/karaf/wrapper/internal/solaris/x86_64/karaf-wrapper
----------------------------------------------------------------------
diff --git a/wrapper/core/src/main/resources/org/apache/karaf/wrapper/internal/solaris/x86_64/karaf-wrapper b/wrapper/core/src/main/resources/org/apache/karaf/wrapper/internal/solaris/x86_64/karaf-wrapper
new file mode 100755
index 0000000..6bd165e
Binary files /dev/null and b/wrapper/core/src/main/resources/org/apache/karaf/wrapper/internal/solaris/x86_64/karaf-wrapper differ
http://git-wip-us.apache.org/repos/asf/karaf/blob/99bbb9e3/wrapper/core/src/main/resources/org/apache/karaf/wrapper/internal/solaris/x86_64/libwrapper.so
----------------------------------------------------------------------
diff --git a/wrapper/core/src/main/resources/org/apache/karaf/wrapper/internal/solaris/x86_64/libwrapper.so b/wrapper/core/src/main/resources/org/apache/karaf/wrapper/internal/solaris/x86_64/libwrapper.so
new file mode 100755
index 0000000..0d52ffa
Binary files /dev/null and b/wrapper/core/src/main/resources/org/apache/karaf/wrapper/internal/solaris/x86_64/libwrapper.so differ
[3/3] git commit: KARAF-2857 - Add Solaris x86_64 support to wrapper
Posted by ja...@apache.org.
KARAF-2857 - Add Solaris x86_64 support to wrapper
Project: http://git-wip-us.apache.org/repos/asf/karaf/repo
Commit: http://git-wip-us.apache.org/repos/asf/karaf/commit/af279829
Tree: http://git-wip-us.apache.org/repos/asf/karaf/tree/af279829
Diff: http://git-wip-us.apache.org/repos/asf/karaf/diff/af279829
Branch: refs/heads/karaf-2.x
Commit: af27982900c21ad11e5cfe4416c0ec08bba98666
Parents: c4e1aec
Author: Jonathan Anstey <ja...@gmail.com>
Authored: Thu Mar 27 16:38:50 2014 -0230
Committer: Jonathan Anstey <ja...@gmail.com>
Committed: Thu Mar 27 16:38:50 2014 -0230
----------------------------------------------------------------------
.../karaf/shell/wrapper/InstallCommand.java | 16 ++++++++++++++++
.../shell/wrapper/solaris/x86_64/karaf-wrapper | Bin 0 -> 160000 bytes
.../shell/wrapper/solaris/x86_64/libwrapper.so | Bin 0 -> 19072 bytes
3 files changed, 16 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/karaf/blob/af279829/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 d0b7561..4551f21 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
@@ -230,6 +230,22 @@ public class InstallCommand extends AbstractAction {
mkdir(lib);
copyResourceTo(new File(lib, "libwrapper.so"), "solaris/x86/libwrapper.so", false);
+ } else if (arch.equalsIgnoreCase("x86_64")) {
+ mkdir(bin);
+
+ File file = new File(bin, name + "-wrapper");
+ copyResourceTo(file, "solaris/x86_64/karaf-wrapper", false);
+ chmod(file, "a+x");
+
+ serviceFile = new File(bin, name + "-service");
+ copyFilteredResourceTo(serviceFile, "unix/karaf-service", props);
+ chmod(serviceFile, "a+x");
+
+ wrapperConf = new File(etc, name + "-wrapper.conf");
+ copyFilteredResourceTo(wrapperConf, "unix/karaf-wrapper.conf", props);
+
+ mkdir(lib);
+ copyResourceTo(new File(lib, "libwrapper.so"), "solaris/x86_64/libwrapper.so", false);
} else {
mkdir(bin);
http://git-wip-us.apache.org/repos/asf/karaf/blob/af279829/shell/wrapper/src/main/resources/org/apache/karaf/shell/wrapper/solaris/x86_64/karaf-wrapper
----------------------------------------------------------------------
diff --git a/shell/wrapper/src/main/resources/org/apache/karaf/shell/wrapper/solaris/x86_64/karaf-wrapper b/shell/wrapper/src/main/resources/org/apache/karaf/shell/wrapper/solaris/x86_64/karaf-wrapper
new file mode 100755
index 0000000..6bd165e
Binary files /dev/null and b/shell/wrapper/src/main/resources/org/apache/karaf/shell/wrapper/solaris/x86_64/karaf-wrapper differ
http://git-wip-us.apache.org/repos/asf/karaf/blob/af279829/shell/wrapper/src/main/resources/org/apache/karaf/shell/wrapper/solaris/x86_64/libwrapper.so
----------------------------------------------------------------------
diff --git a/shell/wrapper/src/main/resources/org/apache/karaf/shell/wrapper/solaris/x86_64/libwrapper.so b/shell/wrapper/src/main/resources/org/apache/karaf/shell/wrapper/solaris/x86_64/libwrapper.so
new file mode 100755
index 0000000..0d52ffa
Binary files /dev/null and b/shell/wrapper/src/main/resources/org/apache/karaf/shell/wrapper/solaris/x86_64/libwrapper.so differ
[2/3] git commit: KARAF-2857 - Add Solaris x86_64 support to wrapper
Posted by ja...@apache.org.
KARAF-2857 - Add Solaris x86_64 support to wrapper
Project: http://git-wip-us.apache.org/repos/asf/karaf/repo
Commit: http://git-wip-us.apache.org/repos/asf/karaf/commit/df41bc04
Tree: http://git-wip-us.apache.org/repos/asf/karaf/tree/df41bc04
Diff: http://git-wip-us.apache.org/repos/asf/karaf/diff/df41bc04
Branch: refs/heads/karaf-3.0.x
Commit: df41bc0483e81cdbcd56c5ab79e8288c7e667b8a
Parents: bd8753b
Author: Jonathan Anstey <ja...@gmail.com>
Authored: Thu Mar 27 16:23:45 2014 -0230
Committer: Jonathan Anstey <ja...@gmail.com>
Committed: Thu Mar 27 16:26:14 2014 -0230
----------------------------------------------------------------------
.../wrapper/internal/WrapperServiceImpl.java | 16 ++++++++++++++++
.../wrapper/internal/solaris/x86_64/karaf-wrapper | Bin 0 -> 160000 bytes
.../wrapper/internal/solaris/x86_64/libwrapper.so | Bin 0 -> 19072 bytes
3 files changed, 16 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/karaf/blob/df41bc04/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 4503fd8..ad4aa4a 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
@@ -217,6 +217,22 @@ public class WrapperServiceImpl implements WrapperService {
mkdir(lib);
copyResourceTo(new File(lib, "libwrapper.so"), "solaris/x86/libwrapper.so", false);
+ } else if (arch.equalsIgnoreCase("x86_64")) {
+ mkdir(bin);
+
+ File file = new File(bin, name + "-wrapper");
+ copyResourceTo(file, "solaris/x86_64/karaf-wrapper", false);
+ chmod(file, "a+x");
+
+ serviceFile = new File(bin, name + "-service");
+ copyFilteredResourceTo(serviceFile, "unix/karaf-service", props);
+ chmod(serviceFile, "a+x");
+
+ wrapperConf = new File(etc, name + "-wrapper.conf");
+ copyFilteredResourceTo(wrapperConf, "unix/karaf-wrapper.conf", props);
+
+ mkdir(lib);
+ copyResourceTo(new File(lib, "libwrapper.so"), "solaris/x86_64/libwrapper.so", false);
} else {
mkdir(bin);
http://git-wip-us.apache.org/repos/asf/karaf/blob/df41bc04/wrapper/core/src/main/resources/org/apache/karaf/wrapper/internal/solaris/x86_64/karaf-wrapper
----------------------------------------------------------------------
diff --git a/wrapper/core/src/main/resources/org/apache/karaf/wrapper/internal/solaris/x86_64/karaf-wrapper b/wrapper/core/src/main/resources/org/apache/karaf/wrapper/internal/solaris/x86_64/karaf-wrapper
new file mode 100755
index 0000000..6bd165e
Binary files /dev/null and b/wrapper/core/src/main/resources/org/apache/karaf/wrapper/internal/solaris/x86_64/karaf-wrapper differ
http://git-wip-us.apache.org/repos/asf/karaf/blob/df41bc04/wrapper/core/src/main/resources/org/apache/karaf/wrapper/internal/solaris/x86_64/libwrapper.so
----------------------------------------------------------------------
diff --git a/wrapper/core/src/main/resources/org/apache/karaf/wrapper/internal/solaris/x86_64/libwrapper.so b/wrapper/core/src/main/resources/org/apache/karaf/wrapper/internal/solaris/x86_64/libwrapper.so
new file mode 100755
index 0000000..0d52ffa
Binary files /dev/null and b/wrapper/core/src/main/resources/org/apache/karaf/wrapper/internal/solaris/x86_64/libwrapper.so differ