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/04/09 08:10:13 UTC

karaf git commit: [KARAF-3535] Add karaf-jmx-boot.jar in the wrapper

Repository: karaf
Updated Branches:
  refs/heads/karaf-2.x 859cb7f56 -> 402daa3c8


[KARAF-3535] Add karaf-jmx-boot.jar in the wrapper


Project: http://git-wip-us.apache.org/repos/asf/karaf/repo
Commit: http://git-wip-us.apache.org/repos/asf/karaf/commit/402daa3c
Tree: http://git-wip-us.apache.org/repos/asf/karaf/tree/402daa3c
Diff: http://git-wip-us.apache.org/repos/asf/karaf/diff/402daa3c

Branch: refs/heads/karaf-2.x
Commit: 402daa3c81a380ffe15a6f2b7c6e79b72937ee35
Parents: 859cb7f
Author: Jean-Baptiste Onofré <jb...@apache.org>
Authored: Thu Apr 9 08:09:48 2015 +0200
Committer: Jean-Baptiste Onofré <jb...@apache.org>
Committed: Thu Apr 9 08:09:48 2015 +0200

----------------------------------------------------------------------
 .../org/apache/karaf/shell/wrapper/unix/karaf-wrapper.conf        | 3 ++-
 .../org/apache/karaf/shell/wrapper/windows/karaf-wrapper.conf     | 3 ++-
 .../org/apache/karaf/shell/wrapper/windows64/karaf-wrapper.conf   | 3 ++-
 3 files changed, 6 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/karaf/blob/402daa3c/shell/wrapper/src/main/resources/org/apache/karaf/shell/wrapper/unix/karaf-wrapper.conf
----------------------------------------------------------------------
diff --git a/shell/wrapper/src/main/resources/org/apache/karaf/shell/wrapper/unix/karaf-wrapper.conf b/shell/wrapper/src/main/resources/org/apache/karaf/shell/wrapper/unix/karaf-wrapper.conf
index 908d1a2..3522dad 100644
--- a/shell/wrapper/src/main/resources/org/apache/karaf/shell/wrapper/unix/karaf-wrapper.conf
+++ b/shell/wrapper/src/main/resources/org/apache/karaf/shell/wrapper/unix/karaf-wrapper.conf
@@ -31,7 +31,8 @@ wrapper.java.mainclass=org.apache.karaf.shell.wrapper.Main
 wrapper.java.classpath.1=%KARAF_BASE%/lib/karaf-wrapper.jar
 wrapper.java.classpath.2=%KARAF_HOME%/lib/karaf.jar
 wrapper.java.classpath.3=%KARAF_HOME%/lib/karaf-jaas-boot.jar
-wrapper.java.classpath.4=%KARAF_BASE%/lib/karaf-wrapper-main.jar
+wrapper.java.classpath.4=%KARAF_HOME%/lib/karaf-jmx-boot.jar
+wrapper.java.classpath.5=%KARAF_BASE%/lib/karaf-wrapper-main.jar
 wrapper.java.library.path.1=%KARAF_BASE%/lib/
 
 # Application Parameters.  Add parameters as needed starting from 1

http://git-wip-us.apache.org/repos/asf/karaf/blob/402daa3c/shell/wrapper/src/main/resources/org/apache/karaf/shell/wrapper/windows/karaf-wrapper.conf
----------------------------------------------------------------------
diff --git a/shell/wrapper/src/main/resources/org/apache/karaf/shell/wrapper/windows/karaf-wrapper.conf b/shell/wrapper/src/main/resources/org/apache/karaf/shell/wrapper/windows/karaf-wrapper.conf
index 79f30c0..fd83c80 100644
--- a/shell/wrapper/src/main/resources/org/apache/karaf/shell/wrapper/windows/karaf-wrapper.conf
+++ b/shell/wrapper/src/main/resources/org/apache/karaf/shell/wrapper/windows/karaf-wrapper.conf
@@ -31,7 +31,8 @@ wrapper.java.mainclass=org.apache.karaf.shell.wrapper.Main
 wrapper.java.classpath.1=%KARAF_BASE%/lib/karaf-wrapper.jar
 wrapper.java.classpath.2=%KARAF_HOME%/lib/karaf.jar
 wrapper.java.classpath.3=%KARAF_HOME%/lib/karaf-jaas-boot.jar
-wrapper.java.classpath.4=%KARAF_BASE%/lib/karaf-wrapper-main.jar
+wrapper.java.classpath.4=%KARAF_HOME%/lib/karaf-jmx-boot.jar
+wrapper.java.classpath.5=%KARAF_BASE%/lib/karaf-wrapper-main.jar
 wrapper.java.library.path.1=%KARAF_BASE%/lib/
 
 # Application Parameters.  Add parameters as needed starting from 1

http://git-wip-us.apache.org/repos/asf/karaf/blob/402daa3c/shell/wrapper/src/main/resources/org/apache/karaf/shell/wrapper/windows64/karaf-wrapper.conf
----------------------------------------------------------------------
diff --git a/shell/wrapper/src/main/resources/org/apache/karaf/shell/wrapper/windows64/karaf-wrapper.conf b/shell/wrapper/src/main/resources/org/apache/karaf/shell/wrapper/windows64/karaf-wrapper.conf
index 79f30c0..fd83c80 100644
--- a/shell/wrapper/src/main/resources/org/apache/karaf/shell/wrapper/windows64/karaf-wrapper.conf
+++ b/shell/wrapper/src/main/resources/org/apache/karaf/shell/wrapper/windows64/karaf-wrapper.conf
@@ -31,7 +31,8 @@ wrapper.java.mainclass=org.apache.karaf.shell.wrapper.Main
 wrapper.java.classpath.1=%KARAF_BASE%/lib/karaf-wrapper.jar
 wrapper.java.classpath.2=%KARAF_HOME%/lib/karaf.jar
 wrapper.java.classpath.3=%KARAF_HOME%/lib/karaf-jaas-boot.jar
-wrapper.java.classpath.4=%KARAF_BASE%/lib/karaf-wrapper-main.jar
+wrapper.java.classpath.4=%KARAF_HOME%/lib/karaf-jmx-boot.jar
+wrapper.java.classpath.5=%KARAF_BASE%/lib/karaf-wrapper-main.jar
 wrapper.java.library.path.1=%KARAF_BASE%/lib/
 
 # Application Parameters.  Add parameters as needed starting from 1