Update of
/var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/cao/impl
In directory
james.mmbase.org:/tmp/cvs-serv30364/portlets-newsletter/src/java/com/finalist/newsletter/cao/impl
Modified Files:
NewsletterPublicationCAOImpl.java
Log Message:
CMSC-818 move service initial to spring.
See also:
http://cvs.mmbase.org/viewcvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/cao/impl
See also: http://www.mmbase.org/jira/browse/CMSC-818
Index: NewsletterPublicationCAOImpl.java
===================================================================
RCS file:
/var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/cao/impl/NewsletterPublicationCAOImpl.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -b -r1.9 -r1.10
--- NewsletterPublicationCAOImpl.java 7 May 2008 05:58:37 -0000 1.9
+++ NewsletterPublicationCAOImpl.java 7 May 2008 08:18:27 -0000 1.10
@@ -21,11 +21,13 @@
import com.finalist.cmsc.mmbase.PropertiesUtil;
import com.finalist.cmsc.navigation.NavigationUtil;
import com.finalist.newsletter.NewsletterSendFailException;
+import com.finalist.newsletter.ApplicationContextFactory;
import com.finalist.newsletter.cao.NewsletterPublicationCAO;
import com.finalist.newsletter.domain.Newsletter;
import com.finalist.newsletter.domain.Publication;
import com.finalist.newsletter.domain.Term;
import com.finalist.newsletter.util.POConvertUtils;
+import com.finalist.newsletter.util.NewsletterUtil;
import com.finalist.portlets.newsletter.NewsletterContentPortlet;
import org.apache.commons.lang.StringUtils;
@@ -93,7 +95,10 @@
pub.setUrl(getPublicationURL(number));
Newsletter newsletter = new Newsletter();
- new POConvertUtils<Newsletter>().convert(newsletter,
relatedNewsletters.get(0));
+ Node node = relatedNewsletters.get(0);
+ new POConvertUtils<Newsletter>().convert(newsletter, node);
+ newsletter.setSendempty(node.getBooleanValue("sendempty"));
+ newsletter.setTxtempty(node.getStringValue("txtempty"));
pub.setNewsletter(newsletter);
return pub;
@@ -102,10 +107,8 @@
public String getPublicationURL(int publciationId) {
Node publicationNode = cloud.getNode(publciationId);
- String hostUrl = getHostUrl();
+ String hostUrl = NewsletterUtil.getHostUrl();
String newsletterPath = getNewsletterPath(publicationNode);
-
-
return "".concat(hostUrl).concat(newsletterPath);
}
@@ -153,20 +156,6 @@
return NavigationUtil.getPathToRootString(newsletterPublicationNode,
true);
}
- protected String getHostUrl() {
- String hostUrl = PropertiesUtil.getProperty("host");
-
- if (StringUtils.isEmpty(hostUrl)) {
- throw new NewsletterSendFailException("get property <host> from
system property and get nothing");
- }
-
- log.debug("get property <host> from system property and get:" + hostUrl);
-
- if (!hostUrl.endsWith("/")) {
- hostUrl += "/";
- }
- return hostUrl;
- }
public Set<Term> getTermsByPublication(int publicationId) {
Node newsletterPublicationNode = cloud.getNode(publicationId);
_______________________________________________
Cvs mailing list
[email protected]
http://lists.mmbase.org/mailman/listinfo/cvs
