http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a4c0e5fd/core/src/main/java/org/apache/brooklyn/core/util/xstream/XmlUtil.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/brooklyn/core/util/xstream/XmlUtil.java b/core/src/main/java/org/apache/brooklyn/core/util/xstream/XmlUtil.java new file mode 100644 index 0000000..637f078 --- /dev/null +++ b/core/src/main/java/org/apache/brooklyn/core/util/xstream/XmlUtil.java @@ -0,0 +1,59 @@ +/* + * 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.core.util.xstream; + +import java.io.ByteArrayInputStream; +import java.io.IOException; + +import javax.xml.parsers.DocumentBuilder; +import javax.xml.parsers.DocumentBuilderFactory; +import javax.xml.parsers.ParserConfigurationException; +import javax.xml.xpath.XPathExpression; +import javax.xml.xpath.XPathExpressionException; +import javax.xml.xpath.XPathFactory; + +import org.w3c.dom.Document; +import org.xml.sax.SAXException; + +import brooklyn.util.exceptions.Exceptions; + +public class XmlUtil { + + public static Object xpath(String xml, String xpath) { + // TODO Could share factory/doc in thread-local storage; see http://stackoverflow.com/questions/9828254/is-documentbuilderfactory-thread-safe-in-java-5 + try { + DocumentBuilderFactory factory = DocumentBuilderFactory.newInstance(); + DocumentBuilder builder = factory.newDocumentBuilder(); + Document doc = builder.parse(new ByteArrayInputStream(xml.getBytes())); + XPathFactory xPathfactory = XPathFactory.newInstance(); + XPathExpression expr = xPathfactory.newXPath().compile(xpath); + + return expr.evaluate(doc); + + } catch (ParserConfigurationException e) { + throw Exceptions.propagate(e); + } catch (SAXException e) { + throw Exceptions.propagate(e); + } catch (IOException e) { + throw Exceptions.propagate(e); + } catch (XPathExpressionException e) { + throw Exceptions.propagate(e); + } + } +}
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a4c0e5fd/core/src/main/java/org/apache/brooklyn/location/access/BrooklynAccessUtils.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/brooklyn/location/access/BrooklynAccessUtils.java b/core/src/main/java/org/apache/brooklyn/location/access/BrooklynAccessUtils.java index 9daf1c5..c3b6c61 100644 --- a/core/src/main/java/org/apache/brooklyn/location/access/BrooklynAccessUtils.java +++ b/core/src/main/java/org/apache/brooklyn/location/access/BrooklynAccessUtils.java @@ -23,6 +23,10 @@ import java.util.Collection; import org.apache.brooklyn.api.entity.Entity; import org.apache.brooklyn.api.location.Location; import org.apache.brooklyn.api.location.MachineLocation; +import org.apache.brooklyn.core.util.task.DynamicTasks; +import org.apache.brooklyn.core.util.task.Tasks; +import org.apache.brooklyn.core.util.task.ssh.SshTasks; +import org.apache.brooklyn.core.util.task.system.ProcessTaskWrapper; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -37,10 +41,6 @@ import org.apache.brooklyn.location.basic.SupportsPortForwarding; import brooklyn.util.exceptions.Exceptions; import brooklyn.util.guava.Maybe; import brooklyn.util.net.Cidr; -import brooklyn.util.task.DynamicTasks; -import brooklyn.util.task.Tasks; -import brooklyn.util.task.ssh.SshTasks; -import brooklyn.util.task.system.ProcessTaskWrapper; import brooklyn.util.text.Strings; import com.google.common.base.Supplier; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a4c0e5fd/core/src/main/java/org/apache/brooklyn/location/access/PortForwardManagerLocationResolver.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/brooklyn/location/access/PortForwardManagerLocationResolver.java b/core/src/main/java/org/apache/brooklyn/location/access/PortForwardManagerLocationResolver.java index db35a34..3e23f45 100644 --- a/core/src/main/java/org/apache/brooklyn/location/access/PortForwardManagerLocationResolver.java +++ b/core/src/main/java/org/apache/brooklyn/location/access/PortForwardManagerLocationResolver.java @@ -23,6 +23,7 @@ import java.util.Map; import org.apache.brooklyn.api.location.Location; import org.apache.brooklyn.api.location.LocationRegistry; import org.apache.brooklyn.api.location.LocationSpec; +import org.apache.brooklyn.core.util.config.ConfigBag; import org.apache.brooklyn.location.basic.LocationConfigUtils; import org.apache.brooklyn.location.basic.LocationInternal; import org.apache.brooklyn.location.basic.LocationPredicates; @@ -30,8 +31,6 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.apache.brooklyn.location.basic.AbstractLocationResolver; -import brooklyn.util.config.ConfigBag; - import com.google.common.base.Optional; import com.google.common.base.Predicates; import com.google.common.collect.Iterables; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a4c0e5fd/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 554a781..0a96956 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 @@ -38,6 +38,9 @@ import org.apache.brooklyn.api.mementos.LocationMemento; import org.apache.brooklyn.core.internal.BrooklynFeatureEnablement; import org.apache.brooklyn.core.management.internal.LocalLocationManager; import org.apache.brooklyn.core.management.internal.ManagementContextInternal; +import org.apache.brooklyn.core.util.config.ConfigBag; +import org.apache.brooklyn.core.util.flags.FlagUtils; +import org.apache.brooklyn.core.util.flags.TypeCoercions; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -56,9 +59,6 @@ import org.apache.brooklyn.location.geo.HasHostGeoInfo; import org.apache.brooklyn.location.geo.HostGeoInfo; import brooklyn.util.collections.SetFromLiveMap; -import brooklyn.util.config.ConfigBag; -import brooklyn.util.flags.FlagUtils; -import brooklyn.util.flags.TypeCoercions; import brooklyn.util.guava.Maybe; import brooklyn.util.stream.Streams; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a4c0e5fd/core/src/main/java/org/apache/brooklyn/location/basic/AbstractLocationResolver.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/brooklyn/location/basic/AbstractLocationResolver.java b/core/src/main/java/org/apache/brooklyn/location/basic/AbstractLocationResolver.java index 26f895c..aea65ae 100644 --- a/core/src/main/java/org/apache/brooklyn/location/basic/AbstractLocationResolver.java +++ b/core/src/main/java/org/apache/brooklyn/location/basic/AbstractLocationResolver.java @@ -31,12 +31,12 @@ import org.apache.brooklyn.api.location.LocationRegistry; import org.apache.brooklyn.api.location.LocationResolver; import org.apache.brooklyn.api.location.LocationSpec; import org.apache.brooklyn.api.management.ManagementContext; +import org.apache.brooklyn.core.util.config.ConfigBag; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.apache.brooklyn.location.basic.AbstractLocationResolver.SpecParser.ParsedSpec; import brooklyn.util.collections.MutableMap; -import brooklyn.util.config.ConfigBag; import brooklyn.util.text.KeyValueParser; import com.google.common.collect.ImmutableList; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a4c0e5fd/core/src/main/java/org/apache/brooklyn/location/basic/AggregatingMachineProvisioningLocation.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/brooklyn/location/basic/AggregatingMachineProvisioningLocation.java b/core/src/main/java/org/apache/brooklyn/location/basic/AggregatingMachineProvisioningLocation.java index c814209..ae1a534 100644 --- a/core/src/main/java/org/apache/brooklyn/location/basic/AggregatingMachineProvisioningLocation.java +++ b/core/src/main/java/org/apache/brooklyn/location/basic/AggregatingMachineProvisioningLocation.java @@ -29,8 +29,8 @@ import java.util.concurrent.atomic.AtomicInteger; import org.apache.brooklyn.api.location.MachineLocation; import org.apache.brooklyn.api.location.MachineProvisioningLocation; import org.apache.brooklyn.api.location.NoMachinesAvailableException; +import org.apache.brooklyn.core.util.flags.SetFromFlag; -import brooklyn.util.flags.SetFromFlag; import brooklyn.util.stream.Streams; import com.google.common.base.Objects; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a4c0e5fd/core/src/main/java/org/apache/brooklyn/location/basic/BasicLocationRegistry.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/brooklyn/location/basic/BasicLocationRegistry.java b/core/src/main/java/org/apache/brooklyn/location/basic/BasicLocationRegistry.java index 3cb9f14..4f8637e 100644 --- a/core/src/main/java/org/apache/brooklyn/location/basic/BasicLocationRegistry.java +++ b/core/src/main/java/org/apache/brooklyn/location/basic/BasicLocationRegistry.java @@ -42,12 +42,12 @@ import org.apache.brooklyn.api.location.LocationSpec; import org.apache.brooklyn.api.management.ManagementContext; import org.apache.brooklyn.core.catalog.CatalogPredicates; import org.apache.brooklyn.core.management.internal.LocalLocationManager; +import org.apache.brooklyn.core.util.config.ConfigBag; import brooklyn.config.ConfigMap; import brooklyn.config.ConfigPredicates; import brooklyn.config.ConfigUtils; import brooklyn.util.collections.MutableMap; -import brooklyn.util.config.ConfigBag; import brooklyn.util.exceptions.Exceptions; import brooklyn.util.guava.Maybe; import brooklyn.util.guava.Maybe.Absent; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a4c0e5fd/core/src/main/java/org/apache/brooklyn/location/basic/BasicMachineDetails.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/brooklyn/location/basic/BasicMachineDetails.java b/core/src/main/java/org/apache/brooklyn/location/basic/BasicMachineDetails.java index d6b51c6..9404af2 100644 --- a/core/src/main/java/org/apache/brooklyn/location/basic/BasicMachineDetails.java +++ b/core/src/main/java/org/apache/brooklyn/location/basic/BasicMachineDetails.java @@ -32,15 +32,15 @@ import org.apache.brooklyn.api.location.HardwareDetails; import org.apache.brooklyn.api.location.MachineDetails; import org.apache.brooklyn.api.location.OsDetails; import org.apache.brooklyn.api.management.Task; +import org.apache.brooklyn.core.util.ResourceUtils; +import org.apache.brooklyn.core.util.task.DynamicTasks; +import org.apache.brooklyn.core.util.task.TaskTags; +import org.apache.brooklyn.core.util.task.ssh.internal.PlainSshExecTaskFactory; +import org.apache.brooklyn.core.util.task.system.ProcessTaskWrapper; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import brooklyn.util.ResourceUtils; import brooklyn.util.stream.Streams; -import brooklyn.util.task.DynamicTasks; -import brooklyn.util.task.TaskTags; -import brooklyn.util.task.ssh.internal.PlainSshExecTaskFactory; -import brooklyn.util.task.system.ProcessTaskWrapper; import com.google.common.base.CharMatcher; import com.google.common.base.Function; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a4c0e5fd/core/src/main/java/org/apache/brooklyn/location/basic/ByonLocationResolver.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/brooklyn/location/basic/ByonLocationResolver.java b/core/src/main/java/org/apache/brooklyn/location/basic/ByonLocationResolver.java index 70735e5..c5680ba 100644 --- a/core/src/main/java/org/apache/brooklyn/location/basic/ByonLocationResolver.java +++ b/core/src/main/java/org/apache/brooklyn/location/basic/ByonLocationResolver.java @@ -29,6 +29,8 @@ import org.apache.brooklyn.api.location.LocationRegistry; import org.apache.brooklyn.api.location.LocationSpec; import org.apache.brooklyn.api.location.MachineLocation; import org.apache.brooklyn.core.management.internal.LocalLocationManager; +import org.apache.brooklyn.core.util.config.ConfigBag; +import org.apache.brooklyn.core.util.flags.TypeCoercions; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -42,8 +44,6 @@ import brooklyn.config.ConfigKey; import brooklyn.entity.basic.ConfigKeys; import brooklyn.entity.basic.Sanitizer; import brooklyn.util.collections.MutableMap; -import brooklyn.util.config.ConfigBag; -import brooklyn.util.flags.TypeCoercions; import brooklyn.util.net.UserAndHostAndPort; import brooklyn.util.text.WildcardGlobs; import brooklyn.util.text.WildcardGlobs.PhraseTreatment; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a4c0e5fd/core/src/main/java/org/apache/brooklyn/location/basic/FixedListMachineProvisioningLocation.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/brooklyn/location/basic/FixedListMachineProvisioningLocation.java b/core/src/main/java/org/apache/brooklyn/location/basic/FixedListMachineProvisioningLocation.java index 7b9d73e..170867d 100644 --- a/core/src/main/java/org/apache/brooklyn/location/basic/FixedListMachineProvisioningLocation.java +++ b/core/src/main/java/org/apache/brooklyn/location/basic/FixedListMachineProvisioningLocation.java @@ -35,6 +35,8 @@ import org.apache.brooklyn.api.location.MachineLocationCustomizer; import org.apache.brooklyn.api.location.MachineProvisioningLocation; import org.apache.brooklyn.api.location.NoMachinesAvailableException; import org.apache.brooklyn.api.management.LocationManager; +import org.apache.brooklyn.core.util.config.ConfigBag; +import org.apache.brooklyn.core.util.flags.SetFromFlag; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -56,8 +58,6 @@ import org.apache.brooklyn.location.cloud.CloudLocationConfig; import brooklyn.util.collections.CollectionFunctionals; import brooklyn.util.collections.MutableMap; import brooklyn.util.collections.MutableSet; -import brooklyn.util.config.ConfigBag; -import brooklyn.util.flags.SetFromFlag; import brooklyn.util.stream.Streams; import brooklyn.util.text.WildcardGlobs; import brooklyn.util.text.WildcardGlobs.PhraseTreatment; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a4c0e5fd/core/src/main/java/org/apache/brooklyn/location/basic/HostLocationResolver.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/brooklyn/location/basic/HostLocationResolver.java b/core/src/main/java/org/apache/brooklyn/location/basic/HostLocationResolver.java index 8eb983c..d1eb838 100644 --- a/core/src/main/java/org/apache/brooklyn/location/basic/HostLocationResolver.java +++ b/core/src/main/java/org/apache/brooklyn/location/basic/HostLocationResolver.java @@ -23,9 +23,9 @@ import java.util.Map; import org.apache.brooklyn.api.location.Location; import org.apache.brooklyn.api.location.LocationRegistry; import org.apache.brooklyn.api.location.LocationSpec; +import org.apache.brooklyn.core.util.config.ConfigBag; import org.apache.brooklyn.location.basic.AbstractLocationResolver.SpecParser.ParsedSpec; -import brooklyn.util.config.ConfigBag; import brooklyn.util.exceptions.Exceptions; import brooklyn.util.guava.Maybe; import brooklyn.util.guava.Maybe.Absent; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a4c0e5fd/core/src/main/java/org/apache/brooklyn/location/basic/LocalhostLocationResolver.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/brooklyn/location/basic/LocalhostLocationResolver.java b/core/src/main/java/org/apache/brooklyn/location/basic/LocalhostLocationResolver.java index 859fa99..9e06f58 100644 --- a/core/src/main/java/org/apache/brooklyn/location/basic/LocalhostLocationResolver.java +++ b/core/src/main/java/org/apache/brooklyn/location/basic/LocalhostLocationResolver.java @@ -23,8 +23,7 @@ import java.util.Map; import org.apache.brooklyn.api.location.Location; import org.apache.brooklyn.api.location.LocationRegistry; import org.apache.brooklyn.api.location.LocationResolver; - -import brooklyn.util.config.ConfigBag; +import org.apache.brooklyn.core.util.config.ConfigBag; /** * Examples of valid specs: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a4c0e5fd/core/src/main/java/org/apache/brooklyn/location/basic/LocalhostMachineProvisioningLocation.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/brooklyn/location/basic/LocalhostMachineProvisioningLocation.java b/core/src/main/java/org/apache/brooklyn/location/basic/LocalhostMachineProvisioningLocation.java index cfaf241..b87b85e 100644 --- a/core/src/main/java/org/apache/brooklyn/location/basic/LocalhostMachineProvisioningLocation.java +++ b/core/src/main/java/org/apache/brooklyn/location/basic/LocalhostMachineProvisioningLocation.java @@ -32,6 +32,11 @@ import org.apache.brooklyn.api.location.LocationSpec; import org.apache.brooklyn.api.location.MachineProvisioningLocation; import org.apache.brooklyn.api.location.OsDetails; import org.apache.brooklyn.api.location.PortRange; +import org.apache.brooklyn.core.util.BrooklynNetworkUtils; +import org.apache.brooklyn.core.util.flags.SetFromFlag; +import org.apache.brooklyn.core.util.internal.ssh.process.ProcessTool; +import org.apache.brooklyn.core.util.mutex.MutexSupport; +import org.apache.brooklyn.core.util.mutex.WithMutexes; import org.apache.brooklyn.location.geo.HostGeoInfo; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -43,12 +48,7 @@ import brooklyn.entity.basic.ConfigKeys; import brooklyn.entity.rebind.persister.FileBasedObjectStore; import brooklyn.entity.rebind.persister.LocationWithObjectStore; import brooklyn.entity.rebind.persister.PersistenceObjectStore; -import brooklyn.util.BrooklynNetworkUtils; import brooklyn.util.collections.MutableMap; -import brooklyn.util.flags.SetFromFlag; -import brooklyn.util.internal.ssh.process.ProcessTool; -import brooklyn.util.mutex.MutexSupport; -import brooklyn.util.mutex.WithMutexes; import brooklyn.util.net.Networking; import brooklyn.util.os.Os; import brooklyn.util.ssh.BashCommands; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a4c0e5fd/core/src/main/java/org/apache/brooklyn/location/basic/LocalhostPropertiesFromBrooklynProperties.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/brooklyn/location/basic/LocalhostPropertiesFromBrooklynProperties.java b/core/src/main/java/org/apache/brooklyn/location/basic/LocalhostPropertiesFromBrooklynProperties.java index 1830ddd..7a6c8a9 100644 --- a/core/src/main/java/org/apache/brooklyn/location/basic/LocalhostPropertiesFromBrooklynProperties.java +++ b/core/src/main/java/org/apache/brooklyn/location/basic/LocalhostPropertiesFromBrooklynProperties.java @@ -20,11 +20,10 @@ package org.apache.brooklyn.location.basic; import java.util.Map; +import org.apache.brooklyn.core.util.config.ConfigBag; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import brooklyn.util.config.ConfigBag; - import com.google.common.base.Strings; /** http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a4c0e5fd/core/src/main/java/org/apache/brooklyn/location/basic/LocationConfigUtils.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/brooklyn/location/basic/LocationConfigUtils.java b/core/src/main/java/org/apache/brooklyn/location/basic/LocationConfigUtils.java index d34a199..47784b1 100644 --- a/core/src/main/java/org/apache/brooklyn/location/basic/LocationConfigUtils.java +++ b/core/src/main/java/org/apache/brooklyn/location/basic/LocationConfigUtils.java @@ -32,6 +32,10 @@ import java.util.Set; import org.apache.brooklyn.api.management.ManagementContext; import org.apache.brooklyn.core.internal.BrooklynFeatureEnablement; +import org.apache.brooklyn.core.util.ResourceUtils; +import org.apache.brooklyn.core.util.config.ConfigBag; +import org.apache.brooklyn.core.util.crypto.SecureKeys; +import org.apache.brooklyn.core.util.crypto.SecureKeys.PassphraseProblem; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -40,13 +44,9 @@ import brooklyn.entity.basic.ConfigKeys; import org.apache.brooklyn.location.cloud.CloudLocationConfig; -import brooklyn.util.ResourceUtils; import brooklyn.util.collections.MutableMap; import brooklyn.util.collections.MutableSet; -import brooklyn.util.config.ConfigBag; import brooklyn.util.crypto.AuthorizedKeysParser; -import brooklyn.util.crypto.SecureKeys; -import brooklyn.util.crypto.SecureKeys.PassphraseProblem; import brooklyn.util.exceptions.Exceptions; import brooklyn.util.os.Os; import brooklyn.util.text.StringFunctions; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a4c0e5fd/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 de3e9a0..4a444c7 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 @@ -24,12 +24,12 @@ 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.api.mementos.LocationMemento; +import org.apache.brooklyn.core.util.config.ConfigBag; import brooklyn.basic.BrooklynObjectInternal; import brooklyn.config.ConfigInheritance; import brooklyn.config.ConfigKey; import brooklyn.entity.basic.ConfigKeys; -import brooklyn.util.config.ConfigBag; import com.google.common.annotations.Beta; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a4c0e5fd/core/src/main/java/org/apache/brooklyn/location/basic/LocationPropertiesFromBrooklynProperties.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/brooklyn/location/basic/LocationPropertiesFromBrooklynProperties.java b/core/src/main/java/org/apache/brooklyn/location/basic/LocationPropertiesFromBrooklynProperties.java index e1feb18..2655fc9 100644 --- a/core/src/main/java/org/apache/brooklyn/location/basic/LocationPropertiesFromBrooklynProperties.java +++ b/core/src/main/java/org/apache/brooklyn/location/basic/LocationPropertiesFromBrooklynProperties.java @@ -23,6 +23,8 @@ import static com.google.common.base.Preconditions.checkArgument; import java.io.File; import java.util.Map; +import org.apache.brooklyn.core.util.config.ConfigBag; +import org.apache.brooklyn.core.util.internal.ssh.SshTool; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -30,8 +32,6 @@ import brooklyn.config.BrooklynProperties; import brooklyn.config.BrooklynServerConfig; import brooklyn.config.ConfigUtils; import brooklyn.util.collections.MutableMap; -import brooklyn.util.config.ConfigBag; -import brooklyn.util.internal.ssh.SshTool; import brooklyn.util.os.Os; import com.google.common.base.Predicates; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a4c0e5fd/core/src/main/java/org/apache/brooklyn/location/basic/MultiLocation.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/brooklyn/location/basic/MultiLocation.java b/core/src/main/java/org/apache/brooklyn/location/basic/MultiLocation.java index b702a92..5740a8f 100644 --- a/core/src/main/java/org/apache/brooklyn/location/basic/MultiLocation.java +++ b/core/src/main/java/org/apache/brooklyn/location/basic/MultiLocation.java @@ -32,6 +32,7 @@ import org.apache.brooklyn.api.location.MachineLocation; import org.apache.brooklyn.api.location.MachineProvisioningLocation; import org.apache.brooklyn.api.location.NoMachinesAvailableException; import org.apache.brooklyn.api.management.ManagementContext; +import org.apache.brooklyn.core.util.flags.SetFromFlag; import org.apache.brooklyn.location.cloud.AbstractAvailabilityZoneExtension; import org.apache.brooklyn.location.cloud.AvailabilityZoneExtension; @@ -41,7 +42,6 @@ import brooklyn.util.collections.MutableList; import brooklyn.util.collections.MutableMap; import brooklyn.util.exceptions.CompoundRuntimeException; import brooklyn.util.exceptions.Exceptions; -import brooklyn.util.flags.SetFromFlag; import brooklyn.util.text.Strings; import com.google.common.base.Predicate; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a4c0e5fd/core/src/main/java/org/apache/brooklyn/location/basic/NamedLocationResolver.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/brooklyn/location/basic/NamedLocationResolver.java b/core/src/main/java/org/apache/brooklyn/location/basic/NamedLocationResolver.java index a9f6499..d57b681 100644 --- a/core/src/main/java/org/apache/brooklyn/location/basic/NamedLocationResolver.java +++ b/core/src/main/java/org/apache/brooklyn/location/basic/NamedLocationResolver.java @@ -28,10 +28,10 @@ import org.apache.brooklyn.api.location.LocationDefinition; import org.apache.brooklyn.api.location.LocationRegistry; import org.apache.brooklyn.api.location.LocationResolver; import org.apache.brooklyn.api.management.ManagementContext; +import org.apache.brooklyn.core.util.config.ConfigBag; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import brooklyn.util.config.ConfigBag; import brooklyn.util.text.Strings; /** http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a4c0e5fd/core/src/main/java/org/apache/brooklyn/location/basic/PortRanges.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/brooklyn/location/basic/PortRanges.java b/core/src/main/java/org/apache/brooklyn/location/basic/PortRanges.java index 2e1bdcc..92c3010 100644 --- a/core/src/main/java/org/apache/brooklyn/location/basic/PortRanges.java +++ b/core/src/main/java/org/apache/brooklyn/location/basic/PortRanges.java @@ -30,8 +30,7 @@ import java.util.NoSuchElementException; import java.util.concurrent.atomic.AtomicBoolean; import org.apache.brooklyn.api.location.PortRange; - -import brooklyn.util.flags.TypeCoercions; +import org.apache.brooklyn.core.util.flags.TypeCoercions; import com.google.common.base.Function; import com.google.common.base.Objects; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a4c0e5fd/core/src/main/java/org/apache/brooklyn/location/basic/SingleMachineLocationResolver.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/brooklyn/location/basic/SingleMachineLocationResolver.java b/core/src/main/java/org/apache/brooklyn/location/basic/SingleMachineLocationResolver.java index fb5f676..3db980e 100644 --- a/core/src/main/java/org/apache/brooklyn/location/basic/SingleMachineLocationResolver.java +++ b/core/src/main/java/org/apache/brooklyn/location/basic/SingleMachineLocationResolver.java @@ -23,8 +23,8 @@ import java.util.Map; import org.apache.brooklyn.api.location.Location; import org.apache.brooklyn.api.location.LocationRegistry; import org.apache.brooklyn.api.location.LocationSpec; +import org.apache.brooklyn.core.util.config.ConfigBag; -import brooklyn.util.config.ConfigBag; import brooklyn.util.exceptions.Exceptions; import brooklyn.util.guava.Maybe; import brooklyn.util.guava.Maybe.Absent; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a4c0e5fd/core/src/main/java/org/apache/brooklyn/location/basic/SingleMachineProvisioningLocation.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/brooklyn/location/basic/SingleMachineProvisioningLocation.java b/core/src/main/java/org/apache/brooklyn/location/basic/SingleMachineProvisioningLocation.java index 5f249d2..bac439f 100644 --- a/core/src/main/java/org/apache/brooklyn/location/basic/SingleMachineProvisioningLocation.java +++ b/core/src/main/java/org/apache/brooklyn/location/basic/SingleMachineProvisioningLocation.java @@ -23,11 +23,10 @@ import java.util.Map; import org.apache.brooklyn.api.location.MachineLocation; import org.apache.brooklyn.api.location.MachineProvisioningLocation; import org.apache.brooklyn.api.location.NoMachinesAvailableException; +import org.apache.brooklyn.core.util.flags.SetFromFlag; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import brooklyn.util.flags.SetFromFlag; - import com.google.common.collect.ImmutableMap; public class SingleMachineProvisioningLocation<T extends MachineLocation> extends FixedListMachineProvisioningLocation<T> { http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a4c0e5fd/core/src/main/java/org/apache/brooklyn/location/basic/SshMachineLocation.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/brooklyn/location/basic/SshMachineLocation.java b/core/src/main/java/org/apache/brooklyn/location/basic/SshMachineLocation.java index 0a8dd44..7c58194 100644 --- a/core/src/main/java/org/apache/brooklyn/location/basic/SshMachineLocation.java +++ b/core/src/main/java/org/apache/brooklyn/location/basic/SshMachineLocation.java @@ -51,6 +51,22 @@ import org.apache.brooklyn.api.location.OsDetails; import org.apache.brooklyn.api.location.PortRange; import org.apache.brooklyn.api.location.PortSupplier; import org.apache.brooklyn.api.management.Task; +import org.apache.brooklyn.core.util.ResourceUtils; +import org.apache.brooklyn.core.util.config.ConfigBag; +import org.apache.brooklyn.core.util.crypto.SecureKeys; +import org.apache.brooklyn.core.util.file.ArchiveUtils; +import org.apache.brooklyn.core.util.flags.SetFromFlag; +import org.apache.brooklyn.core.util.flags.TypeCoercions; +import org.apache.brooklyn.core.util.internal.ssh.ShellTool; +import org.apache.brooklyn.core.util.internal.ssh.SshException; +import org.apache.brooklyn.core.util.internal.ssh.SshTool; +import org.apache.brooklyn.core.util.internal.ssh.sshj.SshjTool; +import org.apache.brooklyn.core.util.mutex.MutexSupport; +import org.apache.brooklyn.core.util.mutex.WithMutexes; +import org.apache.brooklyn.core.util.task.ScheduledTask; +import org.apache.brooklyn.core.util.task.Tasks; +import org.apache.brooklyn.core.util.task.system.internal.ExecWithLoggingHelpers; +import org.apache.brooklyn.core.util.task.system.internal.ExecWithLoggingHelpers.ExecRunner; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -87,22 +103,10 @@ import brooklyn.event.basic.MapConfigKey; import org.apache.brooklyn.location.access.PortForwardManager; -import brooklyn.util.ResourceUtils; import brooklyn.util.collections.MutableMap; -import brooklyn.util.config.ConfigBag; -import brooklyn.util.crypto.SecureKeys; import brooklyn.util.exceptions.Exceptions; import brooklyn.util.exceptions.RuntimeInterruptedException; -import brooklyn.util.file.ArchiveUtils; -import brooklyn.util.flags.SetFromFlag; -import brooklyn.util.flags.TypeCoercions; import brooklyn.util.guava.KeyTransformingLoadingCache.KeyTransformingSameTypeLoadingCache; -import brooklyn.util.internal.ssh.ShellTool; -import brooklyn.util.internal.ssh.SshException; -import brooklyn.util.internal.ssh.SshTool; -import brooklyn.util.internal.ssh.sshj.SshjTool; -import brooklyn.util.mutex.MutexSupport; -import brooklyn.util.mutex.WithMutexes; import brooklyn.util.net.Urls; import brooklyn.util.pool.BasicPool; import brooklyn.util.pool.Pool; @@ -110,10 +114,6 @@ import brooklyn.util.ssh.BashCommands; import brooklyn.util.stream.KnownSizeInputStream; import brooklyn.util.stream.ReaderInputStream; import brooklyn.util.stream.StreamGobbler; -import brooklyn.util.task.ScheduledTask; -import brooklyn.util.task.Tasks; -import brooklyn.util.task.system.internal.ExecWithLoggingHelpers; -import brooklyn.util.task.system.internal.ExecWithLoggingHelpers.ExecRunner; import brooklyn.util.text.Strings; import brooklyn.util.time.Duration; import groovy.lang.Closure; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a4c0e5fd/core/src/main/java/org/apache/brooklyn/location/cloud/AbstractCloudMachineProvisioningLocation.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/brooklyn/location/cloud/AbstractCloudMachineProvisioningLocation.java b/core/src/main/java/org/apache/brooklyn/location/cloud/AbstractCloudMachineProvisioningLocation.java index 437d49b..4b297f8 100644 --- a/core/src/main/java/org/apache/brooklyn/location/cloud/AbstractCloudMachineProvisioningLocation.java +++ b/core/src/main/java/org/apache/brooklyn/location/cloud/AbstractCloudMachineProvisioningLocation.java @@ -24,11 +24,11 @@ import java.util.Map; import org.apache.brooklyn.api.location.LocationSpec; import org.apache.brooklyn.api.location.MachineLocation; import org.apache.brooklyn.api.location.MachineProvisioningLocation; +import org.apache.brooklyn.core.util.config.ConfigBag; +import org.apache.brooklyn.core.util.internal.ssh.SshTool; import org.apache.brooklyn.location.basic.AbstractLocation; import brooklyn.util.collections.MutableMap; -import brooklyn.util.config.ConfigBag; -import brooklyn.util.internal.ssh.SshTool; public abstract class AbstractCloudMachineProvisioningLocation extends AbstractLocation implements MachineProvisioningLocation<MachineLocation>, CloudLocationConfig http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a4c0e5fd/core/src/main/java/org/apache/brooklyn/location/cloud/CloudLocationConfig.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/brooklyn/location/cloud/CloudLocationConfig.java b/core/src/main/java/org/apache/brooklyn/location/cloud/CloudLocationConfig.java index a44ca49..ad6a11c 100644 --- a/core/src/main/java/org/apache/brooklyn/location/cloud/CloudLocationConfig.java +++ b/core/src/main/java/org/apache/brooklyn/location/cloud/CloudLocationConfig.java @@ -28,10 +28,9 @@ import brooklyn.entity.basic.ConfigKeys; import brooklyn.event.basic.BasicConfigKey; import org.apache.brooklyn.api.location.MachineLocationCustomizer; +import org.apache.brooklyn.core.util.flags.SetFromFlag; import org.apache.brooklyn.location.basic.LocationConfigKeys; -import brooklyn.util.flags.SetFromFlag; - public interface CloudLocationConfig { public static final ConfigKey<String> CLOUD_ENDPOINT = LocationConfigKeys.CLOUD_ENDPOINT; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a4c0e5fd/core/src/main/java/org/apache/brooklyn/location/cloud/names/AbstractCloudMachineNamer.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/brooklyn/location/cloud/names/AbstractCloudMachineNamer.java b/core/src/main/java/org/apache/brooklyn/location/cloud/names/AbstractCloudMachineNamer.java index b06b88a..2df845e 100644 --- a/core/src/main/java/org/apache/brooklyn/location/cloud/names/AbstractCloudMachineNamer.java +++ b/core/src/main/java/org/apache/brooklyn/location/cloud/names/AbstractCloudMachineNamer.java @@ -20,9 +20,9 @@ package org.apache.brooklyn.location.cloud.names; import org.apache.brooklyn.api.entity.Entity; import org.apache.brooklyn.api.entity.trait.HasShortName; - +import org.apache.brooklyn.core.util.config.ConfigBag; import org.apache.brooklyn.location.cloud.CloudLocationConfig; -import brooklyn.util.config.ConfigBag; + import brooklyn.util.text.Identifiers; import brooklyn.util.text.Strings; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a4c0e5fd/core/src/main/java/org/apache/brooklyn/location/cloud/names/BasicCloudMachineNamer.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/brooklyn/location/cloud/names/BasicCloudMachineNamer.java b/core/src/main/java/org/apache/brooklyn/location/cloud/names/BasicCloudMachineNamer.java index 818053d..26c41ee 100644 --- a/core/src/main/java/org/apache/brooklyn/location/cloud/names/BasicCloudMachineNamer.java +++ b/core/src/main/java/org/apache/brooklyn/location/cloud/names/BasicCloudMachineNamer.java @@ -20,9 +20,9 @@ package org.apache.brooklyn.location.cloud.names; import org.apache.brooklyn.api.entity.Application; import org.apache.brooklyn.api.entity.Entity; - +import org.apache.brooklyn.core.util.config.ConfigBag; import org.apache.brooklyn.location.cloud.CloudLocationConfig; -import brooklyn.util.config.ConfigBag; + import brooklyn.util.text.Identifiers; import brooklyn.util.text.StringShortener; import brooklyn.util.text.Strings; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a4c0e5fd/core/src/main/java/org/apache/brooklyn/location/cloud/names/CloudMachineNamer.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/brooklyn/location/cloud/names/CloudMachineNamer.java b/core/src/main/java/org/apache/brooklyn/location/cloud/names/CloudMachineNamer.java index df7fd8b..b475436 100644 --- a/core/src/main/java/org/apache/brooklyn/location/cloud/names/CloudMachineNamer.java +++ b/core/src/main/java/org/apache/brooklyn/location/cloud/names/CloudMachineNamer.java @@ -20,10 +20,9 @@ package org.apache.brooklyn.location.cloud.names; import org.apache.brooklyn.api.entity.Entity; import org.apache.brooklyn.api.location.Location; +import org.apache.brooklyn.core.util.config.ConfigBag; import org.apache.brooklyn.location.cloud.CloudLocationConfig; -import brooklyn.util.config.ConfigBag; - /** * Interface used to construct names for individual cloud machines and for groups of machines. * <p> http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a4c0e5fd/core/src/main/java/org/apache/brooklyn/location/cloud/names/CustomMachineNamer.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/brooklyn/location/cloud/names/CustomMachineNamer.java b/core/src/main/java/org/apache/brooklyn/location/cloud/names/CustomMachineNamer.java index 472adde..0bac6c8 100644 --- a/core/src/main/java/org/apache/brooklyn/location/cloud/names/CustomMachineNamer.java +++ b/core/src/main/java/org/apache/brooklyn/location/cloud/names/CustomMachineNamer.java @@ -21,14 +21,16 @@ package org.apache.brooklyn.location.cloud.names; import java.util.Map; import org.apache.brooklyn.api.entity.Entity; +import org.apache.brooklyn.core.util.config.ConfigBag; +import org.apache.brooklyn.core.util.text.TemplateProcessor; import brooklyn.config.ConfigKey; import brooklyn.entity.basic.ConfigKeys; import brooklyn.entity.basic.EntityInternal; + import org.apache.brooklyn.location.cloud.CloudLocationConfig; -import brooklyn.util.config.ConfigBag; + import brooklyn.util.text.Strings; -import brooklyn.util.text.TemplateProcessor; import com.google.common.collect.ImmutableMap; import com.google.common.reflect.TypeToken; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a4c0e5fd/core/src/main/java/org/apache/brooklyn/location/dynamic/DynamicLocation.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/brooklyn/location/dynamic/DynamicLocation.java b/core/src/main/java/org/apache/brooklyn/location/dynamic/DynamicLocation.java index 4c38b7e..5b6fd05 100644 --- a/core/src/main/java/org/apache/brooklyn/location/dynamic/DynamicLocation.java +++ b/core/src/main/java/org/apache/brooklyn/location/dynamic/DynamicLocation.java @@ -20,12 +20,12 @@ package org.apache.brooklyn.location.dynamic; import org.apache.brooklyn.api.entity.Entity; import org.apache.brooklyn.api.location.Location; +import org.apache.brooklyn.core.util.flags.SetFromFlag; import com.google.common.annotations.Beta; import brooklyn.config.ConfigKey; import brooklyn.entity.basic.ConfigKeys; -import brooklyn.util.flags.SetFromFlag; /** * A location that is created and owned by an entity at runtime. http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a4c0e5fd/core/src/main/java/org/apache/brooklyn/location/dynamic/LocationOwner.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/brooklyn/location/dynamic/LocationOwner.java b/core/src/main/java/org/apache/brooklyn/location/dynamic/LocationOwner.java index b061b69..84348cb 100644 --- a/core/src/main/java/org/apache/brooklyn/location/dynamic/LocationOwner.java +++ b/core/src/main/java/org/apache/brooklyn/location/dynamic/LocationOwner.java @@ -24,12 +24,12 @@ import org.apache.brooklyn.api.entity.Entity; import org.apache.brooklyn.api.event.AttributeSensor; import org.apache.brooklyn.api.location.Location; import org.apache.brooklyn.api.location.LocationDefinition; +import org.apache.brooklyn.core.util.flags.SetFromFlag; import brooklyn.config.ConfigKey; import brooklyn.entity.basic.ConfigKeys; import brooklyn.event.basic.BasicAttributeSensorAndConfigKey; import brooklyn.event.basic.Sensors; -import brooklyn.util.flags.SetFromFlag; import com.google.common.annotations.Beta; import com.google.common.collect.ImmutableMap; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a4c0e5fd/core/src/main/java/org/apache/brooklyn/location/geo/HostGeoInfo.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/brooklyn/location/geo/HostGeoInfo.java b/core/src/main/java/org/apache/brooklyn/location/geo/HostGeoInfo.java index ad05bbd..c85060c 100644 --- a/core/src/main/java/org/apache/brooklyn/location/geo/HostGeoInfo.java +++ b/core/src/main/java/org/apache/brooklyn/location/geo/HostGeoInfo.java @@ -26,13 +26,13 @@ import javax.annotation.Nullable; import org.apache.brooklyn.api.entity.Entity; import org.apache.brooklyn.api.location.AddressableLocation; import org.apache.brooklyn.api.location.Location; +import org.apache.brooklyn.core.util.flags.TypeCoercions; import org.apache.brooklyn.location.basic.AbstractLocation; import org.apache.brooklyn.location.basic.LocationConfigKeys; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import brooklyn.util.exceptions.Exceptions; -import brooklyn.util.flags.TypeCoercions; import brooklyn.util.guava.Maybe; import brooklyn.util.internal.BrooklynSystemProperties; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a4c0e5fd/core/src/main/java/org/apache/brooklyn/location/geo/LocalhostExternalIpLoader.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/brooklyn/location/geo/LocalhostExternalIpLoader.java b/core/src/main/java/org/apache/brooklyn/location/geo/LocalhostExternalIpLoader.java index cd46bdd..8738817 100644 --- a/core/src/main/java/org/apache/brooklyn/location/geo/LocalhostExternalIpLoader.java +++ b/core/src/main/java/org/apache/brooklyn/location/geo/LocalhostExternalIpLoader.java @@ -26,10 +26,10 @@ import java.util.concurrent.atomic.AtomicBoolean; import java.util.regex.Matcher; import java.util.regex.Pattern; +import org.apache.brooklyn.core.util.ResourceUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import brooklyn.util.ResourceUtils; import brooklyn.util.exceptions.Exceptions; import brooklyn.util.text.StringPredicates; import brooklyn.util.time.Duration; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a4c0e5fd/core/src/test/java/brooklyn/camp/lite/CampYamlLiteTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/brooklyn/camp/lite/CampYamlLiteTest.java b/core/src/test/java/brooklyn/camp/lite/CampYamlLiteTest.java index d5590fc..d6a9ed0 100644 --- a/core/src/test/java/brooklyn/camp/lite/CampYamlLiteTest.java +++ b/core/src/test/java/brooklyn/camp/lite/CampYamlLiteTest.java @@ -55,15 +55,15 @@ import org.apache.brooklyn.core.catalog.internal.CatalogDto; import org.apache.brooklyn.core.catalog.internal.CatalogUtils; import org.apache.brooklyn.core.management.internal.LocalManagementContext; import org.apache.brooklyn.core.management.osgi.OsgiStandaloneTest; +import org.apache.brooklyn.core.util.ResourceUtils; +import org.apache.brooklyn.core.util.config.ConfigBag; import brooklyn.entity.basic.ApplicationBuilder; import brooklyn.entity.basic.ConfigKeys; import brooklyn.entity.basic.Entities; import brooklyn.entity.effector.AddChildrenEffector; import brooklyn.entity.effector.Effectors; -import brooklyn.util.ResourceUtils; import brooklyn.util.collections.MutableMap; -import brooklyn.util.config.ConfigBag; import brooklyn.util.stream.Streams; import com.google.common.base.Joiner; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a4c0e5fd/core/src/test/java/brooklyn/camp/lite/TestAppAssemblyInstantiator.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/brooklyn/camp/lite/TestAppAssemblyInstantiator.java b/core/src/test/java/brooklyn/camp/lite/TestAppAssemblyInstantiator.java index 22d3ab8..2fa3415 100644 --- a/core/src/test/java/brooklyn/camp/lite/TestAppAssemblyInstantiator.java +++ b/core/src/test/java/brooklyn/camp/lite/TestAppAssemblyInstantiator.java @@ -32,13 +32,13 @@ import java.util.Set; import org.apache.brooklyn.api.entity.proxying.EntitySpec; import org.apache.brooklyn.api.management.ManagementContext; import org.apache.brooklyn.api.management.classloading.BrooklynClassLoadingContext; +import org.apache.brooklyn.core.util.config.ConfigBag; import org.apache.brooklyn.test.entity.TestApplication; import org.apache.brooklyn.test.entity.TestEntity; import brooklyn.camp.brooklyn.api.AssemblyTemplateSpecInstantiator; import brooklyn.camp.brooklyn.api.HasBrooklynManagementContext; import brooklyn.util.collections.MutableMap; -import brooklyn.util.config.ConfigBag; /** simple illustrative instantiator which always makes a {@link TestApplication}, populated with {@link TestEntity} children, * all setting {@link TestEntity#CONF_NAME} for the name in the plan and in the service specs http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a4c0e5fd/core/src/test/java/brooklyn/enricher/basic/BasicEnricherTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/brooklyn/enricher/basic/BasicEnricherTest.java b/core/src/test/java/brooklyn/enricher/basic/BasicEnricherTest.java index 396c76a..7ee1177 100644 --- a/core/src/test/java/brooklyn/enricher/basic/BasicEnricherTest.java +++ b/core/src/test/java/brooklyn/enricher/basic/BasicEnricherTest.java @@ -25,6 +25,7 @@ import java.util.Map; import org.apache.brooklyn.api.entity.proxying.EntitySpec; import org.apache.brooklyn.api.policy.Enricher; import org.apache.brooklyn.api.policy.EnricherSpec; +import org.apache.brooklyn.core.util.flags.SetFromFlag; import org.apache.brooklyn.test.entity.TestApplication; import org.apache.brooklyn.test.entity.TestApplicationNoEnrichersImpl; import org.testng.Assert; @@ -38,7 +39,6 @@ import brooklyn.entity.basic.ApplicationBuilder; import brooklyn.entity.basic.BrooklynConfigKeys; import brooklyn.event.basic.BasicConfigKey; import brooklyn.util.collections.MutableSet; -import brooklyn.util.flags.SetFromFlag; /** * Test that enricher can be created and accessed, by construction and by spec http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a4c0e5fd/core/src/test/java/brooklyn/entity/EffectorSayHiTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/brooklyn/entity/EffectorSayHiTest.java b/core/src/test/java/brooklyn/entity/EffectorSayHiTest.java index 62579e3..80cfe2a 100644 --- a/core/src/test/java/brooklyn/entity/EffectorSayHiTest.java +++ b/core/src/test/java/brooklyn/entity/EffectorSayHiTest.java @@ -34,6 +34,7 @@ import org.apache.brooklyn.api.entity.proxying.ImplementedBy; import org.apache.brooklyn.api.management.ExecutionContext; import org.apache.brooklyn.api.management.Task; import org.apache.brooklyn.core.management.internal.ManagementContextInternal; +import org.apache.brooklyn.core.util.task.BasicTask; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.testng.annotations.BeforeMethod; @@ -45,7 +46,6 @@ import brooklyn.entity.basic.BrooklynTaskTags; import brooklyn.entity.basic.MethodEffector; import brooklyn.entity.trait.Startable; import brooklyn.util.collections.MutableMap; -import brooklyn.util.task.BasicTask; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a4c0e5fd/core/src/test/java/brooklyn/entity/SetFromFlagTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/brooklyn/entity/SetFromFlagTest.java b/core/src/test/java/brooklyn/entity/SetFromFlagTest.java index c5cfc0b..08d0428 100644 --- a/core/src/test/java/brooklyn/entity/SetFromFlagTest.java +++ b/core/src/test/java/brooklyn/entity/SetFromFlagTest.java @@ -24,6 +24,7 @@ import java.util.Map; import org.apache.brooklyn.api.entity.Entity; import org.apache.brooklyn.api.location.PortRange; +import org.apache.brooklyn.core.util.flags.SetFromFlag; import org.testng.annotations.Test; import brooklyn.entity.basic.AbstractEntity; @@ -31,7 +32,6 @@ import brooklyn.entity.basic.AbstractEntity; import org.apache.brooklyn.location.basic.PortRanges; import brooklyn.util.collections.MutableMap; -import brooklyn.util.flags.SetFromFlag; public class SetFromFlagTest { http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a4c0e5fd/core/src/test/java/brooklyn/entity/basic/ConfigMapTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/brooklyn/entity/basic/ConfigMapTest.java b/core/src/test/java/brooklyn/entity/basic/ConfigMapTest.java index a532d15..f67a193 100644 --- a/core/src/test/java/brooklyn/entity/basic/ConfigMapTest.java +++ b/core/src/test/java/brooklyn/entity/basic/ConfigMapTest.java @@ -35,6 +35,8 @@ import java.util.concurrent.atomic.AtomicInteger; import org.apache.brooklyn.api.entity.Entity; import org.apache.brooklyn.api.management.ExecutionManager; import org.apache.brooklyn.api.management.Task; +import org.apache.brooklyn.core.util.task.BasicTask; +import org.apache.brooklyn.core.util.task.DeferredSupplier; import org.testng.Assert; import org.testng.annotations.AfterMethod; import org.testng.annotations.BeforeMethod; @@ -46,8 +48,6 @@ import brooklyn.config.ConfigPredicates; import brooklyn.entity.BrooklynAppUnitTestSupport; import brooklyn.event.basic.BasicAttributeSensorAndConfigKey.IntegerAttributeSensorAndConfigKey; import brooklyn.util.collections.MutableMap; -import brooklyn.util.task.BasicTask; -import brooklyn.util.task.DeferredSupplier; import com.google.common.base.Predicate; import com.google.common.base.Predicates; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a4c0e5fd/core/src/test/java/brooklyn/entity/basic/DependentConfigurationTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/brooklyn/entity/basic/DependentConfigurationTest.java b/core/src/test/java/brooklyn/entity/basic/DependentConfigurationTest.java index 2919055..dd107aa 100644 --- a/core/src/test/java/brooklyn/entity/basic/DependentConfigurationTest.java +++ b/core/src/test/java/brooklyn/entity/basic/DependentConfigurationTest.java @@ -31,6 +31,7 @@ import java.util.concurrent.atomic.AtomicReference; import org.apache.brooklyn.api.entity.proxying.EntitySpec; import org.apache.brooklyn.api.management.Task; +import org.apache.brooklyn.core.util.task.BasicTask; import org.apache.brooklyn.test.EntityTestUtils; import org.apache.brooklyn.test.entity.TestEntity; import org.slf4j.Logger; @@ -46,7 +47,6 @@ import brooklyn.util.collections.MutableList; import brooklyn.util.collections.MutableMap; import brooklyn.util.exceptions.Exceptions; import brooklyn.util.javalang.JavaClassNames; -import brooklyn.util.task.BasicTask; import brooklyn.util.text.StringPredicates; import brooklyn.util.time.Duration; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a4c0e5fd/core/src/test/java/brooklyn/entity/basic/EntityConfigTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/brooklyn/entity/basic/EntityConfigTest.java b/core/src/test/java/brooklyn/entity/basic/EntityConfigTest.java index 4878e33..e41e3a3 100644 --- a/core/src/test/java/brooklyn/entity/basic/EntityConfigTest.java +++ b/core/src/test/java/brooklyn/entity/basic/EntityConfigTest.java @@ -22,13 +22,13 @@ import static org.testng.Assert.assertEquals; import org.apache.brooklyn.api.entity.proxying.EntitySpec; import org.apache.brooklyn.api.management.ManagementContext; +import org.apache.brooklyn.core.util.flags.SetFromFlag; import org.apache.brooklyn.test.entity.LocalManagementContextForTests; import org.testng.annotations.AfterMethod; import org.testng.annotations.BeforeMethod; import org.testng.annotations.Test; import brooklyn.config.ConfigKey; -import brooklyn.util.flags.SetFromFlag; import com.google.common.collect.ImmutableMap; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a4c0e5fd/core/src/test/java/brooklyn/entity/basic/EntitySpecTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/brooklyn/entity/basic/EntitySpecTest.java b/core/src/test/java/brooklyn/entity/basic/EntitySpecTest.java index 0bb8c2f..80ebfb7 100644 --- a/core/src/test/java/brooklyn/entity/basic/EntitySpecTest.java +++ b/core/src/test/java/brooklyn/entity/basic/EntitySpecTest.java @@ -27,6 +27,7 @@ import org.apache.brooklyn.api.policy.Enricher; import org.apache.brooklyn.api.policy.EnricherSpec; import org.apache.brooklyn.api.policy.Policy; import org.apache.brooklyn.api.policy.PolicySpec; +import org.apache.brooklyn.core.util.flags.SetFromFlag; import org.apache.brooklyn.test.entity.TestEntity; import org.apache.brooklyn.test.entity.TestEntityImpl; import org.apache.brooklyn.test.entity.TestEntityNoEnrichersImpl; @@ -42,7 +43,6 @@ import org.apache.brooklyn.location.basic.SimulatedLocation; import brooklyn.policy.basic.AbstractPolicy; import brooklyn.test.Asserts; -import brooklyn.util.flags.SetFromFlag; import com.google.common.collect.ImmutableSet; import com.google.common.collect.Iterables; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a4c0e5fd/core/src/test/java/brooklyn/entity/basic/MapListAndOtherStructuredConfigKeyTest.groovy ---------------------------------------------------------------------- diff --git a/core/src/test/java/brooklyn/entity/basic/MapListAndOtherStructuredConfigKeyTest.groovy b/core/src/test/java/brooklyn/entity/basic/MapListAndOtherStructuredConfigKeyTest.groovy index a52e7d5..86bdc18 100644 --- a/core/src/test/java/brooklyn/entity/basic/MapListAndOtherStructuredConfigKeyTest.groovy +++ b/core/src/test/java/brooklyn/entity/basic/MapListAndOtherStructuredConfigKeyTest.groovy @@ -39,7 +39,7 @@ import org.apache.brooklyn.test.entity.TestApplication import org.apache.brooklyn.test.entity.TestEntity import brooklyn.util.collections.MutableMap import brooklyn.util.exceptions.Exceptions -import brooklyn.util.task.DeferredSupplier +import org.apache.brooklyn.core.util.task.DeferredSupplier import com.google.common.collect.ImmutableList import com.google.common.collect.ImmutableSet http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a4c0e5fd/core/src/test/java/brooklyn/entity/basic/SanitizerTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/brooklyn/entity/basic/SanitizerTest.java b/core/src/test/java/brooklyn/entity/basic/SanitizerTest.java index c9d40a5..ed07c75 100644 --- a/core/src/test/java/brooklyn/entity/basic/SanitizerTest.java +++ b/core/src/test/java/brooklyn/entity/basic/SanitizerTest.java @@ -22,10 +22,9 @@ import static org.testng.Assert.assertEquals; import java.util.Map; +import org.apache.brooklyn.core.util.config.ConfigBag; import org.testng.annotations.Test; -import brooklyn.util.config.ConfigBag; - import com.google.common.collect.ImmutableMap; public class SanitizerTest { http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a4c0e5fd/core/src/test/java/brooklyn/entity/effector/EffectorBasicTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/brooklyn/entity/effector/EffectorBasicTest.java b/core/src/test/java/brooklyn/entity/effector/EffectorBasicTest.java index fa963c3..f8f4eb1 100644 --- a/core/src/test/java/brooklyn/entity/effector/EffectorBasicTest.java +++ b/core/src/test/java/brooklyn/entity/effector/EffectorBasicTest.java @@ -26,6 +26,7 @@ import org.apache.brooklyn.api.entity.proxying.EntitySpec; import org.apache.brooklyn.api.management.HasTaskChildren; import org.apache.brooklyn.api.management.Task; import org.apache.brooklyn.core.management.internal.ManagementContextInternal; +import org.apache.brooklyn.core.util.task.Tasks; import org.apache.brooklyn.test.TestUtils; import org.apache.brooklyn.test.entity.TestEntity; import org.slf4j.Logger; @@ -43,7 +44,6 @@ import org.apache.brooklyn.location.basic.SimulatedLocation; import brooklyn.util.collections.MutableMap; import brooklyn.util.exceptions.Exceptions; -import brooklyn.util.task.Tasks; import com.google.common.collect.ImmutableList; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a4c0e5fd/core/src/test/java/brooklyn/entity/effector/EffectorConcatenateTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/brooklyn/entity/effector/EffectorConcatenateTest.java b/core/src/test/java/brooklyn/entity/effector/EffectorConcatenateTest.java index 56382d8..63b10da 100644 --- a/core/src/test/java/brooklyn/entity/effector/EffectorConcatenateTest.java +++ b/core/src/test/java/brooklyn/entity/effector/EffectorConcatenateTest.java @@ -30,6 +30,8 @@ import java.util.concurrent.atomic.AtomicReference; import org.apache.brooklyn.api.entity.Entity; import org.apache.brooklyn.api.management.ExecutionManager; import org.apache.brooklyn.api.management.Task; +import org.apache.brooklyn.core.util.task.BasicExecutionContext; +import org.apache.brooklyn.core.util.task.Tasks; import org.apache.brooklyn.test.entity.TestApplication; import org.apache.brooklyn.test.entity.TestApplicationImpl; import org.slf4j.Logger; @@ -45,8 +47,6 @@ import brooklyn.entity.basic.BrooklynTaskTags; import brooklyn.entity.basic.Entities; import brooklyn.entity.basic.MethodEffector; import brooklyn.util.collections.MutableMap; -import brooklyn.util.task.BasicExecutionContext; -import brooklyn.util.task.Tasks; import com.google.common.base.Predicate; import com.google.common.collect.ImmutableMap; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a4c0e5fd/core/src/test/java/brooklyn/entity/effector/EffectorTaskTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/brooklyn/entity/effector/EffectorTaskTest.java b/core/src/test/java/brooklyn/entity/effector/EffectorTaskTest.java index 38dd2b8..0f6f041 100644 --- a/core/src/test/java/brooklyn/entity/effector/EffectorTaskTest.java +++ b/core/src/test/java/brooklyn/entity/effector/EffectorTaskTest.java @@ -26,6 +26,11 @@ import org.apache.brooklyn.api.entity.Entity; import org.apache.brooklyn.api.entity.proxying.EntitySpec; import org.apache.brooklyn.api.management.HasTaskChildren; import org.apache.brooklyn.api.management.Task; +import org.apache.brooklyn.core.util.config.ConfigBag; +import org.apache.brooklyn.core.util.task.DynamicSequentialTask; +import org.apache.brooklyn.core.util.task.DynamicTasks; +import org.apache.brooklyn.core.util.task.TaskBuilder; +import org.apache.brooklyn.core.util.task.Tasks; import org.apache.brooklyn.test.entity.TestEntity; import org.testng.Assert; import org.testng.annotations.Test; @@ -38,12 +43,7 @@ import brooklyn.entity.basic.EntityInternal; import brooklyn.entity.effector.EffectorTasks.EffectorTaskFactory; import brooklyn.entity.trait.Startable; import brooklyn.util.collections.MutableMap; -import brooklyn.util.config.ConfigBag; import brooklyn.util.exceptions.Exceptions; -import brooklyn.util.task.DynamicSequentialTask; -import brooklyn.util.task.DynamicTasks; -import brooklyn.util.task.TaskBuilder; -import brooklyn.util.task.Tasks; import com.google.common.base.Preconditions; import com.google.common.collect.ImmutableMap; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a4c0e5fd/core/src/test/java/brooklyn/entity/rebind/Dumpers.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/brooklyn/entity/rebind/Dumpers.java b/core/src/test/java/brooklyn/entity/rebind/Dumpers.java index 12e47ad..934df5c 100644 --- a/core/src/test/java/brooklyn/entity/rebind/Dumpers.java +++ b/core/src/test/java/brooklyn/entity/rebind/Dumpers.java @@ -31,11 +31,11 @@ import java.util.Random; import javax.annotation.Nullable; +import org.apache.brooklyn.core.util.flags.FlagUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import brooklyn.util.exceptions.Exceptions; -import brooklyn.util.flags.FlagUtils; import brooklyn.util.javalang.Serializers; import brooklyn.util.javalang.Serializers.ObjectReplacer; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a4c0e5fd/core/src/test/java/brooklyn/entity/rebind/RebindCatalogEntityTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/brooklyn/entity/rebind/RebindCatalogEntityTest.java b/core/src/test/java/brooklyn/entity/rebind/RebindCatalogEntityTest.java index 3debe30..dc440bc 100644 --- a/core/src/test/java/brooklyn/entity/rebind/RebindCatalogEntityTest.java +++ b/core/src/test/java/brooklyn/entity/rebind/RebindCatalogEntityTest.java @@ -45,10 +45,9 @@ import org.apache.brooklyn.api.management.ManagementContext; import org.apache.brooklyn.api.management.ha.ManagementNodeState; import org.apache.brooklyn.core.catalog.internal.CatalogInitialization; import org.apache.brooklyn.core.management.internal.LocalManagementContext; +import org.apache.brooklyn.core.util.javalang.UrlClassLoader; import org.apache.brooklyn.test.TestResourceUnavailableException; -import brooklyn.util.javalang.UrlClassLoader; - import com.google.common.base.Function; public class RebindCatalogEntityTest extends RebindTestFixture<StartableApplication> { http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a4c0e5fd/core/src/test/java/brooklyn/entity/rebind/RebindEnricherTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/brooklyn/entity/rebind/RebindEnricherTest.java b/core/src/test/java/brooklyn/entity/rebind/RebindEnricherTest.java index 3102dd2..ea21787 100644 --- a/core/src/test/java/brooklyn/entity/rebind/RebindEnricherTest.java +++ b/core/src/test/java/brooklyn/entity/rebind/RebindEnricherTest.java @@ -32,6 +32,7 @@ import org.apache.brooklyn.api.event.AttributeSensor; import org.apache.brooklyn.api.location.LocationSpec; import org.apache.brooklyn.api.policy.Enricher; import org.apache.brooklyn.api.policy.EnricherSpec; +import org.apache.brooklyn.core.util.flags.SetFromFlag; import org.apache.brooklyn.test.EntityTestUtils; import org.apache.brooklyn.test.entity.TestApplication; import org.apache.brooklyn.test.entity.TestEntity; @@ -55,7 +56,6 @@ import org.apache.brooklyn.location.basic.SimulatedLocation; import brooklyn.test.Asserts; import brooklyn.util.collections.MutableSet; -import brooklyn.util.flags.SetFromFlag; import brooklyn.util.text.Identifiers; import brooklyn.util.text.StringFunctions; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a4c0e5fd/core/src/test/java/brooklyn/entity/rebind/RebindEntityDynamicTypeInfoTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/brooklyn/entity/rebind/RebindEntityDynamicTypeInfoTest.java b/core/src/test/java/brooklyn/entity/rebind/RebindEntityDynamicTypeInfoTest.java index d7ad132..883b1aa 100644 --- a/core/src/test/java/brooklyn/entity/rebind/RebindEntityDynamicTypeInfoTest.java +++ b/core/src/test/java/brooklyn/entity/rebind/RebindEntityDynamicTypeInfoTest.java @@ -27,6 +27,7 @@ import java.util.concurrent.ExecutionException; import org.apache.brooklyn.api.entity.Effector; import org.apache.brooklyn.api.entity.proxying.EntitySpec; +import org.apache.brooklyn.core.util.config.ConfigBag; import org.apache.brooklyn.test.entity.TestApplication; import org.apache.brooklyn.test.entity.TestEntity; import org.slf4j.Logger; @@ -38,7 +39,6 @@ import brooklyn.config.ConfigKey; import brooklyn.entity.basic.ConfigKeys; import brooklyn.entity.effector.EffectorBody; import brooklyn.entity.effector.Effectors; -import brooklyn.util.config.ConfigBag; import brooklyn.util.stream.Streams; public class RebindEntityDynamicTypeInfoTest extends RebindTestFixtureWithApp { http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a4c0e5fd/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 992ca8e..3ece27b 100644 --- a/core/src/test/java/brooklyn/entity/rebind/RebindEntityTest.java +++ b/core/src/test/java/brooklyn/entity/rebind/RebindEntityTest.java @@ -53,6 +53,7 @@ import org.apache.brooklyn.api.management.ha.ManagementNodeState; import org.apache.brooklyn.api.mementos.BrooklynMementoManifest; import org.apache.brooklyn.api.mementos.EntityMemento; import org.apache.brooklyn.core.management.internal.LocalManagementContext; +import org.apache.brooklyn.core.util.flags.SetFromFlag; import org.apache.brooklyn.test.entity.TestApplication; import org.apache.brooklyn.test.entity.TestEntity; import org.apache.brooklyn.test.entity.TestEntityImpl; @@ -79,7 +80,6 @@ import brooklyn.test.Asserts; import brooklyn.util.collections.MutableMap; import brooklyn.util.collections.MutableSet; import brooklyn.util.exceptions.RuntimeInterruptedException; -import brooklyn.util.flags.SetFromFlag; import brooklyn.util.time.Durations; import com.google.common.base.Objects; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a4c0e5fd/core/src/test/java/brooklyn/entity/rebind/RebindFailuresTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/brooklyn/entity/rebind/RebindFailuresTest.java b/core/src/test/java/brooklyn/entity/rebind/RebindFailuresTest.java index ba168cf..674d77e 100644 --- a/core/src/test/java/brooklyn/entity/rebind/RebindFailuresTest.java +++ b/core/src/test/java/brooklyn/entity/rebind/RebindFailuresTest.java @@ -40,6 +40,7 @@ import org.apache.brooklyn.api.policy.EnricherSpec; import org.apache.brooklyn.api.policy.Policy; import org.apache.brooklyn.api.policy.PolicySpec; import org.apache.brooklyn.core.management.internal.LocalManagementContext; +import org.apache.brooklyn.core.util.flags.SetFromFlag; import org.apache.brooklyn.test.entity.LocalManagementContextForTests; import org.testng.Assert; import org.testng.annotations.Test; @@ -54,7 +55,6 @@ import brooklyn.entity.rebind.RebindEntityTest.MyEntity; import brooklyn.entity.rebind.RebindEntityTest.MyEntityImpl; import brooklyn.policy.basic.AbstractPolicy; import brooklyn.util.exceptions.Exceptions; -import brooklyn.util.flags.SetFromFlag; import brooklyn.util.os.Os; import com.google.common.base.Charsets; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a4c0e5fd/core/src/test/java/brooklyn/entity/rebind/RebindFeedTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/brooklyn/entity/rebind/RebindFeedTest.java b/core/src/test/java/brooklyn/entity/rebind/RebindFeedTest.java index c368a7a..d0d03d6 100644 --- a/core/src/test/java/brooklyn/entity/rebind/RebindFeedTest.java +++ b/core/src/test/java/brooklyn/entity/rebind/RebindFeedTest.java @@ -29,6 +29,8 @@ import org.apache.brooklyn.api.entity.proxying.EntitySpec; import org.apache.brooklyn.api.event.AttributeSensor; import org.apache.brooklyn.api.location.Location; import org.apache.brooklyn.core.management.internal.BrooklynGarbageCollector; +import org.apache.brooklyn.core.util.http.BetterMockWebServer; +import org.apache.brooklyn.core.util.task.BasicExecutionManager; import org.apache.brooklyn.test.EntityTestUtils; import org.apache.brooklyn.test.entity.TestEntity; import org.apache.brooklyn.test.entity.TestEntityImpl.TestEntityWithoutEnrichers; @@ -57,8 +59,6 @@ import org.apache.brooklyn.location.basic.SshMachineLocation; import brooklyn.test.Asserts; import brooklyn.util.collections.MutableList; -import brooklyn.util.http.BetterMockWebServer; -import brooklyn.util.task.BasicExecutionManager; import brooklyn.util.text.Identifiers; import brooklyn.util.text.Strings; import brooklyn.util.time.Duration; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a4c0e5fd/core/src/test/java/brooklyn/entity/rebind/RebindFeedWithHaTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/brooklyn/entity/rebind/RebindFeedWithHaTest.java b/core/src/test/java/brooklyn/entity/rebind/RebindFeedWithHaTest.java index 868665f..c42090b 100644 --- a/core/src/test/java/brooklyn/entity/rebind/RebindFeedWithHaTest.java +++ b/core/src/test/java/brooklyn/entity/rebind/RebindFeedWithHaTest.java @@ -31,6 +31,8 @@ import org.apache.brooklyn.api.event.AttributeSensor; import org.apache.brooklyn.api.management.Task; import org.apache.brooklyn.api.management.ha.HighAvailabilityMode; import org.apache.brooklyn.core.management.internal.LocalManagementContext; +import org.apache.brooklyn.core.util.http.BetterMockWebServer; +import org.apache.brooklyn.core.util.task.BasicExecutionManager; import org.apache.brooklyn.test.EntityTestUtils; import org.apache.brooklyn.test.entity.TestApplication; import org.apache.brooklyn.test.entity.TestEntity; @@ -41,9 +43,7 @@ import org.testng.annotations.AfterMethod; import org.testng.annotations.BeforeMethod; import org.testng.annotations.Test; -import brooklyn.util.http.BetterMockWebServer; import brooklyn.util.repeat.Repeater; -import brooklyn.util.task.BasicExecutionManager; import brooklyn.util.time.Duration; import com.google.common.collect.Iterables; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a4c0e5fd/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 8c93fc7..7e54ac4 100644 --- a/core/src/test/java/brooklyn/entity/rebind/RebindLocationTest.java +++ b/core/src/test/java/brooklyn/entity/rebind/RebindLocationTest.java @@ -33,6 +33,7 @@ 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.api.mementos.LocationMemento; +import org.apache.brooklyn.core.util.flags.SetFromFlag; import org.apache.brooklyn.test.entity.TestApplication; import org.testng.Assert; import org.testng.annotations.BeforeMethod; @@ -46,7 +47,6 @@ import org.apache.brooklyn.location.basic.AbstractLocation; import brooklyn.test.Asserts; import brooklyn.util.collections.MutableMap; -import brooklyn.util.flags.SetFromFlag; import com.google.common.base.Predicates; import com.google.common.collect.ImmutableList; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a4c0e5fd/core/src/test/java/brooklyn/entity/rebind/RebindManagerTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/brooklyn/entity/rebind/RebindManagerTest.java b/core/src/test/java/brooklyn/entity/rebind/RebindManagerTest.java index 676d040..c1312e5 100644 --- a/core/src/test/java/brooklyn/entity/rebind/RebindManagerTest.java +++ b/core/src/test/java/brooklyn/entity/rebind/RebindManagerTest.java @@ -25,13 +25,12 @@ import java.util.concurrent.Callable; import org.apache.brooklyn.api.entity.Entity; import org.apache.brooklyn.api.entity.proxying.EntitySpec; import org.apache.brooklyn.api.management.Task; +import org.apache.brooklyn.core.util.task.BasicTask; +import org.apache.brooklyn.core.util.task.DynamicTasks; import org.apache.brooklyn.test.entity.TestEntity; import org.apache.brooklyn.test.entity.TestEntityImpl; import org.testng.annotations.Test; -import brooklyn.util.task.BasicTask; -import brooklyn.util.task.DynamicTasks; - import com.google.common.base.Predicates; import com.google.common.collect.Iterables; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a4c0e5fd/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 f77e3d4..d74a6fc 100644 --- a/core/src/test/java/brooklyn/entity/rebind/RebindPolicyTest.java +++ b/core/src/test/java/brooklyn/entity/rebind/RebindPolicyTest.java @@ -33,6 +33,7 @@ import org.apache.brooklyn.api.mementos.BrooklynMementoManifest; import org.apache.brooklyn.api.policy.EnricherSpec; import org.apache.brooklyn.api.policy.Policy; import org.apache.brooklyn.api.policy.PolicySpec; +import org.apache.brooklyn.core.util.flags.SetFromFlag; import org.apache.brooklyn.test.entity.TestApplication; import org.apache.brooklyn.test.entity.TestEntity; import org.testng.annotations.Test; @@ -50,7 +51,6 @@ import brooklyn.policy.basic.AbstractPolicy; import brooklyn.test.Asserts; import brooklyn.util.collections.MutableMap; import brooklyn.util.collections.MutableSet; -import brooklyn.util.flags.SetFromFlag; import com.google.common.base.Predicates; import com.google.common.collect.ImmutableSet; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a4c0e5fd/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 5c39216..966ecea 100644 --- a/core/src/test/java/brooklyn/entity/rebind/RebindTestFixture.java +++ b/core/src/test/java/brooklyn/entity/rebind/RebindTestFixture.java @@ -43,6 +43,7 @@ import org.apache.brooklyn.api.mementos.BrooklynMementoManifest; import org.apache.brooklyn.core.catalog.internal.CatalogUtils; import org.apache.brooklyn.core.management.internal.LocalManagementContext; import org.apache.brooklyn.core.management.internal.ManagementContextInternal; +import org.apache.brooklyn.core.util.task.BasicExecutionManager; import brooklyn.entity.basic.Entities; import brooklyn.entity.basic.EntityFunctions; @@ -53,7 +54,6 @@ import brooklyn.entity.rebind.persister.PersistMode; import brooklyn.entity.trait.Startable; import brooklyn.util.os.Os; import brooklyn.util.repeat.Repeater; -import brooklyn.util.task.BasicExecutionManager; import brooklyn.util.text.Identifiers; import brooklyn.util.time.Duration; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a4c0e5fd/core/src/test/java/brooklyn/entity/rebind/transformer/impl/XsltTransformerTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/brooklyn/entity/rebind/transformer/impl/XsltTransformerTest.java b/core/src/test/java/brooklyn/entity/rebind/transformer/impl/XsltTransformerTest.java index 5791dd4..cdd89a5 100644 --- a/core/src/test/java/brooklyn/entity/rebind/transformer/impl/XsltTransformerTest.java +++ b/core/src/test/java/brooklyn/entity/rebind/transformer/impl/XsltTransformerTest.java @@ -20,11 +20,11 @@ package brooklyn.entity.rebind.transformer.impl; import static org.testng.Assert.assertEquals; +import org.apache.brooklyn.core.util.ResourceUtils; +import org.apache.brooklyn.core.util.text.TemplateProcessor; import org.testng.annotations.Test; -import brooklyn.util.ResourceUtils; import brooklyn.util.os.Os; -import brooklyn.util.text.TemplateProcessor; import com.google.common.collect.ImmutableMap; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a4c0e5fd/core/src/test/java/brooklyn/entity/trait/FailingEntity.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/brooklyn/entity/trait/FailingEntity.java b/core/src/test/java/brooklyn/entity/trait/FailingEntity.java index 4d06fc4..4b8c85e 100644 --- a/core/src/test/java/brooklyn/entity/trait/FailingEntity.java +++ b/core/src/test/java/brooklyn/entity/trait/FailingEntity.java @@ -22,11 +22,11 @@ import java.util.List; import org.apache.brooklyn.api.entity.Entity; import org.apache.brooklyn.api.entity.proxying.ImplementedBy; +import org.apache.brooklyn.core.util.flags.SetFromFlag; import org.apache.brooklyn.test.entity.TestEntity; import brooklyn.config.ConfigKey; import brooklyn.entity.basic.ConfigKeys; -import brooklyn.util.flags.SetFromFlag; import com.google.common.base.Function; import com.google.common.base.Functions; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a4c0e5fd/core/src/test/java/brooklyn/entity/trait/FailingEntityImpl.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/brooklyn/entity/trait/FailingEntityImpl.java b/core/src/test/java/brooklyn/entity/trait/FailingEntityImpl.java index 4d1d9f9..e4a5d77 100644 --- a/core/src/test/java/brooklyn/entity/trait/FailingEntityImpl.java +++ b/core/src/test/java/brooklyn/entity/trait/FailingEntityImpl.java @@ -22,12 +22,12 @@ import java.util.Collection; import org.apache.brooklyn.api.location.Location; import org.apache.brooklyn.api.management.Task; +import org.apache.brooklyn.core.util.task.Tasks; import org.apache.brooklyn.test.entity.TestEntityImpl; import org.testng.Assert; import brooklyn.entity.basic.Entities; import brooklyn.util.exceptions.Exceptions; -import brooklyn.util.task.Tasks; public class FailingEntityImpl extends TestEntityImpl implements FailingEntity { http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a4c0e5fd/core/src/test/java/brooklyn/entity/trait/StartableMethodsTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/brooklyn/entity/trait/StartableMethodsTest.java b/core/src/test/java/brooklyn/entity/trait/StartableMethodsTest.java index 1a3537d..f457b0d 100644 --- a/core/src/test/java/brooklyn/entity/trait/StartableMethodsTest.java +++ b/core/src/test/java/brooklyn/entity/trait/StartableMethodsTest.java @@ -23,6 +23,7 @@ import static org.testng.Assert.fail; import org.apache.brooklyn.api.entity.proxying.EntitySpec; import org.apache.brooklyn.api.management.Task; +import org.apache.brooklyn.core.util.task.Tasks; import org.apache.brooklyn.test.entity.TestEntity; import org.testng.annotations.BeforeMethod; import org.testng.annotations.Test; @@ -30,8 +31,8 @@ import org.testng.annotations.Test; import brooklyn.entity.BrooklynAppUnitTestSupport; import brooklyn.entity.basic.Entities; import brooklyn.entity.trait.FailingEntity.RecordingEventListener; + import org.apache.brooklyn.location.basic.SimulatedLocation; -import brooklyn.util.task.Tasks; import com.google.common.collect.ImmutableList; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a4c0e5fd/core/src/test/java/brooklyn/event/feed/PollerTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/brooklyn/event/feed/PollerTest.java b/core/src/test/java/brooklyn/event/feed/PollerTest.java index fc799e0..1427c93 100644 --- a/core/src/test/java/brooklyn/event/feed/PollerTest.java +++ b/core/src/test/java/brooklyn/event/feed/PollerTest.java @@ -25,6 +25,7 @@ import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.AtomicInteger; import org.apache.brooklyn.api.entity.proxying.EntitySpec; +import org.apache.brooklyn.core.util.task.DynamicTasks; import org.apache.brooklyn.test.entity.TestEntity; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -35,7 +36,6 @@ import org.testng.annotations.Test; import brooklyn.entity.BrooklynAppUnitTestSupport; import brooklyn.test.Asserts; import brooklyn.util.collections.MutableMap; -import brooklyn.util.task.DynamicTasks; import brooklyn.util.time.Duration; public class PollerTest extends BrooklynAppUnitTestSupport { http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a4c0e5fd/core/src/test/java/brooklyn/event/feed/http/HttpFeedTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/brooklyn/event/feed/http/HttpFeedTest.java b/core/src/test/java/brooklyn/event/feed/http/HttpFeedTest.java index aa16b8c..e367bdf 100644 --- a/core/src/test/java/brooklyn/event/feed/http/HttpFeedTest.java +++ b/core/src/test/java/brooklyn/event/feed/http/HttpFeedTest.java @@ -29,6 +29,8 @@ import org.apache.brooklyn.api.entity.basic.EntityLocal; import org.apache.brooklyn.api.entity.proxying.EntitySpec; import org.apache.brooklyn.api.event.AttributeSensor; import org.apache.brooklyn.api.location.Location; +import org.apache.brooklyn.core.util.http.BetterMockWebServer; +import org.apache.brooklyn.core.util.http.HttpToolResponse; import org.apache.brooklyn.test.entity.TestEntity; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -49,8 +51,6 @@ import brooklyn.test.Asserts; import brooklyn.util.collections.MutableList; import brooklyn.util.collections.MutableMap; import brooklyn.util.guava.Functionals; -import brooklyn.util.http.BetterMockWebServer; -import brooklyn.util.http.HttpToolResponse; import brooklyn.util.net.Networking; import brooklyn.util.time.Duration; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a4c0e5fd/core/src/test/java/brooklyn/event/feed/http/HttpValueFunctionsTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/brooklyn/event/feed/http/HttpValueFunctionsTest.java b/core/src/test/java/brooklyn/event/feed/http/HttpValueFunctionsTest.java index 7769427..2f83cc5 100644 --- a/core/src/test/java/brooklyn/event/feed/http/HttpValueFunctionsTest.java +++ b/core/src/test/java/brooklyn/event/feed/http/HttpValueFunctionsTest.java @@ -25,11 +25,10 @@ import static org.testng.Assert.assertTrue; import java.util.NoSuchElementException; +import org.apache.brooklyn.core.util.http.HttpToolResponse; import org.testng.annotations.BeforeMethod; import org.testng.annotations.Test; -import brooklyn.util.http.HttpToolResponse; - import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; import com.google.gson.JsonElement; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a4c0e5fd/core/src/test/java/brooklyn/policy/basic/BasicPolicyTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/brooklyn/policy/basic/BasicPolicyTest.java b/core/src/test/java/brooklyn/policy/basic/BasicPolicyTest.java index df779e1..5ac58c9 100644 --- a/core/src/test/java/brooklyn/policy/basic/BasicPolicyTest.java +++ b/core/src/test/java/brooklyn/policy/basic/BasicPolicyTest.java @@ -23,13 +23,13 @@ import static org.testng.Assert.assertEquals; import java.util.Map; import org.apache.brooklyn.api.policy.PolicySpec; +import org.apache.brooklyn.core.util.flags.SetFromFlag; import org.testng.annotations.Test; import brooklyn.config.ConfigKey; import brooklyn.entity.BrooklynAppUnitTestSupport; import brooklyn.event.basic.BasicConfigKey; import brooklyn.util.collections.MutableSet; -import brooklyn.util.flags.SetFromFlag; /** * Test that policy can be created and accessed, by construction and by spec http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a4c0e5fd/core/src/test/java/brooklyn/qa/longevity/EntityCleanupLongevityTestFixture.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/brooklyn/qa/longevity/EntityCleanupLongevityTestFixture.java b/core/src/test/java/brooklyn/qa/longevity/EntityCleanupLongevityTestFixture.java index 85eaf3d..790bfe1 100644 --- a/core/src/test/java/brooklyn/qa/longevity/EntityCleanupLongevityTestFixture.java +++ b/core/src/test/java/brooklyn/qa/longevity/EntityCleanupLongevityTestFixture.java @@ -29,6 +29,8 @@ import org.apache.brooklyn.api.location.LocationSpec; import org.apache.brooklyn.core.management.internal.AbstractManagementContext; import org.apache.brooklyn.core.management.internal.LocalManagementContext; import org.apache.brooklyn.core.management.internal.ManagementContextInternal; +import org.apache.brooklyn.core.util.task.BasicExecutionManager; +import org.apache.brooklyn.core.util.task.TaskScheduler; import org.apache.brooklyn.test.entity.LocalManagementContextForTests; import org.apache.brooklyn.test.entity.TestApplication; import org.apache.brooklyn.test.entity.TestEntity; @@ -46,8 +48,6 @@ import brooklyn.internal.storage.impl.BrooklynStorageImpl; import org.apache.brooklyn.location.basic.SimulatedLocation; -import brooklyn.util.task.BasicExecutionManager; -import brooklyn.util.task.TaskScheduler; import brooklyn.util.text.Strings; import brooklyn.util.time.Time; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a4c0e5fd/core/src/test/java/brooklyn/qa/performance/FilePersistencePerformanceTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/brooklyn/qa/performance/FilePersistencePerformanceTest.java b/core/src/test/java/brooklyn/qa/performance/FilePersistencePerformanceTest.java index 098648d..0b35670 100644 --- a/core/src/test/java/brooklyn/qa/performance/FilePersistencePerformanceTest.java +++ b/core/src/test/java/brooklyn/qa/performance/FilePersistencePerformanceTest.java @@ -23,6 +23,7 @@ import java.io.IOException; import java.util.List; import java.util.concurrent.atomic.AtomicInteger; +import org.apache.brooklyn.core.util.internal.ssh.process.ProcessTool; import org.testng.annotations.AfterMethod; import org.testng.annotations.BeforeMethod; import org.testng.annotations.Test; @@ -31,7 +32,6 @@ import brooklyn.entity.rebind.persister.FileBasedStoreObjectAccessor; import brooklyn.util.collections.MutableList; import brooklyn.util.collections.MutableMap; import brooklyn.util.exceptions.Exceptions; -import brooklyn.util.internal.ssh.process.ProcessTool; import com.google.common.base.Charsets; import com.google.common.collect.ImmutableList;
