BROOKLYN-162 - rename more references towards brooklyn.entity.basic package
Project: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/commit/3d91a438 Tree: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/tree/3d91a438 Diff: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/diff/3d91a438 Branch: refs/heads/master Commit: 3d91a4384a24bd9ae9068b2ea039ed715d31c616 Parents: 95277b3 Author: Ciprian Ciubotariu <[email protected]> Authored: Wed Aug 19 14:03:58 2015 +0300 Committer: Ciprian Ciubotariu <[email protected]> Committed: Wed Aug 19 14:11:14 2015 +0300 ---------------------------------------------------------------------- .../org/apache/brooklyn/api/entity/Application.java | 4 ++-- .../java/org/apache/brooklyn/api/entity/Entity.java | 8 ++++---- .../apache/brooklyn/core/config/BasicConfigKey.java | 2 +- .../core/catalog/internal/CatalogVersioningTest.java | 2 +- .../entity/core/ConfigEntityInheritanceTest.java | 2 -- docs/_extra/big_examples/global-web-fabric/index.md | 6 +++--- docs/guide/ops/locations/index.md | 2 +- docs/guide/yaml/clusters.md | 2 +- docs/guide/yaml/example_yaml/cluster-vm.yaml | 2 +- docs/guide/yaml/example_yaml/simple-vm.yaml | 2 +- .../test-app-with-enrichers-slightly-simpler.yaml | 4 ++-- .../yaml/example_yaml/vanilla-bash-netcat-file.yaml | 2 +- .../example_yaml/vanilla-bash-netcat-restarter.yaml | 2 +- .../example_yaml/vanilla-bash-netcat-w-client.yaml | 4 ++-- docs/guide/yaml/example_yaml/vanilla-bash-netcat.yaml | 2 +- docs/guide/yaml/winrm/index.md | 4 ++-- ...louds-location-test-various-login-credentials.yaml | 12 ++++++------ parent/pom.xml | 2 +- .../brooklyn/entity/database/derby/DerbyDatabase.java | 6 +++--- .../brooklyn/entity/database/derby/DerbySchema.java | 2 +- .../database/postgresql/PostgreSqlNodeSaltImpl.java | 8 ++++---- .../org/apache/brooklyn/entity/salt/SaltConfig.java | 2 +- .../org/apache/brooklyn/entity/salt/SaltConfigs.java | 2 +- .../entity/salt/SaltLifecycleEffectorTasks.java | 4 ++-- .../apache/brooklyn/entity/salt/SaltStackMaster.java | 6 +++--- .../brooklyn/entity/salt/SaltStackMasterDriver.java | 2 +- .../brooklyn/entity/salt/SaltStackMasterImpl.java | 2 +- .../entity/salt/SaltStackMasterSshDriver.java | 2 +- .../org/apache/brooklyn/entity/salt/SaltTasks.java | 2 +- .../database/postgresql/PostgreSqlSaltLiveTest.java | 2 +- .../apache/brooklyn/entity/salt/SaltConfigsTest.java | 4 ++-- .../entity/nosql/hazelcast/HazelcastCluster.java | 2 +- .../entity/nosql/hazelcast/HazelcastClusterImpl.java | 4 ++-- .../entity/nosql/hazelcast/HazelcastNode.java | 4 ++-- .../entity/nosql/hazelcast/HazelcastNodeDriver.java | 2 +- .../entity/nosql/hazelcast/HazelcastNodeImpl.java | 4 ++-- .../nosql/hazelcast/HazelcastNodeSshDriver.java | 2 +- .../entity/nosql/infinispan/Infinispan5Server.java | 6 +++--- .../nosql/hazelcast/HazelcastClusterEc2LiveTest.java | 2 +- .../hazelcast/HazelcastClusterSoftlayerLiveTest.java | 2 +- .../Infinispan5ServerIntegrationTest.groovy | 2 +- .../software/base/AbstractSoftwareProcessDriver.java | 2 +- .../software/base/DoNothingSoftwareProcess.java | 1 - ...illaSoftwareProcessAndChildrenIntegrationTest.java | 2 +- .../brooklyn/entity/nosql/couchbase/pillowfight.yaml | 2 +- .../brooklyn/entity/webapp/WebAppServiceMetrics.java | 4 ++-- .../brooklyn/camp/brooklyn/ByonLocationsYamlTest.java | 12 ++++++------ .../brooklyn/camp/brooklyn/ReferencedYamlTest.java | 6 +++--- .../catalog/CatalogOsgiVersionMoreEntityTest.java | 2 +- .../camp/brooklyn/catalog/CatalogXmlVersionTest.java | 6 +++--- .../camp/brooklyn/catalog/CatalogYamlAppTest.java | 14 +++++++------- .../camp/brooklyn/catalog/CatalogYamlEntityTest.java | 4 ++-- .../brooklyn/catalog/CatalogYamlLocationTest.java | 2 +- .../camp/brooklyn/catalog/CatalogYamlPolicyTest.java | 4 ++-- .../brooklyn/catalog/CatalogYamlVersioningTest.java | 2 +- usage/camp/src/test/resources/simple-catalog.xml | 10 +++++----- .../src/test/resources/test-app-with-enricher.yaml | 2 +- .../camp/src/test/resources/test-app-with-policy.yaml | 2 +- .../resources/test-entity-reference-map-template.yaml | 4 ++-- .../src/test/resources/test-entity-with-enricher.yaml | 2 +- .../src/test/resources/test-entity-with-policy.yaml | 2 +- .../test/resources/vanilla-bash-netcat-w-client.yaml | 4 ++-- usage/camp/src/test/resources/yaml-ref-app.yaml | 2 +- usage/camp/src/test/resources/yaml-ref-entity.yaml | 2 +- .../src/main/resources/brooklyn/default.catalog.bom | 3 ++- .../basic-empty-app-and-entity-blueprint.yaml | 4 ++-- .../src/test/resources/basic-empy-app-blueprint.yaml | 2 +- usage/launcher/src/test/resources/mongo-sharded.yaml | 2 +- usage/launcher/src/test/resources/mssql-test.yaml | 2 +- .../test/resources/vanilla-software-blueprint.yaml | 2 +- .../vanilla-software-with-child-blueprint.yaml | 4 ++-- .../brooklyn/rest/resources/EntityResourceTest.java | 2 +- .../brooklyn/rest/resources/ServerResourceTest.java | 2 +- .../brooklyn/rest/resources/ServerShutdownTest.java | 2 +- 74 files changed, 127 insertions(+), 129 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/3d91a438/api/src/main/java/org/apache/brooklyn/api/entity/Application.java ---------------------------------------------------------------------- diff --git a/api/src/main/java/org/apache/brooklyn/api/entity/Application.java b/api/src/main/java/org/apache/brooklyn/api/entity/Application.java index e56b23f..3b03155 100644 --- a/api/src/main/java/org/apache/brooklyn/api/entity/Application.java +++ b/api/src/main/java/org/apache/brooklyn/api/entity/Application.java @@ -25,8 +25,8 @@ import org.apache.brooklyn.api.mgmt.ManagementContext; * An application is the root of the entity hierarchy. In the parent-child relationship, it is * the top-level entity under which the application's entities are all places. * - * The recommended ways to write a new application are to either extend {@link brooklyn.entity.basic.ApplicationBuilder} - * or to extend {@link brooklyn.entity.basic.AbstractApplication}. + * The recommended ways to write a new application are to either extend {@link org.apache.brooklyn.entity.factory.ApplicationBuilder} + * or to extend {@link org.apache.brooklyn.entity.core.AbstractApplication}. */ public interface Application extends Entity { http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/3d91a438/api/src/main/java/org/apache/brooklyn/api/entity/Entity.java ---------------------------------------------------------------------- diff --git a/api/src/main/java/org/apache/brooklyn/api/entity/Entity.java b/api/src/main/java/org/apache/brooklyn/api/entity/Entity.java index 83f6d39..8b4f326 100644 --- a/api/src/main/java/org/apache/brooklyn/api/entity/Entity.java +++ b/api/src/main/java/org/apache/brooklyn/api/entity/Entity.java @@ -40,15 +40,15 @@ import org.apache.brooklyn.util.guava.Maybe; /** * The basic interface for a Brooklyn entity. * <p> - * Implementors of entities are strongly encouraged to extend {@link brooklyn.entity.basic.AbstractEntity}. + * Implementors of entities are strongly encouraged to extend {@link org.apache.brooklyn.entity.core.AbstractEntity}. * <p> * To instantiate an entity, see {@code managementContext.getEntityManager().createEntity(entitySpec)}. - * Also see {@link brooklyn.entity.basic.ApplicationBuilder}, - * {@link brooklyn.entity.basic.AbstractEntity#addChild(EntitySpec)}, and + * Also see {@link org.apache.brooklyn.entity.factory.ApplicationBuilder}, + * {@link org.apache.brooklyn.entity.core.AbstractEntity#addChild(EntitySpec)}, and * {@link org.apache.brooklyn.api.entity.EntitySpec}. * <p> * - * @see brooklyn.entity.basic.AbstractEntity + * @see org.apache.brooklyn.entity.core.AbstractEntity */ public interface Entity extends BrooklynObject { /** http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/3d91a438/core/src/main/java/org/apache/brooklyn/core/config/BasicConfigKey.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/brooklyn/core/config/BasicConfigKey.java b/core/src/main/java/org/apache/brooklyn/core/config/BasicConfigKey.java index fd5f80b..614f60b 100644 --- a/core/src/main/java/org/apache/brooklyn/core/config/BasicConfigKey.java +++ b/core/src/main/java/org/apache/brooklyn/core/config/BasicConfigKey.java @@ -251,7 +251,7 @@ public class BasicConfigKey<T> implements ConfigKeySelfExtracting<T>, Serializab /** used to record a key which overwrites another; only needed at disambiguation time * if a class declares a key and an equivalent one (often inherited) which overwrites it. - * See brooklyn.entity.basic.ConfigEntityInheritanceTest, and uses of this class, for more explanation. + * See org.apache.brooklyn.entity.core.ConfigEntityInheritanceTest, and uses of this class, for more explanation. */ public static class BasicConfigKeyOverwriting<T> extends BasicConfigKey<T> { private static final long serialVersionUID = -3458116971918128018L; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/3d91a438/core/src/test/java/org/apache/brooklyn/core/catalog/internal/CatalogVersioningTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/org/apache/brooklyn/core/catalog/internal/CatalogVersioningTest.java b/core/src/test/java/org/apache/brooklyn/core/catalog/internal/CatalogVersioningTest.java index 33de2b5..9ba1d06 100644 --- a/core/src/test/java/org/apache/brooklyn/core/catalog/internal/CatalogVersioningTest.java +++ b/core/src/test/java/org/apache/brooklyn/core/catalog/internal/CatalogVersioningTest.java @@ -143,7 +143,7 @@ public class CatalogVersioningTest { @SuppressWarnings("deprecation") private void createCatalogItem(String symbolicName, String version) { catalog.addItem(CatalogItemBuilder.newEntity(symbolicName, version). - plan("services:\n- type: brooklyn.entity.basic.BasicEntity") + plan("services:\n- type: org.apache.brooklyn.entity.stock.BasicEntity") .build()); } http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/3d91a438/core/src/test/java/org/apache/brooklyn/entity/core/ConfigEntityInheritanceTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/org/apache/brooklyn/entity/core/ConfigEntityInheritanceTest.java b/core/src/test/java/org/apache/brooklyn/entity/core/ConfigEntityInheritanceTest.java index 6deb2e1..5ea366b 100644 --- a/core/src/test/java/org/apache/brooklyn/entity/core/ConfigEntityInheritanceTest.java +++ b/core/src/test/java/org/apache/brooklyn/entity/core/ConfigEntityInheritanceTest.java @@ -24,8 +24,6 @@ import org.apache.brooklyn.config.ConfigInheritance; import org.apache.brooklyn.config.ConfigKey; import org.apache.brooklyn.core.config.ConfigKeys; import org.apache.brooklyn.core.test.entity.TestApplication; -import org.apache.brooklyn.entity.core.AbstractEntity; -import org.apache.brooklyn.entity.core.Entities; import org.apache.brooklyn.entity.core.internal.ConfigMapTest.MyOtherEntity; import org.apache.brooklyn.sensor.core.AttributeSensorAndConfigKey; import org.apache.brooklyn.sensor.core.BasicAttributeSensorAndConfigKey.IntegerAttributeSensorAndConfigKey; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/3d91a438/docs/_extra/big_examples/global-web-fabric/index.md ---------------------------------------------------------------------- diff --git a/docs/_extra/big_examples/global-web-fabric/index.md b/docs/_extra/big_examples/global-web-fabric/index.md index d163611..6897ffe 100644 --- a/docs/_extra/big_examples/global-web-fabric/index.md +++ b/docs/_extra/big_examples/global-web-fabric/index.md @@ -100,7 +100,7 @@ This will extend the Brooklyn `AbstractApplication`: package brooklyn.demo; import static com.google.common.base.Preconditions.checkNotNull; -import brooklyn.entity.basic.AbstractApplication; +import org.apache.brooklyn.entity.core.AbstractApplication; public class GlobalWebFabricExample extends AbstractApplication { @Override @@ -203,8 +203,8 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; import brooklyn.config.StringConfigMap; -import brooklyn.entity.basic.AbstractApplication; -import brooklyn.entity.basic.Attributes; +import org.apache.brooklyn.entity.core.AbstractApplication; +import org.apache.brooklyn.entity.core.Attributes; import brooklyn.entity.dns.geoscaling.GeoscalingDnsService; import brooklyn.entity.group.DynamicFabric; import brooklyn.entity.proxy.AbstractController; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/3d91a438/docs/guide/ops/locations/index.md ---------------------------------------------------------------------- diff --git a/docs/guide/ops/locations/index.md b/docs/guide/ops/locations/index.md index c9b41db..367b774 100644 --- a/docs/guide/ops/locations/index.md +++ b/docs/guide/ops/locations/index.md @@ -231,7 +231,7 @@ For example, here is a complete blueprint that sets some AWS EC2 specific option location: AWS_eu-west-1 services: - - type: brooklyn.entity.basic.EmptySoftwareProcess + - type: org.apache.brooklyn.entity.software.base.EmptySoftwareProcess provisioningProperties: templateOptions: subnetId: subnet-041c8373 http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/3d91a438/docs/guide/yaml/clusters.md ---------------------------------------------------------------------- diff --git a/docs/guide/yaml/clusters.md b/docs/guide/yaml/clusters.md index 854254e..78b1df9 100644 --- a/docs/guide/yaml/clusters.md +++ b/docs/guide/yaml/clusters.md @@ -7,7 +7,7 @@ categories: [use, guide, defining-applications] What if you want multiple machines? -One way is just to repeat the `- type: brooklyn.entity.basic.EmptySoftwareProcess` block, +One way is just to repeat the `- type: org.apache.brooklyn.entity.software.base.EmptySoftwareProcess` block, but there's another way which will keep your powder [DRY](http://en.wikipedia.org/wiki/Don't_repeat_yourself): {% highlight yaml %} http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/3d91a438/docs/guide/yaml/example_yaml/cluster-vm.yaml ---------------------------------------------------------------------- diff --git a/docs/guide/yaml/example_yaml/cluster-vm.yaml b/docs/guide/yaml/example_yaml/cluster-vm.yaml index a0a50da..50521fb 100644 --- a/docs/guide/yaml/example_yaml/cluster-vm.yaml +++ b/docs/guide/yaml/example_yaml/cluster-vm.yaml @@ -4,7 +4,7 @@ services: initialSize: 5 memberSpec: $brooklyn:entitySpec: - type: brooklyn.entity.basic.EmptySoftwareProcess + type: org.apache.brooklyn.entity.software.base.EmptySoftwareProcess name: VM provisioning.properties: minRam: 8g http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/3d91a438/docs/guide/yaml/example_yaml/simple-vm.yaml ---------------------------------------------------------------------- diff --git a/docs/guide/yaml/example_yaml/simple-vm.yaml b/docs/guide/yaml/example_yaml/simple-vm.yaml index 149a1b9..8f6447c 100644 --- a/docs/guide/yaml/example_yaml/simple-vm.yaml +++ b/docs/guide/yaml/example_yaml/simple-vm.yaml @@ -1,6 +1,6 @@ name: simple-vm services: -- type: brooklyn.entity.basic.EmptySoftwareProcess +- type: org.apache.brooklyn.entity.software.base.EmptySoftwareProcess name: VM provisioning.properties: minRam: 8192mb http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/3d91a438/docs/guide/yaml/example_yaml/test-app-with-enrichers-slightly-simpler.yaml ---------------------------------------------------------------------- diff --git a/docs/guide/yaml/example_yaml/test-app-with-enrichers-slightly-simpler.yaml b/docs/guide/yaml/example_yaml/test-app-with-enrichers-slightly-simpler.yaml index a6a8116..3c9b4ad 100644 --- a/docs/guide/yaml/example_yaml/test-app-with-enrichers-slightly-simpler.yaml +++ b/docs/guide/yaml/example_yaml/test-app-with-enrichers-slightly-simpler.yaml @@ -26,7 +26,7 @@ services: # instead of (or in addition to) this map brooklyn.config: sensorMapping: - $brooklyn:sensor("url"): $brooklyn:sensor("brooklyn.entity.basic.Attributes", "main.uri") + $brooklyn:sensor("url"): $brooklyn:sensor("org.apache.brooklyn.entity.core.Attributes", "main.uri") brooklyn.enrichers: - type: brooklyn.enricher.basic.Aggregator # aggregate `url` sensors from children into a list @@ -46,7 +46,7 @@ services: # pick one uri as the main one to use brooklyn.config: enricher.sourceSensor: $brooklyn:sensor("urls.list") - enricher.targetSensor: $brooklyn:sensor("brooklyn.entity.basic.Attributes", "main.uri") + enricher.targetSensor: $brooklyn:sensor("org.apache.brooklyn.entity.core.Attributes", "main.uri") quote: false maximum: 1 brooklyn.enrichers: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/3d91a438/docs/guide/yaml/example_yaml/vanilla-bash-netcat-file.yaml ---------------------------------------------------------------------- diff --git a/docs/guide/yaml/example_yaml/vanilla-bash-netcat-file.yaml b/docs/guide/yaml/example_yaml/vanilla-bash-netcat-file.yaml index 7950b8c..d768739 100644 --- a/docs/guide/yaml/example_yaml/vanilla-bash-netcat-file.yaml +++ b/docs/guide/yaml/example_yaml/vanilla-bash-netcat-file.yaml @@ -1,6 +1,6 @@ name: Simple Netcat Example From File location: localhost services: -- type: brooklyn.entity.basic.VanillaSoftwareProcess +- type: org.apache.brooklyn.entity.software.base.VanillaSoftwareProcess name: Simple Netcat Server download.url: file:///tmp/netcat-server.tgz http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/3d91a438/docs/guide/yaml/example_yaml/vanilla-bash-netcat-restarter.yaml ---------------------------------------------------------------------- diff --git a/docs/guide/yaml/example_yaml/vanilla-bash-netcat-restarter.yaml b/docs/guide/yaml/example_yaml/vanilla-bash-netcat-restarter.yaml index 6752980..adaa933 100644 --- a/docs/guide/yaml/example_yaml/vanilla-bash-netcat-restarter.yaml +++ b/docs/guide/yaml/example_yaml/vanilla-bash-netcat-restarter.yaml @@ -1,7 +1,7 @@ name: Simple Netcat Example with Restarter Policy location: localhost services: -- type: brooklyn.entity.basic.VanillaSoftwareProcess +- type: org.apache.brooklyn.entity.software.base.VanillaSoftwareProcess id: netcat-server name: Simple Netcat Server launch.command: | http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/3d91a438/docs/guide/yaml/example_yaml/vanilla-bash-netcat-w-client.yaml ---------------------------------------------------------------------- diff --git a/docs/guide/yaml/example_yaml/vanilla-bash-netcat-w-client.yaml b/docs/guide/yaml/example_yaml/vanilla-bash-netcat-w-client.yaml index 4893968..747d5a5 100644 --- a/docs/guide/yaml/example_yaml/vanilla-bash-netcat-w-client.yaml +++ b/docs/guide/yaml/example_yaml/vanilla-bash-netcat-w-client.yaml @@ -5,7 +5,7 @@ location: localhost services: # the netcat server instance, running in listener mode (-l) -- type: brooklyn.entity.basic.VanillaSoftwareProcess +- type: org.apache.brooklyn.entity.software.base.VanillaSoftwareProcess id: netcat-server name: Simple Netcat Server launch.command: | @@ -40,7 +40,7 @@ services: command: cat server-input # a client to hit netcat -- type: brooklyn.entity.basic.VanillaSoftwareProcess +- type: org.apache.brooklyn.entity.software.base.VanillaSoftwareProcess name: Simple Pinger # set the hostname of the netcat instance as an env var for the scripts http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/3d91a438/docs/guide/yaml/example_yaml/vanilla-bash-netcat.yaml ---------------------------------------------------------------------- diff --git a/docs/guide/yaml/example_yaml/vanilla-bash-netcat.yaml b/docs/guide/yaml/example_yaml/vanilla-bash-netcat.yaml index d4cb37b..3023038 100644 --- a/docs/guide/yaml/example_yaml/vanilla-bash-netcat.yaml +++ b/docs/guide/yaml/example_yaml/vanilla-bash-netcat.yaml @@ -1,7 +1,7 @@ name: Simple Netcat Server Example location: localhost services: -- type: brooklyn.entity.basic.VanillaSoftwareProcess +- type: org.apache.brooklyn.entity.software.base.VanillaSoftwareProcess name: Simple Netcat Server launch.command: | echo hello | nc -l 4321 & http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/3d91a438/docs/guide/yaml/winrm/index.md ---------------------------------------------------------------------- diff --git a/docs/guide/yaml/winrm/index.md b/docs/guide/yaml/winrm/index.md index 363fe08..7989a61 100644 --- a/docs/guide/yaml/winrm/index.md +++ b/docs/guide/yaml/winrm/index.md @@ -68,7 +68,7 @@ Alternatively, in your YAML blueprint: A Sample Blueprint ------------------ -Creating a Windows VM is done using the `brooklyn.entity.basic.VanillaWindowsProcess` entity type. This is very similar +Creating a Windows VM is done using the `org.apache.brooklyn.entity.software.base.VanillaWindowsProcess` entity type. This is very similar to `VanillaSoftwareProcess`, but adapted to work for Windows and WinRM instead of Linux. We suggest you read the [documentation for VanillaSoftwareProcess](../custom-entities.html#vanilla-software-using-bash) to find out what you can do with this entity. @@ -88,7 +88,7 @@ For example - here is a blueprint: templateOptions: {mapNewVolumeToDeviceName: ["/dev/sda1", 100, true]} services: - - type: brooklyn.entity.basic.VanillaWindowsProcess + - type: org.apache.brooklyn.entity.software.base.VanillaWindowsProcess brooklyn.config: templates.install: file:///Users/richard/install7zip.ps1: "C:\\install7zip.ps1" http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/3d91a438/locations/jclouds/src/test/resources/org/apache/brooklyn/location/jclouds/jclouds-location-test-various-login-credentials.yaml ---------------------------------------------------------------------- diff --git a/locations/jclouds/src/test/resources/org/apache/brooklyn/location/jclouds/jclouds-location-test-various-login-credentials.yaml b/locations/jclouds/src/test/resources/org/apache/brooklyn/location/jclouds/jclouds-location-test-various-login-credentials.yaml index 9230c4e..fb473c4 100644 --- a/locations/jclouds/src/test/resources/org/apache/brooklyn/location/jclouds/jclouds-location-test-various-login-credentials.yaml +++ b/locations/jclouds/src/test/resources/org/apache/brooklyn/location/jclouds/jclouds-location-test-various-login-credentials.yaml @@ -25,39 +25,39 @@ name: various-login-credentials-test services: -- type: brooklyn.entity.basic.EmptySoftwareProcess +- type: org.apache.brooklyn.entity.software.base.EmptySoftwareProcess name: GOOD-default-should-use-id-rsa-or-create location: jclouds:aws-ec2 # passphrases -- type: brooklyn.entity.basic.EmptySoftwareProcess +- type: org.apache.brooklyn.entity.software.base.EmptySoftwareProcess name: GOOD-key-w-passphrase-supplied location: jclouds:aws-ec2: privateKeyFile: ~/.ssh/passphrase-id_rsa privateKeyPassphrase: passphrase -- type: brooklyn.entity.basic.EmptySoftwareProcess +- type: org.apache.brooklyn.entity.software.base.EmptySoftwareProcess name: FAIL-missing-passphrase location: jclouds:aws-ec2: privateKeyFile: ~/.ssh/passphrase-id_rsa # creating a new key -- type: brooklyn.entity.basic.EmptySoftwareProcess +- type: org.apache.brooklyn.entity.software.base.EmptySoftwareProcess name: GOOD-no-key-create-key location: jclouds:aws-ec2: privateKeyFile: "" # passwords - TODO need an image which doesn't have password-ssh disabled by default! -- type: brooklyn.entity.basic.EmptySoftwareProcess +- type: org.apache.brooklyn.entity.software.base.EmptySoftwareProcess # depends if image allows password access name: MAYBE-explicit-password location: jclouds:aws-ec2: password: foo -- type: brooklyn.entity.basic.EmptySoftwareProcess +- type: org.apache.brooklyn.entity.software.base.EmptySoftwareProcess # depends if image allows password access name: MAYBE-explicit-password-used-and-public-key-authed location: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/3d91a438/parent/pom.xml ---------------------------------------------------------------------- diff --git a/parent/pom.xml b/parent/pom.xml index 4512b1d..d8afa57 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -1150,7 +1150,7 @@ <exclude>**/*.psd</exclude> <exclude>**/*.json</exclude> <exclude>**/*.plxarc</exclude> - <exclude>**/src/test/resources/brooklyn/entity/basic/template_with_extra_substitutions.txt</exclude> + <exclude>**/src/test/resources/org/apache/brooklyn/entity/software/base/template_with_extra_substitutions.txt</exclude> <exclude>**/src/main/resources/banner.txt</exclude> <exclude>**/src/test/resources/ssl/certs/localhost/info.txt</exclude> <exclude>**/sandbox/examples/src/main/scripts/amis.txt</exclude> http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/3d91a438/sandbox/database/src/main/java/org/apache/brooklyn/entity/database/derby/DerbyDatabase.java ---------------------------------------------------------------------- diff --git a/sandbox/database/src/main/java/org/apache/brooklyn/entity/database/derby/DerbyDatabase.java b/sandbox/database/src/main/java/org/apache/brooklyn/entity/database/derby/DerbyDatabase.java index b6c09f8..bf9c70b 100644 --- a/sandbox/database/src/main/java/org/apache/brooklyn/entity/database/derby/DerbyDatabase.java +++ b/sandbox/database/src/main/java/org/apache/brooklyn/entity/database/derby/DerbyDatabase.java @@ -31,9 +31,9 @@ import org.slf4j.LoggerFactory; import brooklyn.config.ConfigKey; import org.apache.brooklyn.api.entity.Entity; -import brooklyn.entity.basic.ConfigKeys; -import brooklyn.entity.basic.SoftwareProcess; -import brooklyn.entity.basic.SoftwareProcessImpl; +import org.apache.brooklyn.core.config.ConfigKeys; +import org.apache.brooklyn.entity.software.base.SoftwareProcess; +import org.apache.brooklyn.entity.software.base.SoftwareProcessImpl; import brooklyn.entity.java.UsesJava; import brooklyn.entity.java.UsesJmx; import brooklyn.event.basic.BasicAttributeSensorAndConfigKey; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/3d91a438/sandbox/database/src/main/java/org/apache/brooklyn/entity/database/derby/DerbySchema.java ---------------------------------------------------------------------- diff --git a/sandbox/database/src/main/java/org/apache/brooklyn/entity/database/derby/DerbySchema.java b/sandbox/database/src/main/java/org/apache/brooklyn/entity/database/derby/DerbySchema.java index 99a89fb..1a895c6 100644 --- a/sandbox/database/src/main/java/org/apache/brooklyn/entity/database/derby/DerbySchema.java +++ b/sandbox/database/src/main/java/org/apache/brooklyn/entity/database/derby/DerbySchema.java @@ -29,7 +29,7 @@ import org.apache.brooklyn.core.util.flags.SetFromFlag; import org.apache.brooklyn.entity.database.Schema; import org.apache.brooklyn.api.entity.Entity; -import brooklyn.entity.basic.AbstractEntity; +import org.apache.brooklyn.entity.core.AbstractEntity; import org.apache.brooklyn.api.entity.basic.EntityLocal; import brooklyn.entity.java.UsesJmx; import org.apache.brooklyn.api.event.AttributeSensor; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/3d91a438/sandbox/extra/src/main/java/org/apache/brooklyn/entity/database/postgresql/PostgreSqlNodeSaltImpl.java ---------------------------------------------------------------------- diff --git a/sandbox/extra/src/main/java/org/apache/brooklyn/entity/database/postgresql/PostgreSqlNodeSaltImpl.java b/sandbox/extra/src/main/java/org/apache/brooklyn/entity/database/postgresql/PostgreSqlNodeSaltImpl.java index 4cd74eb..4be9e20 100644 --- a/sandbox/extra/src/main/java/org/apache/brooklyn/entity/database/postgresql/PostgreSqlNodeSaltImpl.java +++ b/sandbox/extra/src/main/java/org/apache/brooklyn/entity/database/postgresql/PostgreSqlNodeSaltImpl.java @@ -32,10 +32,10 @@ import org.slf4j.LoggerFactory; import brooklyn.config.ConfigKey; import org.apache.brooklyn.api.entity.Effector; -import brooklyn.entity.basic.ConfigKeys; -import brooklyn.entity.basic.EffectorStartableImpl; -import brooklyn.entity.basic.Entities; -import brooklyn.entity.basic.SoftwareProcess; +import org.apache.brooklyn.core.config.ConfigKeys; +import org.apache.brooklyn.entity.stock.EffectorStartableImpl; +import org.apache.brooklyn.entity.core.Entities; +import org.apache.brooklyn.entity.software.base.SoftwareProcess; import org.apache.brooklyn.entity.database.postgresql.PostgreSqlNode; import brooklyn.entity.effector.EffectorBody; import brooklyn.entity.effector.Effectors; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/3d91a438/sandbox/extra/src/main/java/org/apache/brooklyn/entity/salt/SaltConfig.java ---------------------------------------------------------------------- diff --git a/sandbox/extra/src/main/java/org/apache/brooklyn/entity/salt/SaltConfig.java b/sandbox/extra/src/main/java/org/apache/brooklyn/entity/salt/SaltConfig.java index 5a8330f..d229fcc 100644 --- a/sandbox/extra/src/main/java/org/apache/brooklyn/entity/salt/SaltConfig.java +++ b/sandbox/extra/src/main/java/org/apache/brooklyn/entity/salt/SaltConfig.java @@ -25,7 +25,7 @@ import org.apache.brooklyn.api.management.TaskFactory; import org.apache.brooklyn.core.util.flags.SetFromFlag; import brooklyn.config.ConfigKey; -import brooklyn.entity.basic.ConfigKeys; +import org.apache.brooklyn.core.config.ConfigKeys; import brooklyn.event.basic.BasicAttributeSensor; import brooklyn.event.basic.BasicConfigKey; import brooklyn.event.basic.MapConfigKey; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/3d91a438/sandbox/extra/src/main/java/org/apache/brooklyn/entity/salt/SaltConfigs.java ---------------------------------------------------------------------- diff --git a/sandbox/extra/src/main/java/org/apache/brooklyn/entity/salt/SaltConfigs.java b/sandbox/extra/src/main/java/org/apache/brooklyn/entity/salt/SaltConfigs.java index 9c97742..94a7205 100644 --- a/sandbox/extra/src/main/java/org/apache/brooklyn/entity/salt/SaltConfigs.java +++ b/sandbox/extra/src/main/java/org/apache/brooklyn/entity/salt/SaltConfigs.java @@ -22,7 +22,7 @@ import java.util.Map; import brooklyn.config.ConfigKey; import org.apache.brooklyn.api.entity.Entity; -import brooklyn.entity.basic.EntityInternal; +import org.apache.brooklyn.entity.core.EntityInternal; import org.apache.brooklyn.api.entity.proxying.EntitySpec; import brooklyn.event.basic.MapConfigKey.MapModifications; import brooklyn.event.basic.SetConfigKey.SetModifications; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/3d91a438/sandbox/extra/src/main/java/org/apache/brooklyn/entity/salt/SaltLifecycleEffectorTasks.java ---------------------------------------------------------------------- diff --git a/sandbox/extra/src/main/java/org/apache/brooklyn/entity/salt/SaltLifecycleEffectorTasks.java b/sandbox/extra/src/main/java/org/apache/brooklyn/entity/salt/SaltLifecycleEffectorTasks.java index 2d0dbf2..e418689 100644 --- a/sandbox/extra/src/main/java/org/apache/brooklyn/entity/salt/SaltLifecycleEffectorTasks.java +++ b/sandbox/extra/src/main/java/org/apache/brooklyn/entity/salt/SaltLifecycleEffectorTasks.java @@ -26,8 +26,8 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; import brooklyn.config.BrooklynServerConfig; -import brooklyn.entity.basic.Attributes; -import brooklyn.entity.basic.Lifecycle; +import org.apache.brooklyn.entity.core.Attributes; +import org.apache.brooklyn.entity.lifecycle.Lifecycle; import brooklyn.entity.software.MachineLifecycleEffectorTasks; import brooklyn.entity.software.SshEffectorTasks; import brooklyn.util.net.Urls; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/3d91a438/sandbox/extra/src/main/java/org/apache/brooklyn/entity/salt/SaltStackMaster.java ---------------------------------------------------------------------- diff --git a/sandbox/extra/src/main/java/org/apache/brooklyn/entity/salt/SaltStackMaster.java b/sandbox/extra/src/main/java/org/apache/brooklyn/entity/salt/SaltStackMaster.java index 9511a85..872865b 100644 --- a/sandbox/extra/src/main/java/org/apache/brooklyn/entity/salt/SaltStackMaster.java +++ b/sandbox/extra/src/main/java/org/apache/brooklyn/entity/salt/SaltStackMaster.java @@ -26,9 +26,9 @@ import org.apache.brooklyn.api.event.AttributeSensor; import org.apache.brooklyn.core.util.flags.SetFromFlag; import brooklyn.config.ConfigKey; -import brooklyn.entity.basic.BrooklynConfigKeys; -import brooklyn.entity.basic.ConfigKeys; -import brooklyn.entity.basic.SoftwareProcess; +import org.apache.brooklyn.entity.core.BrooklynConfigKeys; +import org.apache.brooklyn.core.config.ConfigKeys; +import org.apache.brooklyn.entity.software.base.SoftwareProcess; import brooklyn.event.basic.BasicAttributeSensor; import brooklyn.event.basic.PortAttributeSensorAndConfigKey; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/3d91a438/sandbox/extra/src/main/java/org/apache/brooklyn/entity/salt/SaltStackMasterDriver.java ---------------------------------------------------------------------- diff --git a/sandbox/extra/src/main/java/org/apache/brooklyn/entity/salt/SaltStackMasterDriver.java b/sandbox/extra/src/main/java/org/apache/brooklyn/entity/salt/SaltStackMasterDriver.java index 703213a..09c4db1 100644 --- a/sandbox/extra/src/main/java/org/apache/brooklyn/entity/salt/SaltStackMasterDriver.java +++ b/sandbox/extra/src/main/java/org/apache/brooklyn/entity/salt/SaltStackMasterDriver.java @@ -18,7 +18,7 @@ */ package org.apache.brooklyn.entity.salt; -import brooklyn.entity.basic.SoftwareProcessDriver; +import org.apache.brooklyn.entity.software.base.SoftwareProcessDriver; public interface SaltStackMasterDriver extends SoftwareProcessDriver { http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/3d91a438/sandbox/extra/src/main/java/org/apache/brooklyn/entity/salt/SaltStackMasterImpl.java ---------------------------------------------------------------------- diff --git a/sandbox/extra/src/main/java/org/apache/brooklyn/entity/salt/SaltStackMasterImpl.java b/sandbox/extra/src/main/java/org/apache/brooklyn/entity/salt/SaltStackMasterImpl.java index 1adfd1a..36cbc65 100644 --- a/sandbox/extra/src/main/java/org/apache/brooklyn/entity/salt/SaltStackMasterImpl.java +++ b/sandbox/extra/src/main/java/org/apache/brooklyn/entity/salt/SaltStackMasterImpl.java @@ -21,7 +21,7 @@ package org.apache.brooklyn.entity.salt; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import brooklyn.entity.basic.SoftwareProcessImpl; +import org.apache.brooklyn.entity.software.base.SoftwareProcessImpl; import brooklyn.event.feed.ConfigToAttributes; public class SaltStackMasterImpl extends SoftwareProcessImpl implements SaltStackMaster { http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/3d91a438/sandbox/extra/src/main/java/org/apache/brooklyn/entity/salt/SaltStackMasterSshDriver.java ---------------------------------------------------------------------- diff --git a/sandbox/extra/src/main/java/org/apache/brooklyn/entity/salt/SaltStackMasterSshDriver.java b/sandbox/extra/src/main/java/org/apache/brooklyn/entity/salt/SaltStackMasterSshDriver.java index e77ddff..df39083 100644 --- a/sandbox/extra/src/main/java/org/apache/brooklyn/entity/salt/SaltStackMasterSshDriver.java +++ b/sandbox/extra/src/main/java/org/apache/brooklyn/entity/salt/SaltStackMasterSshDriver.java @@ -21,7 +21,7 @@ package org.apache.brooklyn.entity.salt; import org.apache.brooklyn.location.basic.SshMachineLocation; import org.apache.brooklyn.core.util.task.DynamicTasks; -import brooklyn.entity.basic.Entities; +import org.apache.brooklyn.entity.core.Entities; import brooklyn.entity.java.JavaSoftwareProcessSshDriver; import brooklyn.util.ssh.BashCommands; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/3d91a438/sandbox/extra/src/main/java/org/apache/brooklyn/entity/salt/SaltTasks.java ---------------------------------------------------------------------- diff --git a/sandbox/extra/src/main/java/org/apache/brooklyn/entity/salt/SaltTasks.java b/sandbox/extra/src/main/java/org/apache/brooklyn/entity/salt/SaltTasks.java index 8a3ccc1..49871bd 100644 --- a/sandbox/extra/src/main/java/org/apache/brooklyn/entity/salt/SaltTasks.java +++ b/sandbox/extra/src/main/java/org/apache/brooklyn/entity/salt/SaltTasks.java @@ -33,7 +33,7 @@ import org.apache.brooklyn.core.util.task.DynamicTasks; import org.apache.brooklyn.core.util.task.Tasks; import org.apache.brooklyn.core.util.text.TemplateProcessor; -import brooklyn.entity.basic.Entities; +import org.apache.brooklyn.entity.core.Entities; import brooklyn.entity.effector.EffectorTasks; import brooklyn.entity.software.SshEffectorTasks; import brooklyn.util.collections.MutableMap; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/3d91a438/sandbox/extra/src/test/java/org/apache/brooklyn/entity/database/postgresql/PostgreSqlSaltLiveTest.java ---------------------------------------------------------------------- diff --git a/sandbox/extra/src/test/java/org/apache/brooklyn/entity/database/postgresql/PostgreSqlSaltLiveTest.java b/sandbox/extra/src/test/java/org/apache/brooklyn/entity/database/postgresql/PostgreSqlSaltLiveTest.java index 6f195bb..613e002 100644 --- a/sandbox/extra/src/test/java/org/apache/brooklyn/entity/database/postgresql/PostgreSqlSaltLiveTest.java +++ b/sandbox/extra/src/test/java/org/apache/brooklyn/entity/database/postgresql/PostgreSqlSaltLiveTest.java @@ -35,7 +35,7 @@ import org.testng.Assert; import org.testng.annotations.AfterMethod; import org.testng.annotations.Test; -import brooklyn.entity.basic.Entities; +import org.apache.brooklyn.entity.core.Entities; import org.apache.brooklyn.entity.database.VogellaExampleAccess; import org.apache.brooklyn.entity.database.postgresql.PostgreSqlIntegrationTest; import org.apache.brooklyn.entity.database.postgresql.PostgreSqlNode; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/3d91a438/sandbox/extra/src/test/java/org/apache/brooklyn/entity/salt/SaltConfigsTest.java ---------------------------------------------------------------------- diff --git a/sandbox/extra/src/test/java/org/apache/brooklyn/entity/salt/SaltConfigsTest.java b/sandbox/extra/src/test/java/org/apache/brooklyn/entity/salt/SaltConfigsTest.java index c76e1e6..12758c3 100644 --- a/sandbox/extra/src/test/java/org/apache/brooklyn/entity/salt/SaltConfigsTest.java +++ b/sandbox/extra/src/test/java/org/apache/brooklyn/entity/salt/SaltConfigsTest.java @@ -27,8 +27,8 @@ import org.testng.Assert; import org.testng.annotations.AfterMethod; import org.testng.annotations.Test; -import brooklyn.entity.basic.ApplicationBuilder; -import brooklyn.entity.basic.Entities; +import org.apache.brooklyn.entity.factory.ApplicationBuilder; +import org.apache.brooklyn.entity.core.Entities; import org.apache.brooklyn.test.entity.TestApplication; import com.google.common.collect.ImmutableMap; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/3d91a438/sandbox/nosql/src/main/java/org/apache/brooklyn/entity/nosql/hazelcast/HazelcastCluster.java ---------------------------------------------------------------------- diff --git a/sandbox/nosql/src/main/java/org/apache/brooklyn/entity/nosql/hazelcast/HazelcastCluster.java b/sandbox/nosql/src/main/java/org/apache/brooklyn/entity/nosql/hazelcast/HazelcastCluster.java index 26e529f..656faf6 100644 --- a/sandbox/nosql/src/main/java/org/apache/brooklyn/entity/nosql/hazelcast/HazelcastCluster.java +++ b/sandbox/nosql/src/main/java/org/apache/brooklyn/entity/nosql/hazelcast/HazelcastCluster.java @@ -28,7 +28,7 @@ import org.apache.brooklyn.api.event.AttributeSensor; import org.apache.brooklyn.core.util.flags.SetFromFlag; import brooklyn.config.ConfigKey; -import brooklyn.entity.basic.ConfigKeys; +import org.apache.brooklyn.core.config.ConfigKeys; import brooklyn.entity.group.DynamicCluster; import brooklyn.event.basic.BasicAttributeSensorAndConfigKey; import brooklyn.event.basic.Sensors; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/3d91a438/sandbox/nosql/src/main/java/org/apache/brooklyn/entity/nosql/hazelcast/HazelcastClusterImpl.java ---------------------------------------------------------------------- diff --git a/sandbox/nosql/src/main/java/org/apache/brooklyn/entity/nosql/hazelcast/HazelcastClusterImpl.java b/sandbox/nosql/src/main/java/org/apache/brooklyn/entity/nosql/hazelcast/HazelcastClusterImpl.java index 0eb6744..f7a8e48 100644 --- a/sandbox/nosql/src/main/java/org/apache/brooklyn/entity/nosql/hazelcast/HazelcastClusterImpl.java +++ b/sandbox/nosql/src/main/java/org/apache/brooklyn/entity/nosql/hazelcast/HazelcastClusterImpl.java @@ -27,8 +27,8 @@ import org.slf4j.LoggerFactory; import com.google.common.collect.Lists; import org.apache.brooklyn.api.entity.Entity; -import brooklyn.entity.basic.Attributes; -import brooklyn.entity.basic.EntityInternal; +import org.apache.brooklyn.entity.core.Attributes; +import org.apache.brooklyn.entity.core.EntityInternal; import brooklyn.entity.group.AbstractMembershipTrackingPolicy; import brooklyn.entity.group.DynamicClusterImpl; import org.apache.brooklyn.api.entity.proxying.EntitySpec; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/3d91a438/sandbox/nosql/src/main/java/org/apache/brooklyn/entity/nosql/hazelcast/HazelcastNode.java ---------------------------------------------------------------------- diff --git a/sandbox/nosql/src/main/java/org/apache/brooklyn/entity/nosql/hazelcast/HazelcastNode.java b/sandbox/nosql/src/main/java/org/apache/brooklyn/entity/nosql/hazelcast/HazelcastNode.java index f8a4eb6..c9d2df5 100644 --- a/sandbox/nosql/src/main/java/org/apache/brooklyn/entity/nosql/hazelcast/HazelcastNode.java +++ b/sandbox/nosql/src/main/java/org/apache/brooklyn/entity/nosql/hazelcast/HazelcastNode.java @@ -24,8 +24,8 @@ import org.apache.brooklyn.core.util.flags.SetFromFlag; import org.apache.brooklyn.location.basic.PortRanges; import brooklyn.config.ConfigKey; -import brooklyn.entity.basic.ConfigKeys; -import brooklyn.entity.basic.SoftwareProcess; +import org.apache.brooklyn.core.config.ConfigKeys; +import org.apache.brooklyn.entity.software.base.SoftwareProcess; import brooklyn.entity.java.UsesJava; import brooklyn.entity.java.UsesJmx; import brooklyn.event.basic.BasicAttributeSensorAndConfigKey; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/3d91a438/sandbox/nosql/src/main/java/org/apache/brooklyn/entity/nosql/hazelcast/HazelcastNodeDriver.java ---------------------------------------------------------------------- diff --git a/sandbox/nosql/src/main/java/org/apache/brooklyn/entity/nosql/hazelcast/HazelcastNodeDriver.java b/sandbox/nosql/src/main/java/org/apache/brooklyn/entity/nosql/hazelcast/HazelcastNodeDriver.java index e5aa759..8cf1e0c 100644 --- a/sandbox/nosql/src/main/java/org/apache/brooklyn/entity/nosql/hazelcast/HazelcastNodeDriver.java +++ b/sandbox/nosql/src/main/java/org/apache/brooklyn/entity/nosql/hazelcast/HazelcastNodeDriver.java @@ -18,7 +18,7 @@ */ package org.apache.brooklyn.entity.nosql.hazelcast; -import brooklyn.entity.basic.SoftwareProcessDriver; +import org.apache.brooklyn.entity.software.base.SoftwareProcessDriver; public interface HazelcastNodeDriver extends SoftwareProcessDriver { http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/3d91a438/sandbox/nosql/src/main/java/org/apache/brooklyn/entity/nosql/hazelcast/HazelcastNodeImpl.java ---------------------------------------------------------------------- diff --git a/sandbox/nosql/src/main/java/org/apache/brooklyn/entity/nosql/hazelcast/HazelcastNodeImpl.java b/sandbox/nosql/src/main/java/org/apache/brooklyn/entity/nosql/hazelcast/HazelcastNodeImpl.java index 3efc53d..efd575c 100644 --- a/sandbox/nosql/src/main/java/org/apache/brooklyn/entity/nosql/hazelcast/HazelcastNodeImpl.java +++ b/sandbox/nosql/src/main/java/org/apache/brooklyn/entity/nosql/hazelcast/HazelcastNodeImpl.java @@ -24,8 +24,8 @@ import java.util.concurrent.TimeUnit; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import brooklyn.entity.basic.Attributes; -import brooklyn.entity.basic.SoftwareProcessImpl; +import org.apache.brooklyn.entity.core.Attributes; +import org.apache.brooklyn.entity.software.base.SoftwareProcessImpl; import brooklyn.event.feed.http.HttpFeed; import brooklyn.event.feed.http.HttpPollConfig; import brooklyn.event.feed.http.HttpValueFunctions; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/3d91a438/sandbox/nosql/src/main/java/org/apache/brooklyn/entity/nosql/hazelcast/HazelcastNodeSshDriver.java ---------------------------------------------------------------------- diff --git a/sandbox/nosql/src/main/java/org/apache/brooklyn/entity/nosql/hazelcast/HazelcastNodeSshDriver.java b/sandbox/nosql/src/main/java/org/apache/brooklyn/entity/nosql/hazelcast/HazelcastNodeSshDriver.java index 157a2b7..aaf281a 100644 --- a/sandbox/nosql/src/main/java/org/apache/brooklyn/entity/nosql/hazelcast/HazelcastNodeSshDriver.java +++ b/sandbox/nosql/src/main/java/org/apache/brooklyn/entity/nosql/hazelcast/HazelcastNodeSshDriver.java @@ -27,7 +27,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.apache.brooklyn.api.entity.Entity; -import brooklyn.entity.basic.Entities; +import org.apache.brooklyn.entity.core.Entities; import org.apache.brooklyn.api.entity.basic.EntityLocal; import brooklyn.entity.java.JavaSoftwareProcessSshDriver; import org.apache.brooklyn.location.basic.SshMachineLocation; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/3d91a438/sandbox/nosql/src/main/java/org/apache/brooklyn/entity/nosql/infinispan/Infinispan5Server.java ---------------------------------------------------------------------- diff --git a/sandbox/nosql/src/main/java/org/apache/brooklyn/entity/nosql/infinispan/Infinispan5Server.java b/sandbox/nosql/src/main/java/org/apache/brooklyn/entity/nosql/infinispan/Infinispan5Server.java index f46f61d..1320fdc 100644 --- a/sandbox/nosql/src/main/java/org/apache/brooklyn/entity/nosql/infinispan/Infinispan5Server.java +++ b/sandbox/nosql/src/main/java/org/apache/brooklyn/entity/nosql/infinispan/Infinispan5Server.java @@ -26,9 +26,9 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; import brooklyn.config.ConfigKey; -import brooklyn.entity.basic.ConfigKeys; -import brooklyn.entity.basic.SoftwareProcess; -import brooklyn.entity.basic.SoftwareProcessImpl; +import org.apache.brooklyn.core.config.ConfigKeys; +import org.apache.brooklyn.entity.software.base.SoftwareProcess; +import org.apache.brooklyn.entity.software.base.SoftwareProcessImpl; import brooklyn.entity.java.UsesJmx; import brooklyn.event.basic.BasicAttributeSensorAndConfigKey; import brooklyn.event.basic.PortAttributeSensorAndConfigKey; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/3d91a438/sandbox/nosql/src/test/java/org/apache/brooklyn/entity/nosql/hazelcast/HazelcastClusterEc2LiveTest.java ---------------------------------------------------------------------- diff --git a/sandbox/nosql/src/test/java/org/apache/brooklyn/entity/nosql/hazelcast/HazelcastClusterEc2LiveTest.java b/sandbox/nosql/src/test/java/org/apache/brooklyn/entity/nosql/hazelcast/HazelcastClusterEc2LiveTest.java index 8cd90c9..ae9b148 100644 --- a/sandbox/nosql/src/test/java/org/apache/brooklyn/entity/nosql/hazelcast/HazelcastClusterEc2LiveTest.java +++ b/sandbox/nosql/src/test/java/org/apache/brooklyn/entity/nosql/hazelcast/HazelcastClusterEc2LiveTest.java @@ -26,7 +26,7 @@ import org.slf4j.LoggerFactory; import org.testng.annotations.Test; import brooklyn.entity.AbstractEc2LiveTest; -import brooklyn.entity.basic.Attributes; +import org.apache.brooklyn.entity.core.Attributes; import org.apache.brooklyn.api.entity.proxying.EntitySpec; import org.apache.brooklyn.api.location.Location; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/3d91a438/sandbox/nosql/src/test/java/org/apache/brooklyn/entity/nosql/hazelcast/HazelcastClusterSoftlayerLiveTest.java ---------------------------------------------------------------------- diff --git a/sandbox/nosql/src/test/java/org/apache/brooklyn/entity/nosql/hazelcast/HazelcastClusterSoftlayerLiveTest.java b/sandbox/nosql/src/test/java/org/apache/brooklyn/entity/nosql/hazelcast/HazelcastClusterSoftlayerLiveTest.java index f251c23..ed1c755 100644 --- a/sandbox/nosql/src/test/java/org/apache/brooklyn/entity/nosql/hazelcast/HazelcastClusterSoftlayerLiveTest.java +++ b/sandbox/nosql/src/test/java/org/apache/brooklyn/entity/nosql/hazelcast/HazelcastClusterSoftlayerLiveTest.java @@ -26,7 +26,7 @@ import org.slf4j.LoggerFactory; import org.testng.annotations.Test; import brooklyn.entity.AbstractSoftlayerLiveTest; -import brooklyn.entity.basic.Attributes; +import org.apache.brooklyn.entity.core.Attributes; import org.apache.brooklyn.api.entity.proxying.EntitySpec; import org.apache.brooklyn.api.location.Location; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/3d91a438/sandbox/nosql/src/test/java/org/apache/brooklyn/entity/nosql/infinispan/Infinispan5ServerIntegrationTest.groovy ---------------------------------------------------------------------- diff --git a/sandbox/nosql/src/test/java/org/apache/brooklyn/entity/nosql/infinispan/Infinispan5ServerIntegrationTest.groovy b/sandbox/nosql/src/test/java/org/apache/brooklyn/entity/nosql/infinispan/Infinispan5ServerIntegrationTest.groovy index 5205a74..2bfb9ab 100644 --- a/sandbox/nosql/src/test/java/org/apache/brooklyn/entity/nosql/infinispan/Infinispan5ServerIntegrationTest.groovy +++ b/sandbox/nosql/src/test/java/org/apache/brooklyn/entity/nosql/infinispan/Infinispan5ServerIntegrationTest.groovy @@ -32,7 +32,7 @@ import org.testng.annotations.BeforeMethod import org.testng.annotations.Test import org.apache.brooklyn.api.entity.Application -import brooklyn.entity.basic.Entities +import org.apache.brooklyn.entity.core.Entities import org.apache.brooklyn.location.basic.LocalhostMachineProvisioningLocation import org.apache.brooklyn.test.entity.TestApplicationImpl import brooklyn.util.internal.TimeExtras http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/3d91a438/software/base/src/main/java/org/apache/brooklyn/entity/software/base/AbstractSoftwareProcessDriver.java ---------------------------------------------------------------------- diff --git a/software/base/src/main/java/org/apache/brooklyn/entity/software/base/AbstractSoftwareProcessDriver.java b/software/base/src/main/java/org/apache/brooklyn/entity/software/base/AbstractSoftwareProcessDriver.java index 5efd7c2..41385ea 100644 --- a/software/base/src/main/java/org/apache/brooklyn/entity/software/base/AbstractSoftwareProcessDriver.java +++ b/software/base/src/main/java/org/apache/brooklyn/entity/software/base/AbstractSoftwareProcessDriver.java @@ -68,7 +68,7 @@ public abstract class AbstractSoftwareProcessDriver implements SoftwareProcessDr /* * (non-Javadoc) - * @see brooklyn.entity.basic.SoftwareProcessDriver#rebind() + * @see org.apache.brooklyn.entity.software.base.SoftwareProcessDriver#rebind() */ @Override public void rebind() { http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/3d91a438/software/base/src/test/java/org/apache/brooklyn/entity/software/base/DoNothingSoftwareProcess.java ---------------------------------------------------------------------- diff --git a/software/base/src/test/java/org/apache/brooklyn/entity/software/base/DoNothingSoftwareProcess.java b/software/base/src/test/java/org/apache/brooklyn/entity/software/base/DoNothingSoftwareProcess.java index 4459db4..538b7a8 100644 --- a/software/base/src/test/java/org/apache/brooklyn/entity/software/base/DoNothingSoftwareProcess.java +++ b/software/base/src/test/java/org/apache/brooklyn/entity/software/base/DoNothingSoftwareProcess.java @@ -22,7 +22,6 @@ import org.apache.brooklyn.api.entity.ImplementedBy; import org.apache.brooklyn.config.ConfigKey; import org.apache.brooklyn.core.config.ConfigKeys; import org.apache.brooklyn.entity.core.BrooklynConfigKeys; -import org.apache.brooklyn.entity.software.base.SoftwareProcess; @ImplementedBy(DoNothingSoftwareProcessImpl.class) public interface DoNothingSoftwareProcess extends SoftwareProcess { http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/3d91a438/software/base/src/test/java/org/apache/brooklyn/entity/software/base/VanillaSoftwareProcessAndChildrenIntegrationTest.java ---------------------------------------------------------------------- diff --git a/software/base/src/test/java/org/apache/brooklyn/entity/software/base/VanillaSoftwareProcessAndChildrenIntegrationTest.java b/software/base/src/test/java/org/apache/brooklyn/entity/software/base/VanillaSoftwareProcessAndChildrenIntegrationTest.java index 3298a2f..4164dde 100644 --- a/software/base/src/test/java/org/apache/brooklyn/entity/software/base/VanillaSoftwareProcessAndChildrenIntegrationTest.java +++ b/software/base/src/test/java/org/apache/brooklyn/entity/software/base/VanillaSoftwareProcessAndChildrenIntegrationTest.java @@ -50,7 +50,7 @@ public class VanillaSoftwareProcessAndChildrenIntegrationTest { // TODO Why are these tests so slow? Even when the sleep time was 3 seconds instead of 10, they would still take about 10 seconds. // Note that tests run by jenkins can be extremely time-sensitive. - // e.g. http://brooklyn.builds.cloudsoftcorp.com/job/Brooklyn-Master-Integration/io.brooklyn$brooklyn-software-base/217/testReport/junit/brooklyn.entity.basic/VanillaSoftwareProcessAndChildrenIntegrationTest/testModeBackground/ + // e.g. http://brooklyn.builds.cloudsoftcorp.com/job/Brooklyn-Master-Integration/io.brooklyn$brooklyn-software-base/217/testReport/junit/org.apache.brooklyn.entity.software.base/VanillaSoftwareProcessAndChildrenIntegrationTest/testModeBackground/ // shows a 5 second difference when in background mode, whereas the test originally asserted a difference of <= 1. // Therefore increasing time that tests will take, but decreasing the sensitivity so we don't get such false-negatives. http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/3d91a438/software/nosql/src/main/resources/org/apache/brooklyn/entity/nosql/couchbase/pillowfight.yaml ---------------------------------------------------------------------- diff --git a/software/nosql/src/main/resources/org/apache/brooklyn/entity/nosql/couchbase/pillowfight.yaml b/software/nosql/src/main/resources/org/apache/brooklyn/entity/nosql/couchbase/pillowfight.yaml index 01f4027..5323885 100644 --- a/software/nosql/src/main/resources/org/apache/brooklyn/entity/nosql/couchbase/pillowfight.yaml +++ b/software/nosql/src/main/resources/org/apache/brooklyn/entity/nosql/couchbase/pillowfight.yaml @@ -17,7 +17,7 @@ # under the License. # services: -- type: brooklyn.entity.basic.VanillaSoftwareProcess +- type: org.apache.brooklyn.entity.software.base.VanillaSoftwareProcess name: CBC Pillowfight launch.command: | sudo wget -O/etc/apt/sources.list.d/couchbase.list http://packages.couchbase.com/ubuntu/couchbase-ubuntu1204.list http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/3d91a438/software/webapp/src/main/java/org/apache/brooklyn/entity/webapp/WebAppServiceMetrics.java ---------------------------------------------------------------------- diff --git a/software/webapp/src/main/java/org/apache/brooklyn/entity/webapp/WebAppServiceMetrics.java b/software/webapp/src/main/java/org/apache/brooklyn/entity/webapp/WebAppServiceMetrics.java index 61a61f5..6319089 100644 --- a/software/webapp/src/main/java/org/apache/brooklyn/entity/webapp/WebAppServiceMetrics.java +++ b/software/webapp/src/main/java/org/apache/brooklyn/entity/webapp/WebAppServiceMetrics.java @@ -36,7 +36,7 @@ public interface WebAppServiceMetrics { Sensors.newIntegerSensor("webapp.reqs.processingTime.max", "Max processing time for any single request, reported by webserver (millis)"); /** the fraction of time represented by the most recent delta to TOTAL_PROCESSING_TIME, ie 0.4 if 800 millis were accumulated in last 2s; - * easily configured with {@link WebAppServiceMethods#connectWebAppServerPolicies(brooklyn.entity.basic.EntityLocal, org.apache.brooklyn.util.time.Duration)} */ + * easily configured with {@link WebAppServiceMethods#connectWebAppServerPolicies(org.apache.brooklyn.api.internal.EntityLocal, org.apache.brooklyn.util.time.Duration)} */ public static final AttributeSensor<Double> PROCESSING_TIME_FRACTION_LAST = Sensors.newDoubleSensor("webapp.reqs.processingTime.fraction.last", "Fraction of time spent processing, reported by webserver (percentage, last datapoint)"); public static final AttributeSensor<Double> PROCESSING_TIME_FRACTION_IN_WINDOW = @@ -52,7 +52,7 @@ public interface WebAppServiceMetrics { Sensors.newDoubleSensor("webapp.reqs.perSec.last", "Reqs/sec (last datapoint)"); /** rolled-up req/second for a window, - * easily configured with {@link WebAppServiceMethods#connectWebAppServerPolicies(brooklyn.entity.basic.EntityLocal, org.apache.brooklyn.util.time.Duration)} */ + * easily configured with {@link WebAppServiceMethods#connectWebAppServerPolicies(org.apache.brooklyn.api.internal.EntityLocal, org.apache.brooklyn.util.time.Duration)} */ public static final AttributeSensor<Double> REQUESTS_PER_SECOND_IN_WINDOW = Sensors.newDoubleSensor("webapp.reqs.perSec.windowed", "Reqs/sec (over time window)"); http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/3d91a438/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 edb774f..30bea17 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 @@ -61,7 +61,7 @@ public class ByonLocationsYamlTest extends AbstractYamlTest { String yaml = Joiner.on("\n").join( "location: byon(user=myuser,mykey=myval,hosts=\"1.1.1.1\")", "services:", - "- serviceType: brooklyn.entity.basic.BasicApplication"); + "- serviceType: org.apache.brooklyn.entity.stock.BasicApplication"); Entity app = createStartWaitAndLogApplication(new StringReader(yaml)); FixedListMachineProvisioningLocation<SshMachineLocation> loc = (FixedListMachineProvisioningLocation<SshMachineLocation>) Iterables.get(app.getLocations(), 0); @@ -84,7 +84,7 @@ public class ByonLocationsYamlTest extends AbstractYamlTest { " user: myuser", " mykey: myval", "services:", - "- serviceType: brooklyn.entity.basic.BasicApplication"); + "- serviceType: org.apache.brooklyn.entity.stock.BasicApplication"); Entity app = createStartWaitAndLogApplication(new StringReader(yaml)); FixedListMachineProvisioningLocation<SshMachineLocation> loc = (FixedListMachineProvisioningLocation<SshMachineLocation>) Iterables.get(app.getLocations(), 0); @@ -111,7 +111,7 @@ public class ByonLocationsYamlTest extends AbstractYamlTest { " mykey: myval", " osfamily: windows", "services:", - "- serviceType: brooklyn.entity.basic.BasicApplication"); + "- serviceType: org.apache.brooklyn.entity.stock.BasicApplication"); Entity app = createStartWaitAndLogApplication(new StringReader(yaml)); FixedListMachineProvisioningLocation<WinRmMachineLocation> loc = (FixedListMachineProvisioningLocation<WinRmMachineLocation>) Iterables.get(app.getLocations(), 0); @@ -148,7 +148,7 @@ public class ByonLocationsYamlTest extends AbstractYamlTest { " mykey: myval3", " osfamily: windows", "services:", - "- serviceType: brooklyn.entity.basic.BasicApplication"); + "- serviceType: org.apache.brooklyn.entity.stock.BasicApplication"); Entity app = createStartWaitAndLogApplication(new StringReader(yaml)); FixedListMachineProvisioningLocation<MachineLocation> loc = (FixedListMachineProvisioningLocation<MachineLocation>) Iterables.get(app.getLocations(), 0); @@ -196,7 +196,7 @@ public class ByonLocationsYamlTest extends AbstractYamlTest { " mykey: myval2", " osfamily: windows", "services:", - "- serviceType: brooklyn.entity.basic.BasicApplication"); + "- serviceType: org.apache.brooklyn.entity.stock.BasicApplication"); Entity app = createStartWaitAndLogApplication(new StringReader(yaml)); FixedListMachineProvisioningLocation<MachineLocation> loc = (FixedListMachineProvisioningLocation<MachineLocation>) Iterables.get(app.getLocations(), 0); @@ -235,7 +235,7 @@ public class ByonLocationsYamlTest extends AbstractYamlTest { " password: mypassword", " user: myuser", "services:", - "- type: brooklyn.entity.basic.DoNothingSoftwareProcess", + "- type: org.apache.brooklyn.entity.software.base.DoNothingSoftwareProcess", " brooklyn.config:", " requiredOpenLoginPorts: [22, 1024]"); http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/3d91a438/usage/camp/src/test/java/org/apache/brooklyn/camp/brooklyn/ReferencedYamlTest.java ---------------------------------------------------------------------- diff --git a/usage/camp/src/test/java/org/apache/brooklyn/camp/brooklyn/ReferencedYamlTest.java b/usage/camp/src/test/java/org/apache/brooklyn/camp/brooklyn/ReferencedYamlTest.java index 0c05ab1..32f9a5f 100644 --- a/usage/camp/src/test/java/org/apache/brooklyn/camp/brooklyn/ReferencedYamlTest.java +++ b/usage/camp/src/test/java/org/apache/brooklyn/camp/brooklyn/ReferencedYamlTest.java @@ -71,7 +71,7 @@ public class ReferencedYamlTest extends AbstractYamlTest { String entityName = "Reference child name"; Entity createAndStartApplication = createAndStartApplication( "services:", - "- type: brooklyn.entity.basic.BasicEntity", + "- type: org.apache.brooklyn.entity.stock.BasicEntity", " brooklyn.children:", " - name: " + entityName, " type: classpath://yaml-ref-entity.yaml"); @@ -83,7 +83,7 @@ public class ReferencedYamlTest extends AbstractYamlTest { public void testAnonymousReferenceYamlAsChild() throws Exception { Entity createAndStartApplication = createAndStartApplication( "services:", - "- type: brooklyn.entity.basic.BasicEntity", + "- type: org.apache.brooklyn.entity.stock.BasicEntity", " brooklyn.children:", " - type: classpath://yaml-ref-entity.yaml"); @@ -115,7 +115,7 @@ public class ReferencedYamlTest extends AbstractYamlTest { " id: yaml.basic", " version: " + TEST_VERSION, "services:", - "- type: brooklyn.entity.basic.BasicEntity"); + "- type: org.apache.brooklyn.entity.stock.BasicEntity"); String entityName = "YAML -> yaml url -> catalog item"; Entity app = createAndStartApplication( http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/3d91a438/usage/camp/src/test/java/org/apache/brooklyn/camp/brooklyn/catalog/CatalogOsgiVersionMoreEntityTest.java ---------------------------------------------------------------------- diff --git a/usage/camp/src/test/java/org/apache/brooklyn/camp/brooklyn/catalog/CatalogOsgiVersionMoreEntityTest.java b/usage/camp/src/test/java/org/apache/brooklyn/camp/brooklyn/catalog/CatalogOsgiVersionMoreEntityTest.java index a1368ff..8b959be 100644 --- a/usage/camp/src/test/java/org/apache/brooklyn/camp/brooklyn/catalog/CatalogOsgiVersionMoreEntityTest.java +++ b/usage/camp/src/test/java/org/apache/brooklyn/camp/brooklyn/catalog/CatalogOsgiVersionMoreEntityTest.java @@ -216,7 +216,7 @@ public class CatalogOsgiVersionMoreEntityTest extends AbstractYamlTest { Entity app = createAndStartApplication( "services: ", - "- type: brooklyn.entity.basic.BasicEntity", + "- type: org.apache.brooklyn.entity.stock.BasicEntity", " brooklyn.policies:", " - type: more-policy:2.0.test"); Entity basicEntity = Iterables.getOnlyElement(app.getChildren()); http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/3d91a438/usage/camp/src/test/java/org/apache/brooklyn/camp/brooklyn/catalog/CatalogXmlVersionTest.java ---------------------------------------------------------------------- diff --git a/usage/camp/src/test/java/org/apache/brooklyn/camp/brooklyn/catalog/CatalogXmlVersionTest.java b/usage/camp/src/test/java/org/apache/brooklyn/camp/brooklyn/catalog/CatalogXmlVersionTest.java index fa44d50..40abd03 100644 --- a/usage/camp/src/test/java/org/apache/brooklyn/camp/brooklyn/catalog/CatalogXmlVersionTest.java +++ b/usage/camp/src/test/java/org/apache/brooklyn/camp/brooklyn/catalog/CatalogXmlVersionTest.java @@ -33,9 +33,9 @@ public class CatalogXmlVersionTest extends AbstractCatalogXmlTest { @DataProvider(name = "types") public Object[][] createTypes() { return new Object[][] { - {"brooklyn.entity.basic.BasicApplication"}, - {"brooklyn.entity.basic.BasicApplication:0.0.0.SNAPSHOT"}, - {"brooklyn.entity.basic.BasicApplication:2.0"}, + {"org.apache.brooklyn.entity.stock.BasicApplication"}, + {"org.apache.brooklyn.entity.stock.BasicApplication:0.0.0.SNAPSHOT"}, + {"org.apache.brooklyn.entity.stock.BasicApplication:2.0"}, {"BasicApp"}, // test that items with symbolicName not matching the type work {"BasicApp:0.0.0.SNAPSHOT"}, {"BasicApp:2.0"}, http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/3d91a438/usage/camp/src/test/java/org/apache/brooklyn/camp/brooklyn/catalog/CatalogYamlAppTest.java ---------------------------------------------------------------------- diff --git a/usage/camp/src/test/java/org/apache/brooklyn/camp/brooklyn/catalog/CatalogYamlAppTest.java b/usage/camp/src/test/java/org/apache/brooklyn/camp/brooklyn/catalog/CatalogYamlAppTest.java index 975fb70..30c383d 100644 --- a/usage/camp/src/test/java/org/apache/brooklyn/camp/brooklyn/catalog/CatalogYamlAppTest.java +++ b/usage/camp/src/test/java/org/apache/brooklyn/camp/brooklyn/catalog/CatalogYamlAppTest.java @@ -32,7 +32,7 @@ public class CatalogYamlAppTest extends AbstractYamlTest { * "BasicEntity" cyclic reference. * * The circular reference comes from the member spec referencing - * "brooklyn.entity.basic.BasicEntity", but that has been defined in the + * "org.apache.brooklyn.entity.stock.BasicEntity", but that has been defined in the * catalog as this new blueprint (which overrides the previous value of it * being a reference to the Java class). * @@ -45,16 +45,16 @@ public class CatalogYamlAppTest extends AbstractYamlTest { // Add a catalog item with a circular reference to its own id. addCatalogItems( "brooklyn.catalog:", - " id: brooklyn.entity.basic.BasicEntity", + " id: org.apache.brooklyn.entity.stock.BasicEntity", " version: "+TEST_VERSION, "services:", - "- type: brooklyn.entity.basic.BasicApplication", + "- type: org.apache.brooklyn.entity.stock.BasicApplication", " brooklyn.config:", " memberSpec:", " $brooklyn:entitySpec:", - " - type: brooklyn.entity.basic.BasicApplication", + " - type: org.apache.brooklyn.entity.stock.BasicApplication", " brooklyn.children:", - " - type: brooklyn.entity.basic.BasicEntity"); + " - type: org.apache.brooklyn.entity.stock.BasicEntity"); try { // Use the blueprint from the catalog that has the circular reference. @@ -64,10 +64,10 @@ public class CatalogYamlAppTest extends AbstractYamlTest { " id: another.app.in.the.catalog", " version: "+TEST_VERSION, "services:", - "- type: brooklyn.entity.basic.BasicEntity"); + "- type: org.apache.brooklyn.entity.stock.BasicEntity"); deleteCatalogEntity("another.app.in.the.catalog"); } finally { - deleteCatalogEntity("brooklyn.entity.basic.BasicEntity"); + deleteCatalogEntity("org.apache.brooklyn.entity.stock.BasicEntity"); } } } http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/3d91a438/usage/camp/src/test/java/org/apache/brooklyn/camp/brooklyn/catalog/CatalogYamlEntityTest.java ---------------------------------------------------------------------- diff --git a/usage/camp/src/test/java/org/apache/brooklyn/camp/brooklyn/catalog/CatalogYamlEntityTest.java b/usage/camp/src/test/java/org/apache/brooklyn/camp/brooklyn/catalog/CatalogYamlEntityTest.java index 75be60f..898f399 100644 --- a/usage/camp/src/test/java/org/apache/brooklyn/camp/brooklyn/catalog/CatalogYamlEntityTest.java +++ b/usage/camp/src/test/java/org/apache/brooklyn/camp/brooklyn/catalog/CatalogYamlEntityTest.java @@ -552,7 +552,7 @@ public class CatalogYamlEntityTest extends AbstractYamlTest { " version: " + TEST_VERSION, "", "services:", - "- type: brooklyn.entity.basic.BasicEntity"); + "- type: org.apache.brooklyn.entity.stock.BasicEntity"); try { addCatalogItems( @@ -577,7 +577,7 @@ public class CatalogYamlEntityTest extends AbstractYamlTest { " version: " + TEST_VERSION, "", "services:", - "- type: brooklyn.entity.basic.BasicEntity"); + "- type: org.apache.brooklyn.entity.stock.BasicEntity"); String versionedId = CatalogUtils.getVersionedId(symbolicName, TEST_VERSION); try { http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/3d91a438/usage/camp/src/test/java/org/apache/brooklyn/camp/brooklyn/catalog/CatalogYamlLocationTest.java ---------------------------------------------------------------------- diff --git a/usage/camp/src/test/java/org/apache/brooklyn/camp/brooklyn/catalog/CatalogYamlLocationTest.java b/usage/camp/src/test/java/org/apache/brooklyn/camp/brooklyn/catalog/CatalogYamlLocationTest.java index 2a82857..a03041a 100644 --- a/usage/camp/src/test/java/org/apache/brooklyn/camp/brooklyn/catalog/CatalogYamlLocationTest.java +++ b/usage/camp/src/test/java/org/apache/brooklyn/camp/brooklyn/catalog/CatalogYamlLocationTest.java @@ -180,7 +180,7 @@ public class CatalogYamlLocationTest extends AbstractYamlTest { " config2: config2 override", " config3: config3", "services: ", - " - type: brooklyn.entity.basic.BasicStartable"); + " - type: org.apache.brooklyn.entity.stock.BasicStartable"); Entity simpleEntity = Iterables.getOnlyElement(app.getChildren()); Location location = Iterables.getOnlyElement(simpleEntity.getLocations()); http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/3d91a438/usage/camp/src/test/java/org/apache/brooklyn/camp/brooklyn/catalog/CatalogYamlPolicyTest.java ---------------------------------------------------------------------- diff --git a/usage/camp/src/test/java/org/apache/brooklyn/camp/brooklyn/catalog/CatalogYamlPolicyTest.java b/usage/camp/src/test/java/org/apache/brooklyn/camp/brooklyn/catalog/CatalogYamlPolicyTest.java index 24d898d..886a31a 100644 --- a/usage/camp/src/test/java/org/apache/brooklyn/camp/brooklyn/catalog/CatalogYamlPolicyTest.java +++ b/usage/camp/src/test/java/org/apache/brooklyn/camp/brooklyn/catalog/CatalogYamlPolicyTest.java @@ -72,7 +72,7 @@ public class CatalogYamlPolicyTest extends AbstractYamlTest { "name: simple-app-yaml", "location: localhost", "services: ", - " - type: brooklyn.entity.basic.BasicEntity\n" + + " - type: org.apache.brooklyn.entity.stock.BasicEntity\n" + " brooklyn.policies:\n" + " - type: " + ver(symbolicName), " brooklyn.config:", @@ -97,7 +97,7 @@ public class CatalogYamlPolicyTest extends AbstractYamlTest { "name: simple-app-yaml", "location: localhost", "services: ", - " - type: brooklyn.entity.basic.BasicEntity\n" + + " - type: org.apache.brooklyn.entity.stock.BasicEntity\n" + " brooklyn.policies:\n" + " - type: " + ver(symbolicName), " brooklyn.config:", http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/3d91a438/usage/camp/src/test/java/org/apache/brooklyn/camp/brooklyn/catalog/CatalogYamlVersioningTest.java ---------------------------------------------------------------------- diff --git a/usage/camp/src/test/java/org/apache/brooklyn/camp/brooklyn/catalog/CatalogYamlVersioningTest.java b/usage/camp/src/test/java/org/apache/brooklyn/camp/brooklyn/catalog/CatalogYamlVersioningTest.java index 3274e86..68f73a8 100644 --- a/usage/camp/src/test/java/org/apache/brooklyn/camp/brooklyn/catalog/CatalogYamlVersioningTest.java +++ b/usage/camp/src/test/java/org/apache/brooklyn/camp/brooklyn/catalog/CatalogYamlVersioningTest.java @@ -84,7 +84,7 @@ public class CatalogYamlVersioningTest extends AbstractYamlTest { String version = "0.1.0"; addCatalogEntity(symbolicName, version); forceCatalogUpdate(); - String expectedType = "brooklyn.entity.basic.BasicApplication"; + String expectedType = "org.apache.brooklyn.entity.stock.BasicApplication"; addCatalogEntity(symbolicName, version, expectedType); CatalogItem<?, ?> item = catalog.getCatalogItem(symbolicName, version); assertTrue(item.getPlanYaml().contains(expectedType), "Version not updated"); http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/3d91a438/usage/camp/src/test/resources/simple-catalog.xml ---------------------------------------------------------------------- diff --git a/usage/camp/src/test/resources/simple-catalog.xml b/usage/camp/src/test/resources/simple-catalog.xml index 6536bdb..7f22157 100644 --- a/usage/camp/src/test/resources/simple-catalog.xml +++ b/usage/camp/src/test/resources/simple-catalog.xml @@ -20,15 +20,15 @@ <catalog> <name>Simple catalogue</name> - <template name="Basic App" type="brooklyn.entity.basic.BasicApplication" /> - <template name="Basic App" type="brooklyn.entity.basic.BasicApplication" version="2.0" /> - <template name="Basic App" type="brooklyn.entity.basic.BasicApplication"> + <template name="Basic App" type="org.apache.brooklyn.entity.stock.BasicApplication" /> + <template name="Basic App" type="org.apache.brooklyn.entity.stock.BasicApplication" version="2.0" /> + <template name="Basic App" type="org.apache.brooklyn.entity.stock.BasicApplication"> <symbolicName>BasicApp</symbolicName> </template> - <template name="Basic App" type="brooklyn.entity.basic.BasicApplication" version="2.0"> + <template name="Basic App" type="org.apache.brooklyn.entity.stock.BasicApplication" version="2.0"> <symbolicName>BasicApp</symbolicName> </template> - <template name="Custom App" type="brooklyn.entity.basic.BasicApplication"> + <template name="Custom App" type="org.apache.brooklyn.entity.stock.BasicApplication"> <symbolicName>org.apache.brooklyn.camp.brooklyn.catalog.TestBasicApp</symbolicName> <!-- Tests that "java:" prefix won't load an old-style catalog item with the same id --> </template> http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/3d91a438/usage/camp/src/test/resources/test-app-with-enricher.yaml ---------------------------------------------------------------------- diff --git a/usage/camp/src/test/resources/test-app-with-enricher.yaml b/usage/camp/src/test/resources/test-app-with-enricher.yaml index 55f9443..6760410 100644 --- a/usage/camp/src/test/resources/test-app-with-enricher.yaml +++ b/usage/camp/src/test/resources/test-app-with-enricher.yaml @@ -20,7 +20,7 @@ name: test-app-with-enricher description: TestEntity with Enricher at application-level using Brooklyn origin: https://github.com/apache/incubator-brooklyn services: -- type: brooklyn.entity.basic.BasicEntity +- type: org.apache.brooklyn.entity.stock.BasicEntity id: be1 name: testentity brooklyn.config: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/3d91a438/usage/camp/src/test/resources/test-app-with-policy.yaml ---------------------------------------------------------------------- diff --git a/usage/camp/src/test/resources/test-app-with-policy.yaml b/usage/camp/src/test/resources/test-app-with-policy.yaml index f390136..d8a04ad 100644 --- a/usage/camp/src/test/resources/test-app-with-policy.yaml +++ b/usage/camp/src/test/resources/test-app-with-policy.yaml @@ -20,7 +20,7 @@ name: test-app-with-policy description: TestEntity with Policy at application-level using Brooklyn origin: https://github.com/apache/incubator-brooklyn services: -- serviceType: brooklyn.entity.basic.BasicEntity +- serviceType: org.apache.brooklyn.entity.stock.BasicEntity name: testentity brooklyn.config: serviceLiteralValue1: Foo http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/3d91a438/usage/camp/src/test/resources/test-entity-reference-map-template.yaml ---------------------------------------------------------------------- diff --git a/usage/camp/src/test/resources/test-entity-reference-map-template.yaml b/usage/camp/src/test/resources/test-entity-reference-map-template.yaml index 0b856f3..c6f7b4d 100644 --- a/usage/camp/src/test/resources/test-entity-reference-map-template.yaml +++ b/usage/camp/src/test/resources/test-entity-reference-map-template.yaml @@ -19,9 +19,9 @@ name: test-entity-reference-map-template description: TestEntity with templated brooklyn.config and additional config (such as services) origin: https://github.com/apache/incubator-brooklyn services: -- serviceType: brooklyn.entity.basic.BasicEntity +- serviceType: org.apache.brooklyn.entity.stock.BasicEntity id: one -- serviceType: brooklyn.entity.basic.BasicEntity +- serviceType: org.apache.brooklyn.entity.stock.BasicEntity id: two - serviceType: org.apache.brooklyn.core.test.entity.TestEntity name: testentity http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/3d91a438/usage/camp/src/test/resources/test-entity-with-enricher.yaml ---------------------------------------------------------------------- diff --git a/usage/camp/src/test/resources/test-entity-with-enricher.yaml b/usage/camp/src/test/resources/test-entity-with-enricher.yaml index 7ff8fde..4e7d3f3 100644 --- a/usage/camp/src/test/resources/test-entity-with-enricher.yaml +++ b/usage/camp/src/test/resources/test-entity-with-enricher.yaml @@ -20,7 +20,7 @@ name: test-entity-with-enricher description: TestEntity with Enricher at entity-level using Brooklyn origin: https://github.com/apache/incubator-brooklyn services: -- serviceType: brooklyn.entity.basic.BasicEntity +- serviceType: org.apache.brooklyn.entity.stock.BasicEntity name: testentity foo: bar brooklyn.config: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/3d91a438/usage/camp/src/test/resources/test-entity-with-policy.yaml ---------------------------------------------------------------------- diff --git a/usage/camp/src/test/resources/test-entity-with-policy.yaml b/usage/camp/src/test/resources/test-entity-with-policy.yaml index e4f52f0..9529642 100644 --- a/usage/camp/src/test/resources/test-entity-with-policy.yaml +++ b/usage/camp/src/test/resources/test-entity-with-policy.yaml @@ -20,7 +20,7 @@ name: test-entity-with-policy description: TestEntity with Policy at entity-level using Brooklyn origin: https://github.com/apache/incubator-brooklyn services: -- serviceType: brooklyn.entity.basic.BasicEntity +- serviceType: org.apache.brooklyn.entity.stock.BasicEntity name: testentity foo: bar brooklyn.config: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/3d91a438/usage/camp/src/test/resources/vanilla-bash-netcat-w-client.yaml ---------------------------------------------------------------------- diff --git a/usage/camp/src/test/resources/vanilla-bash-netcat-w-client.yaml b/usage/camp/src/test/resources/vanilla-bash-netcat-w-client.yaml index 3279dc7..81366eb 100644 --- a/usage/camp/src/test/resources/vanilla-bash-netcat-w-client.yaml +++ b/usage/camp/src/test/resources/vanilla-bash-netcat-w-client.yaml @@ -25,7 +25,7 @@ location: localhost services: # the netcat server instance, running in listener mode (-l) -- type: brooklyn.entity.basic.VanillaSoftwareProcess +- type: org.apache.brooklyn.entity.software.base.VanillaSoftwareProcess id: netcat-server name: Simple Netcat Server launch.command: | @@ -62,7 +62,7 @@ services: period: 100ms # a client to hit netcat -- type: brooklyn.entity.basic.VanillaSoftwareProcess +- type: org.apache.brooklyn.entity.software.base.VanillaSoftwareProcess name: Simple Pinger # set the hostname of the netcat instance as an env var for the scripts http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/3d91a438/usage/camp/src/test/resources/yaml-ref-app.yaml ---------------------------------------------------------------------- diff --git a/usage/camp/src/test/resources/yaml-ref-app.yaml b/usage/camp/src/test/resources/yaml-ref-app.yaml index 8e1f740..33da321 100644 --- a/usage/camp/src/test/resources/yaml-ref-app.yaml +++ b/usage/camp/src/test/resources/yaml-ref-app.yaml @@ -18,4 +18,4 @@ name: Basic app services: - name: service - type: brooklyn.entity.basic.BasicApplication + type: org.apache.brooklyn.entity.stock.BasicApplication http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/3d91a438/usage/camp/src/test/resources/yaml-ref-entity.yaml ---------------------------------------------------------------------- diff --git a/usage/camp/src/test/resources/yaml-ref-entity.yaml b/usage/camp/src/test/resources/yaml-ref-entity.yaml index 69d311f..c9b1c55 100644 --- a/usage/camp/src/test/resources/yaml-ref-entity.yaml +++ b/usage/camp/src/test/resources/yaml-ref-entity.yaml @@ -18,4 +18,4 @@ name: Basic entity services: - name: service - type: brooklyn.entity.basic.BasicEntity + type: org.apache.brooklyn.entity.stock.BasicEntity http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/3d91a438/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 80cc57a..2111410 100644 --- a/usage/cli/src/main/resources/brooklyn/default.catalog.bom +++ b/usage/cli/src/main/resources/brooklyn/default.catalog.bom @@ -21,7 +21,8 @@ brooklyn.catalog: description: | Provision a server, with customizable provisioning.properties and credentials installed, but no other special software process or scripts executed. - The script should be supplied in "launch.command" as per docs on VanillaSoftwareProcess. + The script should be supplied in "launch.command" as per docs on + org.apache.brooklyn.entity.software.base.VanillaSoftwareProcess. item: type: org.apache.brooklyn.entity.software.base.VanillaSoftwareProcess name: Server with Launch Script (bash) http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/3d91a438/usage/launcher/src/test/resources/basic-empty-app-and-entity-blueprint.yaml ---------------------------------------------------------------------- diff --git a/usage/launcher/src/test/resources/basic-empty-app-and-entity-blueprint.yaml b/usage/launcher/src/test/resources/basic-empty-app-and-entity-blueprint.yaml index 2a8348a..901d456 100644 --- a/usage/launcher/src/test/resources/basic-empty-app-and-entity-blueprint.yaml +++ b/usage/launcher/src/test/resources/basic-empty-app-and-entity-blueprint.yaml @@ -21,10 +21,10 @@ name: Simple 2 Element location: localhost services: -- type: brooklyn.entity.basic.BasicApplication +- type: org.apache.brooklyn.entity.stock.BasicApplication brooklyn.config: key1: val1 brooklyn.children: - - type: brooklyn.entity.basic.BasicEntity + - type: org.apache.brooklyn.entity.stock.BasicEntity brooklyn.config: key2: val2 http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/3d91a438/usage/launcher/src/test/resources/basic-empy-app-blueprint.yaml ---------------------------------------------------------------------- diff --git a/usage/launcher/src/test/resources/basic-empy-app-blueprint.yaml b/usage/launcher/src/test/resources/basic-empy-app-blueprint.yaml index da15946..9594092 100644 --- a/usage/launcher/src/test/resources/basic-empy-app-blueprint.yaml +++ b/usage/launcher/src/test/resources/basic-empy-app-blueprint.yaml @@ -20,4 +20,4 @@ name: basic-empy-app # no-op "application" which does nothing location: localhost services: -- type: brooklyn.entity.basic.BasicApplication \ No newline at end of file +- type: org.apache.brooklyn.entity.stock.BasicApplication \ No newline at end of file http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/3d91a438/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 af50bdf..b9b3d9e 100644 --- a/usage/launcher/src/test/resources/mongo-sharded.yaml +++ b/usage/launcher/src/test/resources/mongo-sharded.yaml @@ -52,4 +52,4 @@ services: java.sysprops: brooklyn.example.mongodb.port: $brooklyn:component("parent", "").attributeWhenReady("mongodb.server.port") - $brooklyn:entitySpec: - type: brooklyn.entity.basic.EmptySoftwareProcess + type: org.apache.brooklyn.entity.software.base.EmptySoftwareProcess http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/3d91a438/usage/launcher/src/test/resources/mssql-test.yaml ---------------------------------------------------------------------- diff --git a/usage/launcher/src/test/resources/mssql-test.yaml b/usage/launcher/src/test/resources/mssql-test.yaml index f8d15a5..8765c4f 100644 --- a/usage/launcher/src/test/resources/mssql-test.yaml +++ b/usage/launcher/src/test/resources/mssql-test.yaml @@ -32,7 +32,7 @@ location: mapNewVolumeToDeviceName: ["/dev/sda1", 100, true] services: -- type: brooklyn.entity.basic.VanillaWindowsProcess +- type: org.apache.brooklyn.entity.software.base.VanillaWindowsProcess brooklyn.config: templates.install: classpath://org/apache/brooklyn/entity/database/mssql/ConfigurationFile.ini: "C:\\ConfigurationFile.ini" http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/3d91a438/usage/launcher/src/test/resources/vanilla-software-blueprint.yaml ---------------------------------------------------------------------- diff --git a/usage/launcher/src/test/resources/vanilla-software-blueprint.yaml b/usage/launcher/src/test/resources/vanilla-software-blueprint.yaml index cd7665c..90f7e5a 100644 --- a/usage/launcher/src/test/resources/vanilla-software-blueprint.yaml +++ b/usage/launcher/src/test/resources/vanilla-software-blueprint.yaml @@ -20,7 +20,7 @@ name: vanilla-date-test location: localhost services: -- type: brooklyn.entity.basic.VanillaSoftwareProcess +- type: org.apache.brooklyn.entity.software.base.VanillaSoftwareProcess name: Date1 launch.command: | echo utc `date +%s` > DATE
