Update of
/var/cvs/contributions/CMSContainer_Modules/community/src/webapp/WEB-INF
In directory james.mmbase.org:/tmp/cvs-serv32203/community/src/webapp/WEB-INF
Modified Files:
Tag: b1_4
struts-community.xml spring-community.xml
Added Files:
Tag: b1_4
spring-security.xml
Log Message:
CMSC-617 Personal Pages module
Backport to 1.4
See also:
http://cvs.mmbase.org/viewcvs/contributions/CMSContainer_Modules/community/src/webapp/WEB-INF
See also: http://www.mmbase.org/jira/browse/CMSC-617
spring-security.xml is new
Index: struts-community.xml
===================================================================
RCS file:
/var/cvs/contributions/CMSContainer_Modules/community/src/webapp/WEB-INF/struts-community.xml,v
retrieving revision 1.3
retrieving revision 1.3.2.1
diff -u -b -r1.3 -r1.3.2.1
--- struts-community.xml 31 Jan 2008 14:19:01 -0000 1.3
+++ struts-community.xml 25 Feb 2008 16:26:16 -0000 1.3.2.1
@@ -2,19 +2,33 @@
<!DOCTYPE struts-config PUBLIC
"-//Apache Software Foundation//DTD Struts Configuration 1.2//EN"
"http://struts.apache.org/dtds/struts-config_1_2.dtd";>
-
<struts-config>
-
-<!-- Data Sources Definitions -->
-<!-- Form Bean Definitions -->
+ <!-- Data Sources Definitions -->
+ <!-- Form Bean Definitions -->
<form-beans>
<form-bean name="communityUserForm"
type="com.finalist.cmsc.community.forms.UserForm" />
+ <form-bean name="communityGroupForm"
type="com.finalist.cmsc.community.forms.GroupForm" />
</form-beans>
-
-<!-- Global Exceptions Definitions -->
-<!-- Global Forward Definitions -->
-<!-- Action Mapping Definitions -->
+ <!-- Global Exceptions Definitions -->
+ <!-- Global Forward Definitions -->
+ <!-- Action Mapping Definitions -->
<action-mappings>
+ <!-- ==== Group management ==== -->
+ <action path="/editors/community/deleteGroupAction"
type="com.finalist.cmsc.community.forms.DeleteGroupAction"
+ unknown="false" validate="false">
+ <forward name="success" path="/editors/community/index.jsp"
redirect="false" />
+ </action>
+ <action path="/editors/community/groupAction"
type="com.finalist.cmsc.community.forms.GroupAction"
+ name="communityGroupForm" scope="session"
input="/editors/community/group.jsp" unknown="false"
+ validate="true">
+ <set-property property="cancellable" value="true" />
+ <forward name="success" path="/editors/community/index.jsp"
redirect="false" />
+ </action>
+ <action path="/editors/community/groupInitAction"
type="com.finalist.cmsc.community.forms.GroupInitAction"
+ name="communityGroupForm" scope="session" unknown="false"
validate="false">
+ <forward name="success" path="/editors/community/group.jsp"
redirect="false" />
+ </action>
+ <!-- ==== User management ==== -->
<action path="/editors/community/IndexAction"
type="com.finalist.cmsc.community.forms.IndexAction"
validate="false" unknown="true">
<forward name="success" path="/editors/community/index.jsp"
redirect="false" />
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.4.2.1
diff -u -b -r1.4 -r1.4.2.1
--- spring-community.xml 31 Jan 2008 12:44:13 -0000 1.4
+++ spring-community.xml 25 Feb 2008 16:26:16 -0000 1.4.2.1
@@ -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
