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 2013/10/02 20:27:07 UTC

svn commit: r1528587 [3/3] - in /karaf/trunk: ./ assemblies/features/framework/ assemblies/features/framework/src/main/filtered-resources/resources/bin/ assemblies/features/framework/src/main/filtered-resources/resources/etc/ assemblies/features/framew...

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=1528587&r1=1528586&r2=1528587&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 Wed Oct  2 18:27:05 2013
@@ -45,8 +45,9 @@ wrapper.java.additional.3=-Dkaraf.data=%
 wrapper.java.additional.4=-Dcom.sun.management.jmxremote
 wrapper.java.additional.5=-Dkaraf.startLocalConsole=false
 wrapper.java.additional.6=-Dkaraf.startRemoteShell=true
-wrapper.java.additional.7=-Djava.endorsed.dirs=%JAVA_HOME%/jre/lib/endorsed:%JAVA_HOME%/lib/endorsed:%KARAF_HOME%/lib/endorsed
-wrapper.java.additional.8=-Djava.ext.dirs=%JAVA_HOME%/jre/lib/ext:%JAVA_HOME%/lib/ext:%KARAF_HOME%/lib/ext
+wrapper.java.additional.7=-Djavax.management.builder.initial=org.apache.karaf.management.boot.KarafMBeanServerBuilder
+wrapper.java.additional.8=-Djava.endorsed.dirs=%JAVA_HOME%/jre/lib/endorsed:%JAVA_HOME%/lib/endorsed:%KARAF_HOME%/lib/endorsed
+wrapper.java.additional.9=-Djava.ext.dirs=%JAVA_HOME%/jre/lib/ext:%JAVA_HOME%/lib/ext:%KARAF_HOME%/lib/ext
 
 # Uncomment to enable jmx
 #wrapper.java.additional.n=-Dcom.sun.management.jmxremote.port=1616

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=1528587&r1=1528586&r2=1528587&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 Wed Oct  2 18:27:05 2013
@@ -45,8 +45,9 @@ wrapper.java.additional.3=-Dkaraf.data="
 wrapper.java.additional.4=-Dcom.sun.management.jmxremote
 wrapper.java.additional.5=-Dkaraf.startLocalConsole=false
 wrapper.java.additional.6=-Dkaraf.startRemoteShell=true
-wrapper.java.additional.7=-Djava.endorsed.dirs="%JAVA_HOME%/jre/lib/endorsed;%JAVA_HOME%/lib/endorsed;%KARAF_HOME%/lib/endorsed"
-wrapper.java.additional.8=-Djava.ext.dirs="%JAVA_HOME%/jre/lib/ext;%JAVA_HOME%/lib/ext;%KARAF_HOME%/lib/ext"
+wrapper.java.additional.7=-Djavax.management.builder.initial=org.apache.karaf.management.boot.KarafMBeanServerBuilder
+wrapper.java.additional.8=-Djava.endorsed.dirs="%JAVA_HOME%/jre/lib/endorsed;%JAVA_HOME%/lib/endorsed;%KARAF_HOME%/lib/endorsed"
+wrapper.java.additional.9=-Djava.ext.dirs="%JAVA_HOME%/jre/lib/ext;%JAVA_HOME%/lib/ext;%KARAF_HOME%/lib/ext"
 
 # Uncomment to enable jmx
 #wrapper.java.additional.n=-Dcom.sun.management.jmxremote.port=1616

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=1528587&r1=1528586&r2=1528587&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 Wed Oct  2 18:27:05 2013
@@ -45,8 +45,9 @@ wrapper.java.additional.3=-Dkaraf.data="
 wrapper.java.additional.4=-Dcom.sun.management.jmxremote
 wrapper.java.additional.5=-Dkaraf.startLocalConsole=false
 wrapper.java.additional.6=-Dkaraf.startRemoteShell=true
-wrapper.java.additional.7=-Djava.endorsed.dirs="%JAVA_HOME%/jre/lib/endorsed;%JAVA_HOME%/lib/endorsed;%KARAF_HOME%/lib/endorsed"
-wrapper.java.additional.8=-Djava.ext.dirs="%JAVA_HOME%/jre/lib/ext;%JAVA_HOME%/lib/ext;%KARAF_HOME%/lib/ext"
+wrapper.java.additional.7=-Djavax.management.builder.initial=org.apache.karaf.management.boot.KarafMBeanServerBuilder
+wrapper.java.additional.8=-Djava.endorsed.dirs="%JAVA_HOME%/jre/lib/endorsed;%JAVA_HOME%/lib/endorsed;%KARAF_HOME%/lib/endorsed"
+wrapper.java.additional.9=-Djava.ext.dirs="%JAVA_HOME%/jre/lib/ext;%JAVA_HOME%/lib/ext;%KARAF_HOME%/lib/ext"
 
 # Uncomment to enable jmx
 #wrapper.java.additional.n=-Dcom.sun.management.jmxremote.port=1616