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 2014/07/09 23:46:30 UTC
[17/50] git commit: Add project for generating a test OSGi bundle.
Add project for generating a test OSGi bundle.
The project is included as a resource, not part of the normal build cycle.
Project: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/commit/ac70b2b4
Tree: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/tree/ac70b2b4
Diff: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/diff/ac70b2b4
Branch: refs/heads/master
Commit: ac70b2b4def52e25db10aff6cda543dbb34704e2
Parents: 92f3dd0
Author: Svetoslav Neykov <sv...@cloudsoftcorp.com>
Authored: Mon Jul 7 19:37:32 2014 +0300
Committer: Aled Sage <al...@gmail.com>
Committed: Wed Jul 9 22:34:44 2014 +0100
----------------------------------------------------------------------
.../src/test/dependencies/osgi/entities/pom.xml | 62 +++++++++++++++++++
.../brooklyn/osgi/tests/SimpleApplication.java | 10 +++
.../osgi/tests/SimpleApplicationImpl.java | 9 +++
.../java/brooklyn/osgi/tests/SimpleEntity.java | 10 +++
.../brooklyn/osgi/tests/SimpleEntityImpl.java | 8 +++
.../management/osgi/OsgiStandaloneTest.java | 6 +-
.../osgi/brooklyn-test-osgi-entities.jar | Bin 0 -> 10752 bytes
.../resources/CatalogBundleResourceTest.java | 2 +-
8 files changed, 103 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/ac70b2b4/core/src/test/dependencies/osgi/entities/pom.xml
----------------------------------------------------------------------
diff --git a/core/src/test/dependencies/osgi/entities/pom.xml b/core/src/test/dependencies/osgi/entities/pom.xml
new file mode 100644
index 0000000..8fa76f0
--- /dev/null
+++ b/core/src/test/dependencies/osgi/entities/pom.xml
@@ -0,0 +1,62 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+ <packaging>jar</packaging>
+
+ <artifactId>brooklyn-test-osgi-entities</artifactId>
+
+ <name>OSGi bundled test entities</name>
+
+ <description>
+ Simple entities for testing the OSGi functionality
+ </description>
+
+ <parent>
+ <groupId>io.brooklyn</groupId>
+ <artifactId>brooklyn-parent</artifactId>
+ <version>0.7.0-SNAPSHOT</version><!-- BROOKLYN_VERSION -->
+ <relativePath>../../../../../../pom.xml</relativePath>
+ </parent>
+ <dependencies>
+ <dependency>
+ <groupId>io.brooklyn</groupId>
+ <artifactId>brooklyn-core</artifactId>
+ <version>${brooklyn.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>io.brooklyn</groupId>
+ <artifactId>brooklyn-api</artifactId>
+ <version>${brooklyn.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>io.brooklyn</groupId>
+ <artifactId>brooklyn-utils-common</artifactId>
+ <version>${brooklyn.version}</version>
+ </dependency>
+ </dependencies>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-jar-plugin</artifactId>
+ <version>2.3.2</version>
+ <configuration>
+ <outputDirectory>../../../resources/brooklyn/osgi</outputDirectory>
+ <finalName>brooklyn-test-osgi-entities</finalName>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>maven-bundle-plugin</artifactId>
+ <version>1.4.0</version>
+ <extensions>true</extensions>
+ <configuration>
+ <instructions>
+ <Bundle-Version>0.1.0</Bundle-Version>
+ </instructions>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+</project>
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/ac70b2b4/core/src/test/dependencies/osgi/entities/src/main/java/brooklyn/osgi/tests/SimpleApplication.java
----------------------------------------------------------------------
diff --git a/core/src/test/dependencies/osgi/entities/src/main/java/brooklyn/osgi/tests/SimpleApplication.java b/core/src/test/dependencies/osgi/entities/src/main/java/brooklyn/osgi/tests/SimpleApplication.java
new file mode 100644
index 0000000..a590a59
--- /dev/null
+++ b/core/src/test/dependencies/osgi/entities/src/main/java/brooklyn/osgi/tests/SimpleApplication.java
@@ -0,0 +1,10 @@
+package brooklyn.osgi.tests;
+
+
+import brooklyn.entity.basic.StartableApplication;
+import brooklyn.entity.proxying.ImplementedBy;
+
+@ImplementedBy(SimpleApplicationImpl.class)
+public interface SimpleApplication extends StartableApplication {
+
+}
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/ac70b2b4/core/src/test/dependencies/osgi/entities/src/main/java/brooklyn/osgi/tests/SimpleApplicationImpl.java
----------------------------------------------------------------------
diff --git a/core/src/test/dependencies/osgi/entities/src/main/java/brooklyn/osgi/tests/SimpleApplicationImpl.java b/core/src/test/dependencies/osgi/entities/src/main/java/brooklyn/osgi/tests/SimpleApplicationImpl.java
new file mode 100644
index 0000000..dcc2ce4
--- /dev/null
+++ b/core/src/test/dependencies/osgi/entities/src/main/java/brooklyn/osgi/tests/SimpleApplicationImpl.java
@@ -0,0 +1,9 @@
+package brooklyn.osgi.tests;
+
+
+import brooklyn.entity.basic.AbstractApplication;
+import brooklyn.entity.basic.StartableApplication;
+
+public class SimpleApplicationImpl extends AbstractApplication implements StartableApplication {
+
+}
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/ac70b2b4/core/src/test/dependencies/osgi/entities/src/main/java/brooklyn/osgi/tests/SimpleEntity.java
----------------------------------------------------------------------
diff --git a/core/src/test/dependencies/osgi/entities/src/main/java/brooklyn/osgi/tests/SimpleEntity.java b/core/src/test/dependencies/osgi/entities/src/main/java/brooklyn/osgi/tests/SimpleEntity.java
new file mode 100644
index 0000000..6761ef3
--- /dev/null
+++ b/core/src/test/dependencies/osgi/entities/src/main/java/brooklyn/osgi/tests/SimpleEntity.java
@@ -0,0 +1,10 @@
+package brooklyn.osgi.tests;
+
+
+import brooklyn.entity.Entity;
+import brooklyn.entity.proxying.ImplementedBy;
+
+@ImplementedBy(SimpleEntityImpl.class)
+public interface SimpleEntity extends Entity {
+
+}
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/ac70b2b4/core/src/test/dependencies/osgi/entities/src/main/java/brooklyn/osgi/tests/SimpleEntityImpl.java
----------------------------------------------------------------------
diff --git a/core/src/test/dependencies/osgi/entities/src/main/java/brooklyn/osgi/tests/SimpleEntityImpl.java b/core/src/test/dependencies/osgi/entities/src/main/java/brooklyn/osgi/tests/SimpleEntityImpl.java
new file mode 100644
index 0000000..04b2251
--- /dev/null
+++ b/core/src/test/dependencies/osgi/entities/src/main/java/brooklyn/osgi/tests/SimpleEntityImpl.java
@@ -0,0 +1,8 @@
+package brooklyn.osgi.tests;
+
+import brooklyn.entity.basic.AbstractEntity;
+
+
+public class SimpleEntityImpl extends AbstractEntity implements SimpleEntity {
+
+}
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/ac70b2b4/core/src/test/java/brooklyn/management/osgi/OsgiStandaloneTest.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/brooklyn/management/osgi/OsgiStandaloneTest.java b/core/src/test/java/brooklyn/management/osgi/OsgiStandaloneTest.java
index 8344045..ecb3a68 100644
--- a/core/src/test/java/brooklyn/management/osgi/OsgiStandaloneTest.java
+++ b/core/src/test/java/brooklyn/management/osgi/OsgiStandaloneTest.java
@@ -58,7 +58,7 @@ public class OsgiStandaloneTest {
private static final Logger log = LoggerFactory.getLogger(OsgiStandaloneTest.class);
public static final String BROOKLYN_OSGI_TEST_A_0_1_0_URL = "classpath:///brooklyn/osgi/brooklyn-osgi-test-a_0.1.0.jar";
- public static final String BROOKLYN_TESTS_OSGI_ENTITIES_0_1_0_URL = "/brooklyn/osgi/brooklyn-tests-osgi-entities-0.1.0.jar";
+ public static final String BROOKLYN_TEST_OSGI_ENTITIES_URL = "/brooklyn/osgi/brooklyn-test-osgi-entities.jar";
protected Framework framework = null;
private File storageTempDir;
@@ -167,7 +167,7 @@ public class OsgiStandaloneTest {
@Test
public void testReadKnownManifest() throws Exception {
- InputStream in = this.getClass().getResourceAsStream(BROOKLYN_TESTS_OSGI_ENTITIES_0_1_0_URL);
+ InputStream in = this.getClass().getResourceAsStream(BROOKLYN_TEST_OSGI_ENTITIES_URL);
JarInputStream jarIn = new JarInputStream(in);
ManifestHelper helper = Osgis.ManifestHelper.forManifest(jarIn.getManifest());
jarIn.close();
@@ -177,7 +177,7 @@ public class OsgiStandaloneTest {
@Test
public void testLoadOsgiBundleDependencies() throws Exception {
- Bundle bundle = install("classpath:/" + BROOKLYN_TESTS_OSGI_ENTITIES_0_1_0_URL);
+ Bundle bundle = install("classpath:/" + BROOKLYN_TEST_OSGI_ENTITIES_URL);
Assert.assertNotNull(bundle);
Class<?> aClass = bundle.loadClass("brooklyn.osgi.tests.SimpleApplicationImpl");
Object aInst = aClass.newInstance();
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/ac70b2b4/core/src/test/resources/brooklyn/osgi/brooklyn-test-osgi-entities.jar
----------------------------------------------------------------------
diff --git a/core/src/test/resources/brooklyn/osgi/brooklyn-test-osgi-entities.jar b/core/src/test/resources/brooklyn/osgi/brooklyn-test-osgi-entities.jar
new file mode 100644
index 0000000..b2bc7eb
Binary files /dev/null and b/core/src/test/resources/brooklyn/osgi/brooklyn-test-osgi-entities.jar differ
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/ac70b2b4/usage/rest-server/src/test/java/brooklyn/rest/resources/CatalogBundleResourceTest.java
----------------------------------------------------------------------
diff --git a/usage/rest-server/src/test/java/brooklyn/rest/resources/CatalogBundleResourceTest.java b/usage/rest-server/src/test/java/brooklyn/rest/resources/CatalogBundleResourceTest.java
index 2161464..3066ad2 100644
--- a/usage/rest-server/src/test/java/brooklyn/rest/resources/CatalogBundleResourceTest.java
+++ b/usage/rest-server/src/test/java/brooklyn/rest/resources/CatalogBundleResourceTest.java
@@ -93,7 +93,7 @@ public class CatalogBundleResourceTest extends BrooklynRestResourceTest {
" icon_url: classpath://path/to/myicon.jpg\n"+
" version: 0.1.2\n"+
" libraries:\n"+
- " - url: classpath:/" + OsgiStandaloneTest.BROOKLYN_TESTS_OSGI_ENTITIES_0_1_0_URL + "\n"+
+ " - url: classpath:/" + OsgiStandaloneTest.BROOKLYN_TEST_OSGI_ENTITIES_URL + "\n"+
"\n"+
"services:\n"+
"- type: brooklyn.osgi.tests.SimpleEntity\n";