Github user ahgittin commented on a diff in the pull request:
https://github.com/apache/brooklyn-server/pull/55#discussion_r57584797
--- Diff:
rest/rest-resources/src/main/resources/OSGI-INF/blueprint/service.xml ---
@@ -34,71 +36,34 @@ 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" />
- <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">
+ <jaas:config name="webconsole">
+ <jaas:module
className="org.apache.brooklyn.rest.security.jaas.BrooklynLoginModule"
+ flags="required" />
+ </jaas:config>
+
+ <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">
- <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">
- <property name="managementContext" ref="localManagementContext" />
- <property name="managementContextInternal"
ref="localManagementContextInternal" />
- </bean>
+ <bean id="applicationResourceBean"
class="org.apache.brooklyn.rest.resources.ApplicationResource" />
--- End diff --
must remember -- or document -- that this file needs updating if we add
rest resources.
nice clean up.
feels like we should brain dump to the dev guide a page on how rest and ui
code all works.
---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at [email protected] or file a JIRA ticket
with INFRA.
---
