Move EntityLocal to o.a.b.api.entity
Project: http://git-wip-us.apache.org/repos/asf/brooklyn-library/repo Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-library/commit/1bfbc5a0 Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-library/tree/1bfbc5a0 Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-library/diff/1bfbc5a0 Branch: refs/heads/0.8.0-incubating Commit: 1bfbc5a0bc3a5f0dfd32c8d8c80131b8c49bd695 Parents: 0c14b63 Author: Aled Sage <[email protected]> Authored: Wed Aug 19 15:27:14 2015 +0100 Committer: Aled Sage <[email protected]> Committed: Wed Aug 19 15:49:33 2015 +0100 ---------------------------------------------------------------------- .../org/apache/brooklyn/entity/monitoring/zabbix/ZabbixFeed.java | 2 +- .../apache/brooklyn/entity/database/crate/CrateNodeSshDriver.java | 2 +- .../apache/brooklyn/entity/database/mysql/MySqlClusterImpl.java | 2 +- .../apache/brooklyn/entity/database/rubyrep/RubyRepSshDriver.java | 2 +- .../entity/messaging/activemq/ActiveMQDestinationImpl.java | 2 +- .../brooklyn/entity/messaging/kafka/AbstractfKafkaSshDriver.java | 2 +- .../apache/brooklyn/entity/messaging/qpid/QpidDestinationImpl.java | 2 +- .../org/apache/brooklyn/entity/messaging/storm/StormSshDriver.java | 2 +- .../brooklyn/entity/network/bind/BindDnsServerIntegrationTest.java | 2 +- .../entity/network/bind/DoNothingSoftwareProcessDriver.java | 2 +- .../apache/brooklyn/entity/network/bind/PrefixAndIdEnricher.java | 2 +- .../apache/brooklyn/entity/network/bind/TestBindDnsServerImpl.java | 2 +- .../brooklyn/entity/nosql/cassandra/CassandraNodeSshDriver.java | 2 +- .../entity/nosql/couchbase/CouchbaseSyncGatewaySshDriver.java | 2 +- .../entity/nosql/elasticsearch/ElasticSearchNodeSshDriver.java | 2 +- .../brooklyn/entity/nosql/mongodb/AbstractMongoDBSshDriver.java | 2 +- .../brooklyn/entity/nosql/mongodb/MongoDBClientSshDriver.java | 2 +- .../brooklyn/entity/nosql/cassandra/CassandraFabricTest.java | 2 +- .../org/apache/brooklyn/entity/webapp/WebAppServiceMethods.java | 2 +- .../brooklyn/entity/dns/geoscaling/GeoscalingIntegrationTest.java | 2 +- .../org/apache/brooklyn/entity/proxy/AbstractControllerTest.java | 2 +- .../entity/webapp/AbstractWebAppFixtureIntegrationTest.java | 2 +- .../apache/brooklyn/entity/webapp/DynamicWebAppClusterTest.java | 2 +- .../org/apache/brooklyn/entity/webapp/DynamicWebAppFabricTest.java | 2 +- .../java/org/apache/brooklyn/test/entity/TestJavaWebAppEntity.java | 2 +- .../brooklyn/qa/longevity/webcluster/SinusoidalLoadGenerator.java | 2 +- 26 files changed, 26 insertions(+), 26 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/brooklyn-library/blob/1bfbc5a0/sandbox/monitoring/src/main/java/org/apache/brooklyn/entity/monitoring/zabbix/ZabbixFeed.java ---------------------------------------------------------------------- diff --git a/sandbox/monitoring/src/main/java/org/apache/brooklyn/entity/monitoring/zabbix/ZabbixFeed.java b/sandbox/monitoring/src/main/java/org/apache/brooklyn/entity/monitoring/zabbix/ZabbixFeed.java index 1d6128b..906b684 100644 --- a/sandbox/monitoring/src/main/java/org/apache/brooklyn/entity/monitoring/zabbix/ZabbixFeed.java +++ b/sandbox/monitoring/src/main/java/org/apache/brooklyn/entity/monitoring/zabbix/ZabbixFeed.java @@ -30,7 +30,7 @@ import java.util.concurrent.atomic.AtomicBoolean; import java.util.concurrent.atomic.AtomicInteger; import org.apache.brooklyn.api.entity.Entity; -import org.apache.brooklyn.api.internal.EntityLocal; +import org.apache.brooklyn.api.entity.EntityLocal; import org.apache.brooklyn.api.location.Location; import org.apache.brooklyn.api.location.MachineLocation; import org.apache.brooklyn.config.ConfigKey; http://git-wip-us.apache.org/repos/asf/brooklyn-library/blob/1bfbc5a0/software/database/src/main/java/org/apache/brooklyn/entity/database/crate/CrateNodeSshDriver.java ---------------------------------------------------------------------- diff --git a/software/database/src/main/java/org/apache/brooklyn/entity/database/crate/CrateNodeSshDriver.java b/software/database/src/main/java/org/apache/brooklyn/entity/database/crate/CrateNodeSshDriver.java index fda1c65..072f5b6 100644 --- a/software/database/src/main/java/org/apache/brooklyn/entity/database/crate/CrateNodeSshDriver.java +++ b/software/database/src/main/java/org/apache/brooklyn/entity/database/crate/CrateNodeSshDriver.java @@ -22,7 +22,7 @@ import static java.lang.String.format; import java.util.List; -import org.apache.brooklyn.api.internal.EntityLocal; +import org.apache.brooklyn.api.entity.EntityLocal; import org.apache.brooklyn.entity.core.Entities; import org.apache.brooklyn.entity.java.JavaSoftwareProcessSshDriver; http://git-wip-us.apache.org/repos/asf/brooklyn-library/blob/1bfbc5a0/software/database/src/main/java/org/apache/brooklyn/entity/database/mysql/MySqlClusterImpl.java ---------------------------------------------------------------------- diff --git a/software/database/src/main/java/org/apache/brooklyn/entity/database/mysql/MySqlClusterImpl.java b/software/database/src/main/java/org/apache/brooklyn/entity/database/mysql/MySqlClusterImpl.java index 0f41114..2646924 100644 --- a/software/database/src/main/java/org/apache/brooklyn/entity/database/mysql/MySqlClusterImpl.java +++ b/software/database/src/main/java/org/apache/brooklyn/entity/database/mysql/MySqlClusterImpl.java @@ -25,8 +25,8 @@ import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.atomic.AtomicInteger; import org.apache.brooklyn.api.entity.Entity; +import org.apache.brooklyn.api.entity.EntityLocal; import org.apache.brooklyn.api.entity.EntitySpec; -import org.apache.brooklyn.api.internal.EntityLocal; import org.apache.brooklyn.api.location.Location; import org.apache.brooklyn.api.sensor.AttributeSensor; import org.apache.brooklyn.api.sensor.SensorEvent; http://git-wip-us.apache.org/repos/asf/brooklyn-library/blob/1bfbc5a0/software/database/src/main/java/org/apache/brooklyn/entity/database/rubyrep/RubyRepSshDriver.java ---------------------------------------------------------------------- diff --git a/software/database/src/main/java/org/apache/brooklyn/entity/database/rubyrep/RubyRepSshDriver.java b/software/database/src/main/java/org/apache/brooklyn/entity/database/rubyrep/RubyRepSshDriver.java index 4925770..15fa9da 100644 --- a/software/database/src/main/java/org/apache/brooklyn/entity/database/rubyrep/RubyRepSshDriver.java +++ b/software/database/src/main/java/org/apache/brooklyn/entity/database/rubyrep/RubyRepSshDriver.java @@ -25,7 +25,7 @@ import java.net.URISyntaxException; import java.util.List; import java.util.concurrent.ExecutionException; -import org.apache.brooklyn.api.internal.EntityLocal; +import org.apache.brooklyn.api.entity.EntityLocal; import org.apache.brooklyn.entity.core.Attributes; import org.apache.brooklyn.entity.core.Entities; import org.apache.brooklyn.entity.software.base.AbstractSoftwareProcessSshDriver; http://git-wip-us.apache.org/repos/asf/brooklyn-library/blob/1bfbc5a0/software/messaging/src/main/java/org/apache/brooklyn/entity/messaging/activemq/ActiveMQDestinationImpl.java ---------------------------------------------------------------------- diff --git a/software/messaging/src/main/java/org/apache/brooklyn/entity/messaging/activemq/ActiveMQDestinationImpl.java b/software/messaging/src/main/java/org/apache/brooklyn/entity/messaging/activemq/ActiveMQDestinationImpl.java index 337d68b..28375a0 100644 --- a/software/messaging/src/main/java/org/apache/brooklyn/entity/messaging/activemq/ActiveMQDestinationImpl.java +++ b/software/messaging/src/main/java/org/apache/brooklyn/entity/messaging/activemq/ActiveMQDestinationImpl.java @@ -22,7 +22,7 @@ import javax.management.MalformedObjectNameException; import javax.management.ObjectName; import org.apache.brooklyn.api.entity.Entity; -import org.apache.brooklyn.api.internal.EntityLocal; +import org.apache.brooklyn.api.entity.EntityLocal; import com.google.common.base.Preconditions; http://git-wip-us.apache.org/repos/asf/brooklyn-library/blob/1bfbc5a0/software/messaging/src/main/java/org/apache/brooklyn/entity/messaging/kafka/AbstractfKafkaSshDriver.java ---------------------------------------------------------------------- diff --git a/software/messaging/src/main/java/org/apache/brooklyn/entity/messaging/kafka/AbstractfKafkaSshDriver.java b/software/messaging/src/main/java/org/apache/brooklyn/entity/messaging/kafka/AbstractfKafkaSshDriver.java index 72ffef7..0af0742 100644 --- a/software/messaging/src/main/java/org/apache/brooklyn/entity/messaging/kafka/AbstractfKafkaSshDriver.java +++ b/software/messaging/src/main/java/org/apache/brooklyn/entity/messaging/kafka/AbstractfKafkaSshDriver.java @@ -24,7 +24,7 @@ import java.util.LinkedList; import java.util.List; import java.util.Map; -import org.apache.brooklyn.api.internal.EntityLocal; +import org.apache.brooklyn.api.entity.EntityLocal; import org.apache.brooklyn.config.ConfigKey; import org.apache.brooklyn.entity.core.Entities; import org.apache.brooklyn.entity.java.JavaSoftwareProcessSshDriver; http://git-wip-us.apache.org/repos/asf/brooklyn-library/blob/1bfbc5a0/software/messaging/src/main/java/org/apache/brooklyn/entity/messaging/qpid/QpidDestinationImpl.java ---------------------------------------------------------------------- diff --git a/software/messaging/src/main/java/org/apache/brooklyn/entity/messaging/qpid/QpidDestinationImpl.java b/software/messaging/src/main/java/org/apache/brooklyn/entity/messaging/qpid/QpidDestinationImpl.java index 11b2b2b..61553bf 100644 --- a/software/messaging/src/main/java/org/apache/brooklyn/entity/messaging/qpid/QpidDestinationImpl.java +++ b/software/messaging/src/main/java/org/apache/brooklyn/entity/messaging/qpid/QpidDestinationImpl.java @@ -23,9 +23,9 @@ import static java.lang.String.format; import javax.management.MalformedObjectNameException; import javax.management.ObjectName; -import org.apache.brooklyn.api.internal.EntityLocal; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import org.apache.brooklyn.api.entity.EntityLocal; import org.apache.brooklyn.entity.java.UsesJmx; import org.apache.brooklyn.entity.messaging.amqp.AmqpServer; import org.apache.brooklyn.entity.messaging.jms.JMSDestinationImpl; http://git-wip-us.apache.org/repos/asf/brooklyn-library/blob/1bfbc5a0/software/messaging/src/main/java/org/apache/brooklyn/entity/messaging/storm/StormSshDriver.java ---------------------------------------------------------------------- diff --git a/software/messaging/src/main/java/org/apache/brooklyn/entity/messaging/storm/StormSshDriver.java b/software/messaging/src/main/java/org/apache/brooklyn/entity/messaging/storm/StormSshDriver.java index 296ae16..2aa5bb0 100644 --- a/software/messaging/src/main/java/org/apache/brooklyn/entity/messaging/storm/StormSshDriver.java +++ b/software/messaging/src/main/java/org/apache/brooklyn/entity/messaging/storm/StormSshDriver.java @@ -24,7 +24,7 @@ import java.util.List; import java.util.Map; import org.apache.brooklyn.api.entity.Entity; -import org.apache.brooklyn.api.internal.EntityLocal; +import org.apache.brooklyn.api.entity.EntityLocal; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.apache.brooklyn.entity.core.Attributes; http://git-wip-us.apache.org/repos/asf/brooklyn-library/blob/1bfbc5a0/software/network/src/test/java/org/apache/brooklyn/entity/network/bind/BindDnsServerIntegrationTest.java ---------------------------------------------------------------------- diff --git a/software/network/src/test/java/org/apache/brooklyn/entity/network/bind/BindDnsServerIntegrationTest.java b/software/network/src/test/java/org/apache/brooklyn/entity/network/bind/BindDnsServerIntegrationTest.java index 0b7b90b..7e4d788 100644 --- a/software/network/src/test/java/org/apache/brooklyn/entity/network/bind/BindDnsServerIntegrationTest.java +++ b/software/network/src/test/java/org/apache/brooklyn/entity/network/bind/BindDnsServerIntegrationTest.java @@ -21,8 +21,8 @@ package org.apache.brooklyn.entity.network.bind; import static org.testng.Assert.assertEquals; import org.apache.brooklyn.api.entity.Entity; +import org.apache.brooklyn.api.entity.EntityLocal; import org.apache.brooklyn.api.entity.EntitySpec; -import org.apache.brooklyn.api.internal.EntityLocal; import org.apache.brooklyn.api.sensor.EnricherSpec; import org.apache.brooklyn.core.mgmt.rebind.RebindOptions; import org.apache.brooklyn.core.mgmt.rebind.RebindTestFixture; http://git-wip-us.apache.org/repos/asf/brooklyn-library/blob/1bfbc5a0/software/network/src/test/java/org/apache/brooklyn/entity/network/bind/DoNothingSoftwareProcessDriver.java ---------------------------------------------------------------------- diff --git a/software/network/src/test/java/org/apache/brooklyn/entity/network/bind/DoNothingSoftwareProcessDriver.java b/software/network/src/test/java/org/apache/brooklyn/entity/network/bind/DoNothingSoftwareProcessDriver.java index c78a6ca..0a58326 100644 --- a/software/network/src/test/java/org/apache/brooklyn/entity/network/bind/DoNothingSoftwareProcessDriver.java +++ b/software/network/src/test/java/org/apache/brooklyn/entity/network/bind/DoNothingSoftwareProcessDriver.java @@ -18,7 +18,7 @@ */ package org.apache.brooklyn.entity.network.bind; -import org.apache.brooklyn.api.internal.EntityLocal; +import org.apache.brooklyn.api.entity.EntityLocal; import org.apache.brooklyn.entity.software.base.AbstractSoftwareProcessSshDriver; import org.apache.brooklyn.location.ssh.SshMachineLocation; http://git-wip-us.apache.org/repos/asf/brooklyn-library/blob/1bfbc5a0/software/network/src/test/java/org/apache/brooklyn/entity/network/bind/PrefixAndIdEnricher.java ---------------------------------------------------------------------- diff --git a/software/network/src/test/java/org/apache/brooklyn/entity/network/bind/PrefixAndIdEnricher.java b/software/network/src/test/java/org/apache/brooklyn/entity/network/bind/PrefixAndIdEnricher.java index 2e2942d..6a90e83 100644 --- a/software/network/src/test/java/org/apache/brooklyn/entity/network/bind/PrefixAndIdEnricher.java +++ b/software/network/src/test/java/org/apache/brooklyn/entity/network/bind/PrefixAndIdEnricher.java @@ -18,7 +18,7 @@ */ package org.apache.brooklyn.entity.network.bind; -import org.apache.brooklyn.api.internal.EntityLocal; +import org.apache.brooklyn.api.entity.EntityLocal; import org.apache.brooklyn.api.sensor.AttributeSensor; import org.apache.brooklyn.api.sensor.SensorEvent; import org.apache.brooklyn.api.sensor.SensorEventListener; http://git-wip-us.apache.org/repos/asf/brooklyn-library/blob/1bfbc5a0/software/network/src/test/java/org/apache/brooklyn/entity/network/bind/TestBindDnsServerImpl.java ---------------------------------------------------------------------- diff --git a/software/network/src/test/java/org/apache/brooklyn/entity/network/bind/TestBindDnsServerImpl.java b/software/network/src/test/java/org/apache/brooklyn/entity/network/bind/TestBindDnsServerImpl.java index c103fe4..f04ac12 100644 --- a/software/network/src/test/java/org/apache/brooklyn/entity/network/bind/TestBindDnsServerImpl.java +++ b/software/network/src/test/java/org/apache/brooklyn/entity/network/bind/TestBindDnsServerImpl.java @@ -19,7 +19,7 @@ package org.apache.brooklyn.entity.network.bind; import org.apache.brooklyn.api.entity.Entity; -import org.apache.brooklyn.api.internal.EntityLocal; +import org.apache.brooklyn.api.entity.EntityLocal; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.apache.brooklyn.location.ssh.SshMachineLocation; http://git-wip-us.apache.org/repos/asf/brooklyn-library/blob/1bfbc5a0/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/cassandra/CassandraNodeSshDriver.java ---------------------------------------------------------------------- diff --git a/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/cassandra/CassandraNodeSshDriver.java b/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/cassandra/CassandraNodeSshDriver.java index 67a44f1..c741f71 100644 --- a/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/cassandra/CassandraNodeSshDriver.java +++ b/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/cassandra/CassandraNodeSshDriver.java @@ -28,7 +28,7 @@ import java.util.Map; import java.util.Set; import org.apache.brooklyn.api.entity.Entity; -import org.apache.brooklyn.api.internal.EntityLocal; +import org.apache.brooklyn.api.entity.EntityLocal; import org.apache.brooklyn.api.location.Location; import org.apache.brooklyn.api.mgmt.TaskWrapper; import org.slf4j.Logger; http://git-wip-us.apache.org/repos/asf/brooklyn-library/blob/1bfbc5a0/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/couchbase/CouchbaseSyncGatewaySshDriver.java ---------------------------------------------------------------------- diff --git a/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/couchbase/CouchbaseSyncGatewaySshDriver.java b/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/couchbase/CouchbaseSyncGatewaySshDriver.java index 5e8257b..4433479 100644 --- a/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/couchbase/CouchbaseSyncGatewaySshDriver.java +++ b/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/couchbase/CouchbaseSyncGatewaySshDriver.java @@ -27,8 +27,8 @@ import static org.apache.brooklyn.util.ssh.BashCommands.sudo; import java.util.List; import org.apache.brooklyn.api.entity.Entity; +import org.apache.brooklyn.api.entity.EntityLocal; import org.apache.brooklyn.api.entity.drivers.downloads.DownloadResolver; -import org.apache.brooklyn.api.internal.EntityLocal; import org.apache.brooklyn.api.location.OsDetails; import org.apache.brooklyn.entity.core.Entities; import org.apache.brooklyn.entity.core.EntityPredicates; http://git-wip-us.apache.org/repos/asf/brooklyn-library/blob/1bfbc5a0/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/elasticsearch/ElasticSearchNodeSshDriver.java ---------------------------------------------------------------------- diff --git a/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/elasticsearch/ElasticSearchNodeSshDriver.java b/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/elasticsearch/ElasticSearchNodeSshDriver.java index e989756..257f8a2 100644 --- a/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/elasticsearch/ElasticSearchNodeSshDriver.java +++ b/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/elasticsearch/ElasticSearchNodeSshDriver.java @@ -24,7 +24,7 @@ import java.io.Reader; import java.io.StringReader; import java.util.List; -import org.apache.brooklyn.api.internal.EntityLocal; +import org.apache.brooklyn.api.entity.EntityLocal; import org.apache.brooklyn.config.ConfigKey; import org.apache.brooklyn.entity.core.Entities; import org.apache.brooklyn.entity.software.base.AbstractSoftwareProcessSshDriver; http://git-wip-us.apache.org/repos/asf/brooklyn-library/blob/1bfbc5a0/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/mongodb/AbstractMongoDBSshDriver.java ---------------------------------------------------------------------- diff --git a/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/mongodb/AbstractMongoDBSshDriver.java b/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/mongodb/AbstractMongoDBSshDriver.java index ee390cb..5afc55e 100644 --- a/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/mongodb/AbstractMongoDBSshDriver.java +++ b/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/mongodb/AbstractMongoDBSshDriver.java @@ -22,7 +22,7 @@ import java.util.LinkedList; import java.util.List; import java.util.Map; -import org.apache.brooklyn.api.internal.EntityLocal; +import org.apache.brooklyn.api.entity.EntityLocal; import org.apache.brooklyn.api.location.OsDetails; import org.apache.brooklyn.entity.core.Entities; import org.apache.brooklyn.entity.software.base.AbstractSoftwareProcessSshDriver; http://git-wip-us.apache.org/repos/asf/brooklyn-library/blob/1bfbc5a0/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/mongodb/MongoDBClientSshDriver.java ---------------------------------------------------------------------- diff --git a/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/mongodb/MongoDBClientSshDriver.java b/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/mongodb/MongoDBClientSshDriver.java index 53ecfa7..eb77c01 100644 --- a/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/mongodb/MongoDBClientSshDriver.java +++ b/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/mongodb/MongoDBClientSshDriver.java @@ -23,7 +23,7 @@ import java.util.Map; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import org.apache.brooklyn.api.internal.EntityLocal; +import org.apache.brooklyn.api.entity.EntityLocal; import org.apache.brooklyn.entity.nosql.mongodb.sharding.MongoDBRouter; import org.apache.brooklyn.entity.nosql.mongodb.sharding.MongoDBRouterCluster; import org.apache.brooklyn.entity.nosql.mongodb.sharding.MongoDBShardedDeployment; http://git-wip-us.apache.org/repos/asf/brooklyn-library/blob/1bfbc5a0/software/nosql/src/test/java/org/apache/brooklyn/entity/nosql/cassandra/CassandraFabricTest.java ---------------------------------------------------------------------- diff --git a/software/nosql/src/test/java/org/apache/brooklyn/entity/nosql/cassandra/CassandraFabricTest.java b/software/nosql/src/test/java/org/apache/brooklyn/entity/nosql/cassandra/CassandraFabricTest.java index 89128da..78c8b9f 100644 --- a/software/nosql/src/test/java/org/apache/brooklyn/entity/nosql/cassandra/CassandraFabricTest.java +++ b/software/nosql/src/test/java/org/apache/brooklyn/entity/nosql/cassandra/CassandraFabricTest.java @@ -24,9 +24,9 @@ import java.util.Collection; import java.util.Set; import org.apache.brooklyn.api.entity.Entity; +import org.apache.brooklyn.api.entity.EntityLocal; import org.apache.brooklyn.api.entity.EntitySpec; import org.apache.brooklyn.api.entity.ImplementedBy; -import org.apache.brooklyn.api.internal.EntityLocal; import org.apache.brooklyn.api.location.Location; import org.apache.brooklyn.api.location.LocationSpec; import org.apache.brooklyn.core.test.BrooklynAppUnitTestSupport; http://git-wip-us.apache.org/repos/asf/brooklyn-library/blob/1bfbc5a0/software/webapp/src/main/java/org/apache/brooklyn/entity/webapp/WebAppServiceMethods.java ---------------------------------------------------------------------- diff --git a/software/webapp/src/main/java/org/apache/brooklyn/entity/webapp/WebAppServiceMethods.java b/software/webapp/src/main/java/org/apache/brooklyn/entity/webapp/WebAppServiceMethods.java index 00c3806..cc9f1c2 100644 --- a/software/webapp/src/main/java/org/apache/brooklyn/entity/webapp/WebAppServiceMethods.java +++ b/software/webapp/src/main/java/org/apache/brooklyn/entity/webapp/WebAppServiceMethods.java @@ -24,7 +24,7 @@ import java.util.Set; import java.util.concurrent.TimeUnit; import org.apache.brooklyn.api.entity.Entity; -import org.apache.brooklyn.api.internal.EntityLocal; +import org.apache.brooklyn.api.entity.EntityLocal; import org.apache.brooklyn.location.access.BrooklynAccessUtils; import org.apache.brooklyn.policy.enricher.RollingTimeWindowMeanEnricher; import org.apache.brooklyn.policy.enricher.TimeFractionDeltaEnricher; http://git-wip-us.apache.org/repos/asf/brooklyn-library/blob/1bfbc5a0/software/webapp/src/test/java/org/apache/brooklyn/entity/dns/geoscaling/GeoscalingIntegrationTest.java ---------------------------------------------------------------------- diff --git a/software/webapp/src/test/java/org/apache/brooklyn/entity/dns/geoscaling/GeoscalingIntegrationTest.java b/software/webapp/src/test/java/org/apache/brooklyn/entity/dns/geoscaling/GeoscalingIntegrationTest.java index cb963ec..280c53a 100644 --- a/software/webapp/src/test/java/org/apache/brooklyn/entity/dns/geoscaling/GeoscalingIntegrationTest.java +++ b/software/webapp/src/test/java/org/apache/brooklyn/entity/dns/geoscaling/GeoscalingIntegrationTest.java @@ -22,8 +22,8 @@ import static org.testng.Assert.assertEquals; import java.net.InetAddress; +import org.apache.brooklyn.api.entity.EntityLocal; import org.apache.brooklyn.api.entity.EntitySpec; -import org.apache.brooklyn.api.internal.EntityLocal; import org.apache.brooklyn.api.location.LocationSpec; import org.apache.brooklyn.api.mgmt.ManagementContext; import org.apache.brooklyn.core.test.entity.TestApplication; http://git-wip-us.apache.org/repos/asf/brooklyn-library/blob/1bfbc5a0/software/webapp/src/test/java/org/apache/brooklyn/entity/proxy/AbstractControllerTest.java ---------------------------------------------------------------------- diff --git a/software/webapp/src/test/java/org/apache/brooklyn/entity/proxy/AbstractControllerTest.java b/software/webapp/src/test/java/org/apache/brooklyn/entity/proxy/AbstractControllerTest.java index 4114749..8690728 100644 --- a/software/webapp/src/test/java/org/apache/brooklyn/entity/proxy/AbstractControllerTest.java +++ b/software/webapp/src/test/java/org/apache/brooklyn/entity/proxy/AbstractControllerTest.java @@ -30,8 +30,8 @@ import java.util.Map; import java.util.Set; import org.apache.brooklyn.api.entity.Entity; +import org.apache.brooklyn.api.entity.EntityLocal; import org.apache.brooklyn.api.entity.EntitySpec; -import org.apache.brooklyn.api.internal.EntityLocal; import org.apache.brooklyn.api.location.Location; import org.apache.brooklyn.api.location.LocationSpec; import org.apache.brooklyn.api.location.MachineLocation; http://git-wip-us.apache.org/repos/asf/brooklyn-library/blob/1bfbc5a0/software/webapp/src/test/java/org/apache/brooklyn/entity/webapp/AbstractWebAppFixtureIntegrationTest.java ---------------------------------------------------------------------- diff --git a/software/webapp/src/test/java/org/apache/brooklyn/entity/webapp/AbstractWebAppFixtureIntegrationTest.java b/software/webapp/src/test/java/org/apache/brooklyn/entity/webapp/AbstractWebAppFixtureIntegrationTest.java index 169a532..c5b62c0 100644 --- a/software/webapp/src/test/java/org/apache/brooklyn/entity/webapp/AbstractWebAppFixtureIntegrationTest.java +++ b/software/webapp/src/test/java/org/apache/brooklyn/entity/webapp/AbstractWebAppFixtureIntegrationTest.java @@ -47,8 +47,8 @@ import org.testng.annotations.Test; import org.apache.brooklyn.location.localhost.LocalhostMachineProvisioningLocation; import org.apache.brooklyn.api.entity.Application; import org.apache.brooklyn.api.entity.Entity; +import org.apache.brooklyn.api.entity.EntityLocal; import org.apache.brooklyn.api.entity.drivers.DriverDependentEntity; -import org.apache.brooklyn.api.internal.EntityLocal; import org.apache.brooklyn.api.location.LocationSpec; import org.apache.brooklyn.api.mgmt.ManagementContext; import org.apache.brooklyn.api.mgmt.SubscriptionContext; http://git-wip-us.apache.org/repos/asf/brooklyn-library/blob/1bfbc5a0/software/webapp/src/test/java/org/apache/brooklyn/entity/webapp/DynamicWebAppClusterTest.java ---------------------------------------------------------------------- diff --git a/software/webapp/src/test/java/org/apache/brooklyn/entity/webapp/DynamicWebAppClusterTest.java b/software/webapp/src/test/java/org/apache/brooklyn/entity/webapp/DynamicWebAppClusterTest.java index 39cf94f..51f9062 100644 --- a/software/webapp/src/test/java/org/apache/brooklyn/entity/webapp/DynamicWebAppClusterTest.java +++ b/software/webapp/src/test/java/org/apache/brooklyn/entity/webapp/DynamicWebAppClusterTest.java @@ -21,8 +21,8 @@ package org.apache.brooklyn.entity.webapp; import static org.testng.Assert.assertEquals; import org.apache.brooklyn.api.entity.Entity; +import org.apache.brooklyn.api.entity.EntityLocal; import org.apache.brooklyn.api.entity.EntitySpec; -import org.apache.brooklyn.api.internal.EntityLocal; import org.apache.brooklyn.core.test.entity.TestApplication; import org.apache.brooklyn.entity.core.Attributes; import org.apache.brooklyn.entity.core.Entities; http://git-wip-us.apache.org/repos/asf/brooklyn-library/blob/1bfbc5a0/software/webapp/src/test/java/org/apache/brooklyn/entity/webapp/DynamicWebAppFabricTest.java ---------------------------------------------------------------------- diff --git a/software/webapp/src/test/java/org/apache/brooklyn/entity/webapp/DynamicWebAppFabricTest.java b/software/webapp/src/test/java/org/apache/brooklyn/entity/webapp/DynamicWebAppFabricTest.java index 8d36ecb..b80666a 100644 --- a/software/webapp/src/test/java/org/apache/brooklyn/entity/webapp/DynamicWebAppFabricTest.java +++ b/software/webapp/src/test/java/org/apache/brooklyn/entity/webapp/DynamicWebAppFabricTest.java @@ -21,8 +21,8 @@ package org.apache.brooklyn.entity.webapp; import java.util.List; import org.apache.brooklyn.api.entity.Entity; +import org.apache.brooklyn.api.entity.EntityLocal; import org.apache.brooklyn.api.entity.EntitySpec; -import org.apache.brooklyn.api.internal.EntityLocal; import org.apache.brooklyn.core.test.entity.TestApplication; import org.apache.brooklyn.entity.core.Entities; import org.apache.brooklyn.entity.core.EntityInternal; http://git-wip-us.apache.org/repos/asf/brooklyn-library/blob/1bfbc5a0/software/webapp/src/test/java/org/apache/brooklyn/test/entity/TestJavaWebAppEntity.java ---------------------------------------------------------------------- diff --git a/software/webapp/src/test/java/org/apache/brooklyn/test/entity/TestJavaWebAppEntity.java b/software/webapp/src/test/java/org/apache/brooklyn/test/entity/TestJavaWebAppEntity.java index fc69fd6..092d0db 100644 --- a/software/webapp/src/test/java/org/apache/brooklyn/test/entity/TestJavaWebAppEntity.java +++ b/software/webapp/src/test/java/org/apache/brooklyn/test/entity/TestJavaWebAppEntity.java @@ -18,8 +18,8 @@ */ package org.apache.brooklyn.test.entity; +import org.apache.brooklyn.api.entity.EntityLocal; import org.apache.brooklyn.api.entity.ImplementedBy; -import org.apache.brooklyn.api.internal.EntityLocal; import org.apache.brooklyn.api.location.Location; import org.apache.brooklyn.config.ConfigKey; import org.apache.brooklyn.core.config.ConfigKeys; http://git-wip-us.apache.org/repos/asf/brooklyn-library/blob/1bfbc5a0/usage/qa/src/test/java/org/apache/brooklyn/qa/longevity/webcluster/SinusoidalLoadGenerator.java ---------------------------------------------------------------------- diff --git a/usage/qa/src/test/java/org/apache/brooklyn/qa/longevity/webcluster/SinusoidalLoadGenerator.java b/usage/qa/src/test/java/org/apache/brooklyn/qa/longevity/webcluster/SinusoidalLoadGenerator.java index 46a82d2..06b1cad 100644 --- a/usage/qa/src/test/java/org/apache/brooklyn/qa/longevity/webcluster/SinusoidalLoadGenerator.java +++ b/usage/qa/src/test/java/org/apache/brooklyn/qa/longevity/webcluster/SinusoidalLoadGenerator.java @@ -22,7 +22,7 @@ import java.util.concurrent.Executors; import java.util.concurrent.ScheduledExecutorService; import java.util.concurrent.TimeUnit; -import org.apache.brooklyn.api.internal.EntityLocal; +import org.apache.brooklyn.api.entity.EntityLocal; import org.apache.brooklyn.api.sensor.AttributeSensor; import org.apache.brooklyn.config.ConfigKey; import org.apache.brooklyn.core.config.ConfigKeys;
