brooklyn-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From henev...@apache.org
Subject [44/50] brooklyn-server git commit: This closes #87
Date Wed, 30 Mar 2016 14:00:21 GMT
This closes #87

Conflicts:
	karaf/init/pom.xml
	karaf/init/src/main/java/org/apache/brooklyn/launcher/osgi/OsgiLauncher.java
	rest/rest-resources/src/main/resources/OSGI-INF/blueprint/service.xml

karaf config changed in similar places, easily fixed; also LOG and log both defined in OsgiLauncher


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

Branch: refs/heads/master
Commit: 03bc1fabc95b0c72a85f4137b4010808c9c06263
Parents: 40d68fd 2c03625
Author: Alex Heneveld <alex.heneveld@cloudsoftcorp.com>
Authored: Tue Mar 29 09:43:03 2016 +0100
Committer: Alex Heneveld <alex.heneveld@cloudsoftcorp.com>
Committed: Tue Mar 29 09:43:03 2016 +0100

----------------------------------------------------------------------
 .../brooklyn/core/mgmt/ShutdownHandler.java     | 23 ++++++
 .../deserializingClassRenames.properties        |  2 +-
 karaf/init/pom.xml                              |  5 ++
 .../brooklyn/launcher/osgi/OsgiLauncher.java    |  9 +++
 .../launcher/osgi/OsgiShutdownHandler.java      | 46 +++++++++++
 .../resources/OSGI-INF/blueprint/blueprint.xml  | 12 ++-
 karaf/pom.xml                                   |  1 -
 .../brooklyn/launcher/common/BasicLauncher.java |  4 +-
 .../brooklyn/launcher/BrooklynLauncher.java     |  9 +--
 .../brooklyn/launcher/BrooklynWebServer.java    |  2 +-
 pom.xml                                         |  1 +
 .../brooklyn/rest/resources/ServerResource.java |  2 +-
 .../brooklyn/rest/util/ShutdownHandler.java     |  5 +-
 .../rest/util/ShutdownHandlerProvider.java      |  4 +-
 .../resources/OSGI-INF/blueprint/service.xml    |  8 +-
 .../brooklyn/rest/util/TestShutdownHandler.java |  2 +
 .../rest/util/NoOpRecordingShutdownHandler.java |  2 +-
 .../util/ServerStoppingShutdownHandler.java     |  1 +
 .../main/java/org/apache/brooklyn/cli/Main.java |  2 +-
 .../apache/brooklyn/util/javalang/Threads.java  | 80 ++++++++++++++++----
 20 files changed, 181 insertions(+), 39 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/03bc1fab/karaf/init/pom.xml
----------------------------------------------------------------------
diff --cc karaf/init/pom.xml
index 710d2e4,fb96dfc..be79303
--- a/karaf/init/pom.xml
+++ b/karaf/init/pom.xml
@@@ -45,10 -45,10 +45,15 @@@
              <version>${project.version}</version>
          </dependency>
          <dependency>
 +            <groupId>org.apache.brooklyn</groupId>
 +            <artifactId>brooklyn-rest-resources</artifactId>
 +            <version>${project.version}</version>
 +        </dependency>
++        <dependency>
+             <groupId>org.apache.karaf.system</groupId>
+             <artifactId>org.apache.karaf.system.core</artifactId>
+             <version>${karaf.version}</version>
+         </dependency>
  
          <dependency>
              <groupId>org.testng</groupId>

http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/03bc1fab/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 15c19de,3d61632..03a1a2d
--- 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
@@@ -23,8 -22,7 +23,9 @@@ import org.apache.brooklyn.core.Brookly
  import org.apache.brooklyn.core.internal.BrooklynProperties;
  import org.apache.brooklyn.core.mgmt.persist.PersistMode;
  import org.apache.brooklyn.launcher.common.BasicLauncher;
 +import org.apache.brooklyn.rest.BrooklynWebConfig;
 +import org.apache.brooklyn.rest.security.provider.BrooklynUserWithRandomPasswordSecurityProvider;
+ import org.apache.brooklyn.util.javalang.Threads;
  import org.apache.brooklyn.util.time.Duration;
  import org.slf4j.Logger;
  import org.slf4j.LoggerFactory;
@@@ -35,7 -33,7 +36,8 @@@
   * Temporarily here; should be totally contained in blueprint beans' init-methods.
   */
  public class OsgiLauncher extends BasicLauncher<OsgiLauncher> {
 -    private static final Logger log = LoggerFactory.getLogger(OsgiLauncher.class);
++
 +    private static final Logger LOG = LoggerFactory.getLogger(OsgiLauncher.class);
  
      private BrooklynVersionService brooklynVersion;
  
@@@ -52,6 -51,12 +55,12 @@@
          start();
      }
  
