You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by ga...@apache.org on 2012/06/07 17:20:58 UTC
svn commit: r1347672 - in
/geronimo/server/branches/3.0-beta/framework/modules:
geronimo-hook/src/main/java/org/apache/geronimo/hook/equinox/ClassLoaderHook.java
geronimo-kernel/src/main/java/org/apache/geronimo/kernel/osgi/FrameworkUtils.java
Author: gawor
Date: Thu Jun 7 15:20:57 2012
New Revision: 1347672
URL: http://svn.apache.org/viewvc?rev=1347672&view=rev
Log:
provide better control over when url bases classloader should be used
Modified:
geronimo/server/branches/3.0-beta/framework/modules/geronimo-hook/src/main/java/org/apache/geronimo/hook/equinox/ClassLoaderHook.java
geronimo/server/branches/3.0-beta/framework/modules/geronimo-kernel/src/main/java/org/apache/geronimo/kernel/osgi/FrameworkUtils.java
Modified: geronimo/server/branches/3.0-beta/framework/modules/geronimo-hook/src/main/java/org/apache/geronimo/hook/equinox/ClassLoaderHook.java
URL: http://svn.apache.org/viewvc/geronimo/server/branches/3.0-beta/framework/modules/geronimo-hook/src/main/java/org/apache/geronimo/hook/equinox/ClassLoaderHook.java?rev=1347672&r1=1347671&r2=1347672&view=diff
==============================================================================
--- geronimo/server/branches/3.0-beta/framework/modules/geronimo-hook/src/main/java/org/apache/geronimo/hook/equinox/ClassLoaderHook.java (original)
+++ geronimo/server/branches/3.0-beta/framework/modules/geronimo-hook/src/main/java/org/apache/geronimo/hook/equinox/ClassLoaderHook.java Thu Jun 7 15:20:57 2012
@@ -43,11 +43,15 @@ import org.osgi.framework.BundleExceptio
public class ClassLoaderHook implements ClassLoadingHook, BundleExtender {
private static final String USE_URL_CLASSLOADER = "org.apache.geronimo.equinox.useURLClassLoader";
+ private static final String USE_URL_CLASSLOADER_LOCAL = "org.apache.geronimo.hook.equinox.useURLClassLoader";
private static final boolean useURLClassLoader = initUseURLClassLoader();
private static boolean initUseURLClassLoader() {
- String property = System.getProperty(USE_URL_CLASSLOADER, "false");
+ String property = System.getProperty(USE_URL_CLASSLOADER);
+ if (property == null) {
+ property = System.getProperty(USE_URL_CLASSLOADER_LOCAL, "false");
+ }
return Boolean.parseBoolean(property);
}
Modified: geronimo/server/branches/3.0-beta/framework/modules/geronimo-kernel/src/main/java/org/apache/geronimo/kernel/osgi/FrameworkUtils.java
URL: http://svn.apache.org/viewvc/geronimo/server/branches/3.0-beta/framework/modules/geronimo-kernel/src/main/java/org/apache/geronimo/kernel/osgi/FrameworkUtils.java?rev=1347672&r1=1347671&r2=1347672&view=diff
==============================================================================
--- geronimo/server/branches/3.0-beta/framework/modules/geronimo-kernel/src/main/java/org/apache/geronimo/kernel/osgi/FrameworkUtils.java (original)
+++ geronimo/server/branches/3.0-beta/framework/modules/geronimo-kernel/src/main/java/org/apache/geronimo/kernel/osgi/FrameworkUtils.java Thu Jun 7 15:20:57 2012
@@ -34,13 +34,17 @@ import org.osgi.framework.ServiceReferen
public class FrameworkUtils {
private static final String USE_URL_CLASSLOADER = "org.apache.geronimo.equinox.useURLClassLoader";
+ private static final String USE_URL_CLASSLOADER_LOCAL = "org.apache.geronimo.kernel.osgi.useURLClassLoader";
private static final boolean useURLClassLoader = initUseURLClassLoader();
private static final boolean isEquinox = initIsEquinox();
private static final Object urlConverter = initUrlConverter();
private static boolean initUseURLClassLoader() {
- String property = System.getProperty(USE_URL_CLASSLOADER, "false");
+ String property = System.getProperty(USE_URL_CLASSLOADER);
+ if (property == null) {
+ property = System.getProperty(USE_URL_CLASSLOADER_LOCAL, "true");
+ }
return Boolean.parseBoolean(property);
}