http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a4c0e5fd/core/src/test/java/org/apache/brooklyn/core/util/xstream/CompilerCompatibilityTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/org/apache/brooklyn/core/util/xstream/CompilerCompatibilityTest.java b/core/src/test/java/org/apache/brooklyn/core/util/xstream/CompilerCompatibilityTest.java new file mode 100644 index 0000000..d18da28 --- /dev/null +++ b/core/src/test/java/org/apache/brooklyn/core/util/xstream/CompilerCompatibilityTest.java @@ -0,0 +1,158 @@ +/* + * 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 static org.testng.Assert.assertTrue; + +import java.io.IOException; +import java.io.InputStream; +import java.lang.reflect.Field; + +import org.apache.brooklyn.core.util.xstream.CompilerIndependentOuterClassFieldMapper; +import org.apache.brooklyn.core.util.xstream.CompilerCompatibilityTest.EnclosingClass.DynamicClass; +import org.apache.brooklyn.core.util.xstream.CompilerCompatibilityTest.EnclosingClass.DynamicExtendingClass; +import org.apache.brooklyn.core.util.xstream.CompilerCompatibilityTest.EnclosingClass.EnclosingDynamicClass; +import org.apache.brooklyn.core.util.xstream.CompilerCompatibilityTest.EnclosingClass.EnclosingDynamicClass.NestedDynamicClass; +import org.eclipse.jetty.util.log.Log; +import org.testng.annotations.Test; + +import com.thoughtworks.xstream.XStream; +import com.thoughtworks.xstream.mapper.MapperWrapper; + +// To get the generated synthetic fields use the command: +/* + find core/target/test-classes -name CompilerCompatibilityTest\$EnclosingClass\$* | \ + sed s@core/target/test-classes/@@ | sed '[email protected]$@@' | sed s@/@.@g | \ + xargs javap -classpath core/target/test-classes/ | grep -B1 this +*/ +@SuppressWarnings("unused") +public class CompilerCompatibilityTest { + private EnclosingClass enclosingClass = new EnclosingClass(); + private DynamicClass dynamicClass = enclosingClass.new DynamicClass(); + private DynamicExtendingClass dynamicExtendingClass = enclosingClass.new DynamicExtendingClass(); + private EnclosingDynamicClass enclosingDynamicClass = enclosingClass.new EnclosingDynamicClass(); + private NestedDynamicClass nestedDynamicClass = enclosingDynamicClass.new NestedDynamicClass(); +// NOT SUPPORTED +// private DynamicExtendingClassWithDifferentScope dynamicExtendingClassWithDifferentScope = +// enclosingClass.new DynamicExtendingClassWithDifferentScope(enclosingDynamicClass); + + public static class EnclosingClass { + public class DynamicClass { + //Oracle/OpenJDK/IBM generates + //final EnclosingClass this$0; + + //eclipse-[groovy-]compiler generates + //final EnclosingClass this$1; + } + + public class DynamicExtendingClass extends DynamicClass { + //The field here masks the parent field + + //Oracle/OpenJDK/IBM generates + //final EnclosingClass this$0; + + //eclipse-[groovy-]compiler generates + //final EnclosingClass this$1; + } + + public class EnclosingDynamicClass { + //Oracle/OpenJDK/IBM generates + //final EnclosingClass this$0; + + //eclipse-[groovy-]compiler generates + //final EnclosingClass this$1; + + public class NestedDynamicClass { + //Oracle/OpenJDK/IBM generates + //final EnclosingClass this$1; + + //eclipse-[groovy-]compiler generates + //final EnclosingClass this$2; + } + } + +// WARNING: Combination NOT SUPPORTED. Not enough information in XML to deserialize reliably, +// having in mind that different compilers could be used for parent/child classes. +// If we really need to, we can extend the heuristic to check for field types or assume that +// only one compiler was used for the whole class hierarchy covering some more cases. +// +// The problem is that we have two fields with different names, without relation between the +// indexes in each one. Changing compilers (or combination of compilers) could change the +// indexes independently in each field. This makes it impossible to infer which field in the xml +// maps to which field in the object. +// When having identical field names with parent classes XStream will put a defined-in attribute +// which makes it possible to deserialize, but it can't be forced to put it in each element. +// + public class DynamicExtendingClassWithDifferentScope extends NestedDynamicClass { + //Oracle/OpenJDK/IBM generates + //final EnclosingClass this$0; + + //eclipse-[groovy-]compiler generates + //final EnclosingClass this$1; + + //constructor required to compile + public DynamicExtendingClassWithDifferentScope(EnclosingDynamicClass superEnclosingScope) { + superEnclosingScope.super(); + } + } + } + + @Test + public void testXStreamDeserialize() throws Exception { + deserialize("/brooklyn/entity/rebind/compiler_compatibility_eclipse.xml"); + deserialize("/brooklyn/entity/rebind/compiler_compatibility_oracle.xml"); + } + + private void deserialize(String inputUrl) throws Exception { + XStream xstream = new XStream() { + @Override + protected MapperWrapper wrapMapper(MapperWrapper next) { + return new CompilerIndependentOuterClassFieldMapper(super.wrapMapper(next)); + } + }; + + InputStream in = this.getClass().getResourceAsStream(inputUrl); + try { + Object obj = xstream.fromXML(in); + assertNonNullOuterFields(obj); + } catch (Exception e) { + System.out.println(e.getMessage()); + throw e; + } finally { + in.close(); + } + } + + private void assertNonNullOuterFields(Object obj) throws Exception { + Field[] testInstances = obj.getClass().getDeclaredFields(); + for (Field instanceField : testInstances) { + Object instance = instanceField.get(obj); + Class<?> type = instance.getClass(); + do { + for (Field field : type.getDeclaredFields()) { + if (field.getName().startsWith("this$")) { + Object value = field.get(instance); + assertTrue(value != null, field + " should not be null"); + } + } + type = type.getSuperclass(); + } while (type != null); + } + } +}
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a4c0e5fd/core/src/test/java/org/apache/brooklyn/core/util/xstream/ConverterTestFixture.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/org/apache/brooklyn/core/util/xstream/ConverterTestFixture.java b/core/src/test/java/org/apache/brooklyn/core/util/xstream/ConverterTestFixture.java new file mode 100644 index 0000000..16c7d71 --- /dev/null +++ b/core/src/test/java/org/apache/brooklyn/core/util/xstream/ConverterTestFixture.java @@ -0,0 +1,40 @@ +/* + * 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 org.testng.Assert; + +import com.thoughtworks.xstream.XStream; + +public class ConverterTestFixture { + + protected Object assertX(Object obj, String fmt) { + XStream xstream = new XStream(); + registerConverters(xstream); + String s1 = xstream.toXML(obj); + Assert.assertEquals(s1, fmt); + Object out = xstream.fromXML(s1); + Assert.assertEquals(out, obj); + return out; + } + + protected void registerConverters(XStream xstream) { + } + +} http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a4c0e5fd/core/src/test/java/org/apache/brooklyn/core/util/xstream/EnumCaseForgivingConverterTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/org/apache/brooklyn/core/util/xstream/EnumCaseForgivingConverterTest.java b/core/src/test/java/org/apache/brooklyn/core/util/xstream/EnumCaseForgivingConverterTest.java new file mode 100644 index 0000000..65374e4 --- /dev/null +++ b/core/src/test/java/org/apache/brooklyn/core/util/xstream/EnumCaseForgivingConverterTest.java @@ -0,0 +1,53 @@ +/* + * 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 static org.testng.Assert.assertEquals; +import static org.testng.Assert.fail; + +import org.apache.brooklyn.core.util.xstream.EnumCaseForgivingConverter; +import org.testng.annotations.Test; + +public class EnumCaseForgivingConverterTest { + + public enum MyEnum { + FOO, + BaR; + } + + @Test + public void testFindsCaseInsensitive() throws Exception { + assertEquals(EnumCaseForgivingConverter.resolve(MyEnum.class, "FOO"), MyEnum.FOO); + assertEquals(EnumCaseForgivingConverter.resolve(MyEnum.class, "foo"), MyEnum.FOO); + assertEquals(EnumCaseForgivingConverter.resolve(MyEnum.class, "Foo"), MyEnum.FOO); + assertEquals(EnumCaseForgivingConverter.resolve(MyEnum.class, "BAR"), MyEnum.BaR); + assertEquals(EnumCaseForgivingConverter.resolve(MyEnum.class, "bar"), MyEnum.BaR); + assertEquals(EnumCaseForgivingConverter.resolve(MyEnum.class, "Bar"), MyEnum.BaR); + } + + @Test + public void testFailsIfNoMatch() throws Exception { + try { + assertEquals(EnumCaseForgivingConverter.resolve(MyEnum.class, "DoesNotExist"), MyEnum.BaR); + fail(); + } catch (IllegalArgumentException e) { + if (!e.toString().matches(".*No enum.*MyEnum.DOESNOTEXIST")) throw e; + } + } +} http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a4c0e5fd/core/src/test/java/org/apache/brooklyn/core/util/xstream/ImmutableListConverterTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/org/apache/brooklyn/core/util/xstream/ImmutableListConverterTest.java b/core/src/test/java/org/apache/brooklyn/core/util/xstream/ImmutableListConverterTest.java new file mode 100644 index 0000000..1a708ce --- /dev/null +++ b/core/src/test/java/org/apache/brooklyn/core/util/xstream/ImmutableListConverterTest.java @@ -0,0 +1,60 @@ +/* + * 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.net.UnknownHostException; + +import org.apache.brooklyn.core.util.xstream.ImmutableListConverter; +import org.testng.Assert; +import org.testng.annotations.Test; + +import com.google.common.collect.ImmutableList; +import com.thoughtworks.xstream.XStream; + +@Test +public class ImmutableListConverterTest extends ConverterTestFixture { + + protected void registerConverters(XStream xstream) { + super.registerConverters(xstream); + xstream.aliasType("ImmutableList", ImmutableList.class); + xstream.registerConverter(new ImmutableListConverter(xstream.getMapper())); + } + + @Test + public void testImmutableEmptyList() throws UnknownHostException { + assertX(ImmutableList.of(), "<ImmutableList/>"); + } + + @Test + public void testImmutableSingletonDoubleList() throws UnknownHostException { + assertX(ImmutableList.of(1.2d), "<ImmutableList>\n <double>1.2</double>\n</ImmutableList>"); + } + + @Test + public void testImmutableTwoValStringList() throws UnknownHostException { + assertX(ImmutableList.of("a","b"), "<ImmutableList>\n <string>a</string>\n <string>b</string>\n</ImmutableList>"); + } + + @Test + public void testImmutableEmptyListStaysImmutable() throws UnknownHostException { + Object x = assertX(ImmutableList.of(), "<ImmutableList/>"); + Assert.assertTrue(x instanceof ImmutableList); + } + +} http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a4c0e5fd/core/src/test/java/org/apache/brooklyn/core/util/xstream/InetAddressConverterTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/org/apache/brooklyn/core/util/xstream/InetAddressConverterTest.java b/core/src/test/java/org/apache/brooklyn/core/util/xstream/InetAddressConverterTest.java new file mode 100644 index 0000000..bec2cc4 --- /dev/null +++ b/core/src/test/java/org/apache/brooklyn/core/util/xstream/InetAddressConverterTest.java @@ -0,0 +1,42 @@ +/* + * 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.net.InetAddress; +import java.net.UnknownHostException; + +import org.apache.brooklyn.core.util.xstream.Inet4AddressConverter; +import org.testng.annotations.Test; + +import com.thoughtworks.xstream.XStream; + +@Test +public class InetAddressConverterTest extends ConverterTestFixture { + + protected void registerConverters(XStream xstream) { + super.registerConverters(xstream); + xstream.registerConverter(new Inet4AddressConverter()); + } + + public void testFoo1234() throws UnknownHostException { + assertX(InetAddress.getByAddress("foo", new byte[] { 1, 2, 3, 4 }), + "<java.net.Inet4Address>foo/1.2.3.4</java.net.Inet4Address>"); + } + +} http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a4c0e5fd/core/src/test/java/org/apache/brooklyn/core/util/xstream/StringKeyMapConverterTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/org/apache/brooklyn/core/util/xstream/StringKeyMapConverterTest.java b/core/src/test/java/org/apache/brooklyn/core/util/xstream/StringKeyMapConverterTest.java new file mode 100644 index 0000000..6a15ee9 --- /dev/null +++ b/core/src/test/java/org/apache/brooklyn/core/util/xstream/StringKeyMapConverterTest.java @@ -0,0 +1,78 @@ +/* + * 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.net.UnknownHostException; +import java.util.LinkedHashMap; +import java.util.Map; + +import org.apache.brooklyn.core.util.xstream.StringKeyMapConverter; +import org.testng.annotations.Test; + +import brooklyn.util.collections.MutableMap; + +import com.google.common.collect.Maps; +import com.thoughtworks.xstream.XStream; + +@SuppressWarnings({ "rawtypes", "unchecked" }) +@Test +public class StringKeyMapConverterTest extends ConverterTestFixture { + + protected void registerConverters(XStream xstream) { + super.registerConverters(xstream); + xstream.alias("map", Map.class, LinkedHashMap.class); + xstream.alias("MutableMap", MutableMap.class); + xstream.registerConverter(new StringKeyMapConverter(xstream.getMapper()), /* priority */ 10); + } + + @Test + public void testSimple() throws UnknownHostException { + Map m = Maps.newLinkedHashMap(); + m.put("a", "v"); + assertX(m, "<map>\n <a>v</a>\n</map>"); + } + + @Test + public void testDouble() throws UnknownHostException { + Map m = Maps.newLinkedHashMap(); + m.put("a", "v"); + m.put("x", 1.0d); + assertX(m, "<map>\n <a>v</a>\n <x type=\"double\">1.0</x>\n</map>"); + } + + @Test + public void testEmpty() throws UnknownHostException { + Map m = Maps.newLinkedHashMap(); + assertX(m, "<map/>"); + } + + @Test + public void testBigSpacedKeyInMutableMap() throws UnknownHostException { + Map m = MutableMap.of("a b", "x"); + assertX(m, "<MutableMap>\n <entry key=\"a b\">x</entry>\n</MutableMap>"); + } + + @Test + public void testWithNumericKey() throws UnknownHostException { + Map m = Maps.newLinkedHashMap(); + m.put("123", "v"); + m.put("a", "v2"); + assertX(m, "<map>\n <entry key=\"123\">v</entry>\n <a>v2</a>\n</map>"); + } +} http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a4c0e5fd/core/src/test/java/org/apache/brooklyn/core/util/xstream/XmlUtilTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/org/apache/brooklyn/core/util/xstream/XmlUtilTest.java b/core/src/test/java/org/apache/brooklyn/core/util/xstream/XmlUtilTest.java new file mode 100644 index 0000000..dd97d17 --- /dev/null +++ b/core/src/test/java/org/apache/brooklyn/core/util/xstream/XmlUtilTest.java @@ -0,0 +1,34 @@ +/* + * 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 static org.testng.Assert.assertEquals; + +import org.apache.brooklyn.core.util.xstream.XmlUtil; +import org.testng.annotations.Test; + + +public class XmlUtilTest { + + @Test + public void testXpath() throws Exception { + String xml = "<a><b>myb</b></a>"; + assertEquals(XmlUtil.xpath(xml, "/a/b[text()]"), "myb"); + } +} http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a4c0e5fd/core/src/test/java/org/apache/brooklyn/location/basic/AbstractLocationTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/org/apache/brooklyn/location/basic/AbstractLocationTest.java b/core/src/test/java/org/apache/brooklyn/location/basic/AbstractLocationTest.java index 089b719..d24ac65 100644 --- a/core/src/test/java/org/apache/brooklyn/location/basic/AbstractLocationTest.java +++ b/core/src/test/java/org/apache/brooklyn/location/basic/AbstractLocationTest.java @@ -29,6 +29,7 @@ import java.util.Map; 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.core.util.flags.SetFromFlag; import org.apache.brooklyn.test.entity.LocalManagementContextForTests; import org.testng.annotations.AfterMethod; import org.testng.annotations.BeforeMethod; @@ -37,7 +38,6 @@ import org.testng.annotations.Test; import brooklyn.entity.basic.Entities; import brooklyn.util.collections.MutableMap; import brooklyn.util.collections.MutableSet; -import brooklyn.util.flags.SetFromFlag; 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/org/apache/brooklyn/location/basic/LegacyAbstractLocationTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/org/apache/brooklyn/location/basic/LegacyAbstractLocationTest.java b/core/src/test/java/org/apache/brooklyn/location/basic/LegacyAbstractLocationTest.java index 10e59b3..c53762e 100644 --- a/core/src/test/java/org/apache/brooklyn/location/basic/LegacyAbstractLocationTest.java +++ b/core/src/test/java/org/apache/brooklyn/location/basic/LegacyAbstractLocationTest.java @@ -26,11 +26,11 @@ import static org.testng.Assert.assertTrue; import java.util.Collections; import java.util.Map; +import org.apache.brooklyn.core.util.flags.SetFromFlag; import org.testng.annotations.AfterMethod; import org.testng.annotations.Test; import brooklyn.util.collections.MutableMap; -import brooklyn.util.flags.SetFromFlag; import com.google.common.collect.ImmutableList; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a4c0e5fd/core/src/test/java/org/apache/brooklyn/location/basic/LocationConfigTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/org/apache/brooklyn/location/basic/LocationConfigTest.java b/core/src/test/java/org/apache/brooklyn/location/basic/LocationConfigTest.java index 1f265fd..cbf1aaa 100644 --- a/core/src/test/java/org/apache/brooklyn/location/basic/LocationConfigTest.java +++ b/core/src/test/java/org/apache/brooklyn/location/basic/LocationConfigTest.java @@ -22,6 +22,7 @@ import static org.testng.Assert.assertEquals; import org.apache.brooklyn.api.location.LocationSpec; 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.Assert; import org.testng.annotations.AfterMethod; @@ -31,7 +32,6 @@ import org.testng.annotations.Test; import brooklyn.config.ConfigKey; import brooklyn.entity.basic.ConfigKeys; import brooklyn.entity.basic.Entities; -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/org/apache/brooklyn/location/basic/LocationConfigUtilsTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/org/apache/brooklyn/location/basic/LocationConfigUtilsTest.java b/core/src/test/java/org/apache/brooklyn/location/basic/LocationConfigUtilsTest.java index e9197a1..1360f6b 100644 --- a/core/src/test/java/org/apache/brooklyn/location/basic/LocationConfigUtilsTest.java +++ b/core/src/test/java/org/apache/brooklyn/location/basic/LocationConfigUtilsTest.java @@ -23,11 +23,10 @@ import static org.testng.Assert.assertTrue; import java.io.File; +import org.apache.brooklyn.core.util.config.ConfigBag; import org.testng.Assert; import org.testng.annotations.Test; -import brooklyn.util.config.ConfigBag; - @Test public class LocationConfigUtilsTest { http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a4c0e5fd/core/src/test/java/org/apache/brooklyn/location/basic/PortRangesTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/org/apache/brooklyn/location/basic/PortRangesTest.java b/core/src/test/java/org/apache/brooklyn/location/basic/PortRangesTest.java index 2b7ab69..de23b55 100644 --- a/core/src/test/java/org/apache/brooklyn/location/basic/PortRangesTest.java +++ b/core/src/test/java/org/apache/brooklyn/location/basic/PortRangesTest.java @@ -25,8 +25,7 @@ import java.util.Iterator; import org.testng.Assert; import org.testng.annotations.Test; import org.apache.brooklyn.api.location.PortRange; - -import brooklyn.util.flags.TypeCoercions; +import org.apache.brooklyn.core.util.flags.TypeCoercions; import com.google.common.collect.ImmutableList; import com.google.common.collect.Lists; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a4c0e5fd/core/src/test/java/org/apache/brooklyn/location/basic/SshMachineLocationIntegrationTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/org/apache/brooklyn/location/basic/SshMachineLocationIntegrationTest.java b/core/src/test/java/org/apache/brooklyn/location/basic/SshMachineLocationIntegrationTest.java index 68a53c5..19b58fd 100644 --- a/core/src/test/java/org/apache/brooklyn/location/basic/SshMachineLocationIntegrationTest.java +++ b/core/src/test/java/org/apache/brooklyn/location/basic/SshMachineLocationIntegrationTest.java @@ -23,12 +23,14 @@ import java.security.KeyPair; import java.util.Arrays; import java.util.Map; -import brooklyn.util.internal.ssh.SshTool; - import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; import org.apache.brooklyn.api.management.ManagementContext; +import org.apache.brooklyn.core.util.crypto.SecureKeys; +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.internal.ssh.sshj.SshjTool.SshjToolBuilder; import org.apache.brooklyn.test.entity.LocalManagementContextForTests; import org.apache.brooklyn.test.entity.TestApplication; import org.testng.Assert; @@ -38,9 +40,6 @@ import org.testng.annotations.Test; import brooklyn.entity.basic.Entities; import brooklyn.util.collections.MutableMap; -import brooklyn.util.crypto.SecureKeys; -import brooklyn.util.internal.ssh.sshj.SshjTool; -import brooklyn.util.internal.ssh.sshj.SshjTool.SshjToolBuilder; import com.google.common.base.Preconditions; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a4c0e5fd/core/src/test/java/org/apache/brooklyn/location/basic/SshMachineLocationPerformanceTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/org/apache/brooklyn/location/basic/SshMachineLocationPerformanceTest.java b/core/src/test/java/org/apache/brooklyn/location/basic/SshMachineLocationPerformanceTest.java index 93e33a1..f7f8bf9 100644 --- a/core/src/test/java/org/apache/brooklyn/location/basic/SshMachineLocationPerformanceTest.java +++ b/core/src/test/java/org/apache/brooklyn/location/basic/SshMachineLocationPerformanceTest.java @@ -25,6 +25,7 @@ import java.util.Map; import java.util.concurrent.Executors; import java.util.concurrent.TimeUnit; +import org.apache.brooklyn.core.util.internal.ssh.SshTool; import org.apache.brooklyn.test.PerformanceTestUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -33,7 +34,6 @@ import org.testng.annotations.BeforeMethod; import org.testng.annotations.Test; import brooklyn.util.collections.MutableMap; -import brooklyn.util.internal.ssh.SshTool; import brooklyn.util.net.Networking; import brooklyn.util.stream.Streams; import brooklyn.util.text.Identifiers; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a4c0e5fd/core/src/test/java/org/apache/brooklyn/location/basic/SshMachineLocationReuseIntegrationTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/org/apache/brooklyn/location/basic/SshMachineLocationReuseIntegrationTest.java b/core/src/test/java/org/apache/brooklyn/location/basic/SshMachineLocationReuseIntegrationTest.java index 6ba27e7..fd5884c 100644 --- a/core/src/test/java/org/apache/brooklyn/location/basic/SshMachineLocationReuseIntegrationTest.java +++ b/core/src/test/java/org/apache/brooklyn/location/basic/SshMachineLocationReuseIntegrationTest.java @@ -35,11 +35,11 @@ import brooklyn.entity.basic.Entities; import org.apache.brooklyn.api.location.LocationSpec; import org.apache.brooklyn.core.management.internal.LocalManagementContext; +import org.apache.brooklyn.core.util.internal.ssh.SshTool; +import org.apache.brooklyn.core.util.internal.ssh.sshj.SshjTool; import brooklyn.test.Asserts; import brooklyn.util.collections.MutableMap; -import brooklyn.util.internal.ssh.SshTool; -import brooklyn.util.internal.ssh.sshj.SshjTool; import brooklyn.util.net.Networking; import brooklyn.util.stream.Streams; import brooklyn.util.time.Duration; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a4c0e5fd/core/src/test/java/org/apache/brooklyn/location/basic/SshMachineLocationTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/org/apache/brooklyn/location/basic/SshMachineLocationTest.java b/core/src/test/java/org/apache/brooklyn/location/basic/SshMachineLocationTest.java index b4ee5ef..ca51182 100644 --- a/core/src/test/java/org/apache/brooklyn/location/basic/SshMachineLocationTest.java +++ b/core/src/test/java/org/apache/brooklyn/location/basic/SshMachineLocationTest.java @@ -43,6 +43,13 @@ import org.apache.brooklyn.api.location.MachineDetails; import org.apache.brooklyn.api.location.MachineLocation; import org.apache.brooklyn.api.location.PortRange; import org.apache.brooklyn.api.management.ManagementContext; +import org.apache.brooklyn.core.util.config.ConfigBag; +import org.apache.brooklyn.core.util.file.ArchiveUtils; +import org.apache.brooklyn.core.util.internal.ssh.RecordingSshTool; +import org.apache.brooklyn.core.util.internal.ssh.SshException; +import org.apache.brooklyn.core.util.internal.ssh.SshTool; +import org.apache.brooklyn.core.util.task.BasicExecutionContext; +import org.apache.brooklyn.core.util.task.BasicExecutionManager; import org.apache.brooklyn.test.entity.LocalManagementContextForTests; import org.apache.brooklyn.test.entity.TestApplication; import org.testng.annotations.AfterMethod; @@ -58,18 +65,11 @@ import brooklyn.entity.effector.EffectorTaskTest; import brooklyn.entity.effector.Effectors; import brooklyn.test.Asserts; import brooklyn.util.collections.MutableMap; -import brooklyn.util.config.ConfigBag; -import brooklyn.util.file.ArchiveUtils; import brooklyn.util.guava.Maybe; -import brooklyn.util.internal.ssh.RecordingSshTool; -import brooklyn.util.internal.ssh.SshException; -import brooklyn.util.internal.ssh.SshTool; import brooklyn.util.net.Networking; import brooklyn.util.net.Urls; import brooklyn.util.os.Os; import brooklyn.util.stream.Streams; -import brooklyn.util.task.BasicExecutionContext; -import brooklyn.util.task.BasicExecutionManager; import brooklyn.util.time.Duration; import com.google.common.base.Charsets; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a4c0e5fd/core/src/test/java/org/apache/brooklyn/location/cloud/CloudMachineNamerTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/org/apache/brooklyn/location/cloud/CloudMachineNamerTest.java b/core/src/test/java/org/apache/brooklyn/location/cloud/CloudMachineNamerTest.java index 9d4acad..fe26a43 100644 --- a/core/src/test/java/org/apache/brooklyn/location/cloud/CloudMachineNamerTest.java +++ b/core/src/test/java/org/apache/brooklyn/location/cloud/CloudMachineNamerTest.java @@ -22,6 +22,7 @@ import static org.testng.Assert.assertFalse; import static org.testng.Assert.assertTrue; import org.apache.brooklyn.api.entity.proxying.EntitySpec; +import org.apache.brooklyn.core.util.config.ConfigBag; import org.apache.brooklyn.location.cloud.names.AbstractCloudMachineNamer; import org.apache.brooklyn.location.cloud.names.CloudMachineNamer; import org.apache.brooklyn.test.entity.LocalManagementContextForTests; @@ -35,8 +36,9 @@ import org.testng.annotations.Test; import brooklyn.entity.basic.ApplicationBuilder; import brooklyn.entity.basic.Entities; + import org.apache.brooklyn.location.cloud.names.BasicCloudMachineNamer; -import brooklyn.util.config.ConfigBag; + import brooklyn.util.text.Strings; public class CloudMachineNamerTest { http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a4c0e5fd/core/src/test/java/org/apache/brooklyn/location/cloud/CustomMachineNamerTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/org/apache/brooklyn/location/cloud/CustomMachineNamerTest.java b/core/src/test/java/org/apache/brooklyn/location/cloud/CustomMachineNamerTest.java index f0e7d11..0afad81 100644 --- a/core/src/test/java/org/apache/brooklyn/location/cloud/CustomMachineNamerTest.java +++ b/core/src/test/java/org/apache/brooklyn/location/cloud/CustomMachineNamerTest.java @@ -19,6 +19,7 @@ package org.apache.brooklyn.location.cloud; import org.apache.brooklyn.api.entity.proxying.EntitySpec; +import org.apache.brooklyn.core.util.config.ConfigBag; import org.apache.brooklyn.test.entity.LocalManagementContextForTests; import org.apache.brooklyn.test.entity.TestApplication; import org.apache.brooklyn.test.entity.TestEntity; @@ -29,8 +30,8 @@ import org.testng.annotations.Test; import brooklyn.entity.basic.ApplicationBuilder; import brooklyn.entity.basic.Entities; + import org.apache.brooklyn.location.cloud.names.CustomMachineNamer; -import brooklyn.util.config.ConfigBag; import com.google.common.collect.ImmutableMap; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a4c0e5fd/core/src/test/java/org/apache/brooklyn/test/entity/BlockingEntity.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/org/apache/brooklyn/test/entity/BlockingEntity.java b/core/src/test/java/org/apache/brooklyn/test/entity/BlockingEntity.java index 3586701..7df9a89 100644 --- a/core/src/test/java/org/apache/brooklyn/test/entity/BlockingEntity.java +++ b/core/src/test/java/org/apache/brooklyn/test/entity/BlockingEntity.java @@ -21,10 +21,10 @@ package org.apache.brooklyn.test.entity; import java.util.concurrent.CountDownLatch; import org.apache.brooklyn.api.entity.proxying.ImplementedBy; +import org.apache.brooklyn.core.util.flags.SetFromFlag; import brooklyn.config.ConfigKey; import brooklyn.event.basic.BasicConfigKey; -import brooklyn.util.flags.SetFromFlag; /** * Mock entity that blocks on startup via the {@link CountDownLatch} argument. http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a4c0e5fd/core/src/test/java/org/apache/brooklyn/test/entity/TestEntity.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/org/apache/brooklyn/test/entity/TestEntity.java b/core/src/test/java/org/apache/brooklyn/test/entity/TestEntity.java index 01b835e..8f0eff4 100644 --- a/core/src/test/java/org/apache/brooklyn/test/entity/TestEntity.java +++ b/core/src/test/java/org/apache/brooklyn/test/entity/TestEntity.java @@ -28,6 +28,7 @@ import org.apache.brooklyn.api.entity.basic.EntityLocal; import org.apache.brooklyn.api.entity.proxying.EntitySpec; import org.apache.brooklyn.api.entity.proxying.ImplementedBy; import org.apache.brooklyn.api.event.AttributeSensor; +import org.apache.brooklyn.core.util.flags.SetFromFlag; import org.testng.collections.Lists; import org.testng.internal.annotations.Sets; @@ -49,7 +50,6 @@ import brooklyn.event.basic.MapConfigKey; import brooklyn.event.basic.Sensors; import brooklyn.event.basic.SetConfigKey; import brooklyn.util.collections.MutableMap; -import brooklyn.util.flags.SetFromFlag; /** * Mock entity for testing. http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a4c0e5fd/core/src/test/resources/brooklyn/entity/rebind/compiler_compatibility_eclipse.xml ---------------------------------------------------------------------- diff --git a/core/src/test/resources/brooklyn/entity/rebind/compiler_compatibility_eclipse.xml b/core/src/test/resources/brooklyn/entity/rebind/compiler_compatibility_eclipse.xml index dc972ef..7dd5ac6 100644 --- a/core/src/test/resources/brooklyn/entity/rebind/compiler_compatibility_eclipse.xml +++ b/core/src/test/resources/brooklyn/entity/rebind/compiler_compatibility_eclipse.xml @@ -17,25 +17,25 @@ specific language governing permissions and limitations under the License. --> -<brooklyn.util.xstream.CompilerCompatibilityTest> - <enclosingClass/> +<org.apache.brooklyn.core.util.xstream.CompilerCompatibilityTest> + <enclosingClass /> <dynamicClass> - <this_-1 reference="../../enclosingClass"/> + <this_-1 reference="../../enclosingClass" /> </dynamicClass> <dynamicExtendingClass> - <this_-1 defined-in="brooklyn.util.xstream.CompilerCompatibilityTest$EnclosingClass$DynamicClass" reference="../../enclosingClass"/> - <this_-1 reference="../../enclosingClass"/> + <this_-1 defined-in="org.apache.brooklyn.core.util.xstream.CompilerCompatibilityTest$EnclosingClass$DynamicClass" reference="../../enclosingClass" /> + <this_-1 reference="../../enclosingClass" /> </dynamicExtendingClass> <enclosingDynamicClass> - <this_-1 reference="../../enclosingClass"/> + <this_-1 reference="../../enclosingClass" /> </enclosingDynamicClass> <nestedDynamicClass> - <this_-2 reference="../../enclosingDynamicClass"/> + <this_-2 reference="../../enclosingDynamicClass" /> </nestedDynamicClass> <!-- NOT SUPPORTED <dynamicExtendingClassWithDifferentScope> - <this_-2 reference="../../enclosingDynamicClass"/> - <this_-1 reference="../../enclosingClass"/> + <this_-2 reference="../../enclosingDynamicClass" /> + <this_-1 reference="../../enclosingClass" /> </dynamicExtendingClassWithDifferentScope> --> -</brooklyn.util.xstream.CompilerCompatibilityTest> +</org.apache.brooklyn.core.util.xstream.CompilerCompatibilityTest> http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a4c0e5fd/core/src/test/resources/brooklyn/entity/rebind/compiler_compatibility_oracle.xml ---------------------------------------------------------------------- diff --git a/core/src/test/resources/brooklyn/entity/rebind/compiler_compatibility_oracle.xml b/core/src/test/resources/brooklyn/entity/rebind/compiler_compatibility_oracle.xml index a01692e..2b49251 100644 --- a/core/src/test/resources/brooklyn/entity/rebind/compiler_compatibility_oracle.xml +++ b/core/src/test/resources/brooklyn/entity/rebind/compiler_compatibility_oracle.xml @@ -17,25 +17,25 @@ specific language governing permissions and limitations under the License. --> -<brooklyn.util.xstream.CompilerCompatibilityTest> - <enclosingClass/> +<org.apache.brooklyn.core.util.xstream.CompilerCompatibilityTest> + <enclosingClass /> <dynamicClass> - <outer-class reference="../../enclosingClass"/> + <outer-class reference="../../enclosingClass" /> </dynamicClass> <dynamicExtendingClass> - <outer-class defined-in="brooklyn.util.xstream.CompilerCompatibilityTest$EnclosingClass$DynamicClass" reference="../../enclosingClass"/> + <outer-class defined-in="org.apache.brooklyn.core.util.xstream.CompilerCompatibilityTest$EnclosingClass$DynamicClass" reference="../../enclosingClass" /> <outer-class reference="../../enclosingClass"/> </dynamicExtendingClass> <enclosingDynamicClass> - <outer-class reference="../../enclosingClass"/> + <outer-class reference="../../enclosingClass" /> </enclosingDynamicClass> <nestedDynamicClass> - <this_-1 reference="../../enclosingDynamicClass"/> + <this_-1 reference="../../enclosingDynamicClass" /> </nestedDynamicClass> <!-- NOT SUPPORTED <dynamicExtendingClassWithDifferentScope> - <this_-1 reference="../../enclosingDynamicClass"/> - <outer-class reference="../../enclosingClass"/> + <this_-1 reference="../../enclosingDynamicClass" /> + <outer-class reference="../../enclosingClass" /> </dynamicExtendingClassWithDifferentScope> --> -</brooklyn.util.xstream.CompilerCompatibilityTest> +</org.apache.brooklyn.core.util.xstream.CompilerCompatibilityTest> http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a4c0e5fd/examples/global-web-fabric/src/main/java/org/apache/brooklyn/demo/GlobalWebFabricExample.java ---------------------------------------------------------------------- diff --git a/examples/global-web-fabric/src/main/java/org/apache/brooklyn/demo/GlobalWebFabricExample.java b/examples/global-web-fabric/src/main/java/org/apache/brooklyn/demo/GlobalWebFabricExample.java index d53cf44..6fd3462 100644 --- a/examples/global-web-fabric/src/main/java/org/apache/brooklyn/demo/GlobalWebFabricExample.java +++ b/examples/global-web-fabric/src/main/java/org/apache/brooklyn/demo/GlobalWebFabricExample.java @@ -28,6 +28,8 @@ import org.slf4j.LoggerFactory; import org.apache.brooklyn.api.catalog.Catalog; import org.apache.brooklyn.api.catalog.CatalogConfig; import org.apache.brooklyn.api.entity.proxying.EntitySpec; +import org.apache.brooklyn.core.util.BrooklynMavenArtifacts; +import org.apache.brooklyn.core.util.ResourceUtils; import org.apache.brooklyn.entity.dns.geoscaling.GeoscalingDnsService; import org.apache.brooklyn.entity.proxy.AbstractController; import org.apache.brooklyn.entity.webapp.ElasticJavaWebAppService; @@ -43,11 +45,9 @@ import brooklyn.entity.group.DynamicRegionsFabric; import brooklyn.event.basic.PortAttributeSensorAndConfigKey; import org.apache.brooklyn.launcher.BrooklynLauncher; - import org.apache.brooklyn.location.basic.PortRanges; -import brooklyn.util.BrooklynMavenArtifacts; + import brooklyn.util.CommandLineUtil; -import brooklyn.util.ResourceUtils; import com.google.common.base.Joiner; import com.google.common.collect.ImmutableList; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a4c0e5fd/examples/simple-nosql-cluster/src/main/java/org/apache/brooklyn/demo/CumulusRDFApplication.java ---------------------------------------------------------------------- diff --git a/examples/simple-nosql-cluster/src/main/java/org/apache/brooklyn/demo/CumulusRDFApplication.java b/examples/simple-nosql-cluster/src/main/java/org/apache/brooklyn/demo/CumulusRDFApplication.java index 507ed37..da88bff 100644 --- a/examples/simple-nosql-cluster/src/main/java/org/apache/brooklyn/demo/CumulusRDFApplication.java +++ b/examples/simple-nosql-cluster/src/main/java/org/apache/brooklyn/demo/CumulusRDFApplication.java @@ -34,6 +34,10 @@ import org.apache.brooklyn.api.event.SensorEventListener; import org.apache.brooklyn.api.location.Location; import org.apache.brooklyn.api.policy.EnricherSpec; import org.apache.brooklyn.api.policy.PolicySpec; +import org.apache.brooklyn.core.util.ResourceUtils; +import org.apache.brooklyn.core.util.config.ConfigBag; +import org.apache.brooklyn.core.util.task.DynamicTasks; +import org.apache.brooklyn.core.util.text.TemplateProcessor; import org.apache.brooklyn.entity.nosql.cassandra.CassandraDatacenter; import org.apache.brooklyn.entity.nosql.cassandra.CassandraFabric; import org.apache.brooklyn.entity.nosql.cassandra.CassandraNode; @@ -63,15 +67,11 @@ import brooklyn.policy.ha.ServiceFailureDetector; import brooklyn.policy.ha.ServiceReplacer; import brooklyn.policy.ha.ServiceRestarter; import brooklyn.util.CommandLineUtil; -import brooklyn.util.ResourceUtils; import brooklyn.util.collections.MutableList; import brooklyn.util.collections.MutableMap; -import brooklyn.util.config.ConfigBag; import brooklyn.util.exceptions.Exceptions; -import brooklyn.util.task.DynamicTasks; import brooklyn.util.text.StringEscapes.JavaStringEscapes; import brooklyn.util.text.Strings; -import brooklyn.util.text.TemplateProcessor; import com.google.common.collect.ImmutableList; import com.google.common.collect.Iterables; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a4c0e5fd/examples/simple-web-cluster/src/main/java/org/apache/brooklyn/demo/WebClusterDatabaseExampleApp.java ---------------------------------------------------------------------- diff --git a/examples/simple-web-cluster/src/main/java/org/apache/brooklyn/demo/WebClusterDatabaseExampleApp.java b/examples/simple-web-cluster/src/main/java/org/apache/brooklyn/demo/WebClusterDatabaseExampleApp.java index 5b72a58..441999f 100644 --- a/examples/simple-web-cluster/src/main/java/org/apache/brooklyn/demo/WebClusterDatabaseExampleApp.java +++ b/examples/simple-web-cluster/src/main/java/org/apache/brooklyn/demo/WebClusterDatabaseExampleApp.java @@ -30,6 +30,8 @@ import org.apache.brooklyn.api.catalog.Catalog; import org.apache.brooklyn.api.catalog.CatalogConfig; import org.apache.brooklyn.api.entity.proxying.EntitySpec; import org.apache.brooklyn.api.event.AttributeSensor; +import org.apache.brooklyn.core.util.BrooklynMavenArtifacts; +import org.apache.brooklyn.core.util.ResourceUtils; import org.apache.brooklyn.entity.webapp.ControlledDynamicWebAppCluster; import org.apache.brooklyn.entity.webapp.DynamicWebAppCluster; import org.apache.brooklyn.entity.webapp.JavaWebAppService; @@ -49,12 +51,10 @@ import brooklyn.entity.java.JavaEntityMethods; import brooklyn.event.basic.Sensors; import org.apache.brooklyn.launcher.BrooklynLauncher; - import org.apache.brooklyn.location.basic.PortRanges; + import brooklyn.policy.autoscaling.AutoScalerPolicy; -import brooklyn.util.BrooklynMavenArtifacts; import brooklyn.util.CommandLineUtil; -import brooklyn.util.ResourceUtils; import com.google.common.collect.ImmutableMap; import com.google.common.collect.ImmutableSet; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a4c0e5fd/locations/jclouds/src/main/java/brooklyn/policy/os/CreateUserPolicy.java ---------------------------------------------------------------------- diff --git a/locations/jclouds/src/main/java/brooklyn/policy/os/CreateUserPolicy.java b/locations/jclouds/src/main/java/brooklyn/policy/os/CreateUserPolicy.java index bc8eab1..8327cf1 100644 --- a/locations/jclouds/src/main/java/brooklyn/policy/os/CreateUserPolicy.java +++ b/locations/jclouds/src/main/java/brooklyn/policy/os/CreateUserPolicy.java @@ -26,6 +26,8 @@ import org.apache.brooklyn.api.event.AttributeSensor; import org.apache.brooklyn.api.event.SensorEvent; import org.apache.brooklyn.api.event.SensorEventListener; import org.apache.brooklyn.api.location.Location; +import org.apache.brooklyn.core.util.flags.SetFromFlag; +import org.apache.brooklyn.core.util.internal.ssh.SshTool; import org.jclouds.compute.config.AdminAccessConfiguration; import org.jclouds.scriptbuilder.functions.InitAdminAccess; import org.jclouds.scriptbuilder.statements.login.AdminAccess; @@ -42,8 +44,6 @@ import brooklyn.event.basic.Sensors; import org.apache.brooklyn.location.basic.SshMachineLocation; import brooklyn.policy.basic.AbstractPolicy; -import brooklyn.util.flags.SetFromFlag; -import brooklyn.util.internal.ssh.SshTool; import brooklyn.util.text.Identifiers; import com.google.common.annotations.Beta; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a4c0e5fd/locations/jclouds/src/main/java/org/apache/brooklyn/location/jclouds/BrooklynMachinePool.java ---------------------------------------------------------------------- diff --git a/locations/jclouds/src/main/java/org/apache/brooklyn/location/jclouds/BrooklynMachinePool.java b/locations/jclouds/src/main/java/org/apache/brooklyn/location/jclouds/BrooklynMachinePool.java index fa71a3a..f447482 100644 --- a/locations/jclouds/src/main/java/org/apache/brooklyn/location/jclouds/BrooklynMachinePool.java +++ b/locations/jclouds/src/main/java/org/apache/brooklyn/location/jclouds/BrooklynMachinePool.java @@ -28,6 +28,7 @@ import java.util.concurrent.atomic.AtomicReference; import org.apache.brooklyn.api.entity.Entity; import org.apache.brooklyn.api.location.MachineLocation; import org.apache.brooklyn.api.management.Task; +import org.apache.brooklyn.core.util.task.BasicExecutionContext; import org.jclouds.compute.domain.NodeMetadata; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -40,7 +41,6 @@ import org.apache.brooklyn.location.jclouds.pool.MachineSet; import org.apache.brooklyn.location.jclouds.pool.ReusableMachineTemplate; import brooklyn.util.collections.MutableMap; -import brooklyn.util.task.BasicExecutionContext; import com.google.common.base.Throwables; import com.google.common.collect.ImmutableList; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a4c0e5fd/locations/jclouds/src/main/java/org/apache/brooklyn/location/jclouds/ComputeServiceRegistry.java ---------------------------------------------------------------------- diff --git a/locations/jclouds/src/main/java/org/apache/brooklyn/location/jclouds/ComputeServiceRegistry.java b/locations/jclouds/src/main/java/org/apache/brooklyn/location/jclouds/ComputeServiceRegistry.java index a835e2c..8d48cf5 100644 --- a/locations/jclouds/src/main/java/org/apache/brooklyn/location/jclouds/ComputeServiceRegistry.java +++ b/locations/jclouds/src/main/java/org/apache/brooklyn/location/jclouds/ComputeServiceRegistry.java @@ -18,10 +18,9 @@ */ package org.apache.brooklyn.location.jclouds; +import org.apache.brooklyn.core.util.config.ConfigBag; import org.jclouds.compute.ComputeService; -import brooklyn.util.config.ConfigBag; - public interface ComputeServiceRegistry { public ComputeService findComputeService(ConfigBag conf, boolean allowReuse); http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a4c0e5fd/locations/jclouds/src/main/java/org/apache/brooklyn/location/jclouds/ComputeServiceRegistryImpl.java ---------------------------------------------------------------------- diff --git a/locations/jclouds/src/main/java/org/apache/brooklyn/location/jclouds/ComputeServiceRegistryImpl.java b/locations/jclouds/src/main/java/org/apache/brooklyn/location/jclouds/ComputeServiceRegistryImpl.java index f3f39bb..670379d 100644 --- a/locations/jclouds/src/main/java/org/apache/brooklyn/location/jclouds/ComputeServiceRegistryImpl.java +++ b/locations/jclouds/src/main/java/org/apache/brooklyn/location/jclouds/ComputeServiceRegistryImpl.java @@ -27,6 +27,7 @@ import java.util.Map; import java.util.Properties; import java.util.concurrent.ConcurrentHashMap; +import org.apache.brooklyn.core.util.config.ConfigBag; import org.apache.brooklyn.location.cloud.CloudLocationConfig; import org.jclouds.Constants; import org.jclouds.ContextBuilder; @@ -41,7 +42,6 @@ import org.slf4j.LoggerFactory; import brooklyn.entity.basic.Sanitizer; import brooklyn.util.collections.MutableMap; -import brooklyn.util.config.ConfigBag; import brooklyn.util.time.Duration; import com.google.common.base.Predicates; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a4c0e5fd/locations/jclouds/src/main/java/org/apache/brooklyn/location/jclouds/JcloudsByonLocationResolver.java ---------------------------------------------------------------------- diff --git a/locations/jclouds/src/main/java/org/apache/brooklyn/location/jclouds/JcloudsByonLocationResolver.java b/locations/jclouds/src/main/java/org/apache/brooklyn/location/jclouds/JcloudsByonLocationResolver.java index e8f63b3..eb9ebfa 100644 --- a/locations/jclouds/src/main/java/org/apache/brooklyn/location/jclouds/JcloudsByonLocationResolver.java +++ b/locations/jclouds/src/main/java/org/apache/brooklyn/location/jclouds/JcloudsByonLocationResolver.java @@ -31,6 +31,7 @@ import org.apache.brooklyn.api.location.LocationSpec; import org.apache.brooklyn.api.location.NoMachinesAvailableException; import org.apache.brooklyn.api.management.ManagementContext; 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.BasicLocationRegistry; @@ -41,7 +42,6 @@ import org.apache.brooklyn.location.basic.LocationInternal; import org.apache.brooklyn.location.basic.LocationPropertiesFromBrooklynProperties; import brooklyn.util.collections.MutableMap; -import brooklyn.util.config.ConfigBag; import brooklyn.util.exceptions.Exceptions; import brooklyn.util.text.KeyValueParser; import brooklyn.util.text.Strings; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a4c0e5fd/locations/jclouds/src/main/java/org/apache/brooklyn/location/jclouds/JcloudsLocation.java ---------------------------------------------------------------------- diff --git a/locations/jclouds/src/main/java/org/apache/brooklyn/location/jclouds/JcloudsLocation.java b/locations/jclouds/src/main/java/org/apache/brooklyn/location/jclouds/JcloudsLocation.java index 2583234..1c1254c 100644 --- a/locations/jclouds/src/main/java/org/apache/brooklyn/location/jclouds/JcloudsLocation.java +++ b/locations/jclouds/src/main/java/org/apache/brooklyn/location/jclouds/JcloudsLocation.java @@ -57,6 +57,15 @@ import org.apache.brooklyn.api.location.MachineLocationCustomizer; import org.apache.brooklyn.api.location.MachineManagementMixins; import org.apache.brooklyn.api.location.NoMachinesAvailableException; import org.apache.brooklyn.api.management.AccessController; +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.flags.MethodCoercions; +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.SshTool; +import org.apache.brooklyn.core.util.text.TemplateProcessor; import org.apache.brooklyn.location.access.PortMapping; import org.apache.brooklyn.location.basic.AbstractLocation; import org.apache.brooklyn.location.cloud.AbstractCloudMachineProvisioningLocation; @@ -146,21 +155,13 @@ import org.apache.brooklyn.location.cloud.names.CloudMachineNamer; import org.apache.brooklyn.location.jclouds.JcloudsPredicates.NodeInLocation; import org.apache.brooklyn.location.jclouds.templates.PortableTemplateBuilder; -import brooklyn.util.ResourceUtils; import brooklyn.util.collections.MutableList; import brooklyn.util.collections.MutableMap; import brooklyn.util.collections.MutableSet; -import brooklyn.util.config.ConfigBag; -import brooklyn.util.crypto.SecureKeys; import brooklyn.util.exceptions.CompoundRuntimeException; import brooklyn.util.exceptions.Exceptions; import brooklyn.util.exceptions.ReferenceWithError; -import brooklyn.util.flags.MethodCoercions; -import brooklyn.util.flags.SetFromFlag; -import brooklyn.util.flags.TypeCoercions; import brooklyn.util.guava.Maybe; -import brooklyn.util.internal.ssh.ShellTool; -import brooklyn.util.internal.ssh.SshTool; import brooklyn.util.javalang.Enums; import brooklyn.util.javalang.Reflections; import brooklyn.util.net.Cidr; @@ -177,7 +178,6 @@ import brooklyn.util.text.ByteSizeStrings; import brooklyn.util.text.Identifiers; import brooklyn.util.text.KeyValueParser; import brooklyn.util.text.Strings; -import brooklyn.util.text.TemplateProcessor; import brooklyn.util.time.Duration; import brooklyn.util.time.Time; import io.cloudsoft.winrm4j.pywinrm.Session; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a4c0e5fd/locations/jclouds/src/main/java/org/apache/brooklyn/location/jclouds/JcloudsLocationConfig.java ---------------------------------------------------------------------- diff --git a/locations/jclouds/src/main/java/org/apache/brooklyn/location/jclouds/JcloudsLocationConfig.java b/locations/jclouds/src/main/java/org/apache/brooklyn/location/jclouds/JcloudsLocationConfig.java index 9fce742..1922b39 100644 --- a/locations/jclouds/src/main/java/org/apache/brooklyn/location/jclouds/JcloudsLocationConfig.java +++ b/locations/jclouds/src/main/java/org/apache/brooklyn/location/jclouds/JcloudsLocationConfig.java @@ -23,6 +23,7 @@ import java.util.List; import java.util.Map; import java.util.concurrent.Semaphore; +import org.apache.brooklyn.core.util.internal.ssh.SshTool; import org.apache.brooklyn.location.jclouds.networking.JcloudsPortForwarderExtension; import org.jclouds.Constants; import org.jclouds.compute.domain.Image; @@ -33,11 +34,11 @@ import org.jclouds.domain.LoginCredentials; import brooklyn.config.ConfigKey; import brooklyn.entity.basic.ConfigKeys; import brooklyn.event.basic.BasicConfigKey; + import org.apache.brooklyn.location.access.BrooklynAccessUtils; import org.apache.brooklyn.location.access.PortForwardManager; import org.apache.brooklyn.location.basic.LocationConfigKeys; import org.apache.brooklyn.location.cloud.CloudLocationConfig; -import brooklyn.util.internal.ssh.SshTool; import com.google.common.annotations.Beta; import com.google.common.base.Function; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a4c0e5fd/locations/jclouds/src/main/java/org/apache/brooklyn/location/jclouds/JcloudsLocationCustomizer.java ---------------------------------------------------------------------- diff --git a/locations/jclouds/src/main/java/org/apache/brooklyn/location/jclouds/JcloudsLocationCustomizer.java b/locations/jclouds/src/main/java/org/apache/brooklyn/location/jclouds/JcloudsLocationCustomizer.java index b6cb363..d7cf619 100644 --- a/locations/jclouds/src/main/java/org/apache/brooklyn/location/jclouds/JcloudsLocationCustomizer.java +++ b/locations/jclouds/src/main/java/org/apache/brooklyn/location/jclouds/JcloudsLocationCustomizer.java @@ -18,6 +18,7 @@ */ package org.apache.brooklyn.location.jclouds; +import org.apache.brooklyn.core.util.config.ConfigBag; import org.jclouds.compute.ComputeService; import org.jclouds.compute.domain.Template; import org.jclouds.compute.domain.TemplateBuilder; @@ -25,8 +26,6 @@ import org.jclouds.compute.options.TemplateOptions; import com.google.common.annotations.Beta; -import brooklyn.util.config.ConfigBag; - /** * Customization hooks to allow apps to perform specific customisation at each stage of jclouds machine provisioning. * For example, an app could attach an EBS volume to an EC2 node, or configure a desired availability zone. http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a4c0e5fd/locations/jclouds/src/main/java/org/apache/brooklyn/location/jclouds/JcloudsMachineNamer.java ---------------------------------------------------------------------- diff --git a/locations/jclouds/src/main/java/org/apache/brooklyn/location/jclouds/JcloudsMachineNamer.java b/locations/jclouds/src/main/java/org/apache/brooklyn/location/jclouds/JcloudsMachineNamer.java index 4f4587e..e2cd2e1 100644 --- a/locations/jclouds/src/main/java/org/apache/brooklyn/location/jclouds/JcloudsMachineNamer.java +++ b/locations/jclouds/src/main/java/org/apache/brooklyn/location/jclouds/JcloudsMachineNamer.java @@ -18,8 +18,8 @@ */ package org.apache.brooklyn.location.jclouds; +import org.apache.brooklyn.core.util.config.ConfigBag; import org.apache.brooklyn.location.cloud.names.BasicCloudMachineNamer; -import brooklyn.util.config.ConfigBag; public class JcloudsMachineNamer extends BasicCloudMachineNamer { http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a4c0e5fd/locations/jclouds/src/main/java/org/apache/brooklyn/location/jclouds/JcloudsPropertiesFromBrooklynProperties.java ---------------------------------------------------------------------- diff --git a/locations/jclouds/src/main/java/org/apache/brooklyn/location/jclouds/JcloudsPropertiesFromBrooklynProperties.java b/locations/jclouds/src/main/java/org/apache/brooklyn/location/jclouds/JcloudsPropertiesFromBrooklynProperties.java index f307041..87e8ce4 100644 --- a/locations/jclouds/src/main/java/org/apache/brooklyn/location/jclouds/JcloudsPropertiesFromBrooklynProperties.java +++ b/locations/jclouds/src/main/java/org/apache/brooklyn/location/jclouds/JcloudsPropertiesFromBrooklynProperties.java @@ -20,14 +20,16 @@ package org.apache.brooklyn.location.jclouds; import java.util.Map; +import org.apache.brooklyn.core.util.config.ConfigBag; import org.apache.brooklyn.location.basic.DeprecatedKeysMappingBuilder; import org.apache.brooklyn.location.basic.LocationPropertiesFromBrooklynProperties; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import brooklyn.config.ConfigUtils; + import org.apache.brooklyn.location.basic.LocationConfigKeys; -import brooklyn.util.config.ConfigBag; + import brooklyn.util.javalang.JavaClassNames; import com.google.common.base.Splitter; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a4c0e5fd/locations/jclouds/src/main/java/org/apache/brooklyn/location/jclouds/JcloudsSshMachineLocation.java ---------------------------------------------------------------------- diff --git a/locations/jclouds/src/main/java/org/apache/brooklyn/location/jclouds/JcloudsSshMachineLocation.java b/locations/jclouds/src/main/java/org/apache/brooklyn/location/jclouds/JcloudsSshMachineLocation.java index a2a5735..3ce7892 100644 --- a/locations/jclouds/src/main/java/org/apache/brooklyn/location/jclouds/JcloudsSshMachineLocation.java +++ b/locations/jclouds/src/main/java/org/apache/brooklyn/location/jclouds/JcloudsSshMachineLocation.java @@ -34,6 +34,7 @@ import javax.annotation.Nullable; 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.core.util.flags.SetFromFlag; import org.apache.brooklyn.location.basic.BasicHardwareDetails; import org.apache.brooklyn.location.basic.BasicMachineDetails; import org.apache.brooklyn.location.basic.BasicOsDetails; @@ -55,7 +56,6 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; import brooklyn.util.exceptions.Exceptions; -import brooklyn.util.flags.SetFromFlag; import brooklyn.util.net.Networking; import brooklyn.util.text.Strings; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a4c0e5fd/locations/jclouds/src/main/java/org/apache/brooklyn/location/jclouds/JcloudsUtil.java ---------------------------------------------------------------------- diff --git a/locations/jclouds/src/main/java/org/apache/brooklyn/location/jclouds/JcloudsUtil.java b/locations/jclouds/src/main/java/org/apache/brooklyn/location/jclouds/JcloudsUtil.java index e3026df..c981f26 100644 --- a/locations/jclouds/src/main/java/org/apache/brooklyn/location/jclouds/JcloudsUtil.java +++ b/locations/jclouds/src/main/java/org/apache/brooklyn/location/jclouds/JcloudsUtil.java @@ -36,6 +36,7 @@ import java.util.concurrent.TimeoutException; import javax.annotation.Nullable; +import org.apache.brooklyn.core.util.config.ConfigBag; import org.jclouds.Constants; import org.jclouds.ContextBuilder; import org.jclouds.aws.ec2.AWSEC2Api; @@ -80,7 +81,6 @@ import com.google.inject.Module; import brooklyn.entity.basic.Sanitizer; import brooklyn.util.collections.MutableList; -import brooklyn.util.config.ConfigBag; import brooklyn.util.exceptions.Exceptions; import brooklyn.util.net.Protocol; import brooklyn.util.ssh.BashCommands; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a4c0e5fd/locations/jclouds/src/main/java/org/apache/brooklyn/location/jclouds/JcloudsWinRmMachineLocation.java ---------------------------------------------------------------------- diff --git a/locations/jclouds/src/main/java/org/apache/brooklyn/location/jclouds/JcloudsWinRmMachineLocation.java b/locations/jclouds/src/main/java/org/apache/brooklyn/location/jclouds/JcloudsWinRmMachineLocation.java index 753d772..1204856 100644 --- a/locations/jclouds/src/main/java/org/apache/brooklyn/location/jclouds/JcloudsWinRmMachineLocation.java +++ b/locations/jclouds/src/main/java/org/apache/brooklyn/location/jclouds/JcloudsWinRmMachineLocation.java @@ -25,13 +25,13 @@ import java.net.UnknownHostException; import java.util.Iterator; import java.util.Set; +import org.apache.brooklyn.core.util.flags.SetFromFlag; import org.apache.brooklyn.location.basic.WinRmMachineLocation; import org.jclouds.compute.domain.NodeMetadata; import org.jclouds.compute.domain.Template; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import brooklyn.util.flags.SetFromFlag; import brooklyn.util.net.Networking; import com.google.common.base.Objects; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a4c0e5fd/locations/jclouds/src/main/java/org/apache/brooklyn/location/jclouds/SudoTtyFixingCustomizer.java ---------------------------------------------------------------------- diff --git a/locations/jclouds/src/main/java/org/apache/brooklyn/location/jclouds/SudoTtyFixingCustomizer.java b/locations/jclouds/src/main/java/org/apache/brooklyn/location/jclouds/SudoTtyFixingCustomizer.java index d48a67c..f7bbc2c 100644 --- a/locations/jclouds/src/main/java/org/apache/brooklyn/location/jclouds/SudoTtyFixingCustomizer.java +++ b/locations/jclouds/src/main/java/org/apache/brooklyn/location/jclouds/SudoTtyFixingCustomizer.java @@ -18,16 +18,15 @@ */ package org.apache.brooklyn.location.jclouds; +import org.apache.brooklyn.core.util.task.DynamicTasks; +import org.apache.brooklyn.core.util.task.ssh.SshTasks; +import org.apache.brooklyn.core.util.task.ssh.SshTasks.OnFailingTask; import org.apache.brooklyn.location.basic.SshMachineLocation; import org.jclouds.compute.ComputeService; import com.google.common.annotations.Beta; import com.google.common.base.Preconditions; -import brooklyn.util.task.DynamicTasks; -import brooklyn.util.task.ssh.SshTasks; -import brooklyn.util.task.ssh.SshTasks.OnFailingTask; - /** * Wraps Brooklyn's sudo-tty mitigations in a {@link JcloudsLocationCustomizer} for easy(-ish) consumption * in YAML blueprints: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a4c0e5fd/locations/jclouds/src/main/java/org/apache/brooklyn/location/jclouds/networking/JcloudsLocationSecurityGroupCustomizer.java ---------------------------------------------------------------------- diff --git a/locations/jclouds/src/main/java/org/apache/brooklyn/location/jclouds/networking/JcloudsLocationSecurityGroupCustomizer.java b/locations/jclouds/src/main/java/org/apache/brooklyn/location/jclouds/networking/JcloudsLocationSecurityGroupCustomizer.java index 687a486..eb01bb1 100644 --- a/locations/jclouds/src/main/java/org/apache/brooklyn/location/jclouds/networking/JcloudsLocationSecurityGroupCustomizer.java +++ b/locations/jclouds/src/main/java/org/apache/brooklyn/location/jclouds/networking/JcloudsLocationSecurityGroupCustomizer.java @@ -28,6 +28,7 @@ import java.util.concurrent.ExecutionException; import javax.annotation.Nullable; import org.apache.brooklyn.api.entity.Entity; +import org.apache.brooklyn.core.util.task.Tasks; import org.apache.brooklyn.location.geo.LocalhostExternalIpLoader; import org.apache.brooklyn.location.jclouds.JcloudsLocation; import org.apache.brooklyn.location.jclouds.JcloudsLocationCustomizer; @@ -45,11 +46,10 @@ import org.jclouds.providers.ProviderMetadata; import org.jclouds.providers.Providers; import org.slf4j.Logger; import org.slf4j.LoggerFactory; - import org.apache.brooklyn.location.jclouds.BasicJcloudsLocationCustomizer; + import brooklyn.util.exceptions.Exceptions; import brooklyn.util.net.Cidr; -import brooklyn.util.task.Tasks; import brooklyn.util.time.Duration; import com.google.common.annotations.Beta; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a4c0e5fd/locations/jclouds/src/test/java/brooklyn/entity/rebind/persister/jclouds/BlobStoreExpiryTest.java ---------------------------------------------------------------------- diff --git a/locations/jclouds/src/test/java/brooklyn/entity/rebind/persister/jclouds/BlobStoreExpiryTest.java b/locations/jclouds/src/test/java/brooklyn/entity/rebind/persister/jclouds/BlobStoreExpiryTest.java index 6260a8c..18211c1 100644 --- a/locations/jclouds/src/test/java/brooklyn/entity/rebind/persister/jclouds/BlobStoreExpiryTest.java +++ b/locations/jclouds/src/test/java/brooklyn/entity/rebind/persister/jclouds/BlobStoreExpiryTest.java @@ -28,6 +28,8 @@ import java.util.List; import java.util.Map.Entry; import org.apache.brooklyn.api.management.ManagementContext; +import org.apache.brooklyn.core.util.http.HttpTool; +import org.apache.brooklyn.core.util.http.HttpToolResponse; import org.apache.brooklyn.test.entity.LocalManagementContextForTests; import org.apache.http.client.HttpClient; import org.jclouds.blobstore.BlobStoreContext; @@ -44,13 +46,13 @@ import org.testng.annotations.Test; import brooklyn.config.BrooklynProperties; import brooklyn.entity.basic.Entities; + import org.apache.brooklyn.location.basic.LocationConfigKeys; import org.apache.brooklyn.location.cloud.CloudLocationConfig; import org.apache.brooklyn.location.jclouds.JcloudsLocation; import org.apache.brooklyn.location.jclouds.JcloudsUtil; + import brooklyn.util.collections.MutableMap; -import brooklyn.util.http.HttpTool; -import brooklyn.util.http.HttpToolResponse; import brooklyn.util.text.Identifiers; import brooklyn.util.time.Duration; import brooklyn.util.time.Time; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a4c0e5fd/locations/jclouds/src/test/java/brooklyn/policy/os/CreateUserPolicyLiveTest.java ---------------------------------------------------------------------- diff --git a/locations/jclouds/src/test/java/brooklyn/policy/os/CreateUserPolicyLiveTest.java b/locations/jclouds/src/test/java/brooklyn/policy/os/CreateUserPolicyLiveTest.java index bf5f87b..75eed65 100644 --- a/locations/jclouds/src/test/java/brooklyn/policy/os/CreateUserPolicyLiveTest.java +++ b/locations/jclouds/src/test/java/brooklyn/policy/os/CreateUserPolicyLiveTest.java @@ -29,6 +29,7 @@ import org.apache.brooklyn.api.location.Location; import org.apache.brooklyn.api.location.LocationSpec; import org.apache.brooklyn.api.location.MachineProvisioningLocation; import org.apache.brooklyn.api.policy.PolicySpec; +import org.apache.brooklyn.core.util.internal.ssh.SshTool; import org.apache.brooklyn.test.EntityTestUtils; import org.apache.brooklyn.test.entity.TestEntity; import org.slf4j.Logger; @@ -40,7 +41,6 @@ import brooklyn.entity.BrooklynAppLiveTestSupport; import org.apache.brooklyn.location.basic.LocalhostMachineProvisioningLocation; import org.apache.brooklyn.location.basic.SshMachineLocation; -import brooklyn.util.internal.ssh.SshTool; import brooklyn.util.text.Identifiers; import com.google.common.collect.ImmutableList; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a4c0e5fd/locations/jclouds/src/test/java/brooklyn/policy/os/CreateUserPolicyTest.java ---------------------------------------------------------------------- diff --git a/locations/jclouds/src/test/java/brooklyn/policy/os/CreateUserPolicyTest.java b/locations/jclouds/src/test/java/brooklyn/policy/os/CreateUserPolicyTest.java index af248de..ed4e2ee 100644 --- a/locations/jclouds/src/test/java/brooklyn/policy/os/CreateUserPolicyTest.java +++ b/locations/jclouds/src/test/java/brooklyn/policy/os/CreateUserPolicyTest.java @@ -29,6 +29,7 @@ import java.util.regex.Pattern; import org.apache.brooklyn.api.entity.proxying.EntitySpec; import org.apache.brooklyn.api.location.LocationSpec; import org.apache.brooklyn.api.policy.PolicySpec; +import org.apache.brooklyn.core.util.internal.ssh.SshTool; import org.apache.brooklyn.test.EntityTestUtils; import org.apache.brooklyn.test.entity.TestEntity; import org.slf4j.Logger; @@ -41,8 +42,6 @@ import brooklyn.entity.BrooklynAppUnitTestSupport; import org.apache.brooklyn.location.basic.SshMachineLocation; -import brooklyn.util.internal.ssh.SshTool; - import com.google.common.collect.ImmutableList; import com.google.common.collect.Iterables; import com.google.common.collect.Lists; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a4c0e5fd/locations/jclouds/src/test/java/org/apache/brooklyn/location/jclouds/AbstractJcloudsStubbedLiveTest.java ---------------------------------------------------------------------- diff --git a/locations/jclouds/src/test/java/org/apache/brooklyn/location/jclouds/AbstractJcloudsStubbedLiveTest.java b/locations/jclouds/src/test/java/org/apache/brooklyn/location/jclouds/AbstractJcloudsStubbedLiveTest.java index 9c70305..1faa83b 100644 --- a/locations/jclouds/src/test/java/org/apache/brooklyn/location/jclouds/AbstractJcloudsStubbedLiveTest.java +++ b/locations/jclouds/src/test/java/org/apache/brooklyn/location/jclouds/AbstractJcloudsStubbedLiveTest.java @@ -21,6 +21,7 @@ package org.apache.brooklyn.location.jclouds; import java.util.List; import java.util.Set; +import org.apache.brooklyn.core.util.config.ConfigBag; import org.jclouds.compute.ComputeService; import org.jclouds.compute.RunNodesException; import org.jclouds.compute.domain.NodeMetadata; @@ -30,8 +31,6 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.testng.annotations.BeforeMethod; -import brooklyn.util.config.ConfigBag; - import com.google.common.base.Predicate; import com.google.common.collect.ImmutableMap; import com.google.common.collect.Lists; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a4c0e5fd/locations/jclouds/src/test/java/org/apache/brooklyn/location/jclouds/BailOutJcloudsLocation.java ---------------------------------------------------------------------- diff --git a/locations/jclouds/src/test/java/org/apache/brooklyn/location/jclouds/BailOutJcloudsLocation.java b/locations/jclouds/src/test/java/org/apache/brooklyn/location/jclouds/BailOutJcloudsLocation.java index c323b7f..b83bce8 100644 --- a/locations/jclouds/src/test/java/org/apache/brooklyn/location/jclouds/BailOutJcloudsLocation.java +++ b/locations/jclouds/src/test/java/org/apache/brooklyn/location/jclouds/BailOutJcloudsLocation.java @@ -27,6 +27,7 @@ import javax.annotation.Nullable; import org.apache.brooklyn.api.location.LocationSpec; import org.apache.brooklyn.api.management.ManagementContext; import org.apache.brooklyn.core.management.internal.LocalManagementContext; +import org.apache.brooklyn.core.util.config.ConfigBag; import org.jclouds.compute.ComputeService; import org.jclouds.compute.domain.Image; import org.jclouds.compute.domain.Template; @@ -41,7 +42,6 @@ import brooklyn.config.BrooklynProperties; import brooklyn.config.ConfigKey; import brooklyn.entity.basic.ConfigKeys; import brooklyn.util.collections.MutableMap; -import brooklyn.util.config.ConfigBag; import brooklyn.util.exceptions.CompoundRuntimeException; import brooklyn.util.exceptions.Exceptions; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a4c0e5fd/locations/jclouds/src/test/java/org/apache/brooklyn/location/jclouds/JcloudsLocationTemplateOptionsCustomisersLiveTest.java ---------------------------------------------------------------------- diff --git a/locations/jclouds/src/test/java/org/apache/brooklyn/location/jclouds/JcloudsLocationTemplateOptionsCustomisersLiveTest.java b/locations/jclouds/src/test/java/org/apache/brooklyn/location/jclouds/JcloudsLocationTemplateOptionsCustomisersLiveTest.java index f173646..5e535e4 100644 --- a/locations/jclouds/src/test/java/org/apache/brooklyn/location/jclouds/JcloudsLocationTemplateOptionsCustomisersLiveTest.java +++ b/locations/jclouds/src/test/java/org/apache/brooklyn/location/jclouds/JcloudsLocationTemplateOptionsCustomisersLiveTest.java @@ -19,9 +19,11 @@ package org.apache.brooklyn.location.jclouds; import brooklyn.config.ConfigKey; -import brooklyn.util.config.ConfigBag; + import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; + +import org.apache.brooklyn.core.util.config.ConfigBag; import org.jclouds.aws.ec2.compute.AWSEC2TemplateOptions; import org.jclouds.compute.options.TemplateOptions; import org.jclouds.ec2.domain.BlockDeviceMapping; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a4c0e5fd/locations/jclouds/src/test/java/org/apache/brooklyn/location/jclouds/JcloudsLocationTest.java ---------------------------------------------------------------------- diff --git a/locations/jclouds/src/test/java/org/apache/brooklyn/location/jclouds/JcloudsLocationTest.java b/locations/jclouds/src/test/java/org/apache/brooklyn/location/jclouds/JcloudsLocationTest.java index 83ffb78..de9f950 100644 --- a/locations/jclouds/src/test/java/org/apache/brooklyn/location/jclouds/JcloudsLocationTest.java +++ b/locations/jclouds/src/test/java/org/apache/brooklyn/location/jclouds/JcloudsLocationTest.java @@ -32,6 +32,7 @@ import org.apache.brooklyn.api.location.MachineLocation; import org.apache.brooklyn.api.location.MachineLocationCustomizer; import org.apache.brooklyn.api.location.NoMachinesAvailableException; import org.apache.brooklyn.core.management.internal.LocalManagementContext; +import org.apache.brooklyn.core.util.config.ConfigBag; import org.apache.brooklyn.location.cloud.names.CustomMachineNamer; import org.apache.brooklyn.test.entity.LocalManagementContextForTests; import org.jclouds.scriptbuilder.domain.OsFamily; @@ -61,7 +62,6 @@ import org.apache.brooklyn.location.jclouds.JcloudsLocation.UserCreation; import brooklyn.test.Asserts; import brooklyn.util.collections.MutableMap; -import brooklyn.util.config.ConfigBag; import brooklyn.util.exceptions.Exceptions; /** http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a4c0e5fd/locations/jclouds/src/test/java/org/apache/brooklyn/location/jclouds/JcloudsMachineNamerTest.java ---------------------------------------------------------------------- diff --git a/locations/jclouds/src/test/java/org/apache/brooklyn/location/jclouds/JcloudsMachineNamerTest.java b/locations/jclouds/src/test/java/org/apache/brooklyn/location/jclouds/JcloudsMachineNamerTest.java index 5e25a8c..90c1bbb 100644 --- a/locations/jclouds/src/test/java/org/apache/brooklyn/location/jclouds/JcloudsMachineNamerTest.java +++ b/locations/jclouds/src/test/java/org/apache/brooklyn/location/jclouds/JcloudsMachineNamerTest.java @@ -18,12 +18,12 @@ */ package org.apache.brooklyn.location.jclouds; +import org.apache.brooklyn.core.util.config.ConfigBag; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.testng.Assert; import org.testng.annotations.Test; -import brooklyn.util.config.ConfigBag; import brooklyn.util.text.Strings; public class JcloudsMachineNamerTest { http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a4c0e5fd/locations/jclouds/src/test/java/org/apache/brooklyn/location/jclouds/RebindJcloudsLocationLiveTest.java ---------------------------------------------------------------------- diff --git a/locations/jclouds/src/test/java/org/apache/brooklyn/location/jclouds/RebindJcloudsLocationLiveTest.java b/locations/jclouds/src/test/java/org/apache/brooklyn/location/jclouds/RebindJcloudsLocationLiveTest.java index 6043a09..5f717a3 100644 --- a/locations/jclouds/src/test/java/org/apache/brooklyn/location/jclouds/RebindJcloudsLocationLiveTest.java +++ b/locations/jclouds/src/test/java/org/apache/brooklyn/location/jclouds/RebindJcloudsLocationLiveTest.java @@ -27,6 +27,7 @@ import java.io.File; import org.apache.brooklyn.api.entity.proxying.EntitySpec; import org.apache.brooklyn.api.location.OsDetails; import org.apache.brooklyn.core.management.internal.LocalManagementContext; +import org.apache.brooklyn.core.util.config.ConfigBag; import org.apache.brooklyn.test.entity.TestApplication; import org.testng.annotations.AfterMethod; import org.testng.annotations.BeforeMethod; @@ -35,7 +36,6 @@ import org.testng.annotations.Test; import brooklyn.entity.basic.ApplicationBuilder; import brooklyn.entity.basic.Entities; import brooklyn.entity.rebind.RebindTestUtils; -import brooklyn.util.config.ConfigBag; import com.google.common.base.Predicates; import com.google.common.collect.ImmutableList; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a4c0e5fd/locations/jclouds/src/test/java/org/apache/brooklyn/location/jclouds/RebindJcloudsLocationTest.java ---------------------------------------------------------------------- diff --git a/locations/jclouds/src/test/java/org/apache/brooklyn/location/jclouds/RebindJcloudsLocationTest.java b/locations/jclouds/src/test/java/org/apache/brooklyn/location/jclouds/RebindJcloudsLocationTest.java index cc52ef2..746ff89 100644 --- a/locations/jclouds/src/test/java/org/apache/brooklyn/location/jclouds/RebindJcloudsLocationTest.java +++ b/locations/jclouds/src/test/java/org/apache/brooklyn/location/jclouds/RebindJcloudsLocationTest.java @@ -26,8 +26,9 @@ import org.testng.annotations.BeforeMethod; import org.testng.annotations.Test; import brooklyn.entity.rebind.RebindTestFixtureWithApp; + +import org.apache.brooklyn.core.util.config.ConfigBag; import org.apache.brooklyn.location.basic.SshMachineLocation; -import brooklyn.util.config.ConfigBag; import com.google.common.net.HostAndPort; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a4c0e5fd/policy/src/main/java/brooklyn/enricher/DeltaEnricher.java ---------------------------------------------------------------------- diff --git a/policy/src/main/java/brooklyn/enricher/DeltaEnricher.java b/policy/src/main/java/brooklyn/enricher/DeltaEnricher.java index 39b052f..9b6128c 100644 --- a/policy/src/main/java/brooklyn/enricher/DeltaEnricher.java +++ b/policy/src/main/java/brooklyn/enricher/DeltaEnricher.java @@ -25,9 +25,9 @@ import org.apache.brooklyn.api.entity.Entity; import org.apache.brooklyn.api.event.AttributeSensor; import org.apache.brooklyn.api.event.Sensor; import org.apache.brooklyn.api.event.SensorEvent; +import org.apache.brooklyn.core.util.flags.TypeCoercions; import brooklyn.enricher.basic.AbstractTransformingEnricher; -import brooklyn.util.flags.TypeCoercions; /** * Converts an absolute sensor into a delta sensor (i.e. the diff between the current and previous value) http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a4c0e5fd/policy/src/main/java/brooklyn/enricher/HttpLatencyDetector.java ---------------------------------------------------------------------- diff --git a/policy/src/main/java/brooklyn/enricher/HttpLatencyDetector.java b/policy/src/main/java/brooklyn/enricher/HttpLatencyDetector.java index 209b45a..884d568 100644 --- a/policy/src/main/java/brooklyn/enricher/HttpLatencyDetector.java +++ b/policy/src/main/java/brooklyn/enricher/HttpLatencyDetector.java @@ -32,6 +32,7 @@ import org.apache.brooklyn.api.entity.basic.EntityLocal; import org.apache.brooklyn.api.event.AttributeSensor; import org.apache.brooklyn.api.event.SensorEvent; import org.apache.brooklyn.api.event.SensorEventListener; +import org.apache.brooklyn.core.util.flags.SetFromFlag; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -44,7 +45,6 @@ import brooklyn.event.feed.http.HttpFeed; import brooklyn.event.feed.http.HttpPollConfig; import brooklyn.event.feed.http.HttpValueFunctions; import brooklyn.util.collections.MutableMap; -import brooklyn.util.flags.SetFromFlag; import brooklyn.util.javalang.AtomicReferences; import brooklyn.util.javalang.Boxing; import brooklyn.util.javalang.JavaClassNames; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a4c0e5fd/policy/src/main/java/brooklyn/enricher/RollingMeanEnricher.java ---------------------------------------------------------------------- diff --git a/policy/src/main/java/brooklyn/enricher/RollingMeanEnricher.java b/policy/src/main/java/brooklyn/enricher/RollingMeanEnricher.java index 0eca706..13648af 100644 --- a/policy/src/main/java/brooklyn/enricher/RollingMeanEnricher.java +++ b/policy/src/main/java/brooklyn/enricher/RollingMeanEnricher.java @@ -24,9 +24,9 @@ import org.apache.brooklyn.api.catalog.Catalog; import org.apache.brooklyn.api.entity.Entity; import org.apache.brooklyn.api.event.AttributeSensor; import org.apache.brooklyn.api.event.SensorEvent; +import org.apache.brooklyn.core.util.flags.SetFromFlag; import brooklyn.enricher.basic.AbstractTypeTransformingEnricher; -import brooklyn.util.flags.SetFromFlag; import brooklyn.util.javalang.JavaClassNames; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a4c0e5fd/policy/src/main/java/brooklyn/enricher/RollingTimeWindowMeanEnricher.java ---------------------------------------------------------------------- diff --git a/policy/src/main/java/brooklyn/enricher/RollingTimeWindowMeanEnricher.java b/policy/src/main/java/brooklyn/enricher/RollingTimeWindowMeanEnricher.java index 9993d28..b9688d9 100644 --- a/policy/src/main/java/brooklyn/enricher/RollingTimeWindowMeanEnricher.java +++ b/policy/src/main/java/brooklyn/enricher/RollingTimeWindowMeanEnricher.java @@ -25,12 +25,12 @@ import org.apache.brooklyn.api.entity.Entity; import org.apache.brooklyn.api.event.AttributeSensor; import org.apache.brooklyn.api.event.Sensor; import org.apache.brooklyn.api.event.SensorEvent; +import org.apache.brooklyn.core.util.flags.SetFromFlag; import brooklyn.config.ConfigKey; import brooklyn.enricher.basic.AbstractTypeTransformingEnricher; import brooklyn.enricher.basic.YamlRollingTimeWindowMeanEnricher; import brooklyn.entity.basic.ConfigKeys; -import brooklyn.util.flags.SetFromFlag; import brooklyn.util.javalang.JavaClassNames; import brooklyn.util.time.Duration;
