brooklyn-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From s...@apache.org
Subject [7/7] brooklyn-server git commit: Closes #34
Date Tue, 08 Mar 2016 15:53:25 GMT
Closes #34

Initialization of brooklyn within karaf

Initializes brooklyn using a serial initialization sequence in a new class `org.apache.brooklyn.core.OsgiLauncher`
in `brooklyn-core`. The purpose of this PR is to stay close to the existing `BrooklynLauncher`
initialization code, while discussing the location of various settings within karaf's etc
folder. Further work should move individual bean initialization into corresponding  `init-method`s
of each bean specified in `OSGI-INF/blueprint/blueprint.xml`


Project: http://git-wip-us.apache.org/repos/asf/brooklyn-server/repo
Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-server/commit/256aee05
Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-server/tree/256aee05
Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-server/diff/256aee05

Branch: refs/heads/master
Commit: 256aee05c1a4435d8dfdb5468e1dab4822f28937
Parents: 3ac14e2 ec56f2a
Author: Svetoslav Neykov <svetoslav.neykov@cloudsoftcorp.com>
Authored: Tue Mar 8 17:52:12 2016 +0200
Committer: Svetoslav Neykov <svetoslav.neykov@cloudsoftcorp.com>
Committed: Tue Mar 8 17:52:12 2016 +0200

----------------------------------------------------------------------
 camp/camp-brooklyn/pom.xml                      |  14 +-
 core/pom.xml                                    |   7 -
 .../org/apache/brooklyn/core/OsgiLauncher.java  | 557 +++++++++++++++++++
 .../resources/OSGI-INF/blueprint/blueprint.xml  |  43 +-
 .../etc/org.apache.brooklyn.osgilauncher.cfg    |  59 ++
 .../main/resources/etc/org.apache.cxf.osgi.cfg  |  20 -
 karaf/features/src/main/feature/feature.xml     |  10 +-
 .../java/org/apache/brooklyn/AssemblyTest.java  |  13 +-
 .../rest/BrooklynRestApiLauncherTest.java       |  98 ++++
 pom.xml                                         |   1 -
 rest/rest-resources/pom.xml                     |   2 +-
 .../resources/AbstractBrooklynRestResource.java |  16 +
 .../brooklyn/rest/resources/AccessResource.java |   5 +-
 .../brooklyn/rest/resources/ServerResource.java |   7 +-
 .../brooklyn/rest/resources/UsageResource.java  |   9 +-
 .../resources/OSGI-INF/blueprint/service.xml    |  20 +
 rest/rest-server-jersey/pom.xml                 |   2 +-
 rest/rest-server/pom.xml                        |   2 +-
 .../org/apache/brooklyn/rest/RestApiSetup.java  |  26 +-
 utils/common/dependencies/osgi/README.md        |  33 ++
 utils/common/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     |  43 ++
 .../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 +
 .../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    |  41 ++
 .../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 -> 15646 bytes
 .../brooklyn-test-osgi-more-entities_0.2.0.txt  |  26 +
 ...-test-osgi-more-entities_evil-twin_0.2.0.jar | Bin 0 -> 13811 bytes
 ...-test-osgi-more-entities_evil-twin_0.2.0.txt |  26 +
 utils/rt-felix/pom.xml                          |   4 +-
 utils/rt-osgi/pom.xml                           |  53 --
 .../apache/brooklyn/util/osgi/OsgiUtils.java    | 101 ----
 .../brooklyn/util/osgi/VersionedName.java       |  76 ---
 .../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     |  43 --
 .../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 -
 .../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 15646 -> 0 bytes
 .../brooklyn-test-osgi-more-entities_0.2.0.txt  |  26 -
 ...-test-osgi-more-entities_evil-twin_0.2.0.jar | Bin 13811 -> 0 bytes
 ...-test-osgi-more-entities_evil-twin_0.2.0.txt |  26 -
 97 files changed, 2256 insertions(+), 1413 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/256aee05/pom.xml
----------------------------------------------------------------------


Mime
View raw message