directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From smckin...@apache.org
Subject directory-fortress-commander git commit: make accessMgr bean config like the others for contextId
Date Mon, 05 Nov 2018 19:38:47 GMT
Repository: directory-fortress-commander
Updated Branches:
  refs/heads/master 074a48fa2 -> 0e2a037cd


make accessMgr bean config like the others for contextId


Project: http://git-wip-us.apache.org/repos/asf/directory-fortress-commander/repo
Commit: http://git-wip-us.apache.org/repos/asf/directory-fortress-commander/commit/0e2a037c
Tree: http://git-wip-us.apache.org/repos/asf/directory-fortress-commander/tree/0e2a037c
Diff: http://git-wip-us.apache.org/repos/asf/directory-fortress-commander/diff/0e2a037c

Branch: refs/heads/master
Commit: 0e2a037cd1525b25609d46703b7e777aaf4b63a2
Parents: 074a48f
Author: Shawn McKinney <smckinney@apache.org>
Authored: Mon Nov 5 04:20:33 2018 -0600
Committer: Shawn McKinney <smckinney@apache.org>
Committed: Mon Nov 5 04:20:33 2018 -0600

----------------------------------------------------------------------
 src/main/resources/applicationContext.xml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/directory-fortress-commander/blob/0e2a037c/src/main/resources/applicationContext.xml
----------------------------------------------------------------------
diff --git a/src/main/resources/applicationContext.xml b/src/main/resources/applicationContext.xml
index 4bdc67a..3865f8b 100644
--- a/src/main/resources/applicationContext.xml
+++ b/src/main/resources/applicationContext.xml
@@ -38,6 +38,7 @@
     <context:property-placeholder location="classpath:fortress.properties" ignore-resource-not-found="true"/>
 
     <!-- These Fortress Manager beans are used as api for RBAC domain model -->
+    <!-- These beans all use an argument pulled from the java system properties OR defaults
to "HOME" if not set, per: https://jira.spring.io/browse/SPR-4785-->
     <bean id="reviewMgr" class="org.apache.directory.fortress.core.ReviewMgrFactory" scope="prototype"
           factory-method="createInstance">
         <constructor-arg value="${contextId:HOME}"/>
@@ -48,7 +49,7 @@
     </bean>
     <bean id="accessMgr" class="org.apache.directory.fortress.core.AccessMgrFactory" scope="prototype"
           factory-method="createInstance">
-        <constructor-arg value="#{systemProperties['contextId'] ?: 'HOME'}"/>
+        <constructor-arg value="${contextId:HOME}"/>
     </bean>
     <bean id="delReviewMgr" class="org.apache.directory.fortress.core.DelReviewMgrFactory"
scope="prototype"
           factory-method="createInstance">


Mime
View raw message