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:15 UTC
[38/50] brooklyn-server git commit: This closes #79
This closes #79
Project: http://git-wip-us.apache.org/repos/asf/brooklyn-server/repo
Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-server/commit/0c213e27
Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-server/tree/0c213e27
Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-server/diff/0c213e27
Branch: refs/heads/master
Commit: 0c213e27034aff3da33c08a82395c1253d9a51e4
Parents: 100d6d4 6b2993e
Author: Alex Heneveld <al...@cloudsoftcorp.com>
Authored: Mon Mar 28 17:04:25 2016 +0100
Committer: Alex Heneveld <al...@cloudsoftcorp.com>
Committed: Mon Mar 28 17:04:25 2016 +0100
----------------------------------------------------------------------
core/src/main/java/org/apache/brooklyn/core/BrooklynVersion.java | 4 ++--
.../java/org/apache/brooklyn/rest/resources/ServerResource.java | 2 +-
.../src/main/resources/OSGI-INF/blueprint/service.xml | 2 +-
3 files changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/0c213e27/rest/rest-resources/src/main/java/org/apache/brooklyn/rest/resources/ServerResource.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/0c213e27/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 06a56ff,4355dc2..d0adc48
--- a/rest/rest-resources/src/main/resources/OSGI-INF/blueprint/service.xml
+++ b/rest/rest-resources/src/main/resources/OSGI-INF/blueprint/service.xml
@@@ -88,28 -122,8 +88,28 @@@ limitations under the License
<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" />
</jaxrs:providers>
+
</jaxrs:server>
+
+ <bean class="org.apache.brooklyn.rest.util.ScannerInjectHelper">
+ <property name="server" ref="brooklynRestApiV1" />
+ </bean>
</blueprint>