http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/88b9219a/api/src/main/java/org/apache/brooklyn/policy/Policy.java ---------------------------------------------------------------------- diff --git a/api/src/main/java/org/apache/brooklyn/policy/Policy.java b/api/src/main/java/org/apache/brooklyn/policy/Policy.java index 2516bb9..67f1b58 100644 --- a/api/src/main/java/org/apache/brooklyn/policy/Policy.java +++ b/api/src/main/java/org/apache/brooklyn/policy/Policy.java @@ -20,11 +20,12 @@ package org.apache.brooklyn.policy; import java.util.Map; +import org.apache.brooklyn.mementos.PolicyMemento; + import brooklyn.config.ConfigKey; import brooklyn.entity.rebind.RebindSupport; import brooklyn.entity.rebind.Rebindable; import brooklyn.entity.trait.Configurable; -import brooklyn.mementos.PolicyMemento; import com.google.common.annotations.Beta;
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/88b9219a/core/src/main/java/brooklyn/catalog/internal/CatalogItemDo.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/brooklyn/catalog/internal/CatalogItemDo.java b/core/src/main/java/brooklyn/catalog/internal/CatalogItemDo.java index 4500764..eb7b3f6 100644 --- a/core/src/main/java/brooklyn/catalog/internal/CatalogItemDo.java +++ b/core/src/main/java/brooklyn/catalog/internal/CatalogItemDo.java @@ -24,11 +24,13 @@ import javax.annotation.Nonnull; import javax.annotation.Nullable; import brooklyn.basic.BrooklynObjectInternal; + import org.apache.brooklyn.catalog.CatalogItem; +import org.apache.brooklyn.mementos.CatalogItemMemento; + import brooklyn.config.ConfigKey; import brooklyn.entity.rebind.RebindSupport; import brooklyn.management.ManagementContext; -import brooklyn.mementos.CatalogItemMemento; import com.google.common.base.Preconditions; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/88b9219a/core/src/main/java/brooklyn/catalog/internal/CatalogItemDtoAbstract.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/brooklyn/catalog/internal/CatalogItemDtoAbstract.java b/core/src/main/java/brooklyn/catalog/internal/CatalogItemDtoAbstract.java index f39b921..fe84ed8 100644 --- a/core/src/main/java/brooklyn/catalog/internal/CatalogItemDtoAbstract.java +++ b/core/src/main/java/brooklyn/catalog/internal/CatalogItemDtoAbstract.java @@ -30,11 +30,13 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; import brooklyn.basic.AbstractBrooklynObject; + import org.apache.brooklyn.catalog.CatalogItem; +import org.apache.brooklyn.mementos.CatalogItemMemento; + import brooklyn.config.ConfigKey; import brooklyn.entity.rebind.BasicCatalogItemRebindSupport; import brooklyn.entity.rebind.RebindSupport; -import brooklyn.mementos.CatalogItemMemento; import brooklyn.util.collections.MutableList; import brooklyn.util.flags.FlagUtils; import brooklyn.util.flags.SetFromFlag; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/88b9219a/core/src/main/java/brooklyn/enricher/basic/AbstractEnricher.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/brooklyn/enricher/basic/AbstractEnricher.java b/core/src/main/java/brooklyn/enricher/basic/AbstractEnricher.java index 1118dfd..d394631 100644 --- a/core/src/main/java/brooklyn/enricher/basic/AbstractEnricher.java +++ b/core/src/main/java/brooklyn/enricher/basic/AbstractEnricher.java @@ -22,6 +22,7 @@ import static com.google.common.base.Preconditions.checkState; import java.util.Map; +import org.apache.brooklyn.mementos.EnricherMemento; import org.apache.brooklyn.policy.Enricher; import org.apache.brooklyn.policy.EnricherType; @@ -34,7 +35,6 @@ import brooklyn.entity.rebind.BasicEnricherRebindSupport; import brooklyn.entity.rebind.RebindSupport; import brooklyn.event.AttributeSensor; import brooklyn.event.Sensor; -import brooklyn.mementos.EnricherMemento; import brooklyn.policy.basic.AbstractEntityAdjunct; import brooklyn.util.flags.TypeCoercions; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/88b9219a/core/src/main/java/brooklyn/entity/basic/AbstractEntity.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/brooklyn/entity/basic/AbstractEntity.java b/core/src/main/java/brooklyn/entity/basic/AbstractEntity.java index 762d11e..301599e 100644 --- a/core/src/main/java/brooklyn/entity/basic/AbstractEntity.java +++ b/core/src/main/java/brooklyn/entity/basic/AbstractEntity.java @@ -27,6 +27,7 @@ import java.util.List; import java.util.Map; import java.util.Set; +import org.apache.brooklyn.mementos.EntityMemento; import org.apache.brooklyn.policy.Enricher; import org.apache.brooklyn.policy.EnricherSpec; import org.apache.brooklyn.policy.EntityAdjunct; @@ -80,7 +81,6 @@ import brooklyn.management.internal.EffectorUtils; import brooklyn.management.internal.EntityManagementSupport; import brooklyn.management.internal.ManagementContextInternal; import brooklyn.management.internal.SubscriptionTracker; -import brooklyn.mementos.EntityMemento; import brooklyn.policy.basic.AbstractEntityAdjunct; import brooklyn.policy.basic.AbstractEntityAdjunct.AdjunctTagSupport; import brooklyn.policy.basic.AbstractPolicy; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/88b9219a/core/src/main/java/brooklyn/entity/basic/EntityInternal.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/brooklyn/entity/basic/EntityInternal.java b/core/src/main/java/brooklyn/entity/basic/EntityInternal.java index b0e517e..91fd3cb 100644 --- a/core/src/main/java/brooklyn/entity/basic/EntityInternal.java +++ b/core/src/main/java/brooklyn/entity/basic/EntityInternal.java @@ -21,6 +21,8 @@ package brooklyn.entity.basic; import java.util.Collection; import java.util.Map; +import org.apache.brooklyn.mementos.EntityMemento; + import brooklyn.basic.BrooklynObjectInternal; import brooklyn.config.ConfigKey; import brooklyn.entity.Effector; @@ -33,7 +35,6 @@ import brooklyn.management.ExecutionContext; import brooklyn.management.ManagementContext; import brooklyn.management.SubscriptionContext; import brooklyn.management.internal.EntityManagementSupport; -import brooklyn.mementos.EntityMemento; import brooklyn.util.config.ConfigBag; import com.google.common.annotations.Beta; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/88b9219a/core/src/main/java/brooklyn/entity/basic/EntityTransientCopyInternal.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/brooklyn/entity/basic/EntityTransientCopyInternal.java b/core/src/main/java/brooklyn/entity/basic/EntityTransientCopyInternal.java index 00d4811..027c357 100644 --- a/core/src/main/java/brooklyn/entity/basic/EntityTransientCopyInternal.java +++ b/core/src/main/java/brooklyn/entity/basic/EntityTransientCopyInternal.java @@ -25,6 +25,7 @@ import java.util.Set; import javax.annotation.Nonnull; import javax.annotation.Nullable; +import org.apache.brooklyn.mementos.EntityMemento; import org.apache.brooklyn.policy.Enricher; import org.apache.brooklyn.policy.Policy; @@ -44,7 +45,6 @@ import brooklyn.location.Location; import brooklyn.management.ExecutionContext; import brooklyn.management.ManagementContext; import brooklyn.management.internal.EntityManagementSupport; -import brooklyn.mementos.EntityMemento; import brooklyn.util.config.ConfigBag; import brooklyn.util.guava.Maybe; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/88b9219a/core/src/main/java/brooklyn/entity/rebind/AbstractBrooklynObjectRebindSupport.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/brooklyn/entity/rebind/AbstractBrooklynObjectRebindSupport.java b/core/src/main/java/brooklyn/entity/rebind/AbstractBrooklynObjectRebindSupport.java index ff1975e..5eda7e6 100644 --- a/core/src/main/java/brooklyn/entity/rebind/AbstractBrooklynObjectRebindSupport.java +++ b/core/src/main/java/brooklyn/entity/rebind/AbstractBrooklynObjectRebindSupport.java @@ -18,13 +18,13 @@ */ package brooklyn.entity.rebind; +import org.apache.brooklyn.mementos.Memento; import org.apache.brooklyn.policy.EntityAdjunct; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import brooklyn.basic.AbstractBrooklynObject; import brooklyn.entity.rebind.dto.MementosGenerators; -import brooklyn.mementos.Memento; import brooklyn.policy.basic.AbstractEntityAdjunct.AdjunctTagSupport; import brooklyn.util.text.Strings; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/88b9219a/core/src/main/java/brooklyn/entity/rebind/ActivePartialRebindIteration.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/brooklyn/entity/rebind/ActivePartialRebindIteration.java b/core/src/main/java/brooklyn/entity/rebind/ActivePartialRebindIteration.java index 76e600a..8d59ef7 100644 --- a/core/src/main/java/brooklyn/entity/rebind/ActivePartialRebindIteration.java +++ b/core/src/main/java/brooklyn/entity/rebind/ActivePartialRebindIteration.java @@ -25,6 +25,10 @@ import java.util.Set; import java.util.concurrent.Semaphore; import java.util.concurrent.atomic.AtomicInteger; +import org.apache.brooklyn.mementos.BrooklynMementoPersister; +import org.apache.brooklyn.mementos.BrooklynMementoRawData; +import org.apache.brooklyn.mementos.Memento; +import org.apache.brooklyn.mementos.BrooklynMementoRawData.Builder; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -36,10 +40,6 @@ import brooklyn.entity.rebind.persister.BrooklynMementoPersisterToObjectStore; import brooklyn.entity.rebind.persister.PersistenceActivityMetrics; import brooklyn.entity.rebind.transformer.CompoundTransformer; import brooklyn.management.ha.ManagementNodeState; -import brooklyn.mementos.BrooklynMementoPersister; -import brooklyn.mementos.BrooklynMementoRawData; -import brooklyn.mementos.BrooklynMementoRawData.Builder; -import brooklyn.mementos.Memento; import brooklyn.util.collections.MutableList; import brooklyn.util.collections.MutableSet; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/88b9219a/core/src/main/java/brooklyn/entity/rebind/BasicCatalogItemRebindSupport.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/brooklyn/entity/rebind/BasicCatalogItemRebindSupport.java b/core/src/main/java/brooklyn/entity/rebind/BasicCatalogItemRebindSupport.java index 62528b9..856c758 100644 --- a/core/src/main/java/brooklyn/entity/rebind/BasicCatalogItemRebindSupport.java +++ b/core/src/main/java/brooklyn/entity/rebind/BasicCatalogItemRebindSupport.java @@ -18,11 +18,11 @@ */ package brooklyn.entity.rebind; +import org.apache.brooklyn.mementos.CatalogItemMemento; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import brooklyn.catalog.internal.CatalogItemDtoAbstract; -import brooklyn.mementos.CatalogItemMemento; import brooklyn.util.collections.MutableMap; import brooklyn.util.flags.FlagUtils; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/88b9219a/core/src/main/java/brooklyn/entity/rebind/BasicEnricherRebindSupport.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/brooklyn/entity/rebind/BasicEnricherRebindSupport.java b/core/src/main/java/brooklyn/entity/rebind/BasicEnricherRebindSupport.java index 49ab6a4..11a2529 100644 --- a/core/src/main/java/brooklyn/entity/rebind/BasicEnricherRebindSupport.java +++ b/core/src/main/java/brooklyn/entity/rebind/BasicEnricherRebindSupport.java @@ -18,8 +18,9 @@ */ package brooklyn.entity.rebind; +import org.apache.brooklyn.mementos.EnricherMemento; + import brooklyn.enricher.basic.AbstractEnricher; -import brooklyn.mementos.EnricherMemento; import brooklyn.util.config.ConfigBag; import brooklyn.util.flags.FlagUtils; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/88b9219a/core/src/main/java/brooklyn/entity/rebind/BasicEntityRebindSupport.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/brooklyn/entity/rebind/BasicEntityRebindSupport.java b/core/src/main/java/brooklyn/entity/rebind/BasicEntityRebindSupport.java index 8edb2fd..7c2f044 100644 --- a/core/src/main/java/brooklyn/entity/rebind/BasicEntityRebindSupport.java +++ b/core/src/main/java/brooklyn/entity/rebind/BasicEntityRebindSupport.java @@ -23,6 +23,7 @@ import static com.google.common.base.Preconditions.checkNotNull; import java.util.Collections; import java.util.Map; +import org.apache.brooklyn.mementos.EntityMemento; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -38,7 +39,6 @@ import brooklyn.entity.rebind.dto.MementosGenerators; import brooklyn.event.AttributeSensor; import brooklyn.event.feed.AbstractFeed; import brooklyn.location.Location; -import brooklyn.mementos.EntityMemento; import brooklyn.policy.basic.AbstractPolicy; import brooklyn.util.exceptions.Exceptions; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/88b9219a/core/src/main/java/brooklyn/entity/rebind/BasicFeedRebindSupport.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/brooklyn/entity/rebind/BasicFeedRebindSupport.java b/core/src/main/java/brooklyn/entity/rebind/BasicFeedRebindSupport.java index 35088f6..ab6ba9d 100644 --- a/core/src/main/java/brooklyn/entity/rebind/BasicFeedRebindSupport.java +++ b/core/src/main/java/brooklyn/entity/rebind/BasicFeedRebindSupport.java @@ -18,8 +18,9 @@ */ package brooklyn.entity.rebind; +import org.apache.brooklyn.mementos.FeedMemento; + import brooklyn.event.feed.AbstractFeed; -import brooklyn.mementos.FeedMemento; import brooklyn.util.config.ConfigBag; import brooklyn.util.flags.FlagUtils; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/88b9219a/core/src/main/java/brooklyn/entity/rebind/BasicLocationRebindSupport.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/brooklyn/entity/rebind/BasicLocationRebindSupport.java b/core/src/main/java/brooklyn/entity/rebind/BasicLocationRebindSupport.java index 23ed373..7bc6282 100644 --- a/core/src/main/java/brooklyn/entity/rebind/BasicLocationRebindSupport.java +++ b/core/src/main/java/brooklyn/entity/rebind/BasicLocationRebindSupport.java @@ -23,6 +23,7 @@ import java.util.Collections; import java.util.Map; import java.util.NoSuchElementException; +import org.apache.brooklyn.mementos.LocationMemento; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -30,7 +31,6 @@ import brooklyn.config.ConfigKey; import brooklyn.entity.rebind.dto.MementosGenerators; import brooklyn.location.Location; import brooklyn.location.basic.AbstractLocation; -import brooklyn.mementos.LocationMemento; import brooklyn.util.collections.MutableMap; import brooklyn.util.flags.FlagUtils; import brooklyn.util.flags.TypeCoercions; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/88b9219a/core/src/main/java/brooklyn/entity/rebind/BasicPolicyRebindSupport.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/brooklyn/entity/rebind/BasicPolicyRebindSupport.java b/core/src/main/java/brooklyn/entity/rebind/BasicPolicyRebindSupport.java index 838023e..a0a092f 100644 --- a/core/src/main/java/brooklyn/entity/rebind/BasicPolicyRebindSupport.java +++ b/core/src/main/java/brooklyn/entity/rebind/BasicPolicyRebindSupport.java @@ -18,7 +18,8 @@ */ package brooklyn.entity.rebind; -import brooklyn.mementos.PolicyMemento; +import org.apache.brooklyn.mementos.PolicyMemento; + import brooklyn.policy.basic.AbstractPolicy; import brooklyn.util.config.ConfigBag; import brooklyn.util.flags.FlagUtils; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/88b9219a/core/src/main/java/brooklyn/entity/rebind/ImmediateDeltaChangeListener.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/brooklyn/entity/rebind/ImmediateDeltaChangeListener.java b/core/src/main/java/brooklyn/entity/rebind/ImmediateDeltaChangeListener.java index f7e4417..0f41389 100644 --- a/core/src/main/java/brooklyn/entity/rebind/ImmediateDeltaChangeListener.java +++ b/core/src/main/java/brooklyn/entity/rebind/ImmediateDeltaChangeListener.java @@ -25,19 +25,19 @@ import brooklyn.basic.BrooklynObject; import brooklyn.basic.BrooklynObjectInternal; import org.apache.brooklyn.catalog.CatalogItem; +import org.apache.brooklyn.mementos.BrooklynMementoPersister; +import org.apache.brooklyn.mementos.CatalogItemMemento; +import org.apache.brooklyn.mementos.EnricherMemento; +import org.apache.brooklyn.mementos.EntityMemento; +import org.apache.brooklyn.mementos.LocationMemento; +import org.apache.brooklyn.mementos.Memento; +import org.apache.brooklyn.mementos.PolicyMemento; import org.apache.brooklyn.policy.Enricher; import org.apache.brooklyn.policy.Policy; import brooklyn.entity.Entity; import brooklyn.location.Location; import brooklyn.location.basic.LocationInternal; -import brooklyn.mementos.BrooklynMementoPersister; -import brooklyn.mementos.CatalogItemMemento; -import brooklyn.mementos.EnricherMemento; -import brooklyn.mementos.EntityMemento; -import brooklyn.mementos.LocationMemento; -import brooklyn.mementos.Memento; -import brooklyn.mementos.PolicyMemento; import com.google.common.collect.Maps; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/88b9219a/core/src/main/java/brooklyn/entity/rebind/InitialFullRebindIteration.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/brooklyn/entity/rebind/InitialFullRebindIteration.java b/core/src/main/java/brooklyn/entity/rebind/InitialFullRebindIteration.java index 02cc9e8..a2e3673 100644 --- a/core/src/main/java/brooklyn/entity/rebind/InitialFullRebindIteration.java +++ b/core/src/main/java/brooklyn/entity/rebind/InitialFullRebindIteration.java @@ -22,6 +22,7 @@ import java.util.Set; import java.util.concurrent.Semaphore; import java.util.concurrent.atomic.AtomicInteger; +import org.apache.brooklyn.mementos.BrooklynMementoPersister; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -34,7 +35,6 @@ import brooklyn.management.internal.BrooklynObjectManagementMode; import brooklyn.management.internal.EntityManagerInternal; import brooklyn.management.internal.LocationManagerInternal; import brooklyn.management.internal.ManagementTransitionMode; -import brooklyn.mementos.BrooklynMementoPersister; import brooklyn.util.text.Strings; import com.google.common.base.Preconditions; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/88b9219a/core/src/main/java/brooklyn/entity/rebind/PeriodicDeltaChangeListener.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/brooklyn/entity/rebind/PeriodicDeltaChangeListener.java b/core/src/main/java/brooklyn/entity/rebind/PeriodicDeltaChangeListener.java index 6833f08..a871168 100644 --- a/core/src/main/java/brooklyn/entity/rebind/PeriodicDeltaChangeListener.java +++ b/core/src/main/java/brooklyn/entity/rebind/PeriodicDeltaChangeListener.java @@ -34,6 +34,7 @@ import brooklyn.basic.BrooklynObject; import brooklyn.basic.BrooklynObjectInternal; import org.apache.brooklyn.catalog.CatalogItem; +import org.apache.brooklyn.mementos.BrooklynMementoPersister; import org.apache.brooklyn.policy.Enricher; import org.apache.brooklyn.policy.Policy; @@ -47,7 +48,6 @@ import brooklyn.internal.BrooklynFeatureEnablement; import brooklyn.location.Location; import brooklyn.management.ExecutionContext; import brooklyn.management.Task; -import brooklyn.mementos.BrooklynMementoPersister; import brooklyn.util.collections.MutableMap; import brooklyn.util.collections.MutableSet; import brooklyn.util.exceptions.Exceptions; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/88b9219a/core/src/main/java/brooklyn/entity/rebind/PersistenceExceptionHandlerImpl.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/brooklyn/entity/rebind/PersistenceExceptionHandlerImpl.java b/core/src/main/java/brooklyn/entity/rebind/PersistenceExceptionHandlerImpl.java index a3f7655..0a540f2 100644 --- a/core/src/main/java/brooklyn/entity/rebind/PersistenceExceptionHandlerImpl.java +++ b/core/src/main/java/brooklyn/entity/rebind/PersistenceExceptionHandlerImpl.java @@ -21,11 +21,11 @@ package brooklyn.entity.rebind; import java.util.Set; import java.util.concurrent.atomic.AtomicBoolean; +import org.apache.brooklyn.mementos.Memento; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import brooklyn.basic.BrooklynObject; -import brooklyn.mementos.Memento; import brooklyn.util.exceptions.Exceptions; import com.google.common.collect.Sets; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/88b9219a/core/src/main/java/brooklyn/entity/rebind/PersisterDeltaImpl.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/brooklyn/entity/rebind/PersisterDeltaImpl.java b/core/src/main/java/brooklyn/entity/rebind/PersisterDeltaImpl.java index 891e9db..12dcf66 100644 --- a/core/src/main/java/brooklyn/entity/rebind/PersisterDeltaImpl.java +++ b/core/src/main/java/brooklyn/entity/rebind/PersisterDeltaImpl.java @@ -22,15 +22,15 @@ import java.util.Collection; import java.util.Collections; import java.util.Set; -import brooklyn.mementos.BrooklynMementoPersister.Delta; -import brooklyn.mementos.BrooklynMementoPersister.MutableDelta; -import brooklyn.mementos.CatalogItemMemento; -import brooklyn.mementos.EnricherMemento; -import brooklyn.mementos.EntityMemento; -import brooklyn.mementos.FeedMemento; -import brooklyn.mementos.LocationMemento; -import brooklyn.mementos.Memento; -import brooklyn.mementos.PolicyMemento; +import org.apache.brooklyn.mementos.CatalogItemMemento; +import org.apache.brooklyn.mementos.EnricherMemento; +import org.apache.brooklyn.mementos.EntityMemento; +import org.apache.brooklyn.mementos.FeedMemento; +import org.apache.brooklyn.mementos.LocationMemento; +import org.apache.brooklyn.mementos.Memento; +import org.apache.brooklyn.mementos.PolicyMemento; +import org.apache.brooklyn.mementos.BrooklynMementoPersister.Delta; +import org.apache.brooklyn.mementos.BrooklynMementoPersister.MutableDelta; import com.google.common.annotations.Beta; import com.google.common.collect.Iterables; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/88b9219a/core/src/main/java/brooklyn/entity/rebind/RebindContextImpl.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/brooklyn/entity/rebind/RebindContextImpl.java b/core/src/main/java/brooklyn/entity/rebind/RebindContextImpl.java index 98b046d..632825e 100644 --- a/core/src/main/java/brooklyn/entity/rebind/RebindContextImpl.java +++ b/core/src/main/java/brooklyn/entity/rebind/RebindContextImpl.java @@ -26,6 +26,7 @@ import java.util.Map; import brooklyn.basic.BrooklynObject; import org.apache.brooklyn.catalog.CatalogItem; +import org.apache.brooklyn.mementos.BrooklynMementoPersister.LookupContext; import org.apache.brooklyn.policy.Enricher; import org.apache.brooklyn.policy.Policy; @@ -33,7 +34,6 @@ import brooklyn.entity.Entity; import brooklyn.entity.Feed; import brooklyn.location.Location; import brooklyn.management.ManagementContext; -import brooklyn.mementos.BrooklynMementoPersister.LookupContext; import brooklyn.util.collections.MutableMap; import com.google.common.collect.Maps; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/88b9219a/core/src/main/java/brooklyn/entity/rebind/RebindContextLookupContext.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/brooklyn/entity/rebind/RebindContextLookupContext.java b/core/src/main/java/brooklyn/entity/rebind/RebindContextLookupContext.java index f5a9570..f946495 100644 --- a/core/src/main/java/brooklyn/entity/rebind/RebindContextLookupContext.java +++ b/core/src/main/java/brooklyn/entity/rebind/RebindContextLookupContext.java @@ -26,6 +26,7 @@ import org.slf4j.LoggerFactory; import brooklyn.basic.BrooklynObject; import org.apache.brooklyn.catalog.CatalogItem; +import org.apache.brooklyn.mementos.BrooklynMementoPersister.LookupContext; import org.apache.brooklyn.policy.Enricher; import org.apache.brooklyn.policy.Policy; @@ -34,7 +35,6 @@ import brooklyn.entity.Entity; import brooklyn.entity.Feed; import brooklyn.location.Location; import brooklyn.management.ManagementContext; -import brooklyn.mementos.BrooklynMementoPersister.LookupContext; /** Looks in {@link RebindContext} <i>and</i> {@link ManagementContext} to find entities, locations, etc. */ public class RebindContextLookupContext implements LookupContext { http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/88b9219a/core/src/main/java/brooklyn/entity/rebind/RebindIteration.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/brooklyn/entity/rebind/RebindIteration.java b/core/src/main/java/brooklyn/entity/rebind/RebindIteration.java index 7ef89d4..4e32f73 100644 --- a/core/src/main/java/brooklyn/entity/rebind/RebindIteration.java +++ b/core/src/main/java/brooklyn/entity/rebind/RebindIteration.java @@ -39,6 +39,19 @@ import brooklyn.basic.BrooklynObjectInternal; import org.apache.brooklyn.catalog.BrooklynCatalog; import org.apache.brooklyn.catalog.CatalogItem; +import org.apache.brooklyn.mementos.BrooklynMemento; +import org.apache.brooklyn.mementos.BrooklynMementoManifest; +import org.apache.brooklyn.mementos.BrooklynMementoPersister; +import org.apache.brooklyn.mementos.BrooklynMementoRawData; +import org.apache.brooklyn.mementos.CatalogItemMemento; +import org.apache.brooklyn.mementos.EnricherMemento; +import org.apache.brooklyn.mementos.EntityMemento; +import org.apache.brooklyn.mementos.FeedMemento; +import org.apache.brooklyn.mementos.LocationMemento; +import org.apache.brooklyn.mementos.Memento; +import org.apache.brooklyn.mementos.PolicyMemento; +import org.apache.brooklyn.mementos.TreeNode; +import org.apache.brooklyn.mementos.BrooklynMementoManifest.EntityMementoManifest; import org.apache.brooklyn.policy.Enricher; import org.apache.brooklyn.policy.Policy; @@ -72,19 +85,6 @@ import brooklyn.management.internal.EntityManagerInternal; import brooklyn.management.internal.LocationManagerInternal; import brooklyn.management.internal.ManagementContextInternal; import brooklyn.management.internal.ManagementTransitionMode; -import brooklyn.mementos.BrooklynMemento; -import brooklyn.mementos.BrooklynMementoManifest; -import brooklyn.mementos.BrooklynMementoManifest.EntityMementoManifest; -import brooklyn.mementos.BrooklynMementoPersister; -import brooklyn.mementos.BrooklynMementoRawData; -import brooklyn.mementos.CatalogItemMemento; -import brooklyn.mementos.EnricherMemento; -import brooklyn.mementos.EntityMemento; -import brooklyn.mementos.FeedMemento; -import brooklyn.mementos.LocationMemento; -import brooklyn.mementos.Memento; -import brooklyn.mementos.PolicyMemento; -import brooklyn.mementos.TreeNode; import brooklyn.policy.basic.AbstractPolicy; import brooklyn.util.collections.MutableList; import brooklyn.util.collections.MutableMap; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/88b9219a/core/src/main/java/brooklyn/entity/rebind/RebindManagerImpl.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/brooklyn/entity/rebind/RebindManagerImpl.java b/core/src/main/java/brooklyn/entity/rebind/RebindManagerImpl.java index c94e8fa..78392e2 100644 --- a/core/src/main/java/brooklyn/entity/rebind/RebindManagerImpl.java +++ b/core/src/main/java/brooklyn/entity/rebind/RebindManagerImpl.java @@ -29,6 +29,9 @@ import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeoutException; import java.util.concurrent.atomic.AtomicInteger; +import org.apache.brooklyn.mementos.BrooklynMementoPersister; +import org.apache.brooklyn.mementos.BrooklynMementoRawData; +import org.apache.brooklyn.mementos.TreeNode; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -52,9 +55,6 @@ import brooklyn.management.ha.HighAvailabilityManagerImpl; import brooklyn.management.ha.ManagementNodeState; import brooklyn.management.ha.MementoCopyMode; import brooklyn.management.internal.ManagementContextInternal; -import brooklyn.mementos.BrooklynMementoPersister; -import brooklyn.mementos.BrooklynMementoRawData; -import brooklyn.mementos.TreeNode; import brooklyn.util.collections.MutableList; import brooklyn.util.collections.MutableMap; import brooklyn.util.collections.QuorumCheck; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/88b9219a/core/src/main/java/brooklyn/entity/rebind/dto/AbstractMemento.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/brooklyn/entity/rebind/dto/AbstractMemento.java b/core/src/main/java/brooklyn/entity/rebind/dto/AbstractMemento.java index db12e17..ee4d148 100644 --- a/core/src/main/java/brooklyn/entity/rebind/dto/AbstractMemento.java +++ b/core/src/main/java/brooklyn/entity/rebind/dto/AbstractMemento.java @@ -24,10 +24,11 @@ import java.util.List; import java.util.Map; import java.util.Set; +import org.apache.brooklyn.mementos.Memento; + import brooklyn.BrooklynVersion; import brooklyn.entity.basic.Entities; import brooklyn.entity.basic.Sanitizer; -import brooklyn.mementos.Memento; import com.google.common.base.Objects; import com.google.common.base.Objects.ToStringHelper; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/88b9219a/core/src/main/java/brooklyn/entity/rebind/dto/AbstractTreeNodeMemento.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/brooklyn/entity/rebind/dto/AbstractTreeNodeMemento.java b/core/src/main/java/brooklyn/entity/rebind/dto/AbstractTreeNodeMemento.java index bd64729..1316505 100644 --- a/core/src/main/java/brooklyn/entity/rebind/dto/AbstractTreeNodeMemento.java +++ b/core/src/main/java/brooklyn/entity/rebind/dto/AbstractTreeNodeMemento.java @@ -22,8 +22,8 @@ import java.io.Serializable; import java.util.List; import java.util.Map; -import brooklyn.mementos.Memento; -import brooklyn.mementos.TreeNode; +import org.apache.brooklyn.mementos.Memento; +import org.apache.brooklyn.mementos.TreeNode; import com.google.common.base.Objects.ToStringHelper; import com.google.common.collect.Lists; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/88b9219a/core/src/main/java/brooklyn/entity/rebind/dto/BasicCatalogItemMemento.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/brooklyn/entity/rebind/dto/BasicCatalogItemMemento.java b/core/src/main/java/brooklyn/entity/rebind/dto/BasicCatalogItemMemento.java index 5870820..b8d4a07 100644 --- a/core/src/main/java/brooklyn/entity/rebind/dto/BasicCatalogItemMemento.java +++ b/core/src/main/java/brooklyn/entity/rebind/dto/BasicCatalogItemMemento.java @@ -24,11 +24,11 @@ import java.util.Collections; import java.util.Map; import org.codehaus.jackson.annotate.JsonAutoDetect; - import org.apache.brooklyn.catalog.CatalogItem; +import org.apache.brooklyn.mementos.CatalogItemMemento; + import brooklyn.catalog.internal.BasicBrooklynCatalog; import brooklyn.catalog.internal.CatalogUtils; -import brooklyn.mementos.CatalogItemMemento; import com.google.common.base.Joiner; import com.google.common.base.Objects; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/88b9219a/core/src/main/java/brooklyn/entity/rebind/dto/BasicEnricherMemento.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/brooklyn/entity/rebind/dto/BasicEnricherMemento.java b/core/src/main/java/brooklyn/entity/rebind/dto/BasicEnricherMemento.java index 703a62c..0562661 100644 --- a/core/src/main/java/brooklyn/entity/rebind/dto/BasicEnricherMemento.java +++ b/core/src/main/java/brooklyn/entity/rebind/dto/BasicEnricherMemento.java @@ -21,9 +21,10 @@ package brooklyn.entity.rebind.dto; import java.io.Serializable; import java.util.Map; +import org.apache.brooklyn.mementos.EnricherMemento; + import brooklyn.entity.basic.Entities; import brooklyn.entity.basic.Sanitizer; -import brooklyn.mementos.EnricherMemento; import com.google.common.base.Objects.ToStringHelper; import com.google.common.collect.Maps; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/88b9219a/core/src/main/java/brooklyn/entity/rebind/dto/BasicEntityMemento.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/brooklyn/entity/rebind/dto/BasicEntityMemento.java b/core/src/main/java/brooklyn/entity/rebind/dto/BasicEntityMemento.java index 787c850..1914f9b 100644 --- a/core/src/main/java/brooklyn/entity/rebind/dto/BasicEntityMemento.java +++ b/core/src/main/java/brooklyn/entity/rebind/dto/BasicEntityMemento.java @@ -23,6 +23,8 @@ import java.util.Collections; import java.util.List; import java.util.Map; +import org.apache.brooklyn.mementos.EntityMemento; +import org.apache.brooklyn.mementos.TreeNode; import org.codehaus.jackson.annotate.JsonAutoDetect; import org.codehaus.jackson.annotate.JsonAutoDetect.Visibility; import org.slf4j.Logger; @@ -40,8 +42,6 @@ import brooklyn.entity.rebind.RebindSupport; import brooklyn.event.AttributeSensor; import brooklyn.event.Sensor; import brooklyn.event.basic.Sensors; -import brooklyn.mementos.EntityMemento; -import brooklyn.mementos.TreeNode; import com.google.common.base.Objects.ToStringHelper; import com.google.common.collect.Lists; @@ -52,7 +52,7 @@ import com.google.common.collect.Maps; * * @see AbstractEntity#getRebindSupport() * @see RebindSupport#getMemento() - * @see RebindSupport#reconstruct(brooklyn.entity.rebind.RebindContext, brooklyn.mementos.Memento) + * @see RebindSupport#reconstruct(brooklyn.entity.rebind.RebindContext, org.apache.brooklyn.mementos.Memento) * * @author aled */ http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/88b9219a/core/src/main/java/brooklyn/entity/rebind/dto/BasicFeedMemento.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/brooklyn/entity/rebind/dto/BasicFeedMemento.java b/core/src/main/java/brooklyn/entity/rebind/dto/BasicFeedMemento.java index a17a53e..ad17228 100644 --- a/core/src/main/java/brooklyn/entity/rebind/dto/BasicFeedMemento.java +++ b/core/src/main/java/brooklyn/entity/rebind/dto/BasicFeedMemento.java @@ -21,9 +21,10 @@ package brooklyn.entity.rebind.dto; import java.io.Serializable; import java.util.Map; +import org.apache.brooklyn.mementos.FeedMemento; + import brooklyn.entity.basic.Entities; import brooklyn.entity.basic.Sanitizer; -import brooklyn.mementos.FeedMemento; import com.google.common.base.Objects.ToStringHelper; import com.google.common.collect.Maps; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/88b9219a/core/src/main/java/brooklyn/entity/rebind/dto/BasicLocationMemento.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/brooklyn/entity/rebind/dto/BasicLocationMemento.java b/core/src/main/java/brooklyn/entity/rebind/dto/BasicLocationMemento.java index a584902..d2ae040 100644 --- a/core/src/main/java/brooklyn/entity/rebind/dto/BasicLocationMemento.java +++ b/core/src/main/java/brooklyn/entity/rebind/dto/BasicLocationMemento.java @@ -22,10 +22,11 @@ import java.io.Serializable; import java.util.Map; import java.util.Set; +import org.apache.brooklyn.mementos.LocationMemento; +import org.apache.brooklyn.mementos.TreeNode; + import brooklyn.entity.basic.Entities; import brooklyn.entity.basic.Sanitizer; -import brooklyn.mementos.LocationMemento; -import brooklyn.mementos.TreeNode; import brooklyn.util.config.ConfigBag; import com.google.common.base.Objects.ToStringHelper; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/88b9219a/core/src/main/java/brooklyn/entity/rebind/dto/BasicPolicyMemento.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/brooklyn/entity/rebind/dto/BasicPolicyMemento.java b/core/src/main/java/brooklyn/entity/rebind/dto/BasicPolicyMemento.java index ce520d2..6cf4c87 100644 --- a/core/src/main/java/brooklyn/entity/rebind/dto/BasicPolicyMemento.java +++ b/core/src/main/java/brooklyn/entity/rebind/dto/BasicPolicyMemento.java @@ -21,9 +21,10 @@ package brooklyn.entity.rebind.dto; import java.io.Serializable; import java.util.Map; +import org.apache.brooklyn.mementos.PolicyMemento; + import brooklyn.entity.basic.Entities; import brooklyn.entity.basic.Sanitizer; -import brooklyn.mementos.PolicyMemento; import com.google.common.base.Objects.ToStringHelper; import com.google.common.collect.Maps; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/88b9219a/core/src/main/java/brooklyn/entity/rebind/dto/BrooklynMementoImpl.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/brooklyn/entity/rebind/dto/BrooklynMementoImpl.java b/core/src/main/java/brooklyn/entity/rebind/dto/BrooklynMementoImpl.java index 68c755d..7b4206d 100644 --- a/core/src/main/java/brooklyn/entity/rebind/dto/BrooklynMementoImpl.java +++ b/core/src/main/java/brooklyn/entity/rebind/dto/BrooklynMementoImpl.java @@ -24,15 +24,16 @@ import java.util.Collections; import java.util.List; import java.util.Map; +import org.apache.brooklyn.mementos.BrooklynMemento; +import org.apache.brooklyn.mementos.CatalogItemMemento; +import org.apache.brooklyn.mementos.EnricherMemento; +import org.apache.brooklyn.mementos.EntityMemento; +import org.apache.brooklyn.mementos.FeedMemento; +import org.apache.brooklyn.mementos.LocationMemento; +import org.apache.brooklyn.mementos.Memento; +import org.apache.brooklyn.mementos.PolicyMemento; + import brooklyn.BrooklynVersion; -import brooklyn.mementos.BrooklynMemento; -import brooklyn.mementos.CatalogItemMemento; -import brooklyn.mementos.EnricherMemento; -import brooklyn.mementos.EntityMemento; -import brooklyn.mementos.FeedMemento; -import brooklyn.mementos.LocationMemento; -import brooklyn.mementos.Memento; -import brooklyn.mementos.PolicyMemento; import com.google.common.collect.ImmutableList; import com.google.common.collect.Lists; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/88b9219a/core/src/main/java/brooklyn/entity/rebind/dto/BrooklynMementoManifestImpl.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/brooklyn/entity/rebind/dto/BrooklynMementoManifestImpl.java b/core/src/main/java/brooklyn/entity/rebind/dto/BrooklynMementoManifestImpl.java index 4850309..0f83e21 100644 --- a/core/src/main/java/brooklyn/entity/rebind/dto/BrooklynMementoManifestImpl.java +++ b/core/src/main/java/brooklyn/entity/rebind/dto/BrooklynMementoManifestImpl.java @@ -23,9 +23,10 @@ import java.util.Collection; import java.util.Collections; import java.util.Map; +import org.apache.brooklyn.mementos.BrooklynMementoManifest; +import org.apache.brooklyn.mementos.CatalogItemMemento; + import brooklyn.entity.rebind.BrooklynObjectType; -import brooklyn.mementos.BrooklynMementoManifest; -import brooklyn.mementos.CatalogItemMemento; import com.google.common.collect.Maps; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/88b9219a/core/src/main/java/brooklyn/entity/rebind/dto/EntityMementoManifestImpl.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/brooklyn/entity/rebind/dto/EntityMementoManifestImpl.java b/core/src/main/java/brooklyn/entity/rebind/dto/EntityMementoManifestImpl.java index 05b1dd7..a211574 100644 --- a/core/src/main/java/brooklyn/entity/rebind/dto/EntityMementoManifestImpl.java +++ b/core/src/main/java/brooklyn/entity/rebind/dto/EntityMementoManifestImpl.java @@ -18,7 +18,7 @@ */ package brooklyn.entity.rebind.dto; -import brooklyn.mementos.BrooklynMementoManifest.EntityMementoManifest; +import org.apache.brooklyn.mementos.BrooklynMementoManifest.EntityMementoManifest; public class EntityMementoManifestImpl implements EntityMementoManifest { private String id; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/88b9219a/core/src/main/java/brooklyn/entity/rebind/dto/MementoValidators.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/brooklyn/entity/rebind/dto/MementoValidators.java b/core/src/main/java/brooklyn/entity/rebind/dto/MementoValidators.java index 7815f12..8fb8365 100644 --- a/core/src/main/java/brooklyn/entity/rebind/dto/MementoValidators.java +++ b/core/src/main/java/brooklyn/entity/rebind/dto/MementoValidators.java @@ -21,9 +21,9 @@ package brooklyn.entity.rebind.dto; import java.util.Collection; import java.util.Map; -import brooklyn.mementos.BrooklynMemento; -import brooklyn.mementos.EntityMemento; -import brooklyn.mementos.TreeNode; +import org.apache.brooklyn.mementos.BrooklynMemento; +import org.apache.brooklyn.mementos.EntityMemento; +import org.apache.brooklyn.mementos.TreeNode; public class MementoValidators { http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/88b9219a/core/src/main/java/brooklyn/entity/rebind/dto/MementosGenerators.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/brooklyn/entity/rebind/dto/MementosGenerators.java b/core/src/main/java/brooklyn/entity/rebind/dto/MementosGenerators.java index 05a346d..288773f 100644 --- a/core/src/main/java/brooklyn/entity/rebind/dto/MementosGenerators.java +++ b/core/src/main/java/brooklyn/entity/rebind/dto/MementosGenerators.java @@ -29,6 +29,14 @@ import brooklyn.basic.BrooklynObject; import brooklyn.basic.BrooklynTypes; import org.apache.brooklyn.catalog.CatalogItem; +import org.apache.brooklyn.mementos.BrooklynMemento; +import org.apache.brooklyn.mementos.CatalogItemMemento; +import org.apache.brooklyn.mementos.EnricherMemento; +import org.apache.brooklyn.mementos.EntityMemento; +import org.apache.brooklyn.mementos.FeedMemento; +import org.apache.brooklyn.mementos.LocationMemento; +import org.apache.brooklyn.mementos.Memento; +import org.apache.brooklyn.mementos.PolicyMemento; import org.apache.brooklyn.policy.Enricher; import org.apache.brooklyn.policy.EntityAdjunct; import org.apache.brooklyn.policy.Policy; @@ -52,14 +60,6 @@ import brooklyn.location.Location; import brooklyn.location.basic.LocationInternal; import brooklyn.management.ManagementContext; import brooklyn.management.Task; -import brooklyn.mementos.BrooklynMemento; -import brooklyn.mementos.CatalogItemMemento; -import brooklyn.mementos.EnricherMemento; -import brooklyn.mementos.EntityMemento; -import brooklyn.mementos.FeedMemento; -import brooklyn.mementos.LocationMemento; -import brooklyn.mementos.Memento; -import brooklyn.mementos.PolicyMemento; import brooklyn.policy.basic.AbstractPolicy; import brooklyn.util.collections.MutableMap; import brooklyn.util.config.ConfigBag; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/88b9219a/core/src/main/java/brooklyn/entity/rebind/dto/MutableBrooklynMemento.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/brooklyn/entity/rebind/dto/MutableBrooklynMemento.java b/core/src/main/java/brooklyn/entity/rebind/dto/MutableBrooklynMemento.java index cb205c7..890c9f0 100644 --- a/core/src/main/java/brooklyn/entity/rebind/dto/MutableBrooklynMemento.java +++ b/core/src/main/java/brooklyn/entity/rebind/dto/MutableBrooklynMemento.java @@ -24,17 +24,16 @@ import java.util.Collection; import java.util.Collections; import java.util.Map; +import org.apache.brooklyn.mementos.BrooklynMemento; +import org.apache.brooklyn.mementos.CatalogItemMemento; +import org.apache.brooklyn.mementos.EnricherMemento; +import org.apache.brooklyn.mementos.EntityMemento; +import org.apache.brooklyn.mementos.FeedMemento; +import org.apache.brooklyn.mementos.LocationMemento; +import org.apache.brooklyn.mementos.PolicyMemento; import org.codehaus.jackson.annotate.JsonAutoDetect; import org.codehaus.jackson.annotate.JsonAutoDetect.Visibility; -import brooklyn.mementos.BrooklynMemento; -import brooklyn.mementos.CatalogItemMemento; -import brooklyn.mementos.EnricherMemento; -import brooklyn.mementos.EntityMemento; -import brooklyn.mementos.FeedMemento; -import brooklyn.mementos.LocationMemento; -import brooklyn.mementos.PolicyMemento; - import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; import com.google.common.collect.ImmutableSet; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/88b9219a/core/src/main/java/brooklyn/entity/rebind/persister/BrooklynMementoPersisterToObjectStore.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/brooklyn/entity/rebind/persister/BrooklynMementoPersisterToObjectStore.java b/core/src/main/java/brooklyn/entity/rebind/persister/BrooklynMementoPersisterToObjectStore.java index 491f1d3..74690cb 100644 --- a/core/src/main/java/brooklyn/entity/rebind/persister/BrooklynMementoPersisterToObjectStore.java +++ b/core/src/main/java/brooklyn/entity/rebind/persister/BrooklynMementoPersisterToObjectStore.java @@ -39,7 +39,15 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; import brooklyn.basic.BrooklynObject; + import org.apache.brooklyn.catalog.CatalogItem; +import org.apache.brooklyn.mementos.BrooklynMemento; +import org.apache.brooklyn.mementos.BrooklynMementoManifest; +import org.apache.brooklyn.mementos.BrooklynMementoPersister; +import org.apache.brooklyn.mementos.BrooklynMementoRawData; +import org.apache.brooklyn.mementos.CatalogItemMemento; +import org.apache.brooklyn.mementos.Memento; + import brooklyn.catalog.internal.CatalogUtils; import brooklyn.config.ConfigKey; import brooklyn.config.StringConfigMap; @@ -54,12 +62,6 @@ import brooklyn.entity.rebind.dto.BrooklynMementoManifestImpl; import brooklyn.entity.rebind.persister.PersistenceObjectStore.StoreObjectAccessor; import brooklyn.entity.rebind.persister.PersistenceObjectStore.StoreObjectAccessorWithLock; import brooklyn.management.classloading.ClassLoaderFromBrooklynClassLoadingContext; -import brooklyn.mementos.BrooklynMemento; -import brooklyn.mementos.BrooklynMementoManifest; -import brooklyn.mementos.BrooklynMementoPersister; -import brooklyn.mementos.BrooklynMementoRawData; -import brooklyn.mementos.CatalogItemMemento; -import brooklyn.mementos.Memento; import brooklyn.util.collections.MutableMap; import brooklyn.util.exceptions.CompoundRuntimeException; import brooklyn.util.exceptions.Exceptions; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/88b9219a/core/src/main/java/brooklyn/entity/rebind/persister/BrooklynPersistenceUtils.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/brooklyn/entity/rebind/persister/BrooklynPersistenceUtils.java b/core/src/main/java/brooklyn/entity/rebind/persister/BrooklynPersistenceUtils.java index 04a141b..781c521 100644 --- a/core/src/main/java/brooklyn/entity/rebind/persister/BrooklynPersistenceUtils.java +++ b/core/src/main/java/brooklyn/entity/rebind/persister/BrooklynPersistenceUtils.java @@ -27,6 +27,8 @@ import brooklyn.basic.BrooklynObject; import brooklyn.basic.BrooklynObjectInternal; import org.apache.brooklyn.catalog.CatalogItem; +import org.apache.brooklyn.mementos.BrooklynMementoRawData; +import org.apache.brooklyn.mementos.Memento; import org.apache.brooklyn.policy.Enricher; import org.apache.brooklyn.policy.Policy; @@ -52,8 +54,6 @@ import brooklyn.management.ha.ManagementPlaneSyncRecordPersisterToObjectStore; import brooklyn.management.ha.MementoCopyMode; import brooklyn.management.internal.LocalLocationManager; import brooklyn.management.internal.ManagementContextInternal; -import brooklyn.mementos.BrooklynMementoRawData; -import brooklyn.mementos.Memento; import brooklyn.util.ResourceUtils; import brooklyn.util.exceptions.Exceptions; import brooklyn.util.text.Strings; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/88b9219a/core/src/main/java/brooklyn/entity/rebind/persister/MementoSerializer.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/brooklyn/entity/rebind/persister/MementoSerializer.java b/core/src/main/java/brooklyn/entity/rebind/persister/MementoSerializer.java index 218e94e..39b1a83 100644 --- a/core/src/main/java/brooklyn/entity/rebind/persister/MementoSerializer.java +++ b/core/src/main/java/brooklyn/entity/rebind/persister/MementoSerializer.java @@ -18,9 +18,10 @@ */ package brooklyn.entity.rebind.persister; +import org.apache.brooklyn.mementos.BrooklynMemento; +import org.apache.brooklyn.mementos.BrooklynMementoPersister.LookupContext; + import brooklyn.management.ha.ManagementNodeSyncRecord; -import brooklyn.mementos.BrooklynMemento; -import brooklyn.mementos.BrooklynMementoPersister.LookupContext; /** Serializes the given object; it is often used with {@link BrooklynMemento} for persisting and restoring, * though it can be used for any object (and is also used for the {@link ManagementNodeSyncRecord} instances) */ http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/88b9219a/core/src/main/java/brooklyn/entity/rebind/persister/RetryingMementoSerializer.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/brooklyn/entity/rebind/persister/RetryingMementoSerializer.java b/core/src/main/java/brooklyn/entity/rebind/persister/RetryingMementoSerializer.java index 9bcf81c..6d2bee0 100644 --- a/core/src/main/java/brooklyn/entity/rebind/persister/RetryingMementoSerializer.java +++ b/core/src/main/java/brooklyn/entity/rebind/persister/RetryingMementoSerializer.java @@ -20,11 +20,10 @@ package brooklyn.entity.rebind.persister; import static com.google.common.base.Preconditions.checkNotNull; +import org.apache.brooklyn.mementos.BrooklynMementoPersister.LookupContext; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import brooklyn.mementos.BrooklynMementoPersister.LookupContext; - public class RetryingMementoSerializer<T> implements MementoSerializer<T> { private static final Logger LOG = LoggerFactory.getLogger(RetryingMementoSerializer.class); http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/88b9219a/core/src/main/java/brooklyn/entity/rebind/persister/XmlMementoSerializer.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/brooklyn/entity/rebind/persister/XmlMementoSerializer.java b/core/src/main/java/brooklyn/entity/rebind/persister/XmlMementoSerializer.java index d03fed5..fe8b87c 100644 --- a/core/src/main/java/brooklyn/entity/rebind/persister/XmlMementoSerializer.java +++ b/core/src/main/java/brooklyn/entity/rebind/persister/XmlMementoSerializer.java @@ -33,6 +33,7 @@ import org.slf4j.LoggerFactory; import brooklyn.basic.AbstractBrooklynObjectSpec; import org.apache.brooklyn.catalog.CatalogItem; +import org.apache.brooklyn.mementos.BrooklynMementoPersister.LookupContext; import org.apache.brooklyn.policy.Enricher; import org.apache.brooklyn.policy.Policy; @@ -62,7 +63,6 @@ import brooklyn.management.classloading.BrooklynClassLoadingContext; import brooklyn.management.classloading.BrooklynClassLoadingContextSequential; import brooklyn.management.classloading.ClassLoaderFromBrooklynClassLoadingContext; import brooklyn.management.classloading.JavaBrooklynClassLoadingContext; -import brooklyn.mementos.BrooklynMementoPersister.LookupContext; import brooklyn.util.exceptions.Exceptions; import brooklyn.util.text.Strings; import brooklyn.util.xstream.XmlSerializer; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/88b9219a/core/src/main/java/brooklyn/entity/rebind/transformer/BrooklynMementoTransformer.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/brooklyn/entity/rebind/transformer/BrooklynMementoTransformer.java b/core/src/main/java/brooklyn/entity/rebind/transformer/BrooklynMementoTransformer.java index 3e3638b..a48e1dd 100644 --- a/core/src/main/java/brooklyn/entity/rebind/transformer/BrooklynMementoTransformer.java +++ b/core/src/main/java/brooklyn/entity/rebind/transformer/BrooklynMementoTransformer.java @@ -18,7 +18,7 @@ */ package brooklyn.entity.rebind.transformer; -import brooklyn.mementos.BrooklynMemento; +import org.apache.brooklyn.mementos.BrooklynMemento; import com.google.common.annotations.Beta; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/88b9219a/core/src/main/java/brooklyn/entity/rebind/transformer/CompoundTransformer.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/brooklyn/entity/rebind/transformer/CompoundTransformer.java b/core/src/main/java/brooklyn/entity/rebind/transformer/CompoundTransformer.java index 550a80c..584b7c2 100644 --- a/core/src/main/java/brooklyn/entity/rebind/transformer/CompoundTransformer.java +++ b/core/src/main/java/brooklyn/entity/rebind/transformer/CompoundTransformer.java @@ -23,11 +23,12 @@ import static com.google.common.base.Preconditions.checkNotNull; import java.util.Collection; import java.util.Map; +import org.apache.brooklyn.mementos.BrooklynMementoRawData; + import brooklyn.entity.rebind.BrooklynObjectType; import brooklyn.entity.rebind.RebindExceptionHandler; import brooklyn.entity.rebind.persister.BrooklynMementoPersisterToObjectStore; import brooklyn.entity.rebind.transformer.impl.XsltTransformer; -import brooklyn.mementos.BrooklynMementoRawData; import brooklyn.util.ResourceUtils; import brooklyn.util.collections.MutableMap; import brooklyn.util.text.Strings; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/88b9219a/core/src/main/java/brooklyn/entity/rebind/transformer/impl/DeleteOrphanedLocationsTransformer.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/brooklyn/entity/rebind/transformer/impl/DeleteOrphanedLocationsTransformer.java b/core/src/main/java/brooklyn/entity/rebind/transformer/impl/DeleteOrphanedLocationsTransformer.java index 4d1c3b1..1c32307 100644 --- a/core/src/main/java/brooklyn/entity/rebind/transformer/impl/DeleteOrphanedLocationsTransformer.java +++ b/core/src/main/java/brooklyn/entity/rebind/transformer/impl/DeleteOrphanedLocationsTransformer.java @@ -22,11 +22,12 @@ import java.util.Collection; import java.util.List; import java.util.Set; +import org.apache.brooklyn.mementos.BrooklynMemento; +import org.apache.brooklyn.mementos.EntityMemento; +import org.apache.brooklyn.mementos.LocationMemento; + import brooklyn.entity.rebind.dto.BrooklynMementoImpl; import brooklyn.entity.rebind.transformer.BrooklynMementoTransformer; -import brooklyn.mementos.BrooklynMemento; -import brooklyn.mementos.EntityMemento; -import brooklyn.mementos.LocationMemento; import brooklyn.util.collections.MutableList; import brooklyn.util.collections.MutableMap; import brooklyn.util.collections.MutableSet; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/88b9219a/core/src/main/java/brooklyn/event/feed/AbstractFeed.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/brooklyn/event/feed/AbstractFeed.java b/core/src/main/java/brooklyn/event/feed/AbstractFeed.java index 58cab2a..bc8df5f 100644 --- a/core/src/main/java/brooklyn/event/feed/AbstractFeed.java +++ b/core/src/main/java/brooklyn/event/feed/AbstractFeed.java @@ -22,6 +22,7 @@ import static com.google.common.base.Preconditions.checkNotNull; import java.util.Collection; +import org.apache.brooklyn.mementos.FeedMemento; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -33,7 +34,6 @@ import brooklyn.entity.basic.EntityLocal; import brooklyn.entity.rebind.BasicFeedRebindSupport; import brooklyn.entity.rebind.RebindSupport; import brooklyn.internal.BrooklynFeatureEnablement; -import brooklyn.mementos.FeedMemento; import brooklyn.policy.basic.AbstractEntityAdjunct; import brooklyn.util.javalang.JavaClassNames; import brooklyn.util.text.Strings; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/88b9219a/core/src/main/java/brooklyn/location/access/PortForwardManagerImpl.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/brooklyn/location/access/PortForwardManagerImpl.java b/core/src/main/java/brooklyn/location/access/PortForwardManagerImpl.java index 6a290f7..5e87653 100644 --- a/core/src/main/java/brooklyn/location/access/PortForwardManagerImpl.java +++ b/core/src/main/java/brooklyn/location/access/PortForwardManagerImpl.java @@ -29,6 +29,7 @@ import java.util.Map; import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.atomic.AtomicInteger; +import org.apache.brooklyn.mementos.LocationMemento; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -37,7 +38,6 @@ import brooklyn.entity.rebind.RebindContext; import brooklyn.entity.rebind.RebindSupport; import brooklyn.location.Location; import brooklyn.location.basic.AbstractLocation; -import brooklyn.mementos.LocationMemento; import brooklyn.util.collections.MutableMap; import brooklyn.util.exceptions.Exceptions; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/88b9219a/core/src/main/java/brooklyn/location/basic/AbstractLocation.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/brooklyn/location/basic/AbstractLocation.java b/core/src/main/java/brooklyn/location/basic/AbstractLocation.java index 3cd35fa..20c7338 100644 --- a/core/src/main/java/brooklyn/location/basic/AbstractLocation.java +++ b/core/src/main/java/brooklyn/location/basic/AbstractLocation.java @@ -29,6 +29,7 @@ import java.util.Map; import java.util.Set; import java.util.concurrent.atomic.AtomicBoolean; +import org.apache.brooklyn.mementos.LocationMemento; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -52,7 +53,6 @@ import brooklyn.location.geo.HostGeoInfo; import brooklyn.management.Task; import brooklyn.management.internal.LocalLocationManager; import brooklyn.management.internal.ManagementContextInternal; -import brooklyn.mementos.LocationMemento; import brooklyn.util.collections.SetFromLiveMap; import brooklyn.util.config.ConfigBag; import brooklyn.util.flags.FlagUtils; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/88b9219a/core/src/main/java/brooklyn/location/basic/LocationInternal.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/brooklyn/location/basic/LocationInternal.java b/core/src/main/java/brooklyn/location/basic/LocationInternal.java index 3d9bc5d..d8ad555 100644 --- a/core/src/main/java/brooklyn/location/basic/LocationInternal.java +++ b/core/src/main/java/brooklyn/location/basic/LocationInternal.java @@ -20,6 +20,8 @@ package brooklyn.location.basic; import java.util.Map; +import org.apache.brooklyn.mementos.LocationMemento; + import brooklyn.basic.BrooklynObjectInternal; import brooklyn.config.ConfigInheritance; import brooklyn.config.ConfigKey; @@ -27,7 +29,6 @@ import brooklyn.entity.basic.ConfigKeys; import brooklyn.entity.rebind.RebindSupport; import brooklyn.location.Location; import brooklyn.management.ManagementContext; -import brooklyn.mementos.LocationMemento; import brooklyn.util.config.ConfigBag; import com.google.common.annotations.Beta; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/88b9219a/core/src/main/java/brooklyn/management/internal/NonDeploymentManagementContext.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/brooklyn/management/internal/NonDeploymentManagementContext.java b/core/src/main/java/brooklyn/management/internal/NonDeploymentManagementContext.java index 5aaa3fc..e2478ea 100644 --- a/core/src/main/java/brooklyn/management/internal/NonDeploymentManagementContext.java +++ b/core/src/main/java/brooklyn/management/internal/NonDeploymentManagementContext.java @@ -33,7 +33,11 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; import brooklyn.basic.BrooklynObject; + import org.apache.brooklyn.catalog.BrooklynCatalog; +import org.apache.brooklyn.mementos.BrooklynMementoPersister; +import org.apache.brooklyn.mementos.BrooklynMementoRawData; + import brooklyn.catalog.internal.CatalogInitialization; import brooklyn.config.BrooklynProperties; import brooklyn.config.StringConfigMap; @@ -68,8 +72,6 @@ import brooklyn.management.ha.ManagementNodeState; import brooklyn.management.ha.ManagementPlaneSyncRecord; import brooklyn.management.ha.ManagementPlaneSyncRecordPersister; import brooklyn.management.ha.OsgiManager; -import brooklyn.mementos.BrooklynMementoPersister; -import brooklyn.mementos.BrooklynMementoRawData; import brooklyn.util.guava.Maybe; import brooklyn.util.time.Duration; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/88b9219a/core/src/main/java/brooklyn/policy/basic/AbstractPolicy.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/brooklyn/policy/basic/AbstractPolicy.java b/core/src/main/java/brooklyn/policy/basic/AbstractPolicy.java index decf0f5..46abdf9 100644 --- a/core/src/main/java/brooklyn/policy/basic/AbstractPolicy.java +++ b/core/src/main/java/brooklyn/policy/basic/AbstractPolicy.java @@ -22,6 +22,7 @@ import java.util.Collections; import java.util.Map; import java.util.concurrent.atomic.AtomicBoolean; +import org.apache.brooklyn.mementos.PolicyMemento; import org.apache.brooklyn.policy.Policy; import org.apache.brooklyn.policy.PolicyType; import org.slf4j.Logger; @@ -30,7 +31,6 @@ import org.slf4j.LoggerFactory; import brooklyn.entity.rebind.BasicPolicyRebindSupport; import brooklyn.entity.rebind.RebindSupport; import brooklyn.entity.trait.Configurable; -import brooklyn.mementos.PolicyMemento; import com.google.common.base.Objects; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/88b9219a/core/src/test/java/brooklyn/entity/rebind/RebindEntityTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/brooklyn/entity/rebind/RebindEntityTest.java b/core/src/test/java/brooklyn/entity/rebind/RebindEntityTest.java index 280d06f..1046c1b 100644 --- a/core/src/test/java/brooklyn/entity/rebind/RebindEntityTest.java +++ b/core/src/test/java/brooklyn/entity/rebind/RebindEntityTest.java @@ -35,6 +35,8 @@ import java.util.concurrent.CopyOnWriteArrayList; import java.util.concurrent.CountDownLatch; import java.util.concurrent.Semaphore; +import org.apache.brooklyn.mementos.BrooklynMementoManifest; +import org.apache.brooklyn.mementos.EntityMemento; import org.testng.Assert; import org.testng.annotations.Test; @@ -66,8 +68,6 @@ import brooklyn.location.LocationSpec; import brooklyn.location.basic.LocationConfigTest.MyLocation; import brooklyn.management.ha.ManagementNodeState; import brooklyn.management.internal.LocalManagementContext; -import brooklyn.mementos.BrooklynMementoManifest; -import brooklyn.mementos.EntityMemento; import brooklyn.test.Asserts; import brooklyn.test.entity.TestApplication; import brooklyn.test.entity.TestEntity; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/88b9219a/core/src/test/java/brooklyn/entity/rebind/RebindLocalhostLocationTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/brooklyn/entity/rebind/RebindLocalhostLocationTest.java b/core/src/test/java/brooklyn/entity/rebind/RebindLocalhostLocationTest.java index 00e88d7..6625ecd 100644 --- a/core/src/test/java/brooklyn/entity/rebind/RebindLocalhostLocationTest.java +++ b/core/src/test/java/brooklyn/entity/rebind/RebindLocalhostLocationTest.java @@ -22,6 +22,7 @@ import static org.testng.Assert.assertEquals; import java.util.Collections; +import org.apache.brooklyn.mementos.BrooklynMementoManifest; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.testng.Assert; @@ -31,7 +32,6 @@ import org.testng.annotations.Test; import brooklyn.location.LocationSpec; import brooklyn.location.basic.LocalhostMachineProvisioningLocation; import brooklyn.location.basic.SshMachineLocation; -import brooklyn.mementos.BrooklynMementoManifest; import brooklyn.test.entity.TestApplication; import com.google.common.collect.ImmutableList; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/88b9219a/core/src/test/java/brooklyn/entity/rebind/RebindLocationTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/brooklyn/entity/rebind/RebindLocationTest.java b/core/src/test/java/brooklyn/entity/rebind/RebindLocationTest.java index 7236768..b9d0573 100644 --- a/core/src/test/java/brooklyn/entity/rebind/RebindLocationTest.java +++ b/core/src/test/java/brooklyn/entity/rebind/RebindLocationTest.java @@ -27,6 +27,7 @@ import java.util.List; import java.util.Map; import java.util.concurrent.atomic.AtomicLong; +import org.apache.brooklyn.mementos.LocationMemento; import org.testng.Assert; import org.testng.annotations.BeforeMethod; import org.testng.annotations.Test; @@ -39,7 +40,6 @@ import brooklyn.entity.rebind.RebindEntityTest.MyEntity; import brooklyn.location.Location; import brooklyn.location.LocationSpec; import brooklyn.location.basic.AbstractLocation; -import brooklyn.mementos.LocationMemento; import brooklyn.test.Asserts; import brooklyn.test.entity.TestApplication; import brooklyn.util.collections.MutableMap; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/88b9219a/core/src/test/java/brooklyn/entity/rebind/RebindManagerSorterTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/brooklyn/entity/rebind/RebindManagerSorterTest.java b/core/src/test/java/brooklyn/entity/rebind/RebindManagerSorterTest.java index f986c7e..a670893 100644 --- a/core/src/test/java/brooklyn/entity/rebind/RebindManagerSorterTest.java +++ b/core/src/test/java/brooklyn/entity/rebind/RebindManagerSorterTest.java @@ -25,6 +25,8 @@ import java.util.List; import java.util.Map; import java.util.Set; +import org.apache.brooklyn.mementos.EntityMemento; +import org.apache.brooklyn.mementos.TreeNode; import org.testng.annotations.AfterMethod; import org.testng.annotations.BeforeMethod; import org.testng.annotations.Test; @@ -36,8 +38,6 @@ import brooklyn.entity.proxying.EntitySpec; import brooklyn.entity.rebind.dto.MementosGenerators; import brooklyn.entity.trait.Identifiable; import brooklyn.management.ManagementContext; -import brooklyn.mementos.EntityMemento; -import brooklyn.mementos.TreeNode; import brooklyn.test.entity.TestApplication; import brooklyn.test.entity.TestEntity; import brooklyn.util.collections.MutableSet; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/88b9219a/core/src/test/java/brooklyn/entity/rebind/RebindPolicyTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/brooklyn/entity/rebind/RebindPolicyTest.java b/core/src/test/java/brooklyn/entity/rebind/RebindPolicyTest.java index 7e1345f..68d69d4 100644 --- a/core/src/test/java/brooklyn/entity/rebind/RebindPolicyTest.java +++ b/core/src/test/java/brooklyn/entity/rebind/RebindPolicyTest.java @@ -25,6 +25,7 @@ import static org.testng.Assert.assertTrue; import java.util.Map; +import org.apache.brooklyn.mementos.BrooklynMementoManifest; import org.apache.brooklyn.policy.EnricherSpec; import org.apache.brooklyn.policy.Policy; import org.apache.brooklyn.policy.PolicySpec; @@ -41,7 +42,6 @@ import brooklyn.entity.proxying.EntitySpec; import brooklyn.entity.rebind.RebindEnricherTest.MyEnricher; import brooklyn.location.Location; import brooklyn.location.basic.Locations; -import brooklyn.mementos.BrooklynMementoManifest; import brooklyn.policy.basic.AbstractPolicy; import brooklyn.test.Asserts; import brooklyn.test.entity.TestApplication; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/88b9219a/core/src/test/java/brooklyn/entity/rebind/RebindTestFixture.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/brooklyn/entity/rebind/RebindTestFixture.java b/core/src/test/java/brooklyn/entity/rebind/RebindTestFixture.java index 68b4a7f..0045711 100644 --- a/core/src/test/java/brooklyn/entity/rebind/RebindTestFixture.java +++ b/core/src/test/java/brooklyn/entity/rebind/RebindTestFixture.java @@ -31,9 +31,10 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.testng.annotations.AfterMethod; import org.testng.annotations.BeforeMethod; - import org.apache.brooklyn.catalog.BrooklynCatalog; import org.apache.brooklyn.catalog.CatalogItem; +import org.apache.brooklyn.mementos.BrooklynMementoManifest; + import brooklyn.catalog.internal.CatalogUtils; import brooklyn.entity.Application; import brooklyn.entity.basic.Entities; @@ -48,7 +49,6 @@ import brooklyn.management.Task; import brooklyn.management.ha.HighAvailabilityMode; import brooklyn.management.internal.LocalManagementContext; import brooklyn.management.internal.ManagementContextInternal; -import brooklyn.mementos.BrooklynMementoManifest; import brooklyn.util.os.Os; import brooklyn.util.repeat.Repeater; import brooklyn.util.task.BasicExecutionManager; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/88b9219a/core/src/test/java/brooklyn/entity/rebind/RebindTestUtils.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/brooklyn/entity/rebind/RebindTestUtils.java b/core/src/test/java/brooklyn/entity/rebind/RebindTestUtils.java index ad0d407..778dbd7 100644 --- a/core/src/test/java/brooklyn/entity/rebind/RebindTestUtils.java +++ b/core/src/test/java/brooklyn/entity/rebind/RebindTestUtils.java @@ -27,6 +27,8 @@ import java.util.List; import java.util.Map; import java.util.concurrent.TimeoutException; +import org.apache.brooklyn.mementos.BrooklynMemento; +import org.apache.brooklyn.mementos.BrooklynMementoRawData; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -48,8 +50,6 @@ import brooklyn.management.ha.ManagementNodeState; import brooklyn.management.ha.ManagementPlaneSyncRecordPersisterToObjectStore; import brooklyn.management.internal.LocalManagementContext; import brooklyn.management.internal.ManagementContextInternal; -import brooklyn.mementos.BrooklynMemento; -import brooklyn.mementos.BrooklynMementoRawData; import brooklyn.test.entity.LocalManagementContextForTests; import brooklyn.util.io.FileUtil; import brooklyn.util.javalang.Serializers; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/88b9219a/core/src/test/java/brooklyn/entity/rebind/persister/BrooklynMementoPersisterTestFixture.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/brooklyn/entity/rebind/persister/BrooklynMementoPersisterTestFixture.java b/core/src/test/java/brooklyn/entity/rebind/persister/BrooklynMementoPersisterTestFixture.java index 25a218f..375b83c 100644 --- a/core/src/test/java/brooklyn/entity/rebind/persister/BrooklynMementoPersisterTestFixture.java +++ b/core/src/test/java/brooklyn/entity/rebind/persister/BrooklynMementoPersisterTestFixture.java @@ -23,6 +23,9 @@ import static org.testng.Assert.assertFalse; import static org.testng.Assert.assertNotNull; import static org.testng.Assert.assertTrue; +import org.apache.brooklyn.mementos.BrooklynMemento; +import org.apache.brooklyn.mementos.BrooklynMementoPersister; +import org.apache.brooklyn.mementos.BrooklynMementoRawData; import org.apache.brooklyn.policy.Enricher; import org.apache.brooklyn.policy.Policy; import org.testng.SkipException; @@ -45,9 +48,6 @@ import brooklyn.location.Location; import brooklyn.location.LocationSpec; import brooklyn.location.basic.SshMachineLocation; import brooklyn.management.ManagementContext; -import brooklyn.mementos.BrooklynMemento; -import brooklyn.mementos.BrooklynMementoPersister; -import brooklyn.mementos.BrooklynMementoRawData; import brooklyn.test.entity.TestApplication; import brooklyn.test.entity.TestEntity; import brooklyn.test.policy.TestPolicy; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/88b9219a/core/src/test/java/brooklyn/entity/rebind/persister/XmlMementoSerializerTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/brooklyn/entity/rebind/persister/XmlMementoSerializerTest.java b/core/src/test/java/brooklyn/entity/rebind/persister/XmlMementoSerializerTest.java index d3bafd9..2d3b09a 100644 --- a/core/src/test/java/brooklyn/entity/rebind/persister/XmlMementoSerializerTest.java +++ b/core/src/test/java/brooklyn/entity/rebind/persister/XmlMementoSerializerTest.java @@ -32,6 +32,7 @@ import java.util.Set; import brooklyn.management.osgi.OsgiTestResources; +import org.apache.brooklyn.mementos.BrooklynMementoPersister.LookupContext; import org.apache.brooklyn.policy.Enricher; import org.apache.brooklyn.policy.Policy; import org.apache.brooklyn.test.TestResourceUnavailableException; @@ -57,7 +58,6 @@ import brooklyn.location.Location; import brooklyn.location.LocationSpec; import brooklyn.management.ManagementContext; import brooklyn.management.osgi.OsgiVersionMoreEntityTest; -import brooklyn.mementos.BrooklynMementoPersister.LookupContext; import brooklyn.test.entity.LocalManagementContextForTests; import brooklyn.test.entity.TestApplication; import brooklyn.test.entity.TestEntity; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/88b9219a/core/src/test/java/brooklyn/entity/rebind/transformer/CompoundTransformerTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/brooklyn/entity/rebind/transformer/CompoundTransformerTest.java b/core/src/test/java/brooklyn/entity/rebind/transformer/CompoundTransformerTest.java index 50e31bf..f8069df 100644 --- a/core/src/test/java/brooklyn/entity/rebind/transformer/CompoundTransformerTest.java +++ b/core/src/test/java/brooklyn/entity/rebind/transformer/CompoundTransformerTest.java @@ -25,6 +25,7 @@ import java.io.File; import javax.annotation.Nullable; +import org.apache.brooklyn.mementos.BrooklynMementoRawData; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.testng.Assert; @@ -49,7 +50,6 @@ import brooklyn.event.basic.BasicConfigKey; import brooklyn.management.ManagementContext; import brooklyn.management.ha.HighAvailabilityMode; import brooklyn.management.internal.ManagementContextInternal; -import brooklyn.mementos.BrooklynMementoRawData; import brooklyn.test.entity.TestApplication; import brooklyn.util.guava.SerializablePredicate; import brooklyn.util.os.Os; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/88b9219a/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 af09b76..ebdebb7 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 @@ -71,7 +71,10 @@ import brooklyn.entity.rebind.persister.PersistMode; import brooklyn.entity.rebind.persister.PersistenceObjectStore; import brooklyn.entity.rebind.transformer.CompoundTransformer; import brooklyn.entity.trait.Startable; + import org.apache.brooklyn.launcher.config.StopWhichAppsOnShutdown; +import org.apache.brooklyn.mementos.BrooklynMementoRawData; + import brooklyn.location.Location; import brooklyn.location.LocationSpec; import brooklyn.location.PortRange; @@ -87,11 +90,12 @@ import brooklyn.management.ha.ManagementPlaneSyncRecordPersister; import brooklyn.management.ha.ManagementPlaneSyncRecordPersisterToObjectStore; import brooklyn.management.internal.LocalManagementContext; import brooklyn.management.internal.ManagementContextInternal; -import brooklyn.mementos.BrooklynMementoRawData; + import org.apache.brooklyn.rest.BrooklynWebConfig; import org.apache.brooklyn.rest.filter.BrooklynPropertiesSecurityFilter; import org.apache.brooklyn.rest.security.provider.BrooklynUserWithRandomPasswordSecurityProvider; import org.apache.brooklyn.rest.util.ShutdownHandler; + import brooklyn.util.exceptions.Exceptions; import brooklyn.util.exceptions.FatalConfigurationRuntimeException; import brooklyn.util.exceptions.FatalRuntimeException; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/88b9219a/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 b2aeaf9..0910e29 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 @@ -19,6 +19,8 @@ package org.apache.brooklyn.launcher; import org.apache.brooklyn.launcher.BrooklynLauncher; +import org.apache.brooklyn.mementos.BrooklynMementoRawData; + import static org.testng.Assert.assertEquals; import org.testng.annotations.BeforeMethod; @@ -32,7 +34,6 @@ import brooklyn.entity.rebind.persister.PersistMode; import brooklyn.entity.rebind.persister.jclouds.BlobStoreTest; import brooklyn.entity.rebind.persister.jclouds.JcloudsBlobStoreBasedObjectStore; import brooklyn.management.ManagementContext; -import brooklyn.mementos.BrooklynMementoRawData; import brooklyn.test.entity.LocalManagementContextForTests; import brooklyn.test.entity.TestApplication; import brooklyn.util.javalang.JavaClassNames;
