http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/458d1b17/api/src/main/java/org/apache/brooklyn/mementos/TreeNode.java ---------------------------------------------------------------------- diff --git a/api/src/main/java/org/apache/brooklyn/mementos/TreeNode.java b/api/src/main/java/org/apache/brooklyn/mementos/TreeNode.java deleted file mode 100644 index d150f03..0000000 --- a/api/src/main/java/org/apache/brooklyn/mementos/TreeNode.java +++ /dev/null @@ -1,48 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ -package org.apache.brooklyn.mementos; - -import java.util.List; - -/** - * A simple tree structure, where a node references a parent and children using their ids. - * - * e.g. could be used to represent the entity hierarchy within mementos, where the - * String is the id of parent/child entities. - * - * @author aled - */ -public interface TreeNode { - - /** - * The id of this node in the tree. This id will be used by the parent's getChildren(), - * and by each child's getParent(). - */ - String getId(); - - /** - * The id of the parent entity, or null if none. - */ - String getParent(); - - /** - * The ids of the children. - */ - List<String> getChildren(); -}
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/458d1b17/api/src/main/java/org/apache/brooklyn/policy/Enricher.java ---------------------------------------------------------------------- diff --git a/api/src/main/java/org/apache/brooklyn/policy/Enricher.java b/api/src/main/java/org/apache/brooklyn/policy/Enricher.java index 19d60e4..3b7608d 100644 --- a/api/src/main/java/org/apache/brooklyn/policy/Enricher.java +++ b/api/src/main/java/org/apache/brooklyn/policy/Enricher.java @@ -23,7 +23,7 @@ import java.util.Map; import org.apache.brooklyn.api.entity.rebind.RebindSupport; import org.apache.brooklyn.api.entity.rebind.Rebindable; import org.apache.brooklyn.api.entity.trait.Configurable; -import org.apache.brooklyn.mementos.EnricherMemento; +import org.apache.brooklyn.api.mementos.EnricherMemento; import brooklyn.config.ConfigKey; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/458d1b17/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 d062334..7bf6e9f 100644 --- a/api/src/main/java/org/apache/brooklyn/policy/Policy.java +++ b/api/src/main/java/org/apache/brooklyn/policy/Policy.java @@ -23,7 +23,7 @@ import java.util.Map; import org.apache.brooklyn.api.entity.rebind.RebindSupport; import org.apache.brooklyn.api.entity.rebind.Rebindable; import org.apache.brooklyn.api.entity.trait.Configurable; -import org.apache.brooklyn.mementos.PolicyMemento; +import org.apache.brooklyn.api.mementos.PolicyMemento; import brooklyn.config.ConfigKey; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/458d1b17/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 f68c975..6e9f963 100644 --- a/core/src/main/java/brooklyn/catalog/internal/CatalogItemDo.java +++ b/core/src/main/java/brooklyn/catalog/internal/CatalogItemDo.java @@ -28,7 +28,7 @@ import brooklyn.basic.BrooklynObjectInternal; import org.apache.brooklyn.api.catalog.CatalogItem; import org.apache.brooklyn.api.entity.rebind.RebindSupport; import org.apache.brooklyn.api.management.ManagementContext; -import org.apache.brooklyn.mementos.CatalogItemMemento; +import org.apache.brooklyn.api.mementos.CatalogItemMemento; import brooklyn.config.ConfigKey; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/458d1b17/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 a3ea1b1..b72f55f 100644 --- a/core/src/main/java/brooklyn/catalog/internal/CatalogItemDtoAbstract.java +++ b/core/src/main/java/brooklyn/catalog/internal/CatalogItemDtoAbstract.java @@ -33,7 +33,7 @@ import brooklyn.basic.AbstractBrooklynObject; import org.apache.brooklyn.api.catalog.CatalogItem; import org.apache.brooklyn.api.entity.rebind.RebindSupport; -import org.apache.brooklyn.mementos.CatalogItemMemento; +import org.apache.brooklyn.api.mementos.CatalogItemMemento; import brooklyn.config.ConfigKey; import brooklyn.entity.rebind.BasicCatalogItemRebindSupport; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/458d1b17/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 0ed4452..71e8391 100644 --- a/core/src/main/java/brooklyn/enricher/basic/AbstractEnricher.java +++ b/core/src/main/java/brooklyn/enricher/basic/AbstractEnricher.java @@ -26,7 +26,7 @@ import org.apache.brooklyn.api.entity.basic.EntityLocal; import org.apache.brooklyn.api.entity.rebind.RebindSupport; import org.apache.brooklyn.api.event.AttributeSensor; import org.apache.brooklyn.api.event.Sensor; -import org.apache.brooklyn.mementos.EnricherMemento; +import org.apache.brooklyn.api.mementos.EnricherMemento; import org.apache.brooklyn.policy.Enricher; import org.apache.brooklyn.policy.EnricherType; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/458d1b17/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 09d41c6..855bfbf 100644 --- a/core/src/main/java/brooklyn/entity/basic/AbstractEntity.java +++ b/core/src/main/java/brooklyn/entity/basic/AbstractEntity.java @@ -47,7 +47,7 @@ import org.apache.brooklyn.api.management.ManagementContext; import org.apache.brooklyn.api.management.SubscriptionContext; import org.apache.brooklyn.api.management.SubscriptionHandle; import org.apache.brooklyn.api.management.Task; -import org.apache.brooklyn.mementos.EntityMemento; +import org.apache.brooklyn.api.mementos.EntityMemento; import org.apache.brooklyn.policy.Enricher; import org.apache.brooklyn.policy.EnricherSpec; import org.apache.brooklyn.policy.EntityAdjunct; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/458d1b17/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 3a8b22b..a735750 100644 --- a/core/src/main/java/brooklyn/entity/basic/EntityInternal.java +++ b/core/src/main/java/brooklyn/entity/basic/EntityInternal.java @@ -31,7 +31,7 @@ import org.apache.brooklyn.api.location.Location; import org.apache.brooklyn.api.management.ExecutionContext; import org.apache.brooklyn.api.management.ManagementContext; import org.apache.brooklyn.api.management.SubscriptionContext; -import org.apache.brooklyn.mementos.EntityMemento; +import org.apache.brooklyn.api.mementos.EntityMemento; import brooklyn.basic.BrooklynObjectInternal; import brooklyn.config.ConfigKey; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/458d1b17/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 1f60c41..be97b32 100644 --- a/core/src/main/java/brooklyn/entity/basic/EntityTransientCopyInternal.java +++ b/core/src/main/java/brooklyn/entity/basic/EntityTransientCopyInternal.java @@ -34,7 +34,7 @@ import org.apache.brooklyn.api.event.AttributeSensor; import org.apache.brooklyn.api.location.Location; import org.apache.brooklyn.api.management.ExecutionContext; import org.apache.brooklyn.api.management.ManagementContext; -import org.apache.brooklyn.mementos.EntityMemento; +import org.apache.brooklyn.api.mementos.EntityMemento; import org.apache.brooklyn.policy.Enricher; import org.apache.brooklyn.policy.Policy; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/458d1b17/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 b03e22b..7f556a1 100644 --- a/core/src/main/java/brooklyn/entity/rebind/AbstractBrooklynObjectRebindSupport.java +++ b/core/src/main/java/brooklyn/entity/rebind/AbstractBrooklynObjectRebindSupport.java @@ -20,7 +20,7 @@ package brooklyn.entity.rebind; import org.apache.brooklyn.api.entity.rebind.RebindContext; import org.apache.brooklyn.api.entity.rebind.RebindSupport; -import org.apache.brooklyn.mementos.Memento; +import org.apache.brooklyn.api.mementos.Memento; import org.apache.brooklyn.policy.EntityAdjunct; import org.slf4j.Logger; import org.slf4j.LoggerFactory; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/458d1b17/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 c8d0d85..c1d2576 100644 --- a/core/src/main/java/brooklyn/entity/rebind/ActivePartialRebindIteration.java +++ b/core/src/main/java/brooklyn/entity/rebind/ActivePartialRebindIteration.java @@ -30,10 +30,10 @@ import org.apache.brooklyn.api.entity.Entity; import org.apache.brooklyn.api.entity.rebind.BrooklynObjectType; import org.apache.brooklyn.api.entity.rebind.RebindExceptionHandler; import org.apache.brooklyn.api.management.ha.ManagementNodeState; -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.apache.brooklyn.api.mementos.BrooklynMementoPersister; +import org.apache.brooklyn.api.mementos.BrooklynMementoRawData; +import org.apache.brooklyn.api.mementos.Memento; +import org.apache.brooklyn.api.mementos.BrooklynMementoRawData.Builder; import org.slf4j.Logger; import org.slf4j.LoggerFactory; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/458d1b17/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 d37e404..0d4d92c 100644 --- a/core/src/main/java/brooklyn/entity/rebind/BasicCatalogItemRebindSupport.java +++ b/core/src/main/java/brooklyn/entity/rebind/BasicCatalogItemRebindSupport.java @@ -19,7 +19,7 @@ package brooklyn.entity.rebind; import org.apache.brooklyn.api.entity.rebind.RebindContext; -import org.apache.brooklyn.mementos.CatalogItemMemento; +import org.apache.brooklyn.api.mementos.CatalogItemMemento; import org.slf4j.Logger; import org.slf4j.LoggerFactory; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/458d1b17/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 b5abe2f..d6b289f 100644 --- a/core/src/main/java/brooklyn/entity/rebind/BasicEnricherRebindSupport.java +++ b/core/src/main/java/brooklyn/entity/rebind/BasicEnricherRebindSupport.java @@ -19,7 +19,7 @@ package brooklyn.entity.rebind; import org.apache.brooklyn.api.entity.rebind.RebindContext; -import org.apache.brooklyn.mementos.EnricherMemento; +import org.apache.brooklyn.api.mementos.EnricherMemento; import brooklyn.enricher.basic.AbstractEnricher; import brooklyn.util.config.ConfigBag; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/458d1b17/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 4fd14d8..3a29595 100644 --- a/core/src/main/java/brooklyn/entity/rebind/BasicEntityRebindSupport.java +++ b/core/src/main/java/brooklyn/entity/rebind/BasicEntityRebindSupport.java @@ -30,7 +30,7 @@ import org.apache.brooklyn.api.entity.rebind.BrooklynObjectType; import org.apache.brooklyn.api.entity.rebind.RebindContext; import org.apache.brooklyn.api.event.AttributeSensor; import org.apache.brooklyn.api.location.Location; -import org.apache.brooklyn.mementos.EntityMemento; +import org.apache.brooklyn.api.mementos.EntityMemento; import org.slf4j.Logger; import org.slf4j.LoggerFactory; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/458d1b17/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 763a917..5507e6b 100644 --- a/core/src/main/java/brooklyn/entity/rebind/BasicFeedRebindSupport.java +++ b/core/src/main/java/brooklyn/entity/rebind/BasicFeedRebindSupport.java @@ -19,7 +19,7 @@ package brooklyn.entity.rebind; import org.apache.brooklyn.api.entity.rebind.RebindContext; -import org.apache.brooklyn.mementos.FeedMemento; +import org.apache.brooklyn.api.mementos.FeedMemento; import brooklyn.event.feed.AbstractFeed; import brooklyn.util.config.ConfigBag; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/458d1b17/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 75cf659..edf8867 100644 --- a/core/src/main/java/brooklyn/entity/rebind/BasicLocationRebindSupport.java +++ b/core/src/main/java/brooklyn/entity/rebind/BasicLocationRebindSupport.java @@ -25,7 +25,7 @@ import java.util.NoSuchElementException; import org.apache.brooklyn.api.entity.rebind.RebindContext; import org.apache.brooklyn.api.location.Location; -import org.apache.brooklyn.mementos.LocationMemento; +import org.apache.brooklyn.api.mementos.LocationMemento; import org.slf4j.Logger; import org.slf4j.LoggerFactory; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/458d1b17/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 ca9237e..9b22d65 100644 --- a/core/src/main/java/brooklyn/entity/rebind/BasicPolicyRebindSupport.java +++ b/core/src/main/java/brooklyn/entity/rebind/BasicPolicyRebindSupport.java @@ -19,7 +19,7 @@ package brooklyn.entity.rebind; import org.apache.brooklyn.api.entity.rebind.RebindContext; -import org.apache.brooklyn.mementos.PolicyMemento; +import org.apache.brooklyn.api.mementos.PolicyMemento; import brooklyn.policy.basic.AbstractPolicy; import brooklyn.util.config.ConfigBag; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/458d1b17/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 f830261..ad56dbf 100644 --- a/core/src/main/java/brooklyn/entity/rebind/ImmediateDeltaChangeListener.java +++ b/core/src/main/java/brooklyn/entity/rebind/ImmediateDeltaChangeListener.java @@ -29,13 +29,13 @@ import org.apache.brooklyn.api.entity.Entity; import org.apache.brooklyn.api.entity.rebind.ChangeListener; import org.apache.brooklyn.api.entity.rebind.PersistenceExceptionHandler; import org.apache.brooklyn.api.location.Location; -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.api.mementos.BrooklynMementoPersister; +import org.apache.brooklyn.api.mementos.CatalogItemMemento; +import org.apache.brooklyn.api.mementos.EnricherMemento; +import org.apache.brooklyn.api.mementos.EntityMemento; +import org.apache.brooklyn.api.mementos.LocationMemento; +import org.apache.brooklyn.api.mementos.Memento; +import org.apache.brooklyn.api.mementos.PolicyMemento; import org.apache.brooklyn.policy.Enricher; import org.apache.brooklyn.policy.Policy; import org.apache.brooklyn.location.basic.LocationInternal; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/458d1b17/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 33cc05b..f9e42b3 100644 --- a/core/src/main/java/brooklyn/entity/rebind/InitialFullRebindIteration.java +++ b/core/src/main/java/brooklyn/entity/rebind/InitialFullRebindIteration.java @@ -25,7 +25,7 @@ import java.util.concurrent.atomic.AtomicInteger; import org.apache.brooklyn.api.entity.Entity; import org.apache.brooklyn.api.entity.rebind.RebindExceptionHandler; import org.apache.brooklyn.api.management.ha.ManagementNodeState; -import org.apache.brooklyn.mementos.BrooklynMementoPersister; +import org.apache.brooklyn.api.mementos.BrooklynMementoPersister; import org.slf4j.Logger; import org.slf4j.LoggerFactory; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/458d1b17/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 0eb1993..681d0fc 100644 --- a/core/src/main/java/brooklyn/entity/rebind/PeriodicDeltaChangeListener.java +++ b/core/src/main/java/brooklyn/entity/rebind/PeriodicDeltaChangeListener.java @@ -42,7 +42,7 @@ import org.apache.brooklyn.api.entity.rebind.PersistenceExceptionHandler; import org.apache.brooklyn.api.location.Location; import org.apache.brooklyn.api.management.ExecutionContext; import org.apache.brooklyn.api.management.Task; -import org.apache.brooklyn.mementos.BrooklynMementoPersister; +import org.apache.brooklyn.api.mementos.BrooklynMementoPersister; import org.apache.brooklyn.policy.Enricher; import org.apache.brooklyn.policy.Policy; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/458d1b17/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 51e78f7..3fb0a75 100644 --- a/core/src/main/java/brooklyn/entity/rebind/PersistenceExceptionHandlerImpl.java +++ b/core/src/main/java/brooklyn/entity/rebind/PersistenceExceptionHandlerImpl.java @@ -24,7 +24,7 @@ import java.util.concurrent.atomic.AtomicBoolean; import org.apache.brooklyn.api.basic.BrooklynObject; import org.apache.brooklyn.api.entity.rebind.BrooklynObjectType; import org.apache.brooklyn.api.entity.rebind.PersistenceExceptionHandler; -import org.apache.brooklyn.mementos.Memento; +import org.apache.brooklyn.api.mementos.Memento; import org.slf4j.Logger; import org.slf4j.LoggerFactory; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/458d1b17/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 9e3371b..56dfc78 100644 --- a/core/src/main/java/brooklyn/entity/rebind/PersisterDeltaImpl.java +++ b/core/src/main/java/brooklyn/entity/rebind/PersisterDeltaImpl.java @@ -23,15 +23,15 @@ import java.util.Collections; import java.util.Set; import org.apache.brooklyn.api.entity.rebind.BrooklynObjectType; -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 org.apache.brooklyn.api.mementos.CatalogItemMemento; +import org.apache.brooklyn.api.mementos.EnricherMemento; +import org.apache.brooklyn.api.mementos.EntityMemento; +import org.apache.brooklyn.api.mementos.FeedMemento; +import org.apache.brooklyn.api.mementos.LocationMemento; +import org.apache.brooklyn.api.mementos.Memento; +import org.apache.brooklyn.api.mementos.PolicyMemento; +import org.apache.brooklyn.api.mementos.BrooklynMementoPersister.Delta; +import org.apache.brooklyn.api.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/458d1b17/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 745f030..3966bc1 100644 --- a/core/src/main/java/brooklyn/entity/rebind/RebindContextImpl.java +++ b/core/src/main/java/brooklyn/entity/rebind/RebindContextImpl.java @@ -31,7 +31,7 @@ import org.apache.brooklyn.api.entity.rebind.RebindContext; import org.apache.brooklyn.api.entity.rebind.RebindExceptionHandler; import org.apache.brooklyn.api.location.Location; import org.apache.brooklyn.api.management.ManagementContext; -import org.apache.brooklyn.mementos.BrooklynMementoPersister.LookupContext; +import org.apache.brooklyn.api.mementos.BrooklynMementoPersister.LookupContext; import org.apache.brooklyn.policy.Enricher; import org.apache.brooklyn.policy.Policy; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/458d1b17/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 8cd6e54..00e5a56 100644 --- a/core/src/main/java/brooklyn/entity/rebind/RebindContextLookupContext.java +++ b/core/src/main/java/brooklyn/entity/rebind/RebindContextLookupContext.java @@ -31,7 +31,7 @@ import org.apache.brooklyn.api.entity.rebind.RebindContext; import org.apache.brooklyn.api.entity.rebind.RebindExceptionHandler; import org.apache.brooklyn.api.location.Location; import org.apache.brooklyn.api.management.ManagementContext; -import org.apache.brooklyn.mementos.BrooklynMementoPersister.LookupContext; +import org.apache.brooklyn.api.mementos.BrooklynMementoPersister.LookupContext; import org.apache.brooklyn.policy.Enricher; import org.apache.brooklyn.policy.Policy; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/458d1b17/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 45f1457..defd7b3 100644 --- a/core/src/main/java/brooklyn/entity/rebind/RebindIteration.java +++ b/core/src/main/java/brooklyn/entity/rebind/RebindIteration.java @@ -49,19 +49,19 @@ import org.apache.brooklyn.api.entity.rebind.RebindSupport; import org.apache.brooklyn.api.location.Location; import org.apache.brooklyn.api.management.classloading.BrooklynClassLoadingContext; import org.apache.brooklyn.api.management.ha.ManagementNodeState; -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.api.mementos.BrooklynMemento; +import org.apache.brooklyn.api.mementos.BrooklynMementoManifest; +import org.apache.brooklyn.api.mementos.BrooklynMementoPersister; +import org.apache.brooklyn.api.mementos.BrooklynMementoRawData; +import org.apache.brooklyn.api.mementos.CatalogItemMemento; +import org.apache.brooklyn.api.mementos.EnricherMemento; +import org.apache.brooklyn.api.mementos.EntityMemento; +import org.apache.brooklyn.api.mementos.FeedMemento; +import org.apache.brooklyn.api.mementos.LocationMemento; +import org.apache.brooklyn.api.mementos.Memento; +import org.apache.brooklyn.api.mementos.PolicyMemento; +import org.apache.brooklyn.api.mementos.TreeNode; +import org.apache.brooklyn.api.mementos.BrooklynMementoManifest.EntityMementoManifest; import org.apache.brooklyn.policy.Enricher; import org.apache.brooklyn.policy.Policy; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/458d1b17/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 a7b31c7..25a396b 100644 --- a/core/src/main/java/brooklyn/entity/rebind/RebindManagerImpl.java +++ b/core/src/main/java/brooklyn/entity/rebind/RebindManagerImpl.java @@ -40,9 +40,9 @@ import org.apache.brooklyn.api.management.ExecutionContext; import org.apache.brooklyn.api.management.Task; import org.apache.brooklyn.api.management.ha.ManagementNodeState; import org.apache.brooklyn.api.management.ha.MementoCopyMode; -import org.apache.brooklyn.mementos.BrooklynMementoPersister; -import org.apache.brooklyn.mementos.BrooklynMementoRawData; -import org.apache.brooklyn.mementos.TreeNode; +import org.apache.brooklyn.api.mementos.BrooklynMementoPersister; +import org.apache.brooklyn.api.mementos.BrooklynMementoRawData; +import org.apache.brooklyn.api.mementos.TreeNode; import org.slf4j.Logger; import org.slf4j.LoggerFactory; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/458d1b17/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 ee4d148..02f6032 100644 --- a/core/src/main/java/brooklyn/entity/rebind/dto/AbstractMemento.java +++ b/core/src/main/java/brooklyn/entity/rebind/dto/AbstractMemento.java @@ -24,7 +24,7 @@ import java.util.List; import java.util.Map; import java.util.Set; -import org.apache.brooklyn.mementos.Memento; +import org.apache.brooklyn.api.mementos.Memento; import brooklyn.BrooklynVersion; import brooklyn.entity.basic.Entities; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/458d1b17/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 1316505..cd9841f 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 org.apache.brooklyn.mementos.Memento; -import org.apache.brooklyn.mementos.TreeNode; +import org.apache.brooklyn.api.mementos.Memento; +import org.apache.brooklyn.api.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/458d1b17/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 c976f93..b2a3068 100644 --- a/core/src/main/java/brooklyn/entity/rebind/dto/BasicCatalogItemMemento.java +++ b/core/src/main/java/brooklyn/entity/rebind/dto/BasicCatalogItemMemento.java @@ -25,7 +25,7 @@ import java.util.Map; import org.codehaus.jackson.annotate.JsonAutoDetect; import org.apache.brooklyn.api.catalog.CatalogItem; -import org.apache.brooklyn.mementos.CatalogItemMemento; +import org.apache.brooklyn.api.mementos.CatalogItemMemento; import brooklyn.catalog.internal.BasicBrooklynCatalog; import brooklyn.catalog.internal.CatalogUtils; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/458d1b17/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 0562661..34979e9 100644 --- a/core/src/main/java/brooklyn/entity/rebind/dto/BasicEnricherMemento.java +++ b/core/src/main/java/brooklyn/entity/rebind/dto/BasicEnricherMemento.java @@ -21,7 +21,7 @@ package brooklyn.entity.rebind.dto; import java.io.Serializable; import java.util.Map; -import org.apache.brooklyn.mementos.EnricherMemento; +import org.apache.brooklyn.api.mementos.EnricherMemento; import brooklyn.entity.basic.Entities; import brooklyn.entity.basic.Sanitizer; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/458d1b17/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 6416660..2e80444 100644 --- a/core/src/main/java/brooklyn/entity/rebind/dto/BasicEntityMemento.java +++ b/core/src/main/java/brooklyn/entity/rebind/dto/BasicEntityMemento.java @@ -28,8 +28,8 @@ import org.apache.brooklyn.api.entity.Entity; import org.apache.brooklyn.api.entity.rebind.RebindSupport; import org.apache.brooklyn.api.event.AttributeSensor; import org.apache.brooklyn.api.event.Sensor; -import org.apache.brooklyn.mementos.EntityMemento; -import org.apache.brooklyn.mementos.TreeNode; +import org.apache.brooklyn.api.mementos.EntityMemento; +import org.apache.brooklyn.api.mementos.TreeNode; import org.codehaus.jackson.annotate.JsonAutoDetect; import org.codehaus.jackson.annotate.JsonAutoDetect.Visibility; import org.slf4j.Logger; @@ -52,7 +52,7 @@ import com.google.common.collect.Maps; * * @see AbstractEntity#getRebindSupport() * @see RebindSupport#getMemento() - * @see RebindSupport#reconstruct(org.apache.brooklyn.api.entity.rebind.RebindContext, org.apache.brooklyn.mementos.Memento) + * @see RebindSupport#reconstruct(org.apache.brooklyn.api.entity.rebind.RebindContext, org.apache.brooklyn.api.mementos.Memento) * * @author aled */ http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/458d1b17/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 ad17228..034b0e9 100644 --- a/core/src/main/java/brooklyn/entity/rebind/dto/BasicFeedMemento.java +++ b/core/src/main/java/brooklyn/entity/rebind/dto/BasicFeedMemento.java @@ -21,7 +21,7 @@ package brooklyn.entity.rebind.dto; import java.io.Serializable; import java.util.Map; -import org.apache.brooklyn.mementos.FeedMemento; +import org.apache.brooklyn.api.mementos.FeedMemento; import brooklyn.entity.basic.Entities; import brooklyn.entity.basic.Sanitizer; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/458d1b17/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 d2ae040..a0578bb 100644 --- a/core/src/main/java/brooklyn/entity/rebind/dto/BasicLocationMemento.java +++ b/core/src/main/java/brooklyn/entity/rebind/dto/BasicLocationMemento.java @@ -22,8 +22,8 @@ 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 org.apache.brooklyn.api.mementos.LocationMemento; +import org.apache.brooklyn.api.mementos.TreeNode; import brooklyn.entity.basic.Entities; import brooklyn.entity.basic.Sanitizer; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/458d1b17/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 6cf4c87..8e2f010 100644 --- a/core/src/main/java/brooklyn/entity/rebind/dto/BasicPolicyMemento.java +++ b/core/src/main/java/brooklyn/entity/rebind/dto/BasicPolicyMemento.java @@ -21,7 +21,7 @@ package brooklyn.entity.rebind.dto; import java.io.Serializable; import java.util.Map; -import org.apache.brooklyn.mementos.PolicyMemento; +import org.apache.brooklyn.api.mementos.PolicyMemento; import brooklyn.entity.basic.Entities; import brooklyn.entity.basic.Sanitizer; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/458d1b17/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 7b4206d..b7a963b 100644 --- a/core/src/main/java/brooklyn/entity/rebind/dto/BrooklynMementoImpl.java +++ b/core/src/main/java/brooklyn/entity/rebind/dto/BrooklynMementoImpl.java @@ -24,14 +24,14 @@ 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 org.apache.brooklyn.api.mementos.BrooklynMemento; +import org.apache.brooklyn.api.mementos.CatalogItemMemento; +import org.apache.brooklyn.api.mementos.EnricherMemento; +import org.apache.brooklyn.api.mementos.EntityMemento; +import org.apache.brooklyn.api.mementos.FeedMemento; +import org.apache.brooklyn.api.mementos.LocationMemento; +import org.apache.brooklyn.api.mementos.Memento; +import org.apache.brooklyn.api.mementos.PolicyMemento; import brooklyn.BrooklynVersion; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/458d1b17/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 5ae5e87..61fcf89 100644 --- a/core/src/main/java/brooklyn/entity/rebind/dto/BrooklynMementoManifestImpl.java +++ b/core/src/main/java/brooklyn/entity/rebind/dto/BrooklynMementoManifestImpl.java @@ -24,8 +24,8 @@ import java.util.Collections; import java.util.Map; import org.apache.brooklyn.api.entity.rebind.BrooklynObjectType; -import org.apache.brooklyn.mementos.BrooklynMementoManifest; -import org.apache.brooklyn.mementos.CatalogItemMemento; +import org.apache.brooklyn.api.mementos.BrooklynMementoManifest; +import org.apache.brooklyn.api.mementos.CatalogItemMemento; import com.google.common.collect.Maps; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/458d1b17/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 a211574..8eedd2a 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 org.apache.brooklyn.mementos.BrooklynMementoManifest.EntityMementoManifest; +import org.apache.brooklyn.api.mementos.BrooklynMementoManifest.EntityMementoManifest; public class EntityMementoManifestImpl implements EntityMementoManifest { private String id; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/458d1b17/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 8fb8365..832808e 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 org.apache.brooklyn.mementos.BrooklynMemento; -import org.apache.brooklyn.mementos.EntityMemento; -import org.apache.brooklyn.mementos.TreeNode; +import org.apache.brooklyn.api.mementos.BrooklynMemento; +import org.apache.brooklyn.api.mementos.EntityMemento; +import org.apache.brooklyn.api.mementos.TreeNode; public class MementoValidators { http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/458d1b17/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 5a8d146..ff73567 100644 --- a/core/src/main/java/brooklyn/entity/rebind/dto/MementosGenerators.java +++ b/core/src/main/java/brooklyn/entity/rebind/dto/MementosGenerators.java @@ -38,14 +38,14 @@ import org.apache.brooklyn.api.event.AttributeSensor.SensorPersistenceMode; import org.apache.brooklyn.api.location.Location; import org.apache.brooklyn.api.management.ManagementContext; import org.apache.brooklyn.api.management.Task; -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.api.mementos.BrooklynMemento; +import org.apache.brooklyn.api.mementos.CatalogItemMemento; +import org.apache.brooklyn.api.mementos.EnricherMemento; +import org.apache.brooklyn.api.mementos.EntityMemento; +import org.apache.brooklyn.api.mementos.FeedMemento; +import org.apache.brooklyn.api.mementos.LocationMemento; +import org.apache.brooklyn.api.mementos.Memento; +import org.apache.brooklyn.api.mementos.PolicyMemento; import org.apache.brooklyn.policy.Enricher; import org.apache.brooklyn.policy.EntityAdjunct; import org.apache.brooklyn.policy.Policy; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/458d1b17/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 890c9f0..49c207d 100644 --- a/core/src/main/java/brooklyn/entity/rebind/dto/MutableBrooklynMemento.java +++ b/core/src/main/java/brooklyn/entity/rebind/dto/MutableBrooklynMemento.java @@ -24,13 +24,13 @@ 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.apache.brooklyn.api.mementos.BrooklynMemento; +import org.apache.brooklyn.api.mementos.CatalogItemMemento; +import org.apache.brooklyn.api.mementos.EnricherMemento; +import org.apache.brooklyn.api.mementos.EntityMemento; +import org.apache.brooklyn.api.mementos.FeedMemento; +import org.apache.brooklyn.api.mementos.LocationMemento; +import org.apache.brooklyn.api.mementos.PolicyMemento; import org.codehaus.jackson.annotate.JsonAutoDetect; import org.codehaus.jackson.annotate.JsonAutoDetect.Visibility; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/458d1b17/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 72039b6..9495988 100644 --- a/core/src/main/java/brooklyn/entity/rebind/persister/BrooklynMementoPersisterToObjectStore.java +++ b/core/src/main/java/brooklyn/entity/rebind/persister/BrooklynMementoPersisterToObjectStore.java @@ -42,12 +42,12 @@ import org.apache.brooklyn.api.catalog.CatalogItem; import org.apache.brooklyn.api.entity.rebind.BrooklynObjectType; import org.apache.brooklyn.api.entity.rebind.PersistenceExceptionHandler; import org.apache.brooklyn.api.entity.rebind.RebindExceptionHandler; -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 org.apache.brooklyn.api.mementos.BrooklynMemento; +import org.apache.brooklyn.api.mementos.BrooklynMementoManifest; +import org.apache.brooklyn.api.mementos.BrooklynMementoPersister; +import org.apache.brooklyn.api.mementos.BrooklynMementoRawData; +import org.apache.brooklyn.api.mementos.CatalogItemMemento; +import org.apache.brooklyn.api.mementos.Memento; import brooklyn.catalog.internal.CatalogUtils; import brooklyn.config.ConfigKey; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/458d1b17/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 a424a31..f490e9b 100644 --- a/core/src/main/java/brooklyn/entity/rebind/persister/BrooklynPersistenceUtils.java +++ b/core/src/main/java/brooklyn/entity/rebind/persister/BrooklynPersistenceUtils.java @@ -38,8 +38,8 @@ import org.apache.brooklyn.api.management.ha.HighAvailabilityMode; import org.apache.brooklyn.api.management.ha.ManagementNodeState; import org.apache.brooklyn.api.management.ha.ManagementPlaneSyncRecord; import org.apache.brooklyn.api.management.ha.MementoCopyMode; -import org.apache.brooklyn.mementos.BrooklynMementoRawData; -import org.apache.brooklyn.mementos.Memento; +import org.apache.brooklyn.api.mementos.BrooklynMementoRawData; +import org.apache.brooklyn.api.mementos.Memento; import org.apache.brooklyn.policy.Enricher; import org.apache.brooklyn.policy.Policy; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/458d1b17/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 45e0065..7d7f69f 100644 --- a/core/src/main/java/brooklyn/entity/rebind/persister/MementoSerializer.java +++ b/core/src/main/java/brooklyn/entity/rebind/persister/MementoSerializer.java @@ -19,8 +19,8 @@ package brooklyn.entity.rebind.persister; import org.apache.brooklyn.api.management.ha.ManagementNodeSyncRecord; -import org.apache.brooklyn.mementos.BrooklynMemento; -import org.apache.brooklyn.mementos.BrooklynMementoPersister.LookupContext; +import org.apache.brooklyn.api.mementos.BrooklynMemento; +import org.apache.brooklyn.api.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/458d1b17/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 6d2bee0..115f81f 100644 --- a/core/src/main/java/brooklyn/entity/rebind/persister/RetryingMementoSerializer.java +++ b/core/src/main/java/brooklyn/entity/rebind/persister/RetryingMementoSerializer.java @@ -20,7 +20,7 @@ package brooklyn.entity.rebind.persister; import static com.google.common.base.Preconditions.checkNotNull; -import org.apache.brooklyn.mementos.BrooklynMementoPersister.LookupContext; +import org.apache.brooklyn.api.mementos.BrooklynMementoPersister.LookupContext; import org.slf4j.Logger; import org.slf4j.LoggerFactory; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/458d1b17/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 fe7e26f..2c11a1a 100644 --- a/core/src/main/java/brooklyn/entity/rebind/persister/XmlMementoSerializer.java +++ b/core/src/main/java/brooklyn/entity/rebind/persister/XmlMementoSerializer.java @@ -39,7 +39,7 @@ import org.apache.brooklyn.api.location.Location; import org.apache.brooklyn.api.management.ManagementContext; import org.apache.brooklyn.api.management.Task; import org.apache.brooklyn.api.management.classloading.BrooklynClassLoadingContext; -import org.apache.brooklyn.mementos.BrooklynMementoPersister.LookupContext; +import org.apache.brooklyn.api.mementos.BrooklynMementoPersister.LookupContext; import org.apache.brooklyn.policy.Enricher; import org.apache.brooklyn.policy.Policy; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/458d1b17/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 a48e1dd..856c75a 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 org.apache.brooklyn.mementos.BrooklynMemento; +import org.apache.brooklyn.api.mementos.BrooklynMemento; import com.google.common.annotations.Beta; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/458d1b17/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 d7050fb..33d9422 100644 --- a/core/src/main/java/brooklyn/entity/rebind/transformer/CompoundTransformer.java +++ b/core/src/main/java/brooklyn/entity/rebind/transformer/CompoundTransformer.java @@ -25,7 +25,7 @@ import java.util.Map; import org.apache.brooklyn.api.entity.rebind.BrooklynObjectType; import org.apache.brooklyn.api.entity.rebind.RebindExceptionHandler; -import org.apache.brooklyn.mementos.BrooklynMementoRawData; +import org.apache.brooklyn.api.mementos.BrooklynMementoRawData; import brooklyn.entity.rebind.persister.BrooklynMementoPersisterToObjectStore; import brooklyn.entity.rebind.transformer.impl.XsltTransformer; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/458d1b17/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 1c32307..0a46af7 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,9 +22,9 @@ 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 org.apache.brooklyn.api.mementos.BrooklynMemento; +import org.apache.brooklyn.api.mementos.EntityMemento; +import org.apache.brooklyn.api.mementos.LocationMemento; import brooklyn.entity.rebind.dto.BrooklynMementoImpl; import brooklyn.entity.rebind.transformer.BrooklynMementoTransformer; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/458d1b17/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 a3ffb09..5f5229c 100644 --- a/core/src/main/java/brooklyn/event/feed/AbstractFeed.java +++ b/core/src/main/java/brooklyn/event/feed/AbstractFeed.java @@ -25,7 +25,7 @@ import java.util.Collection; import org.apache.brooklyn.api.entity.Feed; import org.apache.brooklyn.api.entity.basic.EntityLocal; import org.apache.brooklyn.api.entity.rebind.RebindSupport; -import org.apache.brooklyn.mementos.FeedMemento; +import org.apache.brooklyn.api.mementos.FeedMemento; import org.slf4j.Logger; import org.slf4j.LoggerFactory; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/458d1b17/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 67a9d1b..e8d2cfa 100644 --- a/core/src/main/java/brooklyn/management/internal/NonDeploymentManagementContext.java +++ b/core/src/main/java/brooklyn/management/internal/NonDeploymentManagementContext.java @@ -57,8 +57,8 @@ import org.apache.brooklyn.api.management.ha.HighAvailabilityMode; 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.mementos.BrooklynMementoPersister; -import org.apache.brooklyn.mementos.BrooklynMementoRawData; +import org.apache.brooklyn.api.mementos.BrooklynMementoPersister; +import org.apache.brooklyn.api.mementos.BrooklynMementoRawData; import brooklyn.catalog.internal.CatalogInitialization; import brooklyn.config.BrooklynProperties; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/458d1b17/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 8969727..a78274e 100644 --- a/core/src/main/java/brooklyn/policy/basic/AbstractPolicy.java +++ b/core/src/main/java/brooklyn/policy/basic/AbstractPolicy.java @@ -24,7 +24,7 @@ import java.util.concurrent.atomic.AtomicBoolean; import org.apache.brooklyn.api.entity.rebind.RebindSupport; import org.apache.brooklyn.api.entity.trait.Configurable; -import org.apache.brooklyn.mementos.PolicyMemento; +import org.apache.brooklyn.api.mementos.PolicyMemento; import org.apache.brooklyn.policy.Policy; import org.apache.brooklyn.policy.PolicyType; import org.slf4j.Logger; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/458d1b17/core/src/main/java/org/apache/brooklyn/location/access/PortForwardManagerImpl.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/brooklyn/location/access/PortForwardManagerImpl.java b/core/src/main/java/org/apache/brooklyn/location/access/PortForwardManagerImpl.java index af1a496..f1705c8 100644 --- a/core/src/main/java/org/apache/brooklyn/location/access/PortForwardManagerImpl.java +++ b/core/src/main/java/org/apache/brooklyn/location/access/PortForwardManagerImpl.java @@ -32,8 +32,8 @@ import java.util.concurrent.atomic.AtomicInteger; import org.apache.brooklyn.api.entity.rebind.RebindContext; import org.apache.brooklyn.api.entity.rebind.RebindSupport; import org.apache.brooklyn.api.location.Location; +import org.apache.brooklyn.api.mementos.LocationMemento; import org.apache.brooklyn.location.basic.AbstractLocation; -import org.apache.brooklyn.mementos.LocationMemento; import org.slf4j.Logger; import org.slf4j.LoggerFactory; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/458d1b17/core/src/main/java/org/apache/brooklyn/location/basic/AbstractLocation.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/brooklyn/location/basic/AbstractLocation.java b/core/src/main/java/org/apache/brooklyn/location/basic/AbstractLocation.java index 7280927..47dca3e 100644 --- a/core/src/main/java/org/apache/brooklyn/location/basic/AbstractLocation.java +++ b/core/src/main/java/org/apache/brooklyn/location/basic/AbstractLocation.java @@ -34,7 +34,7 @@ import org.apache.brooklyn.api.entity.trait.Configurable; import org.apache.brooklyn.api.location.Location; import org.apache.brooklyn.api.location.LocationSpec; import org.apache.brooklyn.api.management.Task; -import org.apache.brooklyn.mementos.LocationMemento; +import org.apache.brooklyn.api.mementos.LocationMemento; import org.slf4j.Logger; import org.slf4j.LoggerFactory; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/458d1b17/core/src/main/java/org/apache/brooklyn/location/basic/LocationInternal.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/brooklyn/location/basic/LocationInternal.java b/core/src/main/java/org/apache/brooklyn/location/basic/LocationInternal.java index d1ffcb9..de3e9a0 100644 --- a/core/src/main/java/org/apache/brooklyn/location/basic/LocationInternal.java +++ b/core/src/main/java/org/apache/brooklyn/location/basic/LocationInternal.java @@ -23,7 +23,7 @@ import java.util.Map; import org.apache.brooklyn.api.entity.rebind.RebindSupport; import org.apache.brooklyn.api.location.Location; import org.apache.brooklyn.api.management.ManagementContext; -import org.apache.brooklyn.mementos.LocationMemento; +import org.apache.brooklyn.api.mementos.LocationMemento; import brooklyn.basic.BrooklynObjectInternal; import brooklyn.config.ConfigInheritance; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/458d1b17/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 45c3721..75ba13e 100644 --- a/core/src/test/java/brooklyn/entity/rebind/RebindEntityTest.java +++ b/core/src/test/java/brooklyn/entity/rebind/RebindEntityTest.java @@ -50,8 +50,8 @@ import org.apache.brooklyn.api.event.AttributeSensor.SensorPersistenceMode; import org.apache.brooklyn.api.location.Location; import org.apache.brooklyn.api.location.LocationSpec; import org.apache.brooklyn.api.management.ha.ManagementNodeState; -import org.apache.brooklyn.mementos.BrooklynMementoManifest; -import org.apache.brooklyn.mementos.EntityMemento; +import org.apache.brooklyn.api.mementos.BrooklynMementoManifest; +import org.apache.brooklyn.api.mementos.EntityMemento; import org.apache.brooklyn.test.entity.TestApplication; import org.apache.brooklyn.test.entity.TestEntity; import org.apache.brooklyn.test.entity.TestEntityImpl; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/458d1b17/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 54b4b14..ab0ab26 100644 --- a/core/src/test/java/brooklyn/entity/rebind/RebindLocalhostLocationTest.java +++ b/core/src/test/java/brooklyn/entity/rebind/RebindLocalhostLocationTest.java @@ -22,7 +22,6 @@ import static org.testng.Assert.assertEquals; import java.util.Collections; -import org.apache.brooklyn.mementos.BrooklynMementoManifest; import org.apache.brooklyn.test.entity.TestApplication; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -30,6 +29,7 @@ import org.testng.Assert; import org.testng.annotations.BeforeMethod; import org.testng.annotations.Test; import org.apache.brooklyn.api.location.LocationSpec; +import org.apache.brooklyn.api.mementos.BrooklynMementoManifest; import org.apache.brooklyn.location.basic.LocalhostMachineProvisioningLocation; import org.apache.brooklyn.location.basic.SshMachineLocation; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/458d1b17/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 6df2b7f..8c93fc7 100644 --- a/core/src/test/java/brooklyn/entity/rebind/RebindLocationTest.java +++ b/core/src/test/java/brooklyn/entity/rebind/RebindLocationTest.java @@ -32,7 +32,7 @@ import org.apache.brooklyn.api.entity.rebind.RebindContext; import org.apache.brooklyn.api.entity.rebind.RebindSupport; import org.apache.brooklyn.api.location.Location; import org.apache.brooklyn.api.location.LocationSpec; -import org.apache.brooklyn.mementos.LocationMemento; +import org.apache.brooklyn.api.mementos.LocationMemento; import org.apache.brooklyn.test.entity.TestApplication; import org.testng.Assert; import org.testng.annotations.BeforeMethod; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/458d1b17/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 b6da363..6f620e5 100644 --- a/core/src/test/java/brooklyn/entity/rebind/RebindManagerSorterTest.java +++ b/core/src/test/java/brooklyn/entity/rebind/RebindManagerSorterTest.java @@ -29,8 +29,8 @@ import org.apache.brooklyn.api.entity.Entity; import org.apache.brooklyn.api.entity.proxying.EntitySpec; import org.apache.brooklyn.api.entity.trait.Identifiable; import org.apache.brooklyn.api.management.ManagementContext; -import org.apache.brooklyn.mementos.EntityMemento; -import org.apache.brooklyn.mementos.TreeNode; +import org.apache.brooklyn.api.mementos.EntityMemento; +import org.apache.brooklyn.api.mementos.TreeNode; import org.apache.brooklyn.test.entity.TestApplication; import org.apache.brooklyn.test.entity.TestEntity; import org.testng.annotations.AfterMethod; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/458d1b17/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 9dcdfc9..a93418c 100644 --- a/core/src/test/java/brooklyn/entity/rebind/RebindPolicyTest.java +++ b/core/src/test/java/brooklyn/entity/rebind/RebindPolicyTest.java @@ -29,7 +29,7 @@ import org.apache.brooklyn.api.entity.Group; import org.apache.brooklyn.api.entity.basic.EntityLocal; import org.apache.brooklyn.api.entity.proxying.EntitySpec; import org.apache.brooklyn.api.location.Location; -import org.apache.brooklyn.mementos.BrooklynMementoManifest; +import org.apache.brooklyn.api.mementos.BrooklynMementoManifest; import org.apache.brooklyn.policy.EnricherSpec; import org.apache.brooklyn.policy.Policy; import org.apache.brooklyn.policy.PolicySpec; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/458d1b17/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 98abee6..1522140 100644 --- a/core/src/test/java/brooklyn/entity/rebind/RebindTestFixture.java +++ b/core/src/test/java/brooklyn/entity/rebind/RebindTestFixture.java @@ -39,7 +39,7 @@ import org.apache.brooklyn.api.entity.rebind.RebindManager; import org.apache.brooklyn.api.management.ManagementContext; import org.apache.brooklyn.api.management.Task; import org.apache.brooklyn.api.management.ha.HighAvailabilityMode; -import org.apache.brooklyn.mementos.BrooklynMementoManifest; +import org.apache.brooklyn.api.mementos.BrooklynMementoManifest; import brooklyn.catalog.internal.CatalogUtils; import brooklyn.entity.basic.Entities; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/458d1b17/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 104ee7e..7541009 100644 --- a/core/src/test/java/brooklyn/entity/rebind/RebindTestUtils.java +++ b/core/src/test/java/brooklyn/entity/rebind/RebindTestUtils.java @@ -36,8 +36,8 @@ import org.apache.brooklyn.api.location.Location; import org.apache.brooklyn.api.management.ManagementContext; import org.apache.brooklyn.api.management.ha.HighAvailabilityMode; import org.apache.brooklyn.api.management.ha.ManagementNodeState; -import org.apache.brooklyn.mementos.BrooklynMemento; -import org.apache.brooklyn.mementos.BrooklynMementoRawData; +import org.apache.brooklyn.api.mementos.BrooklynMemento; +import org.apache.brooklyn.api.mementos.BrooklynMementoRawData; import org.apache.brooklyn.test.entity.LocalManagementContextForTests; import org.slf4j.Logger; import org.slf4j.LoggerFactory; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/458d1b17/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 3b63804..fcf496b 100644 --- a/core/src/test/java/brooklyn/entity/rebind/persister/BrooklynMementoPersisterTestFixture.java +++ b/core/src/test/java/brooklyn/entity/rebind/persister/BrooklynMementoPersisterTestFixture.java @@ -30,9 +30,9 @@ import org.apache.brooklyn.api.entity.rebind.RebindManager.RebindFailureMode; import org.apache.brooklyn.api.location.Location; import org.apache.brooklyn.api.location.LocationSpec; import org.apache.brooklyn.api.management.ManagementContext; -import org.apache.brooklyn.mementos.BrooklynMemento; -import org.apache.brooklyn.mementos.BrooklynMementoPersister; -import org.apache.brooklyn.mementos.BrooklynMementoRawData; +import org.apache.brooklyn.api.mementos.BrooklynMemento; +import org.apache.brooklyn.api.mementos.BrooklynMementoPersister; +import org.apache.brooklyn.api.mementos.BrooklynMementoRawData; import org.apache.brooklyn.policy.Enricher; import org.apache.brooklyn.policy.Policy; import org.apache.brooklyn.test.entity.TestApplication; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/458d1b17/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 54b97a1..9660f87 100644 --- a/core/src/test/java/brooklyn/entity/rebind/persister/XmlMementoSerializerTest.java +++ b/core/src/test/java/brooklyn/entity/rebind/persister/XmlMementoSerializerTest.java @@ -36,7 +36,6 @@ import org.apache.brooklyn.location.basic.SimulatedLocation; import org.apache.brooklyn.api.location.Location; import org.apache.brooklyn.api.location.LocationSpec; import org.apache.brooklyn.api.management.ManagementContext; -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; @@ -54,6 +53,7 @@ import org.apache.brooklyn.api.entity.Feed; import org.apache.brooklyn.api.entity.proxying.EntitySpec; import org.apache.brooklyn.api.entity.rebind.BrooklynObjectType; import org.apache.brooklyn.api.management.ManagementContext; +import org.apache.brooklyn.api.mementos.BrooklynMementoPersister.LookupContext; import brooklyn.catalog.internal.CatalogItemBuilder; import brooklyn.catalog.internal.CatalogItemDtoAbstract; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/458d1b17/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 29ad739..56896ca 100644 --- a/core/src/test/java/brooklyn/entity/rebind/transformer/CompoundTransformerTest.java +++ b/core/src/test/java/brooklyn/entity/rebind/transformer/CompoundTransformerTest.java @@ -32,7 +32,7 @@ import org.apache.brooklyn.api.entity.rebind.RebindExceptionHandler; import org.apache.brooklyn.api.entity.rebind.RebindManager.RebindFailureMode; import org.apache.brooklyn.api.management.ManagementContext; import org.apache.brooklyn.api.management.ha.HighAvailabilityMode; -import org.apache.brooklyn.mementos.BrooklynMementoRawData; +import org.apache.brooklyn.api.mementos.BrooklynMementoRawData; import org.apache.brooklyn.test.entity.TestApplication; import org.slf4j.Logger; import org.slf4j.LoggerFactory; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/458d1b17/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 a044735..b1efe6f 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 @@ -46,6 +46,7 @@ import org.apache.brooklyn.api.management.ha.HighAvailabilityMode; 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.brooklyn.BrooklynCampPlatformLauncherNoServer; import org.apache.brooklyn.camp.brooklyn.spi.creation.BrooklynAssemblyTemplateInstantiator; import org.slf4j.Logger; @@ -82,7 +83,6 @@ 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 org.apache.brooklyn.location.basic.LocalhostMachineProvisioningLocation.LocalhostMachine; import org.apache.brooklyn.location.basic.PortRanges; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/458d1b17/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 566014a..5142266 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 @@ -20,8 +20,8 @@ package org.apache.brooklyn.launcher; import org.apache.brooklyn.api.entity.proxying.EntitySpec; import org.apache.brooklyn.api.management.ManagementContext; +import org.apache.brooklyn.api.mementos.BrooklynMementoRawData; import org.apache.brooklyn.launcher.BrooklynLauncher; -import org.apache.brooklyn.mementos.BrooklynMementoRawData; import org.apache.brooklyn.test.entity.LocalManagementContextForTests; import org.apache.brooklyn.test.entity.TestApplication;
