Merge branch 'master' into uninstall-bundles-on-error
Project: http://git-wip-us.apache.org/repos/asf/brooklyn-server/repo Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-server/commit/e7c87ff3 Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-server/tree/e7c87ff3 Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-server/diff/e7c87ff3 Branch: refs/heads/master Commit: e7c87ff39b27adbdefe7115dc459ae9eadd76ebb Parents: 1adfb75 2c3e33b Author: Alex Heneveld <[email protected]> Authored: Tue Aug 29 12:04:43 2017 +0100 Committer: Alex Heneveld <[email protected]> Committed: Tue Aug 29 12:04:43 2017 +0100 ---------------------------------------------------------------------- .../spi/creation/CampTypePlanTransformer.java | 25 ++- .../catalog/CatalogYamlAppOsgiTest.java | 7 + .../brooklyn/catalog/CatalogYamlAppTest.java | 7 +- .../camp/brooklyn/catalog/template-and-app.bom | 32 ++++ .../typereg/AbstractTypePlanTransformer.java | 19 ++- .../core/typereg/BasicBrooklynTypeRegistry.java | 42 ++++- .../ReferencedUnresolvedTypeException.java | 7 +- .../brooklyn/core/typereg/RegisteredTypes.java | 16 +- .../brooklyn/entity/group/DynamicCluster.java | 2 + .../entity/group/DynamicClusterImpl.java | 4 + .../core/test/entity/TestClusterImpl.java | 4 +- .../test/entity/TestSizeRecordingCluster.java | 39 +++++ .../entity/TestSizeRecordingClusterImpl.java | 59 +++++++ .../entity/group/DynamicClusterTest.java | 18 ++ .../karaf/commands/ApplicationList.java | 57 +++++++ .../apache/brooklyn/karaf/commands/Catalog.java | 44 ----- .../brooklyn/karaf/commands/EntityInfo.java | 141 ++++++++++++++++ .../commands/completers/EntityIdCompleter.java | 42 +++++ .../brooklyn/launcher/osgi/OsgiLauncher.java | 8 +- karaf/itests/pom.xml | 166 ------------------- .../karaf/itests/FeatureInstallationTest.java | 85 ---------- .../apache/brooklyn/karaf/itests/TestBase.java | 36 ---- karaf/pom.xml | 3 +- .../launcher/BrooklynWebServerTest.java | 2 + .../policy/autoscaling/AutoScalerPolicy.java | 21 +++ .../AutoScalerPolicyPoolSizeTest.java | 110 ++++++++++++ pom.xml | 6 +- .../rest/security/jaas/BrooklynLoginModule.java | 82 ++++----- 28 files changed, 691 insertions(+), 393 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/e7c87ff3/core/src/main/java/org/apache/brooklyn/core/typereg/BasicBrooklynTypeRegistry.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/e7c87ff3/karaf/init/src/main/java/org/apache/brooklyn/launcher/osgi/OsgiLauncher.java ---------------------------------------------------------------------- diff --cc karaf/init/src/main/java/org/apache/brooklyn/launcher/osgi/OsgiLauncher.java index 51f43db,0e89739..20e20fe --- a/karaf/init/src/main/java/org/apache/brooklyn/launcher/osgi/OsgiLauncher.java +++ b/karaf/init/src/main/java/org/apache/brooklyn/launcher/osgi/OsgiLauncher.java @@@ -97,10 -98,13 +98,13 @@@ public class OsgiLauncher extends Basic // init-method can't find the start method for some reason, provide an alternative public void init() { synchronized (reloadLock) { + final Stopwatch startupTimer = Stopwatch.createStarted(); BrooklynShutdownHooks.resetShutdownFlag(); - LOG.debug("OsgiLauncher init"); + LOG.debug("OsgiLauncher init, catalog "+defaultCatalogLocation); catalogInitialization(new CatalogInitialization(String.format("file:%s", defaultCatalogLocation), false, null, false)); start(); + startupTimer.stop(); + LOG.info("Brooklyn initialisation complete after {}", startupTimer.toString()); } }
