BROOKLYN-162 - rename more references towards brooklyn.entity.basic package
Project: http://git-wip-us.apache.org/repos/asf/brooklyn-library/repo Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-library/commit/d1460dd3 Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-library/tree/d1460dd3 Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-library/diff/d1460dd3 Branch: refs/heads/0.8.0-incubating Commit: d1460dd3aaa677ca68706ffc6d5a75c316fc6cc3 Parents: 09cb16e 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 ---------------------------------------------------------------------- .../apache/brooklyn/entity/database/derby/DerbyDatabase.java | 6 +++--- .../apache/brooklyn/entity/database/derby/DerbySchema.java | 2 +- .../entity/database/postgresql/PostgreSqlNodeSaltImpl.java | 8 ++++---- .../java/org/apache/brooklyn/entity/salt/SaltConfig.java | 2 +- .../java/org/apache/brooklyn/entity/salt/SaltConfigs.java | 2 +- .../brooklyn/entity/salt/SaltLifecycleEffectorTasks.java | 4 ++-- .../org/apache/brooklyn/entity/salt/SaltStackMaster.java | 6 +++--- .../apache/brooklyn/entity/salt/SaltStackMasterDriver.java | 2 +- .../org/apache/brooklyn/entity/salt/SaltStackMasterImpl.java | 2 +- .../brooklyn/entity/salt/SaltStackMasterSshDriver.java | 2 +- .../main/java/org/apache/brooklyn/entity/salt/SaltTasks.java | 2 +- .../entity/database/postgresql/PostgreSqlSaltLiveTest.java | 2 +- .../org/apache/brooklyn/entity/salt/SaltConfigsTest.java | 4 ++-- .../brooklyn/entity/nosql/hazelcast/HazelcastCluster.java | 2 +- .../entity/nosql/hazelcast/HazelcastClusterImpl.java | 4 ++-- .../brooklyn/entity/nosql/hazelcast/HazelcastNode.java | 4 ++-- .../brooklyn/entity/nosql/hazelcast/HazelcastNodeDriver.java | 2 +- .../brooklyn/entity/nosql/hazelcast/HazelcastNodeImpl.java | 4 ++-- .../entity/nosql/hazelcast/HazelcastNodeSshDriver.java | 2 +- .../brooklyn/entity/nosql/infinispan/Infinispan5Server.java | 6 +++--- .../entity/nosql/hazelcast/HazelcastClusterEc2LiveTest.java | 2 +- .../nosql/hazelcast/HazelcastClusterSoftlayerLiveTest.java | 2 +- .../nosql/infinispan/Infinispan5ServerIntegrationTest.groovy | 2 +- .../apache/brooklyn/entity/nosql/couchbase/pillowfight.yaml | 2 +- .../apache/brooklyn/entity/webapp/WebAppServiceMetrics.java | 4 ++-- 25 files changed, 40 insertions(+), 40 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/brooklyn-library/blob/d1460dd3/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/brooklyn-library/blob/d1460dd3/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/brooklyn-library/blob/d1460dd3/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/brooklyn-library/blob/d1460dd3/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/brooklyn-library/blob/d1460dd3/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/brooklyn-library/blob/d1460dd3/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/brooklyn-library/blob/d1460dd3/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/brooklyn-library/blob/d1460dd3/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/brooklyn-library/blob/d1460dd3/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/brooklyn-library/blob/d1460dd3/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/brooklyn-library/blob/d1460dd3/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/brooklyn-library/blob/d1460dd3/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/brooklyn-library/blob/d1460dd3/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/brooklyn-library/blob/d1460dd3/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/brooklyn-library/blob/d1460dd3/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/brooklyn-library/blob/d1460dd3/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/brooklyn-library/blob/d1460dd3/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/brooklyn-library/blob/d1460dd3/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/brooklyn-library/blob/d1460dd3/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/brooklyn-library/blob/d1460dd3/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/brooklyn-library/blob/d1460dd3/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/brooklyn-library/blob/d1460dd3/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/brooklyn-library/blob/d1460dd3/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/brooklyn-library/blob/d1460dd3/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/brooklyn-library/blob/d1460dd3/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)");
