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 2016/12/13 15:59:02 UTC
[08/13] brooklyn-server git commit: Compile with jclouds 2.0.0
Compile with jclouds 2.0.0
- tweak karaf dependencies [WIP]
- small changes to accommodate new signatures
- sshj package rename throughout
Project: http://git-wip-us.apache.org/repos/asf/brooklyn-server/repo
Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-server/commit/eef749c6
Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-server/tree/eef749c6
Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-server/diff/eef749c6
Branch: refs/heads/master
Commit: eef749c6c9f4e36c3dcdde1a80ed4f0e809c6f9a
Parents: a5e5652
Author: Guglielmo Nigri <gu...@cloudsoftcorp.com>
Authored: Wed Dec 7 18:07:17 2016 +0100
Committer: Guglielmo Nigri <gu...@cloudsoftcorp.com>
Committed: Wed Dec 7 18:07:17 2016 +0100
----------------------------------------------------------------------
karaf/features/src/main/feature/feature.xml | 11 ++++-----
.../jclouds/JcloudsStubTemplateBuilder.java | 25 +++++++++++++++++---
.../jclouds/StubbedComputeServiceRegistry.java | 6 +----
.../jclouds/UnsupportedComputeService.java | 22 +++++++----------
.../brooklyn/logback-logger-excludes.xml | 4 ++--
pom.xml | 2 +-
6 files changed, 40 insertions(+), 30 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/eef749c6/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 5d4c919..14a9d8f 100644
--- a/karaf/features/src/main/feature/feature.xml
+++ b/karaf/features/src/main/feature/feature.xml
@@ -144,7 +144,7 @@
<bundle dependency="true">mvn:net.minidev/asm/${minidev.asm.version}</bundle>
<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:net.schmizz/sshj/${sshj.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:org.bouncycastle/bcprov-ext-jdk15on/${bouncycastle.version}</bundle>
<bundle dependency="true">mvn:org.bouncycastle/bcpkix-jdk15on/${bouncycastle.version}</bundle>
@@ -260,13 +260,13 @@
<bundle dependency="true">mvn:org.apache.jclouds.driver/jclouds-okhttp/${jclouds.version}</bundle>
<bundle dependency="true">mvn:org.apache.jclouds.driver/jclouds-sshj/${jclouds.version}</bundle>
- <bundle dependency="true">mvn:org.apache.jclouds.labs/abiquo/${jclouds.version}</bundle>
- <bundle dependency="true">mvn:org.apache.jclouds.labs/docker/${jclouds.version}</bundle>
+ <!--<bundle dependency="true">mvn:org.apache.jclouds.labs/abiquo/${jclouds.version}</bundle>--> <!-- jclouds abstraction not implemented -->
+ <bundle dependency="true">mvn:org.apache.jclouds.api/docker/${jclouds.version}</bundle>
- <!-- Not bundle-ized, fixed in 2.0.0-SNAPSHOT -->
- <!-- bundle dependency="true">mvn:org.apache.jclouds.labs/google-compute-engine/${jclouds.version}</bundle -->
+ <bundle dependency="true">mvn:org.apache.jclouds.provider/google-compute-engine/${jclouds.version}</bundle>
<feature>jclouds-services</feature>
+ <bundle dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.jsch-agentproxy-sshj/0.0.9_1</bundle>
<!-- Same as allcompute -->
<feature>jclouds-aws-ec2</feature>
@@ -291,7 +291,6 @@
<feature>jclouds-aws-s3</feature>
<feature>jclouds-azureblob</feature>
<feature>jclouds-api-atmos</feature>
- <feature>jclouds-api-swift</feature>
<feature>jclouds-api-openstack-swift</feature>
<feature>jclouds-rackspace-cloudfiles-uk</feature>
<feature>jclouds-rackspace-cloudfiles-us</feature>
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/eef749c6/locations/jclouds/src/test/java/org/apache/brooklyn/location/jclouds/JcloudsStubTemplateBuilder.java
----------------------------------------------------------------------
diff --git a/locations/jclouds/src/test/java/org/apache/brooklyn/location/jclouds/JcloudsStubTemplateBuilder.java b/locations/jclouds/src/test/java/org/apache/brooklyn/location/jclouds/JcloudsStubTemplateBuilder.java
index bea98f3..0e7ef12 100644
--- a/locations/jclouds/src/test/java/org/apache/brooklyn/location/jclouds/JcloudsStubTemplateBuilder.java
+++ b/locations/jclouds/src/test/java/org/apache/brooklyn/location/jclouds/JcloudsStubTemplateBuilder.java
@@ -27,6 +27,7 @@ import com.google.common.cache.CacheLoader;
import com.google.common.cache.LoadingCache;
import com.google.common.collect.ImmutableMap;
import com.google.common.collect.ImmutableSet;
+import org.apache.brooklyn.util.javalang.AtomicReferences;
import org.jclouds.compute.domain.*;
import org.jclouds.compute.options.TemplateOptions;
import org.jclouds.compute.strategy.GetImageStrategy;
@@ -40,9 +41,11 @@ import org.jclouds.ec2.compute.functions.ImagesToRegionAndIdMap;
import org.jclouds.ec2.compute.internal.EC2TemplateBuilderImpl;
import org.jclouds.ec2.domain.RootDeviceType;
import org.jclouds.ec2.domain.VirtualizationType;
+import org.jclouds.rest.AuthorizationException;
import javax.inject.Provider;
import java.util.Set;
+import java.util.concurrent.atomic.AtomicReference;
import static org.jclouds.ec2.compute.domain.EC2HardwareBuilder.*;
import static org.mockito.Mockito.mock;
@@ -89,7 +92,7 @@ public class JcloudsStubTemplateBuilder {
Provider<TemplateOptions> optionsProvider = mock(Provider.class);
Provider<TemplateBuilder> templateBuilderProvider = mock(Provider.class);
TemplateOptions defaultOptions = mock(TemplateOptions.class);
- GetImageStrategy getImageStrategy = mock(GetImageStrategy.class);
+ final GetImageStrategy getImageStrategy = mock(GetImageStrategy.class);
when(optionsProvider.get()).thenReturn(defaultOptions);
@@ -98,8 +101,24 @@ public class JcloudsStubTemplateBuilder {
Supplier<Set<? extends Hardware>> sizes = Suppliers.<Set<? extends Hardware>> ofInstance(ImmutableSet
.of(HARDWARE_SUPPORTING_BOGUS));
- return new EC2TemplateBuilderImpl(locations, new ImageCacheSupplier(images, 60), sizes, Suppliers.ofInstance(jcloudsDomainLocation), optionsProvider,
- templateBuilderProvider, getImageStrategy, imageCache) {
+
+ AtomicReference<AuthorizationException> authException = new AtomicReference<AuthorizationException>(new AuthorizationException());
+
+ com.google.inject.Provider<GetImageStrategy> imageLoader = new com.google.inject.Provider<GetImageStrategy>() {
+ @Override
+ public GetImageStrategy get() {
+ return getImageStrategy;
+ }
+ };
+
+ return new EC2TemplateBuilderImpl(
+ locations,
+ new ImageCacheSupplier(images, 60, authException, imageLoader),
+ sizes,
+ Suppliers.ofInstance(jcloudsDomainLocation),
+ optionsProvider,
+ templateBuilderProvider,
+ imageCache) {
@Override
protected ToStringHelper string() {
return super.string().add("type", "Stubbed-TemplateBuilder");
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/eef749c6/locations/jclouds/src/test/java/org/apache/brooklyn/location/jclouds/StubbedComputeServiceRegistry.java
----------------------------------------------------------------------
diff --git a/locations/jclouds/src/test/java/org/apache/brooklyn/location/jclouds/StubbedComputeServiceRegistry.java b/locations/jclouds/src/test/java/org/apache/brooklyn/location/jclouds/StubbedComputeServiceRegistry.java
index e97f0ea..4e25dbd 100644
--- a/locations/jclouds/src/test/java/org/apache/brooklyn/location/jclouds/StubbedComputeServiceRegistry.java
+++ b/locations/jclouds/src/test/java/org/apache/brooklyn/location/jclouds/StubbedComputeServiceRegistry.java
@@ -147,7 +147,7 @@ public class StubbedComputeServiceRegistry implements ComputeServiceRegistry {
nodeCreator.destroyNode(id);
}
@Override
- public Set<? extends NodeMetadata> listNodesDetailsMatching(Predicate<ComputeMetadata> filter) {
+ public Set<? extends NodeMetadata> listNodesDetailsMatching(Predicate<? super NodeMetadata> filter) {
return nodeCreator.listNodesDetailsMatching(filter);
}
@Override
@@ -158,10 +158,6 @@ public class StubbedComputeServiceRegistry implements ComputeServiceRegistry {
public Set<? extends NodeMetadata> createNodesInGroup(String group, int count, TemplateOptions templateOptions) {
throw new UnsupportedOperationException();
}
- @Override
- public Set<? extends NodeMetadata> destroyNodesMatching(Predicate<NodeMetadata> filter) {
- throw new UnsupportedOperationException();
- }
}
private final NodeCreator nodeCreator;
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/eef749c6/locations/jclouds/src/test/java/org/apache/brooklyn/location/jclouds/UnsupportedComputeService.java
----------------------------------------------------------------------
diff --git a/locations/jclouds/src/test/java/org/apache/brooklyn/location/jclouds/UnsupportedComputeService.java b/locations/jclouds/src/test/java/org/apache/brooklyn/location/jclouds/UnsupportedComputeService.java
index 6bd89a6..b17aac4 100644
--- a/locations/jclouds/src/test/java/org/apache/brooklyn/location/jclouds/UnsupportedComputeService.java
+++ b/locations/jclouds/src/test/java/org/apache/brooklyn/location/jclouds/UnsupportedComputeService.java
@@ -112,7 +112,7 @@ public class UnsupportedComputeService implements ComputeService {
}
@Override
- public Set<? extends NodeMetadata> resumeNodesMatching(Predicate<NodeMetadata> filter) {
+ public Set<? extends NodeMetadata> resumeNodesMatching(Predicate<? super NodeMetadata> filter) {
throw new UnsupportedOperationException();
}
@@ -122,7 +122,7 @@ public class UnsupportedComputeService implements ComputeService {
}
@Override
- public Set<? extends NodeMetadata> suspendNodesMatching(Predicate<NodeMetadata> filter) {
+ public Set<? extends NodeMetadata> suspendNodesMatching(Predicate<? super NodeMetadata> filter) {
throw new UnsupportedOperationException();
}
@@ -132,7 +132,7 @@ public class UnsupportedComputeService implements ComputeService {
}
@Override
- public Set<? extends NodeMetadata> destroyNodesMatching(Predicate<NodeMetadata> filter) {
+ public Set<? extends NodeMetadata> destroyNodesMatching(Predicate<? super NodeMetadata> filter) {
throw new UnsupportedOperationException();
}
@@ -142,7 +142,7 @@ public class UnsupportedComputeService implements ComputeService {
}
@Override
- public Set<? extends NodeMetadata> rebootNodesMatching(Predicate<NodeMetadata> filter) {
+ public Set<? extends NodeMetadata> rebootNodesMatching(Predicate<? super NodeMetadata> filter) {
throw new UnsupportedOperationException();
}
@@ -152,31 +152,27 @@ public class UnsupportedComputeService implements ComputeService {
}
@Override
- public Set<? extends NodeMetadata> listNodesDetailsMatching(Predicate<ComputeMetadata> filter) {
+ public Set<? extends NodeMetadata> listNodesDetailsMatching(Predicate<? super NodeMetadata> filter) {
throw new UnsupportedOperationException();
}
@Override
- public Map<? extends NodeMetadata, ExecResponse> runScriptOnNodesMatching(Predicate<NodeMetadata> filter, String runScript)
- throws RunScriptOnNodesException {
+ public Map<? extends NodeMetadata, ExecResponse> runScriptOnNodesMatching(Predicate<? super NodeMetadata> filter, String runScript) throws RunScriptOnNodesException {
throw new UnsupportedOperationException();
}
@Override
- public Map<? extends NodeMetadata, ExecResponse> runScriptOnNodesMatching(Predicate<NodeMetadata> filter, Statement runScript)
- throws RunScriptOnNodesException {
+ public Map<? extends NodeMetadata, ExecResponse> runScriptOnNodesMatching(Predicate<? super NodeMetadata> filter, Statement runScript) throws RunScriptOnNodesException {
throw new UnsupportedOperationException();
}
@Override
- public Map<? extends NodeMetadata, ExecResponse> runScriptOnNodesMatching(Predicate<NodeMetadata> filter,
- String runScript, RunScriptOptions options) throws RunScriptOnNodesException {
+ public Map<? extends NodeMetadata, ExecResponse> runScriptOnNodesMatching(Predicate<? super NodeMetadata> filter, String runScript, RunScriptOptions options) throws RunScriptOnNodesException {
throw new UnsupportedOperationException();
}
@Override
- public Map<? extends NodeMetadata, ExecResponse> runScriptOnNodesMatching(Predicate<NodeMetadata> filter,
- Statement runScript, RunScriptOptions options) throws RunScriptOnNodesException {
+ public Map<? extends NodeMetadata, ExecResponse> runScriptOnNodesMatching(Predicate<? super NodeMetadata> filter, Statement runScript, RunScriptOptions options) throws RunScriptOnNodesException {
throw new UnsupportedOperationException();
}
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/eef749c6/logging/logback-includes/src/main/resources/brooklyn/logback-logger-excludes.xml
----------------------------------------------------------------------
diff --git a/logging/logback-includes/src/main/resources/brooklyn/logback-logger-excludes.xml b/logging/logback-includes/src/main/resources/brooklyn/logback-logger-excludes.xml
index afc3a0f..8bc1135 100644
--- a/logging/logback-includes/src/main/resources/brooklyn/logback-logger-excludes.xml
+++ b/logging/logback-includes/src/main/resources/brooklyn/logback-logger-excludes.xml
@@ -19,8 +19,8 @@
-->
<included>
- <!-- schmizz (sshj) very noisy, profligate with errors, put to file only, at warn level -->
- <logger name="net.schmizz" level="WARN" additivity="false">
+ <!-- sshj very noisy, profligate with errors, put to file only, at warn level -->
+ <logger name="com.hierynomus" level="WARN" additivity="false">
<appender-ref ref="FILE" />
</logger>
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/eef749c6/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index f0218cd..6b01e8e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -122,7 +122,7 @@
<commons-lang3.version>3.3.2</commons-lang3.version>
<groovy.version>2.3.7</groovy.version> <!-- Version supported by https://github.com/groovy/groovy-eclipse/wiki/Groovy-Eclipse-2.9.1-Release-Notes -->
<jsr305.version>2.0.1</jsr305.version>
- <snakeyaml.version>1.16</snakeyaml.version>
+ <snakeyaml.version>1.17</snakeyaml.version>
<!-- Next version of swagger requires changes to how path mapping and scanner injection are done. -->
<swagger.version>1.5.6</swagger.version>
<jansi.version>1.2.1</jansi.version>