Update of
/var/cvs/contributions/CMSContainer_Modules/community/src/webapp/WEB-INF
In directory james.mmbase.org:/tmp/cvs-serv4666/community/src/webapp/WEB-INF
Modified Files:
spring-community.xml struts-community.xml
Log Message:
CMSC-996 code improved.
See also:
http://cvs.mmbase.org/viewcvs/contributions/CMSContainer_Modules/community/src/webapp/WEB-INF
See also: http://www.mmbase.org/jira/browse/CMSC-996
Index: spring-community.xml
===================================================================
RCS file:
/var/cvs/contributions/CMSContainer_Modules/community/src/webapp/WEB-INF/spring-community.xml,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -b -r1.8 -r1.9
--- spring-community.xml 23 Jul 2008 07:20:02 -0000 1.8
+++ spring-community.xml 31 Jul 2008 07:55:54 -0000 1.9
@@ -67,15 +67,22 @@
<!-- Actions -->
<bean name="/editors/community/PreferenceAction"
class="com.finalist.cmsc.community.forms.PreferenceAction">
- <property name="preferenceService"><ref
bean="preferenceService"></ref></property>
+ <property name="preferenceService" ref="preferenceService"/>
</bean>
- <bean name="/editors/community/ReferenceImportExportAction"
class="com.finalist.cmsc.community.forms.ReferenceImportExportAction">
-
- <property name="personService"><ref
bean="personService"></ref></property>
+ <bean name="/editors/community/ReferenceImportExportAction"
+ class="com.finalist.cmsc.community.forms.ReferenceImportExportAction">
+ <property name="personService" ref="personService"/>
+ </bean>
+ <bean name="/editors/community/SearchConditionalUser"
+ class="com.finalist.cmsc.community.forms.SearchConditionalUserAction">
+ <property name="personService" ref="personService"/>
+ <property name="authenticationService" ref="authenticationService"/>
+ <property name="authorityService" ref="authorityService"/>
</bean>
- <import resource="spring-security.xml" />
+
+ <import resource="spring-security.xml"/>
<!-- Services Holder-->
<bean id="contextHolder"
class="com.finalist.cmsc.services.community.ApplicationContextFactory"/>
</beans>
Index: struts-community.xml
===================================================================
RCS file:
/var/cvs/contributions/CMSContainer_Modules/community/src/webapp/WEB-INF/struts-community.xml,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -b -r1.18 -r1.19
--- struts-community.xml 31 Jul 2008 05:15:17 -0000 1.18
+++ struts-community.xml 31 Jul 2008 07:55:54 -0000 1.19
@@ -62,9 +62,9 @@
unknown="false" validate="false">
<forward name="success"
path="/editors/community/SearchConditionalUser.do" redirect="false" />
</action>
- <action path="/editors/community/SearchConditionalUser"
type="com.finalist.cmsc.community.forms.SearchConditionalUserAction"
- unknown="false" validate="false" name="searchForm" scope="request">
- <forward name="group"
path="/editors/community/moveUserBetweenGroup.jsp" redirect="false" />
+ <action path="/editors/community/SearchConditionalUser"
type="org.springframework.web.struts.DelegatingActionProxy"
+ unknown="false" validate="false" name="searchForm" scope="request"
parameter="method">
+ <forward name="group"
path="/editors/community/userlist_addusertogroup.jsp" redirect="false" />
<forward name="success" path="/editors/community/listUsers.jsp"
redirect="false" />
</action>
<action path="/editors/community/AddUserToGroupInit"
type="com.finalist.cmsc.community.forms.AddUserToGroupInitAction"
_______________________________________________
Cvs mailing list
[email protected]
http://lists.mmbase.org/mailman/listinfo/cvs
