Repository: incubator-brooklyn Updated Branches: refs/heads/master f092e183f -> 23889db5c
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/7d782f34/usage/camp/src/main/java/org/apache/brooklyn/camp/brooklyn/spi/dsl/BrooklynDslDeferredSupplier.java ---------------------------------------------------------------------- diff --git a/usage/camp/src/main/java/org/apache/brooklyn/camp/brooklyn/spi/dsl/BrooklynDslDeferredSupplier.java b/usage/camp/src/main/java/org/apache/brooklyn/camp/brooklyn/spi/dsl/BrooklynDslDeferredSupplier.java index f8d03c9..7107050 100644 --- a/usage/camp/src/main/java/org/apache/brooklyn/camp/brooklyn/spi/dsl/BrooklynDslDeferredSupplier.java +++ b/usage/camp/src/main/java/org/apache/brooklyn/camp/brooklyn/spi/dsl/BrooklynDslDeferredSupplier.java @@ -20,13 +20,12 @@ package org.apache.brooklyn.camp.brooklyn.spi.dsl; import java.io.Serializable; -import io.brooklyn.camp.spi.Assembly; -import io.brooklyn.camp.spi.AssemblyTemplate; -import io.brooklyn.camp.spi.resolve.interpret.PlanInterpretationNode; - import org.apache.brooklyn.api.entity.Entity; import org.apache.brooklyn.api.management.Task; import org.apache.brooklyn.api.management.TaskFactory; +import org.apache.brooklyn.camp.spi.Assembly; +import org.apache.brooklyn.camp.spi.AssemblyTemplate; +import org.apache.brooklyn.camp.spi.resolve.interpret.PlanInterpretationNode; import org.apache.brooklyn.core.util.task.DeferredSupplier; import org.slf4j.Logger; import org.slf4j.LoggerFactory; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/7d782f34/usage/camp/src/main/java/org/apache/brooklyn/camp/brooklyn/spi/dsl/BrooklynDslInterpreter.java ---------------------------------------------------------------------- diff --git a/usage/camp/src/main/java/org/apache/brooklyn/camp/brooklyn/spi/dsl/BrooklynDslInterpreter.java b/usage/camp/src/main/java/org/apache/brooklyn/camp/brooklyn/spi/dsl/BrooklynDslInterpreter.java index e30f7f2..5836148 100644 --- a/usage/camp/src/main/java/org/apache/brooklyn/camp/brooklyn/spi/dsl/BrooklynDslInterpreter.java +++ b/usage/camp/src/main/java/org/apache/brooklyn/camp/brooklyn/spi/dsl/BrooklynDslInterpreter.java @@ -18,11 +18,6 @@ */ package org.apache.brooklyn.camp.brooklyn.spi.dsl; -import io.brooklyn.camp.spi.resolve.PlanInterpreter; -import io.brooklyn.camp.spi.resolve.PlanInterpreter.PlanInterpreterAdapter; -import io.brooklyn.camp.spi.resolve.interpret.PlanInterpretationNode; -import io.brooklyn.camp.spi.resolve.interpret.PlanInterpretationNode.Role; - import java.lang.reflect.InvocationTargetException; import java.util.ArrayList; import java.util.List; @@ -32,6 +27,10 @@ import org.apache.brooklyn.camp.brooklyn.spi.dsl.methods.BrooklynDslCommon; import org.apache.brooklyn.camp.brooklyn.spi.dsl.parse.DslParser; import org.apache.brooklyn.camp.brooklyn.spi.dsl.parse.FunctionWithArgs; import org.apache.brooklyn.camp.brooklyn.spi.dsl.parse.QuotedString; +import org.apache.brooklyn.camp.spi.resolve.PlanInterpreter; +import org.apache.brooklyn.camp.spi.resolve.PlanInterpreter.PlanInterpreterAdapter; +import org.apache.brooklyn.camp.spi.resolve.interpret.PlanInterpretationNode; +import org.apache.brooklyn.camp.spi.resolve.interpret.PlanInterpretationNode.Role; import org.slf4j.Logger; import org.slf4j.LoggerFactory; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/7d782f34/usage/camp/src/main/java/org/apache/brooklyn/camp/brooklyn/spi/lookup/AbstractBrooklynResourceLookup.java ---------------------------------------------------------------------- diff --git a/usage/camp/src/main/java/org/apache/brooklyn/camp/brooklyn/spi/lookup/AbstractBrooklynResourceLookup.java b/usage/camp/src/main/java/org/apache/brooklyn/camp/brooklyn/spi/lookup/AbstractBrooklynResourceLookup.java index f67f2c9..9635a95 100644 --- a/usage/camp/src/main/java/org/apache/brooklyn/camp/brooklyn/spi/lookup/AbstractBrooklynResourceLookup.java +++ b/usage/camp/src/main/java/org/apache/brooklyn/camp/brooklyn/spi/lookup/AbstractBrooklynResourceLookup.java @@ -19,10 +19,9 @@ package org.apache.brooklyn.camp.brooklyn.spi.lookup; import org.apache.brooklyn.api.management.ManagementContext; - -import io.brooklyn.camp.spi.AbstractResource; -import io.brooklyn.camp.spi.PlatformRootSummary; -import io.brooklyn.camp.spi.collection.AbstractResourceLookup; +import org.apache.brooklyn.camp.spi.AbstractResource; +import org.apache.brooklyn.camp.spi.PlatformRootSummary; +import org.apache.brooklyn.camp.spi.collection.AbstractResourceLookup; public abstract class AbstractBrooklynResourceLookup<T extends AbstractResource> extends AbstractResourceLookup<T> { http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/7d782f34/usage/camp/src/main/java/org/apache/brooklyn/camp/brooklyn/spi/lookup/AbstractTemplateBrooklynLookup.java ---------------------------------------------------------------------- diff --git a/usage/camp/src/main/java/org/apache/brooklyn/camp/brooklyn/spi/lookup/AbstractTemplateBrooklynLookup.java b/usage/camp/src/main/java/org/apache/brooklyn/camp/brooklyn/spi/lookup/AbstractTemplateBrooklynLookup.java index 63ac989..a7a9647 100644 --- a/usage/camp/src/main/java/org/apache/brooklyn/camp/brooklyn/spi/lookup/AbstractTemplateBrooklynLookup.java +++ b/usage/camp/src/main/java/org/apache/brooklyn/camp/brooklyn/spi/lookup/AbstractTemplateBrooklynLookup.java @@ -18,16 +18,15 @@ */ package org.apache.brooklyn.camp.brooklyn.spi.lookup; -import io.brooklyn.camp.spi.AbstractResource; -import io.brooklyn.camp.spi.PlatformRootSummary; -import io.brooklyn.camp.spi.collection.ResolvableLink; - import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.apache.brooklyn.api.catalog.CatalogItem; import org.apache.brooklyn.api.entity.Entity; import org.apache.brooklyn.api.entity.proxying.EntitySpec; import org.apache.brooklyn.api.management.ManagementContext; +import org.apache.brooklyn.camp.spi.AbstractResource; +import org.apache.brooklyn.camp.spi.PlatformRootSummary; +import org.apache.brooklyn.camp.spi.collection.ResolvableLink; import org.apache.brooklyn.core.catalog.internal.CatalogUtils; public abstract class AbstractTemplateBrooklynLookup<T extends AbstractResource> extends AbstractBrooklynResourceLookup<T> { http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/7d782f34/usage/camp/src/main/java/org/apache/brooklyn/camp/brooklyn/spi/lookup/AssemblyBrooklynLookup.java ---------------------------------------------------------------------- diff --git a/usage/camp/src/main/java/org/apache/brooklyn/camp/brooklyn/spi/lookup/AssemblyBrooklynLookup.java b/usage/camp/src/main/java/org/apache/brooklyn/camp/brooklyn/spi/lookup/AssemblyBrooklynLookup.java index ac3e542..9496c0d 100644 --- a/usage/camp/src/main/java/org/apache/brooklyn/camp/brooklyn/spi/lookup/AssemblyBrooklynLookup.java +++ b/usage/camp/src/main/java/org/apache/brooklyn/camp/brooklyn/spi/lookup/AssemblyBrooklynLookup.java @@ -18,10 +18,6 @@ */ package org.apache.brooklyn.camp.brooklyn.spi.lookup; -import io.brooklyn.camp.spi.Assembly; -import io.brooklyn.camp.spi.PlatformRootSummary; -import io.brooklyn.camp.spi.collection.ResolvableLink; - import java.util.ArrayList; import java.util.Date; import java.util.List; @@ -29,6 +25,9 @@ import java.util.List; import org.apache.brooklyn.api.entity.Application; import org.apache.brooklyn.api.entity.Entity; import org.apache.brooklyn.api.management.ManagementContext; +import org.apache.brooklyn.camp.spi.Assembly; +import org.apache.brooklyn.camp.spi.PlatformRootSummary; +import org.apache.brooklyn.camp.spi.collection.ResolvableLink; public class AssemblyBrooklynLookup extends AbstractBrooklynResourceLookup<Assembly> { http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/7d782f34/usage/camp/src/main/java/org/apache/brooklyn/camp/brooklyn/spi/lookup/AssemblyTemplateBrooklynLookup.java ---------------------------------------------------------------------- diff --git a/usage/camp/src/main/java/org/apache/brooklyn/camp/brooklyn/spi/lookup/AssemblyTemplateBrooklynLookup.java b/usage/camp/src/main/java/org/apache/brooklyn/camp/brooklyn/spi/lookup/AssemblyTemplateBrooklynLookup.java index a41ee05..8efe3b0 100644 --- a/usage/camp/src/main/java/org/apache/brooklyn/camp/brooklyn/spi/lookup/AssemblyTemplateBrooklynLookup.java +++ b/usage/camp/src/main/java/org/apache/brooklyn/camp/brooklyn/spi/lookup/AssemblyTemplateBrooklynLookup.java @@ -18,10 +18,6 @@ */ package org.apache.brooklyn.camp.brooklyn.spi.lookup; -import io.brooklyn.camp.spi.AssemblyTemplate; -import io.brooklyn.camp.spi.PlatformRootSummary; -import io.brooklyn.camp.spi.collection.ResolvableLink; - import java.util.ArrayList; import java.util.List; @@ -31,6 +27,9 @@ import org.apache.brooklyn.api.entity.Entity; import org.apache.brooklyn.api.entity.proxying.EntitySpec; import org.apache.brooklyn.api.management.ManagementContext; import org.apache.brooklyn.camp.brooklyn.spi.creation.BrooklynAssemblyTemplateInstantiator; +import org.apache.brooklyn.camp.spi.AssemblyTemplate; +import org.apache.brooklyn.camp.spi.PlatformRootSummary; +import org.apache.brooklyn.camp.spi.collection.ResolvableLink; import org.apache.brooklyn.core.catalog.CatalogPredicates; public class AssemblyTemplateBrooklynLookup extends AbstractTemplateBrooklynLookup<AssemblyTemplate> { http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/7d782f34/usage/camp/src/main/java/org/apache/brooklyn/camp/brooklyn/spi/lookup/PlatformComponentBrooklynLookup.java ---------------------------------------------------------------------- diff --git a/usage/camp/src/main/java/org/apache/brooklyn/camp/brooklyn/spi/lookup/PlatformComponentBrooklynLookup.java b/usage/camp/src/main/java/org/apache/brooklyn/camp/brooklyn/spi/lookup/PlatformComponentBrooklynLookup.java index 05c8485..6a6c827 100644 --- a/usage/camp/src/main/java/org/apache/brooklyn/camp/brooklyn/spi/lookup/PlatformComponentBrooklynLookup.java +++ b/usage/camp/src/main/java/org/apache/brooklyn/camp/brooklyn/spi/lookup/PlatformComponentBrooklynLookup.java @@ -18,17 +18,16 @@ */ package org.apache.brooklyn.camp.brooklyn.spi.lookup; -import io.brooklyn.camp.spi.PlatformComponent; -import io.brooklyn.camp.spi.PlatformComponent.Builder; -import io.brooklyn.camp.spi.PlatformRootSummary; -import io.brooklyn.camp.spi.collection.ResolvableLink; - import java.util.Collections; import java.util.Date; import java.util.List; import org.apache.brooklyn.api.entity.Entity; import org.apache.brooklyn.api.management.ManagementContext; +import org.apache.brooklyn.camp.spi.PlatformComponent; +import org.apache.brooklyn.camp.spi.PlatformRootSummary; +import org.apache.brooklyn.camp.spi.PlatformComponent.Builder; +import org.apache.brooklyn.camp.spi.collection.ResolvableLink; public class PlatformComponentBrooklynLookup extends AbstractBrooklynResourceLookup<PlatformComponent> { http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/7d782f34/usage/camp/src/main/java/org/apache/brooklyn/camp/brooklyn/spi/lookup/PlatformComponentTemplateBrooklynLookup.java ---------------------------------------------------------------------- diff --git a/usage/camp/src/main/java/org/apache/brooklyn/camp/brooklyn/spi/lookup/PlatformComponentTemplateBrooklynLookup.java b/usage/camp/src/main/java/org/apache/brooklyn/camp/brooklyn/spi/lookup/PlatformComponentTemplateBrooklynLookup.java index a7089e8..d97eaa7 100644 --- a/usage/camp/src/main/java/org/apache/brooklyn/camp/brooklyn/spi/lookup/PlatformComponentTemplateBrooklynLookup.java +++ b/usage/camp/src/main/java/org/apache/brooklyn/camp/brooklyn/spi/lookup/PlatformComponentTemplateBrooklynLookup.java @@ -18,10 +18,6 @@ */ package org.apache.brooklyn.camp.brooklyn.spi.lookup; -import io.brooklyn.camp.spi.PlatformComponentTemplate; -import io.brooklyn.camp.spi.PlatformRootSummary; -import io.brooklyn.camp.spi.collection.ResolvableLink; - import java.util.ArrayList; import java.util.List; @@ -29,6 +25,9 @@ import org.apache.brooklyn.api.catalog.CatalogItem; import org.apache.brooklyn.api.entity.Entity; import org.apache.brooklyn.api.entity.proxying.EntitySpec; import org.apache.brooklyn.api.management.ManagementContext; +import org.apache.brooklyn.camp.spi.PlatformComponentTemplate; +import org.apache.brooklyn.camp.spi.PlatformRootSummary; +import org.apache.brooklyn.camp.spi.collection.ResolvableLink; import org.apache.brooklyn.core.catalog.CatalogPredicates; public class PlatformComponentTemplateBrooklynLookup extends AbstractTemplateBrooklynLookup<PlatformComponentTemplate> { http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/7d782f34/usage/camp/src/main/java/org/apache/brooklyn/camp/brooklyn/spi/platform/BrooklynImmutableCampPlatform.java ---------------------------------------------------------------------- diff --git a/usage/camp/src/main/java/org/apache/brooklyn/camp/brooklyn/spi/platform/BrooklynImmutableCampPlatform.java b/usage/camp/src/main/java/org/apache/brooklyn/camp/brooklyn/spi/platform/BrooklynImmutableCampPlatform.java index bf79b7a..d69a3e4 100644 --- a/usage/camp/src/main/java/org/apache/brooklyn/camp/brooklyn/spi/platform/BrooklynImmutableCampPlatform.java +++ b/usage/camp/src/main/java/org/apache/brooklyn/camp/brooklyn/spi/platform/BrooklynImmutableCampPlatform.java @@ -18,24 +18,23 @@ */ package org.apache.brooklyn.camp.brooklyn.spi.platform; -import io.brooklyn.camp.CampPlatform; -import io.brooklyn.camp.spi.ApplicationComponent; -import io.brooklyn.camp.spi.ApplicationComponentTemplate; -import io.brooklyn.camp.spi.Assembly; -import io.brooklyn.camp.spi.AssemblyTemplate; -import io.brooklyn.camp.spi.PlatformComponent; -import io.brooklyn.camp.spi.PlatformComponentTemplate; -import io.brooklyn.camp.spi.PlatformRootSummary; -import io.brooklyn.camp.spi.PlatformTransaction; -import io.brooklyn.camp.spi.collection.BasicResourceLookup; -import io.brooklyn.camp.spi.collection.ResourceLookup; -import io.brooklyn.camp.spi.collection.ResourceLookup.EmptyResourceLookup; - import org.apache.brooklyn.api.management.ManagementContext; +import org.apache.brooklyn.camp.CampPlatform; import org.apache.brooklyn.camp.brooklyn.spi.lookup.AssemblyBrooklynLookup; import org.apache.brooklyn.camp.brooklyn.spi.lookup.AssemblyTemplateBrooklynLookup; import org.apache.brooklyn.camp.brooklyn.spi.lookup.PlatformComponentBrooklynLookup; import org.apache.brooklyn.camp.brooklyn.spi.lookup.PlatformComponentTemplateBrooklynLookup; +import org.apache.brooklyn.camp.spi.ApplicationComponent; +import org.apache.brooklyn.camp.spi.ApplicationComponentTemplate; +import org.apache.brooklyn.camp.spi.Assembly; +import org.apache.brooklyn.camp.spi.AssemblyTemplate; +import org.apache.brooklyn.camp.spi.PlatformComponent; +import org.apache.brooklyn.camp.spi.PlatformComponentTemplate; +import org.apache.brooklyn.camp.spi.PlatformRootSummary; +import org.apache.brooklyn.camp.spi.PlatformTransaction; +import org.apache.brooklyn.camp.spi.collection.BasicResourceLookup; +import org.apache.brooklyn.camp.spi.collection.ResourceLookup; +import org.apache.brooklyn.camp.spi.collection.ResourceLookup.EmptyResourceLookup; import brooklyn.camp.brooklyn.api.HasBrooklynManagementContext; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/7d782f34/usage/camp/src/test/java/org/apache/brooklyn/camp/brooklyn/AbstractYamlRebindTest.java ---------------------------------------------------------------------- diff --git a/usage/camp/src/test/java/org/apache/brooklyn/camp/brooklyn/AbstractYamlRebindTest.java b/usage/camp/src/test/java/org/apache/brooklyn/camp/brooklyn/AbstractYamlRebindTest.java index 8922059..0deb246 100644 --- a/usage/camp/src/test/java/org/apache/brooklyn/camp/brooklyn/AbstractYamlRebindTest.java +++ b/usage/camp/src/test/java/org/apache/brooklyn/camp/brooklyn/AbstractYamlRebindTest.java @@ -18,9 +18,6 @@ */ package org.apache.brooklyn.camp.brooklyn; -import io.brooklyn.camp.spi.Assembly; -import io.brooklyn.camp.spi.AssemblyTemplate; - import java.io.Reader; import java.io.StringReader; import java.util.Set; @@ -30,6 +27,8 @@ import org.apache.brooklyn.api.management.ManagementContext; import org.apache.brooklyn.api.management.Task; import org.apache.brooklyn.camp.brooklyn.BrooklynCampPlatform; import org.apache.brooklyn.camp.brooklyn.BrooklynCampPlatformLauncherNoServer; +import org.apache.brooklyn.camp.spi.Assembly; +import org.apache.brooklyn.camp.spi.AssemblyTemplate; import org.apache.brooklyn.core.catalog.internal.CatalogUtils; import org.apache.brooklyn.core.management.internal.LocalManagementContext; import org.apache.brooklyn.core.util.ResourceUtils; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/7d782f34/usage/camp/src/test/java/org/apache/brooklyn/camp/brooklyn/AbstractYamlTest.java ---------------------------------------------------------------------- diff --git a/usage/camp/src/test/java/org/apache/brooklyn/camp/brooklyn/AbstractYamlTest.java b/usage/camp/src/test/java/org/apache/brooklyn/camp/brooklyn/AbstractYamlTest.java index 0396009..fbe4637 100644 --- a/usage/camp/src/test/java/org/apache/brooklyn/camp/brooklyn/AbstractYamlTest.java +++ b/usage/camp/src/test/java/org/apache/brooklyn/camp/brooklyn/AbstractYamlTest.java @@ -18,9 +18,6 @@ */ package org.apache.brooklyn.camp.brooklyn; -import io.brooklyn.camp.spi.Assembly; -import io.brooklyn.camp.spi.AssemblyTemplate; - import java.io.Reader; import java.io.StringReader; import java.util.Set; @@ -30,6 +27,8 @@ import org.apache.brooklyn.api.management.ManagementContext; import org.apache.brooklyn.api.management.Task; import org.apache.brooklyn.camp.brooklyn.BrooklynCampPlatform; import org.apache.brooklyn.camp.brooklyn.BrooklynCampPlatformLauncherNoServer; +import org.apache.brooklyn.camp.spi.Assembly; +import org.apache.brooklyn.camp.spi.AssemblyTemplate; import org.apache.brooklyn.core.catalog.internal.CatalogUtils; import org.apache.brooklyn.core.management.internal.LocalManagementContext; import org.apache.brooklyn.core.util.ResourceUtils; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/7d782f34/usage/camp/src/test/java/org/apache/brooklyn/camp/brooklyn/JavaWebAppWithDslYamlRebindIntegrationTest.java ---------------------------------------------------------------------- diff --git a/usage/camp/src/test/java/org/apache/brooklyn/camp/brooklyn/JavaWebAppWithDslYamlRebindIntegrationTest.java b/usage/camp/src/test/java/org/apache/brooklyn/camp/brooklyn/JavaWebAppWithDslYamlRebindIntegrationTest.java index 72b06e3..99cc83b 100644 --- a/usage/camp/src/test/java/org/apache/brooklyn/camp/brooklyn/JavaWebAppWithDslYamlRebindIntegrationTest.java +++ b/usage/camp/src/test/java/org/apache/brooklyn/camp/brooklyn/JavaWebAppWithDslYamlRebindIntegrationTest.java @@ -18,9 +18,6 @@ */ package org.apache.brooklyn.camp.brooklyn; -import io.brooklyn.camp.spi.Assembly; -import io.brooklyn.camp.spi.AssemblyTemplate; - import java.io.File; import java.io.Reader; import java.util.Set; @@ -28,6 +25,8 @@ import java.util.Set; import org.apache.brooklyn.api.entity.Application; import org.apache.brooklyn.api.management.ManagementContext; import org.apache.brooklyn.api.management.Task; +import org.apache.brooklyn.camp.spi.Assembly; +import org.apache.brooklyn.camp.spi.AssemblyTemplate; import org.apache.brooklyn.core.management.internal.LocalManagementContext; import org.apache.brooklyn.core.util.ResourceUtils; import org.slf4j.Logger; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/7d782f34/usage/camp/src/test/java/org/apache/brooklyn/camp/brooklyn/JavaWebAppsIntegrationTest.java ---------------------------------------------------------------------- diff --git a/usage/camp/src/test/java/org/apache/brooklyn/camp/brooklyn/JavaWebAppsIntegrationTest.java b/usage/camp/src/test/java/org/apache/brooklyn/camp/brooklyn/JavaWebAppsIntegrationTest.java index 5a6d7d8..ef9a28a 100644 --- a/usage/camp/src/test/java/org/apache/brooklyn/camp/brooklyn/JavaWebAppsIntegrationTest.java +++ b/usage/camp/src/test/java/org/apache/brooklyn/camp/brooklyn/JavaWebAppsIntegrationTest.java @@ -19,11 +19,6 @@ package org.apache.brooklyn.camp.brooklyn; import static com.google.common.base.Preconditions.checkNotNull; -import io.brooklyn.camp.spi.Assembly; -import io.brooklyn.camp.spi.AssemblyTemplate; -import io.brooklyn.camp.spi.PlatformComponent; -import io.brooklyn.camp.spi.PlatformRootSummary; -import io.brooklyn.camp.spi.collection.ResolvableLink; import java.io.IOException; import java.io.Reader; @@ -36,11 +31,14 @@ import org.apache.brooklyn.api.entity.Entity; import org.apache.brooklyn.api.management.ManagementContext; import org.apache.brooklyn.api.management.Task; import org.apache.brooklyn.api.policy.Policy; - import org.apache.brooklyn.camp.brooklyn.BrooklynCampPlatform; import org.apache.brooklyn.camp.brooklyn.BrooklynCampPlatformLauncherNoServer; +import org.apache.brooklyn.camp.spi.Assembly; +import org.apache.brooklyn.camp.spi.AssemblyTemplate; +import org.apache.brooklyn.camp.spi.PlatformComponent; +import org.apache.brooklyn.camp.spi.PlatformRootSummary; +import org.apache.brooklyn.camp.spi.collection.ResolvableLink; import org.apache.brooklyn.core.util.ResourceUtils; - import org.apache.brooklyn.entity.webapp.DynamicWebAppCluster; import org.apache.brooklyn.entity.webapp.JavaWebAppService; import org.apache.brooklyn.entity.webapp.WebAppService; @@ -56,7 +54,9 @@ import brooklyn.entity.basic.Attributes; import brooklyn.entity.basic.BrooklynTaskTags; import brooklyn.entity.basic.Entities; import brooklyn.entity.basic.Lifecycle; + import org.apache.brooklyn.policy.autoscaling.AutoScalerPolicy; + import brooklyn.test.Asserts; import brooklyn.util.collections.MutableMap; import brooklyn.util.exceptions.Exceptions; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/7d782f34/usage/camp/src/test/java/org/apache/brooklyn/camp/brooklyn/JavaWebAppsMatchingTest.java ---------------------------------------------------------------------- diff --git a/usage/camp/src/test/java/org/apache/brooklyn/camp/brooklyn/JavaWebAppsMatchingTest.java b/usage/camp/src/test/java/org/apache/brooklyn/camp/brooklyn/JavaWebAppsMatchingTest.java index 7e45019..9f03388 100644 --- a/usage/camp/src/test/java/org/apache/brooklyn/camp/brooklyn/JavaWebAppsMatchingTest.java +++ b/usage/camp/src/test/java/org/apache/brooklyn/camp/brooklyn/JavaWebAppsMatchingTest.java @@ -18,12 +18,6 @@ */ package org.apache.brooklyn.camp.brooklyn; -import io.brooklyn.camp.spi.AssemblyTemplate; -import io.brooklyn.camp.spi.PlatformComponentTemplate; -import io.brooklyn.camp.spi.PlatformRootSummary; -import io.brooklyn.camp.spi.collection.ResolvableLink; -import io.brooklyn.camp.spi.pdp.DeploymentPlan; - import java.io.IOException; import java.io.Reader; import java.util.Iterator; @@ -32,6 +26,11 @@ import java.util.Map; import org.apache.brooklyn.api.management.ManagementContext; import org.apache.brooklyn.camp.brooklyn.BrooklynCampPlatform; import org.apache.brooklyn.camp.brooklyn.BrooklynCampReservedKeys; +import org.apache.brooklyn.camp.spi.AssemblyTemplate; +import org.apache.brooklyn.camp.spi.PlatformComponentTemplate; +import org.apache.brooklyn.camp.spi.PlatformRootSummary; +import org.apache.brooklyn.camp.spi.collection.ResolvableLink; +import org.apache.brooklyn.camp.spi.pdp.DeploymentPlan; import org.apache.brooklyn.core.util.ResourceUtils; import org.apache.brooklyn.core.util.task.DeferredSupplier; import org.apache.brooklyn.test.entity.LocalManagementContextForTests; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/7d782f34/usage/camp/src/test/java/org/apache/brooklyn/camp/brooklyn/ReloadBrooklynPropertiesTest.java ---------------------------------------------------------------------- diff --git a/usage/camp/src/test/java/org/apache/brooklyn/camp/brooklyn/ReloadBrooklynPropertiesTest.java b/usage/camp/src/test/java/org/apache/brooklyn/camp/brooklyn/ReloadBrooklynPropertiesTest.java index 961e2fd..67ec2f6 100644 --- a/usage/camp/src/test/java/org/apache/brooklyn/camp/brooklyn/ReloadBrooklynPropertiesTest.java +++ b/usage/camp/src/test/java/org/apache/brooklyn/camp/brooklyn/ReloadBrooklynPropertiesTest.java @@ -18,16 +18,15 @@ */ package org.apache.brooklyn.camp.brooklyn; -import io.brooklyn.camp.CampPlatform; -import io.brooklyn.camp.spi.Assembly; -import io.brooklyn.camp.spi.AssemblyTemplate; - import java.io.Reader; import org.apache.brooklyn.api.entity.Entity; import org.apache.brooklyn.api.management.ManagementContext; +import org.apache.brooklyn.camp.CampPlatform; import org.apache.brooklyn.camp.brooklyn.BrooklynCampConstants; import org.apache.brooklyn.camp.brooklyn.BrooklynCampPlatformLauncherNoServer; +import org.apache.brooklyn.camp.spi.Assembly; +import org.apache.brooklyn.camp.spi.AssemblyTemplate; import org.apache.brooklyn.core.util.ResourceUtils; import org.apache.brooklyn.test.EntityTestUtils; import org.slf4j.Logger; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/7d782f34/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 504363a..0c21d90 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 @@ -47,8 +47,11 @@ import org.apache.brooklyn.api.management.ha.ManagementNodeState; import org.apache.brooklyn.api.management.ha.ManagementPlaneSyncRecord; import org.apache.brooklyn.api.management.ha.ManagementPlaneSyncRecordPersister; import org.apache.brooklyn.api.mementos.BrooklynMementoRawData; +import org.apache.brooklyn.camp.CampPlatform; import org.apache.brooklyn.camp.brooklyn.BrooklynCampPlatformLauncherNoServer; import org.apache.brooklyn.camp.brooklyn.spi.creation.BrooklynAssemblyTemplateInstantiator; +import org.apache.brooklyn.camp.spi.AssemblyTemplate; +import org.apache.brooklyn.camp.spi.instantiate.AssemblyTemplateInstantiator; import org.apache.brooklyn.core.catalog.internal.CatalogInitialization; import org.apache.brooklyn.core.management.ha.HighAvailabilityManagerImpl; import org.apache.brooklyn.core.management.ha.ManagementPlaneSyncRecordPersisterToObjectStore; @@ -106,9 +109,6 @@ import brooklyn.util.stream.Streams; import brooklyn.util.text.Strings; import brooklyn.util.time.Duration; import brooklyn.util.time.Time; -import io.brooklyn.camp.CampPlatform; -import io.brooklyn.camp.spi.AssemblyTemplate; -import io.brooklyn.camp.spi.instantiate.AssemblyTemplateInstantiator; /** * Example usage is: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/7d782f34/usage/launcher/src/main/java/org/apache/brooklyn/launcher/camp/BrooklynCampPlatformLauncher.java ---------------------------------------------------------------------- diff --git a/usage/launcher/src/main/java/org/apache/brooklyn/launcher/camp/BrooklynCampPlatformLauncher.java b/usage/launcher/src/main/java/org/apache/brooklyn/launcher/camp/BrooklynCampPlatformLauncher.java index 461065e..556ac66 100644 --- a/usage/launcher/src/main/java/org/apache/brooklyn/launcher/camp/BrooklynCampPlatformLauncher.java +++ b/usage/launcher/src/main/java/org/apache/brooklyn/launcher/camp/BrooklynCampPlatformLauncher.java @@ -18,14 +18,14 @@ */ package org.apache.brooklyn.launcher.camp; -import io.brooklyn.camp.CampServer; -import io.brooklyn.camp.spi.PlatformRootSummary; import brooklyn.entity.basic.BrooklynShutdownHooks; import org.apache.brooklyn.launcher.BrooklynLauncher; import org.apache.brooklyn.api.management.ManagementContext; import org.apache.brooklyn.camp.brooklyn.BrooklynCampPlatform; import org.apache.brooklyn.camp.brooklyn.BrooklynCampPlatformLauncherAbstract; +import org.apache.brooklyn.camp.server.rest.CampServer; +import org.apache.brooklyn.camp.spi.PlatformRootSummary; import org.apache.brooklyn.core.management.internal.LocalManagementContext; import com.google.common.annotations.Beta; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/7d782f34/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 830214e..e165ab4 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 @@ -18,8 +18,6 @@ */ package org.apache.brooklyn.rest.resources; -import io.brooklyn.camp.CampPlatform; - import javax.annotation.Nullable; import javax.servlet.ServletContext; import javax.ws.rs.core.Context; @@ -33,6 +31,7 @@ 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.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/7d782f34/usage/rest-server/src/main/java/org/apache/brooklyn/rest/resources/ApplicationResource.java ---------------------------------------------------------------------- diff --git a/usage/rest-server/src/main/java/org/apache/brooklyn/rest/resources/ApplicationResource.java b/usage/rest-server/src/main/java/org/apache/brooklyn/rest/resources/ApplicationResource.java index d195af6..03a53f0 100644 --- a/usage/rest-server/src/main/java/org/apache/brooklyn/rest/resources/ApplicationResource.java +++ b/usage/rest-server/src/main/java/org/apache/brooklyn/rest/resources/ApplicationResource.java @@ -22,9 +22,9 @@ import static com.google.common.base.Preconditions.checkNotNull; import static javax.ws.rs.core.Response.created; import static javax.ws.rs.core.Response.status; import static javax.ws.rs.core.Response.Status.ACCEPTED; + import brooklyn.entity.basic.EntityPredicates; import brooklyn.util.text.Strings; -import io.brooklyn.camp.spi.AssemblyTemplate; import java.io.StringReader; import java.net.URI; @@ -59,6 +59,7 @@ import org.apache.brooklyn.api.event.AttributeSensor; import org.apache.brooklyn.api.event.Sensor; import org.apache.brooklyn.api.location.Location; import org.apache.brooklyn.api.management.Task; +import org.apache.brooklyn.camp.spi.AssemblyTemplate; import org.apache.brooklyn.core.catalog.internal.CatalogUtils; import org.apache.brooklyn.core.management.entitlement.EntitlementPredicates; import org.apache.brooklyn.core.management.entitlement.Entitlements;
