Return-Path: 
 <commits-return-13449-apmail-brooklyn-commits-archive=brooklyn.apache.org@brooklyn.apache.org>
X-Original-To: apmail-brooklyn-commits-archive@minotaur.apache.org
Delivered-To: apmail-brooklyn-commits-archive@minotaur.apache.org
Received: from mail.apache.org (hermes.apache.org [140.211.11.3])
	by minotaur.apache.org (Postfix) with SMTP id 9DB96191B6
	for <apmail-brooklyn-commits-archive@minotaur.apache.org>;
 Wed, 30 Mar 2016 13:59:42 +0000 (UTC)
Received: (qmail 7772 invoked by uid 500); 30 Mar 2016 13:59:42 -0000
Delivered-To: apmail-brooklyn-commits-archive@brooklyn.apache.org
Received: (qmail 7681 invoked by uid 500); 30 Mar 2016 13:59:42 -0000
Mailing-List: contact commits-help@brooklyn.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:commits-help@brooklyn.apache.org>
List-Unsubscribe: <mailto:commits-unsubscribe@brooklyn.apache.org>
List-Post: <mailto:commits@brooklyn.apache.org>
List-Id: <commits.brooklyn.apache.org>
Reply-To: dev@brooklyn.apache.org
Delivered-To: mailing list commits@brooklyn.apache.org
Received: (qmail 6361 invoked by uid 99); 30 Mar 2016 13:59:39 -0000
Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org)
 (140.211.11.23)
    by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 30 Mar 2016 13:59:39 +0000
Received: by git1-us-west.apache.org (ASF Mail Server at
 git1-us-west.apache.org, from userid 33)
	id 305D9E981A; Wed, 30 Mar 2016 13:59:39 +0000 (UTC)
Content-Type: text/plain; charset="us-ascii"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
From: heneveld@apache.org
To: commits@brooklyn.apache.org
Date: Wed, 30 Mar 2016 14:00:12 -0000
Message-Id: <8f960267e5be403ab3c42d08539bf80b@git.apache.org>
In-Reply-To: <d338dcb532b042e3b694fc84ef831e50@git.apache.org>
References: <d338dcb532b042e3b694fc84ef831e50@git.apache.org>
X-Mailer: ASF-Git Admin Mailer
Subject: [35/50] brooklyn-server git commit: This closes #66

This closes #66


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

Branch: refs/heads/master
Commit: 14ecb3643f307a5f9ea6cdd10999e626cf98f4c7
Parents: d7f0aa2 6e2d398
Author: Alex Heneveld <alex.heneveld@cloudsoftcorp.com>
Authored: Mon Mar 28 16:58:23 2016 +0100
Committer: Alex Heneveld <alex.heneveld@cloudsoftcorp.com>
Committed: Mon Mar 28 16:58:23 2016 +0100

----------------------------------------------------------------------
 .../brooklyn/core/mgmt/ha/OsgiManager.java      | 13 ++---
 .../util/core/osgi/ContainerFramework.java      | 47 +++++++++++++++++
 .../apache/brooklyn/util/core/osgi/Osgis.java   | 38 +++-----------
 .../util/core/osgi/SystemFrameworkLoader.java   | 36 +++++++++++++
 .../resources/OSGI-INF/blueprint/blueprint.xml  |  4 ++
 .../core/mgmt/osgi/OsgiStandaloneTest.java      |  4 +-
 karaf/features/src/main/feature/feature.xml     |  1 +
 pom.xml                                         |  1 +
 .../brooklyn/util/osgi/SystemFramework.java     | 45 ++++++++++++++++
 .../rt/felix/EmbeddedFelixFramework.java        |  5 --
 .../brooklyn/rt/felix/EmbeddedFramework.java    | 54 ++++++++++++++++++++
 ...rg.apache.brooklyn.util.osgi.SystemFramework | 19 +++++++
 12 files changed, 218 insertions(+), 49 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/14ecb364/core/src/main/java/org/apache/brooklyn/util/core/osgi/Osgis.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/14ecb364/core/src/main/resources/OSGI-INF/blueprint/blueprint.xml
