http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/ac1a7c09/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/cassandra/CassandraDatacenter.java ---------------------------------------------------------------------- diff --git a/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/cassandra/CassandraDatacenter.java b/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/cassandra/CassandraDatacenter.java index 07e7f96..c21df9d 100644 --- a/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/cassandra/CassandraDatacenter.java +++ b/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/cassandra/CassandraDatacenter.java @@ -33,7 +33,7 @@ import brooklyn.config.ConfigKey; import brooklyn.entity.annotation.Effector; import brooklyn.entity.basic.ConfigKeys; import brooklyn.entity.basic.MethodEffector; -import brooklyn.entity.database.DatastoreMixins; +import org.apache.brooklyn.entity.database.DatastoreMixins; import brooklyn.entity.effector.Effectors; import brooklyn.entity.group.DynamicCluster; import brooklyn.event.basic.BasicAttributeSensorAndConfigKey;
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/ac1a7c09/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/cassandra/CassandraNode.java ---------------------------------------------------------------------- diff --git a/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/cassandra/CassandraNode.java b/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/cassandra/CassandraNode.java index f779de8..4fcfd2b 100644 --- a/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/cassandra/CassandraNode.java +++ b/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/cassandra/CassandraNode.java @@ -32,7 +32,7 @@ import brooklyn.config.ConfigKey; import brooklyn.entity.basic.BrooklynConfigKeys; import brooklyn.entity.basic.ConfigKeys; import brooklyn.entity.basic.SoftwareProcess; -import brooklyn.entity.database.DatastoreMixins; +import org.apache.brooklyn.entity.database.DatastoreMixins; import brooklyn.entity.java.UsesJavaMXBeans; import brooklyn.entity.java.UsesJmx; import brooklyn.event.basic.BasicAttributeSensorAndConfigKey; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/ac1a7c09/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/cassandra/CassandraNodeSshDriver.java ---------------------------------------------------------------------- diff --git a/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/cassandra/CassandraNodeSshDriver.java b/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/cassandra/CassandraNodeSshDriver.java index 7806979..0e8d343 100644 --- a/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/cassandra/CassandraNodeSshDriver.java +++ b/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/cassandra/CassandraNodeSshDriver.java @@ -44,7 +44,7 @@ import com.google.common.collect.ImmutableSet; import brooklyn.entity.basic.Attributes; import brooklyn.entity.basic.Entities; -import brooklyn.entity.database.DatastoreMixins; +import org.apache.brooklyn.entity.database.DatastoreMixins; import brooklyn.entity.java.JavaSoftwareProcessSshDriver; import brooklyn.entity.java.UsesJmx; import brooklyn.entity.software.SshEffectorTasks; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/ac1a7c09/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/elasticsearch/ElasticSearchNode.java ---------------------------------------------------------------------- diff --git a/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/elasticsearch/ElasticSearchNode.java b/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/elasticsearch/ElasticSearchNode.java index d82e34b..acea855 100644 --- a/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/elasticsearch/ElasticSearchNode.java +++ b/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/elasticsearch/ElasticSearchNode.java @@ -27,7 +27,7 @@ import org.apache.brooklyn.entity.webapp.WebAppServiceConstants; import brooklyn.config.ConfigKey; import brooklyn.entity.basic.ConfigKeys; import brooklyn.entity.basic.SoftwareProcess; -import brooklyn.entity.database.DatastoreMixins; +import org.apache.brooklyn.entity.database.DatastoreMixins; import brooklyn.event.basic.BasicAttributeSensorAndConfigKey; import brooklyn.event.basic.BasicAttributeSensorAndConfigKey.StringAttributeSensorAndConfigKey; import brooklyn.event.basic.PortAttributeSensorAndConfigKey; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/ac1a7c09/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 c9b73e0..705ceca 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 @@ -17,8 +17,8 @@ import brooklyn.enricher.basic.SensorTransformingEnricher; import brooklyn.entity.basic.AbstractApplication; import brooklyn.entity.basic.ConfigKeys; import brooklyn.entity.basic.Entities; -import brooklyn.entity.database.DatastoreMixins.DatastoreCommon; -import brooklyn.entity.database.mysql.MySqlNode; +import org.apache.brooklyn.entity.database.DatastoreMixins.DatastoreCommon; +import org.apache.brooklyn.entity.database.mysql.MySqlNode; import brooklyn.entity.group.DynamicCluster; import brooklyn.entity.java.JavaEntityMethods; import org.apache.brooklyn.api.entity.proxying.EntitySpec; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/ac1a7c09/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 df15e0a..537b547 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 @@ -10,8 +10,8 @@ import org.testng.annotations.Test; import org.apache.brooklyn.api.entity.Entity; import brooklyn.entity.basic.Entities; import brooklyn.entity.basic.StartableApplication; -import brooklyn.entity.database.DatastoreMixins.DatastoreCommon; -import brooklyn.entity.database.mysql.MySqlNode; +import org.apache.brooklyn.entity.database.DatastoreMixins.DatastoreCommon; +import org.apache.brooklyn.entity.database.mysql.MySqlNode; import org.apache.brooklyn.api.entity.proxying.EntitySpec; import org.apache.brooklyn.entity.webapp.JavaWebAppService; import org.apache.brooklyn.entity.webapp.WebAppService; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/ac1a7c09/usage/camp/src/test/resources/java-web-app-and-db-with-function-2.yaml ---------------------------------------------------------------------- diff --git a/usage/camp/src/test/resources/java-web-app-and-db-with-function-2.yaml b/usage/camp/src/test/resources/java-web-app-and-db-with-function-2.yaml index bf90092..1f02444 100644 --- a/usage/camp/src/test/resources/java-web-app-and-db-with-function-2.yaml +++ b/usage/camp/src/test/resources/java-web-app-and-db-with-function-2.yaml @@ -34,7 +34,7 @@ services: - visitors - brooklyn - br00k11n -- serviceType: brooklyn.entity.database.mysql.MySqlNode +- serviceType: org.apache.brooklyn.entity.database.mysql.MySqlNode name: My DB id: db brooklyn.config: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/ac1a7c09/usage/camp/src/test/resources/java-web-app-and-db-with-function.yaml ---------------------------------------------------------------------- diff --git a/usage/camp/src/test/resources/java-web-app-and-db-with-function.yaml b/usage/camp/src/test/resources/java-web-app-and-db-with-function.yaml index 249ab32..0f15729 100644 --- a/usage/camp/src/test/resources/java-web-app-and-db-with-function.yaml +++ b/usage/camp/src/test/resources/java-web-app-and-db-with-function.yaml @@ -28,7 +28,7 @@ services: java.sysprops: brooklyn.example.db.url: $brooklyn:formatString("jdbc:%s%s?user=%s&password=%s", component("db").attributeWhenReady("datastore.url"), "visitors", "brooklyn", "br00k11n") -- serviceType: brooklyn.entity.database.mysql.MySqlNode +- serviceType: org.apache.brooklyn.entity.database.mysql.MySqlNode id: db name: My DB location: localhost http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/ac1a7c09/usage/camp/src/test/resources/java-web-app-and-db-with-policy.yaml ---------------------------------------------------------------------- diff --git a/usage/camp/src/test/resources/java-web-app-and-db-with-policy.yaml b/usage/camp/src/test/resources/java-web-app-and-db-with-policy.yaml index 671f64a..dd799fc 100644 --- a/usage/camp/src/test/resources/java-web-app-and-db-with-policy.yaml +++ b/usage/camp/src/test/resources/java-web-app-and-db-with-policy.yaml @@ -37,7 +37,7 @@ services: minPoolSize: 1 maxPoolSize: 5 -- type: brooklyn.entity.database.mysql.MySqlNode +- type: org.apache.brooklyn.entity.database.mysql.MySqlNode id: db name: My DB location: localhost http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/ac1a7c09/usage/camp/src/test/resources/test-java-web-app-spec-and-db-with-function.yaml ---------------------------------------------------------------------- diff --git a/usage/camp/src/test/resources/test-java-web-app-spec-and-db-with-function.yaml b/usage/camp/src/test/resources/test-java-web-app-spec-and-db-with-function.yaml index eb63758..f51f4d7 100644 --- a/usage/camp/src/test/resources/test-java-web-app-spec-and-db-with-function.yaml +++ b/usage/camp/src/test/resources/test-java-web-app-spec-and-db-with-function.yaml @@ -32,7 +32,7 @@ services: java.sysprops: brooklyn.example.db.url: $brooklyn:formatString("jdbc:%s%s?user=%s\\&password=%s", component("db").attributeWhenReady("datastore.url"), "visitors", "brooklyn", "br00k11n") -- serviceType: brooklyn.entity.database.mysql.MySqlNode +- serviceType: org.apache.brooklyn.entity.database.mysql.MySqlNode id: db name: My DB brooklyn.config: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/ac1a7c09/usage/launcher/src/test/resources/java-web-app-and-db-with-function.yaml ---------------------------------------------------------------------- diff --git a/usage/launcher/src/test/resources/java-web-app-and-db-with-function.yaml b/usage/launcher/src/test/resources/java-web-app-and-db-with-function.yaml index 1bf0172..d3c3a04 100644 --- a/usage/launcher/src/test/resources/java-web-app-and-db-with-function.yaml +++ b/usage/launcher/src/test/resources/java-web-app-and-db-with-function.yaml @@ -28,7 +28,7 @@ services: java.sysprops: brooklyn.example.db.url: $brooklyn:formatString("jdbc:%s%s?user=%s\\&password=%s", component("db").attributeWhenReady("datastore.url"), "visitors", "brooklyn", "br00k11n") -- serviceType: brooklyn.entity.database.mysql.MySqlNode +- serviceType: org.apache.brooklyn.entity.database.mysql.MySqlNode id: db name: My DB location: localhost http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/ac1a7c09/usage/launcher/src/test/resources/mssql-test.yaml ---------------------------------------------------------------------- diff --git a/usage/launcher/src/test/resources/mssql-test.yaml b/usage/launcher/src/test/resources/mssql-test.yaml index 2b31f74..f8d15a5 100644 --- a/usage/launcher/src/test/resources/mssql-test.yaml +++ b/usage/launcher/src/test/resources/mssql-test.yaml @@ -17,7 +17,7 @@ # under the License. # -# Duplicate of software/database/src/main/resources/brooklyn/entity/database/mssql/mssql.yaml, +# Duplicate of software/database/src/main/resources/org/apache/brooklyn/entity/database/mssql/mssql.yaml, # but with template for download url, etc name: mssql @@ -35,11 +35,11 @@ services: - type: brooklyn.entity.basic.VanillaWindowsProcess brooklyn.config: templates.install: - classpath://brooklyn/entity/database/mssql/ConfigurationFile.ini: "C:\\ConfigurationFile.ini" - classpath://brooklyn/entity/database/mssql/installmssql.ps1: "C:\\installmssql.ps1" - classpath://brooklyn/entity/database/mssql/configuremssql.ps1: "C:\\configuremssql.ps1" - classpath://brooklyn/entity/database/mssql/launchmssql.bat: "C:\\launchmssql.bat" - classpath://brooklyn/entity/database/mssql/stopmssql.bat: "C:\\stopmssql.bat" + classpath://org/apache/brooklyn/entity/database/mssql/ConfigurationFile.ini: "C:\\ConfigurationFile.ini" + classpath://org/apache/brooklyn/entity/database/mssql/installmssql.ps1: "C:\\installmssql.ps1" + classpath://org/apache/brooklyn/entity/database/mssql/configuremssql.ps1: "C:\\configuremssql.ps1" + classpath://org/apache/brooklyn/entity/database/mssql/launchmssql.bat: "C:\\launchmssql.bat" + classpath://org/apache/brooklyn/entity/database/mssql/stopmssql.bat: "C:\\stopmssql.bat" install.command: powershell -command "C:\\installmssql.ps1" customize.command: powershell -command "C:\\configuremssql.ps1" launch.command: "C:\\launchmssql.bat" http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/ac1a7c09/usage/launcher/src/test/resources/postgres-gce-blueprint.yaml ---------------------------------------------------------------------- diff --git a/usage/launcher/src/test/resources/postgres-gce-blueprint.yaml b/usage/launcher/src/test/resources/postgres-gce-blueprint.yaml index de4abd0..9f12a3c 100644 --- a/usage/launcher/src/test/resources/postgres-gce-blueprint.yaml +++ b/usage/launcher/src/test/resources/postgres-gce-blueprint.yaml @@ -18,5 +18,5 @@ # name: PostgreSQL services: -- serviceType: brooklyn.entity.database.postgresql.PostgreSqlNode +- serviceType: org.apache.brooklyn.entity.database.postgresql.PostgreSqlNode location: gce-europe-west1 http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/ac1a7c09/usage/qa/src/main/java/org/apache/brooklyn/qa/load/SimulatedMySqlNodeImpl.java ---------------------------------------------------------------------- diff --git a/usage/qa/src/main/java/org/apache/brooklyn/qa/load/SimulatedMySqlNodeImpl.java b/usage/qa/src/main/java/org/apache/brooklyn/qa/load/SimulatedMySqlNodeImpl.java index b5f0cf4..7b44dc5 100644 --- a/usage/qa/src/main/java/org/apache/brooklyn/qa/load/SimulatedMySqlNodeImpl.java +++ b/usage/qa/src/main/java/org/apache/brooklyn/qa/load/SimulatedMySqlNodeImpl.java @@ -24,9 +24,9 @@ import java.util.concurrent.Callable; import brooklyn.config.ConfigKey; import brooklyn.entity.basic.AbstractSoftwareProcessSshDriver; -import brooklyn.entity.database.mysql.MySqlNode; -import brooklyn.entity.database.mysql.MySqlNodeImpl; -import brooklyn.entity.database.mysql.MySqlSshDriver; +import org.apache.brooklyn.entity.database.mysql.MySqlNode; +import org.apache.brooklyn.entity.database.mysql.MySqlNodeImpl; +import org.apache.brooklyn.entity.database.mysql.MySqlSshDriver; import brooklyn.entity.software.SshEffectorTasks; import brooklyn.event.feed.function.FunctionFeed; import brooklyn.event.feed.function.FunctionPollConfig; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/ac1a7c09/usage/qa/src/main/java/org/apache/brooklyn/qa/load/SimulatedTheeTierApp.java ---------------------------------------------------------------------- diff --git a/usage/qa/src/main/java/org/apache/brooklyn/qa/load/SimulatedTheeTierApp.java b/usage/qa/src/main/java/org/apache/brooklyn/qa/load/SimulatedTheeTierApp.java index bc7b2c3..fbfc7c0 100644 --- a/usage/qa/src/main/java/org/apache/brooklyn/qa/load/SimulatedTheeTierApp.java +++ b/usage/qa/src/main/java/org/apache/brooklyn/qa/load/SimulatedTheeTierApp.java @@ -32,7 +32,7 @@ import brooklyn.entity.basic.Attributes; import brooklyn.entity.basic.ConfigKeys; import brooklyn.entity.basic.Entities; import brooklyn.entity.basic.StartableApplication; -import brooklyn.entity.database.mysql.MySqlNode; +import org.apache.brooklyn.entity.database.mysql.MySqlNode; import brooklyn.entity.group.DynamicCluster; import brooklyn.entity.java.JavaEntityMethods; import brooklyn.entity.trait.Startable;
