Update of
/var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/webapp/WEB-INF
In directory
james.mmbase.org:/tmp/cvs-serv16798/portlets-newsletter/src/webapp/WEB-INF
Modified Files:
struts-newsletter.xml spring-newsletter.xml
Log Message:
CMSC-818 basic function implement,move service initial to spring.
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-818
Index: struts-newsletter.xml
===================================================================
RCS file:
/var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/webapp/WEB-INF/struts-newsletter.xml,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- struts-newsletter.xml 3 May 2008 15:08:45 -0000 1.4
+++ struts-newsletter.xml 5 May 2008 02:40:11 -0000 1.5
@@ -12,32 +12,44 @@
<action-mappings>
<!-- ==== Site management ==== -->
- <action path="/editors/newsletter/NewsletterCreate"
type="com.finalist.newsletter.forms.NewsletterCreate" unknown="false"
validate="false">
- <forward name="openwizard"
path="/editors/WizardInitAction.do" redirect="false" />
- <forward name="returnurl"
path="/editors/newsletter/NewsletterCreate.do" redirect="false" />
- <forward name="cancel" path="/editors/empty.html"
redirect="true" />
- <forward name="success"
path="/editors/site/refreshpagesandshow.jsp" redirect="false" />
- </action>
- <action path="/editors/newsletter/NewsletterEdit"
type="com.finalist.newsletter.forms.NewsletterEdit" unknown="false"
validate="false">
- <forward name="openwizard"
path="/editors/WizardInitAction.do" redirect="false" />
- <forward name="returnurl"
path="/editors/newsletter/NewsletterEdit.do" redirect="false" />
- <forward name="success"
path="/editors/site/refreshpagesandshow.jsp" redirect="false" />
- </action>
- <action path="/editors/newsletter/NewsletterDelete"
type="com.finalist.newsletter.forms.NewsletterDelete" unknown="false"
validate="false">
- <forward name="newsletterdelete"
path="/editors/newsletter/newsletterdelete.jsp" redirect="false" />
- <forward name="success"
path="/editors/site/refreshpages.jsp" redirect="false" />
+ <action path="/editors/newsletter/NewsletterCreate"
type="com.finalist.newsletter.forms.NewsletterCreate"
+ unknown="false" validate="false">
+ <forward name="openwizard" path="/editors/WizardInitAction.do"
redirect="false"/>
+ <forward name="returnurl"
path="/editors/newsletter/NewsletterCreate.do" redirect="false"/>
+ <forward name="cancel" path="/editors/empty.html" redirect="true"/>
+ <forward name="success" path="/editors/site/refreshpagesandshow.jsp"
redirect="false"/>
+ </action>
+ <action path="/editors/newsletter/NewsletterEdit"
type="com.finalist.newsletter.forms.NewsletterEdit"
+ unknown="false" validate="false">
+ <forward name="openwizard" path="/editors/WizardInitAction.do"
redirect="false"/>
+ <forward name="returnurl"
path="/editors/newsletter/NewsletterEdit.do" redirect="false"/>
+ <forward name="success" path="/editors/site/refreshpagesandshow.jsp"
redirect="false"/>
+ </action>
+ <action path="/editors/newsletter/NewsletterDelete"
type="com.finalist.newsletter.forms.NewsletterDelete"
+ unknown="false" validate="false">
+ <forward name="newsletterdelete"
path="/editors/newsletter/newsletterdelete.jsp" redirect="false"/>
+ <forward name="success" path="/editors/site/refreshpages.jsp"
redirect="false"/>
</action>
- <action path="/editors/newsletter/NewsletterPause"
type="com.finalist.newsletter.forms.NewsletterPause" unknown="false"
validate="false">
- <forward name="success"
path="/editors/site/refreshpages.jsp" redirect="false" />
+ <action path="/editors/newsletter/NewsletterPause"
type="com.finalist.newsletter.forms.NewsletterPause"
+ unknown="false" validate="false">
+ <forward name="success" path="/editors/site/refreshpages.jsp"
redirect="false"/>
</action>
- <action path="/editors/newsletter/NewsletterResume"
type="com.finalist.newsletter.forms.NewsletterResume" unknown="false"
validate="false">
- <forward name="success"
path="/editors/site/refreshpages.jsp" redirect="false" />
+ <action path="/editors/newsletter/NewsletterResume"
type="com.finalist.newsletter.forms.NewsletterResume"
+ unknown="false" validate="false">
+ <forward name="success" path="/editors/site/refreshpages.jsp"
redirect="false"/>
</action>
<action path="/editors/newsletter/Subscribe"
type="com.finalist.newsletter.forms.SubscribeAction" unknown="false"
validate="false" parameter="action">
<forward name="success" path="/editors/site/refreshpages.jsp"
redirect="false"/>
</action>
- <action path="/editors/newsletter/Schedule"
type="com.finalist.newsletter.forms.Schedule" unknown="false" validate="false">
+ <action path="/editors/newsletter/SubscriptionManagement"
+ type="com.finalist.newsletter.forms.SubscriptioManagementAction"
parameter="action">
+ <forward name="newsletterdashboard"
path="/editors/newsletter/module/report_overview.jsp" redirect="false"/>
+ <forward name="newsletteroverview"
path="/editors/newsletter/module/report_newsletter_list.jsp" redirect="false"/>
+ <forward name="newsletterdetail"
path="/editors/newsletter/module/report_newsletter_subscriptions.jsp"
redirect="false"/>
+ </action>
+ <action path="/editors/newsletter/Schedule"
type="com.finalist.newsletter.forms.Schedule" unknown="false"
+ validate="false">
</action>
<!-- ==== Select page nodes ==== -->
@@ -45,6 +57,6 @@
<!-- ==== Security role management ==== -->
</action-mappings>
- <message-resources parameter="cmsc-site" key="SITE" />
+ <message-resources parameter="cmsc-site" key="SITE"/>
<message-resources parameter="portlets-newslettersubscription"/>
</struts-config>
\ No newline at end of file
Index: spring-newsletter.xml
===================================================================
RCS file:
/var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/webapp/WEB-INF/spring-newsletter.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- spring-newsletter.xml 25 Apr 2008 18:18:35 -0000 1.1
+++ spring-newsletter.xml 5 May 2008 02:40:11 -0000 1.2
@@ -13,7 +13,32 @@
http://www.springframework.org/schema/jee
http://www.springframework.org/schema/jee/spring-jee-2.5.xsd
http://www.springframework.org/schema/tx
http://www.springframework.org/schema/tx/spring-tx-2.5.xsd";>
+
+ <!-- Cloud provider -->
+ <bean name="cloudProviderBean"
class="com.finalist.newsletter.cao.CloudProviderBean"/>
+ <bean id="cloud" factory-bean="cloudProviderBean" factory-method="getCloud"
lazy-init="true"/>
+
+ <!-- Cloud Access Ojbect -->
+ <bean name="subscriptionCAO"
class="com.finalist.newsletter.cao.impl.NewsletterSubscriptionCAOImpl"
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>
+
<!-- Services -->
- <bean name="userDetailsService"
class="com.finalist.cmsc.services.community.security.UserDetailsHibernateService"/>
+ <bean id="newsletterSubscriptionServices"
+
class="com.finalist.newsletter.services.impl.NewsletterSubscriptionServicesImpl"
lazy-init="true">
+ <property name="subscriptinCAO" ref="subscriptionCAO"/>
+ <property name="newsletterCAO" ref="newsletterCAO"/>
+ <property name="newsletterService" ref="newsletterServices"/>
+ </bean>
+
+ <bean id="newsletterServices"
+ class="com.finalist.newsletter.services.impl.NewsletterServiceImpl"
lazy-init="true">
+ <property name="newsletterCAO" ref="newsletterCAO"/>
+ </bean>
+
+ <!-- Services Holder-->
<bean id="contextHolder"
class="com.finalist.newsletter.ApplicationContextFactory"/>
</beans>
_______________________________________________
Cvs mailing list
[email protected]
http://lists.mmbase.org/mailman/listinfo/cvs