+     // Called by blueprint container
+     public void destroy() {
 -        log.debug("Notified of system shutdown, calling shutdown hooks");
++        LOG.debug("Notified of system shutdown, calling shutdown hooks");
+         Threads.runShutdownHooks();
+     }
+ 
      public void setBrooklynVersion(BrooklynVersionService brooklynVersion) {
          this.brooklynVersion = brooklynVersion;
      }

http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/03bc1fab/karaf/init/src/main/resources/OSGI-INF/blueprint/blueprint.xml
----------------------------------------------------------------------
diff --cc karaf/init/src/main/resources/OSGI-INF/blueprint/blueprint.xml
index 9dd0452,f569ff6..51dfce8
--- a/karaf/init/src/main/resources/OSGI-INF/blueprint/blueprint.xml
+++ b/karaf/init/src/main/resources/OSGI-INF/blueprint/blueprint.xml
@@@ -20,24 -20,27 +20,27 @@@ limitations under the License
             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/schemas/blueprint-cm/blueprint-cm-1.1.0.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
               ">
  
-     <!-- Make sure core bundle is already started -->
+     <!-- Makes sure core bundle is already started -->
      <reference id="brooklynVersion"
 -               interface="org.apache.brooklyn.core.BrooklynVersionService" />
 +               interface="org.apache.brooklyn.core.BrooklynVersionService"/>
  
+     <reference id="systemService"
+                interface="org.apache.karaf.system.SystemService" />
+ 
      <cm:property-placeholder persistent-id="org.apache.brooklyn.osgilauncher" update-strategy="reload">
          <cm:default-properties>
 -            <cm:property name="ignoreCatalogErrors" value="true" />
 -            <cm:property name="ignorePersistenceErrors" value="true" />
 -            <cm:property name="highAvailabilityMode" value="DISABLED" />
 -            <cm:property name="persistMode" value="DISABLED" />
 -            <cm:property name="persistenceDir" value="" />
 -            <cm:property name="persistenceLocation" value="" />
 -            <cm:property name="persistPeriod" value="1s" />
 -            <cm:property name="globalBrooklynPropertiesFile" value="~/.brooklyn/brooklyn.properties"
/>
 -            <cm:property name="localBrooklynPropertiesFile" value="" /> <!-- used
to be settable through cli params -->
 +            <cm:property name="ignoreCatalogErrors" value="true"/>
 +            <cm:property name="ignorePersistenceErrors" value="true"/>
 +            <cm:property name="highAvailabilityMode" value="DISABLED"/>
 +            <cm:property name="persistMode" value="DISABLED"/>
 +            <cm:property name="persistenceDir" value=""/>
 +            <cm:property name="persistenceLocation" value=""/>
 +            <cm:property name="persistPeriod" value="1s"/>
 +            <cm:property name="globalBrooklynPropertiesFile" value="~/.brooklyn/brooklyn.properties"/>
 +            <cm:property name="localBrooklynPropertiesFile" value=""/> <!-- used
to be settable through cli params -->
          </cm:default-properties>
      </cm:property-placeholder>
  
@@@ -54,18 -57,19 +57,19 @@@
  
      <bean id="launcher"
            class="org.apache.brooklyn.launcher.osgi.OsgiLauncher"
-           init-method="init">
+           init-method="init"
+           destroy-method="destroy">
  
 -        <property name="brooklynVersion" ref="brooklynVersion" />
 -        <property name="brooklynPropertiesBuilder" ref="propertiesBuilder" />
 +        <property name="brooklynVersion" ref="brooklynVersion"/>
 +        <property name="brooklynPropertiesBuilder" ref="propertiesBuilder"/>
  
 -        <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}" />
 +        <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="localManagementContextService"
@@@ -76,9 -80,11 +80,11 @@@
      <bean id="campPlatform"
            class="org.apache.brooklyn.camp.CampPlatform"
            factory-ref="launcher"
 -          factory-method="getCampPlatform" />
 +          factory-method="getCampPlatform"/>
  
-     <!-- TODO shutdown -->
+     <service interface="org.apache.brooklyn.core.mgmt.ShutdownHandler">
+         <bean class="org.apache.brooklyn.launcher.osgi.OsgiShutdownHandler" />
+     </service>
  
      <service ref="localManagementContextService">
          <interfaces>