----------------------------------------------------------------------
diff --cc core/src/main/resources/OSGI-INF/blueprint/blueprint.xml
index f517f2b,26adeb9..7590de7
--- a/core/src/main/resources/OSGI-INF/blueprint/blueprint.xml
+++ b/core/src/main/resources/OSGI-INF/blueprint/blueprint.xml
@@@ -39,74 -46,23 +39,78 @@@ limitations under the License
          </interfaces>
      </service>
  
 -    <bean id="launcher"
 -          class="org.apache.brooklyn.core.OsgiLauncher"
 -          init-method="start">
 +    <bean id="javaClassNameTypePlanTransformer"
 +          class="org.apache.brooklyn.core.typereg.JavaClassNameTypePlanTransformer"
 +          scope="prototype"/>
 +
 +    <service id="javaClassNameTypePlanTransformerService" ref="javaClassNameTypePlanTransformer"
 +             interface="org.apache.brooklyn.core.typereg.BrooklynTypePlanTransformer" />
 +
 +
 +    <bean id="javaCatalogToSpecTransformer" scope="prototype"
 +          class="org.apache.brooklyn.core.catalog.internal.JavaCatalogToSpecTransformer"/>
 +    <service id="javaCatalogToSpecTransformerService" ref="javaCatalogToSpecTransformer"
 +             interface="org.apache.brooklyn.core.plan.PlanToSpecTransformer"/>
 +
 +
 +    <bean id="javaEntitySpecResolver" scope="prototype"
 +          class="org.apache.brooklyn.core.resolve.entity.JavaEntitySpecResolver"/>
 +    <service id="javaEntitySpecResolverService" ref="javaEntitySpecResolver"
 +             interface="org.apache.brooklyn.core.resolve.entity.EntitySpecResolver" />
 +
 +    <bean id="catalogEntitySpecResolver" scope="prototype"
 +          class="org.apache.brooklyn.core.resolve.entity.CatalogEntitySpecResolver"/>
 +    <service id="catalogEntitySpecResolverService" ref="catalogEntitySpecResolver"
 +             interface="org.apache.brooklyn.core.resolve.entity.EntitySpecResolver" />
 +
 +
 +    <bean id="definedLocationByIdResolver" scope="prototype"
 +          class="org.apache.brooklyn.core.location.DefinedLocationByIdResolver"/>
 +    <service id="definedLocationByIdResolverService" ref="definedLocationByIdResolver"
 +             interface="org.apache.brooklyn.api.location.LocationResolver"/>
 +
 +    <bean id="namedLocationResolver" scope="prototype"
 +          class="org.apache.brooklyn.core.location.NamedLocationResolver" />
 +    <service id="namedLocationResolverService" ref="namedLocationResolver"
 +             interface="org.apache.brooklyn.api.location.LocationResolver"/>
 +
 +    <bean id="catalogLocationResolver" scope="prototype"
 +          class="org.apache.brooklyn.core.location.CatalogLocationResolver"/>
 +    <service id="catalogLocationResolverService" ref="catalogLocationResolver"
 +             interface="org.apache.brooklyn.api.location.LocationResolver"/>
 +
 +    <bean id="portForwardManagerLocationResolver" scope="prototype"
 +          class="org.apache.brooklyn.core.location.access.PortForwardManagerLocationResolver"/>
 +    <service id="portForwardManagerLocationResolverService" ref="portForwardManagerLocationResolver"
 +             interface="org.apache.brooklyn.api.location.LocationResolver"/>
 +
 +    <bean id="byonLocationResolver" scope="prototype"
 +          class="org.apache.brooklyn.location.byon.ByonLocationResolver" />
 +    <service id="byonLocationResolverService" ref="byonLocationResolver"
 +             interface="org.apache.brooklyn.api.location.LocationResolver"/>
 +
 +    <bean id="singleMachineLocationResolver" scope="prototype"
 +          class="org.apache.brooklyn.location.byon.SingleMachineLocationResolver"/>
 +    <service id="singleMachineLocationResolverService" ref="singleMachineLocationResolver"
 +             interface="org.apache.brooklyn.api.location.LocationResolver"/>
 +
 +    <bean id="hostLocationResolver" scope="prototype"
 +          class="org.apache.brooklyn.location.byon.HostLocationResolver"/>
 +    <service id="hostLocationResolverService" ref="hostLocationResolver"
 +             interface="org.apache.brooklyn.api.location.LocationResolver"/>
  
 -        <property name="managementContext" ref="localManagementContextService" />
 +    <bean id="localhostLocationResolver" scope="prototype"
 +          class="org.apache.brooklyn.location.localhost.LocalhostLocationResolver"/>
 +    <service id="localhostLocationResolverService" ref="localhostLocationResolver"
 +             interface="org.apache.brooklyn.api.location.LocationResolver"/>
  
 -        <property name="ignoreCatalogErrors" value="${ignoreCatalogErrors}" />
 -        <property name="ignorePersistenceErrors" value="${ignorePersistenceErrors}" />
 -        <property name="highAvailabilityMode" value="${highAvailabilityMode}" />
 -        <property name="persistMode" value="${persistMode}" />
 -        <property name="persistenceDir" value="${persistenceDir}" />
 -        <property name="persistenceLocation" value="${persistenceLocation}" />
 -        <property name="persistPeriod" value="${persistPeriod}" />
 -    </bean>
 +    <bean id="multiLocationResolver" scope="prototype"
 +          class="org.apache.brooklyn.location.multi.MultiLocationResolver" />
 +    <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>

http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/14ecb364/karaf/features/src/main/feature/feature.xml
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/14ecb364/pom.xml
----------------------------------------------------------------------
diff --cc pom.xml
index 1a5299c,4b85520..228fe82
--- a/pom.xml
+++ b/pom.xml
@@@ -152,8 -150,9 +152,9 @@@
          <jsr311-api.version>1.1.1</jsr311-api.version>
          <jax-rs-api.version>2.0.1</jax-rs-api.version>
          <maxmind.version>0.8.1</maxmind.version>
+         <maxmind-db.version>0.3.4</maxmind-db.version>
          <jna.version>4.0.0</jna.version>
 -        <winrm4j.version>0.3.2</winrm4j.version>
 +        <winrm4j.version>0.3.5</winrm4j.version>
          <!-- Transitive dependencies, declared explicitly to avoid version mismatch -->
          <clojure.version>1.4.0</clojure.version>
          <zookeeper.version>3.3.4</zookeeper.version>