karaf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jbono...@apache.org
Subject karaf git commit: [KARAF-4648] Use KARAF_BASE in wrapper classpath/library instead of KARAF_HOME
Date Tue, 23 Aug 2016 13:47:14 GMT
Repository: karaf
Updated Branches:
  refs/heads/karaf-4.0.x 3eed10407 -> 1895733f4


[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/1895733f
Tree: http://git-wip-us.apache.org/repos/asf/karaf/tree/1895733f
Diff: http://git-wip-us.apache.org/repos/asf/karaf/diff/1895733f

Branch: refs/heads/karaf-4.0.x
Commit: 1895733f424737dc420b311b512a321f3107bd10
Parents: 3eed104
Author: Jean-Baptiste Onofré <jbonofre@apache.org>
Authored: Tue Aug 23 15:37:11 2016 +0200
Committer: Jean-Baptiste Onofré <jbonofre@apache.org>
Committed: Tue Aug 23 15:47:07 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/1895733f/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/1895733f/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/1895733f/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=


Mime
View raw message