BROOKLYN-162 - apply org.apache package prefix to core config packages
Project: http://git-wip-us.apache.org/repos/asf/brooklyn-library/repo Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-library/commit/09b9412d Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-library/tree/09b9412d Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-library/diff/09b9412d Branch: refs/heads/0.8.0-incubating Commit: 09b9412d5e943a1433818eacfc1bf7d61393c0c1 Parents: 1edd7ea Author: Alex Heneveld <[email protected]> Authored: Tue Aug 18 14:37:16 2015 +0100 Committer: Alex Heneveld <[email protected]> Committed: Tue Aug 18 15:05:22 2015 +0100 ---------------------------------------------------------------------- .../main/java/org/apache/brooklyn/demo/WebClusterExample.java | 2 +- .../org/apache/brooklyn/entity/database/crate/CrateNodeImpl.java | 2 +- .../brooklyn/entity/database/mariadb/MariaDbIntegrationTest.java | 2 +- .../brooklyn/entity/database/mysql/MySqlLiveRackspaceTest.java | 4 +--- .../entity/database/postgresql/PostgreSqlIntegrationTest.java | 3 ++- .../brooklyn/entity/database/rubyrep/RubyRepIntegrationTest.java | 4 ++-- .../java/org/apache/brooklyn/entity/messaging/storm/Storm.java | 2 +- .../brooklyn/entity/nosql/couchbase/CouchbaseClusterImpl.java | 2 +- .../apache/brooklyn/entity/nosql/couchbase/CouchbaseNode.java | 2 +- .../entity/nosql/couchbase/CouchbaseSyncGatewayImpl.java | 3 ++- .../apache/brooklyn/entity/nosql/mongodb/MongoDBServerImpl.java | 3 ++- .../org/apache/brooklyn/entity/webapp/DynamicWebAppCluster.java | 2 +- .../apache/brooklyn/entity/webapp/WebAppServiceConstants.java | 2 +- .../org/apache/brooklyn/entity/webapp/WebAppServiceMetrics.java | 2 +- .../apache/brooklyn/entity/webapp/jboss/JBoss7ServerImpl.java | 2 +- .../entity/webapp/AbstractWebAppFixtureIntegrationTest.java | 2 +- .../brooklyn/entity/webapp/WebAppLiveIntegrationTest.groovy | 2 +- 17 files changed, 21 insertions(+), 20 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/brooklyn-library/blob/09b9412d/examples/simple-web-cluster/src/main/java/org/apache/brooklyn/demo/WebClusterExample.java ---------------------------------------------------------------------- diff --git a/examples/simple-web-cluster/src/main/java/org/apache/brooklyn/demo/WebClusterExample.java b/examples/simple-web-cluster/src/main/java/org/apache/brooklyn/demo/WebClusterExample.java index 59b62f3..8cefe1a 100644 --- a/examples/simple-web-cluster/src/main/java/org/apache/brooklyn/demo/WebClusterExample.java +++ b/examples/simple-web-cluster/src/main/java/org/apache/brooklyn/demo/WebClusterExample.java @@ -23,11 +23,11 @@ import java.util.List; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import brooklyn.config.BrooklynProperties; import brooklyn.entity.basic.AbstractApplication; import brooklyn.entity.basic.Entities; import org.apache.brooklyn.api.entity.proxying.EntitySpec; +import org.apache.brooklyn.core.config.BrooklynProperties; import org.apache.brooklyn.entity.proxy.nginx.NginxController; import org.apache.brooklyn.entity.webapp.ControlledDynamicWebAppCluster; import org.apache.brooklyn.entity.webapp.DynamicWebAppCluster; http://git-wip-us.apache.org/repos/asf/brooklyn-library/blob/09b9412d/software/database/src/main/java/org/apache/brooklyn/entity/database/crate/CrateNodeImpl.java ---------------------------------------------------------------------- diff --git a/software/database/src/main/java/org/apache/brooklyn/entity/database/crate/CrateNodeImpl.java b/software/database/src/main/java/org/apache/brooklyn/entity/database/crate/CrateNodeImpl.java index 0edb37d..5871fc6 100644 --- a/software/database/src/main/java/org/apache/brooklyn/entity/database/crate/CrateNodeImpl.java +++ b/software/database/src/main/java/org/apache/brooklyn/entity/database/crate/CrateNodeImpl.java @@ -18,9 +18,9 @@ */ package org.apache.brooklyn.entity.database.crate; +import org.apache.brooklyn.core.config.render.RendererHints; import org.apache.brooklyn.util.guava.Functionals; -import brooklyn.config.render.RendererHints; import brooklyn.enricher.Enrichers; import brooklyn.entity.basic.Attributes; import brooklyn.entity.basic.SoftwareProcessImpl; http://git-wip-us.apache.org/repos/asf/brooklyn-library/blob/09b9412d/software/database/src/test/java/org/apache/brooklyn/entity/database/mariadb/MariaDbIntegrationTest.java ---------------------------------------------------------------------- diff --git a/software/database/src/test/java/org/apache/brooklyn/entity/database/mariadb/MariaDbIntegrationTest.java b/software/database/src/test/java/org/apache/brooklyn/entity/database/mariadb/MariaDbIntegrationTest.java index b6eb469..ecaeab3 100644 --- a/software/database/src/test/java/org/apache/brooklyn/entity/database/mariadb/MariaDbIntegrationTest.java +++ b/software/database/src/test/java/org/apache/brooklyn/entity/database/mariadb/MariaDbIntegrationTest.java @@ -23,6 +23,7 @@ import java.net.InetAddress; import org.apache.brooklyn.api.entity.proxying.EntitySpec; import org.apache.brooklyn.api.management.ManagementContext; +import org.apache.brooklyn.core.config.BrooklynProperties; import org.apache.brooklyn.core.management.internal.LocalManagementContext; import org.apache.brooklyn.test.entity.TestApplication; import org.apache.brooklyn.util.collections.MutableMap; @@ -34,7 +35,6 @@ import org.testng.annotations.AfterMethod; import org.testng.annotations.BeforeMethod; import org.testng.annotations.Test; -import brooklyn.config.BrooklynProperties; import brooklyn.entity.basic.ApplicationBuilder; import brooklyn.entity.basic.Entities; http://git-wip-us.apache.org/repos/asf/brooklyn-library/blob/09b9412d/software/database/src/test/java/org/apache/brooklyn/entity/database/mysql/MySqlLiveRackspaceTest.java ---------------------------------------------------------------------- diff --git a/software/database/src/test/java/org/apache/brooklyn/entity/database/mysql/MySqlLiveRackspaceTest.java b/software/database/src/test/java/org/apache/brooklyn/entity/database/mysql/MySqlLiveRackspaceTest.java index 158dcc3..6e8807c 100644 --- a/software/database/src/test/java/org/apache/brooklyn/entity/database/mysql/MySqlLiveRackspaceTest.java +++ b/software/database/src/test/java/org/apache/brooklyn/entity/database/mysql/MySqlLiveRackspaceTest.java @@ -21,10 +21,8 @@ package org.apache.brooklyn.entity.database.mysql; import java.util.Arrays; import org.apache.brooklyn.api.entity.proxying.EntitySpec; +import org.apache.brooklyn.core.config.BrooklynProperties; import org.testng.annotations.Test; - -import brooklyn.config.BrooklynProperties; - import org.apache.brooklyn.entity.database.DatastoreMixins.DatastoreCommon; import org.apache.brooklyn.entity.database.VogellaExampleAccess; import org.apache.brooklyn.location.basic.SshMachineLocation; http://git-wip-us.apache.org/repos/asf/brooklyn-library/blob/09b9412d/software/database/src/test/java/org/apache/brooklyn/entity/database/postgresql/PostgreSqlIntegrationTest.java ---------------------------------------------------------------------- diff --git a/software/database/src/test/java/org/apache/brooklyn/entity/database/postgresql/PostgreSqlIntegrationTest.java b/software/database/src/test/java/org/apache/brooklyn/entity/database/postgresql/PostgreSqlIntegrationTest.java index ede5fec..fa41367 100644 --- a/software/database/src/test/java/org/apache/brooklyn/entity/database/postgresql/PostgreSqlIntegrationTest.java +++ b/software/database/src/test/java/org/apache/brooklyn/entity/database/postgresql/PostgreSqlIntegrationTest.java @@ -20,6 +20,7 @@ package org.apache.brooklyn.entity.database.postgresql; import org.apache.brooklyn.api.entity.proxying.EntitySpec; import org.apache.brooklyn.api.management.ManagementContext; +import org.apache.brooklyn.core.config.BrooklynProperties; import org.apache.brooklyn.core.management.internal.LocalManagementContext; import org.apache.brooklyn.test.entity.TestApplication; import org.slf4j.Logger; @@ -28,9 +29,9 @@ import org.testng.annotations.AfterMethod; import org.testng.annotations.BeforeMethod; import org.testng.annotations.Test; -import brooklyn.config.BrooklynProperties; import brooklyn.entity.basic.ApplicationBuilder; import brooklyn.entity.basic.Entities; + import org.apache.brooklyn.entity.database.DatastoreMixins.DatastoreCommon; import org.apache.brooklyn.entity.database.VogellaExampleAccess; import org.apache.brooklyn.location.basic.LocalhostMachineProvisioningLocation; http://git-wip-us.apache.org/repos/asf/brooklyn-library/blob/09b9412d/software/database/src/test/java/org/apache/brooklyn/entity/database/rubyrep/RubyRepIntegrationTest.java ---------------------------------------------------------------------- diff --git a/software/database/src/test/java/org/apache/brooklyn/entity/database/rubyrep/RubyRepIntegrationTest.java b/software/database/src/test/java/org/apache/brooklyn/entity/database/rubyrep/RubyRepIntegrationTest.java index e58b250..2ea37c4 100644 --- a/software/database/src/test/java/org/apache/brooklyn/entity/database/rubyrep/RubyRepIntegrationTest.java +++ b/software/database/src/test/java/org/apache/brooklyn/entity/database/rubyrep/RubyRepIntegrationTest.java @@ -26,6 +26,7 @@ import java.util.List; import org.apache.brooklyn.api.entity.proxying.EntitySpec; import org.apache.brooklyn.api.location.Location; import org.apache.brooklyn.api.management.ManagementContext; +import org.apache.brooklyn.core.config.BrooklynProperties; import org.apache.brooklyn.core.management.internal.LocalManagementContext; import org.apache.brooklyn.test.entity.TestApplication; import org.slf4j.Logger; @@ -34,16 +35,15 @@ import org.testng.annotations.AfterMethod; import org.testng.annotations.BeforeMethod; import org.testng.annotations.Test; -import brooklyn.config.BrooklynProperties; import brooklyn.entity.basic.ApplicationBuilder; import brooklyn.entity.basic.Entities; + import org.apache.brooklyn.entity.database.DatastoreMixins.DatastoreCommon; import org.apache.brooklyn.entity.database.VogellaExampleAccess; import org.apache.brooklyn.entity.database.mysql.MySqlIntegrationTest; import org.apache.brooklyn.entity.database.mysql.MySqlNode; import org.apache.brooklyn.entity.database.postgresql.PostgreSqlIntegrationTest; import org.apache.brooklyn.entity.database.postgresql.PostgreSqlNode; - import org.apache.brooklyn.location.basic.LocalhostMachineProvisioningLocation; import org.apache.brooklyn.location.basic.PortRanges; http://git-wip-us.apache.org/repos/asf/brooklyn-library/blob/09b9412d/software/messaging/src/main/java/org/apache/brooklyn/entity/messaging/storm/Storm.java ---------------------------------------------------------------------- diff --git a/software/messaging/src/main/java/org/apache/brooklyn/entity/messaging/storm/Storm.java b/software/messaging/src/main/java/org/apache/brooklyn/entity/messaging/storm/Storm.java index 94cdebc..fd45e3d 100644 --- a/software/messaging/src/main/java/org/apache/brooklyn/entity/messaging/storm/Storm.java +++ b/software/messaging/src/main/java/org/apache/brooklyn/entity/messaging/storm/Storm.java @@ -23,9 +23,9 @@ import org.apache.brooklyn.api.entity.Entity; import org.apache.brooklyn.api.entity.proxying.ImplementedBy; import org.apache.brooklyn.api.event.AttributeSensor; import org.apache.brooklyn.config.ConfigKey; +import org.apache.brooklyn.core.config.render.RendererHints; import org.apache.brooklyn.core.util.flags.SetFromFlag; -import brooklyn.config.render.RendererHints; import brooklyn.entity.basic.ConfigKeys; import brooklyn.entity.basic.SoftwareProcess; import brooklyn.entity.java.UsesJmx; http://git-wip-us.apache.org/repos/asf/brooklyn-library/blob/09b9412d/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/couchbase/CouchbaseClusterImpl.java ---------------------------------------------------------------------- diff --git a/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/couchbase/CouchbaseClusterImpl.java b/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/couchbase/CouchbaseClusterImpl.java index 1dd9fbf..92560e6 100644 --- a/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/couchbase/CouchbaseClusterImpl.java +++ b/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/couchbase/CouchbaseClusterImpl.java @@ -33,13 +33,13 @@ import org.apache.brooklyn.api.entity.Entity; import org.apache.brooklyn.api.entity.proxying.EntitySpec; import org.apache.brooklyn.api.event.AttributeSensor; import org.apache.brooklyn.api.policy.PolicySpec; +import org.apache.brooklyn.core.config.render.RendererHints; import org.apache.brooklyn.core.util.task.DynamicTasks; import org.apache.brooklyn.core.util.task.TaskBuilder; import org.apache.brooklyn.core.util.task.Tasks; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import brooklyn.config.render.RendererHints; import brooklyn.enricher.Enrichers; import brooklyn.entity.basic.Attributes; import brooklyn.entity.basic.Entities; http://git-wip-us.apache.org/repos/asf/brooklyn-library/blob/09b9412d/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/couchbase/CouchbaseNode.java ---------------------------------------------------------------------- diff --git a/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/couchbase/CouchbaseNode.java b/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/couchbase/CouchbaseNode.java index 0a5f3d4..5cc1a36 100644 --- a/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/couchbase/CouchbaseNode.java +++ b/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/couchbase/CouchbaseNode.java @@ -24,10 +24,10 @@ import org.apache.brooklyn.api.catalog.Catalog; import org.apache.brooklyn.api.entity.proxying.ImplementedBy; import org.apache.brooklyn.api.event.AttributeSensor; import org.apache.brooklyn.config.ConfigKey; +import org.apache.brooklyn.core.config.render.RendererHints; import org.apache.brooklyn.core.util.flags.SetFromFlag; import org.apache.brooklyn.util.text.ByteSizeStrings; -import brooklyn.config.render.RendererHints; import brooklyn.entity.annotation.Effector; import brooklyn.entity.annotation.EffectorParam; import brooklyn.entity.basic.Attributes; http://git-wip-us.apache.org/repos/asf/brooklyn-library/blob/09b9412d/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/couchbase/CouchbaseSyncGatewayImpl.java ---------------------------------------------------------------------- diff --git a/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/couchbase/CouchbaseSyncGatewayImpl.java b/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/couchbase/CouchbaseSyncGatewayImpl.java index 6d52bc4..261bb20 100644 --- a/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/couchbase/CouchbaseSyncGatewayImpl.java +++ b/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/couchbase/CouchbaseSyncGatewayImpl.java @@ -18,11 +18,12 @@ */ package org.apache.brooklyn.entity.nosql.couchbase; -import brooklyn.config.render.RendererHints; import brooklyn.entity.basic.SoftwareProcessImpl; import brooklyn.event.feed.http.HttpFeed; import brooklyn.event.feed.http.HttpPollConfig; import brooklyn.event.feed.http.HttpValueFunctions; + +import org.apache.brooklyn.core.config.render.RendererHints; import org.apache.brooklyn.location.access.BrooklynAccessUtils; import com.google.common.base.Functions; http://git-wip-us.apache.org/repos/asf/brooklyn-library/blob/09b9412d/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/mongodb/MongoDBServerImpl.java ---------------------------------------------------------------------- diff --git a/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/mongodb/MongoDBServerImpl.java b/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/mongodb/MongoDBServerImpl.java index 505b557..4e93cca 100644 --- a/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/mongodb/MongoDBServerImpl.java +++ b/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/mongodb/MongoDBServerImpl.java @@ -24,14 +24,15 @@ import java.util.concurrent.TimeUnit; import org.apache.brooklyn.api.event.SensorEvent; import org.apache.brooklyn.api.event.SensorEventListener; +import org.apache.brooklyn.core.config.render.RendererHints; import org.bson.BasicBSONObject; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import brooklyn.config.render.RendererHints; import brooklyn.entity.basic.SoftwareProcessImpl; import brooklyn.event.feed.function.FunctionFeed; import brooklyn.event.feed.function.FunctionPollConfig; + import org.apache.brooklyn.location.access.BrooklynAccessUtils; import com.google.common.base.Functions; http://git-wip-us.apache.org/repos/asf/brooklyn-library/blob/09b9412d/software/webapp/src/main/java/org/apache/brooklyn/entity/webapp/DynamicWebAppCluster.java ---------------------------------------------------------------------- diff --git a/software/webapp/src/main/java/org/apache/brooklyn/entity/webapp/DynamicWebAppCluster.java b/software/webapp/src/main/java/org/apache/brooklyn/entity/webapp/DynamicWebAppCluster.java index 525b025..6818bb3 100644 --- a/software/webapp/src/main/java/org/apache/brooklyn/entity/webapp/DynamicWebAppCluster.java +++ b/software/webapp/src/main/java/org/apache/brooklyn/entity/webapp/DynamicWebAppCluster.java @@ -21,9 +21,9 @@ package org.apache.brooklyn.entity.webapp; import org.apache.brooklyn.api.catalog.Catalog; import org.apache.brooklyn.api.entity.proxying.ImplementedBy; import org.apache.brooklyn.api.event.AttributeSensor; +import org.apache.brooklyn.core.config.render.RendererHints; import org.apache.brooklyn.util.time.Duration; -import brooklyn.config.render.RendererHints; import brooklyn.entity.group.DynamicCluster; import brooklyn.event.basic.BasicAttributeSensor; http://git-wip-us.apache.org/repos/asf/brooklyn-library/blob/09b9412d/software/webapp/src/main/java/org/apache/brooklyn/entity/webapp/WebAppServiceConstants.java ---------------------------------------------------------------------- diff --git a/software/webapp/src/main/java/org/apache/brooklyn/entity/webapp/WebAppServiceConstants.java b/software/webapp/src/main/java/org/apache/brooklyn/entity/webapp/WebAppServiceConstants.java index 693b4c4..baf1262 100644 --- a/software/webapp/src/main/java/org/apache/brooklyn/entity/webapp/WebAppServiceConstants.java +++ b/software/webapp/src/main/java/org/apache/brooklyn/entity/webapp/WebAppServiceConstants.java @@ -21,11 +21,11 @@ package org.apache.brooklyn.entity.webapp; import java.util.Set; import org.apache.brooklyn.api.event.AttributeSensor; +import org.apache.brooklyn.core.config.render.RendererHints; import org.apache.brooklyn.core.util.flags.SetFromFlag; import com.google.common.collect.ImmutableSet; -import brooklyn.config.render.RendererHints; import brooklyn.entity.basic.Attributes; import brooklyn.event.basic.BasicAttributeSensorAndConfigKey; import brooklyn.event.basic.PortAttributeSensorAndConfigKey; http://git-wip-us.apache.org/repos/asf/brooklyn-library/blob/09b9412d/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 00df2d5..2b206af 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 @@ -19,11 +19,11 @@ package org.apache.brooklyn.entity.webapp; import org.apache.brooklyn.api.event.AttributeSensor; +import org.apache.brooklyn.core.config.render.RendererHints; import org.apache.brooklyn.util.math.MathFunctions; import org.apache.brooklyn.util.text.ByteSizeStrings; import org.apache.brooklyn.util.time.Duration; -import brooklyn.config.render.RendererHints; import brooklyn.event.basic.BasicAttributeSensor; import brooklyn.event.basic.Sensors; http://git-wip-us.apache.org/repos/asf/brooklyn-library/blob/09b9412d/software/webapp/src/main/java/org/apache/brooklyn/entity/webapp/jboss/JBoss7ServerImpl.java ---------------------------------------------------------------------- diff --git a/software/webapp/src/main/java/org/apache/brooklyn/entity/webapp/jboss/JBoss7ServerImpl.java b/software/webapp/src/main/java/org/apache/brooklyn/entity/webapp/jboss/JBoss7ServerImpl.java index 5cc6ad8..ac35e16 100644 --- a/software/webapp/src/main/java/org/apache/brooklyn/entity/webapp/jboss/JBoss7ServerImpl.java +++ b/software/webapp/src/main/java/org/apache/brooklyn/entity/webapp/jboss/JBoss7ServerImpl.java @@ -21,11 +21,11 @@ package org.apache.brooklyn.entity.webapp.jboss; import java.util.Map; import org.apache.brooklyn.api.entity.Entity; +import org.apache.brooklyn.core.config.render.RendererHints; import org.apache.brooklyn.entity.webapp.JavaWebAppSoftwareProcessImpl; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import brooklyn.config.render.RendererHints; import brooklyn.enricher.Enrichers; import brooklyn.entity.basic.Attributes; import brooklyn.event.feed.http.HttpFeed; http://git-wip-us.apache.org/repos/asf/brooklyn-library/blob/09b9412d/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 769edce..d78d90f 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,7 +47,6 @@ import org.testng.annotations.BeforeMethod; import org.testng.annotations.DataProvider; import org.testng.annotations.Test; -import brooklyn.config.BrooklynProperties; import brooklyn.entity.basic.ApplicationBuilder; import brooklyn.entity.basic.Entities; import brooklyn.entity.basic.EntityInternal; @@ -65,6 +64,7 @@ import org.apache.brooklyn.api.location.LocationSpec; import org.apache.brooklyn.api.management.ManagementContext; import org.apache.brooklyn.api.management.SubscriptionContext; import org.apache.brooklyn.api.management.SubscriptionHandle; +import org.apache.brooklyn.core.config.BrooklynProperties; import org.apache.brooklyn.core.util.crypto.FluentKeySigner; import org.apache.brooklyn.core.util.crypto.SecureKeys; import org.apache.brooklyn.entity.webapp.JavaWebAppService; http://git-wip-us.apache.org/repos/asf/brooklyn-library/blob/09b9412d/software/webapp/src/test/java/org/apache/brooklyn/entity/webapp/WebAppLiveIntegrationTest.groovy ---------------------------------------------------------------------- diff --git a/software/webapp/src/test/java/org/apache/brooklyn/entity/webapp/WebAppLiveIntegrationTest.groovy b/software/webapp/src/test/java/org/apache/brooklyn/entity/webapp/WebAppLiveIntegrationTest.groovy index 6e49882..87766fc 100644 --- a/software/webapp/src/test/java/org/apache/brooklyn/entity/webapp/WebAppLiveIntegrationTest.groovy +++ b/software/webapp/src/test/java/org/apache/brooklyn/entity/webapp/WebAppLiveIntegrationTest.groovy @@ -29,7 +29,7 @@ import org.testng.annotations.BeforeMethod import org.testng.annotations.DataProvider import org.testng.annotations.Test -import brooklyn.config.BrooklynProperties +import org.apache.brooklyn.core.config.BrooklynProperties import org.apache.brooklyn.api.entity.Application import brooklyn.entity.basic.SoftwareProcess import brooklyn.entity.basic.Entities
