Update of
/var/cvs/contributions/CMSContainer_Modules/community/src/webapp/WEB-INF
In directory james.mmbase.org:/tmp/cvs-serv11342/community/src/webapp/WEB-INF
Modified Files:
spring-community.xml
Added Files:
spring-security.xml
Log Message:
Changes Community module
See also:
http://cvs.mmbase.org/viewcvs/contributions/CMSContainer_Modules/community/src/webapp/WEB-INF
spring-security.xml is new
Index: spring-community.xml
===================================================================
RCS file:
/var/cvs/contributions/CMSContainer_Modules/community/src/webapp/WEB-INF/spring-community.xml,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- spring-community.xml 31 Jan 2008 12:44:13 -0000 1.4
+++ spring-community.xml 8 Feb 2008 10:33:13 -0000 1.5
@@ -18,16 +18,16 @@
<!-- Post-processors for all standard config annotations (for @Required) -->
<context:annotation-config />
- <!-- DriverManagerDataSource is a local DataSource that works in any
environment (for testing) -->
+ <!-- DriverManagerDataSource is a local DataSource that works in any
environment (for testing)
<bean id="dataSource"
class="org.springframework.jdbc.datasource.DriverManagerDataSource"
p:driverClassName="${jdbc.driverClassName}"
p:url="${jdbc.url}"
p:username="${jdbc.username}"
p:password="${jdbc.password}"/>
-
+ -->
<!-- JNDI DataSource
- <jee:jndi-lookup id="dataSource" jndi-name="jdbc/Community"/>
-->
+ <jee:jndi-lookup id="dataSource" jndi-name="java:comp/env/jdbc/Community"/>
<!-- Hibernate SessionFactory -->
<bean id="sessionFactory"
class="org.springframework.orm.hibernate3.annotation.AnnotationSessionFactoryBean">
@@ -57,69 +57,6 @@
<!-- Instruct Spring to perform declarative transaction management
automatically on annotated classes. -->
<tx:annotation-driven />
- <!-- Acegi Security -->
-
- <!-- AuthenticationManager (our own Hibernate implementation of
UserDetailsService. User Cache not yet implemented -->
- <bean name="authenticationProvider"
class="org.acegisecurity.providers.dao.DaoAuthenticationProvider">
- <property name="userDetailsService" ref="userDetailsService" />
- <property name="passwordEncoder">
- <bean class="org.acegisecurity.providers.encoding.Md5PasswordEncoder" />
- </property>
- <property name="saltSource">
- <bean class="org.acegisecurity.providers.dao.salt.ReflectionSaltSource">
- <property name="userPropertyToUse" value="userName" />
- </bean>
- </property>
- </bean>
- <bean id="authenticationManager"
class="org.acegisecurity.providers.ProviderManager">
- <property name="providers">
- <list>
- <ref bean="authenticationProvider"/>
- </list>
- </property>
- </bean>
-
- <!-- AccessDecisionManager (unanimous based, allow access if ALL voters vote
to grant access) -->
- <bean id="accessDecisionManager"
class="org.acegisecurity.vote.UnanimousBased">
- <property name="decisionVoters">
- <list>
- <ref bean="roleVoter"/>
- <ref bean="groupVoter"/>
- </list>
- </property>
- </bean>
-
- <!-- voters -->
- <bean id="roleVoter" class="org.acegisecurity.vote.RoleVoter" />
-
- <bean id="groupVoter" class="org.acegisecurity.vote.RoleVoter">
- <property name="rolePrefix" value="GROUP_" />
- </bean>
-
- <!-- filters -->
- <bean id="filterChainProxy" class="org.acegisecurity.util.FilterChainProxy">
- <property name="filterInvocationDefinitionSource">
- <value>
- CONVERT_URL_TO_LOWERCASE_BEFORE_COMPARISON
- PATTERN_TYPE_APACHE_ANT
- /**=httpSessionIntegrationFilter
- </value>
- </property>
- </bean>
-
- <bean id="httpSessionIntegrationFilter"
class="org.acegisecurity.context.HttpSessionContextIntegrationFilter"/>
-
-<!--
- <bean id="authenticationEntryPoint"
class="org.acegisecurity.ui.basicauth.BasicProcessingFilterEntryPoint">
- <property name="realmName" value="Community Module" />
- </bean>
-
-
- <bean id="authenticationProcessingFilter"
class="org.acegisecurity.ui.basicauth.BasicProcessingFilter">
- <property name="authenticationManager" ref="authenticationManager"/>
- <property name="authenticationEntryPoint" ref="authenticationEntryPoint"/>
- </bean>
--->
<!-- Services -->
<bean name="userDetailsService"
class="com.finalist.cmsc.services.community.security.UserDetailsHibernateService"
/>
@@ -128,4 +65,5 @@
<bean name="preferenceService"
class="com.finalist.cmsc.services.community.preferences.PreferenceHibernateService"
/>
<bean name="personService"
class="com.finalist.cmsc.services.community.person.PersonHibernateService" />
+ <import resource="spring-security.xml" />
</beans>
_______________________________________________
Cvs mailing list
[email protected]
http://lists.mmbase.org/mailman/listinfo/cvs
