http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/68240194/software/base/src/main/java/brooklyn/entity/basic/AbstractSoftwareProcessSshDriver.java ---------------------------------------------------------------------- diff --git a/software/base/src/main/java/brooklyn/entity/basic/AbstractSoftwareProcessSshDriver.java b/software/base/src/main/java/brooklyn/entity/basic/AbstractSoftwareProcessSshDriver.java index 2c8c668..2d7e2f5 100644 --- a/software/base/src/main/java/brooklyn/entity/basic/AbstractSoftwareProcessSshDriver.java +++ b/software/base/src/main/java/brooklyn/entity/basic/AbstractSoftwareProcessSshDriver.java @@ -29,6 +29,7 @@ import java.util.Set; import org.apache.brooklyn.api.entity.basic.EntityLocal; import org.apache.brooklyn.api.entity.drivers.downloads.DownloadResolver; +import org.apache.brooklyn.core.config.BrooklynLogging; import org.apache.brooklyn.core.util.internal.ssh.SshTool; import org.apache.brooklyn.core.util.internal.ssh.sshj.SshjTool; import org.apache.brooklyn.core.util.task.DynamicTasks; @@ -44,7 +45,6 @@ import com.google.common.collect.Iterables; import com.google.common.collect.Maps; import com.google.common.collect.Sets; -import brooklyn.config.BrooklynLogging; import brooklyn.entity.basic.lifecycle.NaiveScriptRunner; import brooklyn.entity.basic.lifecycle.ScriptHelper; import brooklyn.entity.effector.EffectorTasks;
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/68240194/software/base/src/main/java/brooklyn/entity/brooklynnode/BrooklynNodeImpl.java ---------------------------------------------------------------------- diff --git a/software/base/src/main/java/brooklyn/entity/brooklynnode/BrooklynNodeImpl.java b/software/base/src/main/java/brooklyn/entity/brooklynnode/BrooklynNodeImpl.java index 54371af..491ff00 100644 --- a/software/base/src/main/java/brooklyn/entity/brooklynnode/BrooklynNodeImpl.java +++ b/software/base/src/main/java/brooklyn/entity/brooklynnode/BrooklynNodeImpl.java @@ -32,6 +32,7 @@ import org.apache.brooklyn.api.management.Task; import org.apache.brooklyn.api.management.TaskAdaptable; import org.apache.brooklyn.api.management.ha.ManagementNodeState; import org.apache.brooklyn.config.ConfigKey; +import org.apache.brooklyn.core.config.render.RendererHints; import org.apache.brooklyn.core.util.config.ConfigBag; import org.apache.brooklyn.core.util.http.HttpToolResponse; import org.apache.brooklyn.core.util.task.DynamicTasks; @@ -41,7 +42,6 @@ import org.apache.http.HttpStatus; 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.BrooklynTaskTags; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/68240194/software/base/src/main/java/brooklyn/entity/brooklynnode/LocalBrooklynNodeImpl.java ---------------------------------------------------------------------- diff --git a/software/base/src/main/java/brooklyn/entity/brooklynnode/LocalBrooklynNodeImpl.java b/software/base/src/main/java/brooklyn/entity/brooklynnode/LocalBrooklynNodeImpl.java index fe5764c..d3b7514 100644 --- a/software/base/src/main/java/brooklyn/entity/brooklynnode/LocalBrooklynNodeImpl.java +++ b/software/base/src/main/java/brooklyn/entity/brooklynnode/LocalBrooklynNodeImpl.java @@ -18,10 +18,9 @@ */ package brooklyn.entity.brooklynnode; +import org.apache.brooklyn.core.config.BrooklynProperties; import org.apache.brooklyn.util.text.Strings; -import brooklyn.config.BrooklynProperties; - public class LocalBrooklynNodeImpl extends BrooklynNodeImpl implements LocalBrooklynNode { private static final String LOCAL_BROOKLYN_NODE_KEY = "brooklyn.entity.brooklynnode.local.%s"; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/68240194/software/base/src/main/java/brooklyn/entity/java/JavaAppUtils.java ---------------------------------------------------------------------- diff --git a/software/base/src/main/java/brooklyn/entity/java/JavaAppUtils.java b/software/base/src/main/java/brooklyn/entity/java/JavaAppUtils.java index 6e0e1a6..29f00e2 100644 --- a/software/base/src/main/java/brooklyn/entity/java/JavaAppUtils.java +++ b/software/base/src/main/java/brooklyn/entity/java/JavaAppUtils.java @@ -31,12 +31,12 @@ import javax.management.openmbean.CompositeData; import org.apache.brooklyn.api.entity.Entity; import org.apache.brooklyn.api.entity.basic.EntityLocal; +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 org.apache.brooklyn.util.time.Time; -import brooklyn.config.render.RendererHints; import brooklyn.enricher.RollingTimeWindowMeanEnricher; import brooklyn.enricher.TimeFractionDeltaEnricher; import brooklyn.event.feed.http.HttpValueFunctions; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/68240194/software/base/src/main/java/brooklyn/entity/machine/MachineAttributes.java ---------------------------------------------------------------------- diff --git a/software/base/src/main/java/brooklyn/entity/machine/MachineAttributes.java b/software/base/src/main/java/brooklyn/entity/machine/MachineAttributes.java index 39c0da3..2e76bbf 100644 --- a/software/base/src/main/java/brooklyn/entity/machine/MachineAttributes.java +++ b/software/base/src/main/java/brooklyn/entity/machine/MachineAttributes.java @@ -23,12 +23,12 @@ import java.util.concurrent.atomic.AtomicBoolean; import javax.annotation.Nullable; import org.apache.brooklyn.api.event.AttributeSensor; +import org.apache.brooklyn.core.config.render.RendererHints; import org.apache.brooklyn.util.guava.Functionals; 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.Sensors; import com.google.common.base.Function; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/68240194/software/base/src/main/java/brooklyn/entity/software/SshEffectorTasks.java ---------------------------------------------------------------------- diff --git a/software/base/src/main/java/brooklyn/entity/software/SshEffectorTasks.java b/software/base/src/main/java/brooklyn/entity/software/SshEffectorTasks.java index 60ed736..41acf7f 100644 --- a/software/base/src/main/java/brooklyn/entity/software/SshEffectorTasks.java +++ b/software/base/src/main/java/brooklyn/entity/software/SshEffectorTasks.java @@ -29,6 +29,7 @@ import org.apache.brooklyn.api.location.Location; import org.apache.brooklyn.api.management.Task; import org.apache.brooklyn.config.ConfigKey; import org.apache.brooklyn.config.StringConfigMap; +import org.apache.brooklyn.core.config.ConfigUtils; import org.apache.brooklyn.core.util.config.ConfigBag; import org.apache.brooklyn.core.util.internal.ssh.SshTool; import org.apache.brooklyn.core.util.task.Tasks; @@ -44,7 +45,6 @@ import org.apache.brooklyn.core.util.task.system.ProcessTaskWrapper; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import brooklyn.config.ConfigUtils; import brooklyn.entity.basic.BrooklynTaskTags; import brooklyn.entity.basic.ConfigKeys; import brooklyn.entity.basic.EntityInternal; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/68240194/software/base/src/test/java/brooklyn/entity/AbstractEc2LiveTest.java ---------------------------------------------------------------------- diff --git a/software/base/src/test/java/brooklyn/entity/AbstractEc2LiveTest.java b/software/base/src/test/java/brooklyn/entity/AbstractEc2LiveTest.java index 8edeac0..e93a4cd 100644 --- a/software/base/src/test/java/brooklyn/entity/AbstractEc2LiveTest.java +++ b/software/base/src/test/java/brooklyn/entity/AbstractEc2LiveTest.java @@ -24,10 +24,8 @@ import org.apache.brooklyn.test.entity.LocalManagementContextForTests; import org.apache.brooklyn.util.collections.MutableMap; import org.testng.annotations.BeforeMethod; import org.testng.annotations.Test; - -import brooklyn.config.BrooklynProperties; - import org.apache.brooklyn.api.location.Location; +import org.apache.brooklyn.core.config.BrooklynProperties; import org.apache.brooklyn.location.jclouds.JcloudsLocation; import org.apache.brooklyn.location.jclouds.JcloudsLocationConfig; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/68240194/software/base/src/test/java/brooklyn/entity/AbstractGoogleComputeLiveTest.java ---------------------------------------------------------------------- diff --git a/software/base/src/test/java/brooklyn/entity/AbstractGoogleComputeLiveTest.java b/software/base/src/test/java/brooklyn/entity/AbstractGoogleComputeLiveTest.java index 3775c57..da3ae23 100644 --- a/software/base/src/test/java/brooklyn/entity/AbstractGoogleComputeLiveTest.java +++ b/software/base/src/test/java/brooklyn/entity/AbstractGoogleComputeLiveTest.java @@ -23,6 +23,7 @@ import java.util.Map; 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.apache.brooklyn.util.collections.MutableMap; @@ -30,7 +31,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/incubator-brooklyn/blob/68240194/software/base/src/test/java/brooklyn/entity/AbstractSoftlayerLiveTest.java ---------------------------------------------------------------------- diff --git a/software/base/src/test/java/brooklyn/entity/AbstractSoftlayerLiveTest.java b/software/base/src/test/java/brooklyn/entity/AbstractSoftlayerLiveTest.java index 003e25f..eeb38d6 100644 --- a/software/base/src/test/java/brooklyn/entity/AbstractSoftlayerLiveTest.java +++ b/software/base/src/test/java/brooklyn/entity/AbstractSoftlayerLiveTest.java @@ -23,6 +23,7 @@ import java.util.Map; 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.apache.brooklyn.util.collections.MutableMap; @@ -36,7 +37,6 @@ import com.google.common.base.CaseFormat; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; -import brooklyn.config.BrooklynProperties; import brooklyn.entity.basic.ApplicationBuilder; import brooklyn.entity.basic.Entities; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/68240194/software/base/src/test/java/brooklyn/entity/brooklynnode/BrooklynNodeIntegrationTest.java ---------------------------------------------------------------------- diff --git a/software/base/src/test/java/brooklyn/entity/brooklynnode/BrooklynNodeIntegrationTest.java b/software/base/src/test/java/brooklyn/entity/brooklynnode/BrooklynNodeIntegrationTest.java index fe28a4a..06a24fd 100644 --- a/software/base/src/test/java/brooklyn/entity/brooklynnode/BrooklynNodeIntegrationTest.java +++ b/software/base/src/test/java/brooklyn/entity/brooklynnode/BrooklynNodeIntegrationTest.java @@ -35,6 +35,7 @@ import org.apache.brooklyn.api.entity.Effector; import org.apache.brooklyn.api.entity.Entity; import org.apache.brooklyn.api.entity.basic.EntityLocal; import org.apache.brooklyn.api.entity.proxying.EntitySpec; +import org.apache.brooklyn.core.config.BrooklynProperties; import org.apache.brooklyn.core.util.config.ConfigBag; import org.apache.brooklyn.core.util.http.HttpTool; import org.apache.brooklyn.core.util.http.HttpToolResponse; @@ -59,7 +60,6 @@ import org.testng.annotations.AfterMethod; import org.testng.annotations.BeforeMethod; import org.testng.annotations.Test; -import brooklyn.config.BrooklynProperties; import brooklyn.entity.BrooklynAppUnitTestSupport; import brooklyn.entity.basic.BasicApplication; import brooklyn.entity.basic.BasicApplicationImpl; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/68240194/software/base/src/test/java/brooklyn/entity/pool/ServerPoolLiveTest.java ---------------------------------------------------------------------- diff --git a/software/base/src/test/java/brooklyn/entity/pool/ServerPoolLiveTest.java b/software/base/src/test/java/brooklyn/entity/pool/ServerPoolLiveTest.java index 38bb060..c8afc05 100644 --- a/software/base/src/test/java/brooklyn/entity/pool/ServerPoolLiveTest.java +++ b/software/base/src/test/java/brooklyn/entity/pool/ServerPoolLiveTest.java @@ -25,6 +25,7 @@ import java.util.Map; import org.apache.brooklyn.api.entity.Entity; 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.test.entity.LocalManagementContextForTests; import org.apache.brooklyn.test.entity.TestApplication; import org.apache.brooklyn.util.collections.MutableMap; @@ -33,7 +34,6 @@ import org.testng.annotations.Test; import com.google.common.base.CaseFormat; import com.google.common.collect.ImmutableList; -import brooklyn.config.BrooklynProperties; import brooklyn.entity.basic.Attributes; public class ServerPoolLiveTest extends AbstractServerPoolTest { http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/68240194/software/base/src/test/java/brooklyn/entity/pool/ServerPoolLocationResolverTest.java ---------------------------------------------------------------------- diff --git a/software/base/src/test/java/brooklyn/entity/pool/ServerPoolLocationResolverTest.java b/software/base/src/test/java/brooklyn/entity/pool/ServerPoolLocationResolverTest.java index d01354c..d18ce30 100644 --- a/software/base/src/test/java/brooklyn/entity/pool/ServerPoolLocationResolverTest.java +++ b/software/base/src/test/java/brooklyn/entity/pool/ServerPoolLocationResolverTest.java @@ -26,6 +26,7 @@ import org.apache.brooklyn.api.entity.Entity; import org.apache.brooklyn.api.entity.proxying.EntitySpec; import org.apache.brooklyn.api.location.Location; import org.apache.brooklyn.api.location.LocationSpec; +import org.apache.brooklyn.core.config.BrooklynProperties; import org.apache.brooklyn.core.management.internal.LocalManagementContext; import org.apache.brooklyn.test.entity.LocalManagementContextForTests; import org.apache.brooklyn.test.entity.TestApplication; @@ -37,7 +38,6 @@ import org.testng.annotations.Test; import com.google.common.collect.ImmutableList; -import brooklyn.config.BrooklynProperties; import brooklyn.entity.basic.ApplicationBuilder; import brooklyn.entity.basic.EmptySoftwareProcess; import brooklyn.entity.basic.Entities; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/68240194/software/base/src/test/java/brooklyn/entity/software/AbstractDockerLiveTest.java ---------------------------------------------------------------------- diff --git a/software/base/src/test/java/brooklyn/entity/software/AbstractDockerLiveTest.java b/software/base/src/test/java/brooklyn/entity/software/AbstractDockerLiveTest.java index 126064e..1651e0f 100644 --- a/software/base/src/test/java/brooklyn/entity/software/AbstractDockerLiveTest.java +++ b/software/base/src/test/java/brooklyn/entity/software/AbstractDockerLiveTest.java @@ -18,7 +18,6 @@ */ package brooklyn.entity.software; -import brooklyn.config.BrooklynProperties; import brooklyn.entity.basic.ApplicationBuilder; import brooklyn.entity.basic.Entities; @@ -28,6 +27,7 @@ import com.google.common.collect.ImmutableMap; 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.apache.brooklyn.util.collections.MutableMap; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/68240194/software/base/src/test/java/brooklyn/management/usage/UsageListenerTest.java ---------------------------------------------------------------------- diff --git a/software/base/src/test/java/brooklyn/management/usage/UsageListenerTest.java b/software/base/src/test/java/brooklyn/management/usage/UsageListenerTest.java index 0d94fae..0bc7637 100644 --- a/software/base/src/test/java/brooklyn/management/usage/UsageListenerTest.java +++ b/software/base/src/test/java/brooklyn/management/usage/UsageListenerTest.java @@ -31,10 +31,10 @@ import org.testng.annotations.AfterMethod; import org.testng.annotations.BeforeMethod; import org.testng.annotations.Test; -import brooklyn.config.BrooklynProperties; import brooklyn.entity.basic.Entities; import org.apache.brooklyn.api.location.Location; +import org.apache.brooklyn.core.config.BrooklynProperties; import org.apache.brooklyn.core.management.internal.ManagementContextInternal; import org.apache.brooklyn.core.management.internal.UsageManager; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/68240194/software/base/src/test/java/org/apache/brooklyn/location/basic/WinRmMachineLocationLiveTest.java ---------------------------------------------------------------------- diff --git a/software/base/src/test/java/org/apache/brooklyn/location/basic/WinRmMachineLocationLiveTest.java b/software/base/src/test/java/org/apache/brooklyn/location/basic/WinRmMachineLocationLiveTest.java index 29eb71d..8cebde1 100644 --- a/software/base/src/test/java/org/apache/brooklyn/location/basic/WinRmMachineLocationLiveTest.java +++ b/software/base/src/test/java/org/apache/brooklyn/location/basic/WinRmMachineLocationLiveTest.java @@ -20,6 +20,7 @@ package org.apache.brooklyn.location.basic; import static org.testng.Assert.assertEquals; +import org.apache.brooklyn.core.config.BrooklynProperties; import org.apache.brooklyn.core.management.internal.ManagementContextInternal; import org.apache.brooklyn.location.jclouds.JcloudsLocation; import org.apache.brooklyn.test.entity.LocalManagementContextForTests; @@ -33,7 +34,6 @@ import org.testng.annotations.AfterClass; import org.testng.annotations.BeforeClass; import org.testng.annotations.Test; -import brooklyn.config.BrooklynProperties; import brooklyn.entity.BrooklynAppLiveTestSupport; import brooklyn.entity.basic.Entities; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/68240194/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/incubator-brooklyn/blob/68240194/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/incubator-brooklyn/blob/68240194/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/incubator-brooklyn/blob/68240194/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/incubator-brooklyn/blob/68240194/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/incubator-brooklyn/blob/68240194/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/incubator-brooklyn/blob/68240194/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/incubator-brooklyn/blob/68240194/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/incubator-brooklyn/blob/68240194/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/incubator-brooklyn/blob/68240194/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/incubator-brooklyn/blob/68240194/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/incubator-brooklyn/blob/68240194/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/incubator-brooklyn/blob/68240194/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/incubator-brooklyn/blob/68240194/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/incubator-brooklyn/blob/68240194/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/incubator-brooklyn/blob/68240194/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 http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/68240194/storage/hazelcast/src/test/java/org/apache/brooklyn/storage/impl/hazelcast/HazelcastStorageTest.java ---------------------------------------------------------------------- diff --git a/storage/hazelcast/src/test/java/org/apache/brooklyn/storage/impl/hazelcast/HazelcastStorageTest.java b/storage/hazelcast/src/test/java/org/apache/brooklyn/storage/impl/hazelcast/HazelcastStorageTest.java index 54e87ef..58ef024 100644 --- a/storage/hazelcast/src/test/java/org/apache/brooklyn/storage/impl/hazelcast/HazelcastStorageTest.java +++ b/storage/hazelcast/src/test/java/org/apache/brooklyn/storage/impl/hazelcast/HazelcastStorageTest.java @@ -27,9 +27,7 @@ import java.util.Map; import org.testng.annotations.AfterMethod; import org.testng.annotations.BeforeMethod; import org.testng.annotations.Test; - -import brooklyn.config.BrooklynProperties; - +import org.apache.brooklyn.core.config.BrooklynProperties; import org.apache.brooklyn.core.internal.storage.BrooklynStorage; import org.apache.brooklyn.core.internal.storage.DataGridFactory; import org.apache.brooklyn.core.internal.storage.Reference; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/68240194/usage/camp/src/main/java/org/apache/brooklyn/camp/brooklyn/BrooklynCampConstants.java ---------------------------------------------------------------------- diff --git a/usage/camp/src/main/java/org/apache/brooklyn/camp/brooklyn/BrooklynCampConstants.java b/usage/camp/src/main/java/org/apache/brooklyn/camp/brooklyn/BrooklynCampConstants.java index 4a078f5..a249e80 100644 --- a/usage/camp/src/main/java/org/apache/brooklyn/camp/brooklyn/BrooklynCampConstants.java +++ b/usage/camp/src/main/java/org/apache/brooklyn/camp/brooklyn/BrooklynCampConstants.java @@ -23,8 +23,8 @@ import java.util.Set; import org.apache.brooklyn.camp.CampPlatform; import org.apache.brooklyn.config.ConfigInheritance; import org.apache.brooklyn.config.ConfigKey; +import org.apache.brooklyn.core.config.BrooklynServerConfig; -import brooklyn.config.BrooklynServerConfig; import brooklyn.entity.basic.ConfigKeys; import com.google.common.collect.ImmutableSet; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/68240194/usage/camp/src/main/java/org/apache/brooklyn/camp/brooklyn/BrooklynCampPlatform.java ---------------------------------------------------------------------- diff --git a/usage/camp/src/main/java/org/apache/brooklyn/camp/brooklyn/BrooklynCampPlatform.java b/usage/camp/src/main/java/org/apache/brooklyn/camp/brooklyn/BrooklynCampPlatform.java index fece562..6ffe01f 100644 --- a/usage/camp/src/main/java/org/apache/brooklyn/camp/brooklyn/BrooklynCampPlatform.java +++ b/usage/camp/src/main/java/org/apache/brooklyn/camp/brooklyn/BrooklynCampPlatform.java @@ -26,9 +26,9 @@ import org.apache.brooklyn.camp.brooklyn.spi.creation.BrooklynEntityMatcher; import org.apache.brooklyn.camp.brooklyn.spi.dsl.BrooklynDslInterpreter; import org.apache.brooklyn.camp.brooklyn.spi.platform.BrooklynImmutableCampPlatform; import org.apache.brooklyn.camp.spi.PlatformRootSummary; +import org.apache.brooklyn.core.config.BrooklynProperties; import brooklyn.camp.brooklyn.api.HasBrooklynManagementContext; -import brooklyn.config.BrooklynProperties; /** {@link CampPlatform} implementation which includes Brooklyn entities * (via {@link BrooklynImmutableCampPlatform}) http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/68240194/usage/camp/src/main/java/org/apache/brooklyn/camp/brooklyn/spi/creation/BrooklynAssemblyTemplateInstantiator.java ---------------------------------------------------------------------- diff --git a/usage/camp/src/main/java/org/apache/brooklyn/camp/brooklyn/spi/creation/BrooklynAssemblyTemplateInstantiator.java b/usage/camp/src/main/java/org/apache/brooklyn/camp/brooklyn/spi/creation/BrooklynAssemblyTemplateInstantiator.java index 6287c6c..d8710bf 100644 --- a/usage/camp/src/main/java/org/apache/brooklyn/camp/brooklyn/spi/creation/BrooklynAssemblyTemplateInstantiator.java +++ b/usage/camp/src/main/java/org/apache/brooklyn/camp/brooklyn/spi/creation/BrooklynAssemblyTemplateInstantiator.java @@ -48,6 +48,7 @@ import org.apache.brooklyn.camp.spi.collection.ResolvableLink; import org.apache.brooklyn.camp.spi.instantiate.AssemblyTemplateInstantiator; import org.apache.brooklyn.core.catalog.internal.CatalogUtils; import org.apache.brooklyn.core.catalog.internal.BasicBrooklynCatalog.BrooklynLoaderTracker; +import org.apache.brooklyn.core.config.BrooklynServerConfig; import org.apache.brooklyn.core.management.internal.EntityManagementUtils; import org.apache.brooklyn.core.management.internal.EntityManagementUtils.CreationResult; import org.apache.brooklyn.core.util.ResourceUtils; @@ -55,7 +56,6 @@ import org.apache.brooklyn.core.util.flags.TypeCoercions; import org.apache.brooklyn.util.exceptions.Exceptions; import org.apache.brooklyn.util.net.Urls; -import brooklyn.config.BrooklynServerConfig; import brooklyn.entity.basic.BasicApplicationImpl; import com.google.common.collect.Iterables; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/68240194/usage/camp/src/test/java/org/apache/brooklyn/camp/brooklyn/catalog/AbstractCatalogXmlTest.java ---------------------------------------------------------------------- diff --git a/usage/camp/src/test/java/org/apache/brooklyn/camp/brooklyn/catalog/AbstractCatalogXmlTest.java b/usage/camp/src/test/java/org/apache/brooklyn/camp/brooklyn/catalog/AbstractCatalogXmlTest.java index f63e367..67805f6 100644 --- a/usage/camp/src/test/java/org/apache/brooklyn/camp/brooklyn/catalog/AbstractCatalogXmlTest.java +++ b/usage/camp/src/test/java/org/apache/brooklyn/camp/brooklyn/catalog/AbstractCatalogXmlTest.java @@ -20,6 +20,8 @@ package org.apache.brooklyn.camp.brooklyn.catalog; import org.apache.brooklyn.api.entity.Entity; import org.apache.brooklyn.camp.brooklyn.AbstractYamlTest; +import org.apache.brooklyn.core.config.BrooklynProperties; +import org.apache.brooklyn.core.config.BrooklynServerConfig; import org.apache.brooklyn.core.management.internal.LocalManagementContext; import org.apache.brooklyn.core.management.osgi.OsgiTestResources; import org.apache.brooklyn.core.util.ResourceUtils; @@ -36,9 +38,6 @@ import java.io.InputStream; import java.io.OutputStream; import java.io.StringReader; -import brooklyn.config.BrooklynProperties; -import brooklyn.config.BrooklynServerConfig; - import com.google.common.io.ByteStreams; public class AbstractCatalogXmlTest extends AbstractYamlTest { http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/68240194/usage/jsgui/src/test/java/org/apache/brooklyn/rest/jsgui/BrooklynJavascriptGuiLauncherTest.java ---------------------------------------------------------------------- diff --git a/usage/jsgui/src/test/java/org/apache/brooklyn/rest/jsgui/BrooklynJavascriptGuiLauncherTest.java b/usage/jsgui/src/test/java/org/apache/brooklyn/rest/jsgui/BrooklynJavascriptGuiLauncherTest.java index dc7ee73..eede542 100644 --- a/usage/jsgui/src/test/java/org/apache/brooklyn/rest/jsgui/BrooklynJavascriptGuiLauncherTest.java +++ b/usage/jsgui/src/test/java/org/apache/brooklyn/rest/jsgui/BrooklynJavascriptGuiLauncherTest.java @@ -25,10 +25,10 @@ import org.eclipse.jetty.server.handler.ContextHandler; import org.testng.annotations.AfterMethod; import org.testng.annotations.Test; -import brooklyn.config.BrooklynServiceAttributes; import brooklyn.entity.basic.Entities; import org.apache.brooklyn.api.management.ManagementContext; +import org.apache.brooklyn.core.config.BrooklynServiceAttributes; import org.apache.brooklyn.rest.BrooklynRestApiLauncherTestFixture; /** Convenience and demo for launching programmatically. */ http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/68240194/usage/launcher/src/main/java/org/apache/brooklyn/launcher/BrooklynLauncher.java ---------------------------------------------------------------------- diff --git a/usage/launcher/src/main/java/org/apache/brooklyn/launcher/BrooklynLauncher.java b/usage/launcher/src/main/java/org/apache/brooklyn/launcher/BrooklynLauncher.java index 8e711b4..f04a8d0 100644 --- a/usage/launcher/src/main/java/org/apache/brooklyn/launcher/BrooklynLauncher.java +++ b/usage/launcher/src/main/java/org/apache/brooklyn/launcher/BrooklynLauncher.java @@ -54,6 +54,10 @@ import org.apache.brooklyn.camp.spi.AssemblyTemplate; import org.apache.brooklyn.camp.spi.instantiate.AssemblyTemplateInstantiator; import org.apache.brooklyn.config.ConfigKey; import org.apache.brooklyn.core.catalog.internal.CatalogInitialization; +import org.apache.brooklyn.core.config.BrooklynProperties; +import org.apache.brooklyn.core.config.BrooklynServerConfig; +import org.apache.brooklyn.core.config.BrooklynServerPaths; +import org.apache.brooklyn.core.config.ConfigPredicates; import org.apache.brooklyn.core.management.ha.HighAvailabilityManagerImpl; import org.apache.brooklyn.core.management.ha.ManagementPlaneSyncRecordPersisterToObjectStore; import org.apache.brooklyn.core.management.internal.LocalManagementContext; @@ -69,10 +73,6 @@ import com.google.common.collect.ImmutableList; import com.google.common.collect.Lists; import com.google.common.collect.Maps; -import brooklyn.config.BrooklynProperties; -import brooklyn.config.BrooklynServerConfig; -import brooklyn.config.BrooklynServerPaths; -import brooklyn.config.ConfigPredicates; import brooklyn.entity.basic.ApplicationBuilder; import brooklyn.entity.basic.BrooklynShutdownHooks; import brooklyn.entity.basic.Entities; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/68240194/usage/launcher/src/main/java/org/apache/brooklyn/launcher/BrooklynWebServer.java ---------------------------------------------------------------------- diff --git a/usage/launcher/src/main/java/org/apache/brooklyn/launcher/BrooklynWebServer.java b/usage/launcher/src/main/java/org/apache/brooklyn/launcher/BrooklynWebServer.java index 179655d..8f9e924 100644 --- a/usage/launcher/src/main/java/org/apache/brooklyn/launcher/BrooklynWebServer.java +++ b/usage/launcher/src/main/java/org/apache/brooklyn/launcher/BrooklynWebServer.java @@ -60,12 +60,12 @@ import com.sun.jersey.api.core.ResourceConfig; import com.sun.jersey.spi.container.servlet.ServletContainer; import brooklyn.BrooklynVersion; -import brooklyn.config.BrooklynServerPaths; -import brooklyn.config.BrooklynServiceAttributes; import org.apache.brooklyn.api.location.PortRange; import org.apache.brooklyn.api.management.ManagementContext; import org.apache.brooklyn.config.ConfigKey; +import org.apache.brooklyn.core.config.BrooklynServerPaths; +import org.apache.brooklyn.core.config.BrooklynServiceAttributes; import org.apache.brooklyn.core.internal.BrooklynInitialization; import org.apache.brooklyn.core.management.internal.ManagementContextInternal; import org.apache.brooklyn.core.util.BrooklynNetworkUtils; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/68240194/usage/launcher/src/main/java/org/apache/brooklyn/launcher/config/BrooklynGlobalConfig.java ---------------------------------------------------------------------- diff --git a/usage/launcher/src/main/java/org/apache/brooklyn/launcher/config/BrooklynGlobalConfig.java b/usage/launcher/src/main/java/org/apache/brooklyn/launcher/config/BrooklynGlobalConfig.java index 3f3941c..5c2d0e7 100644 --- a/usage/launcher/src/main/java/org/apache/brooklyn/launcher/config/BrooklynGlobalConfig.java +++ b/usage/launcher/src/main/java/org/apache/brooklyn/launcher/config/BrooklynGlobalConfig.java @@ -18,10 +18,10 @@ */ package org.apache.brooklyn.launcher.config; -import brooklyn.config.BrooklynServiceAttributes; import brooklyn.entity.basic.BrooklynConfigKeys; import org.apache.brooklyn.config.ConfigKey; +import org.apache.brooklyn.core.config.BrooklynServiceAttributes; import org.apache.brooklyn.core.management.internal.BrooklynGarbageCollector; import org.apache.brooklyn.location.cloud.CloudLocationConfig; import org.apache.brooklyn.rest.BrooklynWebConfig; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/68240194/usage/launcher/src/test/java/org/apache/brooklyn/launcher/BrooklynLauncherHighAvailabilityTest.java ---------------------------------------------------------------------- diff --git a/usage/launcher/src/test/java/org/apache/brooklyn/launcher/BrooklynLauncherHighAvailabilityTest.java b/usage/launcher/src/test/java/org/apache/brooklyn/launcher/BrooklynLauncherHighAvailabilityTest.java index d4cb091..3fee94d 100644 --- a/usage/launcher/src/test/java/org/apache/brooklyn/launcher/BrooklynLauncherHighAvailabilityTest.java +++ b/usage/launcher/src/test/java/org/apache/brooklyn/launcher/BrooklynLauncherHighAvailabilityTest.java @@ -23,6 +23,7 @@ import org.apache.brooklyn.api.entity.proxying.EntitySpec; import org.apache.brooklyn.api.management.ManagementContext; import org.apache.brooklyn.api.management.ha.HighAvailabilityMode; import org.apache.brooklyn.api.management.ha.ManagementPlaneSyncRecordPersister; +import org.apache.brooklyn.core.config.BrooklynProperties; import org.apache.brooklyn.core.management.internal.ManagementContextInternal; import org.apache.brooklyn.launcher.BrooklynLauncher; import org.apache.brooklyn.test.Asserts; @@ -44,7 +45,6 @@ import org.testng.annotations.AfterMethod; import org.testng.annotations.BeforeMethod; import org.testng.annotations.Test; -import brooklyn.config.BrooklynProperties; import brooklyn.entity.rebind.RebindTestUtils; import brooklyn.entity.rebind.persister.PersistMode; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/68240194/usage/launcher/src/test/java/org/apache/brooklyn/launcher/BrooklynLauncherRebindTestFixture.java ---------------------------------------------------------------------- diff --git a/usage/launcher/src/test/java/org/apache/brooklyn/launcher/BrooklynLauncherRebindTestFixture.java b/usage/launcher/src/test/java/org/apache/brooklyn/launcher/BrooklynLauncherRebindTestFixture.java index 1a2f90d..b0d7c9c 100644 --- a/usage/launcher/src/test/java/org/apache/brooklyn/launcher/BrooklynLauncherRebindTestFixture.java +++ b/usage/launcher/src/test/java/org/apache/brooklyn/launcher/BrooklynLauncherRebindTestFixture.java @@ -23,6 +23,8 @@ 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.api.management.ha.HighAvailabilityMode; +import org.apache.brooklyn.core.config.BrooklynProperties; +import org.apache.brooklyn.core.config.BrooklynServerConfig; import org.apache.brooklyn.launcher.BrooklynLauncher; import org.apache.brooklyn.test.Asserts; import org.apache.brooklyn.test.entity.LocalManagementContextForTests; @@ -43,8 +45,6 @@ import org.testng.annotations.AfterMethod; import org.testng.annotations.BeforeMethod; import org.testng.annotations.Test; -import brooklyn.config.BrooklynProperties; -import brooklyn.config.BrooklynServerConfig; import brooklyn.entity.basic.EntityPredicates; import brooklyn.entity.basic.StartableApplication; import brooklyn.entity.rebind.persister.BrooklynMementoPersisterToObjectStore; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/68240194/usage/launcher/src/test/java/org/apache/brooklyn/launcher/BrooklynLauncherRebindTestToFiles.java ---------------------------------------------------------------------- diff --git a/usage/launcher/src/test/java/org/apache/brooklyn/launcher/BrooklynLauncherRebindTestToFiles.java b/usage/launcher/src/test/java/org/apache/brooklyn/launcher/BrooklynLauncherRebindTestToFiles.java index 0b7c09c..e3a2615 100644 --- a/usage/launcher/src/test/java/org/apache/brooklyn/launcher/BrooklynLauncherRebindTestToFiles.java +++ b/usage/launcher/src/test/java/org/apache/brooklyn/launcher/BrooklynLauncherRebindTestToFiles.java @@ -21,6 +21,8 @@ package org.apache.brooklyn.launcher; import org.apache.brooklyn.api.entity.proxying.EntitySpec; import org.apache.brooklyn.api.management.ManagementContext; import org.apache.brooklyn.api.management.ha.HighAvailabilityMode; +import org.apache.brooklyn.core.config.BrooklynProperties; +import org.apache.brooklyn.core.config.BrooklynServerPaths; import org.apache.brooklyn.launcher.BrooklynLauncher; import org.apache.brooklyn.test.entity.TestApplication; import org.apache.brooklyn.util.javalang.JavaClassNames; @@ -35,8 +37,6 @@ import java.io.File; import org.testng.annotations.Test; -import brooklyn.config.BrooklynProperties; -import brooklyn.config.BrooklynServerPaths; import brooklyn.entity.rebind.persister.BrooklynMementoPersisterToObjectStore; import brooklyn.entity.rebind.persister.FileBasedObjectStore; import brooklyn.entity.rebind.persister.PersistMode; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/68240194/usage/launcher/src/test/java/org/apache/brooklyn/launcher/BrooklynLauncherRebindToCloudObjectStoreTest.java ---------------------------------------------------------------------- diff --git a/usage/launcher/src/test/java/org/apache/brooklyn/launcher/BrooklynLauncherRebindToCloudObjectStoreTest.java b/usage/launcher/src/test/java/org/apache/brooklyn/launcher/BrooklynLauncherRebindToCloudObjectStoreTest.java index 39f2564..3e1f630 100644 --- a/usage/launcher/src/test/java/org/apache/brooklyn/launcher/BrooklynLauncherRebindToCloudObjectStoreTest.java +++ b/usage/launcher/src/test/java/org/apache/brooklyn/launcher/BrooklynLauncherRebindToCloudObjectStoreTest.java @@ -21,6 +21,8 @@ package org.apache.brooklyn.launcher; import org.apache.brooklyn.api.entity.proxying.EntitySpec; import org.apache.brooklyn.api.management.ManagementContext; import org.apache.brooklyn.api.mementos.BrooklynMementoRawData; +import org.apache.brooklyn.core.config.BrooklynProperties; +import org.apache.brooklyn.core.config.BrooklynServerPaths; import org.apache.brooklyn.launcher.BrooklynLauncher; import org.apache.brooklyn.test.entity.LocalManagementContextForTests; import org.apache.brooklyn.test.entity.TestApplication; @@ -33,8 +35,6 @@ import static org.testng.Assert.assertEquals; import org.testng.annotations.BeforeMethod; import org.testng.annotations.Test; -import brooklyn.config.BrooklynProperties; -import brooklyn.config.BrooklynServerPaths; import brooklyn.entity.rebind.persister.BrooklynMementoPersisterToObjectStore; import brooklyn.entity.rebind.persister.PersistMode; import brooklyn.entity.rebind.persister.jclouds.BlobStoreTest; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/68240194/usage/launcher/src/test/java/org/apache/brooklyn/launcher/BrooklynLauncherTest.java ---------------------------------------------------------------------- diff --git a/usage/launcher/src/test/java/org/apache/brooklyn/launcher/BrooklynLauncherTest.java b/usage/launcher/src/test/java/org/apache/brooklyn/launcher/BrooklynLauncherTest.java index 95bb33b..c47d3d4 100644 --- a/usage/launcher/src/test/java/org/apache/brooklyn/launcher/BrooklynLauncherTest.java +++ b/usage/launcher/src/test/java/org/apache/brooklyn/launcher/BrooklynLauncherTest.java @@ -23,6 +23,8 @@ 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.catalog.internal.CatalogInitialization; +import org.apache.brooklyn.core.config.BrooklynProperties; +import org.apache.brooklyn.core.config.BrooklynServerConfig; import org.apache.brooklyn.core.management.internal.LocalManagementContext; import org.apache.brooklyn.core.management.internal.ManagementContextInternal; import org.apache.brooklyn.launcher.BrooklynLauncher; @@ -56,8 +58,6 @@ import org.testng.Assert; import org.testng.annotations.AfterMethod; import org.testng.annotations.Test; -import brooklyn.config.BrooklynProperties; -import brooklyn.config.BrooklynServerConfig; import brooklyn.entity.basic.ApplicationBuilder; import brooklyn.entity.rebind.RebindTestUtils; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/68240194/usage/launcher/src/test/java/org/apache/brooklyn/launcher/BrooklynWebServerTest.java ---------------------------------------------------------------------- diff --git a/usage/launcher/src/test/java/org/apache/brooklyn/launcher/BrooklynWebServerTest.java b/usage/launcher/src/test/java/org/apache/brooklyn/launcher/BrooklynWebServerTest.java index e26b9cd..497e59e 100644 --- a/usage/launcher/src/test/java/org/apache/brooklyn/launcher/BrooklynWebServerTest.java +++ b/usage/launcher/src/test/java/org/apache/brooklyn/launcher/BrooklynWebServerTest.java @@ -18,6 +18,7 @@ */ package org.apache.brooklyn.launcher; +import org.apache.brooklyn.core.config.BrooklynProperties; import org.apache.brooklyn.core.management.internal.LocalManagementContext; import org.apache.brooklyn.core.util.http.HttpTool; import org.apache.brooklyn.core.util.http.HttpToolResponse; @@ -49,7 +50,6 @@ import org.testng.annotations.BeforeMethod; import org.testng.annotations.DataProvider; import org.testng.annotations.Test; -import brooklyn.config.BrooklynProperties; import brooklyn.entity.basic.Entities; import org.apache.brooklyn.rest.BrooklynWebConfig; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/68240194/usage/launcher/src/test/java/org/apache/brooklyn/launcher/WebAppRunnerTest.java ---------------------------------------------------------------------- diff --git a/usage/launcher/src/test/java/org/apache/brooklyn/launcher/WebAppRunnerTest.java b/usage/launcher/src/test/java/org/apache/brooklyn/launcher/WebAppRunnerTest.java index 9cbc0e6..4538303 100644 --- a/usage/launcher/src/test/java/org/apache/brooklyn/launcher/WebAppRunnerTest.java +++ b/usage/launcher/src/test/java/org/apache/brooklyn/launcher/WebAppRunnerTest.java @@ -18,6 +18,7 @@ */ package org.apache.brooklyn.launcher; +import org.apache.brooklyn.core.config.BrooklynProperties; import org.apache.brooklyn.core.management.internal.LocalManagementContext; import org.apache.brooklyn.core.management.internal.ManagementContextInternal; import org.apache.brooklyn.launcher.BrooklynWebServer; @@ -39,7 +40,6 @@ import org.slf4j.LoggerFactory; import org.testng.annotations.AfterMethod; import org.testng.annotations.Test; -import brooklyn.config.BrooklynProperties; import brooklyn.entity.basic.Entities; import com.google.common.collect.Lists; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/68240194/usage/rest-server/src/main/java/org/apache/brooklyn/rest/BrooklynWebConfig.java ---------------------------------------------------------------------- diff --git a/usage/rest-server/src/main/java/org/apache/brooklyn/rest/BrooklynWebConfig.java b/usage/rest-server/src/main/java/org/apache/brooklyn/rest/BrooklynWebConfig.java index a18fe0a..7996118 100644 --- a/usage/rest-server/src/main/java/org/apache/brooklyn/rest/BrooklynWebConfig.java +++ b/usage/rest-server/src/main/java/org/apache/brooklyn/rest/BrooklynWebConfig.java @@ -18,12 +18,12 @@ */ package org.apache.brooklyn.rest; -import brooklyn.config.ConfigPredicates; import brooklyn.entity.basic.ConfigKeys; import org.apache.brooklyn.api.location.PortRange; import org.apache.brooklyn.config.ConfigKey; import org.apache.brooklyn.config.ConfigMap; +import org.apache.brooklyn.core.config.ConfigPredicates; import org.apache.brooklyn.rest.security.provider.DelegatingSecurityProvider; import org.apache.brooklyn.rest.security.provider.ExplicitUsersSecurityProvider; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/68240194/usage/rest-server/src/main/java/org/apache/brooklyn/rest/filter/BrooklynPropertiesSecurityFilter.java ---------------------------------------------------------------------- diff --git a/usage/rest-server/src/main/java/org/apache/brooklyn/rest/filter/BrooklynPropertiesSecurityFilter.java b/usage/rest-server/src/main/java/org/apache/brooklyn/rest/filter/BrooklynPropertiesSecurityFilter.java index d9d01bd..92b3176 100644 --- a/usage/rest-server/src/main/java/org/apache/brooklyn/rest/filter/BrooklynPropertiesSecurityFilter.java +++ b/usage/rest-server/src/main/java/org/apache/brooklyn/rest/filter/BrooklynPropertiesSecurityFilter.java @@ -33,10 +33,8 @@ import javax.servlet.http.HttpSession; import org.slf4j.Logger; import org.slf4j.LoggerFactory; - -import brooklyn.config.BrooklynServiceAttributes; - import org.apache.brooklyn.api.management.ManagementContext; +import org.apache.brooklyn.core.config.BrooklynServiceAttributes; import org.apache.brooklyn.core.management.entitlement.Entitlements; import org.apache.brooklyn.core.management.entitlement.WebEntitlementContext; import org.apache.brooklyn.rest.security.provider.DelegatingSecurityProvider; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/68240194/usage/rest-server/src/main/java/org/apache/brooklyn/rest/filter/HaMasterCheckFilter.java ---------------------------------------------------------------------- diff --git a/usage/rest-server/src/main/java/org/apache/brooklyn/rest/filter/HaMasterCheckFilter.java b/usage/rest-server/src/main/java/org/apache/brooklyn/rest/filter/HaMasterCheckFilter.java index 39fcee7..23ef063 100644 --- a/usage/rest-server/src/main/java/org/apache/brooklyn/rest/filter/HaMasterCheckFilter.java +++ b/usage/rest-server/src/main/java/org/apache/brooklyn/rest/filter/HaMasterCheckFilter.java @@ -34,11 +34,9 @@ import javax.ws.rs.core.Response; import org.slf4j.Logger; import org.slf4j.LoggerFactory; - -import brooklyn.config.BrooklynServiceAttributes; - import org.apache.brooklyn.api.management.ManagementContext; import org.apache.brooklyn.api.management.ha.ManagementNodeState; +import org.apache.brooklyn.core.config.BrooklynServiceAttributes; import org.apache.brooklyn.rest.domain.ApiError; import org.apache.brooklyn.rest.util.WebResourceUtils; import org.apache.brooklyn.util.text.Strings; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/68240194/usage/rest-server/src/main/java/org/apache/brooklyn/rest/filter/LoggingFilter.java ---------------------------------------------------------------------- diff --git a/usage/rest-server/src/main/java/org/apache/brooklyn/rest/filter/LoggingFilter.java b/usage/rest-server/src/main/java/org/apache/brooklyn/rest/filter/LoggingFilter.java index fd25f83..d383ae4 100644 --- a/usage/rest-server/src/main/java/org/apache/brooklyn/rest/filter/LoggingFilter.java +++ b/usage/rest-server/src/main/java/org/apache/brooklyn/rest/filter/LoggingFilter.java @@ -32,6 +32,7 @@ import javax.servlet.ServletResponse; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; +import org.apache.brooklyn.core.config.BrooklynLogging; import org.apache.brooklyn.util.exceptions.Exceptions; import org.apache.brooklyn.util.time.Duration; import org.slf4j.Logger; @@ -41,8 +42,6 @@ import com.google.common.base.Joiner; import com.google.common.base.Stopwatch; import com.google.common.collect.Sets; -import brooklyn.config.BrooklynLogging; - /** * Handles logging of request information. */ http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/68240194/usage/rest-server/src/main/java/org/apache/brooklyn/rest/resources/AbstractBrooklynRestResource.java ---------------------------------------------------------------------- diff --git a/usage/rest-server/src/main/java/org/apache/brooklyn/rest/resources/AbstractBrooklynRestResource.java b/usage/rest-server/src/main/java/org/apache/brooklyn/rest/resources/AbstractBrooklynRestResource.java index 75fd536..2df8703 100644 --- a/usage/rest-server/src/main/java/org/apache/brooklyn/rest/resources/AbstractBrooklynRestResource.java +++ b/usage/rest-server/src/main/java/org/apache/brooklyn/rest/resources/AbstractBrooklynRestResource.java @@ -23,15 +23,13 @@ import javax.servlet.ServletContext; import javax.ws.rs.core.Context; import org.codehaus.jackson.map.ObjectMapper; - -import brooklyn.config.BrooklynServerConfig; -import brooklyn.config.BrooklynServiceAttributes; -import brooklyn.config.render.RendererHints; - import org.apache.brooklyn.api.entity.Entity; import org.apache.brooklyn.api.entity.basic.EntityLocal; import org.apache.brooklyn.api.management.ManagementContext; import org.apache.brooklyn.camp.CampPlatform; +import org.apache.brooklyn.core.config.BrooklynServerConfig; +import org.apache.brooklyn.core.config.BrooklynServiceAttributes; +import org.apache.brooklyn.core.config.render.RendererHints; import org.apache.brooklyn.core.management.ManagementContextInjectable; import org.apache.brooklyn.core.util.task.Tasks; import org.apache.brooklyn.rest.util.BrooklynRestResourceUtils; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/68240194/usage/rest-server/src/main/java/org/apache/brooklyn/rest/security/provider/ExplicitUsersSecurityProvider.java ---------------------------------------------------------------------- diff --git a/usage/rest-server/src/main/java/org/apache/brooklyn/rest/security/provider/ExplicitUsersSecurityProvider.java b/usage/rest-server/src/main/java/org/apache/brooklyn/rest/security/provider/ExplicitUsersSecurityProvider.java index 42caafb..d9f6a5c 100644 --- a/usage/rest-server/src/main/java/org/apache/brooklyn/rest/security/provider/ExplicitUsersSecurityProvider.java +++ b/usage/rest-server/src/main/java/org/apache/brooklyn/rest/security/provider/ExplicitUsersSecurityProvider.java @@ -26,11 +26,9 @@ import javax.servlet.http.HttpSession; import org.slf4j.Logger; import org.slf4j.LoggerFactory; - -import brooklyn.config.BrooklynProperties; - import org.apache.brooklyn.api.management.ManagementContext; import org.apache.brooklyn.config.StringConfigMap; +import org.apache.brooklyn.core.config.BrooklynProperties; import org.apache.brooklyn.rest.BrooklynWebConfig; import org.apache.brooklyn.rest.security.PasswordHasher; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/68240194/usage/rest-server/src/main/java/org/apache/brooklyn/rest/transform/EntityTransformer.java ---------------------------------------------------------------------- diff --git a/usage/rest-server/src/main/java/org/apache/brooklyn/rest/transform/EntityTransformer.java b/usage/rest-server/src/main/java/org/apache/brooklyn/rest/transform/EntityTransformer.java index 7211751..82fa422 100644 --- a/usage/rest-server/src/main/java/org/apache/brooklyn/rest/transform/EntityTransformer.java +++ b/usage/rest-server/src/main/java/org/apache/brooklyn/rest/transform/EntityTransformer.java @@ -30,9 +30,7 @@ import org.apache.brooklyn.api.entity.Application; import org.apache.brooklyn.api.entity.Entity; import org.apache.brooklyn.api.entity.basic.EntityLocal; import org.apache.brooklyn.config.ConfigKey; - -import brooklyn.config.render.RendererHints; - +import org.apache.brooklyn.core.config.render.RendererHints; import org.apache.brooklyn.rest.domain.EntityConfigSummary; import org.apache.brooklyn.rest.domain.EntitySummary; import org.apache.brooklyn.rest.util.WebResourceUtils; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/68240194/usage/rest-server/src/main/java/org/apache/brooklyn/rest/transform/SensorTransformer.java ---------------------------------------------------------------------- diff --git a/usage/rest-server/src/main/java/org/apache/brooklyn/rest/transform/SensorTransformer.java b/usage/rest-server/src/main/java/org/apache/brooklyn/rest/transform/SensorTransformer.java index 456aab2..fd7ca6f 100644 --- a/usage/rest-server/src/main/java/org/apache/brooklyn/rest/transform/SensorTransformer.java +++ b/usage/rest-server/src/main/java/org/apache/brooklyn/rest/transform/SensorTransformer.java @@ -22,12 +22,10 @@ import java.net.URI; import org.slf4j.Logger; import org.slf4j.LoggerFactory; - -import brooklyn.config.render.RendererHints; - import org.apache.brooklyn.api.entity.Entity; import org.apache.brooklyn.api.event.AttributeSensor; import org.apache.brooklyn.api.event.Sensor; +import org.apache.brooklyn.core.config.render.RendererHints; import org.apache.brooklyn.rest.domain.SensorSummary; import org.apache.brooklyn.util.collections.MutableMap; import org.apache.brooklyn.util.exceptions.Exceptions; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/68240194/usage/rest-server/src/main/java/org/apache/brooklyn/rest/util/json/BrooklynJacksonJsonProvider.java ---------------------------------------------------------------------- diff --git a/usage/rest-server/src/main/java/org/apache/brooklyn/rest/util/json/BrooklynJacksonJsonProvider.java b/usage/rest-server/src/main/java/org/apache/brooklyn/rest/util/json/BrooklynJacksonJsonProvider.java index afc5ac2..fbff521 100644 --- a/usage/rest-server/src/main/java/org/apache/brooklyn/rest/util/json/BrooklynJacksonJsonProvider.java +++ b/usage/rest-server/src/main/java/org/apache/brooklyn/rest/util/json/BrooklynJacksonJsonProvider.java @@ -24,6 +24,8 @@ import javax.ws.rs.core.MediaType; import org.apache.brooklyn.api.management.ManagementContext; import org.apache.brooklyn.config.ConfigKey; +import org.apache.brooklyn.core.config.BrooklynProperties; +import org.apache.brooklyn.core.config.BrooklynServiceAttributes; import org.apache.brooklyn.core.management.ManagementContextInjectable; import org.codehaus.jackson.Version; import org.codehaus.jackson.jaxrs.JacksonJsonProvider; @@ -34,8 +36,6 @@ import org.codehaus.jackson.map.type.TypeFactory; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import brooklyn.config.BrooklynProperties; -import brooklyn.config.BrooklynServiceAttributes; import brooklyn.entity.basic.ConfigKeys; public class BrooklynJacksonJsonProvider extends JacksonJsonProvider implements ManagementContextInjectable { http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/68240194/usage/rest-server/src/test/java/org/apache/brooklyn/rest/BrooklynRestApiLauncher.java ---------------------------------------------------------------------- diff --git a/usage/rest-server/src/test/java/org/apache/brooklyn/rest/BrooklynRestApiLauncher.java b/usage/rest-server/src/test/java/org/apache/brooklyn/rest/BrooklynRestApiLauncher.java index ccc8bdf..a765b37 100644 --- a/usage/rest-server/src/test/java/org/apache/brooklyn/rest/BrooklynRestApiLauncher.java +++ b/usage/rest-server/src/test/java/org/apache/brooklyn/rest/BrooklynRestApiLauncher.java @@ -33,6 +33,9 @@ import javax.servlet.Filter; import org.apache.brooklyn.api.management.ManagementContext; import org.apache.brooklyn.camp.brooklyn.BrooklynCampPlatformLauncherAbstract; import org.apache.brooklyn.camp.brooklyn.BrooklynCampPlatformLauncherNoServer; +import org.apache.brooklyn.core.config.BrooklynProperties; +import org.apache.brooklyn.core.config.BrooklynServerConfig; +import org.apache.brooklyn.core.config.BrooklynServiceAttributes; import org.apache.brooklyn.core.management.internal.LocalManagementContext; import org.apache.brooklyn.core.management.internal.ManagementContextInternal; import org.apache.brooklyn.rest.filter.BrooklynPropertiesSecurityFilter; @@ -68,10 +71,6 @@ import com.sun.jersey.api.core.DefaultResourceConfig; import com.sun.jersey.api.core.ResourceConfig; import com.sun.jersey.spi.container.servlet.ServletContainer; -import brooklyn.config.BrooklynProperties; -import brooklyn.config.BrooklynServerConfig; -import brooklyn.config.BrooklynServiceAttributes; - /** Convenience and demo for launching programmatically. Also used for automated tests. * <p> * BrooklynLauncher has a more full-featured CLI way to start, http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/68240194/usage/rest-server/src/test/java/org/apache/brooklyn/rest/BrooklynRestApiLauncherTestFixture.java ---------------------------------------------------------------------- diff --git a/usage/rest-server/src/test/java/org/apache/brooklyn/rest/BrooklynRestApiLauncherTestFixture.java b/usage/rest-server/src/test/java/org/apache/brooklyn/rest/BrooklynRestApiLauncherTestFixture.java index 54118e7..cdd75c7 100644 --- a/usage/rest-server/src/test/java/org/apache/brooklyn/rest/BrooklynRestApiLauncherTestFixture.java +++ b/usage/rest-server/src/test/java/org/apache/brooklyn/rest/BrooklynRestApiLauncherTestFixture.java @@ -24,12 +24,12 @@ import org.reflections.util.ClasspathHelper; import org.testng.Assert; import org.testng.annotations.AfterMethod; -import brooklyn.config.BrooklynProperties; -import brooklyn.config.BrooklynServerConfig; -import brooklyn.config.BrooklynServiceAttributes; import brooklyn.entity.basic.Entities; import org.apache.brooklyn.api.management.ManagementContext; +import org.apache.brooklyn.core.config.BrooklynProperties; +import org.apache.brooklyn.core.config.BrooklynServerConfig; +import org.apache.brooklyn.core.config.BrooklynServiceAttributes; import org.apache.brooklyn.core.management.internal.LocalManagementContext; import org.apache.brooklyn.rest.security.provider.AnyoneSecurityProvider; import org.apache.brooklyn.util.exceptions.Exceptions; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/68240194/usage/rest-server/src/test/java/org/apache/brooklyn/rest/domain/SensorSummaryTest.java ---------------------------------------------------------------------- diff --git a/usage/rest-server/src/test/java/org/apache/brooklyn/rest/domain/SensorSummaryTest.java b/usage/rest-server/src/test/java/org/apache/brooklyn/rest/domain/SensorSummaryTest.java index e2bf02c..609777d 100644 --- a/usage/rest-server/src/test/java/org/apache/brooklyn/rest/domain/SensorSummaryTest.java +++ b/usage/rest-server/src/test/java/org/apache/brooklyn/rest/domain/SensorSummaryTest.java @@ -30,7 +30,6 @@ import org.testng.annotations.AfterMethod; import org.testng.annotations.BeforeMethod; import org.testng.annotations.Test; -import brooklyn.config.render.RendererHints; import brooklyn.entity.basic.Entities; import brooklyn.event.basic.Sensors; @@ -38,6 +37,7 @@ import org.apache.brooklyn.api.entity.proxying.EntitySpec; import org.apache.brooklyn.api.event.AttributeSensor; import org.apache.brooklyn.api.event.Sensor; import org.apache.brooklyn.api.management.ManagementContext; +import org.apache.brooklyn.core.config.render.RendererHints; import org.apache.brooklyn.rest.transform.SensorTransformer; import org.apache.brooklyn.test.entity.TestApplication; import org.apache.brooklyn.test.entity.TestEntity; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/68240194/usage/rest-server/src/test/java/org/apache/brooklyn/rest/resources/SensorResourceTest.java ---------------------------------------------------------------------- diff --git a/usage/rest-server/src/test/java/org/apache/brooklyn/rest/resources/SensorResourceTest.java b/usage/rest-server/src/test/java/org/apache/brooklyn/rest/resources/SensorResourceTest.java index 2b04262..2c2157a 100644 --- a/usage/rest-server/src/test/java/org/apache/brooklyn/rest/resources/SensorResourceTest.java +++ b/usage/rest-server/src/test/java/org/apache/brooklyn/rest/resources/SensorResourceTest.java @@ -26,6 +26,7 @@ import javax.ws.rs.core.MediaType; import javax.ws.rs.core.Response; import org.apache.brooklyn.api.event.AttributeSensor; +import org.apache.brooklyn.core.config.render.RendererHints; import org.apache.brooklyn.rest.api.SensorApi; import org.apache.brooklyn.rest.domain.ApplicationSpec; import org.apache.brooklyn.rest.domain.EntitySpec; @@ -48,7 +49,6 @@ import com.sun.jersey.api.client.GenericType; import com.sun.jersey.api.client.WebResource; import com.sun.jersey.api.client.WebResource.Builder; -import brooklyn.config.render.RendererHints; import brooklyn.entity.basic.EntityInternal; import brooklyn.entity.basic.EntityPredicates; import brooklyn.event.basic.Sensors; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/68240194/usage/rest-server/src/test/java/org/apache/brooklyn/rest/resources/ServerResourceIntegrationTest.java ---------------------------------------------------------------------- diff --git a/usage/rest-server/src/test/java/org/apache/brooklyn/rest/resources/ServerResourceIntegrationTest.java b/usage/rest-server/src/test/java/org/apache/brooklyn/rest/resources/ServerResourceIntegrationTest.java index 6c49764..3a5f0ba 100644 --- a/usage/rest-server/src/test/java/org/apache/brooklyn/rest/resources/ServerResourceIntegrationTest.java +++ b/usage/rest-server/src/test/java/org/apache/brooklyn/rest/resources/ServerResourceIntegrationTest.java @@ -26,6 +26,7 @@ import java.util.Collections; import java.util.Map; 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.core.management.internal.ManagementContextInternal; import org.apache.brooklyn.core.util.http.HttpTool; @@ -42,8 +43,6 @@ import org.testng.annotations.Test; import com.google.common.collect.ImmutableMap; -import brooklyn.config.BrooklynProperties; - public class ServerResourceIntegrationTest extends BrooklynRestApiLauncherTestFixture { /** http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/68240194/usage/rest-server/src/test/java/org/apache/brooklyn/rest/resources/ServerResourceTest.java ---------------------------------------------------------------------- diff --git a/usage/rest-server/src/test/java/org/apache/brooklyn/rest/resources/ServerResourceTest.java b/usage/rest-server/src/test/java/org/apache/brooklyn/rest/resources/ServerResourceTest.java index fcf2ff6..1f63993 100644 --- a/usage/rest-server/src/test/java/org/apache/brooklyn/rest/resources/ServerResourceTest.java +++ b/usage/rest-server/src/test/java/org/apache/brooklyn/rest/resources/ServerResourceTest.java @@ -26,6 +26,7 @@ import java.util.concurrent.atomic.AtomicInteger; import org.apache.brooklyn.api.entity.proxying.ImplementedBy; import org.apache.brooklyn.api.management.ManagementContext; +import org.apache.brooklyn.core.config.BrooklynProperties; import org.apache.brooklyn.core.management.internal.ManagementContextInternal; import org.apache.brooklyn.rest.domain.HighAvailabilitySummary; import org.apache.brooklyn.rest.domain.VersionSummary; @@ -40,7 +41,6 @@ import com.google.common.collect.ImmutableSet; import com.sun.jersey.api.client.UniformInterfaceException; import brooklyn.BrooklynVersion; -import brooklyn.config.BrooklynProperties; import brooklyn.entity.basic.EmptySoftwareProcess; import brooklyn.entity.basic.EmptySoftwareProcessDriver; import brooklyn.entity.basic.EmptySoftwareProcessImpl; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/68240194/usage/rest-server/src/test/java/org/apache/brooklyn/rest/test/config/render/TestRendererHints.java ---------------------------------------------------------------------- diff --git a/usage/rest-server/src/test/java/org/apache/brooklyn/rest/test/config/render/TestRendererHints.java b/usage/rest-server/src/test/java/org/apache/brooklyn/rest/test/config/render/TestRendererHints.java index dc4750a..91294db 100644 --- a/usage/rest-server/src/test/java/org/apache/brooklyn/rest/test/config/render/TestRendererHints.java +++ b/usage/rest-server/src/test/java/org/apache/brooklyn/rest/test/config/render/TestRendererHints.java @@ -18,7 +18,7 @@ */ package org.apache.brooklyn.rest.test.config.render; -import brooklyn.config.render.RendererHints; +import org.apache.brooklyn.core.config.render.RendererHints; /** Methods used when testing the {@link RendererHints} regiostry. */ public class TestRendererHints {
