brooklyn-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From aleds...@apache.org
Subject [56/62] [abbrv] incubator-brooklyn git commit: Fix imports in utils/test-bundles (missed first time)
Date Wed, 19 Aug 2015 21:21:30 GMT
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 <aled.sage@gmail.com>
Authored: Wed Aug 19 17:24:21 2015 +0100
Committer: Aled Sage <aled.sage@gmail.com>
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 {


Mime
View raw message