You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@brooklyn.apache.org by al...@apache.org on 2017/10/09 11:51:01 UTC
[1/2] brooklyn-server git commit: Fixes broken
ClassLoaderFromStackOfBrooklynClassLoadingContextTest.testLoadClassFromBundle
test
Repository: brooklyn-server
Updated Branches:
refs/heads/master 464ed227e -> 7c317388f
Fixes broken ClassLoaderFromStackOfBrooklynClassLoadingContextTest.testLoadClassFromBundle test
Project: http://git-wip-us.apache.org/repos/asf/brooklyn-server/repo
Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-server/commit/09b25fea
Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-server/tree/09b25fea
Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-server/diff/09b25fea
Branch: refs/heads/master
Commit: 09b25fea0459e8c9346aa910094418c294d581cb
Parents: 464ed22
Author: Martin Harris <gi...@nakomis.com>
Authored: Mon Oct 9 11:39:00 2017 +0100
Committer: Martin Harris <gi...@nakomis.com>
Committed: Mon Oct 9 11:39:00 2017 +0100
----------------------------------------------------------------------
...rFromStackOfBrooklynClassLoadingContext.java | 3 ---
...mStackOfBrooklynClassLoadingContextTest.java | 1 -
.../brooklyn-test-osgi-com-example-entities.jar | Bin 22099 -> 22115 bytes
.../osgi/brooklyn-test-osgi-entities.jar | Bin 22864 -> 22878 bytes
.../brooklyn-test-osgi-more-entities_0.1.0.jar | Bin 15967 -> 15983 bytes
.../brooklyn-test-osgi-more-entities_0.2.0.jar | Bin 16884 -> 16893 bytes
...-test-osgi-more-entities_evil-twin_0.2.0.jar | Bin 14061 -> 14077 bytes
7 files changed, 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/09b25fea/core/src/main/java/org/apache/brooklyn/core/mgmt/classloading/ClassLoaderFromStackOfBrooklynClassLoadingContext.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/brooklyn/core/mgmt/classloading/ClassLoaderFromStackOfBrooklynClassLoadingContext.java b/core/src/main/java/org/apache/brooklyn/core/mgmt/classloading/ClassLoaderFromStackOfBrooklynClassLoadingContext.java
index b4a3675..e7a7de4 100644
--- a/core/src/main/java/org/apache/brooklyn/core/mgmt/classloading/ClassLoaderFromStackOfBrooklynClassLoadingContext.java
+++ b/core/src/main/java/org/apache/brooklyn/core/mgmt/classloading/ClassLoaderFromStackOfBrooklynClassLoadingContext.java
@@ -25,9 +25,6 @@ import java.util.concurrent.atomic.AtomicReference;
import org.apache.brooklyn.api.mgmt.ManagementContext;
import org.apache.brooklyn.api.mgmt.classloading.BrooklynClassLoadingContext;
-import org.apache.brooklyn.core.mgmt.classloading.BrooklynClassLoadingContextSequential;
-import org.apache.brooklyn.core.mgmt.classloading.ClassLoaderFromBrooklynClassLoadingContext;
-import org.apache.brooklyn.core.mgmt.classloading.JavaBrooklynClassLoadingContext;
import org.apache.brooklyn.util.core.ClassLoaderUtils;
import org.apache.brooklyn.util.exceptions.Exceptions;
import org.apache.brooklyn.util.javalang.ClassLoadingContext;
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/09b25fea/core/src/test/java/org/apache/brooklyn/core/mgmt/classloading/ClassLoaderFromStackOfBrooklynClassLoadingContextTest.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/apache/brooklyn/core/mgmt/classloading/ClassLoaderFromStackOfBrooklynClassLoadingContextTest.java b/core/src/test/java/org/apache/brooklyn/core/mgmt/classloading/ClassLoaderFromStackOfBrooklynClassLoadingContextTest.java
index a2237af..036aabc 100644
--- a/core/src/test/java/org/apache/brooklyn/core/mgmt/classloading/ClassLoaderFromStackOfBrooklynClassLoadingContextTest.java
+++ b/core/src/test/java/org/apache/brooklyn/core/mgmt/classloading/ClassLoaderFromStackOfBrooklynClassLoadingContextTest.java
@@ -24,7 +24,6 @@ import org.apache.brooklyn.api.entity.Entity;
import org.apache.brooklyn.api.mgmt.ManagementContext;
import org.apache.brooklyn.core.entity.AbstractEntity;
import org.apache.brooklyn.core.entity.Entities;
-import org.apache.brooklyn.core.mgmt.classloading.ClassLoaderFromStackOfBrooklynClassLoadingContext;
import org.apache.brooklyn.core.mgmt.ha.OsgiManager;
import org.apache.brooklyn.core.mgmt.internal.LocalManagementContext;
import org.apache.brooklyn.core.mgmt.internal.ManagementContextInternal;
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/09b25fea/utils/common/src/test/resources/brooklyn/osgi/brooklyn-test-osgi-com-example-entities.jar
----------------------------------------------------------------------
diff --git a/utils/common/src/test/resources/brooklyn/osgi/brooklyn-test-osgi-com-example-entities.jar b/utils/common/src/test/resources/brooklyn/osgi/brooklyn-test-osgi-com-example-entities.jar
index 44f5273..3caa879 100644
Binary files a/utils/common/src/test/resources/brooklyn/osgi/brooklyn-test-osgi-com-example-entities.jar and b/utils/common/src/test/resources/brooklyn/osgi/brooklyn-test-osgi-com-example-entities.jar differ
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/09b25fea/utils/common/src/test/resources/brooklyn/osgi/brooklyn-test-osgi-entities.jar
----------------------------------------------------------------------
diff --git a/utils/common/src/test/resources/brooklyn/osgi/brooklyn-test-osgi-entities.jar b/utils/common/src/test/resources/brooklyn/osgi/brooklyn-test-osgi-entities.jar
index f879df7..36caec6 100644
Binary files a/utils/common/src/test/resources/brooklyn/osgi/brooklyn-test-osgi-entities.jar and b/utils/common/src/test/resources/brooklyn/osgi/brooklyn-test-osgi-entities.jar differ
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/09b25fea/utils/common/src/test/resources/brooklyn/osgi/brooklyn-test-osgi-more-entities_0.1.0.jar
----------------------------------------------------------------------
diff --git a/utils/common/src/test/resources/brooklyn/osgi/brooklyn-test-osgi-more-entities_0.1.0.jar b/utils/common/src/test/resources/brooklyn/osgi/brooklyn-test-osgi-more-entities_0.1.0.jar
index 6763cc2..465f0ca 100644
Binary files a/utils/common/src/test/resources/brooklyn/osgi/brooklyn-test-osgi-more-entities_0.1.0.jar and b/utils/common/src/test/resources/brooklyn/osgi/brooklyn-test-osgi-more-entities_0.1.0.jar differ
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/09b25fea/utils/common/src/test/resources/brooklyn/osgi/brooklyn-test-osgi-more-entities_0.2.0.jar
----------------------------------------------------------------------
diff --git a/utils/common/src/test/resources/brooklyn/osgi/brooklyn-test-osgi-more-entities_0.2.0.jar b/utils/common/src/test/resources/brooklyn/osgi/brooklyn-test-osgi-more-entities_0.2.0.jar
index d457554..7dad78d 100644
Binary files a/utils/common/src/test/resources/brooklyn/osgi/brooklyn-test-osgi-more-entities_0.2.0.jar and b/utils/common/src/test/resources/brooklyn/osgi/brooklyn-test-osgi-more-entities_0.2.0.jar differ
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/09b25fea/utils/common/src/test/resources/brooklyn/osgi/brooklyn-test-osgi-more-entities_evil-twin_0.2.0.jar
----------------------------------------------------------------------
diff --git a/utils/common/src/test/resources/brooklyn/osgi/brooklyn-test-osgi-more-entities_evil-twin_0.2.0.jar b/utils/common/src/test/resources/brooklyn/osgi/brooklyn-test-osgi-more-entities_evil-twin_0.2.0.jar
index 1f58c67..d5997ba 100644
Binary files a/utils/common/src/test/resources/brooklyn/osgi/brooklyn-test-osgi-more-entities_evil-twin_0.2.0.jar and b/utils/common/src/test/resources/brooklyn/osgi/brooklyn-test-osgi-more-entities_evil-twin_0.2.0.jar differ
[2/2] brooklyn-server git commit: This closes #858
Posted by al...@apache.org.
This closes #858
Project: http://git-wip-us.apache.org/repos/asf/brooklyn-server/repo
Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-server/commit/7c317388
Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-server/tree/7c317388
Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-server/diff/7c317388
Branch: refs/heads/master
Commit: 7c317388fa0a933d2b0afc06d04dba2d9b9a4673
Parents: 464ed22 09b25fe
Author: Aled Sage <al...@gmail.com>
Authored: Mon Oct 9 12:50:47 2017 +0100
Committer: Aled Sage <al...@gmail.com>
Committed: Mon Oct 9 12:50:47 2017 +0100
----------------------------------------------------------------------
...rFromStackOfBrooklynClassLoadingContext.java | 3 ---
...mStackOfBrooklynClassLoadingContextTest.java | 1 -
.../brooklyn-test-osgi-com-example-entities.jar | Bin 22099 -> 22115 bytes
.../osgi/brooklyn-test-osgi-entities.jar | Bin 22864 -> 22878 bytes
.../brooklyn-test-osgi-more-entities_0.1.0.jar | Bin 15967 -> 15983 bytes
.../brooklyn-test-osgi-more-entities_0.2.0.jar | Bin 16884 -> 16893 bytes
...-test-osgi-more-entities_evil-twin_0.2.0.jar | Bin 14061 -> 14077 bytes
7 files changed, 4 deletions(-)
----------------------------------------------------------------------