You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@brooklyn.apache.org by sj...@apache.org on 2014/08/29 11:45:26 UTC
[1/2] git commit: BasicLocationRegistry uses catalogue's root
classloader
Repository: incubator-brooklyn
Updated Branches:
refs/heads/master 4a2fc266f -> 187216b74
BasicLocationRegistry uses catalogue's root classloader
Means LocationResolvers are loaded from things in the catalogue
Project: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/commit/54dc96e6
Tree: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/tree/54dc96e6
Diff: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/diff/54dc96e6
Branch: refs/heads/master
Commit: 54dc96e6e436321e40a5166506ba6ae17143252e
Parents: 4a2fc26
Author: Sam Corbett <sa...@cloudsoftcorp.com>
Authored: Fri Aug 29 10:43:49 2014 +0100
Committer: Sam Corbett <sa...@cloudsoftcorp.com>
Committed: Fri Aug 29 10:43:49 2014 +0100
----------------------------------------------------------------------
.../location/basic/BasicLocationRegistry.java | 2 +-
.../util/javalang/AggregateClassLoader.java | 19 +++++++++++++++++--
2 files changed, 18 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/54dc96e6/core/src/main/java/brooklyn/location/basic/BasicLocationRegistry.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/brooklyn/location/basic/BasicLocationRegistry.java b/core/src/main/java/brooklyn/location/basic/BasicLocationRegistry.java
index 2c7cf36..8bbba45 100644
--- a/core/src/main/java/brooklyn/location/basic/BasicLocationRegistry.java
+++ b/core/src/main/java/brooklyn/location/basic/BasicLocationRegistry.java
@@ -85,7 +85,7 @@ public class BasicLocationRegistry implements LocationRegistry {
}
protected void findServices() {
- ServiceLoader<LocationResolver> loader = ServiceLoader.load(LocationResolver.class);
+ ServiceLoader<LocationResolver> loader = ServiceLoader.load(LocationResolver.class, mgmt.getCatalog().getRootClassLoader());
for (LocationResolver r: loader) {
registerResolver(r);
}
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/54dc96e6/utils/common/src/main/java/brooklyn/util/javalang/AggregateClassLoader.java
----------------------------------------------------------------------
diff --git a/utils/common/src/main/java/brooklyn/util/javalang/AggregateClassLoader.java b/utils/common/src/main/java/brooklyn/util/javalang/AggregateClassLoader.java
index 74535c3..07af10a 100644
--- a/utils/common/src/main/java/brooklyn/util/javalang/AggregateClassLoader.java
+++ b/utils/common/src/main/java/brooklyn/util/javalang/AggregateClassLoader.java
@@ -18,10 +18,16 @@
*/
package brooklyn.util.javalang;
+import java.io.IOException;
import java.net.URL;
+import java.util.Collections;
+import java.util.Enumeration;
import java.util.List;
+import java.util.Set;
import java.util.concurrent.CopyOnWriteArrayList;
+import com.google.common.collect.Sets;
+
/** looks for classes and resources in the classloaders added here
* <p>
* similar to XStream's CompositeClassLoader, but also supporting resources,
@@ -89,7 +95,7 @@ public class AggregateClassLoader extends ClassLoader {
public String toString() {
return "AggregateClassLoader"+classLoaders;
}
-
+
@Override
public URL getResource(String name) {
URL result = null;
@@ -104,6 +110,15 @@ public class AggregateClassLoader extends ClassLoader {
return null;
}
- // TODO lesser used items, such as getResources, getPackage, findLibrary
+ @Override
+ public Enumeration<URL> getResources(String name) throws IOException {
+ Set<URL> resources = Sets.newLinkedHashSet();
+ for (ClassLoader classLoader : classLoaders) {
+ resources.addAll(Collections.list(classLoader.getResources(name)));
+ }
+ return Collections.enumeration(resources);
+ }
+
+ // TODO lesser used items, such as getPackage, findLibrary
}
[2/2] git commit: This closes #132
Posted by sj...@apache.org.
This closes #132
Project: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/commit/187216b7
Tree: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/tree/187216b7
Diff: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/diff/187216b7
Branch: refs/heads/master
Commit: 187216b741857b4f00496acb98c247795e7aeb18
Parents: 4a2fc26 54dc96e
Author: Sam Corbett <sa...@cloudsoftcorp.com>
Authored: Fri Aug 29 10:45:01 2014 +0100
Committer: Sam Corbett <sa...@cloudsoftcorp.com>
Committed: Fri Aug 29 10:45:01 2014 +0100
----------------------------------------------------------------------
.../location/basic/BasicLocationRegistry.java | 2 +-
.../util/javalang/AggregateClassLoader.java | 19 +++++++++++++++++--
2 files changed, 18 insertions(+), 3 deletions(-)
----------------------------------------------------------------------