You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@brooklyn.apache.org by he...@apache.org on 2016/03/30 16:00:19 UTC
[42/50] brooklyn-server git commit: oops added containerFramework
section twice, fixing that
oops added containerFramework section twice, fixing that
Project: http://git-wip-us.apache.org/repos/asf/brooklyn-server/repo
Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-server/commit/efd0cca9
Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-server/tree/efd0cca9
Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-server/diff/efd0cca9
Branch: refs/heads/master
Commit: efd0cca9c71a8215c95e8297cf30011dd803cdb9
Parents: 5f44f5e
Author: Alex Heneveld <al...@cloudsoftcorp.com>
Authored: Tue Mar 29 09:38:28 2016 +0100
Committer: Alex Heneveld <al...@cloudsoftcorp.com>
Committed: Tue Mar 29 09:38:28 2016 +0100
----------------------------------------------------------------------
core/src/main/resources/OSGI-INF/blueprint/blueprint.xml | 4 ----
1 file changed, 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/efd0cca9/core/src/main/resources/OSGI-INF/blueprint/blueprint.xml
----------------------------------------------------------------------
diff --git a/core/src/main/resources/OSGI-INF/blueprint/blueprint.xml b/core/src/main/resources/OSGI-INF/blueprint/blueprint.xml
index 0a2331c..8f0fea0 100644
--- a/core/src/main/resources/OSGI-INF/blueprint/blueprint.xml
+++ b/core/src/main/resources/OSGI-INF/blueprint/blueprint.xml
@@ -109,8 +109,4 @@ limitations under the License.
<service id="multiLocationResolverService" ref="multiLocationResolver"
interface="org.apache.brooklyn.api.location.LocationResolver"/>
- <bean id="containerFramework"
- class="org.apache.brooklyn.util.core.osgi.ContainerFramework" />
- <service ref="containerFramework"
- interface="org.apache.brooklyn.util.osgi.SystemFramework" />
</blueprint>