karaf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From pie...@apache.org
Subject svn commit: r1441424 - in /karaf/trunk/wrapper/core/src/main/resources/org/apache/karaf/wrapper/internal: unix/karaf-wrapper.conf windows/karaf-wrapper.conf windows64/karaf-wrapper.conf
Date Fri, 01 Feb 2013 12:34:45 GMT
Author: pieber
Date: Fri Feb  1 12:34:44 2013
New Revision: 1441424

URL: http://svn.apache.org/viewvc?rev=1441424&view=rev
Log:
[KARAF-2155] Added missing startup library making wrapper work again for master

Signed-off-by: Andreas Pieber <anpieber@gmail.com>

Modified:
    karaf/trunk/wrapper/core/src/main/resources/org/apache/karaf/wrapper/internal/unix/karaf-wrapper.conf
    karaf/trunk/wrapper/core/src/main/resources/org/apache/karaf/wrapper/internal/windows/karaf-wrapper.conf
    karaf/trunk/wrapper/core/src/main/resources/org/apache/karaf/wrapper/internal/windows64/karaf-wrapper.conf

Modified: karaf/trunk/wrapper/core/src/main/resources/org/apache/karaf/wrapper/internal/unix/karaf-wrapper.conf
URL: http://svn.apache.org/viewvc/karaf/trunk/wrapper/core/src/main/resources/org/apache/karaf/wrapper/internal/unix/karaf-wrapper.conf?rev=1441424&r1=1441423&r2=1441424&view=diff
==============================================================================
--- karaf/trunk/wrapper/core/src/main/resources/org/apache/karaf/wrapper/internal/unix/karaf-wrapper.conf
(original)
+++ karaf/trunk/wrapper/core/src/main/resources/org/apache/karaf/wrapper/internal/unix/karaf-wrapper.conf
Fri Feb  1 12:34:44 2013
@@ -27,11 +27,12 @@ set.default.KARAF_DATA=${karaf.data}
 wrapper.working.dir=%KARAF_BASE%
 wrapper.java.command=java
 wrapper.java.mainclass=org.apache.karaf.wrapper.internal.Main
-wrapper.java.classpath.1=%KARAF_BASE%/lib/karaf-wrapper.jar
+wrapper.java.classpath.1=%KARAF_HOME%/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.library.path.1=%KARAF_BASE%/lib/
+wrapper.java.classpath.4=%KARAF_HOME%/lib/karaf-wrapper-main.jar
+wrapper.java.classpath.5=%KARAF_HOME%/lib/karaf-org.osgi.core.jar
+wrapper.java.library.path.1=%KARAF_HOME%/lib/
 
 # Application Parameters.  Add parameters as needed starting from 1
 #wrapper.app.parameter.1=

Modified: karaf/trunk/wrapper/core/src/main/resources/org/apache/karaf/wrapper/internal/windows/karaf-wrapper.conf
URL: http://svn.apache.org/viewvc/karaf/trunk/wrapper/core/src/main/resources/org/apache/karaf/wrapper/internal/windows/karaf-wrapper.conf?rev=1441424&r1=1441423&r2=1441424&view=diff
==============================================================================
--- karaf/trunk/wrapper/core/src/main/resources/org/apache/karaf/wrapper/internal/windows/karaf-wrapper.conf
(original)
+++ karaf/trunk/wrapper/core/src/main/resources/org/apache/karaf/wrapper/internal/windows/karaf-wrapper.conf
Fri Feb  1 12:34:44 2013
@@ -27,11 +27,12 @@ set.default.KARAF_DATA=${karaf.data}
 wrapper.working.dir=%KARAF_BASE%
 wrapper.java.command=java
 wrapper.java.mainclass=org.apache.karaf.wrapper.internal.Main
-wrapper.java.classpath.1=%KARAF_BASE%/lib/karaf-wrapper.jar
+wrapper.java.classpath.1=%KARAF_HOME%/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.library.path.1=%KARAF_BASE%/lib/
+wrapper.java.classpath.4=%KARAF_HOME%/lib/karaf-wrapper-main.jar
+wrapper.java.classpath.5=%KARAF_HOME%/lib/karaf-org.osgi.core.jar
+wrapper.java.library.path.1=%KARAF_HOME%/lib/
 
 # Application Parameters.  Add parameters as needed starting from 1
 #wrapper.app.parameter.1=

Modified: karaf/trunk/wrapper/core/src/main/resources/org/apache/karaf/wrapper/internal/windows64/karaf-wrapper.conf
URL: http://svn.apache.org/viewvc/karaf/trunk/wrapper/core/src/main/resources/org/apache/karaf/wrapper/internal/windows64/karaf-wrapper.conf?rev=1441424&r1=1441423&r2=1441424&view=diff
==============================================================================
--- karaf/trunk/wrapper/core/src/main/resources/org/apache/karaf/wrapper/internal/windows64/karaf-wrapper.conf
(original)
+++ karaf/trunk/wrapper/core/src/main/resources/org/apache/karaf/wrapper/internal/windows64/karaf-wrapper.conf
Fri Feb  1 12:34:44 2013
@@ -27,11 +27,12 @@ set.default.KARAF_DATA=${karaf.data}
 wrapper.working.dir=%KARAF_BASE%
 wrapper.java.command=java
 wrapper.java.mainclass=org.apache.karaf.wrapper.internal.Main
-wrapper.java.classpath.1=%KARAF_BASE%/lib/karaf-wrapper.jar
+wrapper.java.classpath.1=%KARAF_HOME%/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.library.path.1=%KARAF_BASE%/lib/
+wrapper.java.classpath.4=%KARAF_HOME%/lib/karaf-wrapper-main.jar
+wrapper.java.classpath.5=%KARAF_HOME%/lib/karaf-org.osgi.core.jar
+wrapper.java.library.path.1=%KARAF_HOME%/lib/
 
 # Application Parameters.  Add parameters as needed starting from 1
 #wrapper.app.parameter.1=



Mime
View raw message