Repository: incubator-brooklyn Updated Branches: refs/heads/master 50b18e736 -> e3db4e3cc
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/77dff880/usage/cli/src/main/resources/brooklyn/default.catalog.bom ---------------------------------------------------------------------- diff --git a/usage/cli/src/main/resources/brooklyn/default.catalog.bom b/usage/cli/src/main/resources/brooklyn/default.catalog.bom index 839662a..4cd5f6b 100644 --- a/usage/cli/src/main/resources/brooklyn/default.catalog.bom +++ b/usage/cli/src/main/resources/brooklyn/default.catalog.bom @@ -34,7 +34,7 @@ brooklyn.catalog: The sensor advertising the port can be configured with the "member.sensor.portNumber" config key, defaulting to `http.port`; all member entities which have published "service.up" will then be picked up. item: - type: brooklyn.entity.proxy.nginx.NginxController + type: org.apache.brooklyn.entity.proxy.nginx.NginxController name: Load Balancer (nginx) - id: cluster http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/77dff880/usage/jsgui/src/main/webapp/assets/tpl/app-add-wizard/required-config-entry.html ---------------------------------------------------------------------- diff --git a/usage/jsgui/src/main/webapp/assets/tpl/app-add-wizard/required-config-entry.html b/usage/jsgui/src/main/webapp/assets/tpl/app-add-wizard/required-config-entry.html index b802624..1478963 100644 --- a/usage/jsgui/src/main/webapp/assets/tpl/app-add-wizard/required-config-entry.html +++ b/usage/jsgui/src/main/webapp/assets/tpl/app-add-wizard/required-config-entry.html @@ -34,7 +34,7 @@ under the License. element = null; for (var i = 0; i < length; i++) { element = data.possibleValues[i]; %> - <option value="<%= element.value %>"<% if (data.defaultValue == element.value) { %> selected="selected"<% } %>><%= element.description %></option> + <option value="<%= element.value %>"><% if (data.defaultValue == element.value) { %> selected="selected"<% } %>><%= element.description %></option> <% } %> </select> <% } else { %> http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/77dff880/usage/jsgui/src/test/javascript/specs/model/app-tree-spec.js ---------------------------------------------------------------------- diff --git a/usage/jsgui/src/test/javascript/specs/model/app-tree-spec.js b/usage/jsgui/src/test/javascript/specs/model/app-tree-spec.js index 079aff4..7cbacf4 100644 --- a/usage/jsgui/src/test/javascript/specs/model/app-tree-spec.js +++ b/usage/jsgui/src/test/javascript/specs/model/app-tree-spec.js @@ -38,7 +38,7 @@ define([ expect(app1.get("type")).toBe("") expect(app1.get("children").length).toBe(1) expect(app1.get("children")[0].name).toBe("tomcat1") - expect(app1.get("children")[0].type).toBe("brooklyn.entity.webapp.tomcat.TomcatServer") + expect(app1.get("children")[0].type).toBe("org.apache.brooklyn.entity.webapp.tomcat.TomcatServer") expect(apps.at(1).get("children").length).toBe(2) }) http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/77dff880/usage/jsgui/src/test/javascript/specs/model/entity-summary-spec.js ---------------------------------------------------------------------- diff --git a/usage/jsgui/src/test/javascript/specs/model/entity-summary-spec.js b/usage/jsgui/src/test/javascript/specs/model/entity-summary-spec.js index d989415..230b331 100644 --- a/usage/jsgui/src/test/javascript/specs/model/entity-summary-spec.js +++ b/usage/jsgui/src/test/javascript/specs/model/entity-summary-spec.js @@ -28,8 +28,8 @@ define( it('the collection element must be of type TomcatServer and have expected properties', function () { expect(eSummary.getLinkByName('catalog')) - .toBe('/v1/catalog/entities/brooklyn.entity.webapp.tomcat.TomcatServer') - expect(eSummary.get("type")).toBe('brooklyn.entity.webapp.tomcat.TomcatServer') + .toBe('/v1/catalog/entities/org.apache.brooklyn.entity.webapp.tomcat.TomcatServer') + expect(eSummary.get("type")).toBe('org.apache.brooklyn.entity.webapp.tomcat.TomcatServer') expect(eSummary.getLinkByName('sensors')).toBe('fixtures/sensor-summary-list.json') expect(eSummary.getDisplayName()).toBe('TomcatServer:zQsqdXzi') }) http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/77dff880/usage/launcher/src/test/java/org/apache/brooklyn/launcher/BrooklynLauncherTest.java ---------------------------------------------------------------------- diff --git a/usage/launcher/src/test/java/org/apache/brooklyn/launcher/BrooklynLauncherTest.java b/usage/launcher/src/test/java/org/apache/brooklyn/launcher/BrooklynLauncherTest.java index 9aed0a2..13fffe2 100644 --- a/usage/launcher/src/test/java/org/apache/brooklyn/launcher/BrooklynLauncherTest.java +++ b/usage/launcher/src/test/java/org/apache/brooklyn/launcher/BrooklynLauncherTest.java @@ -162,7 +162,7 @@ public class BrooklynLauncherTest { public void testStartsAppFromYAML() throws Exception { String yaml = "name: example-app\n" + "services:\n" + - "- serviceType: brooklyn.test.entity.TestEntity\n" + + "- serviceType: org.apache.brooklyn.test.entity.TestEntity\n" + " name: test-app"; launcher = newLauncherForTests(true) .webconsole(false) http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/77dff880/usage/launcher/src/test/resources/couchbase-w-loadgen.yaml ---------------------------------------------------------------------- diff --git a/usage/launcher/src/test/resources/couchbase-w-loadgen.yaml b/usage/launcher/src/test/resources/couchbase-w-loadgen.yaml index b3e1bce..7dc4995 100644 --- a/usage/launcher/src/test/resources/couchbase-w-loadgen.yaml +++ b/usage/launcher/src/test/resources/couchbase-w-loadgen.yaml @@ -42,7 +42,7 @@ services: minPoolSize: 3 maxPoolSize: 8 -- type: brooklyn.entity.webapp.ControlledDynamicWebAppCluster +- type: org.apache.brooklyn.entity.webapp.ControlledDynamicWebAppCluster name: Web Couchbase Load Gen Cluster war: https://github.com/neykov/web-load-gen/raw/master/load-gen.war brooklyn.config: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/77dff880/usage/launcher/src/test/resources/java-web-app-and-db-with-function.yaml ---------------------------------------------------------------------- diff --git a/usage/launcher/src/test/resources/java-web-app-and-db-with-function.yaml b/usage/launcher/src/test/resources/java-web-app-and-db-with-function.yaml index bb2c2d1..1bf0172 100644 --- a/usage/launcher/src/test/resources/java-web-app-and-db-with-function.yaml +++ b/usage/launcher/src/test/resources/java-web-app-and-db-with-function.yaml @@ -18,7 +18,7 @@ # name: java-cluster-db-example services: -- serviceType: brooklyn.entity.webapp.ControlledDynamicWebAppCluster +- serviceType: org.apache.brooklyn.entity.webapp.ControlledDynamicWebAppCluster name: My Web location: localhost brooklyn.config: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/77dff880/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 8d27c19..af50bdf 100644 --- a/usage/launcher/src/test/resources/mongo-sharded.yaml +++ b/usage/launcher/src/test/resources/mongo-sharded.yaml @@ -29,7 +29,7 @@ services: shardReplicaSetSize: 3 coLocatedRouterGroup: $brooklyn:component("webappcluster").attributeWhenReady("controlleddynamicwebappcluster.cluster") -- type: brooklyn.entity.webapp.ControlledDynamicWebAppCluster +- type: org.apache.brooklyn.entity.webapp.ControlledDynamicWebAppCluster id: webappcluster brooklyn.config: memberSpec: @@ -39,14 +39,14 @@ services: - 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") + $brooklyn:sensor("org.apache.brooklyn.entity.webapp.jboss.JBoss7Server", "http.port"): $brooklyn:sensor("org.apache.brooklyn.entity.webapp.jboss.JBoss7Server", "http.port") enricher.producer: $brooklyn:component("child", "appserver") brooklyn.config: shardedDeployment: $brooklyn:component("mongo") siblingSpecs: - $brooklyn:entitySpec: id: appserver - type: brooklyn.entity.webapp.jboss.JBoss7Server + type: org.apache.brooklyn.entity.webapp.jboss.JBoss7Server brooklyn.config: war: "classpath://brooklyn-example-hello-world-sql-webapp.war" java.sysprops: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/77dff880/usage/launcher/src/test/resources/nginx.yaml ---------------------------------------------------------------------- diff --git a/usage/launcher/src/test/resources/nginx.yaml b/usage/launcher/src/test/resources/nginx.yaml index 984c41a..acbaa8f 100644 --- a/usage/launcher/src/test/resources/nginx.yaml +++ b/usage/launcher/src/test/resources/nginx.yaml @@ -19,7 +19,7 @@ name: Sample Nginx on SSL location: localhost services: -- type: brooklyn.entity.proxy.nginx.NginxController +- type: org.apache.brooklyn.entity.proxy.nginx.NginxController ssl: certificateDestination: /tmp/server.crt keyDestination: /tmp/server.key http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/77dff880/usage/launcher/src/test/resources/opengamma-cluster.yaml ---------------------------------------------------------------------- diff --git a/usage/launcher/src/test/resources/opengamma-cluster.yaml b/usage/launcher/src/test/resources/opengamma-cluster.yaml index 5b2c44c..ebb5c35 100644 --- a/usage/launcher/src/test/resources/opengamma-cluster.yaml +++ b/usage/launcher/src/test/resources/opengamma-cluster.yaml @@ -33,13 +33,13 @@ services: - type: Fabric id: web-fabric spec: - type: brooklyn.entity.webapp.ControlledDynamicWebAppCluster + type: org.apache.brooklyn.entity.webapp.ControlledDynamicWebAppCluster brooklyn.config: dynamiccluster.memberspec: type: io.cloudsoft.opengamma.server.OpenGammaServer opengamma.services.message-bus.entity: og-amq opengamma.services.database.entity: og-db -- type: brooklyn.entity.dns.geoscaling.GeoscalingDnsService +- type: org.apache.brooklyn.entity.dns.geoscaling.GeoscalingDnsService brooklyn.config: username: cloudsoft password: $brooklyn.property("brooklyn.geoscaling.password") http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/77dff880/usage/launcher/src/test/resources/web.yaml ---------------------------------------------------------------------- diff --git a/usage/launcher/src/test/resources/web.yaml b/usage/launcher/src/test/resources/web.yaml index 00edf4e..89f5bbe 100644 --- a/usage/launcher/src/test/resources/web.yaml +++ b/usage/launcher/src/test/resources/web.yaml @@ -18,7 +18,7 @@ # name: Sample Web App services: -- serviceType: brooklyn.entity.webapp.ControlledDynamicWebAppCluster +- serviceType: org.apache.brooklyn.entity.webapp.ControlledDynamicWebAppCluster name: Analytics Web App brooklyn.config: wars.root: http://search.maven.org/remotecontent?filepath=io/brooklyn/example/brooklyn-example-hello-world-sql-webapp/0.6.0-M2/brooklyn-example-hello-world-sql-webapp-0.6.0-M2.war http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/77dff880/usage/qa/src/main/java/org/apache/brooklyn/qa/load/SimulatedJBoss7ServerImpl.java ---------------------------------------------------------------------- diff --git a/usage/qa/src/main/java/org/apache/brooklyn/qa/load/SimulatedJBoss7ServerImpl.java b/usage/qa/src/main/java/org/apache/brooklyn/qa/load/SimulatedJBoss7ServerImpl.java index 762c17b..e40cae9 100644 --- a/usage/qa/src/main/java/org/apache/brooklyn/qa/load/SimulatedJBoss7ServerImpl.java +++ b/usage/qa/src/main/java/org/apache/brooklyn/qa/load/SimulatedJBoss7ServerImpl.java @@ -22,11 +22,12 @@ import static java.lang.String.format; import java.util.concurrent.Callable; +import org.apache.brooklyn.entity.webapp.jboss.JBoss7ServerImpl; +import org.apache.brooklyn.entity.webapp.jboss.JBoss7SshDriver; + import brooklyn.config.ConfigKey; import brooklyn.enricher.Enrichers; import brooklyn.entity.basic.Attributes; -import brooklyn.entity.webapp.jboss.JBoss7ServerImpl; -import brooklyn.entity.webapp.jboss.JBoss7SshDriver; import brooklyn.event.feed.function.FunctionFeed; import brooklyn.event.feed.function.FunctionPollConfig; import brooklyn.event.feed.http.HttpFeed; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/77dff880/usage/qa/src/main/java/org/apache/brooklyn/qa/load/SimulatedNginxControllerImpl.java ---------------------------------------------------------------------- diff --git a/usage/qa/src/main/java/org/apache/brooklyn/qa/load/SimulatedNginxControllerImpl.java b/usage/qa/src/main/java/org/apache/brooklyn/qa/load/SimulatedNginxControllerImpl.java index 16feb43..349aea7 100644 --- a/usage/qa/src/main/java/org/apache/brooklyn/qa/load/SimulatedNginxControllerImpl.java +++ b/usage/qa/src/main/java/org/apache/brooklyn/qa/load/SimulatedNginxControllerImpl.java @@ -24,13 +24,13 @@ import java.net.URI; import java.util.Collection; import java.util.concurrent.Callable; +import org.apache.brooklyn.entity.proxy.nginx.NginxControllerImpl; +import org.apache.brooklyn.entity.proxy.nginx.NginxSshDriver; +import org.apache.brooklyn.entity.proxy.nginx.UrlMapping; import org.apache.brooklyn.policy.PolicySpec; import brooklyn.config.ConfigKey; import brooklyn.entity.Group; -import brooklyn.entity.proxy.nginx.NginxControllerImpl; -import brooklyn.entity.proxy.nginx.NginxSshDriver; -import brooklyn.entity.proxy.nginx.UrlMapping; import brooklyn.event.SensorEvent; import brooklyn.event.SensorEventListener; import brooklyn.event.feed.ConfigToAttributes; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/77dff880/usage/qa/src/main/java/org/apache/brooklyn/qa/load/SimulatedTheeTierApp.java ---------------------------------------------------------------------- diff --git a/usage/qa/src/main/java/org/apache/brooklyn/qa/load/SimulatedTheeTierApp.java b/usage/qa/src/main/java/org/apache/brooklyn/qa/load/SimulatedTheeTierApp.java index 7a45b62..daee92b 100644 --- a/usage/qa/src/main/java/org/apache/brooklyn/qa/load/SimulatedTheeTierApp.java +++ b/usage/qa/src/main/java/org/apache/brooklyn/qa/load/SimulatedTheeTierApp.java @@ -35,15 +35,16 @@ import brooklyn.entity.basic.StartableApplication; import brooklyn.entity.database.mysql.MySqlNode; import brooklyn.entity.group.DynamicCluster; import brooklyn.entity.java.JavaEntityMethods; -import brooklyn.entity.proxy.nginx.NginxController; import brooklyn.entity.proxying.EntitySpec; import brooklyn.entity.trait.Startable; -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.entity.webapp.jboss.JBoss7Server; + +import org.apache.brooklyn.entity.proxy.nginx.NginxController; +import org.apache.brooklyn.entity.webapp.ControlledDynamicWebAppCluster; +import org.apache.brooklyn.entity.webapp.DynamicWebAppCluster; +import org.apache.brooklyn.entity.webapp.JavaWebAppService; +import org.apache.brooklyn.entity.webapp.WebAppService; +import org.apache.brooklyn.entity.webapp.WebAppServiceConstants; +import org.apache.brooklyn.entity.webapp.jboss.JBoss7Server; import org.apache.brooklyn.launcher.BrooklynLauncher; import brooklyn.location.basic.PortRanges; import brooklyn.policy.autoscaling.AutoScalerPolicy; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/77dff880/usage/qa/src/test/java/org/apache/brooklyn/qa/longevity/webcluster/WebClusterApp.java ---------------------------------------------------------------------- diff --git a/usage/qa/src/test/java/org/apache/brooklyn/qa/longevity/webcluster/WebClusterApp.java b/usage/qa/src/test/java/org/apache/brooklyn/qa/longevity/webcluster/WebClusterApp.java index 9cb9eb5..f093fe9 100644 --- a/usage/qa/src/test/java/org/apache/brooklyn/qa/longevity/webcluster/WebClusterApp.java +++ b/usage/qa/src/test/java/org/apache/brooklyn/qa/longevity/webcluster/WebClusterApp.java @@ -25,13 +25,13 @@ import brooklyn.enricher.Enrichers; import brooklyn.entity.basic.AbstractApplication; import brooklyn.entity.basic.Entities; import brooklyn.entity.basic.StartableApplication; -import brooklyn.entity.proxy.nginx.NginxController; import brooklyn.entity.proxying.EntitySpec; -import brooklyn.entity.webapp.ControlledDynamicWebAppCluster; -import brooklyn.entity.webapp.jboss.JBoss7Server; import brooklyn.event.AttributeSensor; import brooklyn.event.basic.Sensors; +import org.apache.brooklyn.entity.proxy.nginx.NginxController; +import org.apache.brooklyn.entity.webapp.ControlledDynamicWebAppCluster; +import org.apache.brooklyn.entity.webapp.jboss.JBoss7Server; import org.apache.brooklyn.launcher.BrooklynLauncher; import org.apache.brooklyn.policy.EnricherSpec; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/77dff880/usage/rest-server/src/test/java/org/apache/brooklyn/rest/BrooklynPropertiesSecurityFilterTest.java ---------------------------------------------------------------------- diff --git a/usage/rest-server/src/test/java/org/apache/brooklyn/rest/BrooklynPropertiesSecurityFilterTest.java b/usage/rest-server/src/test/java/org/apache/brooklyn/rest/BrooklynPropertiesSecurityFilterTest.java index fb8436f..6d8e15e 100644 --- a/usage/rest-server/src/test/java/org/apache/brooklyn/rest/BrooklynPropertiesSecurityFilterTest.java +++ b/usage/rest-server/src/test/java/org/apache/brooklyn/rest/BrooklynPropertiesSecurityFilterTest.java @@ -85,7 +85,7 @@ public class BrooklynPropertiesSecurityFilterTest extends BrooklynRestApiLaunche String blueprint = "name: TestApp\n" + "location: localhost\n" + "services:\n" + - "- type: brooklyn.test.entity.TestEntity"; + "- type: org.apache.brooklyn.test.entity.TestEntity"; HttpClient client = HttpTool.httpClientBuilder() .uri(getBaseUri(server)) .build(); http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/77dff880/usage/rest-server/src/test/java/org/apache/brooklyn/rest/resources/CatalogResourceTest.java ---------------------------------------------------------------------- diff --git a/usage/rest-server/src/test/java/org/apache/brooklyn/rest/resources/CatalogResourceTest.java b/usage/rest-server/src/test/java/org/apache/brooklyn/rest/resources/CatalogResourceTest.java index 77d9f50..3d7389e 100644 --- a/usage/rest-server/src/test/java/org/apache/brooklyn/rest/resources/CatalogResourceTest.java +++ b/usage/rest-server/src/test/java/org/apache/brooklyn/rest/resources/CatalogResourceTest.java @@ -94,7 +94,7 @@ public class CatalogResourceTest extends BrooklynRestResourceTest { " - url: " + bundleUrl + "\n"+ "\n"+ "services:\n"+ - "- type: brooklyn.test.entity.TestEntity\n"; + "- type: org.apache.brooklyn.test.entity.TestEntity\n"; ClientResponse response = client().resource("/v1/catalog") .post(ClientResponse.class, yaml); @@ -105,7 +105,7 @@ public class CatalogResourceTest extends BrooklynRestResourceTest { .get(CatalogEntitySummary.class); Assert.assertNotNull(entityItem.getPlanYaml()); - Assert.assertTrue(entityItem.getPlanYaml().contains("brooklyn.test.entity.TestEntity")); + Assert.assertTrue(entityItem.getPlanYaml().contains("org.apache.brooklyn.test.entity.TestEntity")); assertEquals(entityItem.getId(), ver(symbolicName)); assertEquals(entityItem.getSymbolicName(), symbolicName); @@ -336,7 +336,7 @@ public class CatalogResourceTest extends BrooklynRestResourceTest { " version: " + TEST_VERSION + "\n"+ "\n"+ "services:\n"+ - "- type: brooklyn.test.entity.TestEntity\n"; + "- type: org.apache.brooklyn.test.entity.TestEntity\n"; client().resource("/v1/catalog") .post(ClientResponse.class, yaml); @@ -418,7 +418,7 @@ public class CatalogResourceTest extends BrooklynRestResourceTest { " - url: " + bundleUrl + "\n"+ "\n"+ "services:\n"+ - "- type: brooklyn.test.entity.TestEntity\n"; + "- type: org.apache.brooklyn.test.entity.TestEntity\n"; ClientResponse response = client().resource("/v1/catalog") .post(ClientResponse.class, yaml);
