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 2015/03/16 16:51:01 UTC
[1/6] incubator-brooklyn git commit: suppress unnecessary broken
persistence integration test for deprecated persister
Repository: incubator-brooklyn
Updated Branches:
refs/heads/master da38796a0 -> ab46e6fd8
suppress unnecessary broken persistence integration test for deprecated persister
Project: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/commit/b578f121
Tree: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/tree/b578f121
Diff: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/diff/b578f121
Branch: refs/heads/master
Commit: b578f121942e3081cafb8197c492080fac7046ea
Parents: 0ff4216
Author: Alex Heneveld <al...@cloudsoftcorp.com>
Authored: Mon Mar 2 12:03:29 2015 +0000
Committer: Alex Heneveld <al...@cloudsoftcorp.com>
Committed: Fri Mar 13 09:12:55 2015 +0000
----------------------------------------------------------------------
.../BrooklynMementoPersisterToMultiFileTest.java | 10 +++++++---
1 file changed, 7 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/b578f121/core/src/test/java/brooklyn/entity/rebind/persister/BrooklynMementoPersisterToMultiFileTest.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/brooklyn/entity/rebind/persister/BrooklynMementoPersisterToMultiFileTest.java b/core/src/test/java/brooklyn/entity/rebind/persister/BrooklynMementoPersisterToMultiFileTest.java
index d2fe7a6..6dc9aa1a 100644
--- a/core/src/test/java/brooklyn/entity/rebind/persister/BrooklynMementoPersisterToMultiFileTest.java
+++ b/core/src/test/java/brooklyn/entity/rebind/persister/BrooklynMementoPersisterToMultiFileTest.java
@@ -21,6 +21,7 @@ package brooklyn.entity.rebind.persister;
import java.io.File;
import org.testng.annotations.AfterMethod;
+import org.testng.annotations.Test;
import brooklyn.entity.rebind.PersistenceExceptionHandlerImpl;
import brooklyn.entity.rebind.RebindManagerImpl;
@@ -58,7 +59,10 @@ public class BrooklynMementoPersisterToMultiFileTest extends BrooklynMementoPers
mementoDir = Os.deleteRecursively(mementoDir).asNullOrThrowing();
}
- // to have this picked up in the IDE
-// @Test public void noop() {}
-
+ @Test(groups="Integration")
+ public void testLoadAndCheckpointRawMemento() throws Exception {
+ // test here is deliberately no-op;
+ // checkpoint routines not supported for this (deprecated) persister
+ }
+
}
[5/6] incubator-brooklyn git commit: tidy of mongo yaml
Posted by al...@apache.org.
tidy of mongo yaml
Project: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/commit/b92050cc
Tree: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/tree/b92050cc
Diff: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/diff/b92050cc
Branch: refs/heads/master
Commit: b92050cc7ba7001c456ffdc77fce7151501de922
Parents: 36edce2
Author: Alex Heneveld <al...@cloudsoftcorp.com>
Authored: Wed Feb 4 12:33:14 2015 +0000
Committer: Alex Heneveld <al...@cloudsoftcorp.com>
Committed: Fri Mar 13 09:13:59 2015 +0000
----------------------------------------------------------------------
.../src/test/resources/mongo-blueprint.yaml | 2 +-
.../src/test/resources/mongo-sharded.yaml | 23 ++++++++++----------
2 files changed, 13 insertions(+), 12 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/b92050cc/usage/launcher/src/test/resources/mongo-blueprint.yaml
----------------------------------------------------------------------
diff --git a/usage/launcher/src/test/resources/mongo-blueprint.yaml b/usage/launcher/src/test/resources/mongo-blueprint.yaml
index 5833527..c63b8db 100644
--- a/usage/launcher/src/test/resources/mongo-blueprint.yaml
+++ b/usage/launcher/src/test/resources/mongo-blueprint.yaml
@@ -19,5 +19,5 @@
name: Mongo3
location: localhost
services:
-- serviceType: brooklyn.entity.nosql.mongodb.MongoDBReplicaSet
+- type: brooklyn.entity.nosql.mongodb.MongoDBReplicaSet
name: MongoDB Replica Set
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/b92050cc/usage/launcher/src/test/resources/mongo-sharded.yaml
----------------------------------------------------------------------
diff --git a/usage/launcher/src/test/resources/mongo-sharded.yaml b/usage/launcher/src/test/resources/mongo-sharded.yaml
index 4675884..dcf1f2b 100644
--- a/usage/launcher/src/test/resources/mongo-sharded.yaml
+++ b/usage/launcher/src/test/resources/mongo-sharded.yaml
@@ -16,35 +16,36 @@
# specific language governing permissions and limitations
# under the License.
#
-name: Humongous app
+name: Sharded MongoDB With Web App
description: Auto-scaling web app backed by MongoDB
-origin: http://brooklyn.io
-location: localhost
+location: my-docker-cloud
services:
-- serviceType: brooklyn.entity.nosql.mongodb.sharding.MongoDBShardedDeployment
- id: shardeddeployment
- name: Mongo Deploy
+- type: brooklyn.entity.nosql.mongodb.sharding.MongoDBShardedDeployment
+ id: mongo
+ name: Mongo DB Backend
brooklyn.config:
initialRouterClusterSize: 1
+ initialShardClusterSize: 5
+ shardReplicaSetSize: 3
coLocatedRouterGroup: $brooklyn:component("webappcluster").attributeWhenReady("controlleddynamicwebappcluster.cluster")
-- serviceType: brooklyn.entity.webapp.ControlledDynamicWebAppCluster
+- type: brooklyn.entity.webapp.ControlledDynamicWebAppCluster
id: webappcluster
brooklyn.config:
memberSpec:
$brooklyn:entitySpec:
type: brooklyn.entity.nosql.mongodb.sharding.CoLocatedMongoDBRouter
brooklyn.enrichers:
- - enricherType: brooklyn.enricher.basic.Propagator
+ - type: brooklyn.enricher.basic.Propagator
brooklyn.config:
enricher.propagating.sensorMapping:
$brooklyn:sensor("brooklyn.entity.webapp.jboss.JBoss7Server", "http.port"): $brooklyn:sensor("brooklyn.entity.webapp.jboss.JBoss7Server", "http.port")
- enricher.producer: $brooklyn:component("child", "thewebserver")
+ enricher.producer: $brooklyn:component("child", "appserver")
brooklyn.config:
- shardedDeployment: $brooklyn:component("shardeddeployment")
+ shardedDeployment: $brooklyn:component("mongo")
siblingSpecs:
- $brooklyn:entitySpec:
- id: thewebserver
+ id: appserver
type: brooklyn.entity.webapp.jboss.JBoss7Server
brooklyn.config:
war: "classpath://brooklyn-example-hello-world-sql-webapp.war"
[6/6] incubator-brooklyn git commit: This closes #549
Posted by al...@apache.org.
This closes #549
Project: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/commit/ab46e6fd
Tree: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/tree/ab46e6fd
Diff: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/diff/ab46e6fd
Branch: refs/heads/master
Commit: ab46e6fd8e7286fe43cb1145aaa4ed2a02186c52
Parents: da38796 b92050c
Author: Aled Sage <al...@gmail.com>
Authored: Mon Mar 16 15:50:42 2015 +0000
Committer: Aled Sage <al...@gmail.com>
Committed: Mon Mar 16 15:50:42 2015 +0000
----------------------------------------------------------------------
.../brooklyn/entity/rebind/RebindIteration.java | 13 ++++++++++-
.../entity/rebind/dto/MementosGenerators.java | 5 ++++-
...BrooklynMementoPersisterToMultiFileTest.java | 10 ++++++---
.../quickstart/src/brooklyn-sample/README.md | 12 +++++-----
.../src/test/resources/mongo-blueprint.yaml | 2 +-
.../src/test/resources/mongo-sharded.yaml | 23 ++++++++++----------
6 files changed, 42 insertions(+), 23 deletions(-)
----------------------------------------------------------------------
[2/6] incubator-brooklyn git commit: better logging when can't
instantiate on rebind
Posted by al...@apache.org.
better logging when can't instantiate on rebind
Project: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/commit/b955f7f9
Tree: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/tree/b955f7f9
Diff: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/diff/b955f7f9
Branch: refs/heads/master
Commit: b955f7f9a49bd1d8306bd68886f7ff26f662e032
Parents: b578f12
Author: Alex Heneveld <al...@cloudsoftcorp.com>
Authored: Fri Mar 13 09:11:40 2015 +0000
Committer: Alex Heneveld <al...@cloudsoftcorp.com>
Committed: Fri Mar 13 09:13:00 2015 +0000
----------------------------------------------------------------------
.../java/brooklyn/entity/rebind/RebindIteration.java | 13 ++++++++++++-
1 file changed, 12 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/b955f7f9/core/src/main/java/brooklyn/entity/rebind/RebindIteration.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/brooklyn/entity/rebind/RebindIteration.java b/core/src/main/java/brooklyn/entity/rebind/RebindIteration.java
index de956ae..75f36f8 100644
--- a/core/src/main/java/brooklyn/entity/rebind/RebindIteration.java
+++ b/core/src/main/java/brooklyn/entity/rebind/RebindIteration.java
@@ -21,6 +21,7 @@ package brooklyn.entity.rebind;
import static com.google.common.base.Preconditions.checkNotNull;
import java.io.IOException;
+import java.util.Arrays;
import java.util.Collection;
import java.util.List;
import java.util.Map;
@@ -1042,7 +1043,17 @@ public abstract class RebindIteration {
throw Exceptions.propagate(e);
}
}
- throw new IllegalStateException("Cannot instantiate instance of type "+clazz+"; expected constructor signature not found");
+ StringBuilder args = new StringBuilder();
+ if (possibleArgs.length<1) args.append("no possible argument sets supplied; error");
+ else if (possibleArgs.length<2) args.append("args are "+Arrays.asList(possibleArgs[0]));
+ else {
+ args.append("args are "+Arrays.asList(possibleArgs[0]));
+ for (int i=1; i<possibleArgs.length; i++) {
+ args.append(" or ");
+ args.append(Arrays.asList(possibleArgs[i]));
+ }
+ }
+ throw new IllegalStateException("Cannot instantiate instance of type "+clazz+"; expected constructor signature not found ("+args+")");
}
}
[4/6] incubator-brooklyn git commit: update links in archetype file
Posted by al...@apache.org.
update links in archetype file
Project: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/commit/36edce28
Tree: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/tree/36edce28
Diff: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/diff/36edce28
Branch: refs/heads/master
Commit: 36edce288301cf974ad22b386acf4c9f56f270cd
Parents: 8542c51
Author: Alex Heneveld <al...@cloudsoftcorp.com>
Authored: Fri Mar 13 09:12:29 2015 +0000
Committer: Alex Heneveld <al...@cloudsoftcorp.com>
Committed: Fri Mar 13 09:13:15 2015 +0000
----------------------------------------------------------------------
.../archetypes/quickstart/src/brooklyn-sample/README.md | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/36edce28/usage/archetypes/quickstart/src/brooklyn-sample/README.md
----------------------------------------------------------------------
diff --git a/usage/archetypes/quickstart/src/brooklyn-sample/README.md b/usage/archetypes/quickstart/src/brooklyn-sample/README.md
index 5ef48e2..7498796 100644
--- a/usage/archetypes/quickstart/src/brooklyn-sample/README.md
+++ b/usage/archetypes/quickstart/src/brooklyn-sample/README.md
@@ -34,7 +34,7 @@ To open this project in an IDE, you will need maven support enabled
(e.g. with the relevant plugin). You should then be able to develop
it and run it as usual. For more information on IDE support, visit:
- http://brooklyncentral.github.io/dev/build/ide.html
+ https://brooklyn.incubator.apache.org/v/latest/dev/env/ide/
### Customizing the Assembly
@@ -53,9 +53,9 @@ To easily find the bits you should customize, do a:
grep -ri sample src/ *.*
-### More About Brooklyn
+### More About Apache Brooklyn
-Brooklyn is a code library and framework for managing applications in a
+Apache Brooklyn is a code library and framework for managing applications in a
cloud-first dev-ops-y way. It has been used to create this sample project
which shows how to define an application and entities for Brooklyn.
@@ -65,9 +65,9 @@ deployment depending on what the application needs.
For more information consider:
-* Visiting the open-source Brooklyn home page at http://brooklyncentral.github.com
-* Forking the Brooklyn project at http://github.com/brooklyncentral/brooklyn
-* Emailing brooklyn-users@googlegroups.com
+* Visiting the Apache Brooklyn home page at http://brooklyn.io/
+* Finding us on IRC #brooklyncentral or email (click "Community" at the site above)
+* Forking the project at http://github.com/apache/incubator-brooklyn/
A sample Brooklyn project should specify its license.
[3/6] incubator-brooklyn git commit: fix bug where some persistence
calls (eg from rest api) use non-instantiable catalog item (DO not DTO)
Posted by al...@apache.org.
fix bug where some persistence calls (eg from rest api) use non-instantiable catalog item (DO not DTO)
Project: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/commit/8542c515
Tree: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/tree/8542c515
Diff: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/diff/8542c515
Branch: refs/heads/master
Commit: 8542c515e9ed8572ea82b48a9d491ccd8619dc04
Parents: b955f7f
Author: Alex Heneveld <al...@cloudsoftcorp.com>
Authored: Fri Mar 13 09:12:02 2015 +0000
Committer: Alex Heneveld <al...@cloudsoftcorp.com>
Committed: Fri Mar 13 09:13:07 2015 +0000
----------------------------------------------------------------------
.../java/brooklyn/entity/rebind/dto/MementosGenerators.java | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/8542c515/core/src/main/java/brooklyn/entity/rebind/dto/MementosGenerators.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/brooklyn/entity/rebind/dto/MementosGenerators.java b/core/src/main/java/brooklyn/entity/rebind/dto/MementosGenerators.java
index a81edef..a9d4b66 100644
--- a/core/src/main/java/brooklyn/entity/rebind/dto/MementosGenerators.java
+++ b/core/src/main/java/brooklyn/entity/rebind/dto/MementosGenerators.java
@@ -28,6 +28,7 @@ import java.util.Set;
import brooklyn.basic.BrooklynObject;
import brooklyn.basic.BrooklynTypes;
import brooklyn.catalog.CatalogItem;
+import brooklyn.catalog.internal.CatalogItemDo;
import brooklyn.config.ConfigKey;
import brooklyn.enricher.basic.AbstractEnricher;
import brooklyn.entity.Application;
@@ -41,7 +42,6 @@ import brooklyn.event.AttributeSensor;
import brooklyn.event.AttributeSensor.SensorPersistenceMode;
import brooklyn.event.feed.AbstractFeed;
import brooklyn.location.Location;
-import brooklyn.location.basic.AbstractLocation;
import brooklyn.location.basic.LocationInternal;
import brooklyn.management.ManagementContext;
import brooklyn.management.Task;
@@ -364,6 +364,9 @@ public class MementosGenerators {
}
public static CatalogItemMemento newCatalogItemMemento(CatalogItem<?, ?> catalogItem) {
+ if (catalogItem instanceof CatalogItemDo<?,?>) {
+ catalogItem = ((CatalogItemDo<?,?>)catalogItem).getDto();
+ }
BasicCatalogItemMemento.Builder builder = BasicCatalogItemMemento.builder();
populateBrooklynObjectMementoBuilder(catalogItem, builder);
builder.catalogItemJavaType(catalogItem.getCatalogItemJavaType())