args = Lists.newArrayList(argv);
- String port = CommandLineUtil.getCommandLineOption(args, "--port", "8081+");
- String location = CommandLineUtil.getCommandLineOption(args, "--location", "localhost");
-
- BrooklynLauncher launcher = BrooklynLauncher.newInstance()
- .application(EntitySpec.create(StartableApplication.class, WebClusterDatabaseExample.class).displayName("Brooklyn WebApp Cluster with Database example"))
- .webconsolePort(port)
- .location(location)
- .start();
-
- Entities.dumpInfo(launcher.getApplications());
- }
-}
diff --git a/simple-web-cluster/src/main/java/brooklyn/demo/WebClusterDatabaseExampleApp.java b/simple-web-cluster/src/main/java/brooklyn/demo/WebClusterDatabaseExampleApp.java
deleted file mode 100644
index 34180f7..0000000
--- a/simple-web-cluster/src/main/java/brooklyn/demo/WebClusterDatabaseExampleApp.java
+++ /dev/null
@@ -1,153 +0,0 @@
-package brooklyn.demo;
-
-import static brooklyn.event.basic.DependentConfiguration.attributeWhenReady;
-import static brooklyn.event.basic.DependentConfiguration.formatString;
-
-import java.util.Arrays;
-import java.util.List;
-import java.util.concurrent.TimeUnit;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import brooklyn.catalog.Catalog;
-import brooklyn.catalog.CatalogConfig;
-import brooklyn.config.ConfigKey;
-import brooklyn.enricher.HttpLatencyDetector;
-import brooklyn.enricher.basic.SensorPropagatingEnricher;
-import brooklyn.enricher.basic.SensorTransformingEnricher;
-import brooklyn.entity.basic.AbstractApplication;
-import brooklyn.entity.basic.ConfigKeys;
-import brooklyn.entity.basic.Entities;
-import brooklyn.entity.basic.StartableApplication;
-import brooklyn.entity.database.mysql.MySqlNode;
-import brooklyn.entity.group.DynamicCluster;
-import brooklyn.entity.java.JavaEntityMethods;
-import brooklyn.entity.proxying.EntitySpec;
-import brooklyn.entity.webapp.ControlledDynamicWebAppCluster;
-import brooklyn.entity.webapp.DynamicWebAppCluster;
-import brooklyn.entity.webapp.JavaWebAppService;
-import brooklyn.entity.webapp.WebAppService;
-import brooklyn.entity.webapp.WebAppServiceConstants;
-import brooklyn.event.AttributeSensor;
-import brooklyn.event.basic.Sensors;
-import brooklyn.launcher.BrooklynLauncher;
-import brooklyn.location.basic.PortRanges;
-import brooklyn.policy.autoscaling.AutoScalerPolicy;
-import brooklyn.util.BrooklynMavenArtifacts;
-import brooklyn.util.CommandLineUtil;
-import brooklyn.util.ResourceUtils;
-
-import com.google.common.base.Functions;
-import com.google.common.collect.Lists;
-
-/**
- * Launches a 3-tier app with nginx, clustered jboss, and mysql.
- *
- * Includes some advanced features such as KPI / derived sensors,
- * and annotations for use in a catalog.
- *
- * This variant also increases minimum size to 2.
- * Note the policy min size must have the same value,
- * otherwise it fights with cluster set up trying to reduce the cluster size!
- **/
-@Catalog(name="Elastic Java Web + DB",
- description="Deploys a WAR to a load-balanced elastic Java AppServer cluster, " +
- "with an auto-scaling policy, " +
- "wired to a database initialized with the provided SQL; " +
- "defaults to a 'Hello World' chatroom app.",
- iconUrl="classpath://brooklyn/demo/glossy-3d-blue-web-icon.png")
-public class WebClusterDatabaseExampleApp extends AbstractApplication implements StartableApplication {
-
- public static final Logger LOG = LoggerFactory.getLogger(WebClusterDatabaseExampleApp.class);
-
- public static final String DEFAULT_LOCATION = "localhost";
-
- public static final String DEFAULT_WAR_PATH = ResourceUtils.create(WebClusterDatabaseExampleApp.class)
- // take this war, from the classpath, or via maven if not on the classpath
- .firstAvailableUrl(
- "classpath://hello-world-sql-webapp.war",
- BrooklynMavenArtifacts.localUrl("example", "brooklyn-example-hello-world-sql-webapp", "war"))
- .or("classpath://hello-world-sql-webapp.war");
-
- @CatalogConfig(label="WAR (URL)", priority=2)
- public static final ConfigKey WAR_PATH = ConfigKeys.newConfigKey(
- "app.war", "URL to the application archive which should be deployed",
- DEFAULT_WAR_PATH);
-
- // TODO to expose in catalog we need to let the keystore url be specified (not hard)
- // and also confirm that this works for nginx (might be a bit fiddly);
- // booleans in the gui are working (With checkbox)
- @CatalogConfig(label="HTTPS")
- public static final ConfigKey USE_HTTPS = ConfigKeys.newConfigKey(
- "app.https", "Whether the application should use HTTPS only or just HTTP only (default)", false);
-
- public static final String DEFAULT_DB_SETUP_SQL_URL = "classpath://visitors-creation-script.sql";
-
- @CatalogConfig(label="DB Setup SQL (URL)", priority=1)
- public static final ConfigKey DB_SETUP_SQL_URL = ConfigKeys.newConfigKey(
- "app.db_sql", "URL to the SQL script to set up the database",
- DEFAULT_DB_SETUP_SQL_URL);
-
- public static final String DB_TABLE = "visitors";
- public static final String DB_USERNAME = "brooklyn";
- public static final String DB_PASSWORD = "br00k11n";
-
- AttributeSensor APPSERVERS_COUNT = Sensors.newIntegerSensor(
- "appservers.count", "Number of app servers deployed");
- public static final AttributeSensor REQUESTS_PER_SECOND_IN_WINDOW =
- WebAppServiceConstants.REQUESTS_PER_SECOND_IN_WINDOW;
- public static final AttributeSensor ROOT_URL = WebAppServiceConstants.ROOT_URL;
-
- @Override
- public void init() {
- MySqlNode mysql = addChild(
- EntitySpec.create(MySqlNode.class)
- .configure(MySqlNode.CREATION_SCRIPT_URL, Entities.getRequiredUrlConfig(this, DB_SETUP_SQL_URL)));
-
- ControlledDynamicWebAppCluster web = addChild(
- EntitySpec.create(ControlledDynamicWebAppCluster.class)
- .configure(WebAppService.HTTP_PORT, PortRanges.fromString("8080+"))
- // to specify a diferrent appserver:
-// .configure(ControlledDynamicWebAppCluster.MEMBER_SPEC, EntitySpec.create(TomcatServer.class))
- .configure(JavaWebAppService.ROOT_WAR, Entities.getRequiredUrlConfig(this, WAR_PATH))
- .configure(JavaEntityMethods.javaSysProp("brooklyn.example.db.url"),
- formatString("jdbc:%s%s?user=%s\\&password=%s",
- attributeWhenReady(mysql, MySqlNode.MYSQL_URL), DB_TABLE, DB_USERNAME, DB_PASSWORD))
- .configure(DynamicCluster.INITIAL_SIZE, 2)
- .configure(WebAppService.ENABLED_PROTOCOLS, Arrays.asList(getConfig(USE_HTTPS) ? "https" : "http")) );
-
- web.addEnricher(HttpLatencyDetector.builder().
- url(ROOT_URL).
- rollup(10, TimeUnit.SECONDS).
- build());
-
- web.getCluster().addPolicy(AutoScalerPolicy.builder().
- metric(DynamicWebAppCluster.REQUESTS_PER_SECOND_IN_WINDOW_PER_NODE).
- metricRange(10, 100).
- sizeRange(2, 5).
- build());
-
- addEnricher(SensorPropagatingEnricher.newInstanceListeningTo(web,
- WebAppServiceConstants.ROOT_URL,
- DynamicWebAppCluster.REQUESTS_PER_SECOND_IN_WINDOW,
- HttpLatencyDetector.REQUEST_LATENCY_IN_SECONDS_IN_WINDOW));
- addEnricher(SensorTransformingEnricher.newInstanceTransforming(web,
- DynamicWebAppCluster.GROUP_SIZE, Functions.identity(), APPSERVERS_COUNT));
- }
-
- public static void main(String[] argv) {
- List args = Lists.newArrayList(argv);
- String port = CommandLineUtil.getCommandLineOption(args, "--port", "8081+");
- String location = CommandLineUtil.getCommandLineOption(args, "--location", DEFAULT_LOCATION);
-
- BrooklynLauncher launcher = BrooklynLauncher.newInstance()
- .application(EntitySpec.create(StartableApplication.class, WebClusterDatabaseExampleApp.class)
- .displayName("Brooklyn WebApp Cluster with Database example"))
- .webconsolePort(port)
- .location(location)
- .start();
-
- Entities.dumpInfo(launcher.getApplications());
- }
-}
diff --git a/simple-web-cluster/src/main/java/brooklyn/demo/WebClusterDatabaseExampleGroovy.groovy b/simple-web-cluster/src/main/java/brooklyn/demo/WebClusterDatabaseExampleGroovy.groovy
deleted file mode 100644
index 542cd8a..0000000
--- a/simple-web-cluster/src/main/java/brooklyn/demo/WebClusterDatabaseExampleGroovy.groovy
+++ /dev/null
@@ -1,75 +0,0 @@
-package brooklyn.demo;
-
-import static brooklyn.entity.java.JavaEntityMethods.javaSysProp
-import static brooklyn.event.basic.DependentConfiguration.attributeWhenReady
-import static brooklyn.event.basic.DependentConfiguration.formatString
-
-import org.slf4j.Logger
-import org.slf4j.LoggerFactory
-
-import brooklyn.entity.basic.AbstractApplication
-import brooklyn.entity.basic.Entities
-import brooklyn.entity.database.mysql.MySqlNode
-import brooklyn.entity.proxying.EntitySpecs
-import brooklyn.entity.webapp.ControlledDynamicWebAppCluster
-import brooklyn.entity.webapp.DynamicWebAppCluster
-import brooklyn.launcher.BrooklynLauncher
-import brooklyn.policy.autoscaling.AutoScalerPolicy
-import brooklyn.util.CommandLineUtil
-
-import com.google.common.collect.Lists
-
-/**
- * Launches a 3-tier app with nginx, clustered jboss, and mysql.
- *
- * This variant of {@link WebClusterDatabaseExample} demonstrates Groovy language conveniences.
- **/
-public class WebClusterDatabaseExampleGroovy extends AbstractApplication {
-
- public static final Logger LOG = LoggerFactory.getLogger(WebClusterDatabaseExampleGroovy.class);
-
- public static final String DEFAULT_LOCATION = "localhost";
-
- public static final String WAR_PATH = "classpath://hello-world-sql-webapp.war";
-
- public static final String DB_SETUP_SQL_URL = "classpath://visitors-creation-script.sql";
-
- public static final String DB_TABLE = "visitors";
- public static final String DB_USERNAME = "brooklyn";
- public static final String DB_PASSWORD = "br00k11n";
-
- @Override
- public void init() {
- MySqlNode mysql = addChild(MySqlNode,
- creationScriptUrl: DB_SETUP_SQL_URL);
-
- ControlledDynamicWebAppCluster web = addChild(ControlledDynamicWebAppCluster,
- war: WAR_PATH,
- httpPort: "8080+",
- (javaSysProp("brooklyn.example.db.url")):
- formatString("jdbc:%s%s?user=%s\\&password=%s",
- attributeWhenReady(mysql, MySqlNode.MYSQL_URL),
- DB_TABLE, DB_USERNAME, DB_PASSWORD));
-
- web.getCluster().addPolicy(AutoScalerPolicy.builder().
- metric(DynamicWebAppCluster.AVERAGE_REQUESTS_PER_SECOND).
- sizeRange(1, 5).
- metricRange(10, 100).
- build());
- }
-
- public static void main(String[] argv) {
- List args = Lists.newArrayList(argv);
- String port = CommandLineUtil.getCommandLineOption(args, "--port", "8081+");
- String location = CommandLineUtil.getCommandLineOption(args, "--location", DEFAULT_LOCATION);
-
- BrooklynLauncher launcher = BrooklynLauncher.newInstance()
- .application(EntitySpecs.appSpec(WebClusterDatabaseExampleGroovy.class).displayName("Brooklyn WebApp Cluster with Database example"))
- .webconsolePort(port)
- .location(location)
- .start();
-
- Entities.dumpInfo(launcher.getApplications());
- }
-
-}
diff --git a/simple-web-cluster/src/main/java/brooklyn/demo/WebClusterExample.java b/simple-web-cluster/src/main/java/brooklyn/demo/WebClusterExample.java
deleted file mode 100644
index 3fa6558..0000000
--- a/simple-web-cluster/src/main/java/brooklyn/demo/WebClusterExample.java
+++ /dev/null
@@ -1,79 +0,0 @@
-package brooklyn.demo;
-
-import java.util.List;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import brooklyn.config.BrooklynProperties;
-import brooklyn.entity.basic.AbstractApplication;
-import brooklyn.entity.basic.Entities;
-import brooklyn.entity.proxy.nginx.NginxController;
-import brooklyn.entity.proxying.EntitySpec;
-import brooklyn.entity.proxying.EntitySpecs;
-import brooklyn.entity.webapp.ControlledDynamicWebAppCluster;
-import brooklyn.entity.webapp.DynamicWebAppCluster;
-import brooklyn.entity.webapp.jboss.JBoss7Server;
-import brooklyn.launcher.BrooklynLauncher;
-import brooklyn.policy.autoscaling.AutoScalerPolicy;
-import brooklyn.util.CommandLineUtil;
-
-import com.google.common.collect.Lists;
-
-/**
- * Launches a clustered and load-balanced set of web servers.
- * Demonstrates syntax, so many of the options used here are the defaults.
- * (So the class could be much simpler, as in WebClusterExampleAlt.)
- *
- * Requires:
- * -Xmx512m -Xms128m -XX:MaxPermSize=256m
- * and brooklyn-all jar, and this jar or classes dir, on classpath.
- **/
-public class WebClusterExample extends AbstractApplication {
- public static final Logger LOG = LoggerFactory.getLogger(WebClusterExample.class);
-
- static BrooklynProperties config = BrooklynProperties.Factory.newDefault();
-
- public static final String DEFAULT_LOCATION = "localhost";
-
- public static final String WAR_PATH = "classpath://hello-world-webapp.war";
-
- private NginxController nginxController;
- private ControlledDynamicWebAppCluster web;
-
- @Override
- public void init() {
- nginxController = addChild(EntitySpec.create(NginxController.class)
- //.configure("domain", "webclusterexample.brooklyn.local")
- .configure("port", "8000+"));
-
- web = addChild(ControlledDynamicWebAppCluster.Spec.newInstance()
- .displayName("WebApp cluster")
- .controller(nginxController)
- .initialSize(1)
- .memberSpec(EntitySpec.create(JBoss7Server.class)
- .configure("httpPort", "8080+")
- .configure("war", WAR_PATH)));
-
- web.getCluster().addPolicy(AutoScalerPolicy.builder()
- .metric(DynamicWebAppCluster.AVERAGE_REQUESTS_PER_SECOND)
- .sizeRange(1, 5)
- .metricRange(10, 100)
- .build());
- }
-
- public static void main(String[] argv) {
- List args = Lists.newArrayList(argv);
- String port = CommandLineUtil.getCommandLineOption(args, "--port", "8081+");
- String location = CommandLineUtil.getCommandLineOption(args, "--location", DEFAULT_LOCATION);
-
- // TODO Want to parse, to handle multiple locations
- BrooklynLauncher launcher = BrooklynLauncher.newInstance()
- .application(EntitySpecs.appSpec(WebClusterExample.class).displayName("Brooklyn WebApp Cluster example"))
- .webconsolePort(port)
- .location(location)
- .start();
-
- Entities.dumpInfo(launcher.getApplications());
- }
-}
diff --git a/simple-web-cluster/src/main/java/brooklyn/demo/legacy/SingleWebServerExample.groovy b/simple-web-cluster/src/main/java/brooklyn/demo/legacy/SingleWebServerExample.groovy
deleted file mode 100644
index 3d0b804..0000000
--- a/simple-web-cluster/src/main/java/brooklyn/demo/legacy/SingleWebServerExample.groovy
+++ /dev/null
@@ -1,41 +0,0 @@
-package brooklyn.demo.legacy;
-
-import org.slf4j.Logger
-import org.slf4j.LoggerFactory
-
-import brooklyn.entity.basic.AbstractApplication
-import brooklyn.entity.webapp.jboss.JBoss7Server
-import brooklyn.entity.webapp.jboss.JBoss7ServerImpl
-import brooklyn.location.Location
-import brooklyn.location.basic.LocalhostMachineProvisioningLocation
-
-/**
- * This example starts one web app on 8080, waits for a keypress, then stops it.
- *
- * @deprecated in 0.5; see {@link brooklyn.demo.SingleWebServerExample}
- */
-@Deprecated
-public class SingleWebServerExample extends AbstractApplication {
-
- public static final Logger LOG = LoggerFactory.getLogger(SingleWebServerExample)
-
- private static final String WAR_PATH = "classpath://hello-world-webapp.war"
-
- JBoss7Server web = new JBoss7ServerImpl(this, war: WAR_PATH, httpPort: 8080)
-
- public static void main(String[] args) {
- SingleWebServerExample app = new SingleWebServerExample();
- Location loc = new LocalhostMachineProvisioningLocation();
-
- LOG.info("created, now starting...");
- app.start([loc]);
- LOG.info("started, visit "+app.web.getAttribute(JBoss7Server.ROOT_URL)+"; waiting for keypress to quit");
-
- System.out.println("---- press enter to quit ----");
- System.in.read();
- LOG.info("now ending...");
- app.stop();
- LOG.info("ended.");
- }
-
-}
diff --git a/simple-web-cluster/src/main/java/brooklyn/demo/legacy/WebClusterDatabaseExample.groovy b/simple-web-cluster/src/main/java/brooklyn/demo/legacy/WebClusterDatabaseExample.groovy
deleted file mode 100644
index 4c9343c..0000000
--- a/simple-web-cluster/src/main/java/brooklyn/demo/legacy/WebClusterDatabaseExample.groovy
+++ /dev/null
@@ -1,84 +0,0 @@
-package brooklyn.demo.legacy
-
-import static brooklyn.entity.java.JavaEntityMethods.javaSysProp
-import static brooklyn.entity.webapp.WebAppServiceConstants.HTTP_PORT
-import static brooklyn.event.basic.DependentConfiguration.attributeWhenReady
-import static brooklyn.event.basic.DependentConfiguration.formatString
-
-import java.util.List;
-
-import groovy.transform.InheritConstructors
-
-import org.slf4j.Logger
-import org.slf4j.LoggerFactory
-
-import com.google.common.collect.Lists;
-
-import brooklyn.entity.basic.AbstractApplication
-import brooklyn.entity.basic.Entities
-import brooklyn.entity.database.mysql.MySqlNode
-import brooklyn.entity.database.mysql.MySqlNodeImpl
-import brooklyn.entity.webapp.ControlledDynamicWebAppCluster
-import brooklyn.entity.webapp.ControlledDynamicWebAppClusterImpl
-import brooklyn.entity.webapp.DynamicWebAppCluster
-import brooklyn.launcher.BrooklynLauncher
-import brooklyn.launcher.BrooklynServerDetails
-import brooklyn.location.Location
-import brooklyn.policy.autoscaling.AutoScalerPolicy
-import brooklyn.util.CommandLineUtil
-
-/**
- * Launches a 3-tier app with nginx, clustered jboss, and mysql.
- *
- * @deprecated in 0.5; see {@link brooklyn.demo.WebClusterDatabaseExample}
- */
-@Deprecated
-public class WebClusterDatabaseExample extends AbstractApplication {
-
- public static final Logger LOG = LoggerFactory.getLogger(WebClusterDatabaseExample)
-
- public static final String WAR_PATH = "classpath://hello-world-sql-webapp.war"
-
- public static final String DB_SETUP_SQL_URL = "classpath://visitors-creation-script.sql"
-
- public static final String DB_TABLE = "visitors"
- public static final String DB_USERNAME = "brooklyn"
- public static final String DB_PASSWORD = "br00k11n"
-
-
- ControlledDynamicWebAppCluster web = new ControlledDynamicWebAppClusterImpl(this, war: WAR_PATH);
- MySqlNode mysql = new MySqlNodeImpl(this, creationScriptUrl: DB_SETUP_SQL_URL);
-
- {
- web.configure(HTTP_PORT, "8080+").
- configure(javaSysProp("brooklyn.example.db.url"),
- formatString("jdbc:%s%s?user=%s\\&password=%s",
- attributeWhenReady(mysql, MySqlNode.MYSQL_URL),
- DB_TABLE, DB_USERNAME, DB_PASSWORD));
-
- web.cluster.addPolicy(AutoScalerPolicy.builder().
- metric(DynamicWebAppCluster.REQUESTS_PER_SECOND_LAST_PER_NODE).
- sizeRange(1, 5).
- metricRange(10, 100).
- build());
- }
-
- public WebClusterDatabaseExample(Map properties){
- super(properties);
- }
-
- public static void main(String[] argv) {
- List args = Lists.newArrayList(argv);
- String port = CommandLineUtil.getCommandLineOption(args, "--port", "8081+");
- String location = CommandLineUtil.getCommandLineOption(args, "--location", "localhost");
-
- BrooklynLauncher launcher = BrooklynLauncher.newInstance()
- .application(new WebClusterDatabaseExample(name:'Brooklyn WebApp Cluster with Database example'))
- .webconsolePort(port)
- .location(location)
- .start();
-
- Entities.dumpInfo(launcher.getApplications());
- }
-
-}
diff --git a/simple-web-cluster/src/main/java/brooklyn/demo/legacy/WebClusterDatabaseExampleAlt.groovy b/simple-web-cluster/src/main/java/brooklyn/demo/legacy/WebClusterDatabaseExampleAlt.groovy
deleted file mode 100644
index d78bdbf..0000000
--- a/simple-web-cluster/src/main/java/brooklyn/demo/legacy/WebClusterDatabaseExampleAlt.groovy
+++ /dev/null
@@ -1,111 +0,0 @@
-package brooklyn.demo.legacy
-
-import org.slf4j.Logger
-import org.slf4j.LoggerFactory
-
-import brooklyn.config.BrooklynProperties
-import brooklyn.entity.Entity
-import brooklyn.entity.basic.AbstractApplication
-import brooklyn.entity.basic.Entities
-import brooklyn.entity.database.mysql.MySqlNode
-import brooklyn.entity.database.mysql.MySqlNodeImpl
-import brooklyn.entity.proxy.nginx.NginxControllerImpl
-import brooklyn.entity.webapp.ControlledDynamicWebAppCluster
-import brooklyn.entity.webapp.ControlledDynamicWebAppClusterImpl
-import brooklyn.entity.webapp.DynamicWebAppCluster
-import brooklyn.entity.webapp.JavaWebAppService
-import brooklyn.entity.webapp.jboss.JBoss7Server
-import brooklyn.entity.webapp.jboss.JBoss7ServerImpl
-import brooklyn.event.basic.DependentConfiguration
-import brooklyn.launcher.BrooklynLauncher
-import brooklyn.policy.autoscaling.AutoScalerPolicy
-import brooklyn.util.CommandLineUtil
-
-import com.google.common.collect.Lists
-
-/**
- * Shows some alternative syntaxes compared with WebClusterDatabaseExample.
- * (Inline SQL; different ports (nginx on 8080 now); policy added programmatically.
- *
- * Run with:
- * java -Xmx512m -Xms128m -XX:MaxPermSize=256m
- *
- * This jar or classes dir, and brooklyn-all jar, on classpath.
- *
- * @deprecated in 0.5; see {@link brooklyn.demo.WebClusterDatabaseExample}
- */
-@Deprecated
-public class WebClusterDatabaseExampleAlt extends AbstractApplication {
- public static final Logger LOG = LoggerFactory.getLogger(WebClusterDatabaseExampleAlt)
-
- static BrooklynProperties config = BrooklynProperties.Factory.newDefault()
-
- public static final String WAR_PATH = "classpath://hello-world-sql-webapp.war"
-
- public static final String DB_USERNAME = "brooklyn"
- public static final String DB_PASSWORD = "br00k11n"
-
- public static final String DB_SETUP_SQL = """
-create database visitors;
-use visitors;
-create user '${DB_USERNAME}' identified by '${DB_PASSWORD}';
-grant usage on *.* to '${DB_USERNAME}'@'%' identified by '${DB_PASSWORD}';
-# ''@localhost is sometimes set up, overriding brooklyn@'%', so do a second explicit grant
-grant usage on *.* to '${DB_USERNAME}'@'localhost' identified by '${DB_PASSWORD}';
-grant all privileges on visitors.* to '${DB_USERNAME}'@'%';
-flush privileges;
-
-CREATE TABLE MESSAGES (
- id INT NOT NULL AUTO_INCREMENT,
- NAME VARCHAR(30) NOT NULL,
- MESSAGE VARCHAR(400) NOT NULL,
- PRIMARY KEY (ID)
- );
-
-INSERT INTO MESSAGES values (default, 'Isaac Asimov', 'I grew up in Brooklyn' );
-""";
-
- public WebClusterDatabaseExampleAlt(Map props=[:]) {
- super(props)
- setConfig(JavaWebAppService.ROOT_WAR, WAR_PATH)
- }
-
- MySqlNode mysql = new MySqlNodeImpl(this, creationScriptContents: DB_SETUP_SQL);
-
- protected JavaWebAppService newWebServer(Map flags, Entity cluster) {
- JBoss7Server jb7 = new JBoss7ServerImpl(flags).configure(httpPort: "8000+");
- jb7.setConfig(JBoss7Server.JAVA_SYSPROPS, ["brooklyn.example.db.url":
- //"jdbc:mysql://localhost/visitors?user=brooklyn&password=br00k11n"
- DependentConfiguration.valueWhenAttributeReady(mysql, MySqlNode.MYSQL_URL,
- { "jdbc:"+it+"visitors?user=${DB_USERNAME}\\&password=${DB_PASSWORD}" }) ]);
- jb7.setParent(cluster);
- return jb7;
- }
-
- ControlledDynamicWebAppCluster web = new ControlledDynamicWebAppClusterImpl(this,
- controller: new NginxControllerImpl(port: 8080),
- factory: this.&newWebServer )
-
- AutoScalerPolicy policy = AutoScalerPolicy.builder()
- .metric(DynamicWebAppCluster.REQUESTS_PER_SECOND_LAST_PER_NODE)
- .sizeRange(1, 5)
- .metricRange(10, 100)
- .build();
-
-
- public static void main(String[] argv) {
- List args = Lists.newArrayList(argv);
- String port = CommandLineUtil.getCommandLineOption(args, "--port", "8081+");
- String location = CommandLineUtil.getCommandLineOption(args, "--location", "localhost");
- WebClusterDatabaseExampleAlt app = new WebClusterDatabaseExampleAlt(name:'Brooklyn WebApp Cluster with Database example')
-
- BrooklynLauncher launcher = BrooklynLauncher.newInstance()
- .application(app)
- .webconsolePort(port)
- .location(location)
- .start();
-
- app.web.cluster.addPolicy(app.policy)
- Entities.dumpInfo(launcher.getApplications());
- }
-}
diff --git a/simple-web-cluster/src/main/java/brooklyn/demo/legacy/WebClusterDatabaseExampleAltJava.java b/simple-web-cluster/src/main/java/brooklyn/demo/legacy/WebClusterDatabaseExampleAltJava.java
deleted file mode 100644
index 08469ba..0000000
--- a/simple-web-cluster/src/main/java/brooklyn/demo/legacy/WebClusterDatabaseExampleAltJava.java
+++ /dev/null
@@ -1,106 +0,0 @@
-package brooklyn.demo.legacy;
-
-import static brooklyn.event.basic.DependentConfiguration.valueWhenAttributeReady;
-
-import java.io.IOException;
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Map;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import brooklyn.config.BrooklynProperties;
-import brooklyn.entity.basic.AbstractApplication;
-import brooklyn.entity.basic.Entities;
-import brooklyn.entity.basic.EntityLocal;
-import brooklyn.entity.database.mysql.MySqlNode;
-import brooklyn.entity.database.mysql.MySqlNodeImpl;
-import brooklyn.entity.webapp.ControlledDynamicWebAppCluster;
-import brooklyn.entity.webapp.ControlledDynamicWebAppClusterImpl;
-import brooklyn.entity.webapp.DynamicWebAppCluster;
-import brooklyn.entity.webapp.WebAppService;
-import brooklyn.entity.webapp.jboss.JBoss7Server;
-import brooklyn.launcher.BrooklynLauncher;
-import brooklyn.policy.autoscaling.AutoScalerPolicy;
-import brooklyn.util.CommandLineUtil;
-
-import com.google.common.base.Function;
-import com.google.common.collect.Lists;
-
-/**
- * Launches a 3-tier app with nginx, clustered jboss, and mysql.
- *
- * Same as the {@link WebClusterDatabaseExample} but pure Java.
- *
- * Requires:
- * -Xmx512m -Xms128m -XX:MaxPermSize=256m
- * and brooklyn-all jar, and this jar or classes dir, on classpath.
- *
- * @deprecated in 0.5; see {@link brooklyn.demo.WebClusterDatabaseExample}
- */
-@Deprecated
-public class WebClusterDatabaseExampleAltJava extends AbstractApplication {
- public static final Logger LOG = LoggerFactory.getLogger(WebClusterDatabaseExampleAltJava.class);
-
- static BrooklynProperties config = BrooklynProperties.Factory.newDefault();
-
- public static final String WAR_PATH = "classpath://hello-world-sql-webapp.war";
-
- public static final String DB_USERNAME = "brooklyn";
- public static final String DB_PASSWORD = "br00k11n";
-
- public static final String DB_SETUP_SQL_URL = "classpath://visitors-creation-script.sql";
-
- public static String makeJdbcUrl(String dbUrl) {
- //jdbc:mysql://192.168.1.2:3306/visitors?user=brooklyn&password=br00k11n
- return "jdbc:"+dbUrl+"visitors"+"?"+
- "user="+DB_USERNAME+"\\&"+
- "password="+DB_PASSWORD;
- }
-
- public WebClusterDatabaseExampleAltJava() {
- }
-
- ControlledDynamicWebAppCluster web = new ControlledDynamicWebAppClusterImpl(this);
- MySqlNodeImpl mysql = new MySqlNodeImpl(this);
-
- {
- ((EntityLocal)web).setConfig(ControlledDynamicWebAppCluster.ROOT_WAR, WAR_PATH);
- mysql.setConfig(MySqlNode.CREATION_SCRIPT_URL, DB_SETUP_SQL_URL);
- web.getFactory().setConfig(WebAppService.HTTP_PORT, "8080+");
- Map jvmSysProps = new LinkedHashMap();
- jvmSysProps.put("brooklyn.example.db.url", valueWhenAttributeReady(mysql, MySqlNode.MYSQL_URL,
- new Function() {
- @Override
- public Object apply(Object input) {
- return makeJdbcUrl(""+input);
- }
- }));
- web.getFactory().setConfig(JBoss7Server.JAVA_SYSPROPS, jvmSysProps);
-
- web.getCluster().addPolicy(AutoScalerPolicy.builder()
- .metric(DynamicWebAppCluster.REQUESTS_PER_SECOND_LAST_PER_NODE)
- .sizeRange(1, 5)
- .metricRange(10, 100)
- .build());
- }
-
- public static void main(String[] argv) throws IOException {
- List args = Lists.newArrayList(argv);
- String port = CommandLineUtil.getCommandLineOption(args, "--port", "8081+");
- String location = CommandLineUtil.getCommandLineOption(args, "--location", "localhost");
-
- WebClusterDatabaseExampleAltJava app = new WebClusterDatabaseExampleAltJava();
- app.setDisplayName("Brooklyn WebApp Cluster with Database example");
-
- BrooklynLauncher launcher = BrooklynLauncher.newInstance()
- .application(app)
- .webconsolePort(port)
- .location(location)
- .start();
-
- Entities.dumpInfo(launcher.getApplications());
- }
-
-}
diff --git a/simple-web-cluster/src/main/java/brooklyn/demo/legacy/WebClusterExample.groovy b/simple-web-cluster/src/main/java/brooklyn/demo/legacy/WebClusterExample.groovy
deleted file mode 100644
index 013a091..0000000
--- a/simple-web-cluster/src/main/java/brooklyn/demo/legacy/WebClusterExample.groovy
+++ /dev/null
@@ -1,79 +0,0 @@
-package brooklyn.demo.legacy
-
-import org.slf4j.Logger
-import org.slf4j.LoggerFactory
-
-import brooklyn.config.BrooklynProperties
-import brooklyn.entity.basic.AbstractApplication
-import brooklyn.entity.basic.Entities
-import brooklyn.entity.proxy.nginx.NginxController
-import brooklyn.entity.proxy.nginx.NginxControllerImpl
-import brooklyn.entity.webapp.ControlledDynamicWebAppCluster
-import brooklyn.entity.webapp.ControlledDynamicWebAppClusterImpl
-import brooklyn.entity.webapp.DynamicWebAppCluster
-import brooklyn.entity.webapp.jboss.JBoss7ServerFactory
-import brooklyn.launcher.BrooklynLauncher
-import brooklyn.policy.autoscaling.AutoScalerPolicy
-import brooklyn.util.CommandLineUtil
-
-import com.google.common.collect.Lists
-
-/**
- * Launches a clustered and load-balanced set of web servers.
- * Demonstrates syntax, so many of the options used here are the defaults.
- * (So the class could be much simpler, as in WebClusterExampleAlt.)
- *
- * Requires:
- * -Xmx512m -Xms128m -XX:MaxPermSize=256m
- * and brooklyn-all jar, and this jar or classes dir, on classpath.
- *
- * @deprecated in 0.5; see {@link brooklyn.demo.WebClusterExample}
- */
-@Deprecated
-public class WebClusterExample extends AbstractApplication {
- public static final Logger LOG = LoggerFactory.getLogger(WebClusterExample)
-
- static BrooklynProperties config = BrooklynProperties.Factory.newDefault()
-
- public static final String WAR_PATH = "classpath://hello-world-webapp.war"
-
- public WebClusterExample(Map props=[:]) {
- super(props)
- }
-
-
- NginxController nginxController = new NginxControllerImpl(this,
-// domain: 'webclusterexample.brooklyn.local',
- port:"8000+")
-
- JBoss7ServerFactory jbossFactory = new JBoss7ServerFactory(httpPort: "8080+", war: WAR_PATH);
-
- ControlledDynamicWebAppCluster web = new ControlledDynamicWebAppClusterImpl(this,
- name: "WebApp cluster",
- controller: nginxController,
- initialSize: 1,
- factory: jbossFactory)
-
- AutoScalerPolicy policy = AutoScalerPolicy.builder()
- .metric(DynamicWebAppCluster.REQUESTS_PER_SECOND_LAST_PER_NODE)
- .sizeRange(1, 5)
- .metricRange(10, 100)
- .build();
-
-
- public static void main(String[] argv) {
- List args = Lists.newArrayList(argv);
- String port = CommandLineUtil.getCommandLineOption(args, "--port", "8081+");
- String location = CommandLineUtil.getCommandLineOption(args, "--location", "localhost");
- WebClusterExample app = new WebClusterExample(name:'Brooklyn WebApp Cluster example')
-
- BrooklynLauncher launcher = BrooklynLauncher.newInstance()
- .application(app)
- .webconsolePort(port)
- .location(location)
- .start();
-
- app.web.cluster.addPolicy(app.policy)
- Entities.dumpInfo(launcher.getApplications());
- }
-}
diff --git a/simple-web-cluster/src/main/java/brooklyn/demo/legacy/WebClusterExampleAlt.groovy b/simple-web-cluster/src/main/java/brooklyn/demo/legacy/WebClusterExampleAlt.groovy
deleted file mode 100644
index 5f0dd45..0000000
--- a/simple-web-cluster/src/main/java/brooklyn/demo/legacy/WebClusterExampleAlt.groovy
+++ /dev/null
@@ -1,62 +0,0 @@
-package brooklyn.demo.legacy
-
-import groovy.transform.InheritConstructors
-
-import org.slf4j.Logger
-import org.slf4j.LoggerFactory
-
-import brooklyn.entity.basic.AbstractApplication
-import brooklyn.entity.basic.Entities
-import brooklyn.entity.webapp.ControlledDynamicWebAppCluster
-import brooklyn.entity.webapp.ControlledDynamicWebAppClusterImpl
-import brooklyn.entity.webapp.DynamicWebAppCluster
-import brooklyn.launcher.BrooklynLauncher
-import brooklyn.policy.autoscaling.AutoScalerPolicy
-import brooklyn.util.CommandLineUtil
-
-import com.google.common.collect.Lists
-
-/**
- * Launches a clustered and load-balanced set of web servers.
- * (Simplified variant of WebClusterExample.)
- *
- * Requires:
- * -Xmx512m -Xms128m -XX:MaxPermSize=256m
- * and brooklyn-all jar, and this jar or classes dir, on classpath.
- *
- * @deprecated in 0.5; see {@link brooklyn.demo.WebClusterExample}
- */
-@Deprecated
-public class WebClusterExampleAlt extends AbstractApplication {
-
- public static final Logger LOG = LoggerFactory.getLogger(WebClusterExampleAlt)
-
- public static final String WAR_PATH = "classpath://hello-world-webapp.war"
-
- ControlledDynamicWebAppCluster web = new ControlledDynamicWebAppClusterImpl(this, war: WAR_PATH);
- {
- web.addPolicy(AutoScalerPolicy.builder()
- .metric(DynamicWebAppCluster.REQUESTS_PER_SECOND_LAST_PER_NODE)
- .sizeRange(1, 5)
- .metricRange(10, 100)
- .build());
- }
-
- public WebClusterExampleAlt(Map properties){
- super(properties);
- }
-
- public static void main(String[] argv) {
- List args = Lists.newArrayList(argv);
- String port = CommandLineUtil.getCommandLineOption(args, "--port", "8081+");
- String location = CommandLineUtil.getCommandLineOption(args, "--location", "localhost");
-
- BrooklynLauncher launcher = BrooklynLauncher.newInstance()
- .application(new WebClusterExampleAlt(name:'Brooklyn WebApp Cluster example'))
- .webconsolePort(port)
- .location(location)
- .start();
-
- Entities.dumpInfo(launcher.getApplications());
- }
-}
diff --git a/simple-web-cluster/src/main/resources/brooklyn/demo/glossy-3d-blue-web-icon.png b/simple-web-cluster/src/main/resources/brooklyn/demo/glossy-3d-blue-web-icon.png
deleted file mode 100644
index 542a1de..0000000
Binary files a/simple-web-cluster/src/main/resources/brooklyn/demo/glossy-3d-blue-web-icon.png and /dev/null differ
diff --git a/simple-web-cluster/src/main/resources/logback-custom.xml b/simple-web-cluster/src/main/resources/logback-custom.xml
deleted file mode 100644
index 39e7f16..0000000
--- a/simple-web-cluster/src/main/resources/logback-custom.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/simple-web-cluster/src/main/resources/visitors-creation-script.sql b/simple-web-cluster/src/main/resources/visitors-creation-script.sql
deleted file mode 100644
index e1a1de0..0000000
--- a/simple-web-cluster/src/main/resources/visitors-creation-script.sql
+++ /dev/null
@@ -1,23 +0,0 @@
-create database visitors;
-use visitors;
-
-# not necessary to create user if we grant (and not supported in some dialects)
-# create user 'brooklyn' identified by 'br00k11n';
-
-grant usage on *.* to 'brooklyn'@'%' identified by 'br00k11n';
-
-# ''@localhost is sometimes set up, overriding brooklyn@'%', so do a second explicit grant
-grant usage on *.* to 'brooklyn'@'localhost' identified by 'br00k11n';
-
-grant all privileges on visitors.* to 'brooklyn'@'%';
-
-flush privileges;
-
-CREATE TABLE MESSAGES (
- id BIGINT NOT NULL AUTO_INCREMENT,
- NAME VARCHAR(30) NOT NULL,
- MESSAGE VARCHAR(400) NOT NULL,
- PRIMARY KEY (ID)
- );
-
-INSERT INTO MESSAGES values (default, 'Isaac Asimov', 'I grew up in Brooklyn' );
diff --git a/webapps/hello-world-hadoop-jar/pom.xml b/webapps/hello-world-hadoop-jar/pom.xml
deleted file mode 100644
index c190fb7..0000000
--- a/webapps/hello-world-hadoop-jar/pom.xml
+++ /dev/null
@@ -1,42 +0,0 @@
-
- 4.0.0
-
- brooklyn-example-hello-world-hadoop-jar
- jar
-
- Jar Code for Hadoop Webapp
-
-
- UTF-8
- UTF-8
- 1.0.2
-
-
-
- brooklyn-example-hello-world-hadoop-jar
-
-
-
- io.brooklyn.example
- brooklyn-examples-webapps-parent
- 0.6.0
- ../pom.xml
-
-
-
-
- org.apache.hadoop
- hadoop-core
- ${hadoop.version}
-
-
- commons-cli
- commons-cli
- 1.2
-
-
-
-
-
diff --git a/webapps/hello-world-hadoop-jar/src/main/java/brooklyn/demo/webapp/hello/DemoUtils.java b/webapps/hello-world-hadoop-jar/src/main/java/brooklyn/demo/webapp/hello/DemoUtils.java
deleted file mode 100644
index 8f78ee1..0000000
--- a/webapps/hello-world-hadoop-jar/src/main/java/brooklyn/demo/webapp/hello/DemoUtils.java
+++ /dev/null
@@ -1,30 +0,0 @@
-package brooklyn.demo.webapp.hello;
-
-import java.io.BufferedReader;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.InputStreamReader;
-import java.io.PrintWriter;
-import java.io.StringWriter;
-
-public class DemoUtils {
-
-
- public static String stringFromInputStream(InputStream is) throws IOException {
- BufferedReader reader = new BufferedReader(new InputStreamReader(is));
- StringBuffer sb = new StringBuffer();
- String line;
- while ((line = reader.readLine()) != null)
- sb.append(line).append("\n");
- return sb.toString();
- }
-
- public static String getStackTrace(Throwable t) {
- StringWriter s = new StringWriter();
- PrintWriter pw = new PrintWriter(s);
- t.printStackTrace(pw);
- pw.flush();
- return s.getBuffer().toString();
- }
-
-}
diff --git a/webapps/hello-world-hadoop-jar/src/main/java/brooklyn/demo/webapp/hello/HadoopWordCount.java b/webapps/hello-world-hadoop-jar/src/main/java/brooklyn/demo/webapp/hello/HadoopWordCount.java
deleted file mode 100644
index 7a5c948..0000000
--- a/webapps/hello-world-hadoop-jar/src/main/java/brooklyn/demo/webapp/hello/HadoopWordCount.java
+++ /dev/null
@@ -1,147 +0,0 @@
-package brooklyn.demo.webapp.hello;
-import java.io.BufferedReader;
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileNotFoundException;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.InputStreamReader;
-import java.util.StringTokenizer;
-
-import org.apache.hadoop.conf.Configuration;
-import org.apache.hadoop.fs.FSDataOutputStream;
-import org.apache.hadoop.fs.FileStatus;
-import org.apache.hadoop.fs.FileSystem;
-import org.apache.hadoop.fs.Path;
-import org.apache.hadoop.io.IntWritable;
-import org.apache.hadoop.io.Text;
-import org.apache.hadoop.mapreduce.Job;
-import org.apache.hadoop.mapreduce.Mapper;
-import org.apache.hadoop.mapreduce.Reducer;
-import org.apache.hadoop.mapreduce.lib.input.FileInputFormat;
-import org.apache.hadoop.mapreduce.lib.output.FileOutputFormat;
-import org.apache.hadoop.util.GenericOptionsParser;
-
-public class HadoopWordCount {
-
- public static class TokenizerMapper extends Mapper{
-
- private final static IntWritable one = new IntWritable(1);
- private Text word = new Text();
-
- public void map(Object key, Text value, Context context) throws IOException, InterruptedException {
- StringTokenizer itr = new StringTokenizer(value.toString());
- while (itr.hasMoreTokens()) {
- String w = itr.nextToken();
- // words (in our world) consist of [A-Za-z0-9_]+
- w = w.replaceAll("[^A-Za-z0-9_]+", " ").replaceAll("\\s+", " ").trim().toLowerCase();
- if (w.length()>0) {
- StringTokenizer itr2 = new StringTokenizer(w);
- while (itr2.hasMoreTokens()) {
- String w2 = itr2.nextToken();
- word.set(w2);
- context.write(word, one);
- }
- }
- }
- }
- }
-
- public static class IntSumReducer
- extends Reducer {
- private IntWritable result = new IntWritable();
-
- public void reduce(Text key, Iterable values,
- Context context
- ) throws IOException, InterruptedException {
- int sum = 0;
- for (IntWritable val : values) {
- sum += val.get();
- }
- result.set(sum);
- context.write(key, result);
- }
- }
-
- public static Job makeJob(Configuration conf) throws IOException {
- Job job = new Job(conf, "word count");
- job.setJarByClass(HadoopWordCount.class);
- job.setMapperClass(TokenizerMapper.class);
- job.setCombinerClass(IntSumReducer.class);
- job.setReducerClass(IntSumReducer.class);
- job.setOutputKeyClass(Text.class);
- job.setOutputValueClass(IntWritable.class);
- return job;
- }
-
- public static String stringFromInputStream(InputStream is) throws IOException {
- BufferedReader reader = new BufferedReader(new InputStreamReader(is));
- StringBuffer sb = new StringBuffer();
- String line;
- while ((line = reader.readLine()) != null)
- sb.append(line).append("\n");
- return sb.toString();
- }
-
- public static Job runWordCountWithArgs(Configuration conf, String ...args) throws FileNotFoundException, IOException, InterruptedException {
- if (args.length > 2) {
- System.err.println("Usage: wordcount [/tmp/sample.txt] [/tmp/out]");
- System.exit(2);
- }
- if (args.length > 0 && (args[0].equals("-h") || args[0].equals("--help"))) {
- System.err.println("Usage: wordcount [/tmp/sample.txt] [/tmp/out]");
- System.exit(0);
- }
-
- FileSystem fsClient = FileSystem.get(conf);
-
- // read from /tmp/sample.txt (by default), creating it if it doesn't exist
- String inN = args.length > 0 ? args[0] : "/tmp/sample.txt";
- Path in = new Path(inN);
- if (!fsClient.exists(in)) {
- FSDataOutputStream inS = fsClient.create(in);
-
- String textForInputFile = "This is a test.\nHow is this test working?\nSeems this is okay to me.\n";
- if (new File(inN).exists()) {
- //upload from local file system
- textForInputFile = stringFromInputStream(new FileInputStream(inN));
- }
- inS.write(textForInputFile.getBytes());
- inS.close();
- }
-
- // write to /tmp/out (by default), wipe it if it exists
- String outN = args.length > 1 ? args[1] : "/tmp/out";
- Path out = new Path(outN);
- if (fsClient.exists(out)) {
- fsClient.delete(out, true);
-// if (!out.delete()) {
-// Runtime.getRuntime().exec(new String[] { "rm", "-rf", "/tmp/out" }).waitFor();
-// }
- }
-
- Job job = makeJob(conf);
- FileInputFormat.addInputPath(job, new Path(inN));
- FileOutputFormat.setOutputPath(job, new Path(outN));
- return job;
- }
-
- public static void main(String[] args) throws Exception {
- Configuration conf = new Configuration();
-// String confFileName = System.getProperty("user.home")+"/"+".whirr"+"/"+"whirr-hadoop-sample-"+System.getProperty("user.name")+"/"+"hadoop-site.xml";
-// conf.addResource(new URL("file://"+confFileName));
-// conf.set("mapred.jar", "/tmp/jar-for-my-hadoop-app.jar");
-
- String[] otherArgs = new GenericOptionsParser(conf, args).getRemainingArgs();
- Job job = runWordCountWithArgs(conf, otherArgs);
-
- boolean result = job.waitForCompletion(true);
- if (!result) System.out.println("Job returned non-zero result code.");
-
- for (FileStatus f: FileSystem.get(conf).listStatus(new Path(args.length > 1 ? args[1] : "/tmp/out"))) {
- if (!f.isDir())
- System.out.println("Output "+f.getPath()+":\n"+stringFromInputStream(FileSystem.get(conf).open(f.getPath())));
- }
- }
-
-}
diff --git a/webapps/hello-world-hadoop/pom.xml b/webapps/hello-world-hadoop/pom.xml
deleted file mode 100644
index 773327c..0000000
--- a/webapps/hello-world-hadoop/pom.xml
+++ /dev/null
@@ -1,70 +0,0 @@
-
- 4.0.0
- brooklyn-example-hello-world-hadoop-webapp
- war
- hello-world-hadoop-webapp Maven Webapp
-
-
- io.brooklyn.example
- brooklyn-examples-webapps-parent
- 0.6.0
- ../pom.xml
-
-
-
-
- mysql
- mysql-connector-java
- 5.1.18
-
-
- org.apache.hadoop
- hadoop-client
- 1.0.2
-
-
- io.brooklyn.example
- brooklyn-example-hello-world-hadoop-jar
- ${project.version}
-
-
- org.slf4j
- slf4j-api
- 1.5.11
-
-
-
-
- brooklyn-example-hello-world-hadoop-webapp
-
-
- maven-dependency-plugin
-
-
-
- copy
- process-classes
-
- copy
-
-
-
-
-
- ${project.groupId}
- brooklyn-example-hello-world-hadoop-jar
- ${project.version}
- jar
- true
- target/classes
- brooklyn-example-hello-world-hadoop-jar.jar
-
-
-
-
-
-
-
-
-
-
diff --git a/webapps/hello-world-hadoop/src/main/java/brooklyn/demo/webapp/hello/SerializeHelloWorldHadoopJar.java b/webapps/hello-world-hadoop/src/main/java/brooklyn/demo/webapp/hello/SerializeHelloWorldHadoopJar.java
deleted file mode 100644
index f065f33..0000000
--- a/webapps/hello-world-hadoop/src/main/java/brooklyn/demo/webapp/hello/SerializeHelloWorldHadoopJar.java
+++ /dev/null
@@ -1,64 +0,0 @@
-package brooklyn.demo.webapp.hello;
-
-import java.io.FileNotFoundException;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.net.URL;
-import java.util.concurrent.atomic.AtomicBoolean;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-/**
- * The remote hadoop needs access to a jar file containing the code.
- * We jump through some maven hoops to have that JAR in our classpath,
- * then on the web server we serialize that JAR then pass the filename
- * to the JobConf which gets sent to hadoop.
- */
-public class SerializeHelloWorldHadoopJar {
-
- public static final Logger LOG = LoggerFactory.getLogger(SerializeHelloWorldHadoopJar.class);
-
- private static final String JAR_RESOURCE_NAME = "brooklyn-example-hello-world-hadoop-jar.jar";
- private static AtomicBoolean initialized = new AtomicBoolean(false);
- private static String jarFileName;
-
- public static void init() {
- if (initialized.get()) return;
- synchronized (initialized) {
- if (initialized.get()) return;
- try {
- URL u = SerializeHelloWorldHadoopJar.class.getClassLoader().getResource(JAR_RESOURCE_NAME);
- if (u==null) {
- throw new FileNotFoundException("jar "+JAR_RESOURCE_NAME+" not on classpath");
- } else {
- OutputStream out = new FileOutputStream("/tmp/brooklyn-example-hello-world-hadoop-jar.jar");
- copy(u.openStream(), out);
- out.close();
- jarFileName = "/tmp/brooklyn-example-hello-world-hadoop-jar.jar";
- }
- } catch (Exception e) {
- LOG.warn("Cannot copy "+JAR_RESOURCE_NAME+"; hadoop will likely fail: "+e);
- }
- initialized.set(true);
- }
- }
-
- public static String getJarName() {
- init();
- return jarFileName;
- }
-
- private static void copy(InputStream input, OutputStream output) throws IOException {
- byte[] buf = new byte[1024];
- int bytesRead = input.read(buf);
- while (bytesRead != -1) {
- output.write(buf, 0, bytesRead);
- bytesRead = input.read(buf);
- }
- output.flush();
- }
-
-}
diff --git a/webapps/hello-world-hadoop/src/main/webapp/WEB-INF/web.xml b/webapps/hello-world-hadoop/src/main/webapp/WEB-INF/web.xml
deleted file mode 100644
index 9f88c1f..0000000
--- a/webapps/hello-world-hadoop/src/main/webapp/WEB-INF/web.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-
-
-
- Archetype Created Web Application
-
diff --git a/webapps/hello-world-hadoop/src/main/webapp/available.jsp b/webapps/hello-world-hadoop/src/main/webapp/available.jsp
deleted file mode 100644
index 9cc73ab..0000000
--- a/webapps/hello-world-hadoop/src/main/webapp/available.jsp
+++ /dev/null
@@ -1,55 +0,0 @@
-
-
-Sample "Hello, World" Application
-
-
-
-
-
-
-
- |
-
-Sample Brooklyn Deployed "Hello, World" Application
-This is the home page for a sample application used to illustrate
-how web applications can be deployed to multi-cloud environments using Brooklyn.
- |
-
-
-
-
-The following apps are available:
-
-
-
-<%
-String url=System.getProperty("brooklyn.example.db.url");
-//URL should be supplied e.g. "-Dbrooklyn.example.db.url=jdbc:mysql://localhost/visitors?user=brooklyn&password=br00k11n"
-//(note quoting needed due to ampersand)
-if (url!=null) {
-%>
-- SQL database chatroom
-<% } %>
-
-<%
-String hadoopConfigUrl=System.getProperty("brooklyn.example.hadoop.site.xml.url");
-String hadoopConfigContents=System.getProperty("brooklyn.example.hadoop.site.xml.contents");
-boolean hasHadoop = (hadoopConfigUrl!=null || hadoopConfigContents!=null);
-//URL or contents should be supplied e.g. -Dbrooklyn.example.hadoop.site.xml.url=file://tmp/hadoop-site.xml
-if (hasHadoop) {
-%>
-- Hadoop chatroom
-- Hadoop wordcount (inevitably!) run over the chats
-<% } %>
-
-<%
-if (!hasHadoop && url==null) {
-%>
-- None. Try one of the other Brooklyn examples to see SQL or Hadoop.
-<% } %>
-
-
-Or you can supply or edit the configuration.
-
-
-
diff --git a/webapps/hello-world-hadoop/src/main/webapp/configure.jsp b/webapps/hello-world-hadoop/src/main/webapp/configure.jsp
deleted file mode 100644
index 5730b4f..0000000
--- a/webapps/hello-world-hadoop/src/main/webapp/configure.jsp
+++ /dev/null
@@ -1,104 +0,0 @@
-<%@ page language="java" import="java.sql.*"%>
-
-
-
-Sample Application Database JSP Page
-
-
-
-
-
-|
-
- |
-
-Sample Brooklyn Deployed WebApp
-This is the output of a JSP page that is part of the Hello, World application,
-deployed by brooklyn, to allow configuration.
- |
-
-
-
-<%
-if (request.getParameter("key")!=null) {
- String key = request.getParameter("key");
- String value = request.getParameter("value");
- Object oldValue = System.getProperties().setProperty(key, value);
-%>
- Applied new value for '<%= key %>'.
-<% } %>
-
-
-
-
-| Key |
-Current/New Value |
-Sample Value |
-
-
-
-| brooklyn.example.db.url |
-
-
- |
-jdbc:mysql://localhost/visitors?user=brooklyn&password=br00k11n |
-
-
-
-| brooklyn.example.hadoop.site.xml.url |
-
-
- |
-file:///tmp/hadoop-site.xml |
-
-
-
-| brooklyn.example.hadoop.site.xml.contents |
-
-
- |
-
-
-<configuration>
- <property>
- <name>mapred.job.tracker</name>
- <value>ec2-184-169-225-252.us-west-1.compute.amazonaws.com:8021</value>
- </property>
- <property>
- <name>fs.default.name</name>
- <value>hdfs://ec2-184-169-225-252.us-west-1.compute.amazonaws.com:8020/</value>
- </property>
- <property>
- <name>hadoop.socks.server</name>
- <value>localhost:6666</value>
- </property>
- <property>
- <name>fs.s3n.awsAccessKeyId</name>
- <value>XXX</value>
- <property>
- <name>fs.s3.awsSecretAccessKey</name>
- <value>XXX</value>
- </property>
-</configuration>
-
- |
-
-
-
-
-Click here to go back to the main page.
-
-
-
diff --git a/webapps/hello-world-hadoop/src/main/webapp/db.jsp b/webapps/hello-world-hadoop/src/main/webapp/db.jsp
deleted file mode 100644
index 39b0c70..0000000
--- a/webapps/hello-world-hadoop/src/main/webapp/db.jsp
+++ /dev/null
@@ -1,105 +0,0 @@
-<%@ page language="java" import="java.sql.*"%>
-
-
-
-Sample Application Database JSP Page
-
-
-
-
-
-|
-
- |
-
-Sample Brooklyn Deployed WebApp (Database JSP)
-This is the output of a JSP page that is part of the Hello, World application,
-deployed by brooklyn, to show SQL database interactivity.
- |
-
-
-
-<%
-String url=System.getProperty("brooklyn.example.db.url");
-//URL should be supplied e.g. ""-Dbrooklyn.example.db.url=jdbc:mysql://localhost/visitors?user=brooklyn&password=br00k11n"
-//(note quoting needed due to ampersand)
-if (url==null) {
-%>
- (There is no database included as part of this example.)
-<% } else { /* begin database-enabled block */ %>
-
-
-Visitors:
-
-
-<%
-Connection con=null;
-ResultSet rst=null;
-Statement stmt=null;
-int i=0;
-
-try {
-
- String DRIVER = "com.mysql.jdbc.Driver";
- Class.forName(DRIVER).newInstance();
-
- con=DriverManager.getConnection(url);
- stmt=con.createStatement();
-
- if (request.getParameter("name")!=null) {
- //add a message
- stmt.execute("INSERT INTO MESSAGES values (default, '"+
- //better escaping and security desired...
- //this essentially does StringEscapeUtils.escapeSql (either brooklyn.util or apache commons)
- request.getParameter("name").replaceAll("'", "''")+
- "', '"+
- request.getParameter("message").replaceAll("'", "''")+
- "')");
- }
-
- rst=stmt.executeQuery("select * from MESSAGES");
- while (rst.next()) {
-%>
- - <%= rst.getString(2) %>: <%= rst.getString(3) %>
-<%
- i++;
- }
-} catch (Exception e) {
- i=-1;
-%>
- - The database does not appear to be connected.
- - ERROR: <%= e %>
-<%
-} finally {
- if (rst!=null) rst.close();
- if (stmt!=null) stmt.close();
- if (con!=null) con.close();
-}
-
-if (i==0) {
-%>
- - None.
-<%
-}
-%>
-
-
-
-
-
-Please enter a message:
-
-
-
-<% } /* end of database-enabled block */ %>
-
-
-Click here to go back to the main page.
-
-
diff --git a/webapps/hello-world-hadoop/src/main/webapp/hadoop-chat.jsp b/webapps/hello-world-hadoop/src/main/webapp/hadoop-chat.jsp
deleted file mode 100644
index efae9ce..0000000
--- a/webapps/hello-world-hadoop/src/main/webapp/hadoop-chat.jsp
+++ /dev/null
@@ -1,94 +0,0 @@
-<%@ page language="java" import="java.sql.*"%>
-
-
-
-Sample Application HDFS JSP Page
-
-
-
-
-
-|
-
- |
-
-Sample Brooklyn Deployed WebApp (Hadoop JSP)
-This is the output of a JSP page that is part of the Hello, World application,
-deployed by brooklyn, to show hadoop hdfs used as the data store.
- |
-
-
-
-<%
-String hadoopConfigUrl=System.getProperty("brooklyn.example.hadoop.site.xml.url");
-String hadoopConfigContents=System.getProperty("brooklyn.example.hadoop.site.xml.contents");
-if (hadoopConfigUrl==null && hadoopConfigContents==null) {
-%>
- There is no hadoop included as part of this example. Set brooklyn.example.hadoop.site.xml.url
- or brooklyn.example.hadoop.site.xml.contents to proceed.
-<% } else { /* begin hadoop-enabled block */
-
-try {
- org.apache.hadoop.conf.Configuration conf = new org.apache.hadoop.conf.Configuration();
- conf.setClassLoader(brooklyn.demo.webapp.hello.HadoopWordCount.class.getClassLoader());
- if (hadoopConfigUrl!=null) conf.addResource(new java.net.URL(hadoopConfigUrl));
- if (hadoopConfigContents!=null) conf.addResource(new java.io.ByteArrayInputStream(hadoopConfigContents.getBytes()));
- org.apache.hadoop.fs.FileSystem fsClient = org.apache.hadoop.fs.FileSystem.get(conf);
- if (fsClient==null) throw new NullPointerException("Can't access fsClient");
-
- if (request.getParameter("name")!=null) {
- java.io.OutputStream os1 = fsClient.create(new org.apache.hadoop.fs.Path("chats", ""+System.currentTimeMillis()+"-"+((int)(Math.random()*10000))));
- os1.write(request.getParameter("name").getBytes());
- os1.write(" : ".getBytes());
- os1.write(request.getParameter("message").getBytes());
- os1.flush(); os1.close();
- }
-%>
-
- Visitors:
-
-<%
- org.apache.hadoop.fs.FileStatus[] files = fsClient.listStatus(new org.apache.hadoop.fs.Path("chats"));
- if (files==null) files = new org.apache.hadoop.fs.FileStatus[0];
- for (org.apache.hadoop.fs.FileStatus f: files) {
-%>
- - <%= brooklyn.demo.webapp.hello.DemoUtils.stringFromInputStream(fsClient.open(f.getPath())) %>
-<%
- }
- if (files.length==0) {
- %>
- - None.
- <%
- }
- %>
-
-
-
-
- Please enter a message:
-
-
-
-<%
-} catch (Exception e) {
-%>
- Error connecting to Hadoop.
- ERROR: <%= e %>
- <%= brooklyn.demo.webapp.hello.DemoUtils.getStackTrace(e) %>
-<%
-}
-}
-%>
-
-
- Click here to run a map-reduce job counting the words in these comments.
- Click here to go back to the main page.
-
-
-
diff --git a/webapps/hello-world-hadoop/src/main/webapp/hadoop-wordcount.jsp b/webapps/hello-world-hadoop/src/main/webapp/hadoop-wordcount.jsp
deleted file mode 100644
index 944b254..0000000
--- a/webapps/hello-world-hadoop/src/main/webapp/hadoop-wordcount.jsp
+++ /dev/null
@@ -1,103 +0,0 @@
-<%@ page language="java" import="java.sql.*"%>
-
-
-
-Sample Application Database JSP Page
-
-
-
-
-
-|
-
- |
-
-Sample Brooklyn Deployed WebApp (Hadoop JSP)
-This is the output of a JSP page that is part of the Hello, World application,
-deployed by brooklyn, to show a hadoop map-reduce task run.
- |
-
-
-
-<%
-String hadoopConfigUrl=System.getProperty("brooklyn.example.hadoop.site.xml.url");
-String hadoopConfigContents=System.getProperty("brooklyn.example.hadoop.site.xml.contents");
-if (hadoopConfigUrl==null && hadoopConfigContents==null) {
-%>
- There is no hadoop included as part of this example. Set brooklyn.example.hadoop.site.xml.url
- or brooklyn.example.hadoop.site.xml.contents to proceed.
-<% } else { /* begin hadoop-enabled block */
-
-try {
- org.apache.hadoop.conf.Configuration conf = new org.apache.hadoop.conf.Configuration();
- conf.setClassLoader(brooklyn.demo.webapp.hello.HadoopWordCount.class.getClassLoader());
- if (hadoopConfigUrl!=null) conf.addResource(new java.net.URL(hadoopConfigUrl));
- if (hadoopConfigContents!=null) conf.addResource(new java.io.ByteArrayInputStream(hadoopConfigContents.getBytes()));
- org.apache.hadoop.fs.FileSystem fsClient = org.apache.hadoop.fs.FileSystem.get(conf);
- if (fsClient==null) throw new NullPointerException("Can't access fsClient");
-
- org.apache.hadoop.mapreduce.Job job = brooklyn.demo.webapp.hello.HadoopWordCount.makeJob(conf);
- String jar = brooklyn.demo.webapp.hello.SerializeHelloWorldHadoopJar.getJarName();
- if (jar!=null) { ((org.apache.hadoop.mapred.JobConf)job.getConfiguration()).setJar(jar); }
- else { %>JAR not available. Map-Reduce submission will likely fail.<% }
- org.apache.hadoop.fs.FileStatus[] files = fsClient.listStatus(new org.apache.hadoop.fs.Path("chats"));
- if (files==null) files = new org.apache.hadoop.fs.FileStatus[0];
- for (org.apache.hadoop.fs.FileStatus f: files) {
- org.apache.hadoop.mapreduce.lib.input.FileInputFormat.addInputPath(job, f.getPath());
- }
-
- org.apache.hadoop.fs.Path outp = new org.apache.hadoop.fs.Path("out-"+((int)(Math.random()*10000)));
- org.apache.hadoop.mapreduce.lib.output.FileOutputFormat.setOutputPath(job, outp);
-
- %> Running Map-Reduce... <%
- out.flush();
-
- boolean result = job.waitForCompletion(true);
-
- %> finished: <%
- if (!result) {
- %> Job failed. Consult the logs for more information.
<%
- } else {
- %> Success.
<%
- }
-
- %> Output from map reduce is as follows:
<%
-
- files = fsClient.listStatus(outp);
- if (files==null) files = new org.apache.hadoop.fs.FileStatus[0];
- for (org.apache.hadoop.fs.FileStatus f: files) {
- try {
- if (!f.isDir() && f.getLen()>0) {
- %>
- <%= f.getPath() %>:
- <%= brooklyn.demo.webapp.hello.DemoUtils.stringFromInputStream(fsClient.open(f.getPath())) %>
- <%
- }
- } catch (Exception e) {
- %> Error: <%= e %><%
- }
- }
- if (files.length==0) {
- %>
- No output.
- <%
- }
-
- fsClient.delete(outp, true);
-
-} catch (Exception e) {
-%>
- Error connecting to Hadoop.
- ERROR: <%= e %>
- <%= brooklyn.demo.webapp.hello.DemoUtils.getStackTrace(e) %>
-<%
-}
-}
-%>
-
-
- Click here to view the chat room.
- Click here to go back to the main page.
-
-
-
diff --git a/webapps/hello-world-hadoop/src/main/webapp/images/bridge-small.png b/webapps/hello-world-hadoop/src/main/webapp/images/bridge-small.png
deleted file mode 100644
index 4149c3c..0000000
Binary files a/webapps/hello-world-hadoop/src/main/webapp/images/bridge-small.png and /dev/null differ
diff --git a/webapps/hello-world-hadoop/src/main/webapp/index.html b/webapps/hello-world-hadoop/src/main/webapp/index.html
deleted file mode 100644
index c9f7a1f..0000000
--- a/webapps/hello-world-hadoop/src/main/webapp/index.html
+++ /dev/null
@@ -1,25 +0,0 @@
-
-
-Sample "Hello, World" Application
-
-
-
-
-
-|
-
- |
-
-Sample Brooklyn Deployed "Hello, World" Application
-This is the home page for a sample application used to illustrate
-how web applications can be deployed to multi-cloud environments using Brooklyn.
- |
-
-
-
-
-See the available illustrations here.
-
-
-
-
diff --git a/webapps/hello-world-sql/pom.xml b/webapps/hello-world-sql/pom.xml
deleted file mode 100644
index e0d2e66..0000000
--- a/webapps/hello-world-sql/pom.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-
- 4.0.0
- brooklyn-example-hello-world-sql-webapp
- war
- hello-world-sql-webapp Maven Webapp
-
-
- io.brooklyn.example
- brooklyn-examples-webapps-parent
- 0.6.0
- ../pom.xml
-
-
-
-
- mysql
- mysql-connector-java
- 5.1.18
-
-
-
-
- brooklyn-example-hello-world-sql-webapp
-
-
diff --git a/webapps/hello-world-sql/src/main/webapp/WEB-INF/web.xml b/webapps/hello-world-sql/src/main/webapp/WEB-INF/web.xml
deleted file mode 100644
index 9f88c1f..0000000
--- a/webapps/hello-world-sql/src/main/webapp/WEB-INF/web.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-
-
-
- Archetype Created Web Application
-
diff --git a/webapps/hello-world-sql/src/main/webapp/available.jsp b/webapps/hello-world-sql/src/main/webapp/available.jsp
deleted file mode 100644
index fee83e6..0000000
--- a/webapps/hello-world-sql/src/main/webapp/available.jsp
+++ /dev/null
@@ -1,51 +0,0 @@
-
-
-Sample "Hello, World" Application
-
-
-
-
-
-|
-
- |
-
-Sample Brooklyn Deployed "Hello, World" Application
-This is the home page for a sample application used to illustrate
-how web applications can be deployed to multi-cloud environments using Brooklyn.
- |
-
-
-
-
-The following apps are available:
-
-
-
-<%
-String url=System.getProperty("brooklyn.example.db.url");
-//URL should be supplied e.g. "-Dbrooklyn.example.db.url=jdbc:mysql://localhost/visitors?user=brooklyn&password=br00k11n"
-//(note quoting needed due to ampersand)
-if (url!=null) {
-%>
-- SQL database chatroom
-<% } %>
-
-<%
-String hadoop=System.getProperty("brooklyn.example.hadoop.site.xml.url");
-//URL should be supplied e.g. -Dbrooklyn.example.hadoop.site.xml.url=file://tmp/hadoop-site.xml
-if (hadoop!=null) {
-%>
-- Hadoop chatroom
-- Hadoop wordcount (inevitably!) run over the chats
-<% } %>
-
-<%
-if (hadoop==null && url==null) {
-%>
-- None. Try one of the other Brooklyn examples to see SQL or Hadoop.
-<% } %>
-
-
-
-
diff --git a/webapps/hello-world-sql/src/main/webapp/db.jsp b/webapps/hello-world-sql/src/main/webapp/db.jsp
deleted file mode 100644
index 39b0c70..0000000
--- a/webapps/hello-world-sql/src/main/webapp/db.jsp
+++ /dev/null
@@ -1,105 +0,0 @@
-<%@ page language="java" import="java.sql.*"%>
-
-
-
-Sample Application Database JSP Page
-
-
-
-
-
-|
-
- |
-
-Sample Brooklyn Deployed WebApp (Database JSP)
-This is the output of a JSP page that is part of the Hello, World application,
-deployed by brooklyn, to show SQL database interactivity.
- |
-
-
-
-<%
-String url=System.getProperty("brooklyn.example.db.url");
-//URL should be supplied e.g. ""-Dbrooklyn.example.db.url=jdbc:mysql://localhost/visitors?user=brooklyn&password=br00k11n"
-//(note quoting needed due to ampersand)
-if (url==null) {
-%>
- (There is no database included as part of this example.)
-<% } else { /* begin database-enabled block */ %>
-
-
-Visitors:
-
-
-<%
-Connection con=null;
-ResultSet rst=null;
-Statement stmt=null;
-int i=0;
-
-try {
-
- String DRIVER = "com.mysql.jdbc.Driver";
- Class.forName(DRIVER).newInstance();
-
- con=DriverManager.getConnection(url);
- stmt=con.createStatement();
-
- if (request.getParameter("name")!=null) {
- //add a message
- stmt.execute("INSERT INTO MESSAGES values (default, '"+
- //better escaping and security desired...
- //this essentially does StringEscapeUtils.escapeSql (either brooklyn.util or apache commons)
- request.getParameter("name").replaceAll("'", "''")+
- "', '"+
- request.getParameter("message").replaceAll("'", "''")+
- "')");
- }
-
- rst=stmt.executeQuery("select * from MESSAGES");
- while (rst.next()) {
-%>
- - <%= rst.getString(2) %>: <%= rst.getString(3) %>
-<%
- i++;
- }
-} catch (Exception e) {
- i=-1;
-%>
- - The database does not appear to be connected.
- - ERROR: <%= e %>
-<%
-} finally {
- if (rst!=null) rst.close();
- if (stmt!=null) stmt.close();
- if (con!=null) con.close();
-}
-
-if (i==0) {
-%>
- - None.
-<%
-}
-%>
-
-
-
-
-
-Please enter a message:
-
-
-
-<% } /* end of database-enabled block */ %>
-
-
-Click here to go back to the main page.
-
-
diff --git a/webapps/hello-world-sql/src/main/webapp/hadoop-chat.jsp b/webapps/hello-world-sql/src/main/webapp/hadoop-chat.jsp
deleted file mode 100644
index c5e6bdf..0000000
--- a/webapps/hello-world-sql/src/main/webapp/hadoop-chat.jsp
+++ /dev/null
@@ -1,92 +0,0 @@
-<%@ page language="java" import="java.sql.*"%>
-
-
-
-Sample Application HDFS JSP Page
-
-
-
-
-
-|
-
- |
-
-Sample Brooklyn Deployed WebApp (Database JSP)
-This is the output of a JSP page that is part of the Hello, World application,
-deployed by brooklyn, to show hadoop hdfs used as the data store.
- |
-
-
-
-<%
-String hadoop=System.getProperty("brooklyn.example.hadoop.site.xml.url");
-if (hadoop==null) {
-%>
- (There is no hadoop included as part of this example.)
-<% } else { /* begin hadoop-enabled block */
-
-
-try {
- org.apache.hadoop.conf.Configuration conf = new org.apache.hadoop.conf.Configuration();
- conf.setClassLoader(brooklyn.demo.webapp.hello.HadoopWordCount.class.getClassLoader());
- conf.addResource(new java.net.URL(hadoop));
- org.apache.hadoop.fs.FileSystem fsClient = org.apache.hadoop.fs.FileSystem.get(conf);
- if (fsClient==null) throw new NullPointerException("Can't access fsClient at "+hadoop);
-
- if (request.getParameter("name")!=null) {
- java.io.OutputStream os1 = fsClient.create(new org.apache.hadoop.fs.Path("chats", ""+System.currentTimeMillis()+"-"+((int)(Math.random()*10000))));
- os1.write(request.getParameter("name").getBytes());
- os1.write(" : ".getBytes());
- os1.write(request.getParameter("message").getBytes());
- os1.flush(); os1.close();
- }
-%>
-
- Visitors:
-
-<%
- org.apache.hadoop.fs.FileStatus[] files = fsClient.listStatus(new org.apache.hadoop.fs.Path("chats"));
- if (files==null) files = new org.apache.hadoop.fs.FileStatus[0];
- for (org.apache.hadoop.fs.FileStatus f: files) {
-%>
- - <%= brooklyn.demo.webapp.hello.DemoUtils.stringFromInputStream(fsClient.open(f.getPath())) %>
-<%
- }
- if (files.length==0) {
- %>
- - None.
- <%
- }
- %>
-
-
-
-
- Please enter a message:
-
-
-
-<%
-} catch (Exception e) {
-%>
- Error connecting to Hadoop.
- ERROR: <%= e %>
- <%= brooklyn.demo.webapp.hello.DemoUtils.getStackTrace(e) %>
-<%
-}
-}
-%>
-
-
- Click here to run a map-reduce job counting the words in these comments.
- Click here to go back to the main page.
-
-
-
diff --git a/webapps/hello-world-sql/src/main/webapp/hadoop-wordcount.jsp b/webapps/hello-world-sql/src/main/webapp/hadoop-wordcount.jsp
deleted file mode 100644
index 3b71a2c..0000000
--- a/webapps/hello-world-sql/src/main/webapp/hadoop-wordcount.jsp
+++ /dev/null
@@ -1,96 +0,0 @@
-<%@ page language="java" import="java.sql.*"%>
-
-
-
-Sample Application Database JSP Page
-
-
-
-
-
-|
-
- |
-
-Sample Brooklyn Deployed WebApp (Database JSP)
-This is the output of a JSP page that is part of the Hello, World application,
-deployed by brooklyn, to show a hadoop map-reduce task run.
- |
-
-
-
-<%
-String hadoop=System.getProperty("brooklyn.example.hadoop.site.xml.url");
-String hadoopJar=System.getProperty("brooklyn.example.hadoop.custom.jar.url");
-if (hadoop==null) {
-%>
- There is no hadoop included as part of this example. Set brooklyn.example.hadoop.site.xml.url to proceed.
-<% } else if (hadoopJar==null) {
-%>
- brooklyn.example.hadoop.custom.jar.url must be set to point to the Jar.
-<%} else { /* begin hadoop-enabled block */
-
-try {
- org.apache.hadoop.conf.Configuration conf = new org.apache.hadoop.conf.Configuration();
- conf.setClassLoader(brooklyn.demo.webapp.hello.HadoopWordCount.class.getClassLoader());
- conf.addResource(new java.net.URL(hadoop));
- org.apache.hadoop.fs.FileSystem fsClient = org.apache.hadoop.fs.FileSystem.get(conf);
- if (fsClient==null) throw new NullPointerException("Can't access fsClient at "+hadoop);
-
- org.apache.hadoop.mapreduce.Job job = brooklyn.demo.webapp.hello.HadoopWordCount.makeJob(conf);
- ((org.apache.hadoop.mapred.JobConf)job.getConfiguration()).setJar(hadoopJar);
- org.apache.hadoop.fs.FileStatus[] files = fsClient.listStatus(new org.apache.hadoop.fs.Path("chats"));
- if (files==null) files = new org.apache.hadoop.fs.FileStatus[0];
- for (org.apache.hadoop.fs.FileStatus f: files) {
- org.apache.hadoop.mapreduce.lib.input.FileInputFormat.addInputPath(job, f.getPath());
- }
-
- org.apache.hadoop.fs.Path outp = new org.apache.hadoop.fs.Path("out-"+((int)(Math.random()*10000)));
- org.apache.hadoop.mapreduce.lib.output.FileOutputFormat.setOutputPath(job, outp);
-
- boolean result = job.waitForCompletion(true);
-
- if (!result) {
- %> Map reduce job returned non-zero result code.
<%
- }
-
- %> Output from map reduce is as follows:
<%
-
- files = fsClient.listStatus(outp);
- if (files==null) files = new org.apache.hadoop.fs.FileStatus[0];
- for (org.apache.hadoop.fs.FileStatus f: files) {
- try {
- if (!f.isDir() && f.getLen()>0) {
- %>
- <%= f.getPath() %>:
- <%= brooklyn.demo.webapp.hello.DemoUtils.stringFromInputStream(fsClient.open(f.getPath())) %>
- <%
- }
- } catch (Exception e) {
- %> Error: <%= e %><%
- }
- }
- if (files.length==0) {
- %>
- No output.
- <%
- }
-
- fsClient.delete(outp, true);
-
-} catch (Exception e) {
-%>
- Error connecting to Hadoop.
- ERROR: <%= e %>
- <%= brooklyn.demo.webapp.hello.DemoUtils.getStackTrace(e) %>
-<%
-}
-}
-%>
-
-
- Click here to view the chat room.
- Click here to go back to the main page.
-
-
-
diff --git a/webapps/hello-world-sql/src/main/webapp/images/bridge-small.png b/webapps/hello-world-sql/src/main/webapp/images/bridge-small.png
deleted file mode 100644
index 4149c3c..0000000
Binary files a/webapps/hello-world-sql/src/main/webapp/images/bridge-small.png and /dev/null differ
diff --git a/webapps/hello-world-sql/src/main/webapp/index.html b/webapps/hello-world-sql/src/main/webapp/index.html
deleted file mode 100644
index c9f7a1f..0000000
--- a/webapps/hello-world-sql/src/main/webapp/index.html
+++ /dev/null
@@ -1,25 +0,0 @@
-
-
-Sample "Hello, World" Application
-
-
-
-
-
-|
-
- |
-
-Sample Brooklyn Deployed "Hello, World" Application
-This is the home page for a sample application used to illustrate
-how web applications can be deployed to multi-cloud environments using Brooklyn.
- |
-
-
-
-
-See the available illustrations here.
-
-
-
-
diff --git a/webapps/hello-world-webapp/pom.xml b/webapps/hello-world-webapp/pom.xml
deleted file mode 100644
index 61bc5da..0000000
--- a/webapps/hello-world-webapp/pom.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-
- 4.0.0
- war
- brooklyn-example-hello-world-webapp
- hello-world-webapp Maven Webapp
-
-
- io.brooklyn.example
- brooklyn-examples-webapps-parent
- 0.6.0
- ../pom.xml
-
-
-
- brooklyn-example-hello-world-webapp
-
-
diff --git a/webapps/hello-world-webapp/src/main/webapp/WEB-INF/web.xml b/webapps/hello-world-webapp/src/main/webapp/WEB-INF/web.xml
deleted file mode 100644
index 9f88c1f..0000000
--- a/webapps/hello-world-webapp/src/main/webapp/WEB-INF/web.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-
-
-
- Archetype Created Web Application
-
diff --git a/webapps/hello-world-webapp/src/main/webapp/available.jsp b/webapps/hello-world-webapp/src/main/webapp/available.jsp
deleted file mode 100644
index 6f696c2..0000000
--- a/webapps/hello-world-webapp/src/main/webapp/available.jsp
+++ /dev/null
@@ -1,58 +0,0 @@
-
-
-Sample "Hello, World" Application
-
-
-
-
-
-|
-
- |
-
-Sample Brooklyn Deployed "Hello, World" Application
-This is the home page for a sample application used to illustrate
-how web applications can be deployed to multi-cloud environments using Brooklyn.
- |
-
-
-
-
-The following apps are available:
-
-
-
-<%
-String dburl=System.getProperty("brooklyn.example.db.url");
-//URL should be supplied e.g. "-Dbrooklyn.example.db.url=jdbc:mysql://localhost/visitors?user=brooklyn&password=br00k11n"
-//(note quoting needed due to ampersand)
-if (dburl!=null) {
-%>
-- SQL database chatroom
-<% } %>
-
-<%
-String hadoop=System.getProperty("brooklyn.example.hadoop.site.xml.url");
-//URL should be supplied e.g. -Dbrooklyn.example.hadoop.site.xml.url=file://tmp/hadoop-site.xml
-if (hadoop!=null) {
-%>
-- Hadoop chatroom
-- Hadoop wordcount (inevitably!) run over the chats
-<% } %>
-
-<%
-boolean primes = true;
-if (primes) {
-%>
-- Prime number counting (compute)
-<% } %>
-
-<%
-if (hadoop==null && dburl==null && primes==false) {
-%>
-- None. Try one of the other Brooklyn examples to see SQL or Hadoop.
-<% } %>
-
-
-
-
diff --git a/webapps/hello-world-webapp/src/main/webapp/db.jsp b/webapps/hello-world-webapp/src/main/webapp/db.jsp
deleted file mode 100644
index 39b0c70..0000000
--- a/webapps/hello-world-webapp/src/main/webapp/db.jsp
+++ /dev/null
@@ -1,105 +0,0 @@
-<%@ page language="java" import="java.sql.*"%>
-
-
-
-Sample Application Database JSP Page
-
-
-
-
-
-|
-
- |
-
-Sample Brooklyn Deployed WebApp (Database JSP)
-This is the output of a JSP page that is part of the Hello, World application,
-deployed by brooklyn, to show SQL database interactivity.
- |
-
-
-
-<%
-String url=System.getProperty("brooklyn.example.db.url");
-//URL should be supplied e.g. ""-Dbrooklyn.example.db.url=jdbc:mysql://localhost/visitors?user=brooklyn&password=br00k11n"
-//(note quoting needed due to ampersand)
-if (url==null) {
-%>
- (There is no database included as part of this example.)
-<% } else { /* begin database-enabled block */ %>
-
-
-Visitors:
-
-
-<%
-Connection con=null;
-ResultSet rst=null;
-Statement stmt=null;
-int i=0;
-
-try {
-
- String DRIVER = "com.mysql.jdbc.Driver";
- Class.forName(DRIVER).newInstance();
-
- con=DriverManager.getConnection(url);
- stmt=con.createStatement();
-
- if (request.getParameter("name")!=null) {
- //add a message
- stmt.execute("INSERT INTO MESSAGES values (default, '"+
- //better escaping and security desired...
- //this essentially does StringEscapeUtils.escapeSql (either brooklyn.util or apache commons)
- request.getParameter("name").replaceAll("'", "''")+
- "', '"+
- request.getParameter("message").replaceAll("'", "''")+
- "')");
- }
-
- rst=stmt.executeQuery("select * from MESSAGES");
- while (rst.next()) {
-%>
- - <%= rst.getString(2) %>: <%= rst.getString(3) %>
-<%
- i++;
- }
-} catch (Exception e) {
- i=-1;
-%>
- - The database does not appear to be connected.
- - ERROR: <%= e %>
-<%
-} finally {
- if (rst!=null) rst.close();
- if (stmt!=null) stmt.close();
- if (con!=null) con.close();
-}
-
-if (i==0) {
-%>
- - None.
-<%
-}
-%>
-
-
-
-
-
-Please enter a message:
-
-
-
-<% } /* end of database-enabled block */ %>
-
-
-Click here to go back to the main page.
-
-
diff --git a/webapps/hello-world-webapp/src/main/webapp/hadoop-chat.jsp b/webapps/hello-world-webapp/src/main/webapp/hadoop-chat.jsp
deleted file mode 100644
index c5e6bdf..0000000
--- a/webapps/hello-world-webapp/src/main/webapp/hadoop-chat.jsp
+++ /dev/null
@@ -1,92 +0,0 @@
-<%@ page language="java" import="java.sql.*"%>
-
-
-
-Sample Application HDFS JSP Page
-
-
-
-
-
-|
-
- |
-
-Sample Brooklyn Deployed WebApp (Database JSP)
-This is the output of a JSP page that is part of the Hello, World application,
-deployed by brooklyn, to show hadoop hdfs used as the data store.
- |
-
-
-
-<%
-String hadoop=System.getProperty("brooklyn.example.hadoop.site.xml.url");
-if (hadoop==null) {
-%>
- (There is no hadoop included as part of this example.)
-<% } else { /* begin hadoop-enabled block */
-
-
-try {
- org.apache.hadoop.conf.Configuration conf = new org.apache.hadoop.conf.Configuration();
- conf.setClassLoader(brooklyn.demo.webapp.hello.HadoopWordCount.class.getClassLoader());
- conf.addResource(new java.net.URL(hadoop));
- org.apache.hadoop.fs.FileSystem fsClient = org.apache.hadoop.fs.FileSystem.get(conf);
- if (fsClient==null) throw new NullPointerException("Can't access fsClient at "+hadoop);
-
- if (request.getParameter("name")!=null) {
- java.io.OutputStream os1 = fsClient.create(new org.apache.hadoop.fs.Path("chats", ""+System.currentTimeMillis()+"-"+((int)(Math.random()*10000))));
- os1.write(request.getParameter("name").getBytes());
- os1.write(" : ".getBytes());
- os1.write(request.getParameter("message").getBytes());
- os1.flush(); os1.close();
- }
-%>
-
- Visitors:
-
-<%
- org.apache.hadoop.fs.FileStatus[] files = fsClient.listStatus(new org.apache.hadoop.fs.Path("chats"));
- if (files==null) files = new org.apache.hadoop.fs.FileStatus[0];
- for (org.apache.hadoop.fs.FileStatus f: files) {
-%>
- - <%= brooklyn.demo.webapp.hello.DemoUtils.stringFromInputStream(fsClient.open(f.getPath())) %>
-<%
- }
- if (files.length==0) {
- %>
- - None.
- <%
- }
- %>
-
-
-
-
- Please enter a message:
-
-
-
-<%
-} catch (Exception e) {
-%>
- Error connecting to Hadoop.
- ERROR: <%= e %>
- <%= brooklyn.demo.webapp.hello.DemoUtils.getStackTrace(e) %>
-<%
-}
-}
-%>
-
-
- Click here to run a map-reduce job counting the words in these comments.
- Click here to go back to the main page.
-
-
-
diff --git a/webapps/hello-world-webapp/src/main/webapp/hadoop-wordcount.jsp b/webapps/hello-world-webapp/src/main/webapp/hadoop-wordcount.jsp
deleted file mode 100644
index 3b71a2c..0000000
--- a/webapps/hello-world-webapp/src/main/webapp/hadoop-wordcount.jsp
+++ /dev/null
@@ -1,96 +0,0 @@
-<%@ page language="java" import="java.sql.*"%>
-
-
-
-Sample Application Database JSP Page
-
-
-
-
-
-|
-
- |
-
-Sample Brooklyn Deployed WebApp (Database JSP)
-This is the output of a JSP page that is part of the Hello, World application,
-deployed by brooklyn, to show a hadoop map-reduce task run.
- |
-
-
-
-<%
-String hadoop=System.getProperty("brooklyn.example.hadoop.site.xml.url");
-String hadoopJar=System.getProperty("brooklyn.example.hadoop.custom.jar.url");
-if (hadoop==null) {
-%>
- There is no hadoop included as part of this example. Set brooklyn.example.hadoop.site.xml.url to proceed.
-<% } else if (hadoopJar==null) {
-%>
- brooklyn.example.hadoop.custom.jar.url must be set to point to the Jar.
-<%} else { /* begin hadoop-enabled block */
-
-try {
- org.apache.hadoop.conf.Configuration conf = new org.apache.hadoop.conf.Configuration();
- conf.setClassLoader(brooklyn.demo.webapp.hello.HadoopWordCount.class.getClassLoader());
- conf.addResource(new java.net.URL(hadoop));
- org.apache.hadoop.fs.FileSystem fsClient = org.apache.hadoop.fs.FileSystem.get(conf);
- if (fsClient==null) throw new NullPointerException("Can't access fsClient at "+hadoop);
-
- org.apache.hadoop.mapreduce.Job job = brooklyn.demo.webapp.hello.HadoopWordCount.makeJob(conf);
- ((org.apache.hadoop.mapred.JobConf)job.getConfiguration()).setJar(hadoopJar);
- org.apache.hadoop.fs.FileStatus[] files = fsClient.listStatus(new org.apache.hadoop.fs.Path("chats"));
- if (files==null) files = new org.apache.hadoop.fs.FileStatus[0];
- for (org.apache.hadoop.fs.FileStatus f: files) {
- org.apache.hadoop.mapreduce.lib.input.FileInputFormat.addInputPath(job, f.getPath());
- }
-
- org.apache.hadoop.fs.Path outp = new org.apache.hadoop.fs.Path("out-"+((int)(Math.random()*10000)));
- org.apache.hadoop.mapreduce.lib.output.FileOutputFormat.setOutputPath(job, outp);
-
- boolean result = job.waitForCompletion(true);
-
- if (!result) {
- %> Map reduce job returned non-zero result code.
<%
- }
-
- %> Output from map reduce is as follows:
<%
-
- files = fsClient.listStatus(outp);
- if (files==null) files = new org.apache.hadoop.fs.FileStatus[0];
- for (org.apache.hadoop.fs.FileStatus f: files) {
- try {
- if (!f.isDir() && f.getLen()>0) {
- %>
- <%= f.getPath() %>:
- <%= brooklyn.demo.webapp.hello.DemoUtils.stringFromInputStream(fsClient.open(f.getPath())) %>
- <%
- }
- } catch (Exception e) {
- %> Error: <%= e %><%
- }
- }
- if (files.length==0) {
- %>
- No output.
- <%
- }
-
- fsClient.delete(outp, true);
-
-} catch (Exception e) {
-%>
- Error connecting to Hadoop.
- ERROR: <%= e %>
- <%= brooklyn.demo.webapp.hello.DemoUtils.getStackTrace(e) %>
-<%
-}
-}
-%>
-
-
- Click here to view the chat room.
- Click here to go back to the main page.
-
-
-
diff --git a/webapps/hello-world-webapp/src/main/webapp/images/bridge-small.png b/webapps/hello-world-webapp/src/main/webapp/images/bridge-small.png
deleted file mode 100644
index 4149c3c..0000000
Binary files a/webapps/hello-world-webapp/src/main/webapp/images/bridge-small.png and /dev/null differ
diff --git a/webapps/hello-world-webapp/src/main/webapp/index.html b/webapps/hello-world-webapp/src/main/webapp/index.html
deleted file mode 100644
index c9f7a1f..0000000
--- a/webapps/hello-world-webapp/src/main/webapp/index.html
+++ /dev/null
@@ -1,25 +0,0 @@
-
-
-Sample "Hello, World" Application
-
-
-
-
-
-|
-
- |
-
-Sample Brooklyn Deployed "Hello, World" Application
-This is the home page for a sample application used to illustrate
-how web applications can be deployed to multi-cloud environments using Brooklyn.
- |
-
-
-
-
-See the available illustrations here.
-
-
-
-
diff --git a/webapps/hello-world-webapp/src/main/webapp/primes.jsp b/webapps/hello-world-webapp/src/main/webapp/primes.jsp
deleted file mode 100644
index ee1d838..0000000
--- a/webapps/hello-world-webapp/src/main/webapp/primes.jsp
+++ /dev/null
@@ -1,59 +0,0 @@
-<%@ page language="java"%>
-
-
-
-Sample Application Compute JSP Page
-
-
-
-
-
-|
-
- |
-
-Sample Brooklyn Deployed WebApp (Compute Primes JSP)
-This is the output of a JSP page that is part of the Hello, World application,
-deployed by brooklyn, to show compute load by generating primes.
- |
-
-
-
-<%
-Object nx = request.getParameter("n");
-if (nx==null) {
-%>
- Please supply a value n in the URL, to compute primes up to n.
-
-
-<%
-} else {
- long n = Long.parseLong(""+nx);
- long startTime = System.currentTimeMillis();
- int count = 0;
- for (long k=2; k<=n; k++) {
- // check if k prime
- boolean prime = true;
- for (long j=2; j*j<=k; j++) {
- if (k%j==0) {
- prime = false;
- break;
- }
- }
- if (prime) count++;
- }
- long totalTime = System.currentTimeMillis() - startTime;
-%>
- There are <%= count %> primes less than or equal to <%= n %>.
- Computation took <%= totalTime %> ms.
-<%
-}
-%>
-
-
-
diff --git a/webapps/pom.xml b/webapps/pom.xml
deleted file mode 100644
index 50f715a..0000000
--- a/webapps/pom.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-
-
- 4.0.0
- pom
- brooklyn-examples-webapps-parent
- Brooklyn Examples Support Aggregator Project - Webapps
-
- Brooklyn examples module, building the Brooklyn examples.
-
-
-
- io.brooklyn.example
- brooklyn-examples-parent
- 0.6.0
- ../pom.xml
-
-
-
- UTF-8
-
-
-
- hello-world-webapp
- hello-world-sql
- hello-world-hadoop-jar
- hello-world-hadoop
-
-