BROOKLYN-162 - cleanup and test fixes following refectoring, esp the software/base changes
Project: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/commit/c45bab04 Tree: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/tree/c45bab04 Diff: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/diff/c45bab04 Branch: refs/heads/master Commit: c45bab04f2efec84ce489e6f505f12cf0bdbcd53 Parents: a1ad34d Author: Alex Heneveld <[email protected]> Authored: Wed Aug 19 01:00:43 2015 +0100 Committer: Alex Heneveld <[email protected]> Committed: Wed Aug 19 02:13:26 2015 +0100 ---------------------------------------------------------------------- .../entity/machine/pool/ServerPool.java | 2 +- .../brooklyn/sensor/feed/jmx/JmxFeed.java | 17 ++------- .../BrooklynNodeIntegrationTest.java | 4 +-- .../app/ClusterWebServerDatabaseSample.java | 36 ++++++++++---------- .../sample/app/SingleWebServerSample.java | 13 ++++--- .../app/SampleLocalhostIntegrationTest.java | 19 +++++------ .../brooklyn/sample/app/SampleUnitTest.java | 21 ++++++------ .../brooklyn/cli/BaseCliIntegrationTest.java | 2 +- .../specs/model/sensor-summary-spec.js | 2 +- .../brooklyn/launcher/BrooklynLauncherTest.java | 2 +- .../resources/rebind-test-catalog-additions.bom | 4 +-- .../src/test/resources/rebind-test-catalog.bom | 4 +-- .../fixtures/catalog-application-list.json | 6 ++-- .../resources/fixtures/catalog-application.json | 2 +- .../resources/fixtures/sensor-summary-list.json | 2 +- .../src/main/resources/reset-catalog.xml | 6 ++-- .../rest/resources/CatalogResetTest.java | 4 +-- .../rest/resources/CatalogResourceTest.java | 18 +++++----- .../test/osgi/entities/more/MoreEntity.java | 1 - .../test/osgi/entities/more/MoreEntityImpl.java | 1 - .../test/osgi/entities/more/MoreLocation.java | 1 - .../test/osgi/entities/more/MorePolicy.java | 2 -- .../test/osgi/entities/more/MoreTemplate.java | 6 ---- .../test/osgi/entities/more/MoreEntity.java | 6 ++-- .../test/osgi/entities/more/MoreEntityImpl.java | 7 ++-- .../test/osgi/entities/more/MoreEntity.java | 6 ++-- .../test/osgi/entities/more/MoreEntityImpl.java | 7 ++-- .../test/osgi/entities/more/MoreLocation.java | 2 +- .../test/osgi/entities/more/MorePolicy.java | 2 +- .../test/osgi/entities/more/MoreTemplate.java | 7 +--- 30 files changed, 89 insertions(+), 123 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/c45bab04/software/base/src/main/java/org/apache/brooklyn/entity/machine/pool/ServerPool.java ---------------------------------------------------------------------- diff --git a/software/base/src/main/java/org/apache/brooklyn/entity/machine/pool/ServerPool.java b/software/base/src/main/java/org/apache/brooklyn/entity/machine/pool/ServerPool.java index 548242f..6b89388 100644 --- a/software/base/src/main/java/org/apache/brooklyn/entity/machine/pool/ServerPool.java +++ b/software/base/src/main/java/org/apache/brooklyn/entity/machine/pool/ServerPool.java @@ -56,7 +56,7 @@ import org.apache.brooklyn.sensor.core.Sensors; * {@link org.apache.brooklyn.entity.software.base.SoftwareProcess#PROVISIONING_PROPERTIES PROVISIONING_PROPERTIES}. * For example, in YAML: * <pre> - * - type: brooklyn.entity.pool.ServerPool + * - type: org.apache.brooklyn.entity.machine.pool.ServerPool * brooklyn.config: * # Suitable for TomcatServers * provisioning.properties: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/c45bab04/software/base/src/main/java/org/apache/brooklyn/sensor/feed/jmx/JmxFeed.java ---------------------------------------------------------------------- diff --git a/software/base/src/main/java/org/apache/brooklyn/sensor/feed/jmx/JmxFeed.java b/software/base/src/main/java/org/apache/brooklyn/sensor/feed/jmx/JmxFeed.java index 3c1897e..dec24cc 100644 --- a/software/base/src/main/java/org/apache/brooklyn/sensor/feed/jmx/JmxFeed.java +++ b/software/base/src/main/java/org/apache/brooklyn/sensor/feed/jmx/JmxFeed.java @@ -257,21 +257,8 @@ public class JmxFeed extends AbstractFeed { protected void preStart() { /* * All actions on the JmxHelper are done async (through the poller's threading) so we don't - * block on start for a long time (e.g. if the entity is not contactable and doing a rebind - * on restart of brooklyn). Without that, one gets a 120 second pause with it stuck in a - * stack trace like: - * - * at brooklyn.event.feed.jmx.JmxHelper.sleep(JmxHelper.java:640) - * at brooklyn.event.feed.jmx.JmxHelper.connect(JmxHelper.java:320) - * at brooklyn.event.feed.jmx.JmxFeed.preStart(JmxFeed.java:172) - * at brooklyn.event.feed.AbstractFeed.start(AbstractFeed.java:68) - * at brooklyn.event.feed.jmx.JmxFeed$Builder.build(JmxFeed.java:119) - * at brooklyn.entity.java.JavaAppUtils.connectMXBeanSensors(JavaAppUtils.java:109) - * at brooklyn.entity.java.VanillaJavaApp.connectSensors(VanillaJavaApp.java:97) - * at brooklyn.entity.basic.SoftwareProcessImpl.callRebindHooks(SoftwareProcessImpl.java:189) - * at brooklyn.entity.basic.SoftwareProcessImpl.rebind(SoftwareProcessImpl.java:235) - * ... - * at brooklyn.entity.rebind.RebindManagerImpl.rebind(RebindManagerImpl.java:184) + * block on start/rebind if the entity is unreachable + * (without this we get a 120s pause in JmxHelper.connect restarting) */ final SetMultimap<NotificationFilter, JmxNotificationSubscriptionConfig<?>> notificationSubscriptions = getConfig(NOTIFICATION_SUBSCRIPTIONS); final SetMultimap<List<?>, JmxOperationPollConfig<?>> operationPolls = getConfig(OPERATION_POLLS); http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/c45bab04/software/base/src/test/java/org/apache/brooklyn/entity/brooklynnode/BrooklynNodeIntegrationTest.java ---------------------------------------------------------------------- diff --git a/software/base/src/test/java/org/apache/brooklyn/entity/brooklynnode/BrooklynNodeIntegrationTest.java b/software/base/src/test/java/org/apache/brooklyn/entity/brooklynnode/BrooklynNodeIntegrationTest.java index 0092612..e73cf9f 100644 --- a/software/base/src/test/java/org/apache/brooklyn/entity/brooklynnode/BrooklynNodeIntegrationTest.java +++ b/software/base/src/test/java/org/apache/brooklyn/entity/brooklynnode/BrooklynNodeIntegrationTest.java @@ -155,7 +155,7 @@ public class BrooklynNodeIntegrationTest extends BrooklynAppUnitTestSupport { location: localhost services: -- type: brooklyn.entity.brooklynnode.BrooklynNode +- type: org.apache.brooklyn.entity.brooklynnode.BrooklynNode bindAddress: 127.0.0.1 onExistingProperties: do_not_use @@ -368,7 +368,7 @@ services: protected void waitForApps(final URI webConsoleUri, final int num) { waitForApps(webConsoleUri.toString()); - // e.g. [{"id":"UnBqPcqg","spec":{"name":"Application (UnBqPcqg)","type":"brooklyn.entity.basic.BasicApplication","locations":["pOL4NtiW"]},"status":"RUNNING","links":{"self":"/v1/applications/UnBqPcqg","entities":"/v1/applications/UnBqPcqg/entities"}}] + // e.g. [{"id":"UnBqPcqg","spec":{"name":"Application (UnBqPcqg)","type":"org.apache.brooklyn.entity.stock.BasicApplication","locations":["pOL4NtiW"]},"status":"RUNNING","links":{"self":"/v1/applications/UnBqPcqg","entities":"/v1/applications/UnBqPcqg/entities"}}] Asserts.succeedsEventually(new Runnable() { @Override public void run() { http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/c45bab04/usage/archetypes/quickstart/src/brooklyn-sample/src/main/java/com/acme/sample/brooklyn/sample/app/ClusterWebServerDatabaseSample.java ---------------------------------------------------------------------- diff --git a/usage/archetypes/quickstart/src/brooklyn-sample/src/main/java/com/acme/sample/brooklyn/sample/app/ClusterWebServerDatabaseSample.java b/usage/archetypes/quickstart/src/brooklyn-sample/src/main/java/com/acme/sample/brooklyn/sample/app/ClusterWebServerDatabaseSample.java index cd18511..bfbb464 100644 --- a/usage/archetypes/quickstart/src/brooklyn-sample/src/main/java/com/acme/sample/brooklyn/sample/app/ClusterWebServerDatabaseSample.java +++ b/usage/archetypes/quickstart/src/brooklyn-sample/src/main/java/com/acme/sample/brooklyn/sample/app/ClusterWebServerDatabaseSample.java @@ -1,41 +1,41 @@ package com.acme.sample.brooklyn.sample.app; -import static brooklyn.event.basic.DependentConfiguration.attributeWhenReady; -import static brooklyn.event.basic.DependentConfiguration.formatString; - import java.util.concurrent.TimeUnit; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - import org.apache.brooklyn.api.catalog.Catalog; import org.apache.brooklyn.api.catalog.CatalogConfig; +import org.apache.brooklyn.api.entity.EntitySpec; +import org.apache.brooklyn.api.sensor.AttributeSensor; import org.apache.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 org.apache.brooklyn.core.config.ConfigKeys; +import org.apache.brooklyn.entity.core.AbstractApplication; +import org.apache.brooklyn.entity.core.Entities; import org.apache.brooklyn.entity.database.DatastoreMixins.DatastoreCommon; import org.apache.brooklyn.entity.database.mysql.MySqlNode; -import brooklyn.entity.group.DynamicCluster; -import brooklyn.entity.java.JavaEntityMethods; -import org.apache.brooklyn.api.entity.proxying.EntitySpec; +import org.apache.brooklyn.entity.group.DynamicCluster; +import org.apache.brooklyn.entity.java.JavaEntityMethods; 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.api.event.AttributeSensor; -import brooklyn.event.basic.Sensors; -import org.apache.brooklyn.location.basic.PortRanges; +import org.apache.brooklyn.location.core.PortRanges; import org.apache.brooklyn.policy.autoscaling.AutoScalerPolicy; +import org.apache.brooklyn.policy.enricher.HttpLatencyDetector; +import org.apache.brooklyn.sensor.core.Sensors; +import org.apache.brooklyn.sensor.enricher.SensorPropagatingEnricher; +import org.apache.brooklyn.sensor.enricher.SensorTransformingEnricher; import org.apache.brooklyn.util.maven.MavenArtifact; import org.apache.brooklyn.util.maven.MavenRetriever; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import com.google.common.base.Functions; +import static org.apache.brooklyn.sensor.core.DependentConfiguration.attributeWhenReady; +import static org.apache.brooklyn.sensor.core.DependentConfiguration.formatString; + + /** This sample builds a 3-tier application with an elastic app-server cluster, * and it sets it up for use in the Brooklyn catalog. * <p> http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/c45bab04/usage/archetypes/quickstart/src/brooklyn-sample/src/main/java/com/acme/sample/brooklyn/sample/app/SingleWebServerSample.java ---------------------------------------------------------------------- diff --git a/usage/archetypes/quickstart/src/brooklyn-sample/src/main/java/com/acme/sample/brooklyn/sample/app/SingleWebServerSample.java b/usage/archetypes/quickstart/src/brooklyn-sample/src/main/java/com/acme/sample/brooklyn/sample/app/SingleWebServerSample.java index 4452bd6..46b1dff 100644 --- a/usage/archetypes/quickstart/src/brooklyn-sample/src/main/java/com/acme/sample/brooklyn/sample/app/SingleWebServerSample.java +++ b/usage/archetypes/quickstart/src/brooklyn-sample/src/main/java/com/acme/sample/brooklyn/sample/app/SingleWebServerSample.java @@ -1,16 +1,15 @@ package com.acme.sample.brooklyn.sample.app; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -import brooklyn.entity.basic.AbstractApplication; -import brooklyn.entity.basic.Attributes; -import org.apache.brooklyn.api.entity.proxying.EntitySpec; +import org.apache.brooklyn.api.entity.EntitySpec; +import org.apache.brooklyn.entity.core.AbstractApplication; +import org.apache.brooklyn.entity.core.Attributes; import org.apache.brooklyn.entity.webapp.JavaWebAppService; import org.apache.brooklyn.entity.webapp.jboss.JBoss7Server; -import org.apache.brooklyn.location.basic.PortRanges; +import org.apache.brooklyn.location.core.PortRanges; import org.apache.brooklyn.util.maven.MavenArtifact; import org.apache.brooklyn.util.maven.MavenRetriever; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** This example starts one web app on 8080. */ public class SingleWebServerSample extends AbstractApplication { http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/c45bab04/usage/archetypes/quickstart/src/brooklyn-sample/src/test/java/com/acme/sample/brooklyn/sample/app/SampleLocalhostIntegrationTest.java ---------------------------------------------------------------------- diff --git a/usage/archetypes/quickstart/src/brooklyn-sample/src/test/java/com/acme/sample/brooklyn/sample/app/SampleLocalhostIntegrationTest.java b/usage/archetypes/quickstart/src/brooklyn-sample/src/test/java/com/acme/sample/brooklyn/sample/app/SampleLocalhostIntegrationTest.java index 373a012..1122448 100644 --- a/usage/archetypes/quickstart/src/brooklyn-sample/src/test/java/com/acme/sample/brooklyn/sample/app/SampleLocalhostIntegrationTest.java +++ b/usage/archetypes/quickstart/src/brooklyn-sample/src/test/java/com/acme/sample/brooklyn/sample/app/SampleLocalhostIntegrationTest.java @@ -3,6 +3,15 @@ package com.acme.sample.brooklyn.sample.app; import java.util.Arrays; import java.util.Iterator; +import org.apache.brooklyn.api.entity.Entity; +import org.apache.brooklyn.api.entity.EntitySpec; +import org.apache.brooklyn.api.mgmt.ManagementContext; +import org.apache.brooklyn.core.mgmt.internal.LocalManagementContext; +import org.apache.brooklyn.entity.core.Entities; +import org.apache.brooklyn.entity.core.StartableApplication; +import org.apache.brooklyn.entity.webapp.JavaWebAppService; +import org.apache.brooklyn.util.core.ResourceUtils; +import org.apache.brooklyn.util.text.Strings; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.testng.Assert; @@ -10,16 +19,6 @@ import org.testng.annotations.AfterMethod; import org.testng.annotations.BeforeMethod; import org.testng.annotations.Test; -import org.apache.brooklyn.api.entity.Entity; -import brooklyn.entity.basic.Entities; -import brooklyn.entity.basic.StartableApplication; -import org.apache.brooklyn.api.entity.proxying.EntitySpec; -import org.apache.brooklyn.entity.webapp.JavaWebAppService; -import org.apache.brooklyn.api.management.ManagementContext; -import org.apache.brooklyn.core.management.internal.LocalManagementContext; -import org.apache.brooklyn.core.util.ResourceUtils; -import org.apache.brooklyn.util.text.Strings; - /** * Sample integration tests which show how to launch the sample applications on localhost, * make some assertions about them, and then destroy them. http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/c45bab04/usage/archetypes/quickstart/src/brooklyn-sample/src/test/java/com/acme/sample/brooklyn/sample/app/SampleUnitTest.java ---------------------------------------------------------------------- diff --git a/usage/archetypes/quickstart/src/brooklyn-sample/src/test/java/com/acme/sample/brooklyn/sample/app/SampleUnitTest.java b/usage/archetypes/quickstart/src/brooklyn-sample/src/test/java/com/acme/sample/brooklyn/sample/app/SampleUnitTest.java index 537b547..181d61f 100644 --- a/usage/archetypes/quickstart/src/brooklyn-sample/src/test/java/com/acme/sample/brooklyn/sample/app/SampleUnitTest.java +++ b/usage/archetypes/quickstart/src/brooklyn-sample/src/test/java/com/acme/sample/brooklyn/sample/app/SampleUnitTest.java @@ -1,5 +1,15 @@ package com.acme.sample.brooklyn.sample.app; +import org.apache.brooklyn.api.entity.Entity; +import org.apache.brooklyn.api.entity.EntitySpec; +import org.apache.brooklyn.api.mgmt.ManagementContext; +import org.apache.brooklyn.core.mgmt.internal.LocalManagementContext; +import org.apache.brooklyn.entity.core.Entities; +import org.apache.brooklyn.entity.core.StartableApplication; +import org.apache.brooklyn.entity.database.DatastoreMixins.DatastoreCommon; +import org.apache.brooklyn.entity.database.mysql.MySqlNode; +import org.apache.brooklyn.entity.webapp.JavaWebAppService; +import org.apache.brooklyn.entity.webapp.WebAppService; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.testng.Assert; @@ -7,17 +17,6 @@ import org.testng.annotations.AfterMethod; import org.testng.annotations.BeforeMethod; import org.testng.annotations.Test; -import org.apache.brooklyn.api.entity.Entity; -import brooklyn.entity.basic.Entities; -import brooklyn.entity.basic.StartableApplication; -import org.apache.brooklyn.entity.database.DatastoreMixins.DatastoreCommon; -import org.apache.brooklyn.entity.database.mysql.MySqlNode; -import org.apache.brooklyn.api.entity.proxying.EntitySpec; -import org.apache.brooklyn.entity.webapp.JavaWebAppService; -import org.apache.brooklyn.entity.webapp.WebAppService; -import org.apache.brooklyn.api.management.ManagementContext; -import org.apache.brooklyn.core.management.internal.LocalManagementContext; - import com.google.common.base.Predicates; import com.google.common.collect.Iterables; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/c45bab04/usage/dist/src/test/java/org/apache/brooklyn/cli/BaseCliIntegrationTest.java ---------------------------------------------------------------------- diff --git a/usage/dist/src/test/java/org/apache/brooklyn/cli/BaseCliIntegrationTest.java b/usage/dist/src/test/java/org/apache/brooklyn/cli/BaseCliIntegrationTest.java index 49b4d6d..0960c16 100644 --- a/usage/dist/src/test/java/org/apache/brooklyn/cli/BaseCliIntegrationTest.java +++ b/usage/dist/src/test/java/org/apache/brooklyn/cli/BaseCliIntegrationTest.java @@ -38,7 +38,7 @@ import java.util.concurrent.TimeoutException; import org.testng.annotations.AfterMethod; import org.testng.annotations.BeforeMethod; -import brooklyn.entity.basic.ApplicationBuilder; +import org.apache.brooklyn.entity.factory.ApplicationBuilder; import com.google.common.collect.Lists; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/c45bab04/usage/jsgui/src/test/javascript/specs/model/sensor-summary-spec.js ---------------------------------------------------------------------- diff --git a/usage/jsgui/src/test/javascript/specs/model/sensor-summary-spec.js b/usage/jsgui/src/test/javascript/specs/model/sensor-summary-spec.js index b1bd2fd..222df70 100644 --- a/usage/jsgui/src/test/javascript/specs/model/sensor-summary-spec.js +++ b/usage/jsgui/src/test/javascript/specs/model/sensor-summary-spec.js @@ -32,7 +32,7 @@ define(['model/sensor-summary'], function (SensorSummary) { expect(filteredSensors.length).toBe(1) var ourSensor = filteredSensors.pop() expect(ourSensor.get("name")).toBe('service.state') - expect(ourSensor.get("type")).toBe('org.apache.brooklyn.entity.software.base.Lifecycle') + expect(ourSensor.get("type")).toBe('org.apache.brooklyn.entity.lifecycle.Lifecycle') expect(ourSensor.get("description")).toBe('Service lifecycle state') expect(ourSensor.getLinkByName('self')).toBe('fixtures/service-state.json') expect(ourSensor.getLinkByName()).toBe(undefined) http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/c45bab04/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 e25e1fd..48600a3 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 @@ -161,7 +161,7 @@ public class BrooklynLauncherTest { public void testStartsAppFromYAML() throws Exception { String yaml = "name: example-app\n" + "services:\n" + - "- serviceType: org.apache.brooklyn.test.entity.TestEntity\n" + + "- serviceType: org.apache.brooklyn.core.test.entity.TestEntity\n" + " name: test-app"; launcher = newLauncherForTests(true) .webconsole(false) http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/c45bab04/usage/launcher/src/test/resources/rebind-test-catalog-additions.bom ---------------------------------------------------------------------- diff --git a/usage/launcher/src/test/resources/rebind-test-catalog-additions.bom b/usage/launcher/src/test/resources/rebind-test-catalog-additions.bom index 8c460c8..f4fa777 100644 --- a/usage/launcher/src/test/resources/rebind-test-catalog-additions.bom +++ b/usage/launcher/src/test/resources/rebind-test-catalog-additions.bom @@ -25,8 +25,8 @@ brooklyn.catalog: - id: three item: - type: brooklyn.entity.basic.EmptySoftwareProcess + type: org.apache.brooklyn.entity.software.base.EmptySoftwareProcess - id: four item: - type: brooklyn.entity.basic.VanillaSoftwareProcess \ No newline at end of file + type: org.apache.brooklyn.entity.software.base.VanillaSoftwareProcess \ No newline at end of file http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/c45bab04/usage/launcher/src/test/resources/rebind-test-catalog.bom ---------------------------------------------------------------------- diff --git a/usage/launcher/src/test/resources/rebind-test-catalog.bom b/usage/launcher/src/test/resources/rebind-test-catalog.bom index cb3b4dc..f19e4c4 100644 --- a/usage/launcher/src/test/resources/rebind-test-catalog.bom +++ b/usage/launcher/src/test/resources/rebind-test-catalog.bom @@ -25,8 +25,8 @@ brooklyn.catalog: - id: one item: - type: brooklyn.entity.basic.EmptySoftwareProcess + type: org.apache.brooklyn.entity.software.base.EmptySoftwareProcess - id: two item: - type: brooklyn.entity.basic.VanillaSoftwareProcess \ No newline at end of file + type: org.apache.brooklyn.entity.software.base.VanillaSoftwareProcess \ No newline at end of file http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/c45bab04/usage/rest-api/src/test/resources/fixtures/catalog-application-list.json ---------------------------------------------------------------------- diff --git a/usage/rest-api/src/test/resources/fixtures/catalog-application-list.json b/usage/rest-api/src/test/resources/fixtures/catalog-application-list.json index 68314f0..c4757be 100644 --- a/usage/rest-api/src/test/resources/fixtures/catalog-application-list.json +++ b/usage/rest-api/src/test/resources/fixtures/catalog-application-list.json @@ -5,7 +5,7 @@ "name": "My example application", "version": "1.1", "description": "My awesome example application, as a catalog item", - "planYaml": "services:\n- type: brooklyn.entity.basic.VanillaSoftwareProcess\n launch.command: echo \"Launch application\"\n checkRunning.command: echo \"Check running application\"", + "planYaml": "services:\n- type: org.apache.brooklyn.entity.software.base.VanillaSoftwareProcess\n launch.command: echo \"Launch application\"\n checkRunning.command: echo \"Check running application\"", "iconUrl": "http://my.example.com/icon.png"; }, { @@ -14,7 +14,7 @@ "name": "My example application", "version": "2.0", "description": "My awesome example application, as a catalog item", - "planYaml": "services:\n- type: brooklyn.entity.basic.VanillaSoftwareProcess\n launch.command: echo \"Launch application\"\n checkRunning.command: echo \"Check running application\"", + "planYaml": "services:\n- type: org.apache.brooklyn.entity.software.base.VanillaSoftwareProcess\n launch.command: echo \"Launch application\"\n checkRunning.command: echo \"Check running application\"", "iconUrl": "http://my.example.com/icon.png"; }, { @@ -23,7 +23,7 @@ "name": "Another example application", "version": "1.0", "description": "Another awesome example application, as a catalog item", - "planYaml": "services:\n- type: brooklyn.entity.basic.VanillaSoftwareProcess\n launch.command: echo \"Launch other application\"\n checkRunning.command: echo \"Check running other application\"", + "planYaml": "services:\n- type: org.apache.brooklyn.entity.software.base.VanillaSoftwareProcess\n launch.command: echo \"Launch other application\"\n checkRunning.command: echo \"Check running other application\"", "iconUrl": "http://my.other.example.com/icon.png"; } ] \ No newline at end of file http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/c45bab04/usage/rest-api/src/test/resources/fixtures/catalog-application.json ---------------------------------------------------------------------- diff --git a/usage/rest-api/src/test/resources/fixtures/catalog-application.json b/usage/rest-api/src/test/resources/fixtures/catalog-application.json index 2a3ed8d..7c72270 100644 --- a/usage/rest-api/src/test/resources/fixtures/catalog-application.json +++ b/usage/rest-api/src/test/resources/fixtures/catalog-application.json @@ -4,6 +4,6 @@ "name": "My example application", "version": "1.1", "description": "My awesome example application, as a catalog item", - "planYaml": "services:\n- type: brooklyn.entity.basic.VanillaSoftwareProcess\n launch.command: echo \"Launch application\"\n checkRunning.command: echo \"Check running application\"", + "planYaml": "services:\n- type: org.apache.brooklyn.entity.software.base.VanillaSoftwareProcess\n launch.command: echo \"Launch application\"\n checkRunning.command: echo \"Check running application\"", "iconUrl": "http://my.example.com/icon.png"; } \ No newline at end of file http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/c45bab04/usage/rest-api/src/test/resources/fixtures/sensor-summary-list.json ---------------------------------------------------------------------- diff --git a/usage/rest-api/src/test/resources/fixtures/sensor-summary-list.json b/usage/rest-api/src/test/resources/fixtures/sensor-summary-list.json index 112b89c..6ab457b 100644 --- a/usage/rest-api/src/test/resources/fixtures/sensor-summary-list.json +++ b/usage/rest-api/src/test/resources/fixtures/sensor-summary-list.json @@ -1,7 +1,7 @@ [ { "name":"service.state", - "type":"brooklyn.entity.basic.Lifecycle", + "type":"org.apache.brooklyn.entity.lifecycle.Lifecycle", "description":"Service lifecycle state", "links":{ "self":"fixtures/service-state.json", http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/c45bab04/usage/rest-server/src/main/resources/reset-catalog.xml ---------------------------------------------------------------------- diff --git a/usage/rest-server/src/main/resources/reset-catalog.xml b/usage/rest-server/src/main/resources/reset-catalog.xml index 5e6d0f8..adef40a 100644 --- a/usage/rest-server/src/main/resources/reset-catalog.xml +++ b/usage/rest-server/src/main/resources/reset-catalog.xml @@ -20,15 +20,15 @@ <catalog> <name>Brooklyn Demos</name> - <template type="org.apache.brooklyn.entity.software.base.BasicApplication" name="Basic application" /> - <template type="brooklyn.osgi.tests.SimpleApplication" name="Simple OSGi application"> + <template type="org.apache.brooklyn.entity.stock.BasicApplication" name="Basic application" /> + <template type="org.apache.brooklyn.test.osgi.entities.SimpleApplication" name="Simple OSGi application"> <libraries> <bundle>${bundle-location}</bundle> </libraries> </template> <catalog> <name>Nested catalog</name> - <template type="brooklyn.osgi.tests.SimpleApplication" name="Simple OSGi application"> + <template type="org.apache.brooklyn.test.osgi.entities.SimpleApplication" name="Simple OSGi application"> <libraries> <bundle>${bundle-location}</bundle> </libraries> http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/c45bab04/usage/rest-server/src/test/java/org/apache/brooklyn/rest/resources/CatalogResetTest.java ---------------------------------------------------------------------- diff --git a/usage/rest-server/src/test/java/org/apache/brooklyn/rest/resources/CatalogResetTest.java b/usage/rest-server/src/test/java/org/apache/brooklyn/rest/resources/CatalogResetTest.java index e3d20db..6adfdb5 100644 --- a/usage/rest-server/src/test/java/org/apache/brooklyn/rest/resources/CatalogResetTest.java +++ b/usage/rest-server/src/test/java/org/apache/brooklyn/rest/resources/CatalogResetTest.java @@ -105,8 +105,8 @@ public class CatalogResetTest extends BrooklynRestResourceTest { private void assertItems() { BrooklynCatalog catalog = getManagementContext().getCatalog(); - assertNotNull(catalog.getCatalogItem("brooklyn.entity.basic.BasicApplication", BrooklynCatalog.DEFAULT_VERSION)); - assertNotNull(catalog.getCatalogItem("brooklyn.osgi.tests.SimpleApplication", BrooklynCatalog.DEFAULT_VERSION)); + assertNotNull(catalog.getCatalogItem("org.apache.brooklyn.entity.stock.BasicApplication", BrooklynCatalog.DEFAULT_VERSION)); + assertNotNull(catalog.getCatalogItem("org.apache.brooklyn.test.osgi.entities.SimpleApplication", BrooklynCatalog.DEFAULT_VERSION)); } } http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/c45bab04/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 4bee445..b38c87d 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 @@ -87,13 +87,13 @@ public class CatalogResourceTest extends BrooklynRestResourceTest { " id: " + symbolicName + "\n"+ " name: My Catalog App\n"+ " description: My description\n"+ - " icon_url: classpath:/brooklyn/osgi/tests/icon.gif\n"+ + " icon_url: classpath:/org/apache/brooklyn/test/osgi/entities/icon.gif\n"+ " version: " + TEST_VERSION + "\n"+ " libraries:\n"+ " - url: " + bundleUrl + "\n"+ "\n"+ "services:\n"+ - "- type: org.apache.brooklyn.test.entity.TestEntity\n"; + "- type: org.apache.brooklyn.core.test.entity.TestEntity\n"; ClientResponse response = client().resource("/v1/catalog") .post(ClientResponse.class, yaml); @@ -104,7 +104,7 @@ public class CatalogResourceTest extends BrooklynRestResourceTest { .get(CatalogEntitySummary.class); Assert.assertNotNull(entityItem.getPlanYaml()); - Assert.assertTrue(entityItem.getPlanYaml().contains("org.apache.brooklyn.test.entity.TestEntity")); + Assert.assertTrue(entityItem.getPlanYaml().contains("org.apache.brooklyn.core.test.entity.TestEntity")); assertEquals(entityItem.getId(), ver(symbolicName)); assertEquals(entityItem.getSymbolicName(), symbolicName); @@ -121,7 +121,7 @@ public class CatalogResourceTest extends BrooklynRestResourceTest { assertEquals(entityItem.getName(), "My Catalog App"); assertEquals(entityItem.getDescription(), "My description"); assertEquals(entityItem.getIconUrl(), "/v1/catalog/icon/" + symbolicName + "/" + entityItem.getVersion()); - assertEquals(item.getIconUrl(), "classpath:/brooklyn/osgi/tests/icon.gif"); + assertEquals(item.getIconUrl(), "classpath:/org/apache/brooklyn/test/osgi/entities/icon.gif"); byte[] iconData = client().resource("/v1/catalog/icon/" + symbolicName + "/" + TEST_VERSION).get(byte[].class); assertEquals(iconData.length, 43); @@ -132,7 +132,7 @@ public class CatalogResourceTest extends BrooklynRestResourceTest { TestResourceUnavailableException.throwIfResourceUnavailable(getClass(), OsgiStandaloneTest.BROOKLYN_TEST_OSGI_ENTITIES_PATH); String symbolicName = "my.catalog.policy.id"; - String policyType = "brooklyn.osgi.tests.SimplePolicy"; + String policyType = "org.apache.brooklyn.test.osgi.entities.SimplePolicy"; String bundleUrl = OsgiStandaloneTest.BROOKLYN_TEST_OSGI_ENTITIES_URL; String yaml = @@ -335,7 +335,7 @@ public class CatalogResourceTest extends BrooklynRestResourceTest { " version: " + TEST_VERSION + "\n"+ "\n"+ "services:\n"+ - "- type: org.apache.brooklyn.test.entity.TestEntity\n"; + "- type: org.apache.brooklyn.core.test.entity.TestEntity\n"; client().resource("/v1/catalog") .post(ClientResponse.class, yaml); @@ -353,7 +353,7 @@ public class CatalogResourceTest extends BrooklynRestResourceTest { @Test public void testSetDeprecated() { String itemId = "my.catalog.item.id.for.deprecation"; - String serviceType = "brooklyn.entity.basic.BasicApplication"; + String serviceType = "org.apache.brooklyn.entity.stock.BasicApplication"; addTestCatalogItem(itemId, "template", TEST_VERSION, serviceType); addTestCatalogItem(itemId, "template", "2.0", serviceType); List<CatalogEntitySummary> applications = client().resource("/v1/catalog/applications") @@ -411,13 +411,13 @@ public class CatalogResourceTest extends BrooklynRestResourceTest { " id: " + symbolicName + "\n"+ " name: My Catalog App\n"+ " description: My description\n"+ - " icon_url: classpath:/brooklyn/osgi/tests/icon.gif\n"+ + " icon_url: classpath:/org/apache/brooklyn/test/osgi/entities/icon.gif\n"+ " version: " + TEST_VERSION + "\n"+ " libraries:\n"+ " - url: " + bundleUrl + "\n"+ "\n"+ "services:\n"+ - "- type: org.apache.brooklyn.test.entity.TestEntity\n"; + "- type: org.apache.brooklyn.core.test.entity.TestEntity\n"; ClientResponse response = client().resource("/v1/catalog") .post(ClientResponse.class, yaml); http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/c45bab04/utils/test-bundles/more-entities-v1/src/main/java/org/apache/brooklyn/test/osgi/entities/more/MoreEntity.java ---------------------------------------------------------------------- diff --git a/utils/test-bundles/more-entities-v1/src/main/java/org/apache/brooklyn/test/osgi/entities/more/MoreEntity.java b/utils/test-bundles/more-entities-v1/src/main/java/org/apache/brooklyn/test/osgi/entities/more/MoreEntity.java index c5a7483..81c6966 100644 --- a/utils/test-bundles/more-entities-v1/src/main/java/org/apache/brooklyn/test/osgi/entities/more/MoreEntity.java +++ b/utils/test-bundles/more-entities-v1/src/main/java/org/apache/brooklyn/test/osgi/entities/more/MoreEntity.java @@ -18,7 +18,6 @@ */ package org.apache.brooklyn.test.osgi.entities.more; - import org.apache.brooklyn.api.effector.Effector; import org.apache.brooklyn.api.entity.Entity; import org.apache.brooklyn.api.entity.ImplementedBy; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/c45bab04/utils/test-bundles/more-entities-v1/src/main/java/org/apache/brooklyn/test/osgi/entities/more/MoreEntityImpl.java ---------------------------------------------------------------------- diff --git a/utils/test-bundles/more-entities-v1/src/main/java/org/apache/brooklyn/test/osgi/entities/more/MoreEntityImpl.java b/utils/test-bundles/more-entities-v1/src/main/java/org/apache/brooklyn/test/osgi/entities/more/MoreEntityImpl.java index 8c82acf..17919d4 100644 --- a/utils/test-bundles/more-entities-v1/src/main/java/org/apache/brooklyn/test/osgi/entities/more/MoreEntityImpl.java +++ b/utils/test-bundles/more-entities-v1/src/main/java/org/apache/brooklyn/test/osgi/entities/more/MoreEntityImpl.java @@ -22,7 +22,6 @@ import org.apache.brooklyn.effector.core.EffectorBody; import org.apache.brooklyn.entity.core.AbstractEntity; import org.apache.brooklyn.util.core.config.ConfigBag; - public class MoreEntityImpl extends AbstractEntity implements MoreEntity { @Override http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/c45bab04/utils/test-bundles/more-entities-v1/src/main/java/org/apache/brooklyn/test/osgi/entities/more/MoreLocation.java ---------------------------------------------------------------------- diff --git a/utils/test-bundles/more-entities-v1/src/main/java/org/apache/brooklyn/test/osgi/entities/more/MoreLocation.java b/utils/test-bundles/more-entities-v1/src/main/java/org/apache/brooklyn/test/osgi/entities/more/MoreLocation.java index 14c884d..5ab0abf 100644 --- a/utils/test-bundles/more-entities-v1/src/main/java/org/apache/brooklyn/test/osgi/entities/more/MoreLocation.java +++ b/utils/test-bundles/more-entities-v1/src/main/java/org/apache/brooklyn/test/osgi/entities/more/MoreLocation.java @@ -18,7 +18,6 @@ */ package org.apache.brooklyn.test.osgi.entities.more; - import org.apache.brooklyn.location.core.AbstractLocation; public class MoreLocation extends AbstractLocation { http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/c45bab04/utils/test-bundles/more-entities-v1/src/main/java/org/apache/brooklyn/test/osgi/entities/more/MorePolicy.java ---------------------------------------------------------------------- diff --git a/utils/test-bundles/more-entities-v1/src/main/java/org/apache/brooklyn/test/osgi/entities/more/MorePolicy.java b/utils/test-bundles/more-entities-v1/src/main/java/org/apache/brooklyn/test/osgi/entities/more/MorePolicy.java index 08c7441..84e5a63 100644 --- a/utils/test-bundles/more-entities-v1/src/main/java/org/apache/brooklyn/test/osgi/entities/more/MorePolicy.java +++ b/utils/test-bundles/more-entities-v1/src/main/java/org/apache/brooklyn/test/osgi/entities/more/MorePolicy.java @@ -18,8 +18,6 @@ */ package org.apache.brooklyn.test.osgi.entities.more; - -import org.apache.brooklyn.api.catalog.Catalog; import org.apache.brooklyn.policy.core.AbstractPolicy; public class MorePolicy extends AbstractPolicy { http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/c45bab04/utils/test-bundles/more-entities-v1/src/main/java/org/apache/brooklyn/test/osgi/entities/more/MoreTemplate.java ---------------------------------------------------------------------- diff --git a/utils/test-bundles/more-entities-v1/src/main/java/org/apache/brooklyn/test/osgi/entities/more/MoreTemplate.java b/utils/test-bundles/more-entities-v1/src/main/java/org/apache/brooklyn/test/osgi/entities/more/MoreTemplate.java index f27b79b..7e2aa08 100644 --- a/utils/test-bundles/more-entities-v1/src/main/java/org/apache/brooklyn/test/osgi/entities/more/MoreTemplate.java +++ b/utils/test-bundles/more-entities-v1/src/main/java/org/apache/brooklyn/test/osgi/entities/more/MoreTemplate.java @@ -18,12 +18,6 @@ */ package org.apache.brooklyn.test.osgi.entities.more; - -import org.apache.brooklyn.api.effector.Effector; -import org.apache.brooklyn.api.entity.Application; -import org.apache.brooklyn.api.entity.Entity; -import org.apache.brooklyn.api.entity.ImplementedBy; -import org.apache.brooklyn.effector.core.Effectors; import org.apache.brooklyn.entity.core.AbstractApplication; public class MoreTemplate extends AbstractApplication { http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/c45bab04/utils/test-bundles/more-entities-v2-evil-twin/src/main/java/org/apache/brooklyn/test/osgi/entities/more/MoreEntity.java ---------------------------------------------------------------------- diff --git a/utils/test-bundles/more-entities-v2-evil-twin/src/main/java/org/apache/brooklyn/test/osgi/entities/more/MoreEntity.java b/utils/test-bundles/more-entities-v2-evil-twin/src/main/java/org/apache/brooklyn/test/osgi/entities/more/MoreEntity.java index cf8b58d..8a75e9a 100644 --- a/utils/test-bundles/more-entities-v2-evil-twin/src/main/java/org/apache/brooklyn/test/osgi/entities/more/MoreEntity.java +++ b/utils/test-bundles/more-entities-v2-evil-twin/src/main/java/org/apache/brooklyn/test/osgi/entities/more/MoreEntity.java @@ -18,10 +18,10 @@ */ package org.apache.brooklyn.test.osgi.entities.more; -import org.apache.brooklyn.api.entity.Effector; +import org.apache.brooklyn.api.effector.Effector; import org.apache.brooklyn.api.entity.Entity; -import brooklyn.entity.effector.Effectors; -import org.apache.brooklyn.api.entity.proxying.ImplementedBy; +import org.apache.brooklyn.api.entity.ImplementedBy; +import org.apache.brooklyn.effector.core.Effectors; @ImplementedBy(MoreEntityImpl.class) public interface MoreEntity extends Entity { http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/c45bab04/utils/test-bundles/more-entities-v2-evil-twin/src/main/java/org/apache/brooklyn/test/osgi/entities/more/MoreEntityImpl.java ---------------------------------------------------------------------- diff --git a/utils/test-bundles/more-entities-v2-evil-twin/src/main/java/org/apache/brooklyn/test/osgi/entities/more/MoreEntityImpl.java b/utils/test-bundles/more-entities-v2-evil-twin/src/main/java/org/apache/brooklyn/test/osgi/entities/more/MoreEntityImpl.java index acf33d3..3ebe518 100644 --- a/utils/test-bundles/more-entities-v2-evil-twin/src/main/java/org/apache/brooklyn/test/osgi/entities/more/MoreEntityImpl.java +++ b/utils/test-bundles/more-entities-v2-evil-twin/src/main/java/org/apache/brooklyn/test/osgi/entities/more/MoreEntityImpl.java @@ -18,11 +18,10 @@ */ package org.apache.brooklyn.test.osgi.entities.more; -import brooklyn.entity.basic.AbstractEntity; -import brooklyn.entity.effector.EffectorBody; import org.apache.brooklyn.api.policy.PolicySpec; -import org.apache.brooklyn.core.util.config.ConfigBag; - +import org.apache.brooklyn.effector.core.EffectorBody; +import org.apache.brooklyn.entity.core.AbstractEntity; +import org.apache.brooklyn.util.core.config.ConfigBag; public class MoreEntityImpl extends AbstractEntity implements MoreEntity { http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/c45bab04/utils/test-bundles/more-entities-v2/src/main/java/org/apache/brooklyn/test/osgi/entities/more/MoreEntity.java ---------------------------------------------------------------------- diff --git a/utils/test-bundles/more-entities-v2/src/main/java/org/apache/brooklyn/test/osgi/entities/more/MoreEntity.java b/utils/test-bundles/more-entities-v2/src/main/java/org/apache/brooklyn/test/osgi/entities/more/MoreEntity.java index 18a2b8f..edd650b 100644 --- a/utils/test-bundles/more-entities-v2/src/main/java/org/apache/brooklyn/test/osgi/entities/more/MoreEntity.java +++ b/utils/test-bundles/more-entities-v2/src/main/java/org/apache/brooklyn/test/osgi/entities/more/MoreEntity.java @@ -19,10 +19,10 @@ package org.apache.brooklyn.test.osgi.entities.more; import org.apache.brooklyn.api.catalog.Catalog; -import org.apache.brooklyn.api.entity.Effector; +import org.apache.brooklyn.api.effector.Effector; import org.apache.brooklyn.api.entity.Entity; -import brooklyn.entity.effector.Effectors; -import org.apache.brooklyn.api.entity.proxying.ImplementedBy; +import org.apache.brooklyn.api.entity.ImplementedBy; +import org.apache.brooklyn.effector.core.Effectors; @Catalog(name="More Entity v2") @ImplementedBy(MoreEntityImpl.class) http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/c45bab04/utils/test-bundles/more-entities-v2/src/main/java/org/apache/brooklyn/test/osgi/entities/more/MoreEntityImpl.java ---------------------------------------------------------------------- diff --git a/utils/test-bundles/more-entities-v2/src/main/java/org/apache/brooklyn/test/osgi/entities/more/MoreEntityImpl.java b/utils/test-bundles/more-entities-v2/src/main/java/org/apache/brooklyn/test/osgi/entities/more/MoreEntityImpl.java index 0f021b4..36b421f 100644 --- a/utils/test-bundles/more-entities-v2/src/main/java/org/apache/brooklyn/test/osgi/entities/more/MoreEntityImpl.java +++ b/utils/test-bundles/more-entities-v2/src/main/java/org/apache/brooklyn/test/osgi/entities/more/MoreEntityImpl.java @@ -18,11 +18,10 @@ */ package org.apache.brooklyn.test.osgi.entities.more; -import brooklyn.entity.basic.AbstractEntity; -import brooklyn.entity.effector.EffectorBody; import org.apache.brooklyn.api.policy.PolicySpec; -import org.apache.brooklyn.core.util.config.ConfigBag; - +import org.apache.brooklyn.effector.core.EffectorBody; +import org.apache.brooklyn.entity.core.AbstractEntity; +import org.apache.brooklyn.util.core.config.ConfigBag; public class MoreEntityImpl extends AbstractEntity implements MoreEntity { http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/c45bab04/utils/test-bundles/more-entities-v2/src/main/java/org/apache/brooklyn/test/osgi/entities/more/MoreLocation.java ---------------------------------------------------------------------- diff --git a/utils/test-bundles/more-entities-v2/src/main/java/org/apache/brooklyn/test/osgi/entities/more/MoreLocation.java b/utils/test-bundles/more-entities-v2/src/main/java/org/apache/brooklyn/test/osgi/entities/more/MoreLocation.java index 34e8232..51de347 100644 --- a/utils/test-bundles/more-entities-v2/src/main/java/org/apache/brooklyn/test/osgi/entities/more/MoreLocation.java +++ b/utils/test-bundles/more-entities-v2/src/main/java/org/apache/brooklyn/test/osgi/entities/more/MoreLocation.java @@ -19,7 +19,7 @@ package org.apache.brooklyn.test.osgi.entities.more; import org.apache.brooklyn.api.catalog.Catalog; -import org.apache.brooklyn.location.basic.AbstractLocation; +import org.apache.brooklyn.location.core.AbstractLocation; @Catalog(name="More Location", description="Cataliog item OSGi test location") public class MoreLocation extends AbstractLocation { http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/c45bab04/utils/test-bundles/more-entities-v2/src/main/java/org/apache/brooklyn/test/osgi/entities/more/MorePolicy.java ---------------------------------------------------------------------- diff --git a/utils/test-bundles/more-entities-v2/src/main/java/org/apache/brooklyn/test/osgi/entities/more/MorePolicy.java b/utils/test-bundles/more-entities-v2/src/main/java/org/apache/brooklyn/test/osgi/entities/more/MorePolicy.java index f1c6cb9..f7d7f2d 100644 --- a/utils/test-bundles/more-entities-v2/src/main/java/org/apache/brooklyn/test/osgi/entities/more/MorePolicy.java +++ b/utils/test-bundles/more-entities-v2/src/main/java/org/apache/brooklyn/test/osgi/entities/more/MorePolicy.java @@ -19,7 +19,7 @@ package org.apache.brooklyn.test.osgi.entities.more; import org.apache.brooklyn.api.catalog.Catalog; -import org.apache.brooklyn.core.policy.basic.AbstractPolicy; +import org.apache.brooklyn.policy.core.AbstractPolicy; @Catalog(name="More Policy", description="Cataliog item OSGi test policy") public class MorePolicy extends AbstractPolicy { http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/c45bab04/utils/test-bundles/more-entities-v2/src/main/java/org/apache/brooklyn/test/osgi/entities/more/MoreTemplate.java ---------------------------------------------------------------------- diff --git a/utils/test-bundles/more-entities-v2/src/main/java/org/apache/brooklyn/test/osgi/entities/more/MoreTemplate.java b/utils/test-bundles/more-entities-v2/src/main/java/org/apache/brooklyn/test/osgi/entities/more/MoreTemplate.java index 0dfb0fd..03a7c1c 100644 --- a/utils/test-bundles/more-entities-v2/src/main/java/org/apache/brooklyn/test/osgi/entities/more/MoreTemplate.java +++ b/utils/test-bundles/more-entities-v2/src/main/java/org/apache/brooklyn/test/osgi/entities/more/MoreTemplate.java @@ -19,12 +19,7 @@ package org.apache.brooklyn.test.osgi.entities.more; import org.apache.brooklyn.api.catalog.Catalog; -import org.apache.brooklyn.api.entity.Application; -import org.apache.brooklyn.api.entity.Effector; -import org.apache.brooklyn.api.entity.Entity; -import brooklyn.entity.basic.AbstractApplication; -import brooklyn.entity.effector.Effectors; -import org.apache.brooklyn.api.entity.proxying.ImplementedBy; +import org.apache.brooklyn.entity.core.AbstractApplication; @Catalog(name="More Template", description="Cataliog item OSGi test template") public class MoreTemplate extends AbstractApplication {
![http://my.example.com/icon.png"](http://my.example.com/icon.png"){kind=link}
![http://my.other.example.com/icon.png"](http://my.other.example.com/icon.png"){kind=link}