http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/03bc1fab/karaf/pom.xml
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/03bc1fab/launcher/src/main/java/org/apache/brooklyn/launcher/BrooklynLauncher.java
----------------------------------------------------------------------
diff --cc launcher/src/main/java/org/apache/brooklyn/launcher/BrooklynLauncher.java
index 2ef038d,5b5b79c..62fd7ee
--- a/launcher/src/main/java/org/apache/brooklyn/launcher/BrooklynLauncher.java
+++ b/launcher/src/main/java/org/apache/brooklyn/launcher/BrooklynLauncher.java
@@@ -45,9 -45,9 +45,9 @@@ import org.apache.brooklyn.launcher.com
  import org.apache.brooklyn.launcher.common.BrooklynPropertiesFactoryHelper;
  import org.apache.brooklyn.launcher.config.StopWhichAppsOnShutdown;
  import org.apache.brooklyn.rest.BrooklynWebConfig;
 -import org.apache.brooklyn.rest.filter.BrooklynPropertiesSecurityFilter;
 +import org.apache.brooklyn.rest.security.provider.AnyoneSecurityProvider;
  import org.apache.brooklyn.rest.security.provider.BrooklynUserWithRandomPasswordSecurityProvider;
- import org.apache.brooklyn.rest.util.ShutdownHandler;
+ import org.apache.brooklyn.core.mgmt.ShutdownHandler;
  import org.apache.brooklyn.util.exceptions.Exceptions;
  import org.apache.brooklyn.util.exceptions.FatalRuntimeException;
  import org.apache.brooklyn.util.exceptions.RuntimeInterruptedException;

http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/03bc1fab/launcher/src/main/java/org/apache/brooklyn/launcher/BrooklynWebServer.java
----------------------------------------------------------------------
diff --cc launcher/src/main/java/org/apache/brooklyn/launcher/BrooklynWebServer.java
index f707594,0eab836..29085c1
--- a/launcher/src/main/java/org/apache/brooklyn/launcher/BrooklynWebServer.java
+++ b/launcher/src/main/java/org/apache/brooklyn/launcher/BrooklynWebServer.java
@@@ -54,12 -53,9 +54,12 @@@ import org.apache.brooklyn.rest.filter.
  import org.apache.brooklyn.rest.filter.LoggingFilter;
  import org.apache.brooklyn.rest.filter.NoCacheFilter;
  import org.apache.brooklyn.rest.filter.RequestTaggingFilter;
 +import org.apache.brooklyn.rest.filter.RequestTaggingRsFilter;
 +import org.apache.brooklyn.rest.security.jaas.BrooklynLoginModule;
 +import org.apache.brooklyn.rest.security.jaas.BrooklynLoginModule.RolePrincipal;
 +import org.apache.brooklyn.rest.security.jaas.JaasUtils;
  import org.apache.brooklyn.rest.util.ManagementContextProvider;
- import org.apache.brooklyn.rest.util.ShutdownHandler;
+ import org.apache.brooklyn.core.mgmt.ShutdownHandler;
  import org.apache.brooklyn.rest.util.ShutdownHandlerProvider;
  import org.apache.brooklyn.util.collections.MutableMap;
  import org.apache.brooklyn.util.core.BrooklynNetworkUtils;

http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/03bc1fab/pom.xml
----------------------------------------------------------------------
diff --cc pom.xml
index c1d33d3,c359850..2b76da9
--- a/pom.xml
+++ b/pom.xml
@@@ -153,9 -150,9 +153,10 @@@
          <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.5</winrm4j.version>
+         <karaf.version>4.0.4</karaf.version>
          <!-- Transitive dependencies, declared explicitly to avoid version mismatch -->
          <clojure.version>1.4.0</clojure.version>
          <zookeeper.version>3.3.4</zookeeper.version>

http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/03bc1fab/rest/rest-resources/src/main/java/org/apache/brooklyn/rest/resources/ServerResource.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/03bc1fab/rest/rest-resources/src/main/resources/OSGI-INF/blueprint/service.xml
----------------------------------------------------------------------
diff --cc rest/rest-resources/src/main/resources/OSGI-INF/blueprint/service.xml
index d0adc48,90794f4..20a1d71
--- a/rest/rest-resources/src/main/resources/OSGI-INF/blueprint/service.xml
+++ b/rest/rest-resources/src/main/resources/OSGI-INF/blueprint/service.xml
@@@ -36,35 -34,75 +36,36 @@@ limitations under the License
      </cxf:bus>
  
      <reference id="localManagementContext"
 -               interface="org.apache.brooklyn.api.mgmt.ManagementContext" />
 -    <reference id="localManagementContextInternal"
                 interface="org.apache.brooklyn.core.mgmt.internal.ManagementContextInternal"
