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/20 22:28:59 UTC
[09/11] incubator-brooklyn git commit: update the osgi tests with new
BROOKLYN-162 package prefix
update the osgi tests with new BROOKLYN-162 package prefix
Project: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/commit/1927ad46
Tree: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/tree/1927ad46
Diff: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/diff/1927ad46
Branch: refs/heads/master
Commit: 1927ad46d7460b757f6b486d28c3e9d56d6661a0
Parents: c42f5f8
Author: Alex Heneveld <al...@cloudsoftcorp.com>
Authored: Thu Aug 20 14:40:38 2015 +0100
Committer: Alex Heneveld <al...@cloudsoftcorp.com>
Committed: Thu Aug 20 15:36:13 2015 +0100
----------------------------------------------------------------------
.../brooklyn/core/mgmt/osgi/OsgiStandaloneTest.java | 6 +++---
.../core/mgmt/osgi/OsgiVersionMoreEntityTest.java | 6 +++---
.../yaml/example_yaml/vanilla-bash-netcat-w-client.yaml | 8 ++++----
.../apache/brooklyn/camp/brooklyn/EnrichersYamlTest.java | 2 +-
.../apache/brooklyn/camp/brooklyn/PoliciesYamlTest.java | 2 +-
.../apache/brooklyn/camp/brooklyn/ReferencedYamlTest.java | 2 +-
.../catalog/CatalogOsgiVersionMoreEntityTest.java | 10 +++++-----
.../camp/brooklyn/catalog/CatalogXmlVersionTest.java | 2 +-
.../camp/brooklyn/catalog/CatalogYamlEntityTest.java | 2 +-
.../camp/brooklyn/catalog/CatalogYamlLocationTest.java | 2 +-
.../camp/brooklyn/catalog/CatalogYamlPolicyTest.java | 4 ++--
.../camp/brooklyn/test/lite/CampYamlLiteTest.java | 4 ++--
.../brooklyn/catalog/more-entities-osgi-catalog-scan.yaml | 2 +-
.../catalog/more-entity-v1-called-v1-osgi-catalog.yaml | 2 +-
.../brooklyn/catalog/more-entity-v1-osgi-catalog.yaml | 2 +-
.../catalog/more-entity-v1-with-policy-osgi-catalog.yaml | 2 +-
.../brooklyn/catalog/more-entity-v2-osgi-catalog.yaml | 2 +-
.../brooklyn/catalog/more-policies-osgi-catalog-scan.yaml | 2 +-
.../camp/brooklyn/catalog/simple-policy-osgi-catalog.yaml | 2 +-
usage/camp/src/test/resources/osgi-catalog.xml | 2 +-
usage/camp/src/test/resources/simple-catalog.xml | 4 ++--
usage/camp/src/test/resources/test-app-with-policy.yaml | 2 +-
.../src/test/resources/test-entity-with-enricher.yaml | 2 +-
.../camp/src/test/resources/test-entity-with-policy.yaml | 2 +-
.../src/test/resources/test-propagating-enricher.yaml | 2 +-
.../src/test/resources/vanilla-bash-netcat-w-client.yaml | 8 ++++----
.../test/resources/yaml-ref-bundle-without-libraries.yaml | 2 +-
27 files changed, 44 insertions(+), 44 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/1927ad46/core/src/test/java/org/apache/brooklyn/core/mgmt/osgi/OsgiStandaloneTest.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/apache/brooklyn/core/mgmt/osgi/OsgiStandaloneTest.java b/core/src/test/java/org/apache/brooklyn/core/mgmt/osgi/OsgiStandaloneTest.java
index 853b2e8..cffb432 100644
--- a/core/src/test/java/org/apache/brooklyn/core/mgmt/osgi/OsgiStandaloneTest.java
+++ b/core/src/test/java/org/apache/brooklyn/core/mgmt/osgi/OsgiStandaloneTest.java
@@ -118,7 +118,7 @@ public class OsgiStandaloneTest {
@Test
public void testBootBundle() throws Exception {
Bundle bundle = installFromClasspath(BROOKLYN_TEST_OSGI_ENTITIES_PATH);
- Class<?> bundleCls = bundle.loadClass("brooklyn.osgi.tests.SimpleEntity");
+ Class<?> bundleCls = bundle.loadClass("org.apache.brooklyn.test.osgi.entities.SimpleEntity");
Assert.assertEquals(Entity.class, bundle.loadClass(Entity.class.getName()));
Assert.assertEquals(Entity.class, bundleCls.getClassLoader().loadClass(Entity.class.getName()));
}
@@ -225,14 +225,14 @@ public class OsgiStandaloneTest {
ManifestHelper helper = Osgis.ManifestHelper.forManifest(jarIn.getManifest());
jarIn.close();
Assert.assertEquals(helper.getVersion().toString(), "0.1.0");
- Assert.assertTrue(helper.getExportedPackages().contains("brooklyn.osgi.tests"));
+ Assert.assertTrue(helper.getExportedPackages().contains("org.apache.brooklyn.test.osgi.entities"));
}
@Test
public void testLoadOsgiBundleDependencies() throws Exception {
Bundle bundle = installFromClasspath(BROOKLYN_TEST_OSGI_ENTITIES_PATH);
Assert.assertNotNull(bundle);
- Class<?> aClass = bundle.loadClass("brooklyn.osgi.tests.SimpleApplicationImpl");
+ Class<?> aClass = bundle.loadClass("org.apache.brooklyn.test.osgi.entities.SimpleApplicationImpl");
Object aInst = aClass.newInstance();
Assert.assertNotNull(aInst);
}
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/1927ad46/core/src/test/java/org/apache/brooklyn/core/mgmt/osgi/OsgiVersionMoreEntityTest.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/apache/brooklyn/core/mgmt/osgi/OsgiVersionMoreEntityTest.java b/core/src/test/java/org/apache/brooklyn/core/mgmt/osgi/OsgiVersionMoreEntityTest.java
index 1d50609..b7c7292 100644
--- a/core/src/test/java/org/apache/brooklyn/core/mgmt/osgi/OsgiVersionMoreEntityTest.java
+++ b/core/src/test/java/org/apache/brooklyn/core/mgmt/osgi/OsgiVersionMoreEntityTest.java
@@ -117,9 +117,9 @@ public class OsgiVersionMoreEntityTest {
TestResourceUnavailableException.throwIfResourceUnavailable(getClass(), BROOKLYN_TEST_OSGI_ENTITIES_PATH);
Bundle bundle = Osgis.install(framework, BROOKLYN_TEST_OSGI_ENTITIES_PATH);
@SuppressWarnings("unchecked")
- Class<? extends Entity> bundleCls = (Class<? extends Entity>) bundle.loadClass("brooklyn.osgi.tests.SimpleEntityImpl");
+ Class<? extends Entity> bundleCls = (Class<? extends Entity>) bundle.loadClass("org.apache.brooklyn.test.osgi.entities.SimpleEntityImpl");
@SuppressWarnings("unchecked")
- Class<? extends Entity> bundleInterface = (Class<? extends Entity>) bundle.loadClass("brooklyn.osgi.tests.SimpleEntity");
+ Class<? extends Entity> bundleInterface = (Class<? extends Entity>) bundle.loadClass("org.apache.brooklyn.test.osgi.entities.SimpleEntity");
@SuppressWarnings("unchecked")
EntitySpec<Entity> spec = (EntitySpec<Entity>) (((EntitySpec<Entity>)EntitySpec.create(bundleInterface))).impl(bundleCls);
@@ -286,7 +286,7 @@ public class OsgiVersionMoreEntityTest {
} catch (Exception e) {
Assert.assertTrue(e.toString().toLowerCase().contains("unresolved constraint"), "Missing expected text in error: "+e);
Assert.assertTrue(e.toString().toLowerCase().contains("wiring.package"), "Missing expected text in error: "+e);
- Assert.assertTrue(e.toString().toLowerCase().contains("brooklyn.osgi.tests"), "Missing expected text in error: "+e);
+ Assert.assertTrue(e.toString().toLowerCase().contains("org.apache.brooklyn.test.osgi.entities"), "Missing expected text in error: "+e);
}
}
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/1927ad46/docs/guide/yaml/example_yaml/vanilla-bash-netcat-w-client.yaml
----------------------------------------------------------------------
diff --git a/docs/guide/yaml/example_yaml/vanilla-bash-netcat-w-client.yaml b/docs/guide/yaml/example_yaml/vanilla-bash-netcat-w-client.yaml
index 747d5a5..d3eccbb 100644
--- a/docs/guide/yaml/example_yaml/vanilla-bash-netcat-w-client.yaml
+++ b/docs/guide/yaml/example_yaml/vanilla-bash-netcat-w-client.yaml
@@ -29,12 +29,12 @@ services:
brooklyn.initializers:
# two sensors, recording the data sent to this netcat server:
- - type: brooklyn.entity.software.ssh.SshCommandSensor
+ - type: org.apache.brooklyn.core.sensor.ssh.SshCommandSensor
brooklyn.config:
name: output.last
command: tail -1 server-input
- - type: brooklyn.entity.software.ssh.SshCommandSensor
+ - type: org.apache.brooklyn.core.sensor.ssh.SshCommandSensor
brooklyn.config:
name: output.all
command: cat server-input
@@ -57,7 +57,7 @@ services:
brooklyn.initializers:
# but there is a sample effector which runs nc in client mode
- - type: brooklyn.entity.software.ssh.SshCommandEffector
+ - type: org.apache.brooklyn.core.effector.ssh.SshCommandEffector
brooklyn.config:
name: sayHiNetcat
description: Echo a small hello string to the netcat entity
@@ -70,7 +70,7 @@ services:
# and add an enricher at the root so all sensors from netcat-server are visible on the root
brooklyn.enrichers:
-- enricherType: brooklyn.enricher.basic.Propagator
+- enricherType: org.apache.brooklyn.enricher.stock.Propagator
brooklyn.config:
enricher.producer: $brooklyn:component("netcat-server")
enricher.propagating.propagatingAll: true
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/1927ad46/usage/camp/src/test/java/org/apache/brooklyn/camp/brooklyn/EnrichersYamlTest.java
----------------------------------------------------------------------
diff --git a/usage/camp/src/test/java/org/apache/brooklyn/camp/brooklyn/EnrichersYamlTest.java b/usage/camp/src/test/java/org/apache/brooklyn/camp/brooklyn/EnrichersYamlTest.java
index 8f23a44..868b036 100644
--- a/usage/camp/src/test/java/org/apache/brooklyn/camp/brooklyn/EnrichersYamlTest.java
+++ b/usage/camp/src/test/java/org/apache/brooklyn/camp/brooklyn/EnrichersYamlTest.java
@@ -128,7 +128,7 @@ public class EnrichersYamlTest extends AbstractYamlTest {
" test.confName: parent entity",
" id: parentId",
" brooklyn.enrichers:",
- " - enricherType: brooklyn.enricher.basic.Propagator",
+ " - enricherType: org.apache.brooklyn.enricher.stock.Propagator",
" brooklyn.config:",
" enricher.producer: $brooklyn:component(\"childId\")",
" enricher.propagating.propagatingAll: true",
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/1927ad46/usage/camp/src/test/java/org/apache/brooklyn/camp/brooklyn/PoliciesYamlTest.java
----------------------------------------------------------------------
diff --git a/usage/camp/src/test/java/org/apache/brooklyn/camp/brooklyn/PoliciesYamlTest.java b/usage/camp/src/test/java/org/apache/brooklyn/camp/brooklyn/PoliciesYamlTest.java
index afe0721..4b89552 100644
--- a/usage/camp/src/test/java/org/apache/brooklyn/camp/brooklyn/PoliciesYamlTest.java
+++ b/usage/camp/src/test/java/org/apache/brooklyn/camp/brooklyn/PoliciesYamlTest.java
@@ -96,7 +96,7 @@ public class PoliciesYamlTest extends AbstractYamlTest {
" - serviceType: org.apache.brooklyn.core.test.entity.TestEntity",
" name: Child Entity",
" brooklyn.policies:",
- " - policyType: brooklyn.test.policy.TestPolicy",
+ " - policyType: org.apache.brooklyn.core.test.policy.TestPolicy",
" brooklyn.config:",
" test.confName: Name from YAML",
" test.attributeSensor: $brooklyn:sensor(\"org.apache.brooklyn.core.test.entity.TestEntity\", \"test.name\")"));
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/1927ad46/usage/camp/src/test/java/org/apache/brooklyn/camp/brooklyn/ReferencedYamlTest.java
----------------------------------------------------------------------
diff --git a/usage/camp/src/test/java/org/apache/brooklyn/camp/brooklyn/ReferencedYamlTest.java b/usage/camp/src/test/java/org/apache/brooklyn/camp/brooklyn/ReferencedYamlTest.java
index 50d4f54..923f9ca 100644
--- a/usage/camp/src/test/java/org/apache/brooklyn/camp/brooklyn/ReferencedYamlTest.java
+++ b/usage/camp/src/test/java/org/apache/brooklyn/camp/brooklyn/ReferencedYamlTest.java
@@ -152,7 +152,7 @@ public class ReferencedYamlTest extends AbstractYamlTest {
Collection<Entity> children = app.getChildren();
Assert.assertEquals(children.size(), 1);
Entity child = Iterables.getOnlyElement(children);
- Assert.assertEquals(child.getEntityType().getName(), "brooklyn.osgi.tests.SimpleEntity");
+ Assert.assertEquals(child.getEntityType().getName(), "org.apache.brooklyn.test.osgi.entities.SimpleEntity");
deleteCatalogEntity(parentCatalogId);
}
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/1927ad46/usage/camp/src/test/java/org/apache/brooklyn/camp/brooklyn/catalog/CatalogOsgiVersionMoreEntityTest.java
----------------------------------------------------------------------
diff --git a/usage/camp/src/test/java/org/apache/brooklyn/camp/brooklyn/catalog/CatalogOsgiVersionMoreEntityTest.java b/usage/camp/src/test/java/org/apache/brooklyn/camp/brooklyn/catalog/CatalogOsgiVersionMoreEntityTest.java
index 86b3028..f93f45b 100644
--- a/usage/camp/src/test/java/org/apache/brooklyn/camp/brooklyn/catalog/CatalogOsgiVersionMoreEntityTest.java
+++ b/usage/camp/src/test/java/org/apache/brooklyn/camp/brooklyn/catalog/CatalogOsgiVersionMoreEntityTest.java
@@ -168,7 +168,7 @@ public class CatalogOsgiVersionMoreEntityTest extends AbstractYamlTest {
OsgiVersionMoreEntityTest.assertV2MethodCall(moreEntityV2);
}
- // @Test FIXME: https://issues.apache.org/jira/browse/BROOKLYN-161
+ @Test
public void testMoreEntityV2AutoscanWithClasspath() throws Exception {
TestResourceUnavailableException.throwIfResourceUnavailable(getClass(), "/brooklyn/osgi/brooklyn-test-osgi-more-entities_0.2.0.jar");
TestResourceUnavailableException.throwIfResourceUnavailable(getClass(), "/brooklyn/osgi/brooklyn-test-osgi-entities.jar");
@@ -183,7 +183,7 @@ public class CatalogOsgiVersionMoreEntityTest extends AbstractYamlTest {
Assert.assertEquals(item.getCatalogItemType(), CatalogItemType.ENTITY);
// this refers to the java item, where the libraries are defined
- item = CatalogUtils.getCatalogItemOptionalVersion(mgmt(), "brooklyn.osgi.tests.more.MoreEntity");
+ item = CatalogUtils.getCatalogItemOptionalVersion(mgmt(), "org.apache.brooklyn.test.osgi.entities.more.MoreEntity");
Assert.assertEquals(item.getVersion(), "2.0.test_java");
Assert.assertEquals(item.getLibraries().size(), 2);
@@ -195,7 +195,7 @@ public class CatalogOsgiVersionMoreEntityTest extends AbstractYamlTest {
OsgiVersionMoreEntityTest.assertV2MethodCall(moreEntity);
}
- // @Test FIXME: https://issues.apache.org/jira/browse/BROOKLYN-161
+ @Test
public void testMorePolicyV2AutoscanWithClasspath() throws Exception {
TestResourceUnavailableException.throwIfResourceUnavailable(getClass(), "/brooklyn/osgi/brooklyn-test-osgi-more-entities_0.2.0.jar");
TestResourceUnavailableException.throwIfResourceUnavailable(getClass(), "/brooklyn/osgi/brooklyn-test-osgi-entities.jar");
@@ -210,7 +210,7 @@ public class CatalogOsgiVersionMoreEntityTest extends AbstractYamlTest {
Assert.assertEquals(item.getCatalogItemType(), CatalogItemType.POLICY);
// this refers to the java item, where the libraries are defined
- item = CatalogUtils.getCatalogItemOptionalVersion(mgmt(), "brooklyn.osgi.tests.more.MorePolicy");
+ item = CatalogUtils.getCatalogItemOptionalVersion(mgmt(), "org.apache.brooklyn.test.osgi.entities.more.MorePolicy");
Assert.assertEquals(item.getVersion(), "2.0.test_java");
Assert.assertEquals(item.getLibraries().size(), 2);
@@ -226,7 +226,7 @@ public class CatalogOsgiVersionMoreEntityTest extends AbstractYamlTest {
OsgiVersionMoreEntityTest.assertV2MethodCall(morePolicy);
}
- // @Test FIXME: https://issues.apache.org/jira/browse/BROOKLYN-161
+ @Test
public void testAutoscanWithClasspathCanCreateSpecs() throws Exception {
TestResourceUnavailableException.throwIfResourceUnavailable(getClass(), "/brooklyn/osgi/brooklyn-test-osgi-more-entities_0.2.0.jar");
TestResourceUnavailableException.throwIfResourceUnavailable(getClass(), "/brooklyn/osgi/brooklyn-test-osgi-entities.jar");
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/1927ad46/usage/camp/src/test/java/org/apache/brooklyn/camp/brooklyn/catalog/CatalogXmlVersionTest.java
----------------------------------------------------------------------
diff --git a/usage/camp/src/test/java/org/apache/brooklyn/camp/brooklyn/catalog/CatalogXmlVersionTest.java b/usage/camp/src/test/java/org/apache/brooklyn/camp/brooklyn/catalog/CatalogXmlVersionTest.java
index 40abd03..b47bf76 100644
--- a/usage/camp/src/test/java/org/apache/brooklyn/camp/brooklyn/catalog/CatalogXmlVersionTest.java
+++ b/usage/camp/src/test/java/org/apache/brooklyn/camp/brooklyn/catalog/CatalogXmlVersionTest.java
@@ -39,7 +39,7 @@ public class CatalogXmlVersionTest extends AbstractCatalogXmlTest {
{"BasicApp"}, // test that items with symbolicName not matching the type work
{"BasicApp:0.0.0.SNAPSHOT"},
{"BasicApp:2.0"},
- {"brooklyn.osgi.tests.SimpleApplication"}, //test that classpath is used
+ {"org.apache.brooklyn.test.osgi.entities.SimpleApplication"}, //test that classpath is used
};
}
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/1927ad46/usage/camp/src/test/java/org/apache/brooklyn/camp/brooklyn/catalog/CatalogYamlEntityTest.java
----------------------------------------------------------------------
diff --git a/usage/camp/src/test/java/org/apache/brooklyn/camp/brooklyn/catalog/CatalogYamlEntityTest.java b/usage/camp/src/test/java/org/apache/brooklyn/camp/brooklyn/catalog/CatalogYamlEntityTest.java
index 383ffa6..0063916 100644
--- a/usage/camp/src/test/java/org/apache/brooklyn/camp/brooklyn/catalog/CatalogYamlEntityTest.java
+++ b/usage/camp/src/test/java/org/apache/brooklyn/camp/brooklyn/catalog/CatalogYamlEntityTest.java
@@ -538,7 +538,7 @@ public class CatalogYamlEntityTest extends AbstractYamlTest {
" - serviceType: "+ver(id);
Entity app = createAndStartApplication(yaml);
Entity simpleEntity = Iterables.getOnlyElement(app.getChildren());
- InputStream icon = new ResourceUtils(simpleEntity).getResourceFromUrl("classpath:/brooklyn/osgi/tests/icon.gif");
+ InputStream icon = new ResourceUtils(simpleEntity).getResourceFromUrl("classpath:/org/apache/brooklyn/test/osgi/entities/icon.gif");
assertTrue(icon != null);
icon.close();
}
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/1927ad46/usage/camp/src/test/java/org/apache/brooklyn/camp/brooklyn/catalog/CatalogYamlLocationTest.java
----------------------------------------------------------------------
diff --git a/usage/camp/src/test/java/org/apache/brooklyn/camp/brooklyn/catalog/CatalogYamlLocationTest.java b/usage/camp/src/test/java/org/apache/brooklyn/camp/brooklyn/catalog/CatalogYamlLocationTest.java
index c579aaf..868a8e6 100644
--- a/usage/camp/src/test/java/org/apache/brooklyn/camp/brooklyn/catalog/CatalogYamlLocationTest.java
+++ b/usage/camp/src/test/java/org/apache/brooklyn/camp/brooklyn/catalog/CatalogYamlLocationTest.java
@@ -47,7 +47,7 @@ import com.google.common.collect.Lists;
public class CatalogYamlLocationTest extends AbstractYamlTest {
private static final String LOCALHOST_LOCATION_SPEC = "localhost";
private static final String LOCALHOST_LOCATION_TYPE = LocalhostMachineProvisioningLocation.class.getName();
- private static final String SIMPLE_LOCATION_TYPE = "brooklyn.osgi.tests.SimpleLocation";
+ private static final String SIMPLE_LOCATION_TYPE = "org.apache.brooklyn.test.osgi.entities.SimpleLocation";
@AfterMethod
public void tearDown() {
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/1927ad46/usage/camp/src/test/java/org/apache/brooklyn/camp/brooklyn/catalog/CatalogYamlPolicyTest.java
----------------------------------------------------------------------
diff --git a/usage/camp/src/test/java/org/apache/brooklyn/camp/brooklyn/catalog/CatalogYamlPolicyTest.java b/usage/camp/src/test/java/org/apache/brooklyn/camp/brooklyn/catalog/CatalogYamlPolicyTest.java
index 1774f7c..b1f1851 100644
--- a/usage/camp/src/test/java/org/apache/brooklyn/camp/brooklyn/catalog/CatalogYamlPolicyTest.java
+++ b/usage/camp/src/test/java/org/apache/brooklyn/camp/brooklyn/catalog/CatalogYamlPolicyTest.java
@@ -33,8 +33,8 @@ import org.apache.brooklyn.test.support.TestResourceUnavailableException;
import com.google.common.collect.Iterables;
public class CatalogYamlPolicyTest extends AbstractYamlTest {
- private static final String SIMPLE_POLICY_TYPE = "brooklyn.osgi.tests.SimplePolicy";
- private static final String SIMPLE_ENTITY_TYPE = "brooklyn.osgi.tests.SimpleEntity";
+ private static final String SIMPLE_POLICY_TYPE = "org.apache.brooklyn.test.osgi.entities.SimplePolicy";
+ private static final String SIMPLE_ENTITY_TYPE = "org.apache.brooklyn.test.osgi.entities.SimpleEntity";
@Test
public void testAddCatalogItem() throws Exception {
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/1927ad46/usage/camp/src/test/java/org/apache/brooklyn/camp/brooklyn/test/lite/CampYamlLiteTest.java
----------------------------------------------------------------------
diff --git a/usage/camp/src/test/java/org/apache/brooklyn/camp/brooklyn/test/lite/CampYamlLiteTest.java b/usage/camp/src/test/java/org/apache/brooklyn/camp/brooklyn/test/lite/CampYamlLiteTest.java
index cae1320..2eda1d5 100644
--- a/usage/camp/src/test/java/org/apache/brooklyn/camp/brooklyn/test/lite/CampYamlLiteTest.java
+++ b/usage/camp/src/test/java/org/apache/brooklyn/camp/brooklyn/test/lite/CampYamlLiteTest.java
@@ -216,7 +216,7 @@ public class CampYamlLiteTest {
" id: " + symbolicName + "\n" +
" name: My Catalog App\n" +
" description: My description\n" +
- " icon_url: classpath:/brooklyn/osgi/tests/icon.gif\n" +
+ " icon_url: classpath:/org/apache/brooklyn/test/osgi/entities/icon.gif\n" +
" version: " + TEST_VERSION + "\n" +
" libraries:\n" +
" - url: " + bundleUrl + "\n" +
@@ -244,7 +244,7 @@ public class CampYamlLiteTest {
// now let's check other things on the item
assertEquals(item.getDisplayName(), "My Catalog App");
assertEquals(item.getDescription(), "My description");
- assertEquals(item.getIconUrl(), "classpath:/brooklyn/osgi/tests/icon.gif");
+ assertEquals(item.getIconUrl(), "classpath:/org/apache/brooklyn/test/osgi/entities/icon.gif");
// and confirm we can resolve ICON
byte[] iconData = Streams.readFully(ResourceUtils.create(CatalogUtils.newClassLoadingContext(mgmt, item)).getResourceFromUrl(item.getIconUrl()));
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/1927ad46/usage/camp/src/test/resources/org/apache/brooklyn/camp/brooklyn/catalog/more-entities-osgi-catalog-scan.yaml
----------------------------------------------------------------------
diff --git a/usage/camp/src/test/resources/org/apache/brooklyn/camp/brooklyn/catalog/more-entities-osgi-catalog-scan.yaml b/usage/camp/src/test/resources/org/apache/brooklyn/camp/brooklyn/catalog/more-entities-osgi-catalog-scan.yaml
index 852d9e1..1a79465 100644
--- a/usage/camp/src/test/resources/org/apache/brooklyn/camp/brooklyn/catalog/more-entities-osgi-catalog-scan.yaml
+++ b/usage/camp/src/test/resources/org/apache/brooklyn/camp/brooklyn/catalog/more-entities-osgi-catalog-scan.yaml
@@ -28,5 +28,5 @@ brooklyn.catalog:
- classpath:/brooklyn/osgi/brooklyn-test-osgi-entities.jar
- item:
id: more-entity
- type: brooklyn.osgi.tests.more.MoreEntity
+ type: org.apache.brooklyn.test.osgi.entities.more.MoreEntity
version: 2.0.test
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/1927ad46/usage/camp/src/test/resources/org/apache/brooklyn/camp/brooklyn/catalog/more-entity-v1-called-v1-osgi-catalog.yaml
----------------------------------------------------------------------
diff --git a/usage/camp/src/test/resources/org/apache/brooklyn/camp/brooklyn/catalog/more-entity-v1-called-v1-osgi-catalog.yaml b/usage/camp/src/test/resources/org/apache/brooklyn/camp/brooklyn/catalog/more-entity-v1-called-v1-osgi-catalog.yaml
index 0bc4997..20e56eb 100644
--- a/usage/camp/src/test/resources/org/apache/brooklyn/camp/brooklyn/catalog/more-entity-v1-called-v1-osgi-catalog.yaml
+++ b/usage/camp/src/test/resources/org/apache/brooklyn/camp/brooklyn/catalog/more-entity-v1-called-v1-osgi-catalog.yaml
@@ -17,7 +17,7 @@
# under the License.
#
services:
-- type: brooklyn.osgi.tests.more.MoreEntity
+- type: org.apache.brooklyn.test.osgi.entities.more.MoreEntity
brooklyn.catalog:
id: more-entity-v1
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/1927ad46/usage/camp/src/test/resources/org/apache/brooklyn/camp/brooklyn/catalog/more-entity-v1-osgi-catalog.yaml
----------------------------------------------------------------------
diff --git a/usage/camp/src/test/resources/org/apache/brooklyn/camp/brooklyn/catalog/more-entity-v1-osgi-catalog.yaml b/usage/camp/src/test/resources/org/apache/brooklyn/camp/brooklyn/catalog/more-entity-v1-osgi-catalog.yaml
index 940053d..6a3ecd6 100644
--- a/usage/camp/src/test/resources/org/apache/brooklyn/camp/brooklyn/catalog/more-entity-v1-osgi-catalog.yaml
+++ b/usage/camp/src/test/resources/org/apache/brooklyn/camp/brooklyn/catalog/more-entity-v1-osgi-catalog.yaml
@@ -17,7 +17,7 @@
# under the License.
#
services:
-- type: brooklyn.osgi.tests.more.MoreEntity
+- type: org.apache.brooklyn.test.osgi.entities.more.MoreEntity
brooklyn.catalog:
id: more-entity
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/1927ad46/usage/camp/src/test/resources/org/apache/brooklyn/camp/brooklyn/catalog/more-entity-v1-with-policy-osgi-catalog.yaml
----------------------------------------------------------------------
diff --git a/usage/camp/src/test/resources/org/apache/brooklyn/camp/brooklyn/catalog/more-entity-v1-with-policy-osgi-catalog.yaml b/usage/camp/src/test/resources/org/apache/brooklyn/camp/brooklyn/catalog/more-entity-v1-with-policy-osgi-catalog.yaml
index 3c03bd0..2de00d8 100644
--- a/usage/camp/src/test/resources/org/apache/brooklyn/camp/brooklyn/catalog/more-entity-v1-with-policy-osgi-catalog.yaml
+++ b/usage/camp/src/test/resources/org/apache/brooklyn/camp/brooklyn/catalog/more-entity-v1-with-policy-osgi-catalog.yaml
@@ -17,7 +17,7 @@
# under the License.
#
services:
-- type: brooklyn.osgi.tests.more.MoreEntity
+- type: org.apache.brooklyn.test.osgi.entities.more.MoreEntity
brooklyn.policies:
- type: simple-policy:1.0
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/1927ad46/usage/camp/src/test/resources/org/apache/brooklyn/camp/brooklyn/catalog/more-entity-v2-osgi-catalog.yaml
----------------------------------------------------------------------
diff --git a/usage/camp/src/test/resources/org/apache/brooklyn/camp/brooklyn/catalog/more-entity-v2-osgi-catalog.yaml b/usage/camp/src/test/resources/org/apache/brooklyn/camp/brooklyn/catalog/more-entity-v2-osgi-catalog.yaml
index 74323fa..8033d03 100644
--- a/usage/camp/src/test/resources/org/apache/brooklyn/camp/brooklyn/catalog/more-entity-v2-osgi-catalog.yaml
+++ b/usage/camp/src/test/resources/org/apache/brooklyn/camp/brooklyn/catalog/more-entity-v2-osgi-catalog.yaml
@@ -17,7 +17,7 @@
# under the License.
#
services:
-- type: brooklyn.osgi.tests.more.MoreEntity
+- type: org.apache.brooklyn.test.osgi.entities.more.MoreEntity
brooklyn.catalog:
id: more-entity
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/1927ad46/usage/camp/src/test/resources/org/apache/brooklyn/camp/brooklyn/catalog/more-policies-osgi-catalog-scan.yaml
----------------------------------------------------------------------
diff --git a/usage/camp/src/test/resources/org/apache/brooklyn/camp/brooklyn/catalog/more-policies-osgi-catalog-scan.yaml b/usage/camp/src/test/resources/org/apache/brooklyn/camp/brooklyn/catalog/more-policies-osgi-catalog-scan.yaml
index 47f344d..02002e3 100644
--- a/usage/camp/src/test/resources/org/apache/brooklyn/camp/brooklyn/catalog/more-policies-osgi-catalog-scan.yaml
+++ b/usage/camp/src/test/resources/org/apache/brooklyn/camp/brooklyn/catalog/more-policies-osgi-catalog-scan.yaml
@@ -28,5 +28,5 @@ brooklyn.catalog:
- classpath:/brooklyn/osgi/brooklyn-test-osgi-entities.jar
- item:
id: more-policy
- type: brooklyn.osgi.tests.more.MorePolicy
+ type: org.apache.brooklyn.test.osgi.entities.more.MorePolicy
version: 2.0.test
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/1927ad46/usage/camp/src/test/resources/org/apache/brooklyn/camp/brooklyn/catalog/simple-policy-osgi-catalog.yaml
----------------------------------------------------------------------
diff --git a/usage/camp/src/test/resources/org/apache/brooklyn/camp/brooklyn/catalog/simple-policy-osgi-catalog.yaml b/usage/camp/src/test/resources/org/apache/brooklyn/camp/brooklyn/catalog/simple-policy-osgi-catalog.yaml
index 0004513..01a5db7 100644
--- a/usage/camp/src/test/resources/org/apache/brooklyn/camp/brooklyn/catalog/simple-policy-osgi-catalog.yaml
+++ b/usage/camp/src/test/resources/org/apache/brooklyn/camp/brooklyn/catalog/simple-policy-osgi-catalog.yaml
@@ -17,7 +17,7 @@
# under the License.
#
brooklyn.policies:
-- type: brooklyn.osgi.tests.SimplePolicy
+- type: org.apache.brooklyn.test.osgi.entities.SimplePolicy
brooklyn.catalog:
id: simple-policy
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/1927ad46/usage/camp/src/test/resources/osgi-catalog.xml
----------------------------------------------------------------------
diff --git a/usage/camp/src/test/resources/osgi-catalog.xml b/usage/camp/src/test/resources/osgi-catalog.xml
index f409a52..0586f3b 100644
--- a/usage/camp/src/test/resources/osgi-catalog.xml
+++ b/usage/camp/src/test/resources/osgi-catalog.xml
@@ -20,7 +20,7 @@
<catalog>
<name>OSGi catalogue</name>
- <template name="Osgi App" type="brooklyn.osgi.tests.SimpleApplication">
+ <template name="Osgi App" type="org.apache.brooklyn.test.osgi.entities.SimpleApplication">
<symbolicName>OsgiApp</symbolicName>
<libraries>
<bundle>${osgi-entities-path}</bundle>
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/1927ad46/usage/camp/src/test/resources/simple-catalog.xml
----------------------------------------------------------------------
diff --git a/usage/camp/src/test/resources/simple-catalog.xml b/usage/camp/src/test/resources/simple-catalog.xml
index 7f22157..8b73ffa 100644
--- a/usage/camp/src/test/resources/simple-catalog.xml
+++ b/usage/camp/src/test/resources/simple-catalog.xml
@@ -32,14 +32,14 @@
<symbolicName>org.apache.brooklyn.camp.brooklyn.catalog.TestBasicApp</symbolicName>
<!-- Tests that "java:" prefix won't load an old-style catalog item with the same id -->
</template>
- <template name="Osgi App" type="brooklyn.osgi.tests.SimpleApplication">
+ <template name="Osgi App" type="org.apache.brooklyn.test.osgi.entities.SimpleApplication">
<symbolicName>OsgiApp</symbolicName>
<libraries>
<bundle>${osgi-entities-path}</bundle>
</libraries>
</template>
<catalog>
- <template name="Simple App" type="brooklyn.osgi.tests.SimpleApplication" />
+ <template name="Simple App" type="org.apache.brooklyn.test.osgi.entities.SimpleApplication" />
<classpath>
<entry>${osgi-entities-path}</entry>
</classpath>
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/1927ad46/usage/camp/src/test/resources/test-app-with-policy.yaml
----------------------------------------------------------------------
diff --git a/usage/camp/src/test/resources/test-app-with-policy.yaml b/usage/camp/src/test/resources/test-app-with-policy.yaml
index d8a04ad..2ac75ee 100644
--- a/usage/camp/src/test/resources/test-app-with-policy.yaml
+++ b/usage/camp/src/test/resources/test-app-with-policy.yaml
@@ -26,7 +26,7 @@ services:
serviceLiteralValue1: Foo
serviceLiteralValue2: Bar
brooklyn.policies:
-- policyType: brooklyn.test.policy.TestPolicy
+- policyType: org.apache.brooklyn.core.test.policy.TestPolicy
brooklyn.config:
policyLiteralValue1: Hello
policyLiteralValue2: World
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/1927ad46/usage/camp/src/test/resources/test-entity-with-enricher.yaml
----------------------------------------------------------------------
diff --git a/usage/camp/src/test/resources/test-entity-with-enricher.yaml b/usage/camp/src/test/resources/test-entity-with-enricher.yaml
index 4e7d3f3..6b1061e 100644
--- a/usage/camp/src/test/resources/test-entity-with-enricher.yaml
+++ b/usage/camp/src/test/resources/test-entity-with-enricher.yaml
@@ -27,7 +27,7 @@ services:
serviceLiteralValue1: Foo
serviceLiteralValue2: Bar
brooklyn.enrichers:
- - enricherType: brooklyn.test.policy.TestEnricher
+ - enricherType: org.apache.brooklyn.core.test.policy.TestEnricher
brooklyn.config:
enricherLiteralValue1: Hello
enricherLiteralValue2: World
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/1927ad46/usage/camp/src/test/resources/test-entity-with-policy.yaml
----------------------------------------------------------------------
diff --git a/usage/camp/src/test/resources/test-entity-with-policy.yaml b/usage/camp/src/test/resources/test-entity-with-policy.yaml
index 9529642..b93f521 100644
--- a/usage/camp/src/test/resources/test-entity-with-policy.yaml
+++ b/usage/camp/src/test/resources/test-entity-with-policy.yaml
@@ -27,7 +27,7 @@ services:
serviceLiteralValue1: Foo
serviceLiteralValue2: Bar
brooklyn.policies:
- - policyType: brooklyn.test.policy.TestPolicy
+ - policyType: org.apache.brooklyn.core.test.policy.TestPolicy
brooklyn.config:
policyLiteralValue1: Hello
policyLiteralValue2: World
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/1927ad46/usage/camp/src/test/resources/test-propagating-enricher.yaml
----------------------------------------------------------------------
diff --git a/usage/camp/src/test/resources/test-propagating-enricher.yaml b/usage/camp/src/test/resources/test-propagating-enricher.yaml
index e50f691..1973851 100644
--- a/usage/camp/src/test/resources/test-propagating-enricher.yaml
+++ b/usage/camp/src/test/resources/test-propagating-enricher.yaml
@@ -26,7 +26,7 @@ services:
brooklyn.config:
test.confName: Name from YAML
brooklyn.enrichers:
-- enricherType: brooklyn.enricher.basic.Propagator
+- enricherType: org.apache.brooklyn.enricher.stock.Propagator
brooklyn.config:
enricher.producer: $brooklyn:component("te1")
enricher.propagating.propagatingAll: true
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/1927ad46/usage/camp/src/test/resources/vanilla-bash-netcat-w-client.yaml
----------------------------------------------------------------------
diff --git a/usage/camp/src/test/resources/vanilla-bash-netcat-w-client.yaml b/usage/camp/src/test/resources/vanilla-bash-netcat-w-client.yaml
index 81366eb..82a6f40 100644
--- a/usage/camp/src/test/resources/vanilla-bash-netcat-w-client.yaml
+++ b/usage/camp/src/test/resources/vanilla-bash-netcat-w-client.yaml
@@ -49,13 +49,13 @@ services:
brooklyn.initializers:
# two sensors, recording the data sent to this netcat server:
- - type: brooklyn.entity.software.ssh.SshCommandSensor
+ - type: org.apache.brooklyn.core.sensor.ssh.SshCommandSensor
brooklyn.config:
name: output.last
command: tail -1 server-input
period: 100ms
- - type: brooklyn.entity.software.ssh.SshCommandSensor
+ - type: org.apache.brooklyn.core.sensor.ssh.SshCommandSensor
brooklyn.config:
name: output.all
command: cat server-input
@@ -77,7 +77,7 @@ services:
brooklyn.initializers:
# but there is a sample effector which runs nc in client mode
- - type: brooklyn.entity.software.ssh.SshCommandEffector
+ - type: org.apache.brooklyn.core.effector.ssh.SshCommandEffector
brooklyn.config:
name: sayHiNetcat
description: Echo a small hello string to the netcat entity
@@ -90,7 +90,7 @@ services:
# and add an enricher at the root so all sensors from netcat-server are visible on the root
brooklyn.enrichers:
-- enricherType: brooklyn.enricher.basic.Propagator
+- enricherType: org.apache.brooklyn.enricher.stock.Propagator
brooklyn.config:
enricher.producer: $brooklyn:component("netcat-server")
enricher.propagating.propagatingAll: true
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/1927ad46/usage/camp/src/test/resources/yaml-ref-bundle-without-libraries.yaml
----------------------------------------------------------------------
diff --git a/usage/camp/src/test/resources/yaml-ref-bundle-without-libraries.yaml b/usage/camp/src/test/resources/yaml-ref-bundle-without-libraries.yaml
index f2ae9cb..b961708 100644
--- a/usage/camp/src/test/resources/yaml-ref-bundle-without-libraries.yaml
+++ b/usage/camp/src/test/resources/yaml-ref-bundle-without-libraries.yaml
@@ -16,4 +16,4 @@
# under the License.
#
services:
-- type: brooklyn.osgi.tests.SimpleEntity
+- type: org.apache.brooklyn.test.osgi.entities.SimpleEntity