You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@brooklyn.apache.org by al...@apache.org on 2015/08/19 23:21:35 UTC
[61/62] [abbrv] incubator-brooklyn git commit: Renamed package
references missed previously
Renamed package references missed previously
Project: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/commit/4ae66edb
Tree: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/tree/4ae66edb
Diff: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/diff/4ae66edb
Branch: refs/heads/master
Commit: 4ae66edbf825bbf3a17189edff6f00a0ae0bc1c3
Parents: abb1b88
Author: Aled Sage <al...@gmail.com>
Authored: Wed Aug 19 18:10:50 2015 +0100
Committer: Aled Sage <al...@gmail.com>
Committed: Wed Aug 19 18:22:10 2015 +0100
----------------------------------------------------------------------
.../org/apache/brooklyn/api/entity/Application.java | 2 +-
.../java/org/apache/brooklyn/api/entity/Entity.java | 8 ++++----
.../apache/brooklyn/core/config/BasicConfigKey.java | 2 +-
...rg.apache.brooklyn.api.location.LocationResolver | 12 ++++++------
docs/_extra/big_examples/global-web-fabric/index.md | 16 ++++++++--------
.../test-app-with-enrichers-slightly-simpler.yaml | 4 ++--
.../sample/app/ClusterWebServerDatabaseSample.java | 6 +++---
.../brooklyn/sample/app/SingleWebServerSample.java | 6 +++---
.../sample/app/SampleLocalhostIntegrationTest.java | 4 ++--
.../sample/brooklyn/sample/app/SampleUnitTest.java | 4 ++--
.../test-app-with-enrichers-slightly-simpler.yaml | 4 ++--
11 files changed, 34 insertions(+), 34 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/4ae66edb/api/src/main/java/org/apache/brooklyn/api/entity/Application.java
----------------------------------------------------------------------
diff --git a/api/src/main/java/org/apache/brooklyn/api/entity/Application.java b/api/src/main/java/org/apache/brooklyn/api/entity/Application.java
index 3b03155..402d004 100644
--- a/api/src/main/java/org/apache/brooklyn/api/entity/Application.java
+++ b/api/src/main/java/org/apache/brooklyn/api/entity/Application.java
@@ -26,7 +26,7 @@ import org.apache.brooklyn.api.mgmt.ManagementContext;
* the top-level entity under which the application's entities are all places.
*
* The recommended ways to write a new application are to either extend {@link org.apache.brooklyn.entity.factory.ApplicationBuilder}
- * or to extend {@link org.apache.brooklyn.entity.core.AbstractApplication}.
+ * or to extend {@link org.apache.brooklyn.core.entity.AbstractApplication}.
*/
public interface Application extends Entity {
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/4ae66edb/api/src/main/java/org/apache/brooklyn/api/entity/Entity.java
----------------------------------------------------------------------
diff --git a/api/src/main/java/org/apache/brooklyn/api/entity/Entity.java b/api/src/main/java/org/apache/brooklyn/api/entity/Entity.java
index 8b4f326..e109a45 100644
--- a/api/src/main/java/org/apache/brooklyn/api/entity/Entity.java
+++ b/api/src/main/java/org/apache/brooklyn/api/entity/Entity.java
@@ -40,15 +40,15 @@ import org.apache.brooklyn.util.guava.Maybe;
/**
* The basic interface for a Brooklyn entity.
* <p>
- * Implementors of entities are strongly encouraged to extend {@link org.apache.brooklyn.entity.core.AbstractEntity}.
+ * Implementors of entities are strongly encouraged to extend {@link org.apache.brooklyn.core.entity.AbstractEntity}.
* <p>
* To instantiate an entity, see {@code managementContext.getEntityManager().createEntity(entitySpec)}.
- * Also see {@link org.apache.brooklyn.entity.factory.ApplicationBuilder},
- * {@link org.apache.brooklyn.entity.core.AbstractEntity#addChild(EntitySpec)}, and
+ * Also see {@link org.apache.brooklyn.core.entity.factory.ApplicationBuilder},
+ * {@link org.apache.brooklyn.core.entity.AbstractEntity#addChild(EntitySpec)}, and
* {@link org.apache.brooklyn.api.entity.EntitySpec}.
* <p>
*
- * @see org.apache.brooklyn.entity.core.AbstractEntity
+ * @see org.apache.brooklyn.core.entity.AbstractEntity
*/
public interface Entity extends BrooklynObject {
/**
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/4ae66edb/core/src/main/java/org/apache/brooklyn/core/config/BasicConfigKey.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/brooklyn/core/config/BasicConfigKey.java b/core/src/main/java/org/apache/brooklyn/core/config/BasicConfigKey.java
index 614f60b..069936c 100644
--- a/core/src/main/java/org/apache/brooklyn/core/config/BasicConfigKey.java
+++ b/core/src/main/java/org/apache/brooklyn/core/config/BasicConfigKey.java
@@ -251,7 +251,7 @@ public class BasicConfigKey<T> implements ConfigKeySelfExtracting<T>, Serializab
/** used to record a key which overwrites another; only needed at disambiguation time
* if a class declares a key and an equivalent one (often inherited) which overwrites it.
- * See org.apache.brooklyn.entity.core.ConfigEntityInheritanceTest, and uses of this class, for more explanation.
+ * See org.apache.brooklyn.core.entity.ConfigEntityInheritanceTest, and uses of this class, for more explanation.
*/
public static class BasicConfigKeyOverwriting<T> extends BasicConfigKey<T> {
private static final long serialVersionUID = -3458116971918128018L;
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/4ae66edb/core/src/main/resources/META-INF/services/org.apache.brooklyn.api.location.LocationResolver
----------------------------------------------------------------------
diff --git a/core/src/main/resources/META-INF/services/org.apache.brooklyn.api.location.LocationResolver b/core/src/main/resources/META-INF/services/org.apache.brooklyn.api.location.LocationResolver
index ec64955..3412b27 100644
--- a/core/src/main/resources/META-INF/services/org.apache.brooklyn.api.location.LocationResolver
+++ b/core/src/main/resources/META-INF/services/org.apache.brooklyn.api.location.LocationResolver
@@ -16,12 +16,12 @@
# specific language governing permissions and limitations
# under the License.
#
-org.apache.brooklyn.location.core.DefinedLocationByIdResolver
-org.apache.brooklyn.location.core.NamedLocationResolver
-org.apache.brooklyn.location.core.CatalogLocationResolver
-org.apache.brooklyn.location.localhost.LocalhostLocationResolver
+org.apache.brooklyn.core.location.DefinedLocationByIdResolver
+org.apache.brooklyn.core.location.NamedLocationResolver
+org.apache.brooklyn.core.location.CatalogLocationResolver
+org.apache.brooklyn.core.location.access.PortForwardManagerLocationResolver
org.apache.brooklyn.location.byon.ByonLocationResolver
org.apache.brooklyn.location.byon.SingleMachineLocationResolver
org.apache.brooklyn.location.byon.HostLocationResolver
-org.apache.brooklyn.location.core.MultiLocationResolver
-org.apache.brooklyn.location.access.PortForwardManagerLocationResolver
+org.apache.brooklyn.location.localhost.LocalhostLocationResolver
+org.apache.brooklyn.location.multi.MultiLocationResolver
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/4ae66edb/docs/_extra/big_examples/global-web-fabric/index.md
----------------------------------------------------------------------
diff --git a/docs/_extra/big_examples/global-web-fabric/index.md b/docs/_extra/big_examples/global-web-fabric/index.md
index 6897ffe..8ddbadc 100644
--- a/docs/_extra/big_examples/global-web-fabric/index.md
+++ b/docs/_extra/big_examples/global-web-fabric/index.md
@@ -100,7 +100,7 @@ This will extend the Brooklyn `AbstractApplication`:
package brooklyn.demo;
import static com.google.common.base.Preconditions.checkNotNull;
-import org.apache.brooklyn.entity.core.AbstractApplication;
+import org.apache.brooklyn.core.entity.AbstractApplication;
public class GlobalWebFabricExample extends AbstractApplication {
@Override
@@ -202,13 +202,13 @@ import static com.google.common.base.Preconditions.checkNotNull;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import brooklyn.config.StringConfigMap;
-import org.apache.brooklyn.entity.core.AbstractApplication;
-import org.apache.brooklyn.entity.core.Attributes;
-import brooklyn.entity.dns.geoscaling.GeoscalingDnsService;
-import brooklyn.entity.group.DynamicFabric;
-import brooklyn.entity.proxy.AbstractController;
-import brooklyn.entity.proxying.EntitySpec;
+import org.apache.brooklyn.config.StringConfigMap;
+import org.apache.brooklyn.core.entity.AbstractApplication;
+import org.apache.brooklyn.core.entity.Attributes;
+import org.apache.brooklyn.entity.dns.geoscaling.GeoscalingDnsService;
+import org.apache.brooklyn.entity.group.DynamicFabric;
+import org.apache.brooklyn.entity.proxy.AbstractController;
+import org.apache.brooklyn.entity.proxying.EntitySpec;
import org.apache.brooklyn.entity.webapp.ElasticJavaWebAppService;
import PortRanges;
{% endhighlight %}
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/4ae66edb/docs/guide/yaml/example_yaml/test-app-with-enrichers-slightly-simpler.yaml
----------------------------------------------------------------------
diff --git a/docs/guide/yaml/example_yaml/test-app-with-enrichers-slightly-simpler.yaml b/docs/guide/yaml/example_yaml/test-app-with-enrichers-slightly-simpler.yaml
index 3c9b4ad..b35c2ff 100644
--- a/docs/guide/yaml/example_yaml/test-app-with-enrichers-slightly-simpler.yaml
+++ b/docs/guide/yaml/example_yaml/test-app-with-enrichers-slightly-simpler.yaml
@@ -26,7 +26,7 @@ services:
# instead of (or in addition to) this map
brooklyn.config:
sensorMapping:
- $brooklyn:sensor("url"): $brooklyn:sensor("org.apache.brooklyn.entity.core.Attributes", "main.uri")
+ $brooklyn:sensor("url"): $brooklyn:sensor("org.apache.brooklyn.core.entity.Attributes", "main.uri")
brooklyn.enrichers:
- type: brooklyn.enricher.basic.Aggregator
# aggregate `url` sensors from children into a list
@@ -46,7 +46,7 @@ services:
# pick one uri as the main one to use
brooklyn.config:
enricher.sourceSensor: $brooklyn:sensor("urls.list")
- enricher.targetSensor: $brooklyn:sensor("org.apache.brooklyn.entity.core.Attributes", "main.uri")
+ enricher.targetSensor: $brooklyn:sensor("org.apache.brooklyn.core.entity.Attributes", "main.uri")
quote: false
maximum: 1
brooklyn.enrichers:
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/4ae66edb/usage/archetypes/quickstart/src/brooklyn-sample/src/main/java/com/acme/sample/brooklyn/sample/app/ClusterWebServerDatabaseSample.java
----------------------------------------------------------------------
diff --git a/usage/archetypes/quickstart/src/brooklyn-sample/src/main/java/com/acme/sample/brooklyn/sample/app/ClusterWebServerDatabaseSample.java b/usage/archetypes/quickstart/src/brooklyn-sample/src/main/java/com/acme/sample/brooklyn/sample/app/ClusterWebServerDatabaseSample.java
index bfbb464..6f2907b 100644
--- a/usage/archetypes/quickstart/src/brooklyn-sample/src/main/java/com/acme/sample/brooklyn/sample/app/ClusterWebServerDatabaseSample.java
+++ b/usage/archetypes/quickstart/src/brooklyn-sample/src/main/java/com/acme/sample/brooklyn/sample/app/ClusterWebServerDatabaseSample.java
@@ -8,8 +8,9 @@ import org.apache.brooklyn.api.entity.EntitySpec;
import org.apache.brooklyn.api.sensor.AttributeSensor;
import org.apache.brooklyn.config.ConfigKey;
import org.apache.brooklyn.core.config.ConfigKeys;
-import org.apache.brooklyn.entity.core.AbstractApplication;
-import org.apache.brooklyn.entity.core.Entities;
+import org.apache.brooklyn.core.entity.AbstractApplication;
+import org.apache.brooklyn.core.entity.Entities;
+import org.apache.brooklyn.core.location.PortRanges;
import org.apache.brooklyn.entity.database.DatastoreMixins.DatastoreCommon;
import org.apache.brooklyn.entity.database.mysql.MySqlNode;
import org.apache.brooklyn.entity.group.DynamicCluster;
@@ -19,7 +20,6 @@ import org.apache.brooklyn.entity.webapp.DynamicWebAppCluster;
import org.apache.brooklyn.entity.webapp.JavaWebAppService;
import org.apache.brooklyn.entity.webapp.WebAppService;
import org.apache.brooklyn.entity.webapp.WebAppServiceConstants;
-import org.apache.brooklyn.location.core.PortRanges;
import org.apache.brooklyn.policy.autoscaling.AutoScalerPolicy;
import org.apache.brooklyn.policy.enricher.HttpLatencyDetector;
import org.apache.brooklyn.sensor.core.Sensors;
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/4ae66edb/usage/archetypes/quickstart/src/brooklyn-sample/src/main/java/com/acme/sample/brooklyn/sample/app/SingleWebServerSample.java
----------------------------------------------------------------------
diff --git a/usage/archetypes/quickstart/src/brooklyn-sample/src/main/java/com/acme/sample/brooklyn/sample/app/SingleWebServerSample.java b/usage/archetypes/quickstart/src/brooklyn-sample/src/main/java/com/acme/sample/brooklyn/sample/app/SingleWebServerSample.java
index 46b1dff..3cc9426 100644
--- a/usage/archetypes/quickstart/src/brooklyn-sample/src/main/java/com/acme/sample/brooklyn/sample/app/SingleWebServerSample.java
+++ b/usage/archetypes/quickstart/src/brooklyn-sample/src/main/java/com/acme/sample/brooklyn/sample/app/SingleWebServerSample.java
@@ -1,11 +1,11 @@
package com.acme.sample.brooklyn.sample.app;
import org.apache.brooklyn.api.entity.EntitySpec;
-import org.apache.brooklyn.entity.core.AbstractApplication;
-import org.apache.brooklyn.entity.core.Attributes;
+import org.apache.brooklyn.core.entity.AbstractApplication;
+import org.apache.brooklyn.core.entity.Attributes;
+import org.apache.brooklyn.core.location.PortRanges;
import org.apache.brooklyn.entity.webapp.JavaWebAppService;
import org.apache.brooklyn.entity.webapp.jboss.JBoss7Server;
-import org.apache.brooklyn.location.core.PortRanges;
import org.apache.brooklyn.util.maven.MavenArtifact;
import org.apache.brooklyn.util.maven.MavenRetriever;
import org.slf4j.Logger;
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/4ae66edb/usage/archetypes/quickstart/src/brooklyn-sample/src/test/java/com/acme/sample/brooklyn/sample/app/SampleLocalhostIntegrationTest.java
----------------------------------------------------------------------
diff --git a/usage/archetypes/quickstart/src/brooklyn-sample/src/test/java/com/acme/sample/brooklyn/sample/app/SampleLocalhostIntegrationTest.java b/usage/archetypes/quickstart/src/brooklyn-sample/src/test/java/com/acme/sample/brooklyn/sample/app/SampleLocalhostIntegrationTest.java
index 1122448..f640f6a 100644
--- a/usage/archetypes/quickstart/src/brooklyn-sample/src/test/java/com/acme/sample/brooklyn/sample/app/SampleLocalhostIntegrationTest.java
+++ b/usage/archetypes/quickstart/src/brooklyn-sample/src/test/java/com/acme/sample/brooklyn/sample/app/SampleLocalhostIntegrationTest.java
@@ -7,8 +7,8 @@ import org.apache.brooklyn.api.entity.Entity;
import org.apache.brooklyn.api.entity.EntitySpec;
import org.apache.brooklyn.api.mgmt.ManagementContext;
import org.apache.brooklyn.core.mgmt.internal.LocalManagementContext;
-import org.apache.brooklyn.entity.core.Entities;
-import org.apache.brooklyn.entity.core.StartableApplication;
+import org.apache.brooklyn.core.entity.Entities;
+import org.apache.brooklyn.core.entity.StartableApplication;
import org.apache.brooklyn.entity.webapp.JavaWebAppService;
import org.apache.brooklyn.util.core.ResourceUtils;
import org.apache.brooklyn.util.text.Strings;
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/4ae66edb/usage/archetypes/quickstart/src/brooklyn-sample/src/test/java/com/acme/sample/brooklyn/sample/app/SampleUnitTest.java
----------------------------------------------------------------------
diff --git a/usage/archetypes/quickstart/src/brooklyn-sample/src/test/java/com/acme/sample/brooklyn/sample/app/SampleUnitTest.java b/usage/archetypes/quickstart/src/brooklyn-sample/src/test/java/com/acme/sample/brooklyn/sample/app/SampleUnitTest.java
index 181d61f..6a34301 100644
--- a/usage/archetypes/quickstart/src/brooklyn-sample/src/test/java/com/acme/sample/brooklyn/sample/app/SampleUnitTest.java
+++ b/usage/archetypes/quickstart/src/brooklyn-sample/src/test/java/com/acme/sample/brooklyn/sample/app/SampleUnitTest.java
@@ -4,8 +4,8 @@ import org.apache.brooklyn.api.entity.Entity;
import org.apache.brooklyn.api.entity.EntitySpec;
import org.apache.brooklyn.api.mgmt.ManagementContext;
import org.apache.brooklyn.core.mgmt.internal.LocalManagementContext;
-import org.apache.brooklyn.entity.core.Entities;
-import org.apache.brooklyn.entity.core.StartableApplication;
+import org.apache.brooklyn.core.entity.Entities;
+import org.apache.brooklyn.core.entity.StartableApplication;
import org.apache.brooklyn.entity.database.DatastoreMixins.DatastoreCommon;
import org.apache.brooklyn.entity.database.mysql.MySqlNode;
import org.apache.brooklyn.entity.webapp.JavaWebAppService;
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/4ae66edb/usage/camp/src/test/resources/test-app-with-enrichers-slightly-simpler.yaml
----------------------------------------------------------------------
diff --git a/usage/camp/src/test/resources/test-app-with-enrichers-slightly-simpler.yaml b/usage/camp/src/test/resources/test-app-with-enrichers-slightly-simpler.yaml
index 2ee8ae0..bc753a5 100644
--- a/usage/camp/src/test/resources/test-app-with-enrichers-slightly-simpler.yaml
+++ b/usage/camp/src/test/resources/test-app-with-enrichers-slightly-simpler.yaml
@@ -43,7 +43,7 @@ services:
# instead of (or in addition to) this map
brooklyn.config:
sensorMapping:
- $brooklyn:sensor("url"): $brooklyn:sensor("org.apache.brooklyn.entity.core.Attributes", "main.uri")
+ $brooklyn:sensor("url"): $brooklyn:sensor("org.apache.brooklyn.core.entity.Attributes", "main.uri")
brooklyn.enrichers:
- type: org.apache.brooklyn.sensor.enricher.Aggregator
# aggregate `url` sensors from children into a list
@@ -63,7 +63,7 @@ services:
# pick one uri as the main one to use
brooklyn.config:
enricher.sourceSensor: $brooklyn:sensor("urls.list")
- enricher.targetSensor: $brooklyn:sensor("org.apache.brooklyn.entity.core.Attributes", "main.uri")
+ enricher.targetSensor: $brooklyn:sensor("org.apache.brooklyn.core.entity.Attributes", "main.uri")
quote: false
maximum: 1
brooklyn.enrichers: