You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@brooklyn.apache.org by aledsage <gi...@git.apache.org> on 2017/09/11 14:45:26 UTC
[GitHub] brooklyn-server pull request #815: BROOKLYN-532: karaf separate mgmt init an...
GitHub user aledsage opened a pull request:
https://github.com/apache/brooklyn-server/pull/815
BROOKLYN-532: karaf separate mgmt init and start
See https://issues.apache.org/jira/browse/BROOKLYN-532. This implements the last of the suggestions in https://issues.apache.org/jira/browse/BROOKLYN-532?focusedCommentId=16161370&page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel#comment-16161370
You can merge this pull request into a Git repository by running:
$ git pull https://github.com/aledsage/brooklyn-server karaf-separate-mgmt-init-and-start
Alternatively you can review and apply these changes as the patch at:
https://github.com/apache/brooklyn-server/pull/815.patch
To close this pull request, make a commit to your master/trunk branch
with (at least) the following in the commit message:
This closes #815
----
commit 18ccb58f04de8483371097e7cff77f857234fa62
Author: Aled Sage <al...@gmail.com>
Date: 2017-09-11T14:00:21Z
BROOKLYN-532: karaf separate mgmt init and start
----
---
[GitHub] brooklyn-server issue #815: BROOKLYN-532: karaf separate mgmt init and start
Posted by aledsage <gi...@git.apache.org>.
Github user aledsage commented on the issue:
https://github.com/apache/brooklyn-server/pull/815
retest this please
---
[GitHub] brooklyn-server issue #815: BROOKLYN-532: karaf separate mgmt init and start
Posted by m4rkmckenna <gi...@git.apache.org>.
Github user m4rkmckenna commented on the issue:
https://github.com/apache/brooklyn-server/pull/815
@aledsage Looks good nice simple fix
Tested by setting start to false on https://github.com/apache/brooklyn-server/pull/815/files#diff-bbd50de622bfb6a98f9723e78fa2f827R344 verified that UI was available and displaying warnings. Then upon bundle (manual) start brooklyn behaved as expected
merging now
---
[GitHub] brooklyn-server pull request #815: BROOKLYN-532: karaf separate mgmt init an...
Posted by m4rkmckenna <gi...@git.apache.org>.
Github user m4rkmckenna commented on a diff in the pull request:
https://github.com/apache/brooklyn-server/pull/815#discussion_r138130529
--- Diff: karaf/start/src/main/resources/OSGI-INF/blueprint/blueprint.xml ---
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+Copyright 2015 The Apache Software Foundation.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+-->
+
+<blueprint xmlns="http://www.osgi.org/xmlns/blueprint/v1.0.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:cm="http://aries.apache.org/blueprint/xmlns/blueprint-cm/v1.2.0"
+ xsi:schemaLocation="
+ http://www.osgi.org/xmlns/blueprint/v1.0.0 http://www.osgi.org/xmlns/blueprint/v1.0.0/blueprint.xsd
+ http://aries.apache.org/blueprint/xmlns/blueprint-cm/v1.2.0 http://aries.apache.org/schemas/blueprint-cm/blueprint-cm-1.2.0.xsd
+ ">
+
+ <!-- From brooklyn-karaf-init -->
+ <reference id="localLauncher"
--- End diff --
@aledsage Nice ... Took me a bit to figure out how we made sure this didnt get started before part one
---
[GitHub] brooklyn-server issue #815: BROOKLYN-532: karaf separate mgmt init and start
Posted by aledsage <gi...@git.apache.org>.
Github user aledsage commented on the issue:
https://github.com/apache/brooklyn-server/pull/815
I tested this by using `brooklyn-dist/karaf/apache-brooklyn/target/assembly/`, running `./bin/start`.
I added a `Thread.sleep()` into the code to check that the rest-api and web-console started up as soon as karaf-init was done (they did).
(Oops - I left that config option in `BasicLauncher.startPartTwo()`, I'd delete that!)
I also did a `bundle:refresh 123` to refresh `brooklyn-core` and confirmed that it started up correctly.
If one just does a `bundle:restart` on only the `brooklyn-karaf-start` then it fails (because can't call `start()` multiple times), but if `brooklyn-karaf-init` is first refreshed then it works as expected.
---
[GitHub] brooklyn-server pull request #815: BROOKLYN-532: karaf separate mgmt init an...
Posted by asfgit <gi...@git.apache.org>.
Github user asfgit closed the pull request at:
https://github.com/apache/brooklyn-server/pull/815
---