Author: gnodet
Date: Fri Apr 30 09:28:30 2010
New Revision: 939602
URL: http://svn.apache.org/viewvc?rev=939602&view=rev
Log:
FELIX-2311: Remove the Bootstrap class which is not needed anymore
Removed:
felix/trunk/karaf/main/src/main/java/org/apache/felix/karaf/main/Bootstrap.java
Modified:
felix/trunk/karaf/assembly/src/main/distribution/unix-shell/bin/karaf
felix/trunk/karaf/assembly/src/main/distribution/windows-text/bin/karaf.bat
felix/trunk/karaf/demos/web/src/main/java/org/apache/felix/karaf/web/WebAppListener.java
felix/trunk/karaf/main/src/main/java/org/apache/felix/karaf/main/Main.java
Modified: felix/trunk/karaf/assembly/src/main/distribution/unix-shell/bin/karaf
URL:
http://svn.apache.org/viewvc/felix/trunk/karaf/assembly/src/main/distribution/unix-shell/bin/karaf?rev=939602&r1=939601&r2=939602&view=diff
==============================================================================
--- felix/trunk/karaf/assembly/src/main/distribution/unix-shell/bin/karaf
(original)
+++ felix/trunk/karaf/assembly/src/main/distribution/unix-shell/bin/karaf Fri
Apr 30 09:28:30 2010
@@ -266,7 +266,7 @@ init() {
run() {
OPTS="-Dkaraf.startLocalConsole=true -Dkaraf.startRemoteShell=true"
- MAIN=org.apache.felix.karaf.main.Bootstrap
+ MAIN=org.apache.felix.karaf.main.Main
case "$1" in
'stop')
MAIN=org.apache.felix.karaf.main.Stop
@@ -291,7 +291,7 @@ run() {
CLASSPATH=`cygpath --path --windows "$CLASSPATH"`
fi
cd $KARAF_BASE
- exec $JAVA $JAVA_OPTS -Dstorage.location="${KARAF_HOME}/instances"
-Dkaraf.home="$KARAF_HOME" -Dkaraf.base="$KARAF_BASE"
-Djava.util.logging.config.file=$KARAF_BASE/etc/java.util.logging.properties
$OPTS -classpath "$CLASSPATH" $MAIN "$@"
+ exec $JAVA $JAVA_OPTS -Djava.endorsed.dirs="${KARAF_HOME}/lib/endorsed"
-Dstorage.location="${KARAF_HOME}/instances" -Dkaraf.home="$KARAF_HOME"
-Dkaraf.base="$KARAF_BASE"
-Djava.util.logging.config.file=$KARAF_BASE/etc/java.util.logging.properties
$OPTS -classpath "$CLASSPATH" $MAIN "$@"
}
main() {
Modified:
felix/trunk/karaf/assembly/src/main/distribution/windows-text/bin/karaf.bat
URL:
http://svn.apache.org/viewvc/felix/trunk/karaf/assembly/src/main/distribution/windows-text/bin/karaf.bat?rev=939602&r1=939601&r2=939602&view=diff
==============================================================================
--- felix/trunk/karaf/assembly/src/main/distribution/windows-text/bin/karaf.bat
(original)
+++ felix/trunk/karaf/assembly/src/main/distribution/windows-text/bin/karaf.bat
Fri Apr 30 09:28:30 2010
@@ -128,7 +128,7 @@ if "%KARAF_PROFILER%" == "" goto :RUN
:RUN
SET OPTS=-Dkaraf.startLocalConsole=true -Dkaraf.startRemoteShell=true
- SET MAIN=org.apache.felix.karaf.main.Bootstrap
+ SET MAIN=org.apache.felix.karaf.main.Main
SET SHIFT=false
if "%1" == "stop" goto :EXECUTE_STOP
if "%1" == "console" goto :EXECUTE_CONSOLE
@@ -160,7 +160,7 @@ if "%KARAF_PROFILER%" == "" goto :RUN
if not "%SHIFT%" == "true" SET ARGS=%1 %2 %3 %4 %5 %6 %7 %8
rem Execute the Java Virtual Machine
cd %KARAF_BASE%
- "%JAVA%" %JAVA_OPTS% %OPTS% -classpath "%CLASSPATH%"
-Dstorage.location="%KARAF_HOME%\instances" -Dkaraf.home="%KARAF_HOME%"
-Dkaraf.base="%KARAF_BASE%"
-Djava.util.logging.config.file="%KARAF_BASE%\etc\java.util.logging.properties"
org.apache.felix.karaf.main.Bootstrap %ARGS%
+ "%JAVA%" %JAVA_OPTS% %OPTS% -classpath "%CLASSPATH%"
-Dstorage.location="%KARAF_HOME%\instances" -Dkaraf.home="%KARAF_HOME%"
-Dkaraf.base="%KARAF_BASE%"
-Djava.util.logging.config.file="%KARAF_BASE%\etc\java.util.logging.properties"
%MAIN% %ARGS%
rem # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # #
Modified:
felix/trunk/karaf/demos/web/src/main/java/org/apache/felix/karaf/web/WebAppListener.java
URL:
http://svn.apache.org/viewvc/felix/trunk/karaf/demos/web/src/main/java/org/apache/felix/karaf/web/WebAppListener.java?rev=939602&r1=939601&r2=939602&view=diff
==============================================================================
---
felix/trunk/karaf/demos/web/src/main/java/org/apache/felix/karaf/web/WebAppListener.java
(original)
+++
felix/trunk/karaf/demos/web/src/main/java/org/apache/felix/karaf/web/WebAppListener.java
Fri Apr 30 09:28:30 2010
@@ -22,7 +22,6 @@ import javax.servlet.ServletContextEvent
import javax.servlet.ServletContextListener;
import org.apache.felix.karaf.main.Main;
-import org.apache.felix.karaf.main.Bootstrap;
public class WebAppListener implements ServletContextListener {
@@ -37,7 +36,8 @@ public class WebAppListener implements S
System.setProperty("karaf.base", root);
System.setProperty("karaf.startLocalConsole", "false");
System.setProperty("karaf.startRemoteShell", "true");
- main = Bootstrap.launch(new String[0]);
+ main = new Main(new String[0]);
+ main.launch();
} catch (Exception e) {
main = null;
e.printStackTrace();
Modified:
felix/trunk/karaf/main/src/main/java/org/apache/felix/karaf/main/Main.java
URL:
http://svn.apache.org/viewvc/felix/trunk/karaf/main/src/main/java/org/apache/felix/karaf/main/Main.java?rev=939602&r1=939601&r2=939602&view=diff
==============================================================================
--- felix/trunk/karaf/main/src/main/java/org/apache/felix/karaf/main/Main.java
(original)
+++ felix/trunk/karaf/main/src/main/java/org/apache/felix/karaf/main/Main.java
Fri Apr 30 09:28:30 2010
@@ -813,7 +813,7 @@ public class Main {
throw new FileNotFoundException(bundleFile.getAbsolutePath());
}
- URLClassLoader classLoader = (URLClassLoader)
Bootstrap.class.getClassLoader();
+ URLClassLoader classLoader = (URLClassLoader)
Main.class.getClassLoader();
Method mth = URLClassLoader.class.getDeclaredMethod("addURL",
URL.class);
mth.setAccessible(true);
mth.invoke(classLoader, bundleFile.toURL());