/>
  
 -    <reference id="shutdownHandler"
 -               interface="org.apache.brooklyn.core.mgmt.ShutdownHandler" />
 +    <jaas:config name="webconsole">
-         <jaas:module className="org.apache.brooklyn.rest.security.jaas.BrooklynLoginModule"
-                      flags="required" />
++        <jaas:module className="org.apache.brooklyn.rest.security.jaas.BrooklynLoginModule"
flags="required" />
 +    </jaas:config>
  
 -    <bean id="accessResourceBean" class="org.apache.brooklyn.rest.resources.AccessResource">
 -        <property name="managementContext" ref="localManagementContext" />
 -        <property name="managementContextInternal" ref="localManagementContextInternal"
/>
 -    </bean>
 -    <bean id="activityResourceBean" class="org.apache.brooklyn.rest.resources.ActivityResource">
 -        <property name="managementContext" ref="localManagementContext" />
 -        <property name="managementContextInternal" ref="localManagementContextInternal"
/>
 -    </bean>
 -    <!--<bean id="apidocResourceBean" class="org.apache.brooklyn.rest.resources.ApidocResource"
/>-->
 -    <bean id="applicationResourceBean" class="org.apache.brooklyn.rest.resources.ApplicationResource">
 -        <property name="managementContext" ref="localManagementContext" />
 -        <property name="managementContextInternal" ref="localManagementContextInternal"
/>
 -    </bean>
 -    <bean id="catalogResourceBean" class="org.apache.brooklyn.rest.resources.CatalogResource">
 -        <property name="managementContext" ref="localManagementContext" />
 -        <property name="managementContextInternal" ref="localManagementContextInternal"
/>
 -    </bean>
 -    <bean id="effectorResourceBean" class="org.apache.brooklyn.rest.resources.EffectorResource">
 -        <property name="managementContext" ref="localManagementContext" />
 -        <property name="managementContextInternal" ref="localManagementContextInternal"
/>
 -    </bean>
 -    <bean id="entityConfigResourceBean" class="org.apache.brooklyn.rest.resources.EntityConfigResource">
 -        <property name="managementContext" ref="localManagementContext" />
 -        <property name="managementContextInternal" ref="localManagementContextInternal"
/>
 -    </bean>
 -    <bean id="entityResourceBean" class="org.apache.brooklyn.rest.resources.EntityResource">
 -        <property name="managementContext" ref="localManagementContext" />
 -        <property name="managementContextInternal" ref="localManagementContextInternal"
/>
 -    </bean>
 -    <bean id="locationResourceBean" class="org.apache.brooklyn.rest.resources.LocationResource">
 -        <property name="managementContext" ref="localManagementContext" />
 -        <property name="managementContextInternal" ref="localManagementContextInternal"
/>
 -    </bean>
 -    <bean id="policyConfigResourceBean" class="org.apache.brooklyn.rest.resources.PolicyConfigResource">
 -        <property name="managementContext" ref="localManagementContext" />
 -        <property name="managementContextInternal" ref="localManagementContextInternal"
/>
 -    </bean>
 -    <bean id="policyResourceBean" class="org.apache.brooklyn.rest.resources.PolicyResource">
 -        <property name="managementContext" ref="localManagementContext" />
 -        <property name="managementContextInternal" ref="localManagementContextInternal"
/>
 -    </bean>
 -    <bean id="scriptResourceBean" class="org.apache.brooklyn.rest.resources.ScriptResource">
 -        <property name="managementContext" ref="localManagementContext" />
 -        <property name="managementContextInternal" ref="localManagementContextInternal"
/>
 -    </bean>
 -    <bean id="sensorResourceBean" class="org.apache.brooklyn.rest.resources.SensorResource">
 -        <property name="managementContext" ref="localManagementContext" />
 -        <property name="managementContextInternal" ref="localManagementContextInternal"
/>
 -    </bean>
 -    <bean id="serverResourceBean" class="org.apache.brooklyn.rest.resources.ServerResource">
 -        <property name="managementContext" ref="localManagementContext" />
 -        <property name="managementContextInternal" ref="localManagementContextInternal"
/>
 -    </bean>
 -    <bean id="usageResourceBean" class="org.apache.brooklyn.rest.resources.UsageResource">
 -        <property name="managementContext" ref="localManagementContext" />
 -        <property name="managementContextInternal" ref="localManagementContextInternal"
