Return-Path: X-Original-To: apmail-brooklyn-commits-archive@minotaur.apache.org Delivered-To: apmail-brooklyn-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id B803118DAC for ; Wed, 19 Aug 2015 21:21:05 +0000 (UTC) Received: (qmail 49948 invoked by uid 500); 19 Aug 2015 21:21:05 -0000 Delivered-To: apmail-brooklyn-commits-archive@brooklyn.apache.org Received: (qmail 49925 invoked by uid 500); 19 Aug 2015 21:21:05 -0000 Mailing-List: contact commits-help@brooklyn.incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@brooklyn.incubator.apache.org Delivered-To: mailing list commits@brooklyn.incubator.apache.org Received: (qmail 49916 invoked by uid 99); 19 Aug 2015 21:21:05 -0000 Received: from Unknown (HELO spamd1-us-west.apache.org) (209.188.14.142) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 19 Aug 2015 21:21:05 +0000 Received: from localhost (localhost [127.0.0.1]) by spamd1-us-west.apache.org (ASF Mail Server at spamd1-us-west.apache.org) with ESMTP id 3528DDF4C1 for ; Wed, 19 Aug 2015 21:21:05 +0000 (UTC) X-Virus-Scanned: Debian amavisd-new at spamd1-us-west.apache.org X-Spam-Flag: NO X-Spam-Score: 1.225 X-Spam-Level: * X-Spam-Status: No, score=1.225 tagged_above=-999 required=6.31 tests=[KAM_ASCII_DIVIDERS=0.8, KAM_LAZY_DOMAIN_SECURITY=1, RCVD_IN_MSPIKE_H3=-0.01, RCVD_IN_MSPIKE_WL=-0.01, RP_MATCHES_RCVD=-0.555] autolearn=disabled Received: from mx1-eu-west.apache.org ([10.40.0.8]) by localhost (spamd1-us-west.apache.org [10.40.0.7]) (amavisd-new, port 10024) with ESMTP id aAgpiXtIv4IA for ; Wed, 19 Aug 2015 21:21:03 +0000 (UTC) Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by mx1-eu-west.apache.org (ASF Mail Server at mx1-eu-west.apache.org) with SMTP id 1D6512545B for ; Wed, 19 Aug 2015 21:20:41 +0000 (UTC) Received: (qmail 45899 invoked by uid 99); 19 Aug 2015 21:20:36 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 19 Aug 2015 21:20:36 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id A34F0E7D9D; Wed, 19 Aug 2015 21:20:36 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: aledsage@apache.org To: commits@brooklyn.incubator.apache.org Date: Wed, 19 Aug 2015 21:21:30 -0000 Message-Id: In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [56/62] [abbrv] incubator-brooklyn git commit: Fix imports in utils/test-bundles (missed first time) Fix imports in utils/test-bundles (missed first time) Project: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/commit/33bb19fa Tree: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/tree/33bb19fa Diff: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/diff/33bb19fa Branch: refs/heads/master Commit: 33bb19fadcd343e38d41d89d0ad11afeb1870286 Parents: 6ecd557 Author: Aled Sage Authored: Wed Aug 19 17:24:21 2015 +0100 Committer: Aled Sage Committed: Wed Aug 19 17:44:43 2015 +0100 ---------------------------------------------------------------------- .../apache/brooklyn/test/osgi/entities/SimpleApplication.java | 2 +- .../brooklyn/test/osgi/entities/SimpleApplicationImpl.java | 4 ++-- .../org/apache/brooklyn/test/osgi/entities/SimpleEntityImpl.java | 2 +- .../org/apache/brooklyn/test/osgi/entities/SimpleLocation.java | 2 +- .../org/apache/brooklyn/test/osgi/entities/SimplePolicy.java | 2 +- .../apache/brooklyn/test/osgi/entities/more/MoreEntityImpl.java | 2 +- .../apache/brooklyn/test/osgi/entities/more/MoreLocation.java | 2 +- .../org/apache/brooklyn/test/osgi/entities/more/MorePolicy.java | 2 +- .../apache/brooklyn/test/osgi/entities/more/MoreTemplate.java | 2 +- .../apache/brooklyn/test/osgi/entities/more/MoreEntityImpl.java | 2 +- .../apache/brooklyn/test/osgi/entities/more/MoreEntityImpl.java | 2 +- .../apache/brooklyn/test/osgi/entities/more/MoreLocation.java | 2 +- .../org/apache/brooklyn/test/osgi/entities/more/MorePolicy.java | 2 +- .../apache/brooklyn/test/osgi/entities/more/MoreTemplate.java | 2 +- 14 files changed, 15 insertions(+), 15 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/33bb19fa/utils/test-bundles/entities/src/main/java/org/apache/brooklyn/test/osgi/entities/SimpleApplication.java ---------------------------------------------------------------------- diff --git a/utils/test-bundles/entities/src/main/java/org/apache/brooklyn/test/osgi/entities/SimpleApplication.java b/utils/test-bundles/entities/src/main/java/org/apache/brooklyn/test/osgi/entities/SimpleApplication.java index c0ecbe1..dcfb495 100644 --- a/utils/test-bundles/entities/src/main/java/org/apache/brooklyn/test/osgi/entities/SimpleApplication.java +++ b/utils/test-bundles/entities/src/main/java/org/apache/brooklyn/test/osgi/entities/SimpleApplication.java @@ -20,7 +20,7 @@ package org.apache.brooklyn.test.osgi.entities; import org.apache.brooklyn.api.entity.ImplementedBy; -import org.apache.brooklyn.entity.core.StartableApplication; +import org.apache.brooklyn.core.entity.StartableApplication; @ImplementedBy(SimpleApplicationImpl.class) public interface SimpleApplication extends StartableApplication { http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/33bb19fa/utils/test-bundles/entities/src/main/java/org/apache/brooklyn/test/osgi/entities/SimpleApplicationImpl.java ---------------------------------------------------------------------- diff --git a/utils/test-bundles/entities/src/main/java/org/apache/brooklyn/test/osgi/entities/SimpleApplicationImpl.java b/utils/test-bundles/entities/src/main/java/org/apache/brooklyn/test/osgi/entities/SimpleApplicationImpl.java index b41ca96..fe6f1a2 100644 --- a/utils/test-bundles/entities/src/main/java/org/apache/brooklyn/test/osgi/entities/SimpleApplicationImpl.java +++ b/utils/test-bundles/entities/src/main/java/org/apache/brooklyn/test/osgi/entities/SimpleApplicationImpl.java @@ -19,8 +19,8 @@ package org.apache.brooklyn.test.osgi.entities; -import org.apache.brooklyn.entity.core.AbstractApplication; -import org.apache.brooklyn.entity.core.StartableApplication; +import org.apache.brooklyn.core.entity.AbstractApplication; +import org.apache.brooklyn.core.entity.StartableApplication; public class SimpleApplicationImpl extends AbstractApplication implements StartableApplication, SimpleApplication { http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/33bb19fa/utils/test-bundles/entities/src/main/java/org/apache/brooklyn/test/osgi/entities/SimpleEntityImpl.java ---------------------------------------------------------------------- diff --git a/utils/test-bundles/entities/src/main/java/org/apache/brooklyn/test/osgi/entities/SimpleEntityImpl.java b/utils/test-bundles/entities/src/main/java/org/apache/brooklyn/test/osgi/entities/SimpleEntityImpl.java index 25fa974..2595c39 100644 --- a/utils/test-bundles/entities/src/main/java/org/apache/brooklyn/test/osgi/entities/SimpleEntityImpl.java +++ b/utils/test-bundles/entities/src/main/java/org/apache/brooklyn/test/osgi/entities/SimpleEntityImpl.java @@ -18,7 +18,7 @@ */ package org.apache.brooklyn.test.osgi.entities; -import org.apache.brooklyn.entity.core.AbstractEntity; +import org.apache.brooklyn.core.entity.AbstractEntity; public class SimpleEntityImpl extends AbstractEntity implements SimpleEntity { http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/33bb19fa/utils/test-bundles/entities/src/main/java/org/apache/brooklyn/test/osgi/entities/SimpleLocation.java ---------------------------------------------------------------------- diff --git a/utils/test-bundles/entities/src/main/java/org/apache/brooklyn/test/osgi/entities/SimpleLocation.java b/utils/test-bundles/entities/src/main/java/org/apache/brooklyn/test/osgi/entities/SimpleLocation.java index a474a03..60749cf 100644 --- a/utils/test-bundles/entities/src/main/java/org/apache/brooklyn/test/osgi/entities/SimpleLocation.java +++ b/utils/test-bundles/entities/src/main/java/org/apache/brooklyn/test/osgi/entities/SimpleLocation.java @@ -20,7 +20,7 @@ package org.apache.brooklyn.test.osgi.entities; import org.apache.brooklyn.config.ConfigKey; import org.apache.brooklyn.core.config.ConfigKeys; -import org.apache.brooklyn.location.core.AbstractLocation; +import org.apache.brooklyn.core.location.AbstractLocation; import org.apache.brooklyn.util.core.flags.SetFromFlag; public class SimpleLocation extends AbstractLocation { http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/33bb19fa/utils/test-bundles/entities/src/main/java/org/apache/brooklyn/test/osgi/entities/SimplePolicy.java ---------------------------------------------------------------------- diff --git a/utils/test-bundles/entities/src/main/java/org/apache/brooklyn/test/osgi/entities/SimplePolicy.java b/utils/test-bundles/entities/src/main/java/org/apache/brooklyn/test/osgi/entities/SimplePolicy.java index 17b1bec..fdea821 100644 --- a/utils/test-bundles/entities/src/main/java/org/apache/brooklyn/test/osgi/entities/SimplePolicy.java +++ b/utils/test-bundles/entities/src/main/java/org/apache/brooklyn/test/osgi/entities/SimplePolicy.java @@ -21,7 +21,7 @@ package org.apache.brooklyn.test.osgi.entities; import org.apache.brooklyn.config.ConfigKey; import org.apache.brooklyn.core.config.ConfigKeys; -import org.apache.brooklyn.policy.core.AbstractPolicy; +import org.apache.brooklyn.core.policy.AbstractPolicy; import org.apache.brooklyn.util.core.flags.SetFromFlag; public class SimplePolicy extends AbstractPolicy { http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/33bb19fa/utils/test-bundles/more-entities-v1/src/main/java/org/apache/brooklyn/test/osgi/entities/more/MoreEntityImpl.java ---------------------------------------------------------------------- diff --git a/utils/test-bundles/more-entities-v1/src/main/java/org/apache/brooklyn/test/osgi/entities/more/MoreEntityImpl.java b/utils/test-bundles/more-entities-v1/src/main/java/org/apache/brooklyn/test/osgi/entities/more/MoreEntityImpl.java index 17919d4..17a8a41 100644 --- a/utils/test-bundles/more-entities-v1/src/main/java/org/apache/brooklyn/test/osgi/entities/more/MoreEntityImpl.java +++ b/utils/test-bundles/more-entities-v1/src/main/java/org/apache/brooklyn/test/osgi/entities/more/MoreEntityImpl.java @@ -19,7 +19,7 @@ package org.apache.brooklyn.test.osgi.entities.more; import org.apache.brooklyn.effector.core.EffectorBody; -import org.apache.brooklyn.entity.core.AbstractEntity; +import org.apache.brooklyn.core.entity.AbstractEntity; import org.apache.brooklyn.util.core.config.ConfigBag; public class MoreEntityImpl extends AbstractEntity implements MoreEntity { http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/33bb19fa/utils/test-bundles/more-entities-v1/src/main/java/org/apache/brooklyn/test/osgi/entities/more/MoreLocation.java ---------------------------------------------------------------------- diff --git a/utils/test-bundles/more-entities-v1/src/main/java/org/apache/brooklyn/test/osgi/entities/more/MoreLocation.java b/utils/test-bundles/more-entities-v1/src/main/java/org/apache/brooklyn/test/osgi/entities/more/MoreLocation.java index 5ab0abf..943c53c 100644 --- a/utils/test-bundles/more-entities-v1/src/main/java/org/apache/brooklyn/test/osgi/entities/more/MoreLocation.java +++ b/utils/test-bundles/more-entities-v1/src/main/java/org/apache/brooklyn/test/osgi/entities/more/MoreLocation.java @@ -18,7 +18,7 @@ */ package org.apache.brooklyn.test.osgi.entities.more; -import org.apache.brooklyn.location.core.AbstractLocation; +import org.apache.brooklyn.core.location.AbstractLocation; public class MoreLocation extends AbstractLocation { } http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/33bb19fa/utils/test-bundles/more-entities-v1/src/main/java/org/apache/brooklyn/test/osgi/entities/more/MorePolicy.java ---------------------------------------------------------------------- diff --git a/utils/test-bundles/more-entities-v1/src/main/java/org/apache/brooklyn/test/osgi/entities/more/MorePolicy.java b/utils/test-bundles/more-entities-v1/src/main/java/org/apache/brooklyn/test/osgi/entities/more/MorePolicy.java index 84e5a63..b72768b 100644 --- a/utils/test-bundles/more-entities-v1/src/main/java/org/apache/brooklyn/test/osgi/entities/more/MorePolicy.java +++ b/utils/test-bundles/more-entities-v1/src/main/java/org/apache/brooklyn/test/osgi/entities/more/MorePolicy.java @@ -18,7 +18,7 @@ */ package org.apache.brooklyn.test.osgi.entities.more; -import org.apache.brooklyn.policy.core.AbstractPolicy; +import org.apache.brooklyn.core.policy.AbstractPolicy; public class MorePolicy extends AbstractPolicy { http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/33bb19fa/utils/test-bundles/more-entities-v1/src/main/java/org/apache/brooklyn/test/osgi/entities/more/MoreTemplate.java ---------------------------------------------------------------------- diff --git a/utils/test-bundles/more-entities-v1/src/main/java/org/apache/brooklyn/test/osgi/entities/more/MoreTemplate.java b/utils/test-bundles/more-entities-v1/src/main/java/org/apache/brooklyn/test/osgi/entities/more/MoreTemplate.java index 7e2aa08..c66ed32 100644 --- a/utils/test-bundles/more-entities-v1/src/main/java/org/apache/brooklyn/test/osgi/entities/more/MoreTemplate.java +++ b/utils/test-bundles/more-entities-v1/src/main/java/org/apache/brooklyn/test/osgi/entities/more/MoreTemplate.java @@ -18,7 +18,7 @@ */ package org.apache.brooklyn.test.osgi.entities.more; -import org.apache.brooklyn.entity.core.AbstractApplication; +import org.apache.brooklyn.core.entity.AbstractApplication; public class MoreTemplate extends AbstractApplication { } http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/33bb19fa/utils/test-bundles/more-entities-v2-evil-twin/src/main/java/org/apache/brooklyn/test/osgi/entities/more/MoreEntityImpl.java ---------------------------------------------------------------------- diff --git a/utils/test-bundles/more-entities-v2-evil-twin/src/main/java/org/apache/brooklyn/test/osgi/entities/more/MoreEntityImpl.java b/utils/test-bundles/more-entities-v2-evil-twin/src/main/java/org/apache/brooklyn/test/osgi/entities/more/MoreEntityImpl.java index 3ebe518..497069b 100644 --- a/utils/test-bundles/more-entities-v2-evil-twin/src/main/java/org/apache/brooklyn/test/osgi/entities/more/MoreEntityImpl.java +++ b/utils/test-bundles/more-entities-v2-evil-twin/src/main/java/org/apache/brooklyn/test/osgi/entities/more/MoreEntityImpl.java @@ -20,7 +20,7 @@ package org.apache.brooklyn.test.osgi.entities.more; import org.apache.brooklyn.api.policy.PolicySpec; import org.apache.brooklyn.effector.core.EffectorBody; -import org.apache.brooklyn.entity.core.AbstractEntity; +import org.apache.brooklyn.core.entity.AbstractEntity; import org.apache.brooklyn.util.core.config.ConfigBag; public class MoreEntityImpl extends AbstractEntity implements MoreEntity { http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/33bb19fa/utils/test-bundles/more-entities-v2/src/main/java/org/apache/brooklyn/test/osgi/entities/more/MoreEntityImpl.java ---------------------------------------------------------------------- diff --git a/utils/test-bundles/more-entities-v2/src/main/java/org/apache/brooklyn/test/osgi/entities/more/MoreEntityImpl.java b/utils/test-bundles/more-entities-v2/src/main/java/org/apache/brooklyn/test/osgi/entities/more/MoreEntityImpl.java index 36b421f..fa27964 100644 --- a/utils/test-bundles/more-entities-v2/src/main/java/org/apache/brooklyn/test/osgi/entities/more/MoreEntityImpl.java +++ b/utils/test-bundles/more-entities-v2/src/main/java/org/apache/brooklyn/test/osgi/entities/more/MoreEntityImpl.java @@ -20,7 +20,7 @@ package org.apache.brooklyn.test.osgi.entities.more; import org.apache.brooklyn.api.policy.PolicySpec; import org.apache.brooklyn.effector.core.EffectorBody; -import org.apache.brooklyn.entity.core.AbstractEntity; +import org.apache.brooklyn.core.entity.AbstractEntity; import org.apache.brooklyn.util.core.config.ConfigBag; public class MoreEntityImpl extends AbstractEntity implements MoreEntity { http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/33bb19fa/utils/test-bundles/more-entities-v2/src/main/java/org/apache/brooklyn/test/osgi/entities/more/MoreLocation.java ---------------------------------------------------------------------- diff --git a/utils/test-bundles/more-entities-v2/src/main/java/org/apache/brooklyn/test/osgi/entities/more/MoreLocation.java b/utils/test-bundles/more-entities-v2/src/main/java/org/apache/brooklyn/test/osgi/entities/more/MoreLocation.java index 51de347..ed10541 100644 --- a/utils/test-bundles/more-entities-v2/src/main/java/org/apache/brooklyn/test/osgi/entities/more/MoreLocation.java +++ b/utils/test-bundles/more-entities-v2/src/main/java/org/apache/brooklyn/test/osgi/entities/more/MoreLocation.java @@ -19,7 +19,7 @@ package org.apache.brooklyn.test.osgi.entities.more; import org.apache.brooklyn.api.catalog.Catalog; -import org.apache.brooklyn.location.core.AbstractLocation; +import org.apache.brooklyn.core.location.AbstractLocation; @Catalog(name="More Location", description="Cataliog item OSGi test location") public class MoreLocation extends AbstractLocation { http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/33bb19fa/utils/test-bundles/more-entities-v2/src/main/java/org/apache/brooklyn/test/osgi/entities/more/MorePolicy.java ---------------------------------------------------------------------- diff --git a/utils/test-bundles/more-entities-v2/src/main/java/org/apache/brooklyn/test/osgi/entities/more/MorePolicy.java b/utils/test-bundles/more-entities-v2/src/main/java/org/apache/brooklyn/test/osgi/entities/more/MorePolicy.java index f7d7f2d..7909d5b 100644 --- a/utils/test-bundles/more-entities-v2/src/main/java/org/apache/brooklyn/test/osgi/entities/more/MorePolicy.java +++ b/utils/test-bundles/more-entities-v2/src/main/java/org/apache/brooklyn/test/osgi/entities/more/MorePolicy.java @@ -19,7 +19,7 @@ package org.apache.brooklyn.test.osgi.entities.more; import org.apache.brooklyn.api.catalog.Catalog; -import org.apache.brooklyn.policy.core.AbstractPolicy; +import org.apache.brooklyn.core.policy.AbstractPolicy; @Catalog(name="More Policy", description="Cataliog item OSGi test policy") public class MorePolicy extends AbstractPolicy { http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/33bb19fa/utils/test-bundles/more-entities-v2/src/main/java/org/apache/brooklyn/test/osgi/entities/more/MoreTemplate.java ---------------------------------------------------------------------- diff --git a/utils/test-bundles/more-entities-v2/src/main/java/org/apache/brooklyn/test/osgi/entities/more/MoreTemplate.java b/utils/test-bundles/more-entities-v2/src/main/java/org/apache/brooklyn/test/osgi/entities/more/MoreTemplate.java index 03a7c1c..9e0fc85 100644 --- a/utils/test-bundles/more-entities-v2/src/main/java/org/apache/brooklyn/test/osgi/entities/more/MoreTemplate.java +++ b/utils/test-bundles/more-entities-v2/src/main/java/org/apache/brooklyn/test/osgi/entities/more/MoreTemplate.java @@ -19,7 +19,7 @@ package org.apache.brooklyn.test.osgi.entities.more; import org.apache.brooklyn.api.catalog.Catalog; -import org.apache.brooklyn.entity.core.AbstractApplication; +import org.apache.brooklyn.core.entity.AbstractApplication; @Catalog(name="More Template", description="Cataliog item OSGi test template") public class MoreTemplate extends AbstractApplication {