You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@brooklyn.apache.org by ri...@apache.org on 2014/11/04 13:30:50 UTC
[2/8] git commit: Fix CumulusRDFApplication
Fix CumulusRDFApplication
- Start in just one location.
- If try to start in two, then CassandraDatacenter complains
(because of super DynamicClusterImpl.start)
Project: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/commit/cf2279ce
Tree: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/tree/cf2279ce
Diff: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/diff/cf2279ce
Branch: refs/heads/master
Commit: cf2279cebaef1eeedb99a9c0d7b710a7cd238cde
Parents: fa7373a
Author: Aled Sage <al...@gmail.com>
Authored: Tue Nov 4 10:22:45 2014 +0000
Committer: Aled Sage <al...@gmail.com>
Committed: Tue Nov 4 12:05:55 2014 +0000
----------------------------------------------------------------------
.../main/java/brooklyn/demo/CumulusRDFApplication.java | 10 +++++++---
1 file changed, 7 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/cf2279ce/examples/simple-nosql-cluster/src/main/java/brooklyn/demo/CumulusRDFApplication.java
----------------------------------------------------------------------
diff --git a/examples/simple-nosql-cluster/src/main/java/brooklyn/demo/CumulusRDFApplication.java b/examples/simple-nosql-cluster/src/main/java/brooklyn/demo/CumulusRDFApplication.java
index c835a53..6e11e21 100644
--- a/examples/simple-nosql-cluster/src/main/java/brooklyn/demo/CumulusRDFApplication.java
+++ b/examples/simple-nosql-cluster/src/main/java/brooklyn/demo/CumulusRDFApplication.java
@@ -67,9 +67,11 @@ import brooklyn.util.collections.MutableMap;
import brooklyn.util.config.ConfigBag;
import brooklyn.util.exceptions.Exceptions;
import brooklyn.util.task.DynamicTasks;
+import brooklyn.util.text.StringEscapes.JavaStringEscapes;
import brooklyn.util.text.Strings;
import brooklyn.util.text.TemplateProcessor;
+import com.google.common.collect.ImmutableList;
import com.google.common.collect.Iterables;
import com.google.common.collect.Lists;
import com.google.common.net.HostAndPort;
@@ -96,7 +98,9 @@ public class CumulusRDFApplication extends AbstractApplication {
public static final ConfigKey<Boolean> MULTI_REGION_FABRIC = ConfigKeys.newConfigKey(
"cumulus.cassandra.fabric", "Deploy a multi-region Cassandra fabric", false);
- public static final String DEFAULT_LOCATIONS = "aws-ec2:us-east-1,rackspace-cloudservers-uk";
+ // TODO Fails when given two locations
+ // public static final String DEFAULT_LOCATIONS = "[ jclouds:aws-ec2:us-east-1,jclouds:rackspace-cloudservers-uk ]";
+ public static final String DEFAULT_LOCATIONS = "jclouds:aws-ec2:us-east-1";
private Effector<Void> cumulusConfig = Effectors.effector(Void.class, "cumulusConfig")
.description("Configure the CumulusRDF web application")
@@ -220,12 +224,12 @@ public class CumulusRDFApplication extends AbstractApplication {
public static void main(String[] argv) {
List<String> args = Lists.newArrayList(argv);
String port = CommandLineUtil.getCommandLineOption(args, "--port", "8081+");
- String location = CommandLineUtil.getCommandLineOption(args, "--location", DEFAULT_LOCATIONS);
+ String locations = CommandLineUtil.getCommandLineOption(args, "--locations", DEFAULT_LOCATIONS);
BrooklynLauncher launcher = BrooklynLauncher.newInstance()
.application(EntitySpec.create(StartableApplication.class, CumulusRDFApplication.class).displayName("CumulusRDF application using Cassandra"))
.webconsolePort(port)
- .location(location)
+ .locations(Strings.isBlank(locations) ? ImmutableList.<String>of() : JavaStringEscapes.unwrapJsonishListIfPossible(locations))
.start();
Entities.dumpInfo(launcher.getApplications());