You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@brooklyn.apache.org by dr...@apache.org on 2017/05/03 10:01:14 UTC
[3/5] brooklyn-server git commit: fix but where osgi classpaths
didn't load when using embedded framework
fix but where osgi classpaths didn't load when using embedded framework
Project: http://git-wip-us.apache.org/repos/asf/brooklyn-server/repo
Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-server/commit/400a32d9
Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-server/tree/400a32d9
Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-server/diff/400a32d9
Branch: refs/heads/master
Commit: 400a32d9886a0f19ece36d742a2d8d7cf044e790
Parents: 140631b
Author: Alex Heneveld <al...@cloudsoftcorp.com>
Authored: Fri Apr 28 15:50:11 2017 +0100
Committer: Alex Heneveld <al...@cloudsoftcorp.com>
Committed: Tue May 2 11:43:47 2017 +0100
----------------------------------------------------------------------
.../mgmt/classloading/JavaBrooklynClassLoadingContext.java | 4 ++--
.../apache/brooklyn/core/mgmt/persist/OsgiClassPrefixer.java | 3 ---
.../brooklyn/core/mgmt/persist/XmlMementoSerializer.java | 6 +-----
.../java/org/apache/brooklyn/util/core/ClassLoaderUtils.java | 4 ++--
4 files changed, 5 insertions(+), 12 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/400a32d9/core/src/main/java/org/apache/brooklyn/core/mgmt/classloading/JavaBrooklynClassLoadingContext.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/brooklyn/core/mgmt/classloading/JavaBrooklynClassLoadingContext.java b/core/src/main/java/org/apache/brooklyn/core/mgmt/classloading/JavaBrooklynClassLoadingContext.java
index bd7c7da..e4cb55a 100644
--- a/core/src/main/java/org/apache/brooklyn/core/mgmt/classloading/JavaBrooklynClassLoadingContext.java
+++ b/core/src/main/java/org/apache/brooklyn/core/mgmt/classloading/JavaBrooklynClassLoadingContext.java
@@ -130,11 +130,11 @@ public class JavaBrooklynClassLoadingContext extends AbstractBrooklynClassLoadin
@Override
public URL getResource(String name) {
- return new ClassLoaderUtils(loader).getResource(name);
+ return new ClassLoaderUtils(loader, mgmt).getResource(name);
}
@Override
public Iterable<URL> getResources(String name) {
- return new ClassLoaderUtils(loader).getResources(name);
+ return new ClassLoaderUtils(loader, mgmt).getResources(name);
}
}
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/400a32d9/core/src/main/java/org/apache/brooklyn/core/mgmt/persist/OsgiClassPrefixer.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/brooklyn/core/mgmt/persist/OsgiClassPrefixer.java b/core/src/main/java/org/apache/brooklyn/core/mgmt/persist/OsgiClassPrefixer.java
index 90b7ee6..ac1b63f 100644
--- a/core/src/main/java/org/apache/brooklyn/core/mgmt/persist/OsgiClassPrefixer.java
+++ b/core/src/main/java/org/apache/brooklyn/core/mgmt/persist/OsgiClassPrefixer.java
@@ -21,7 +21,6 @@ package org.apache.brooklyn.core.mgmt.persist;
import javax.annotation.Nullable;
import org.apache.brooklyn.core.mgmt.rebind.dto.MementosGenerators;
-import org.apache.brooklyn.util.core.ClassLoaderUtils;
import org.apache.brooklyn.util.core.osgi.Osgis;
import org.osgi.framework.Bundle;
@@ -43,7 +42,6 @@ public class OsgiClassPrefixer {
public static final String DELIMITER = ":";
- private final ClassLoaderUtils whiteListRetriever;
private final Function<Class<?>, Optional<Bundle>> bundleRetriever;
public OsgiClassPrefixer() {
@@ -52,7 +50,6 @@ public class OsgiClassPrefixer {
@VisibleForTesting
protected OsgiClassPrefixer(@Nullable Function<Class<?>, Optional<Bundle>> bundleRetriever) {
- this.whiteListRetriever = new ClassLoaderUtils(getClass());
this.bundleRetriever = bundleRetriever;
}
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/400a32d9/core/src/main/java/org/apache/brooklyn/core/mgmt/persist/XmlMementoSerializer.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/brooklyn/core/mgmt/persist/XmlMementoSerializer.java b/core/src/main/java/org/apache/brooklyn/core/mgmt/persist/XmlMementoSerializer.java
index 1bded8b..7f38611 100644
--- a/core/src/main/java/org/apache/brooklyn/core/mgmt/persist/XmlMementoSerializer.java
+++ b/core/src/main/java/org/apache/brooklyn/core/mgmt/persist/XmlMementoSerializer.java
@@ -584,11 +584,7 @@ public class XmlMementoSerializer<T> extends XmlSerializer<T> implements Memento
private void setCurrentClassLoader(ClassLoader classLoader) {
currentClassLoader = checkNotNull(classLoader);
- if (mgmt != null) {
- currentLoader.set(new ClassLoaderUtils(currentClassLoader, mgmt));
- } else {
- currentLoader.set(new ClassLoaderUtils(currentClassLoader));
- }
+ currentLoader.set(new ClassLoaderUtils(currentClassLoader, mgmt));
}
protected void acquireXstreamLock() {
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/400a32d9/core/src/main/java/org/apache/brooklyn/util/core/ClassLoaderUtils.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/brooklyn/util/core/ClassLoaderUtils.java b/core/src/main/java/org/apache/brooklyn/util/core/ClassLoaderUtils.java
index e402e72..f607939 100644
--- a/core/src/main/java/org/apache/brooklyn/util/core/ClassLoaderUtils.java
+++ b/core/src/main/java/org/apache/brooklyn/util/core/ClassLoaderUtils.java
@@ -96,7 +96,7 @@ public class ClassLoaderUtils {
public ClassLoaderUtils(@Nullable ClassLoader cl, @Nullable ManagementContext mgmt) {
this.classLoader = getValidClassLoader(cl);
this.entity = null;
- this.mgmt = checkNotNull(mgmt, "mgmt");
+ this.mgmt = mgmt;
}
public ClassLoaderUtils(Class<?> callingClass, Entity entity) {
@@ -303,7 +303,7 @@ public class ClassLoaderUtils {
}
return dispatcher.tryLoadFrom(bundle.get(), name);
} else {
- log.warn("Request for bundle '"+symbolicName+"' "+(Strings.isNonBlank(version) ? "("+version+") " : "")+"will be ignored, loading '"+name+"' as no framework available");
+ log.warn("Request for bundle '"+symbolicName+"' "+(Strings.isNonBlank(version) ? "("+version+") " : "")+"will be ignored as no framework available; will look for '"+name+"' in plain old classpath");
return dispatcher.tryLoadFrom(classLoader, name);
}
}