You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@brooklyn.apache.org by gr...@apache.org on 2016/07/04 09:34:59 UTC
[1/2] brooklyn-server git commit: Misc OSGi fixes
Repository: brooklyn-server
Updated Branches:
refs/heads/master 122c4eae8 -> 5adbbca1c
Misc OSGi fixes
* adds missing bundles for persistence
* enable persistence by default
* add missing entityType for policies (required)
* remove deprecated config key, causing duplicate name warning in logs
* remove TargetableTestComponent from catalog.bom - it's not a user-facing entity, meant to be subclassed
Project: http://git-wip-us.apache.org/repos/asf/brooklyn-server/repo
Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-server/commit/9eca4087
Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-server/tree/9eca4087
Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-server/diff/9eca4087
Branch: refs/heads/master
Commit: 9eca4087670dbed2b504b59b5ff5c6cc2ca45f6a
Parents: 4b11f50
Author: Svetoslav Neykov <sv...@cloudsoftcorp.com>
Authored: Fri Jul 1 17:36:27 2016 +0300
Committer: Svetoslav Neykov <sv...@cloudsoftcorp.com>
Committed: Fri Jul 1 18:50:30 2016 +0300
----------------------------------------------------------------------
karaf/features/src/main/feature/feature.xml | 3 ++-
.../src/main/resources/OSGI-INF/blueprint/blueprint.xml | 2 +-
policy/src/main/resources/catalog.bom | 12 +++++++++---
pom.xml | 2 ++
.../org/apache/brooklyn/entity/chef/ChefConfig.java | 4 ----
.../entity/chef/ChefLifecycleEffectorTasks.java | 2 +-
.../org/apache/brooklyn/entity/chef/ChefSoloDriver.java | 2 +-
test-framework/src/main/resources/catalog.bom | 3 ---
8 files changed, 16 insertions(+), 14 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/9eca4087/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 f990082..057cd3b 100644
--- a/karaf/features/src/main/feature/feature.xml
+++ b/karaf/features/src/main/feature/feature.xml
@@ -126,12 +126,13 @@
<bundle dependency="true">mvn:org.bouncycastle/bcpkix-jdk15on/${bouncycastle.version}</bundle>
<bundle dependency="true">mvn:commons-codec/commons-codec/${commons-codec.version}</bundle>
<bundle dependency="true">mvn:org.apache.commons/commons-lang3/${commons-lang3.version}</bundle>
+ <bundle dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.xpp3/${xpp3.servicemix.version}</bundle> <!-- from com.thoughtworks.xstream/xstream -->
+ <bundle dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.kxml2/${kxml2.servicemix.version}</bundle>
<!-- TODO: don't use wrap -->
<bundle dependency="true">wrap:mvn:com.google.http-client/google-http-client/1.18.0-rc</bundle> <!-- from geoip -->
<bundle dependency="true">wrap:mvn:com.maxmind.geoip2/geoip2/${maxmind.version}</bundle> <!-- from geoip2 -->
<bundle dependency="true">wrap:mvn:com.maxmind.db/maxmind-db/${maxmind-db.version}</bundle>
- <bundle dependency="true">wrap:mvn:xpp3/xpp3_min/1.1.4c</bundle> <!-- from com.thoughtworks.xstream/xstream -->
<bundle dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.reflections/${reflections.bundle.version}</bundle>
</feature>
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/9eca4087/karaf/init/src/main/resources/OSGI-INF/blueprint/blueprint.xml
----------------------------------------------------------------------
diff --git a/karaf/init/src/main/resources/OSGI-INF/blueprint/blueprint.xml b/karaf/init/src/main/resources/OSGI-INF/blueprint/blueprint.xml
index 22cf66c..9907cec 100644
--- a/karaf/init/src/main/resources/OSGI-INF/blueprint/blueprint.xml
+++ b/karaf/init/src/main/resources/OSGI-INF/blueprint/blueprint.xml
@@ -38,7 +38,7 @@ limitations under the License.
<cm:property name="ignoreCatalogErrors" value="true" />
<cm:property name="ignorePersistenceErrors" value="true" />
<cm:property name="highAvailabilityMode" value="DISABLED" />
- <cm:property name="persistMode" value="DISABLED" />
+ <cm:property name="persistMode" value="AUTO" />
<cm:property name="persistenceDir" value="" />
<cm:property name="persistenceLocation" value="" />
<cm:property name="persistPeriod" value="1s" />
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/9eca4087/policy/src/main/resources/catalog.bom
----------------------------------------------------------------------
diff --git a/policy/src/main/resources/catalog.bom b/policy/src/main/resources/catalog.bom
index d8c7d79..a86ea5b 100644
--- a/policy/src/main/resources/catalog.bom
+++ b/policy/src/main/resources/catalog.bom
@@ -19,27 +19,32 @@ brooklyn.catalog:
version: 0.10.0-SNAPSHOT # BROOKLYN_VERSION
items:
- id: org.apache.brooklyn.policy.ha.ConnectionFailureDetector
+ itemType: policy
item:
type: org.apache.brooklyn.policy.ha.ConnectionFailureDetector
name: Connection Failure Detector
description: HA policy for monitoring a host:port,
- id: org.apache.brooklyn.policy.ha.ServiceRestarter
+ itemType: policy
item:
type: org.apache.brooklyn.policy.ha.ServiceRestarter
name: Service Restarter
description: HA policy for restarting a service automatically,
- id: org.apache.brooklyn.policy.ha.SshMachineFailureDetector
+ itemType: policy
item:
type: org.apache.brooklyn.policy.ha.SshMachineFailureDetector
name: Ssh Connectivity Failure Detector
description: HA policy for monitoring an SshMachine,
- - id: org.apache.brooklyn.policy.followthesun.FollowTheSunPool
- item:
- type: org.apache.brooklyn.policy.followthesun.FollowTheSunPool
+# removed from catalog because it cannot currently be configured via catalog mechanisms
+# - id: org.apache.brooklyn.policy.followthesun.FollowTheSunPool
+# item:
+# type: org.apache.brooklyn.policy.followthesun.FollowTheSunPool
- id: org.apache.brooklyn.policy.loadbalancing.BalanceableWorkerPool
item:
type: org.apache.brooklyn.policy.loadbalancing.BalanceableWorkerPool
- id: org.apache.brooklyn.policy.ha.ServiceReplacer
+ itemType: policy
item:
type: org.apache.brooklyn.policy.ha.ServiceReplacer
name: Service Replacer
@@ -48,6 +53,7 @@ brooklyn.catalog:
item:
type: org.apache.brooklyn.policy.loadbalancing.ItemsInContainersGroup
- id: org.apache.brooklyn.policy.autoscaling.AutoScalerPolicy
+ itemType: policy
item:
type: org.apache.brooklyn.policy.autoscaling.AutoScalerPolicy
name: Auto-scaler
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/9eca4087/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 82b7b53..a663b9d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -99,6 +99,8 @@
<!-- This can be different, OSGi will pick it up -->
<guava-swagger.version>18.0</guava-swagger.version>
<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>
<!-- double-check downstream projects before changing jackson and resteasy versions -->
<fasterxml.jackson.version>2.4.5</fasterxml.jackson.version>
<resteasy.version>3.0.8.Final</resteasy.version>
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/9eca4087/software/base/src/main/java/org/apache/brooklyn/entity/chef/ChefConfig.java
----------------------------------------------------------------------
diff --git a/software/base/src/main/java/org/apache/brooklyn/entity/chef/ChefConfig.java b/software/base/src/main/java/org/apache/brooklyn/entity/chef/ChefConfig.java
index 974149e..07b4ce5 100644
--- a/software/base/src/main/java/org/apache/brooklyn/entity/chef/ChefConfig.java
+++ b/software/base/src/main/java/org/apache/brooklyn/entity/chef/ChefConfig.java
@@ -32,10 +32,6 @@ public interface ChefConfig {
public static final ConfigKey<String> CHEF_COOKBOOK_PRIMARY_NAME = ConfigKeys.newStringConfigKey("brooklyn.chef.cookbook.primary.name",
"Namespace to use for passing data to Chef and for finding effectors");
-
- @Deprecated /** @deprecatd since 0.7.0 use #CHEF_COOKBOOK_URLS */
- @SetFromFlag("cookbooks")
- public static final MapConfigKey<String> CHEF_COOKBOOKS = new MapConfigKey<String>(String.class, "brooklyn.chef.cookbooksUrls");
@SetFromFlag("cookbook_urls")
public static final MapConfigKey<String> CHEF_COOKBOOK_URLS = new MapConfigKey<String>(String.class, "brooklyn.chef.cookbooksUrls");
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/9eca4087/software/base/src/main/java/org/apache/brooklyn/entity/chef/ChefLifecycleEffectorTasks.java
----------------------------------------------------------------------
diff --git a/software/base/src/main/java/org/apache/brooklyn/entity/chef/ChefLifecycleEffectorTasks.java b/software/base/src/main/java/org/apache/brooklyn/entity/chef/ChefLifecycleEffectorTasks.java
index 304648c..96d692f 100644
--- a/software/base/src/main/java/org/apache/brooklyn/entity/chef/ChefLifecycleEffectorTasks.java
+++ b/software/base/src/main/java/org/apache/brooklyn/entity/chef/ChefLifecycleEffectorTasks.java
@@ -166,7 +166,7 @@ public class ChefLifecycleEffectorTasks extends MachineLifecycleEffectorTasks im
@SuppressWarnings("rawtypes")
Map<String, String> cookbooks = (Map)
ConfigBag.newInstance( entity().getConfig(CHEF_COOKBOOK_URLS) )
- .putIfAbsent( entity().getConfig(CHEF_COOKBOOKS) )
+ .putIfAbsent( entity().getConfig(CHEF_COOKBOOK_URLS) )
.getAllConfig();
if (cookbooks.isEmpty())
log.warn("No cookbook_urls set for "+entity()+"; launch will likely fail subsequently");
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/9eca4087/software/base/src/main/java/org/apache/brooklyn/entity/chef/ChefSoloDriver.java
----------------------------------------------------------------------
diff --git a/software/base/src/main/java/org/apache/brooklyn/entity/chef/ChefSoloDriver.java b/software/base/src/main/java/org/apache/brooklyn/entity/chef/ChefSoloDriver.java
index 05111b3..6ee1786 100644
--- a/software/base/src/main/java/org/apache/brooklyn/entity/chef/ChefSoloDriver.java
+++ b/software/base/src/main/java/org/apache/brooklyn/entity/chef/ChefSoloDriver.java
@@ -54,7 +54,7 @@ public class ChefSoloDriver extends AbstractSoftwareProcessSshDriver implements
// TODO flag to force reinstallation
DynamicTasks.queue(
ChefSoloTasks.installChef(getInstallDir(), false),
- ChefSoloTasks.installCookbooks(getInstallDir(), getRequiredConfig(CHEF_COOKBOOKS), false));
+ ChefSoloTasks.installCookbooks(getInstallDir(), getRequiredConfig(CHEF_COOKBOOK_URLS), false));
}
@Override
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/9eca4087/test-framework/src/main/resources/catalog.bom
----------------------------------------------------------------------
diff --git a/test-framework/src/main/resources/catalog.bom b/test-framework/src/main/resources/catalog.bom
index f912b4f..cb9b5c7 100644
--- a/test-framework/src/main/resources/catalog.bom
+++ b/test-framework/src/main/resources/catalog.bom
@@ -42,6 +42,3 @@ brooklyn.catalog:
- id: org.apache.brooklyn.test.framework.LoopOverGroupMembersTestCase
item:
type: org.apache.brooklyn.test.framework.LoopOverGroupMembersTestCase
- - id: org.apache.brooklyn.test.framework.TargetableTestComponent
- item:
- type: org.apache.brooklyn.test.framework.TargetableTestComponent
[2/2] brooklyn-server git commit: This closes #228
Posted by gr...@apache.org.
This closes #228
* github/pr/228:
Misc OSGi fixes
Project: http://git-wip-us.apache.org/repos/asf/brooklyn-server/repo
Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-server/commit/5adbbca1
Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-server/tree/5adbbca1
Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-server/diff/5adbbca1
Branch: refs/heads/master
Commit: 5adbbca1c1d6b497eecb10a657866008e7e075e1
Parents: 122c4ea 9eca408
Author: Andrew Donald Kennedy <an...@cloudsoftcorp.com>
Authored: Mon Jul 4 10:34:55 2016 +0100
Committer: Andrew Donald Kennedy <an...@cloudsoftcorp.com>
Committed: Mon Jul 4 10:34:55 2016 +0100
----------------------------------------------------------------------
karaf/features/src/main/feature/feature.xml | 3 ++-
.../src/main/resources/OSGI-INF/blueprint/blueprint.xml | 2 +-
policy/src/main/resources/catalog.bom | 12 +++++++++---
pom.xml | 2 ++
.../org/apache/brooklyn/entity/chef/ChefConfig.java | 4 ----
.../entity/chef/ChefLifecycleEffectorTasks.java | 2 +-
.../org/apache/brooklyn/entity/chef/ChefSoloDriver.java | 2 +-
test-framework/src/main/resources/catalog.bom | 3 ---
8 files changed, 16 insertions(+), 14 deletions(-)
----------------------------------------------------------------------