/>
 -    </bean>
 -    <bean id="versionResourceBean" class="org.apache.brooklyn.rest.resources.VersionResource">
++    <reference id="shutdownHandler" interface="org.apache.brooklyn.core.mgmt.ShutdownHandler"
/>
++
 +    <bean class="org.apache.brooklyn.rest.security.jaas.ManagementContextHolder">
          <property name="managementContext" ref="localManagementContext" />
 -        <property name="managementContextInternal" ref="localManagementContextInternal"
/>
      </bean>
  
 +    <bean id="accessResourceBean" class="org.apache.brooklyn.rest.resources.AccessResource"
/>
 +    <bean id="activityResourceBean" class="org.apache.brooklyn.rest.resources.ActivityResource"
/>
 +    <bean id="apidocResourceBean" class="org.apache.brooklyn.rest.resources.ApidocResource"
/>
 +    <bean id="applicationResourceBean" class="org.apache.brooklyn.rest.resources.ApplicationResource"
/>
 +    <bean id="catalogResourceBean" class="org.apache.brooklyn.rest.resources.CatalogResource"
/>
 +    <bean id="effectorResourceBean" class="org.apache.brooklyn.rest.resources.EffectorResource"
/>
 +    <bean id="entityConfigResourceBean" class="org.apache.brooklyn.rest.resources.EntityConfigResource"
/>
 +    <bean id="entityResourceBean" class="org.apache.brooklyn.rest.resources.EntityResource"
/>
 +    <bean id="locationResourceBean" class="org.apache.brooklyn.rest.resources.LocationResource"
/>
 +    <bean id="policyConfigResourceBean" class="org.apache.brooklyn.rest.resources.PolicyConfigResource"
/>
 +    <bean id="policyResourceBean" class="org.apache.brooklyn.rest.resources.PolicyResource"
/>
 +    <bean id="scriptResourceBean" class="org.apache.brooklyn.rest.resources.ScriptResource"
/>
 +    <bean id="sensorResourceBean" class="org.apache.brooklyn.rest.resources.SensorResource"
/>
 +    <bean id="serverResourceBean" class="org.apache.brooklyn.rest.resources.ServerResource"
/>
 +    <bean id="usageResourceBean" class="org.apache.brooklyn.rest.resources.UsageResource"
/>
 +    <bean id="versionResourceBean" class="org.apache.brooklyn.rest.resources.VersionResource"
/>
 +    <bean id="logoutResourceBean" class="org.apache.brooklyn.rest.resources.LogoutResource"
/>
 +
      <jaxrs:server id="brooklynRestApiV1" address="/">
          <jaxrs:serviceBeans>
              <ref component-id="accessResourceBean" />
@@@ -88,28 -125,11 +89,31 @@@
  
          <jaxrs:providers>
              <bean class="org.apache.brooklyn.rest.util.DefaultExceptionMapper"/>
 -            <bean class="com.fasterxml.jackson.jaxrs.json.JacksonJsonProvider"/>
 +            <bean class="org.apache.brooklyn.rest.util.json.BrooklynJacksonJsonProvider"/>
              <bean class="org.apache.brooklyn.rest.util.FormMapProvider"/>
 +            <bean class="org.apache.cxf.jaxrs.security.JAASAuthenticationFilter">
 +                <property name="contextName" value="webconsole"/>
 +            </bean>
 +            <bean class="org.apache.brooklyn.rest.util.ManagementContextProvider">
 +                <argument ref="localManagementContext" />
 +            </bean>
 +            <!--
 +                TODO ShutdownHandlerProvider, sync with init work.
 +                Needs to be custom OSGi implementation?
 +            -->
 +            <bean class="org.apache.brooklyn.rest.filter.RequestTaggingRsFilter" />
 +            <bean class="org.apache.brooklyn.rest.filter.NoCacheFilter" />
 +            <bean class="org.apache.brooklyn.rest.filter.HaHotCheckResourceFilter" />
 +            <bean class="org.apache.brooklyn.rest.filter.EntitlementContextFilter" />
 +            <bean class="io.swagger.jaxrs.listing.SwaggerSerializers" />
+             <bean class="org.apache.brooklyn.rest.util.ShutdownHandlerProvider">
+                 <argument ref="shutdownHandler" />
+             </bean>
          </jaxrs:providers>
 +
      </jaxrs:server>
 +
 +    <bean class="org.apache.brooklyn.rest.util.ScannerInjectHelper">
 +      <property name="server" ref="brooklynRestApiV1" />
 +    </bean>
  </blueprint>


Mime
View raw message