Update of
/var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/webapp/WEB-INF
In directory james.mmbase.org:/tmp/cvs-serv23447/src/webapp/WEB-INF
Modified Files:
spring-newsletter.xml struts-newsletter.xml
Log Message:
cmsc-979,990 newsletter mangement (block by cmsc-217)
See also:
http://cvs.mmbase.org/viewcvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/webapp/WEB-INF
Index: spring-newsletter.xml
===================================================================
RCS file:
/var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/webapp/WEB-INF/spring-newsletter.xml,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -b -r1.9 -r1.10
--- spring-newsletter.xml 23 Jul 2008 07:18:55 -0000 1.9
+++ spring-newsletter.xml 24 Jul 2008 09:04:16 -0000 1.10
@@ -49,7 +49,6 @@
class="com.finalist.newsletter.services.impl.NewsletterServiceImpl"
lazy-init="true">
<property name="newsletterCAO" ref="newsletterCAO"/>
<property name="subscriptionCAO" ref="subscriptionCAO"/>
- <property name="subscriptionServices" ref="subscriptionServices"/>
</bean>
<bean id="publicationService"
@@ -64,4 +63,24 @@
<property name="newsletterCAO" ref="newsletterCAO"/>
<property name="statisticCAO" ref="statisticCAO"/>
</bean>
+ <bean id="sessionFactory"
class="org.springframework.orm.hibernate3.annotation.AnnotationSessionFactoryBean">
+ <property name="hibernateProperties">
+ <props>
+ <prop key="hibernate.dialect">${hibernate.dialect}</prop>
+ <prop key="hibernate.show_sql">${hibernate.show_sql}</prop>
+ <prop
key="hibernate.generate_statistics">${hibernate.generate_statistics}</prop>
+ <prop key="hibernate.hbm2ddl.auto">${hibernate.hbm2ddl.auto}</prop>
+ </props>
+ </property>
+ <property name="annotatedClasses">
+ <list>
+
<value>com.finalist.cmsc.services.community.security.Authentication</value>
+ <value>com.finalist.cmsc.services.community.security.Authority</value>
+ <value>com.finalist.cmsc.services.community.security.Permission</value>
+ <value>com.finalist.cmsc.services.community.person.Person</value>
+
<value>com.finalist.cmsc.services.community.preferences.Preference</value>
+ </list>
+ </property>
+ </bean>
+ <bean name="subscriptionHService"
class="com.finalist.newsletter.services.impl.NewsletterSubscriptionHibernateService"
/>
</beans>
Index: struts-newsletter.xml
===================================================================
RCS file:
/var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/webapp/WEB-INF/struts-newsletter.xml,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -b -r1.16 -r1.17
--- struts-newsletter.xml 22 Jul 2008 03:16:06 -0000 1.16
+++ struts-newsletter.xml 24 Jul 2008 09:04:16 -0000 1.17
@@ -124,44 +124,62 @@
<forward name="returnurl"
path="/editors/newsletter/NewsletterPublicationEdit.do" redirect="false" />
<forward name="cancel" path="/editors/empty.html"
redirect="true" />
<forward name="success"
path="/editors/site/refreshpagesandshow.jsp" redirect="false" />
- <forward name="publicationmanage"
path="/editors/newsletter/NewsletterPublicationManagement.do" redirect="false"/>
+ <forward name="publicationedit"
path="/editors/newsletter/NewsletterPublicationManagement.do" redirect="false"/>
</action>
<action path="/editors/newsletter/NewsletterPublicationEdit"
type="com.finalist.newsletter.forms.NewsletterPublicationEdit" unknown="false"
validate="false">
<forward name="openwizard"
path="/editors/WizardInitAction.do" redirect="false" />
<forward name="returnurl"
path="/editors/newsletter/NewsletterPublicationEdit.do" redirect="false" />
<forward name="success"
path="/editors/site/refreshpagesandshow.jsp" redirect="false" />
- <forward name="publicationmanage"
path="/editors/newsletter/NewsletterPublicationManagement.do" redirect="false"/>
+ <forward name="publicationedit"
path="/editors/newsletter/NewsletterPublicationManagement.do" redirect="false"/>
+ <forward name="newsletterstatistics"
path="/editors/newsletter/NewsletterPublicationStatisticSearch.do"
redirect="false"/>
</action>
<action path="/editors/newsletter/NewsletterPublicationDelete"
type="com.finalist.newsletter.forms.NewsletterPublicationDelete"
unknown="false" validate="false">
<forward name="newsletterpublicationdelete"
path="/editors/newsletter/newsletterpublicationdelete.jsp" redirect="false" />
<forward name="success"
path="/editors/site/refreshpages.jsp" redirect="false" />
- <forward name="publicationmanage"
path="/editors/newsletter/NewsletterPublicationManagement.do" redirect="false"/>
+ <forward name="publicationedit"
path="/editors/newsletter/NewsletterPublicationManagement.do" redirect="false"/>
+ <forward name="newsletterstatistics"
path="/editors/newsletter/NewsletterPublicationStatisticSearch.do"
redirect="false"/>
</action>
<action path="/editors/newsletter/NewsletterPublicationPublish"
type="com.finalist.newsletter.forms.NewsletterPublicationPublish"
unknown="false" validate="false">
<forward name="confirm_send"
path="/editors/newsletter/confirm_send.jsp" redirect="false" />
<forward name="confirm_resend"
path="/editors/newsletter/confirm_resend.jsp" redirect="false" />
<forward name="success"
path="/editors/newsletter/sendresults.jsp" redirect="false" />
<forward name="cancel"
path="/editors/site/refreshpagesandshow.jsp" redirect="false" />
+ <forward name="publicationedit"
path="/editors/newsletter/NewsletterPublicationManagement.do" redirect="false"/>
</action>
<action path="/editors/newsletter/NewsletterPublicationTest"
type="com.finalist.newsletter.forms.NewsletterPublicationSendEmail"
unknown="false" validate="false">
<forward name="inputpage"
path="/editors/newsletter/testinputform.jsp" redirect="false" />
<forward name="success"
path="/editors/newsletter/sendresults.jsp" redirect="false" />
<forward name="cancel"
path="/editors/site/refreshpagesandshow.jsp" redirect="false" />
+ <forward name="publicationedit"
path="/editors/newsletter/NewsletterPublicationManagement.do" redirect="false"/>
</action>
<action
path="/editors/newsletter/NewsletterPublicationManagement"
name="newsletterPublicationManageForm"
type="com.finalist.newsletter.forms.NewsletterPublicationManagementAction"
parameter="method">
- <forward name="newsletterpublicationlist"
path="/editors/newsletter/module/report_publication_overview.jsp"
redirect="false"/>
- <forward name="statisticmanagement"
path="/editors/newsletter/module/report_publication_statistic.jsp"
redirect="false"/>
- <forward name="termlist"
path="/editors/newsletter/module/report_publication_terms.jsp"
redirect="false"/>
+ <forward name="newsletterpublicationlist"
path="/editors/newsletter/module/report_publication_edit.jsp" redirect="false"/>
+ </action>
+ <action
path="/editors/newsletter/NewsletterPublicationStatisticSearch"
name="newsletterPublicationManageForm"
+
type="com.finalist.newsletter.forms.NewsletterStatisticSearchAction"
parameter="method">
+ <forward name="success"
path="/editors/newsletter/module/report_publication_statistic.jsp"
redirect="false"/>
</action>
<action
path="/editors/newsletter/NewsletterPublicationSubscriberSearch"
name="newsletterSubscriberSearchForm"
-
type="com.finalist.newsletter.forms.NewsletterSubscriberSearchAction"
parameter="action">
+
type="com.finalist.newsletter.forms.NewsletterSubscriberSearchAction"
parameter="method">
<forward name="success"
path="/editors/newsletter/module/report_publication_subscribers.jsp"
redirect="false"/>
</action>
<action path="/editors/newsletter/NewsletterTermSearch"
type="com.finalist.newsletter.forms.NewsletterTermSearchAction">
<forward name="success"
path="/editors/newsletter/module/report_publication_terms.jsp"/>
</action>
+ <action path="/editors/newsletter/NewsletterTermDelete"
type="com.finalist.newsletter.forms.NewsletterTermDeleteAction">
+ <forward name="success"
path="/editors/newsletter/NewsletterTermSearch.do"/>
+ </action>
+ <action
path="/editors/newsletter/NewsletterNewsletterSubscriberDelete"
type="com.finalist.newsletter.forms.NewsletterNewsletterSubscriberDeleteAction">
+ <forward name="success"
path="/editors/newsletter/NewsletterPublicationSubscriberSearch.do"/>
+ </action>
+ <action
path="/editors/newsletter/NewsletterSubscriptionAddRelAction"
type="com.finalist.newsletter.forms.NewsletterSubscriptionAddRelAction"
parameter="method">
+ <forward name="success"
path="/editors/newsletter/NewsletterPublicationSubscriberSearch.do"/>
+ </action>
+ <action path="/editors/newsletter/NewsletterTermsAddAction"
type="com.finalist.newsletter.forms.NewsletterTermsAddAction">
+ <forward name="success"
path="/editors/newsletter/NewsletterTermSearch.do"/>
+ </action>
<!-- ==== Newsletter Statistic ==== -->
<action path="/editors/newsletter/ShowNewsletters"
type="com.finalist.newsletter.forms.NewsletterStatisticAction"
_______________________________________________
Cvs mailing list
[email protected]
http://lists.mmbase.org/mailman/listinfo/cvs
