Repository: incubator-brooklyn Updated Branches: refs/heads/master ce5ddaf2a -> 1811c4b08
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/64c2b2e5/usage/camp/src/test/java/org/apache/brooklyn/camp/brooklyn/ByonLocationsYamlTest.java ---------------------------------------------------------------------- diff --git a/usage/camp/src/test/java/org/apache/brooklyn/camp/brooklyn/ByonLocationsYamlTest.java b/usage/camp/src/test/java/org/apache/brooklyn/camp/brooklyn/ByonLocationsYamlTest.java index c3d17f8..431fec1 100644 --- a/usage/camp/src/test/java/org/apache/brooklyn/camp/brooklyn/ByonLocationsYamlTest.java +++ b/usage/camp/src/test/java/org/apache/brooklyn/camp/brooklyn/ByonLocationsYamlTest.java @@ -29,6 +29,7 @@ import org.apache.brooklyn.api.entity.Entity; import org.apache.brooklyn.api.location.MachineLocation; import org.apache.brooklyn.core.config.ConfigKeys; import org.apache.brooklyn.entity.core.Entities; +import org.apache.brooklyn.entity.software.base.DoNothingSoftwareProcess; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.testng.annotations.Test; @@ -41,8 +42,6 @@ import com.google.common.collect.ImmutableSet; import com.google.common.collect.Iterables; import com.google.common.net.HostAndPort; -import brooklyn.entity.basic.DoNothingSoftwareProcess; - import org.apache.brooklyn.location.access.PortForwardManager; import org.apache.brooklyn.location.basic.FixedListMachineProvisioningLocation; import org.apache.brooklyn.location.basic.LocationPredicates; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/64c2b2e5/usage/camp/src/test/java/org/apache/brooklyn/camp/brooklyn/EmptySoftwareProcessYamlTest.java ---------------------------------------------------------------------- diff --git a/usage/camp/src/test/java/org/apache/brooklyn/camp/brooklyn/EmptySoftwareProcessYamlTest.java b/usage/camp/src/test/java/org/apache/brooklyn/camp/brooklyn/EmptySoftwareProcessYamlTest.java index a6a4411..19ac3a2 100644 --- a/usage/camp/src/test/java/org/apache/brooklyn/camp/brooklyn/EmptySoftwareProcessYamlTest.java +++ b/usage/camp/src/test/java/org/apache/brooklyn/camp/brooklyn/EmptySoftwareProcessYamlTest.java @@ -24,13 +24,11 @@ import java.util.Map; import org.apache.brooklyn.api.entity.Entity; import org.apache.brooklyn.api.location.Location; import org.apache.brooklyn.entity.core.Entities; +import org.apache.brooklyn.entity.software.base.EmptySoftwareProcess; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.testng.Assert; import org.testng.annotations.Test; - -import brooklyn.entity.basic.EmptySoftwareProcess; - import org.apache.brooklyn.location.basic.SshMachineLocation; import org.apache.brooklyn.util.collections.Jsonya; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/64c2b2e5/usage/camp/src/test/java/org/apache/brooklyn/camp/brooklyn/EntitiesYamlTest.java ---------------------------------------------------------------------- diff --git a/usage/camp/src/test/java/org/apache/brooklyn/camp/brooklyn/EntitiesYamlTest.java b/usage/camp/src/test/java/org/apache/brooklyn/camp/brooklyn/EntitiesYamlTest.java index 423b576..c82418c 100644 --- a/usage/camp/src/test/java/org/apache/brooklyn/camp/brooklyn/EntitiesYamlTest.java +++ b/usage/camp/src/test/java/org/apache/brooklyn/camp/brooklyn/EntitiesYamlTest.java @@ -52,6 +52,7 @@ import org.apache.brooklyn.entity.core.EntityInternal; import org.apache.brooklyn.entity.core.EntityPredicates; import org.apache.brooklyn.entity.group.DynamicCluster; import org.apache.brooklyn.entity.lifecycle.Lifecycle; +import org.apache.brooklyn.entity.software.base.SameServerEntity; import org.apache.brooklyn.entity.stock.BasicEntity; import org.apache.brooklyn.sensor.core.Sensors; import org.apache.brooklyn.util.collections.MutableMap; @@ -66,8 +67,6 @@ import org.testng.Assert; import org.testng.annotations.Test; import org.testng.collections.Lists; -import brooklyn.entity.basic.SameServerEntity; - import com.google.common.base.Suppliers; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/64c2b2e5/usage/camp/src/test/resources/same-server-entity-test.yaml ---------------------------------------------------------------------- diff --git a/usage/camp/src/test/resources/same-server-entity-test.yaml b/usage/camp/src/test/resources/same-server-entity-test.yaml index da327f1..9e9a768 100644 --- a/usage/camp/src/test/resources/same-server-entity-test.yaml +++ b/usage/camp/src/test/resources/same-server-entity-test.yaml @@ -19,7 +19,7 @@ name: SameServerEntityYamlTest location: localhost services: -- serviceType: brooklyn.entity.basic.SameServerEntity +- serviceType: org.apache.brooklyn.entity.software.base.SameServerEntity name: Entities brooklyn.children: - serviceType: org.apache.brooklyn.entity.stock.BasicEntity http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/64c2b2e5/usage/cli/src/main/java/org/apache/brooklyn/cli/lister/ClassFinder.java ---------------------------------------------------------------------- diff --git a/usage/cli/src/main/java/org/apache/brooklyn/cli/lister/ClassFinder.java b/usage/cli/src/main/java/org/apache/brooklyn/cli/lister/ClassFinder.java index 485b10b..99a4263 100644 --- a/usage/cli/src/main/java/org/apache/brooklyn/cli/lister/ClassFinder.java +++ b/usage/cli/src/main/java/org/apache/brooklyn/cli/lister/ClassFinder.java @@ -33,6 +33,7 @@ import org.apache.brooklyn.api.policy.Policy; import org.apache.brooklyn.api.sensor.Enricher; import org.apache.brooklyn.entity.core.AbstractApplication; import org.apache.brooklyn.entity.core.AbstractEntity; +import org.apache.brooklyn.entity.software.base.SoftwareProcessImpl; import org.apache.brooklyn.policy.core.AbstractPolicy; import org.apache.brooklyn.sensor.enricher.AbstractEnricher; import org.apache.brooklyn.util.core.ResourceUtils; @@ -47,8 +48,6 @@ import org.reflections.util.ConfigurationBuilder; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import brooklyn.entity.basic.SoftwareProcessImpl; - import com.google.common.annotations.Beta; import com.google.common.base.Predicate; import com.google.common.collect.ImmutableList; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/64c2b2e5/usage/jsgui/src/main/webapp/assets/js/view/script-groovy.js ---------------------------------------------------------------------- diff --git a/usage/jsgui/src/main/webapp/assets/js/view/script-groovy.js b/usage/jsgui/src/main/webapp/assets/js/view/script-groovy.js index 80ecb8f..045e4f1 100644 --- a/usage/jsgui/src/main/webapp/assets/js/view/script-groovy.js +++ b/usage/jsgui/src/main/webapp/assets/js/view/script-groovy.js @@ -51,7 +51,7 @@ define([ }, loadExample: function() { $(".input textarea").val( - 'import static brooklyn.entity.basic.Entities.*\n'+ + 'import static org.apache.brooklyn.entity.software.base.Entities.*\n'+ '\n'+ 'println "Last result: "+last\n'+ 'data.exampleRunCount = (data.exampleRunCount ?: 0) + 1\n'+ http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/64c2b2e5/usage/jsgui/src/test/javascript/specs/model/catalog-application-spec.js ---------------------------------------------------------------------- diff --git a/usage/jsgui/src/test/javascript/specs/model/catalog-application-spec.js b/usage/jsgui/src/test/javascript/specs/model/catalog-application-spec.js index df2bb94..d6a1c27 100644 --- a/usage/jsgui/src/test/javascript/specs/model/catalog-application-spec.js +++ b/usage/jsgui/src/test/javascript/specs/model/catalog-application-spec.js @@ -30,7 +30,7 @@ define([ expect(catalogApplication.get('name')).toEqual('My example application') expect(catalogApplication.get('version')).toEqual('1.1') expect(catalogApplication.get('description')).toEqual('My awesome example application, as a catalog item') - expect(catalogApplication.get('planYaml')).toEqual('services:\n- type: brooklyn.entity.basic.VanillaSoftwareProcess\n launch.command: echo \"Launch application\"\n checkRunning.command: echo \"Check running application\"') + expect(catalogApplication.get('planYaml')).toEqual('services:\n- type: org.apache.brooklyn.entity.software.base.VanillaSoftwareProcess\n launch.command: echo \"Launch application\"\n checkRunning.command: echo \"Check running application\"') expect(catalogApplication.get('iconUrl')).toEqual('http://my.example.com/icon.png') }) }) @@ -54,7 +54,7 @@ define([ expect(catalogApplication1.get('name')).toEqual('My example application') expect(catalogApplication1.get('version')).toEqual('1.1') expect(catalogApplication1.get('description')).toEqual('My awesome example application, as a catalog item') - expect(catalogApplication1.get('planYaml')).toEqual('services:\n- type: brooklyn.entity.basic.VanillaSoftwareProcess\n launch.command: echo \"Launch application\"\n checkRunning.command: echo \"Check running application\"') + expect(catalogApplication1.get('planYaml')).toEqual('services:\n- type: org.apache.brooklyn.entity.software.base.VanillaSoftwareProcess\n launch.command: echo \"Launch application\"\n checkRunning.command: echo \"Check running application\"') expect(catalogApplication1.get('iconUrl')).toEqual('http://my.example.com/icon.png') var catalogApplication2 = catalogApplicationFixture.at(1) @@ -63,7 +63,7 @@ define([ expect(catalogApplication2.get('name')).toEqual('My example application') expect(catalogApplication2.get('version')).toEqual('2.0') expect(catalogApplication2.get('description')).toEqual('My awesome example application, as a catalog item') - expect(catalogApplication2.get('planYaml')).toEqual('services:\n- type: brooklyn.entity.basic.VanillaSoftwareProcess\n launch.command: echo \"Launch application\"\n checkRunning.command: echo \"Check running application\"') + expect(catalogApplication2.get('planYaml')).toEqual('services:\n- type: org.apache.brooklyn.entity.software.base.VanillaSoftwareProcess\n launch.command: echo \"Launch application\"\n checkRunning.command: echo \"Check running application\"') expect(catalogApplication2.get('iconUrl')).toEqual('http://my.example.com/icon.png') var catalogApplication3 = catalogApplicationFixture.at(2) @@ -72,7 +72,7 @@ define([ expect(catalogApplication3.get('name')).toEqual('Another example application') expect(catalogApplication3.get('version')).toEqual('1.0') expect(catalogApplication3.get('description')).toEqual('Another awesome example application, as a catalog item') - expect(catalogApplication3.get('planYaml')).toEqual('services:\n- type: brooklyn.entity.basic.VanillaSoftwareProcess\n launch.command: echo \"Launch other application\"\n checkRunning.command: echo \"Check running other application\"') + expect(catalogApplication3.get('planYaml')).toEqual('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\"') expect(catalogApplication3.get('iconUrl')).toEqual('http://my.other.example.com/icon.png') }) http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/64c2b2e5/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 63db6f2..b1bd2fd 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('brooklyn.entity.basic.Lifecycle') + expect(ourSensor.get("type")).toBe('org.apache.brooklyn.entity.software.base.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/64c2b2e5/usage/launcher/src/main/java/org/apache/brooklyn/launcher/BrooklynLauncher.java ---------------------------------------------------------------------- diff --git a/usage/launcher/src/main/java/org/apache/brooklyn/launcher/BrooklynLauncher.java b/usage/launcher/src/main/java/org/apache/brooklyn/launcher/BrooklynLauncher.java index 205f18b..b5d2eec 100644 --- a/usage/launcher/src/main/java/org/apache/brooklyn/launcher/BrooklynLauncher.java +++ b/usage/launcher/src/main/java/org/apache/brooklyn/launcher/BrooklynLauncher.java @@ -70,9 +70,12 @@ import org.apache.brooklyn.core.mgmt.rebind.persister.PersistenceObjectStore; import org.apache.brooklyn.core.mgmt.rebind.transformer.CompoundTransformer; import org.apache.brooklyn.core.server.BrooklynServerConfig; import org.apache.brooklyn.core.server.BrooklynServerPaths; +import org.apache.brooklyn.entity.brooklynnode.BrooklynNode; +import org.apache.brooklyn.entity.brooklynnode.LocalBrooklynNode; import org.apache.brooklyn.entity.core.Entities; import org.apache.brooklyn.entity.core.StartableApplication; import org.apache.brooklyn.entity.factory.ApplicationBuilder; +import org.apache.brooklyn.entity.software.base.SoftwareProcess; import org.apache.brooklyn.entity.trait.Startable; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -85,10 +88,6 @@ import com.google.common.collect.ImmutableList; import com.google.common.collect.Lists; import com.google.common.collect.Maps; -import brooklyn.entity.basic.SoftwareProcess; -import brooklyn.entity.brooklynnode.BrooklynNode; -import brooklyn.entity.brooklynnode.LocalBrooklynNode; - import org.apache.brooklyn.launcher.config.StopWhichAppsOnShutdown; import org.apache.brooklyn.location.basic.LocalhostMachineProvisioningLocation.LocalhostMachine; import org.apache.brooklyn.location.basic.PortRanges; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/64c2b2e5/usage/launcher/src/test/java/org/apache/brooklyn/entity/basic/VanillaSoftwareYamlTest.java ---------------------------------------------------------------------- diff --git a/usage/launcher/src/test/java/org/apache/brooklyn/entity/basic/VanillaSoftwareYamlTest.java b/usage/launcher/src/test/java/org/apache/brooklyn/entity/basic/VanillaSoftwareYamlTest.java index 8ba6d73..12e3694 100644 --- a/usage/launcher/src/test/java/org/apache/brooklyn/entity/basic/VanillaSoftwareYamlTest.java +++ b/usage/launcher/src/test/java/org/apache/brooklyn/entity/basic/VanillaSoftwareYamlTest.java @@ -22,11 +22,9 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.testng.Assert; import org.testng.annotations.Test; - -import brooklyn.entity.basic.SoftwareProcess; - import org.apache.brooklyn.api.entity.Application; import org.apache.brooklyn.api.entity.Entity; +import org.apache.brooklyn.entity.software.base.SoftwareProcess; import org.apache.brooklyn.entity.trait.Startable; import org.apache.brooklyn.launcher.SimpleYamlLauncherForTests; import org.apache.brooklyn.launcher.camp.SimpleYamlLauncher; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/64c2b2e5/usage/launcher/src/test/java/org/apache/brooklyn/entity/brooklynnode/BrooklynEntityMirrorIntegrationTest.java ---------------------------------------------------------------------- diff --git a/usage/launcher/src/test/java/org/apache/brooklyn/entity/brooklynnode/BrooklynEntityMirrorIntegrationTest.java b/usage/launcher/src/test/java/org/apache/brooklyn/entity/brooklynnode/BrooklynEntityMirrorIntegrationTest.java index b6823da..89f1d05 100644 --- a/usage/launcher/src/test/java/org/apache/brooklyn/entity/brooklynnode/BrooklynEntityMirrorIntegrationTest.java +++ b/usage/launcher/src/test/java/org/apache/brooklyn/entity/brooklynnode/BrooklynEntityMirrorIntegrationTest.java @@ -32,15 +32,13 @@ import org.testng.Assert; import org.testng.annotations.AfterMethod; import org.testng.annotations.BeforeMethod; import org.testng.annotations.Test; - -import brooklyn.entity.brooklynnode.BrooklynEntityMirror; - 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.api.mgmt.ha.HighAvailabilityMode; import org.apache.brooklyn.core.test.entity.LocalManagementContextForTests; import org.apache.brooklyn.core.test.entity.TestApplication; +import org.apache.brooklyn.entity.brooklynnode.BrooklynEntityMirror; import org.apache.brooklyn.entity.core.Entities; import org.apache.brooklyn.entity.core.EntityInternal; import org.apache.brooklyn.entity.factory.ApplicationBuilder; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/64c2b2e5/usage/launcher/src/test/java/org/apache/brooklyn/entity/brooklynnode/BrooklynNodeRestTest.java ---------------------------------------------------------------------- diff --git a/usage/launcher/src/test/java/org/apache/brooklyn/entity/brooklynnode/BrooklynNodeRestTest.java b/usage/launcher/src/test/java/org/apache/brooklyn/entity/brooklynnode/BrooklynNodeRestTest.java index bcce4ce..6141101 100644 --- a/usage/launcher/src/test/java/org/apache/brooklyn/entity/brooklynnode/BrooklynNodeRestTest.java +++ b/usage/launcher/src/test/java/org/apache/brooklyn/entity/brooklynnode/BrooklynNodeRestTest.java @@ -37,11 +37,6 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.testng.Assert; import org.testng.annotations.Test; - -import brooklyn.entity.brooklynnode.BrooklynEntityMirror; -import brooklyn.entity.brooklynnode.BrooklynNode; -import brooklyn.entity.brooklynnode.SameBrooklynNodeImpl; - import org.apache.brooklyn.api.entity.Application; import org.apache.brooklyn.api.entity.EntitySpec; import org.apache.brooklyn.api.location.Location; @@ -49,6 +44,10 @@ import org.apache.brooklyn.api.mgmt.Task; import org.apache.brooklyn.core.config.BasicConfigKey; import org.apache.brooklyn.core.test.entity.TestApplication; import org.apache.brooklyn.core.test.entity.TestEntity; +import org.apache.brooklyn.entity.brooklynnode.BrooklynEntityMirror; +import org.apache.brooklyn.entity.brooklynnode.BrooklynNode; +import org.apache.brooklyn.entity.brooklynnode.BrooklynNodeTest; +import org.apache.brooklyn.entity.brooklynnode.SameBrooklynNodeImpl; import org.apache.brooklyn.entity.core.Attributes; import org.apache.brooklyn.entity.core.Entities; import org.apache.brooklyn.entity.core.EntityInternal; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/64c2b2e5/usage/launcher/src/test/java/org/apache/brooklyn/launcher/blueprints/AbstractBlueprintTest.java ---------------------------------------------------------------------- diff --git a/usage/launcher/src/test/java/org/apache/brooklyn/launcher/blueprints/AbstractBlueprintTest.java b/usage/launcher/src/test/java/org/apache/brooklyn/launcher/blueprints/AbstractBlueprintTest.java index 3606f0e..6e228bf 100644 --- a/usage/launcher/src/test/java/org/apache/brooklyn/launcher/blueprints/AbstractBlueprintTest.java +++ b/usage/launcher/src/test/java/org/apache/brooklyn/launcher/blueprints/AbstractBlueprintTest.java @@ -36,6 +36,7 @@ import org.apache.brooklyn.core.mgmt.rebind.persister.FileBasedObjectStore; import org.apache.brooklyn.entity.core.Attributes; import org.apache.brooklyn.entity.core.Entities; import org.apache.brooklyn.entity.lifecycle.Lifecycle; +import org.apache.brooklyn.entity.software.base.SoftwareProcess; import org.apache.brooklyn.test.Asserts; import org.apache.brooklyn.test.EntityTestUtils; import org.apache.brooklyn.util.core.ResourceUtils; @@ -44,9 +45,6 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.testng.annotations.AfterMethod; import org.testng.annotations.BeforeMethod; - -import brooklyn.entity.basic.SoftwareProcess; - import org.apache.brooklyn.launcher.BrooklynLauncher; import org.apache.brooklyn.launcher.SimpleYamlLauncherForTests; import org.apache.brooklyn.launcher.camp.BrooklynCampPlatformLauncher; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/64c2b2e5/usage/qa/src/main/java/org/apache/brooklyn/qa/load/SimulatedMySqlNodeImpl.java ---------------------------------------------------------------------- diff --git a/usage/qa/src/main/java/org/apache/brooklyn/qa/load/SimulatedMySqlNodeImpl.java b/usage/qa/src/main/java/org/apache/brooklyn/qa/load/SimulatedMySqlNodeImpl.java index 1ef7a7d..af7d7db 100644 --- a/usage/qa/src/main/java/org/apache/brooklyn/qa/load/SimulatedMySqlNodeImpl.java +++ b/usage/qa/src/main/java/org/apache/brooklyn/qa/load/SimulatedMySqlNodeImpl.java @@ -26,18 +26,17 @@ import org.apache.brooklyn.config.ConfigKey; import org.apache.brooklyn.entity.database.mysql.MySqlNode; import org.apache.brooklyn.entity.database.mysql.MySqlNodeImpl; import org.apache.brooklyn.entity.database.mysql.MySqlSshDriver; +import org.apache.brooklyn.entity.software.base.AbstractSoftwareProcessSshDriver; import org.apache.brooklyn.location.basic.SshMachineLocation; import org.apache.brooklyn.sensor.feed.function.FunctionFeed; import org.apache.brooklyn.sensor.feed.function.FunctionPollConfig; +import org.apache.brooklyn.sensor.ssh.SshEffectorTasks; import org.apache.brooklyn.util.collections.MutableMap; import org.apache.brooklyn.util.core.task.DynamicTasks; import org.apache.brooklyn.util.core.task.system.ProcessTaskWrapper; import org.apache.brooklyn.util.time.CountdownTimer; import org.apache.brooklyn.util.time.Duration; -import brooklyn.entity.basic.AbstractSoftwareProcessSshDriver; -import brooklyn.entity.software.SshEffectorTasks; - /** * @see SimulatedJBoss7ServerImpl for description of purpose and configuration options. */ http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/64c2b2e5/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 76b1ecf..7423322 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 @@ -33,6 +33,7 @@ import org.apache.brooklyn.entity.core.Entities; import org.apache.brooklyn.entity.core.StartableApplication; import org.apache.brooklyn.entity.database.mysql.MySqlNode; import org.apache.brooklyn.entity.group.DynamicCluster; +import org.apache.brooklyn.entity.java.JavaEntityMethods; import org.apache.brooklyn.entity.proxy.nginx.NginxController; import org.apache.brooklyn.entity.trait.Startable; import org.apache.brooklyn.entity.webapp.ControlledDynamicWebAppCluster; @@ -54,8 +55,6 @@ import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableSet; import com.google.common.collect.Lists; -import brooklyn.entity.java.JavaEntityMethods; - /** * A 3-tier app where all components are just "simulated" - they don't actually run * real app-servers or databases, instead just executing a "sleep" command to simulate http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/64c2b2e5/usage/qa/src/test/java/org/apache/brooklyn/qa/brooklynnode/SoftlayerObtainPrivateLiveTest.java ---------------------------------------------------------------------- diff --git a/usage/qa/src/test/java/org/apache/brooklyn/qa/brooklynnode/SoftlayerObtainPrivateLiveTest.java b/usage/qa/src/test/java/org/apache/brooklyn/qa/brooklynnode/SoftlayerObtainPrivateLiveTest.java index a1fb6d9..9ddc283 100644 --- a/usage/qa/src/test/java/org/apache/brooklyn/qa/brooklynnode/SoftlayerObtainPrivateLiveTest.java +++ b/usage/qa/src/test/java/org/apache/brooklyn/qa/brooklynnode/SoftlayerObtainPrivateLiveTest.java @@ -29,6 +29,9 @@ import org.apache.brooklyn.api.mgmt.ManagementContext; import org.apache.brooklyn.core.objs.BrooklynObjectInternal.ConfigurationSupportInternal; import org.apache.brooklyn.core.test.entity.LocalManagementContextForTests; import org.apache.brooklyn.core.test.entity.TestApplication; +import org.apache.brooklyn.entity.brooklynnode.BrooklynEntityMirror; +import org.apache.brooklyn.entity.brooklynnode.BrooklynNode; +import org.apache.brooklyn.entity.brooklynnode.BrooklynNode.DeployBlueprintEffector; import org.apache.brooklyn.entity.core.Attributes; import org.apache.brooklyn.entity.core.Entities; import org.apache.brooklyn.entity.lifecycle.Lifecycle; @@ -54,10 +57,6 @@ import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; import com.google.common.collect.ImmutableSet; -import brooklyn.entity.brooklynnode.BrooklynEntityMirror; -import brooklyn.entity.brooklynnode.BrooklynNode; -import brooklyn.entity.brooklynnode.BrooklynNode.DeployBlueprintEffector; - /** * Tests obtaining a machine with a private IP only. For the machine to be * accessible we should have a gateway machine already running in the same http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/64c2b2e5/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 ce43857..5e6d0f8 100644 --- a/usage/rest-server/src/main/resources/reset-catalog.xml +++ b/usage/rest-server/src/main/resources/reset-catalog.xml @@ -20,7 +20,7 @@ <catalog> <name>Brooklyn Demos</name> - <template type="brooklyn.entity.basic.BasicApplication" name="Basic application" /> + <template type="org.apache.brooklyn.entity.software.base.BasicApplication" name="Basic application" /> <template type="brooklyn.osgi.tests.SimpleApplication" name="Simple OSGi application"> <libraries> <bundle>${bundle-location}</bundle> http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/64c2b2e5/usage/rest-server/src/test/java/org/apache/brooklyn/rest/resources/ServerResourceTest.java ---------------------------------------------------------------------- diff --git a/usage/rest-server/src/test/java/org/apache/brooklyn/rest/resources/ServerResourceTest.java b/usage/rest-server/src/test/java/org/apache/brooklyn/rest/resources/ServerResourceTest.java index f5e0c78..7260205 100644 --- a/usage/rest-server/src/test/java/org/apache/brooklyn/rest/resources/ServerResourceTest.java +++ b/usage/rest-server/src/test/java/org/apache/brooklyn/rest/resources/ServerResourceTest.java @@ -29,6 +29,9 @@ import org.apache.brooklyn.api.mgmt.ManagementContext; import org.apache.brooklyn.core.BrooklynVersion; import org.apache.brooklyn.core.internal.BrooklynProperties; import org.apache.brooklyn.core.mgmt.internal.ManagementContextInternal; +import org.apache.brooklyn.entity.software.base.EmptySoftwareProcess; +import org.apache.brooklyn.entity.software.base.EmptySoftwareProcessDriver; +import org.apache.brooklyn.entity.software.base.EmptySoftwareProcessImpl; import org.apache.brooklyn.rest.domain.HighAvailabilitySummary; import org.apache.brooklyn.rest.domain.VersionSummary; import org.apache.brooklyn.rest.testing.BrooklynRestResourceTest; @@ -41,10 +44,6 @@ import org.testng.annotations.Test; import com.google.common.collect.ImmutableSet; import com.sun.jersey.api.client.UniformInterfaceException; -import brooklyn.entity.basic.EmptySoftwareProcess; -import brooklyn.entity.basic.EmptySoftwareProcessDriver; -import brooklyn.entity.basic.EmptySoftwareProcessImpl; - @Test(singleThreaded = true) public class ServerResourceTest extends BrooklynRestResourceTest { http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/64c2b2e5/usage/rest-server/src/test/java/org/apache/brooklyn/rest/resources/UsageResourceTest.java ---------------------------------------------------------------------- diff --git a/usage/rest-server/src/test/java/org/apache/brooklyn/rest/resources/UsageResourceTest.java b/usage/rest-server/src/test/java/org/apache/brooklyn/rest/resources/UsageResourceTest.java index c341e38..6250992 100644 --- a/usage/rest-server/src/test/java/org/apache/brooklyn/rest/resources/UsageResourceTest.java +++ b/usage/rest-server/src/test/java/org/apache/brooklyn/rest/resources/UsageResourceTest.java @@ -35,9 +35,6 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.testng.annotations.BeforeMethod; import org.testng.annotations.Test; - -import brooklyn.entity.basic.SoftwareProcessEntityTest; - import org.apache.brooklyn.api.location.Location; import org.apache.brooklyn.api.location.LocationSpec; import org.apache.brooklyn.api.location.NoMachinesAvailableException; @@ -45,6 +42,7 @@ import org.apache.brooklyn.core.mgmt.internal.LocalUsageManager; import org.apache.brooklyn.core.mgmt.internal.ManagementContextInternal; import org.apache.brooklyn.core.test.entity.TestApplication; import org.apache.brooklyn.entity.factory.ApplicationBuilder; +import org.apache.brooklyn.entity.software.base.SoftwareProcessEntityTest; import org.apache.brooklyn.location.basic.LocalhostMachineProvisioningLocation; import org.apache.brooklyn.location.basic.SshMachineLocation; import org.apache.brooklyn.rest.domain.ApplicationSpec; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/64c2b2e5/usage/rest-server/src/test/java/org/apache/brooklyn/rest/test/entity/brooklynnode/DeployBlueprintTest.java ---------------------------------------------------------------------- diff --git a/usage/rest-server/src/test/java/org/apache/brooklyn/rest/test/entity/brooklynnode/DeployBlueprintTest.java b/usage/rest-server/src/test/java/org/apache/brooklyn/rest/test/entity/brooklynnode/DeployBlueprintTest.java index d0c29c3..a4cf64d 100644 --- a/usage/rest-server/src/test/java/org/apache/brooklyn/rest/test/entity/brooklynnode/DeployBlueprintTest.java +++ b/usage/rest-server/src/test/java/org/apache/brooklyn/rest/test/entity/brooklynnode/DeployBlueprintTest.java @@ -27,6 +27,8 @@ import java.util.Map; import org.apache.brooklyn.api.entity.EntitySpec; import org.apache.brooklyn.api.internal.EntityLocal; import org.apache.brooklyn.api.mgmt.EntityManager; +import org.apache.brooklyn.entity.brooklynnode.BrooklynNode; +import org.apache.brooklyn.entity.brooklynnode.BrooklynNode.DeployBlueprintEffector; import org.apache.brooklyn.entity.stock.BasicApplication; import org.apache.brooklyn.rest.BrooklynRestApiLauncherTestFixture; import org.apache.brooklyn.sensor.feed.http.JsonFunctions; @@ -42,9 +44,6 @@ import com.google.common.base.Function; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; -import brooklyn.entity.brooklynnode.BrooklynNode; -import brooklyn.entity.brooklynnode.BrooklynNode.DeployBlueprintEffector; - public class DeployBlueprintTest extends BrooklynRestApiLauncherTestFixture { private static final Logger log = LoggerFactory.getLogger(DeployBlueprintTest.class); http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/64c2b2e5/usage/rest-server/src/test/java/org/apache/brooklyn/rest/testing/mocks/RestMockSimpleEntity.java ---------------------------------------------------------------------- diff --git a/usage/rest-server/src/test/java/org/apache/brooklyn/rest/testing/mocks/RestMockSimpleEntity.java b/usage/rest-server/src/test/java/org/apache/brooklyn/rest/testing/mocks/RestMockSimpleEntity.java index aaa7179..d5e608f 100644 --- a/usage/rest-server/src/test/java/org/apache/brooklyn/rest/testing/mocks/RestMockSimpleEntity.java +++ b/usage/rest-server/src/test/java/org/apache/brooklyn/rest/testing/mocks/RestMockSimpleEntity.java @@ -28,12 +28,10 @@ import org.apache.brooklyn.core.config.BasicConfigKey; import org.apache.brooklyn.effector.core.MethodEffector; import org.apache.brooklyn.entity.annotation.Effector; import org.apache.brooklyn.entity.annotation.EffectorParam; +import org.apache.brooklyn.entity.software.base.AbstractSoftwareProcessSshDriver; +import org.apache.brooklyn.entity.software.base.SoftwareProcessImpl; import org.slf4j.Logger; import org.slf4j.LoggerFactory; - -import brooklyn.entity.basic.AbstractSoftwareProcessSshDriver; -import brooklyn.entity.basic.SoftwareProcessImpl; - import org.apache.brooklyn.location.basic.SshMachineLocation; import org.apache.brooklyn.sensor.core.BasicAttributeSensor; import org.apache.brooklyn.util.core.flags.SetFromFlag; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/64c2b2e5/usage/rest-server/src/test/java/org/apache/brooklyn/rest/util/EntityLocationUtilsTest.java ---------------------------------------------------------------------- diff --git a/usage/rest-server/src/test/java/org/apache/brooklyn/rest/util/EntityLocationUtilsTest.java b/usage/rest-server/src/test/java/org/apache/brooklyn/rest/util/EntityLocationUtilsTest.java index 3200f5d..ace877b 100644 --- a/usage/rest-server/src/test/java/org/apache/brooklyn/rest/util/EntityLocationUtilsTest.java +++ b/usage/rest-server/src/test/java/org/apache/brooklyn/rest/util/EntityLocationUtilsTest.java @@ -27,9 +27,6 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.testng.annotations.BeforeMethod; import org.testng.annotations.Test; - -import brooklyn.entity.basic.SoftwareProcess; - import org.apache.brooklyn.location.basic.AbstractLocation; import org.apache.brooklyn.location.basic.LocationInternal; import org.apache.brooklyn.location.geo.HostGeoInfo; @@ -37,6 +34,7 @@ import org.apache.brooklyn.api.entity.EntitySpec; import org.apache.brooklyn.api.location.Location; import org.apache.brooklyn.core.test.BrooklynAppUnitTestSupport; import org.apache.brooklyn.entity.core.Entities; +import org.apache.brooklyn.entity.software.base.SoftwareProcess; import org.apache.brooklyn.rest.testing.mocks.RestMockSimpleEntity; import com.google.common.collect.ImmutableList;
