You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@directory.apache.org by sm...@apache.org on 2018/11/02 13:07:38 UTC
[1/2] directory-fortress-commander git commit: FC-253 - Allow startup
when fortress.properties not found
Repository: directory-fortress-commander
Updated Branches:
refs/heads/master 40875d5d0 -> 074a48fa2
FC-253 - Allow startup when fortress.properties not found
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/85a02678
Tree: http://git-wip-us.apache.org/repos/asf/directory-fortress-commander/tree/85a02678
Diff: http://git-wip-us.apache.org/repos/asf/directory-fortress-commander/diff/85a02678
Branch: refs/heads/master
Commit: 85a026782a81bcfcb331a80785a5618dc116f101
Parents: 40875d5
Author: Shawn McKinney <sm...@apache.org>
Authored: Fri Nov 2 08:04:08 2018 -0500
Committer: Shawn McKinney <sm...@apache.org>
Committed: Fri Nov 2 08:04:08 2018 -0500
----------------------------------------------------------------------
src/main/resources/applicationContext.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/directory-fortress-commander/blob/85a02678/src/main/resources/applicationContext.xml
----------------------------------------------------------------------
diff --git a/src/main/resources/applicationContext.xml b/src/main/resources/applicationContext.xml
index 040b094..2f51da1 100644
--- a/src/main/resources/applicationContext.xml
+++ b/src/main/resources/applicationContext.xml
@@ -35,7 +35,7 @@
">
<!-- Housekeeping -->
- <context:property-placeholder location="classpath:fortress.properties" />
+ <context:property-placeholder location="classpath:fortress.properties" ignore-resource-not-found="true"/>
<!-- These Fortress Manager beans are used as api for RBAC domain model -->
<bean id="reviewMgr" class="org.apache.directory.fortress.core.ReviewMgrFactory" scope="prototype"
[2/2] directory-fortress-commander git commit: cleanup
Posted by sm...@apache.org.
cleanup
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/074a48fa
Tree: http://git-wip-us.apache.org/repos/asf/directory-fortress-commander/tree/074a48fa
Diff: http://git-wip-us.apache.org/repos/asf/directory-fortress-commander/diff/074a48fa
Branch: refs/heads/master
Commit: 074a48fa20fce942c58a21beaca0e0226b3c3fc1
Parents: 85a0267
Author: Shawn McKinney <sm...@apache.org>
Authored: Fri Nov 2 08:07:29 2018 -0500
Committer: Shawn McKinney <sm...@apache.org>
Committed: Fri Nov 2 08:07:29 2018 -0500
----------------------------------------------------------------------
src/main/resources/applicationContext.xml | 23 +++++++++++++----------
1 file changed, 13 insertions(+), 10 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/directory-fortress-commander/blob/074a48fa/src/main/resources/applicationContext.xml
----------------------------------------------------------------------
diff --git a/src/main/resources/applicationContext.xml b/src/main/resources/applicationContext.xml
index 2f51da1..4bdc67a 100644
--- a/src/main/resources/applicationContext.xml
+++ b/src/main/resources/applicationContext.xml
@@ -102,7 +102,7 @@
<bean id="filterChainProxy" class="org.springframework.security.web.FilterChainProxy">
<constructor-arg>
<list>
- <sec:filter-chain pattern="/**" filters="sif,j2eePreAuthFilter,logoutFilter,etf,fsi" />
+ <sec:filter-chain pattern="/**" filters="sif,j2eePreAuthFilter,logoutFilter,etf,fsi"/>
</list>
</constructor-arg>
</bean>
@@ -111,11 +111,14 @@
<sec:authentication-manager alias="authenticationManager">
<sec:authentication-provider ref='preAuthenticatedAuthenticationProvider'/>
</sec:authentication-manager>
- <bean id="preAuthenticatedAuthenticationProvider" class="org.springframework.security.web.authentication.preauth.PreAuthenticatedAuthenticationProvider">
+ <bean id="preAuthenticatedAuthenticationProvider"
+ class="org.springframework.security.web.authentication.preauth.PreAuthenticatedAuthenticationProvider">
<property name="preAuthenticatedUserDetailsService" ref="preAuthenticatedUserDetailsService"/>
</bean>
- <bean id="preAuthenticatedUserDetailsService" class="org.springframework.security.web.authentication.preauth.PreAuthenticatedGrantedAuthoritiesUserDetailsService"/>
- <bean id="j2eePreAuthFilter" class="org.springframework.security.web.authentication.preauth.j2ee.J2eePreAuthenticatedProcessingFilter">
+ <bean id="preAuthenticatedUserDetailsService"
+ class="org.springframework.security.web.authentication.preauth.PreAuthenticatedGrantedAuthoritiesUserDetailsService"/>
+ <bean id="j2eePreAuthFilter"
+ class="org.springframework.security.web.authentication.preauth.j2ee.J2eePreAuthenticatedProcessingFilter">
<property name="authenticationManager" ref="authenticationManager"/>
<property name="authenticationDetailsSource">
<bean class="org.springframework.security.web.authentication.preauth.j2ee.J2eeBasedPreAuthenticatedWebAuthenticationDetailsSource">
@@ -130,7 +133,8 @@
</bean>
</property>
</bean>
- <bean id="preAuthenticatedProcessingFilterEntryPoint" class="org.springframework.security.web.authentication.Http403ForbiddenEntryPoint"/>
+ <bean id="preAuthenticatedProcessingFilterEntryPoint"
+ class="org.springframework.security.web.authentication.Http403ForbiddenEntryPoint"/>
<bean id="logoutFilter" class="org.springframework.security.web.authentication.logout.LogoutFilter">
<constructor-arg value="/"/>
<constructor-arg>
@@ -140,10 +144,8 @@
</constructor-arg>
</bean>
- <!-- <bean id="servletContext" class="org.springframework.web.context.support.ServletContextFactoryBean"/> -->
-
<bean id="etf" class="org.springframework.security.web.access.ExceptionTranslationFilter">
- <constructor-arg ref="preAuthenticatedProcessingFilterEntryPoint"/>
+ <constructor-arg ref="preAuthenticatedProcessingFilterEntryPoint"/>
</bean>
<bean id="httpRequestAccessDecisionManager" class="org.springframework.security.access.vote.AffirmativeBased">
@@ -196,5 +198,6 @@
</property>
</bean>
<bean id="roleVoter" class="org.springframework.security.access.vote.RoleVoter"/>
- <bean id="securityContextHolderAwareRequestFilter" class="org.springframework.security.web.servletapi.SecurityContextHolderAwareRequestFilter"/>
-</beans>
+ <bean id="securityContextHolderAwareRequestFilter"
+ class="org.springframework.security.web.servletapi.SecurityContextHolderAwareRequestFilter"/>
+</beans>
\ No newline at end of file