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:29:01 UTC
[11/11] incubator-brooklyn git commit: This closes #859
This closes #859
Project: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/commit/ee9b59a7
Tree: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/tree/ee9b59a7
Diff: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/diff/ee9b59a7
Branch: refs/heads/master
Commit: ee9b59a74fb3f7a2e49572d625230d294e78ed4c
Parents: 0c24058 1c50b34
Author: Aled Sage <al...@gmail.com>
Authored: Thu Aug 20 21:29:08 2015 +0100
Committer: Aled Sage <al...@gmail.com>
Committed: Thu Aug 20 21:29:08 2015 +0100
----------------------------------------------------------------------
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 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 ++++++
.../core/mgmt/osgi/OsgiStandaloneTest.java | 6 +-
.../mgmt/osgi/OsgiVersionMoreEntityTest.java | 6 +-
.../mgmt/rebind/RebindCatalogEntityTest.java | 11 ++-
.../entity/rebind/brooklyn-AppInCatalog.jar | Bin 2387 -> 0 bytes
.../entity/rebind/brooklyn-AppInCatalog.txt | 28 ------
core/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 ++++++
.../brooklyn-AppInCatalog.jar | Bin 0 -> 2891 bytes
.../brooklyn-AppInCatalog.txt | 38 ++++++++
.../vanilla-bash-netcat-w-client.yaml | 8 +-
pom.xml | 1 -
.../camp/brooklyn/EnrichersYamlTest.java | 2 +-
.../camp/brooklyn/PoliciesYamlTest.java | 2 +-
.../camp/brooklyn/ReferencedYamlTest.java | 2 +-
.../CatalogOsgiVersionMoreEntityTest.java | 10 +--
.../brooklyn/catalog/CatalogXmlVersionTest.java | 2 +-
.../brooklyn/catalog/CatalogYamlEntityTest.java | 18 ++--
.../catalog/CatalogYamlLocationTest.java | 2 +-
.../brooklyn/catalog/CatalogYamlPolicyTest.java | 4 +-
.../brooklyn/test/lite/CampYamlLiteTest.java | 4 +-
.../more-entities-osgi-catalog-scan.yaml | 2 +-
.../more-entity-v1-called-v1-osgi-catalog.yaml | 2 +-
.../catalog/more-entity-v1-osgi-catalog.yaml | 2 +-
...more-entity-v1-with-policy-osgi-catalog.yaml | 2 +-
.../catalog/more-entity-v2-osgi-catalog.yaml | 2 +-
.../more-policies-osgi-catalog-scan.yaml | 2 +-
.../catalog/simple-policy-osgi-catalog.yaml | 2 +-
usage/camp/src/test/resources/osgi-catalog.xml | 2 +-
.../camp/src/test/resources/simple-catalog.xml | 4 +-
.../test/resources/test-app-with-policy.yaml | 2 +-
.../resources/test-entity-with-enricher.yaml | 2 +-
.../test/resources/test-entity-with-policy.yaml | 2 +-
.../resources/test-propagating-enricher.yaml | 2 +-
.../resources/vanilla-bash-netcat-w-client.yaml | 8 +-
.../yaml-ref-bundle-without-libraries.yaml | 2 +-
utils/test-bundles/entities/pom.xml | 81 -----------------
.../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
utils/test-bundles/more-entities-v1/pom.xml | 78 ----------------
.../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 -----
.../more-entities-v2-evil-twin/pom.xml | 85 ------------------
.../test/osgi/entities/more/MoreEntity.java | 37 --------
.../test/osgi/entities/more/MoreEntityImpl.java | 46 ----------
utils/test-bundles/more-entities-v2/pom.xml | 84 ------------------
.../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 ------
utils/test-bundles/pom.xml | 44 ----------
92 files changed, 1208 insertions(+), 1042 deletions(-)
----------------------------------------------------------------------