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 2017/05/24 14:44:55 UTC
[1/4] brooklyn-server git commit: Fix DslYamlTest’s getConfigEventually
Repository: brooklyn-server
Updated Branches:
refs/heads/master 757a38cc4 -> b84ec0231
Fix DslYamlTest’s getConfigEventually
Call config().get(), and then config.getNonBlocking().
Previously did it the other way around, so the getNonBlocking could
return absent if the value was not yet available.
Project: http://git-wip-us.apache.org/repos/asf/brooklyn-server/repo
Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-server/commit/a4b13773
Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-server/tree/a4b13773
Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-server/diff/a4b13773
Branch: refs/heads/master
Commit: a4b137730c9f08a61cb82aafacaea2fd1dc3ada7
Parents: 757a38c
Author: Aled Sage <al...@gmail.com>
Authored: Wed May 24 12:43:35 2017 +0100
Committer: Aled Sage <al...@gmail.com>
Committed: Wed May 24 12:43:35 2017 +0100
----------------------------------------------------------------------
.../org/apache/brooklyn/camp/brooklyn/spi/dsl/DslYamlTest.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/a4b13773/camp/camp-brooklyn/src/test/java/org/apache/brooklyn/camp/brooklyn/spi/dsl/DslYamlTest.java
----------------------------------------------------------------------
diff --git a/camp/camp-brooklyn/src/test/java/org/apache/brooklyn/camp/brooklyn/spi/dsl/DslYamlTest.java b/camp/camp-brooklyn/src/test/java/org/apache/brooklyn/camp/brooklyn/spi/dsl/DslYamlTest.java
index 5eba70a..c8463e6 100644
--- a/camp/camp-brooklyn/src/test/java/org/apache/brooklyn/camp/brooklyn/spi/dsl/DslYamlTest.java
+++ b/camp/camp-brooklyn/src/test/java/org/apache/brooklyn/camp/brooklyn/spi/dsl/DslYamlTest.java
@@ -763,8 +763,8 @@ public class DslYamlTest extends AbstractYamlTest {
public T call() throws Exception {
// TODO Move the getNonBlocking call out of the task after #480 is merged.
// Currently doesn't work because no execution context available.
- Maybe<T> immediateValue = ((EntityInternal)entity).config().getNonBlocking(configKey);
T blockingValue = entity.config().get(configKey);
+ Maybe<T> immediateValue = ((EntityInternal)entity).config().getNonBlocking(configKey);
assertEquals(immediateValue.get(), blockingValue);
return blockingValue;
}
[2/4] brooklyn-server git commit: DslYamlTest.getConfigEventually: don’t use entity’s task
Posted by sj...@apache.org.
DslYamlTest.getConfigEventually: don’t use entity’s task
As per previous TODO about PR #480, we don’t need to retrieve the config
in the context of the given entity.
Project: http://git-wip-us.apache.org/repos/asf/brooklyn-server/repo
Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-server/commit/3200ee8c
Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-server/tree/3200ee8c
Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-server/diff/3200ee8c
Branch: refs/heads/master
Commit: 3200ee8c74b45c30a087ff57b6509798e69a01d3
Parents: a4b1377
Author: Aled Sage <al...@gmail.com>
Authored: Wed May 24 12:45:46 2017 +0100
Committer: Aled Sage <al...@gmail.com>
Committed: Wed May 24 12:45:46 2017 +0100
----------------------------------------------------------------------
.../camp/brooklyn/spi/dsl/DslYamlTest.java | 31 ++++++++++++--------
1 file changed, 18 insertions(+), 13 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/3200ee8c/camp/camp-brooklyn/src/test/java/org/apache/brooklyn/camp/brooklyn/spi/dsl/DslYamlTest.java
----------------------------------------------------------------------
diff --git a/camp/camp-brooklyn/src/test/java/org/apache/brooklyn/camp/brooklyn/spi/dsl/DslYamlTest.java b/camp/camp-brooklyn/src/test/java/org/apache/brooklyn/camp/brooklyn/spi/dsl/DslYamlTest.java
index c8463e6..f7ec4c8 100644
--- a/camp/camp-brooklyn/src/test/java/org/apache/brooklyn/camp/brooklyn/spi/dsl/DslYamlTest.java
+++ b/camp/camp-brooklyn/src/test/java/org/apache/brooklyn/camp/brooklyn/spi/dsl/DslYamlTest.java
@@ -19,10 +19,13 @@ import static org.testng.Assert.assertEquals;
import java.util.concurrent.Callable;
import java.util.concurrent.ExecutionException;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
+import java.util.concurrent.Future;
+import java.util.concurrent.TimeUnit;
import org.apache.brooklyn.api.entity.Entity;
import org.apache.brooklyn.api.location.Location;
-import org.apache.brooklyn.api.mgmt.Task;
import org.apache.brooklyn.api.sensor.AttributeSensor;
import org.apache.brooklyn.camp.brooklyn.AbstractYamlTest;
import org.apache.brooklyn.camp.brooklyn.spi.dsl.methods.DslTestObjects.DslTestCallable;
@@ -758,17 +761,19 @@ public class DslYamlTest extends AbstractYamlTest {
}
private static <T> T getConfigEventually(final Entity entity, final ConfigKey<T> configKey) throws Exception {
- Task<T> result = ((EntityInternal)entity).getExecutionContext().submit(new Callable<T>() {
- @Override
- public T call() throws Exception {
- // TODO Move the getNonBlocking call out of the task after #480 is merged.
- // Currently doesn't work because no execution context available.
- T blockingValue = entity.config().get(configKey);
- Maybe<T> immediateValue = ((EntityInternal)entity).config().getNonBlocking(configKey);
- assertEquals(immediateValue.get(), blockingValue);
- return blockingValue;
- }
- });
- return result.get(Asserts.DEFAULT_LONG_TIMEOUT);
+ // Use an executor, in case config().get() blocks forever, waiting for the config value.
+ ExecutorService executor = Executors.newSingleThreadExecutor();
+ try {
+ Future<T> future = executor.submit(new Callable<T>() {
+ public T call() {
+ T blockingValue = entity.config().get(configKey);
+ Maybe<T> immediateValue = ((EntityInternal)entity).config().getNonBlocking(configKey);
+ assertEquals(immediateValue.get(), blockingValue);
+ return blockingValue;
+ }});
+ return future.get(Asserts.DEFAULT_LONG_TIMEOUT.toMilliseconds(), TimeUnit.MILLISECONDS);
+ } finally {
+ executor.shutdownNow();
+ }
}
}
[3/4] brooklyn-server git commit: Upgrade to jclouds 2.1.0-SNAPSHOT
Posted by sj...@apache.org.
Upgrade to jclouds 2.1.0-SNAPSHOT
Project: http://git-wip-us.apache.org/repos/asf/brooklyn-server/repo
Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-server/commit/1259e283
Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-server/tree/1259e283
Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-server/diff/1259e283
Branch: refs/heads/master
Commit: 1259e2832829d67148a42cbbb07400cc94a06587
Parents: 757a38c
Author: Svetoslav Neykov <sv...@cloudsoftcorp.com>
Authored: Mon May 8 19:40:14 2017 +0300
Committer: Sam Corbett <sa...@cloudsoftcorp.com>
Committed: Wed May 24 15:40:49 2017 +0100
----------------------------------------------------------------------
karaf/features/src/main/feature/feature.xml | 3 ++-
pom.xml | 6 ++++--
2 files changed, 6 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/1259e283/karaf/features/src/main/feature/feature.xml
----------------------------------------------------------------------
diff --git a/karaf/features/src/main/feature/feature.xml b/karaf/features/src/main/feature/feature.xml
index d4d348e..c88673d 100644
--- a/karaf/features/src/main/feature/feature.xml
+++ b/karaf/features/src/main/feature/feature.xml
@@ -145,7 +145,8 @@
<bundle dependency="true">mvn:com.thoughtworks.xstream/xstream/${xstream.version}</bundle>
<bundle dependency="true">mvn:org.freemarker/freemarker/${freemarker.version}</bundle>
<bundle dependency="true">mvn:com.hierynomus/sshj/${sshj.version}</bundle>
- <bundle dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.jzlib/1.1.3_2</bundle> <!-- jzlib version is 1.1.3, but bundle is 1.1.3_2 -->
+ <bundle dependency="true">mvn:net.i2p.crypto/eddsa/${eddsa.version}</bundle>
+ <bundle dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.jzlib/${jzlib.servicemix.version}</bundle>
<bundle dependency="true">mvn:org.bouncycastle/bcprov-ext-jdk15on/${bouncycastle.version}</bundle>
<bundle dependency="true">mvn:org.bouncycastle/bcpkix-jdk15on/${bouncycastle.version}</bundle>
<bundle dependency="true">mvn:commons-codec/commons-codec/${commons-codec.version}</bundle>
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/1259e283/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 1055245..a9b43b1 100644
--- a/pom.xml
+++ b/pom.xml
@@ -101,7 +101,7 @@
<surefire.failIfNoSpecifiedTests>false</surefire.failIfNoSpecifiedTests>
<!-- Dependency Versions -->
- <jclouds.version>2.0.1</jclouds.version> <!-- JCLOUDS_VERSION -->
+ <jclouds.version>2.1.0-SNAPSHOT</jclouds.version> <!-- JCLOUDS_VERSION -->
<logback.version>1.0.7</logback.version>
<slf4j.version>1.6.6</slf4j.version> <!-- used for java.util.logging jul-to-slf4j interception -->
<!-- Must match jclouds' version. From jclouds 1.9.3+ can be any version in the range [16-20) -->
@@ -115,6 +115,8 @@
<xstream.version>1.4.8</xstream.version>
<xpp3.servicemix.version>1.1.4c_7</xpp3.servicemix.version>
<kxml2.servicemix.version>2.3.0_3</kxml2.servicemix.version>
+ <jzlib.servicemix.version>1.1.3_2</jzlib.servicemix.version>
+ <eddsa.version>0.1.0</eddsa.version>
<!-- double-check downstream projects before changing jackson version -->
<fasterxml.jackson.version>2.7.5</fasterxml.jackson.version>
<cxf.version>3.1.10</cxf.version>
@@ -133,7 +135,7 @@
<ivy.version>2.2.0</ivy.version>
<mx4j.version>3.0.1</mx4j.version>
<bouncycastle.version>1.51</bouncycastle.version>
- <sshj.version>0.12.0</sshj.version>
+ <sshj.version>0.20.0</sshj.version>
<felix.framework.version>5.6.1</felix.framework.version>
<reflections.version>0.9.9-RC1</reflections.version>
<jetty.version>9.2.13.v20150730</jetty.version>
[4/4] brooklyn-server git commit: This closes #696
Posted by sj...@apache.org.
This closes #696
Fix DslYamlTest
Project: http://git-wip-us.apache.org/repos/asf/brooklyn-server/repo
Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-server/commit/b84ec023
Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-server/tree/b84ec023
Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-server/diff/b84ec023
Branch: refs/heads/master
Commit: b84ec0231bdc305a87bf771fa6c43e6ebf0d1d25
Parents: 1259e28 3200ee8
Author: Sam Corbett <sa...@cloudsoftcorp.com>
Authored: Wed May 24 15:44:35 2017 +0100
Committer: Sam Corbett <sa...@cloudsoftcorp.com>
Committed: Wed May 24 15:44:35 2017 +0100
----------------------------------------------------------------------
.../camp/brooklyn/spi/dsl/DslYamlTest.java | 31 ++++++++++++--------
1 file changed, 18 insertions(+), 13 deletions(-)
----------------------------------------------------------------------