[KARAF-4648] Use KARAF_BASE in wrapper classpath/library instead of KARAF_HOME
Project: http://git-wip-us.apache.org/repos/asf/karaf/repo Commit: http://git-wip-us.apache.org/repos/asf/karaf/commit/45ec65bf Tree: http://git-wip-us.apache.org/repos/asf/karaf/tree/45ec65bf Diff: http://git-wip-us.apache.org/repos/asf/karaf/diff/45ec65bf Branch: refs/heads/master Commit: 45ec65bf03aeb523c90ab25908b139f3610b5a7b Parents: da6183b Author: Jean-Baptiste Onofré <jbono...@apache.org> Authored: Tue Aug 23 15:37:11 2016 +0200 Committer: Jean-Baptiste Onofré <jbono...@apache.org> Committed: Tue Aug 23 15:37:11 2016 +0200 ---------------------------------------------------------------------- .../org/apache/karaf/wrapper/internal/unix/karaf-wrapper.conf | 6 +++--- .../apache/karaf/wrapper/internal/windows/karaf-wrapper.conf | 6 +++--- .../apache/karaf/wrapper/internal/windows64/karaf-wrapper.conf | 6 +++--- 3 files changed, 9 insertions(+), 9 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/karaf/blob/45ec65bf/wrapper/src/main/resources/org/apache/karaf/wrapper/internal/unix/karaf-wrapper.conf ---------------------------------------------------------------------- diff --git a/wrapper/src/main/resources/org/apache/karaf/wrapper/internal/unix/karaf-wrapper.conf b/wrapper/src/main/resources/org/apache/karaf/wrapper/internal/unix/karaf-wrapper.conf index 6da4ac8..4432b1d 100644 --- a/wrapper/src/main/resources/org/apache/karaf/wrapper/internal/unix/karaf-wrapper.conf +++ b/wrapper/src/main/resources/org/apache/karaf/wrapper/internal/unix/karaf-wrapper.conf @@ -28,9 +28,9 @@ set.default.KARAF_ETC=${karaf.etc} wrapper.working.dir=%KARAF_BASE% wrapper.java.command=%JAVA_HOME%/bin/java wrapper.java.mainclass=org.apache.karaf.wrapper.internal.service.Main -wrapper.java.classpath.1=%KARAF_HOME%/lib/boot/*.jar -wrapper.java.classpath.2=%KARAF_HOME%/lib/wrapper/*.jar -wrapper.java.library.path.1=%KARAF_HOME%/lib/wrapper/ +wrapper.java.classpath.1=%KARAF_BASE%/lib/boot/*.jar +wrapper.java.classpath.2=%KARAF_BASE%/lib/wrapper/*.jar +wrapper.java.library.path.1=%KARAF_BASE%/lib/wrapper/ # Application Parameters. Add parameters as needed starting from 1 #wrapper.app.parameter.1= http://git-wip-us.apache.org/repos/asf/karaf/blob/45ec65bf/wrapper/src/main/resources/org/apache/karaf/wrapper/internal/windows/karaf-wrapper.conf ---------------------------------------------------------------------- diff --git a/wrapper/src/main/resources/org/apache/karaf/wrapper/internal/windows/karaf-wrapper.conf b/wrapper/src/main/resources/org/apache/karaf/wrapper/internal/windows/karaf-wrapper.conf index acff6ac..260b510 100644 --- a/wrapper/src/main/resources/org/apache/karaf/wrapper/internal/windows/karaf-wrapper.conf +++ b/wrapper/src/main/resources/org/apache/karaf/wrapper/internal/windows/karaf-wrapper.conf @@ -28,9 +28,9 @@ set.default.KARAF_ETC=${karaf.etc} wrapper.working.dir=%KARAF_BASE% wrapper.java.command=%JAVA_HOME%/bin/java wrapper.java.mainclass=org.apache.karaf.wrapper.internal.service.Main -wrapper.java.classpath.1=%KARAF_HOME%/lib/boot/*.jar -wrapper.java.classpath.2=%KARAF_HOME%/lib/wrapper/*.jar -wrapper.java.library.path.1=%KARAF_HOME%/lib/wrapper/ +wrapper.java.classpath.1=%KARAF_BASE%/lib/boot/*.jar +wrapper.java.classpath.2=%KARAF_BASE%/lib/wrapper/*.jar +wrapper.java.library.path.1=%KARAF_BASE%/lib/wrapper/ # Application Parameters. Add parameters as needed starting from 1 #wrapper.app.parameter.1= http://git-wip-us.apache.org/repos/asf/karaf/blob/45ec65bf/wrapper/src/main/resources/org/apache/karaf/wrapper/internal/windows64/karaf-wrapper.conf ---------------------------------------------------------------------- diff --git a/wrapper/src/main/resources/org/apache/karaf/wrapper/internal/windows64/karaf-wrapper.conf b/wrapper/src/main/resources/org/apache/karaf/wrapper/internal/windows64/karaf-wrapper.conf index acff6ac..260b510 100644 --- a/wrapper/src/main/resources/org/apache/karaf/wrapper/internal/windows64/karaf-wrapper.conf +++ b/wrapper/src/main/resources/org/apache/karaf/wrapper/internal/windows64/karaf-wrapper.conf @@ -28,9 +28,9 @@ set.default.KARAF_ETC=${karaf.etc} wrapper.working.dir=%KARAF_BASE% wrapper.java.command=%JAVA_HOME%/bin/java wrapper.java.mainclass=org.apache.karaf.wrapper.internal.service.Main -wrapper.java.classpath.1=%KARAF_HOME%/lib/boot/*.jar -wrapper.java.classpath.2=%KARAF_HOME%/lib/wrapper/*.jar -wrapper.java.library.path.1=%KARAF_HOME%/lib/wrapper/ +wrapper.java.classpath.1=%KARAF_BASE%/lib/boot/*.jar +wrapper.java.classpath.2=%KARAF_BASE%/lib/wrapper/*.jar +wrapper.java.library.path.1=%KARAF_BASE%/lib/wrapper/ # Application Parameters. Add parameters as needed starting from 1 #wrapper.app.parameter.1=
