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 2012/03/21 21:19:30 UTC
svn commit: r1303554 - in /karaf/branches/karaf-2.2.x/shell/wrapper/src/main:
java/org/apache/karaf/shell/wrapper/
resources/org/apache/karaf/shell/wrapper/aix/
resources/org/apache/karaf/shell/wrapper/aix/ppc32/
resources/org/apache/karaf/shell/wrappe...
Author: jbonofre
Date: Wed Mar 21 20:19:29 2012
New Revision: 1303554
URL: http://svn.apache.org/viewvc?rev=1303554&view=rev
Log:
[KARAF-1265] Add AIX (ppc32 and ppc64) support for the wrapper
Added:
karaf/branches/karaf-2.2.x/shell/wrapper/src/main/resources/org/apache/karaf/shell/wrapper/aix/
karaf/branches/karaf-2.2.x/shell/wrapper/src/main/resources/org/apache/karaf/shell/wrapper/aix/ppc32/
karaf/branches/karaf-2.2.x/shell/wrapper/src/main/resources/org/apache/karaf/shell/wrapper/aix/ppc32/karaf-wrapper (with props)
karaf/branches/karaf-2.2.x/shell/wrapper/src/main/resources/org/apache/karaf/shell/wrapper/aix/ppc32/libwrapper.a (with props)
karaf/branches/karaf-2.2.x/shell/wrapper/src/main/resources/org/apache/karaf/shell/wrapper/aix/ppc64/
karaf/branches/karaf-2.2.x/shell/wrapper/src/main/resources/org/apache/karaf/shell/wrapper/aix/ppc64/karaf-wrapper (with props)
karaf/branches/karaf-2.2.x/shell/wrapper/src/main/resources/org/apache/karaf/shell/wrapper/aix/ppc64/libwrapper.a (with props)
Modified:
karaf/branches/karaf-2.2.x/shell/wrapper/src/main/java/org/apache/karaf/shell/wrapper/InstallCommand.java
Modified: karaf/branches/karaf-2.2.x/shell/wrapper/src/main/java/org/apache/karaf/shell/wrapper/InstallCommand.java
URL: http://svn.apache.org/viewvc/karaf/branches/karaf-2.2.x/shell/wrapper/src/main/java/org/apache/karaf/shell/wrapper/InstallCommand.java?rev=1303554&r1=1303553&r2=1303554&view=diff
==============================================================================
--- karaf/branches/karaf-2.2.x/shell/wrapper/src/main/java/org/apache/karaf/shell/wrapper/InstallCommand.java (original)
+++ karaf/branches/karaf-2.2.x/shell/wrapper/src/main/java/org/apache/karaf/shell/wrapper/InstallCommand.java Wed Mar 21 20:19:29 2012
@@ -146,7 +146,42 @@ public class InstallCommand extends Osgi
// TODO: figure out how to hook in the service that it starts up
// when the machine boots up.
}
- } else {
+ } else if (os.startsWith("AIX")) {
+ String arch = System.getProperty("os.arch");
+ if (arch.equalsIgnoreCase("ppc64")) {
+ mkdir(bin);
+
+ File file = new File(bin, name + "-wrapper");
+ copyResourceTo(file, "aix/ppc64/karaf-wrapper", false);
+ chmod(file, "a+x");
+
+ serviceFile = new File(bin, name + "-service");
+ copyResourceTo(file, "unix/karaf-service", false);
+ chmod(file, "a+x");
+
+ wrapperConf = new File(etc, name + "-wrapper.conf");
+ copyFilteredResourceTo(wrapperConf, "unix/karaf-wrapper.conf", props);
+
+ mkdir(lib);
+ copyResourceTo(new File(lib, "libwrapper.a"), "aix/ppc64/libwrapper.a", false);
+ } else {
+ mkdir(bin);
+
+ File file = new File(bin, name + "-wrapper");
+ copyResourceTo(file, "aix/ppc64/karaf-wrapper", false);
+ chmod(file, "a+x");
+
+ serviceFile = new File(bin, name + "-service");
+ copyResourceTo(file, "unix/karaf-service", false);
+ chmod(file, "a+x");
+
+ wrapperConf = new File(etc, name + "-wrapper.conf");
+ copyFilteredResourceTo(wrapperConf, "unix/karaf-wrapper.conf", props);
+
+ mkdir(lib);
+ copyResourceTo(new File(lib, "libwrapper.a"), "aix/ppc64/libwrapper.a", false);
+ }
+ } else {
System.out.println("Your operating system '"+os+"' is not currently supported.");
return 1;
}
Added: karaf/branches/karaf-2.2.x/shell/wrapper/src/main/resources/org/apache/karaf/shell/wrapper/aix/ppc32/karaf-wrapper
URL: http://svn.apache.org/viewvc/karaf/branches/karaf-2.2.x/shell/wrapper/src/main/resources/org/apache/karaf/shell/wrapper/aix/ppc32/karaf-wrapper?rev=1303554&view=auto
==============================================================================
Files karaf/branches/karaf-2.2.x/shell/wrapper/src/main/resources/org/apache/karaf/shell/wrapper/aix/ppc32/karaf-wrapper (added) and karaf/branches/karaf-2.2.x/shell/wrapper/src/main/resources/org/apache/karaf/shell/wrapper/aix/ppc32/karaf-wrapper Wed Mar 21 20:19:29 2012 differ
Propchange: karaf/branches/karaf-2.2.x/shell/wrapper/src/main/resources/org/apache/karaf/shell/wrapper/aix/ppc32/karaf-wrapper
------------------------------------------------------------------------------
svn:executable = *
Added: karaf/branches/karaf-2.2.x/shell/wrapper/src/main/resources/org/apache/karaf/shell/wrapper/aix/ppc32/libwrapper.a
URL: http://svn.apache.org/viewvc/karaf/branches/karaf-2.2.x/shell/wrapper/src/main/resources/org/apache/karaf/shell/wrapper/aix/ppc32/libwrapper.a?rev=1303554&view=auto
==============================================================================
Files karaf/branches/karaf-2.2.x/shell/wrapper/src/main/resources/org/apache/karaf/shell/wrapper/aix/ppc32/libwrapper.a (added) and karaf/branches/karaf-2.2.x/shell/wrapper/src/main/resources/org/apache/karaf/shell/wrapper/aix/ppc32/libwrapper.a Wed Mar 21 20:19:29 2012 differ
Propchange: karaf/branches/karaf-2.2.x/shell/wrapper/src/main/resources/org/apache/karaf/shell/wrapper/aix/ppc32/libwrapper.a
------------------------------------------------------------------------------
svn:executable = *
Added: karaf/branches/karaf-2.2.x/shell/wrapper/src/main/resources/org/apache/karaf/shell/wrapper/aix/ppc64/karaf-wrapper
URL: http://svn.apache.org/viewvc/karaf/branches/karaf-2.2.x/shell/wrapper/src/main/resources/org/apache/karaf/shell/wrapper/aix/ppc64/karaf-wrapper?rev=1303554&view=auto
==============================================================================
Files karaf/branches/karaf-2.2.x/shell/wrapper/src/main/resources/org/apache/karaf/shell/wrapper/aix/ppc64/karaf-wrapper (added) and karaf/branches/karaf-2.2.x/shell/wrapper/src/main/resources/org/apache/karaf/shell/wrapper/aix/ppc64/karaf-wrapper Wed Mar 21 20:19:29 2012 differ
Propchange: karaf/branches/karaf-2.2.x/shell/wrapper/src/main/resources/org/apache/karaf/shell/wrapper/aix/ppc64/karaf-wrapper
------------------------------------------------------------------------------
svn:executable = *
Added: karaf/branches/karaf-2.2.x/shell/wrapper/src/main/resources/org/apache/karaf/shell/wrapper/aix/ppc64/libwrapper.a
URL: http://svn.apache.org/viewvc/karaf/branches/karaf-2.2.x/shell/wrapper/src/main/resources/org/apache/karaf/shell/wrapper/aix/ppc64/libwrapper.a?rev=1303554&view=auto
==============================================================================
Files karaf/branches/karaf-2.2.x/shell/wrapper/src/main/resources/org/apache/karaf/shell/wrapper/aix/ppc64/libwrapper.a (added) and karaf/branches/karaf-2.2.x/shell/wrapper/src/main/resources/org/apache/karaf/shell/wrapper/aix/ppc64/libwrapper.a Wed Mar 21 20:19:29 2012 differ
Propchange: karaf/branches/karaf-2.2.x/shell/wrapper/src/main/resources/org/apache/karaf/shell/wrapper/aix/ppc64/libwrapper.a
------------------------------------------------------------------------------
svn:executable = *