Update of
/var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/webapp/WEB-INF
In directory
james.mmbase.org:/tmp/cvs-serv19533/portlets-newsletter/src/webapp/WEB-INF
Modified Files:
struts-newsletter.xml spring-newsletter.xml
Log Message:
CMSC-725 fix a bug.
See also:
http://cvs.mmbase.org/viewcvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/webapp/WEB-INF
See also: http://www.mmbase.org/jira/browse/CMSC-725
Index: struts-newsletter.xml
===================================================================
RCS file:
/var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/webapp/WEB-INF/struts-newsletter.xml,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- struts-newsletter.xml 14 May 2008 03:54:40 -0000 1.7
+++ struts-newsletter.xml 15 May 2008 06:33:48 -0000 1.8
@@ -56,6 +56,7 @@
redirect="false"/>
<forward name="importpage"
path="/editors/newsletter/module/import.jsp" redirect="false"/>
<forward name="listsubscribers"
path="/editors/newsletter/module/report_subscriber_list.jsp" redirect="false"/>
+ <forward name="confirmunsubscribe"
path="/editors/newsletter/module/confirm_unsubscribe.jsp" redirect="false"/>
<forward name="ubscriber_subscriptions"
path="/editors/newsletter/module/report_subscriber_subscriptions.jsp"
redirect="false"/>
@@ -74,7 +75,6 @@
</action>
<action path="/editors/newsletter/SwitchMIMEAction"
type="com.finalist.newsletter.forms.SwitchMIMEAction" unknown="false"
validate="false">
- <forward name="reload" path="/editors/newsletter/reload.jsp"
redirect="true"/>
</action>
<!-- ==== Select page nodes ==== -->
Index: spring-newsletter.xml
===================================================================
RCS file:
/var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/webapp/WEB-INF/spring-newsletter.xml,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- spring-newsletter.xml 15 May 2008 01:43:38 -0000 1.6
+++ spring-newsletter.xml 15 May 2008 06:33:48 -0000 1.7
@@ -24,14 +24,14 @@
</bean>
- <bean name="publicationCAO"
class="com.finalist.newsletter.cao.impl.NewsletterPublicationCAOImpl"
+ <bean name="publicationCAOImpl"
class="com.finalist.newsletter.cao.impl.NewsletterPublicationCAOImpl"
lazy-init="true">
<property name="cloud" ref="cloud"/>
</bean>
<bean name="newsletterCAO"
class="com.finalist.newsletter.cao.impl.NewsletterCAOImpl" lazy-init="true">
<property name="cloud" ref="cloud"/>
</bean>
- <bean name="statisticCAO"
class="com.finalist.newsletter.cao.impl.NewsLetterStatisticCAOImpl"
lazy-init="true">
+ <bean name="statisticCAOImpl"
class="com.finalist.newsletter.cao.impl.NewsLetterStatisticCAOImpl"
lazy-init="true">
<property name="cloud" ref="cloud"/>
</bean>
<bean name="publisher"
class="com.finalist.newsletter.publisher.NewsletterPublisher" lazy-init="true"/>
@@ -40,7 +40,7 @@
class="com.finalist.newsletter.services.impl.NewsletterSubscriptionServicesImpl"
lazy-init="true">
<property name="subscriptionCAO" ref="subscriptionCAO"/>
<property name="newsletterCAO" ref="newsletterCAO"/>
- <property name="statisticCAO" ref="statisticCAO"/>
+ <property name="statisticCAO" ref="statisticCAOImpl"/>
<property name="newsletterService" ref="newsletterServices"/>
<property name="personService" ref="personService"/>
</bean>
@@ -55,14 +55,14 @@
<bean id="publicationService"
class="com.finalist.newsletter.services.impl.NewsletterPublicationServiceImpl"
lazy-init="true">
<property name="subscriptionCAO" ref="subscriptionCAO"/>
- <property name="statisticCAO" ref="statisticCAO"/>
- <property name="publicationCAO" ref="publicationCAO"/>
+ <property name="statisticCAO" ref="statisticCAOImpl"/>
+ <property name="publicationCAO" ref="publicationCAOImpl"/>
<property name="publisher" ref="publisher"/>
</bean>
<bean id="statisticService"
class="com.finalist.newsletter.services.impl.StatisticServiceImpl"
lazy-init="true">
- <property name="newsletterCAO" ref="newsletterCAO"/>
- <property name="statisticCAO" ref="statisticCAO"/>
+ <property name="newLettercao" ref="newsletterCAO"/>
+ <property name="statisticcao" ref="statisticCAOImpl"/>
</bean>
<!-- Services Holder-->
<bean id="contextHolder"
class="com.finalist.newsletter.ApplicationContextFactory"/>
_______________________________________________
Cvs mailing list
[email protected]
http://lists.mmbase.org/mailman/listinfo/cvs
