This closes #962
Project: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/commit/8457515f Tree: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/tree/8457515f Diff: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/diff/8457515f Branch: refs/heads/master Commit: 8457515f60f4487dce8e21ca7f845dc5b9fef0ba Parents: 25e1c31 dadf87a Author: Hadrian Zbarcea <[email protected]> Authored: Mon Oct 26 19:27:04 2015 -0400 Committer: Hadrian Zbarcea <[email protected]> Committed: Mon Oct 26 19:27:04 2015 -0400 ---------------------------------------------------------------------- core/pom.xml | 36 +- .../apache/brooklyn/core/BrooklynVersion.java | 188 +++++---- .../brooklyn/core/mgmt/ha/OsgiManager.java | 16 +- .../core/mgmt/persist/XmlMementoSerializer.java | 35 +- .../brooklyn/util/core/ResourceUtils.java | 32 +- .../apache/brooklyn/util/core/osgi/Osgis.java | 389 +++---------------- core/src/test/dependencies/osgi/README.md | 33 -- .../src/test/dependencies/osgi/entities/pom.xml | 84 ---- .../test/osgi/entities/SimpleApplication.java | 28 -- .../osgi/entities/SimpleApplicationImpl.java | 27 -- .../test/osgi/entities/SimpleEntity.java | 28 -- .../test/osgi/entities/SimpleEntityImpl.java | 26 -- .../test/osgi/entities/SimpleLocation.java | 35 -- .../test/osgi/entities/SimplePolicy.java | 36 -- .../apache/brooklyn/test/osgi/entities/icon.gif | Bin 43 -> 0 bytes .../dependencies/osgi/more-entities-v1/pom.xml | 82 ---- .../test/osgi/entities/more/MoreEntity.java | 37 -- .../test/osgi/entities/more/MoreEntityImpl.java | 43 -- .../test/osgi/entities/more/MoreLocation.java | 24 -- .../test/osgi/entities/more/MorePolicy.java | 25 -- .../test/osgi/entities/more/MoreTemplate.java | 24 -- .../osgi/more-entities-v2-evil-twin/pom.xml | 88 ----- .../test/osgi/entities/more/MoreEntity.java | 37 -- .../test/osgi/entities/more/MoreEntityImpl.java | 46 --- .../dependencies/osgi/more-entities-v2/pom.xml | 88 ----- .../test/osgi/entities/more/MoreEntity.java | 40 -- .../test/osgi/entities/more/MoreEntityImpl.java | 46 --- .../test/osgi/entities/more/MoreLocation.java | 26 -- .../test/osgi/entities/more/MorePolicy.java | 29 -- .../test/osgi/entities/more/MoreTemplate.java | 26 -- .../brooklyn/core/BrooklynVersionTest.java | 2 +- .../core/mgmt/osgi/OsgiStandaloneTest.java | 75 +--- .../core/mgmt/osgi/OsgiTestResources.java | 74 ---- .../mgmt/osgi/OsgiVersionMoreEntityTest.java | 6 +- .../mgmt/persist/XmlMementoSerializerTest.java | 2 +- .../brooklyn/util/core/osgi/OsgiTestBase.java | 56 +++ .../brooklyn/util/core/osgi/OsgisTest.java | 41 -- core/src/test/resources/brooklyn/osgi/README.md | 25 -- .../osgi/brooklyn-osgi-test-a_0.1.0.jar | Bin 2055 -> 0 bytes .../osgi/brooklyn-osgi-test-a_0.1.0.txt | 26 -- .../osgi/brooklyn-test-osgi-entities.jar | Bin 14454 -> 0 bytes .../osgi/brooklyn-test-osgi-entities.txt | 26 -- .../brooklyn-test-osgi-more-entities_0.1.0.jar | Bin 14964 -> 0 bytes .../brooklyn-test-osgi-more-entities_0.1.0.txt | 26 -- .../brooklyn-test-osgi-more-entities_0.2.0.jar | Bin 15622 -> 0 bytes .../brooklyn-test-osgi-more-entities_0.2.0.txt | 26 -- ...-test-osgi-more-entities_evil-twin_0.2.0.jar | Bin 13922 -> 0 bytes ...-test-osgi-more-entities_evil-twin_0.2.0.txt | 26 -- karaf/apache-brooklyn/pom.xml | 124 ++++++ .../filtered-resources/etc/branding.properties | 35 ++ .../src/main/resources/etc/custom.properties | 120 ++++++ .../resources/etc/org.ops4j.pax.logging.cfg | 46 +++ .../src/main/resources/etc/system.properties | 133 +++++++ karaf/commands/pom.xml | 77 ++++ .../apache/brooklyn/karaf/commands/Catalog.java | 44 +++ karaf/feature.xml | 51 +++ karaf/features/pom.xml | 64 +++ karaf/features/src/main/feature/feature.xml | 89 +++++ .../features/src/main/history/dependencies.xml | 47 +++ karaf/itest/pom.xml | 188 +++++++++ .../java/org/apache/brooklyn/AssemblyTest.java | 117 ++++++ karaf/itest/src/test/resources/exam.properties | 21 + karaf/itest/src/test/resources/logback.xml | 43 ++ karaf/pom.xml | 143 +++++++ parent/pom.xml | 133 +------ pom.xml | 118 +++++- usage/camp/pom.xml | 7 + .../catalog/AbstractCatalogXmlTest.java | 2 +- .../brooklyn/catalog/CatalogYamlEntityTest.java | 2 +- .../catalog/CatalogYamlTemplateTest.java | 2 +- utils/rt-felix/pom.xml | 61 +++ .../rt/felix/EmbeddedFelixFramework.java | 258 ++++++++++++ .../brooklyn/rt/felix/ManifestHelper.java | 103 +++++ .../rt/felix/EmbeddedFelixFrameworkTest.java | 101 +++++ utils/rt-osgi/pom.xml | 53 +++ .../apache/brooklyn/util/osgi/OsgiUtils.java | 101 +++++ .../brooklyn/util/osgi/VersionedName.java | 76 ++++ .../brooklyn/util/osgi/OsgiTestResources.java | 74 ++++ .../apache/brooklyn/util/osgi/OsgisTest.java | 39 ++ .../src/test/resources/brooklyn/osgi/README.md | 25 ++ .../osgi/brooklyn-osgi-test-a_0.1.0.jar | Bin 0 -> 2055 bytes .../osgi/brooklyn-osgi-test-a_0.1.0.txt | 26 ++ .../osgi/brooklyn-test-osgi-entities.jar | Bin 0 -> 14454 bytes .../osgi/brooklyn-test-osgi-entities.txt | 26 ++ .../brooklyn-test-osgi-more-entities_0.1.0.jar | Bin 0 -> 14964 bytes .../brooklyn-test-osgi-more-entities_0.1.0.txt | 26 ++ .../brooklyn-test-osgi-more-entities_0.2.0.jar | Bin 0 -> 15622 bytes .../brooklyn-test-osgi-more-entities_0.2.0.txt | 26 ++ ...-test-osgi-more-entities_evil-twin_0.2.0.jar | Bin 0 -> 13922 bytes ...-test-osgi-more-entities_evil-twin_0.2.0.txt | 26 ++ .../test/resources/dependencies/osgi/README.md | 33 ++ .../dependencies/osgi/entities/pom.xml | 84 ++++ .../test/osgi/entities/SimpleApplication.java | 28 ++ .../osgi/entities/SimpleApplicationImpl.java | 27 ++ .../test/osgi/entities/SimpleEntity.java | 28 ++ .../test/osgi/entities/SimpleEntityImpl.java | 26 ++ .../test/osgi/entities/SimpleLocation.java | 35 ++ .../test/osgi/entities/SimplePolicy.java | 36 ++ .../apache/brooklyn/test/osgi/entities/icon.gif | Bin 0 -> 43 bytes .../dependencies/osgi/more-entities-v1/pom.xml | 82 ++++ .../test/osgi/entities/more/MoreEntity.java | 37 ++ .../test/osgi/entities/more/MoreEntityImpl.java | 43 ++ .../test/osgi/entities/more/MoreLocation.java | 24 ++ .../test/osgi/entities/more/MorePolicy.java | 25 ++ .../test/osgi/entities/more/MoreTemplate.java | 24 ++ .../osgi/more-entities-v2-evil-twin/pom.xml | 88 +++++ .../test/osgi/entities/more/MoreEntity.java | 37 ++ .../test/osgi/entities/more/MoreEntityImpl.java | 46 +++ .../dependencies/osgi/more-entities-v2/pom.xml | 88 +++++ .../test/osgi/entities/more/MoreEntity.java | 40 ++ .../test/osgi/entities/more/MoreEntityImpl.java | 46 +++ .../test/osgi/entities/more/MoreLocation.java | 26 ++ .../test/osgi/entities/more/MorePolicy.java | 29 ++ .../test/osgi/entities/more/MoreTemplate.java | 26 ++ 114 files changed, 3774 insertions(+), 1876 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/8457515f/core/pom.xml ---------------------------------------------------------------------- diff --cc core/pom.xml index 1a0e04b,f7f59c0..aafc73e --- a/core/pom.xml +++ b/core/pom.xml @@@ -251,19 -253,25 +257,37 @@@ </configuration> </execution> </executions> + <dependencies> + <dependency> + <groupId>org.codehaus.groovy</groupId> + <artifactId>groovy-eclipse-compiler</artifactId> + <version>2.9.0-01</version> + </dependency> + <dependency> + <groupId>org.codehaus.groovy</groupId> + <artifactId>groovy-eclipse-batch</artifactId> + <version>2.3.4-01</version> + </dependency> + </dependencies> </plugin> + <plugin> + <groupId>org.apache.felix</groupId> + <artifactId>maven-bundle-plugin</artifactId> + <configuration> + <supportedProjectTypes> + <supportedProjectType>jar</supportedProjectType> + </supportedProjectTypes> + <instructions> + <Export-Package>brooklyn.*,org.apache.brooklyn.*</Export-Package> + <Import-Package> + !org.apache.brooklyn.rt.felix, + * + </Import-Package> + <Implementation-SHA-1>${buildNumber}</Implementation-SHA-1> + <Implementation-Branch>${scmBranch}</Implementation-Branch> + </instructions> + </configuration> + </plugin> </plugins> </build> </project> http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/8457515f/parent/pom.xml ----------------------------------------------------------------------
