Update of
/var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/cao
In directory james.mmbase.org:/tmp/cvs-serv7519/java/com/finalist/newsletter/cao
Modified Files:
AbstractCAO.java CloudProviderBean.java
NewsLetterStatisticCAO.java NewsletterCAO.java
NewsletterPublicationCAO.java NewsletterSubscriptionCAO.java
Log Message:
CMSC-1085 Newsletter publication should be emailed from Live environment
See also:
http://cvs.mmbase.org/viewcvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/cao
See also: http://www.mmbase.org/jira/browse/CMSC-1085
Index: AbstractCAO.java
===================================================================
RCS file:
/var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/cao/AbstractCAO.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- AbstractCAO.java 5 May 2008 02:40:11 -0000 1.2
+++ AbstractCAO.java 27 Oct 2008 05:56:30 -0000 1.3
@@ -1,18 +1,27 @@
package com.finalist.newsletter.cao;
-import net.sf.mmapps.modules.cloudprovider.CloudProvider;
-import net.sf.mmapps.modules.cloudprovider.CloudProviderFactory;
import org.mmbase.bridge.Cloud;
+import com.finalist.cmsc.navigation.ServerUtil;
+import com.finalist.cmsc.services.publish.Publish;
+
public abstract class AbstractCAO {
protected Cloud cloud;
+ protected boolean isLocal;
public void setCloud(Cloud cloud) {
this.cloud = cloud;
}
protected Cloud getCloud() {
- CloudProvider provider = CloudProviderFactory.getCloudProvider();
- return provider.getCloud();
+ if(isLocal || ServerUtil.isSingle()) {
+ return cloud;
+ }
+ else {
+ return Publish.getRemoteCloud(cloud);
+ }
+ }
+ public void setLocal() {
+ isLocal = true;
}
}
Index: CloudProviderBean.java
===================================================================
RCS file:
/var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/cao/CloudProviderBean.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- CloudProviderBean.java 22 Sep 2008 07:53:41 -0000 1.2
+++ CloudProviderBean.java 27 Oct 2008 05:56:30 -0000 1.3
@@ -1,10 +1,12 @@
package com.finalist.newsletter.cao;
-import org.mmbase.bridge.Cloud;
-import net.sf.mmapps.modules.cloudprovider.CloudProviderFactory;
import net.sf.mmapps.modules.cloudprovider.CloudProvider;
+import net.sf.mmapps.modules.cloudprovider.CloudProviderFactory;
+
+import org.mmbase.bridge.Cloud;
public class CloudProviderBean {
+
public Cloud getCloud() {
CloudProvider cloudProvider = CloudProviderFactory.getCloudProvider();
return cloudProvider.getCloud();
Index: NewsLetterStatisticCAO.java
===================================================================
RCS file:
/var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/cao/NewsLetterStatisticCAO.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -b -r1.11 -r1.12
--- NewsLetterStatisticCAO.java 14 Oct 2008 11:22:44 -0000 1.11
+++ NewsLetterStatisticCAO.java 27 Oct 2008 05:56:30 -0000 1.12
@@ -27,4 +27,6 @@
* @return List which sumLogs about StatisticResult
*/
public List<StatisticResult> getLogs();
+
+ public void setLocal();
}
Index: NewsletterCAO.java
===================================================================
RCS file:
/var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/cao/NewsletterCAO.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -b -r1.10 -r1.11
--- NewsletterCAO.java 23 Sep 2008 10:31:36 -0000 1.10
+++ NewsletterCAO.java 27 Oct 2008 05:56:30 -0000 1.11
@@ -22,4 +22,5 @@
public void processBouncesOfPublication(String publicationId, String
userId, String bounceContent);
+ public void setLocal();
}
Index: NewsletterPublicationCAO.java
===================================================================
RCS file:
/var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/cao/NewsletterPublicationCAO.java,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -b -r1.14 -r1.15
--- NewsletterPublicationCAO.java 23 Sep 2008 10:31:36 -0000 1.14
+++ NewsletterPublicationCAO.java 27 Oct 2008 05:56:30 -0000 1.15
@@ -31,4 +31,5 @@
public List<Publication> getPublications(String title, String subject,
String description, String intro, boolean paging);
+ public void setLocal();
}
Index: NewsletterSubscriptionCAO.java
===================================================================
RCS file:
/var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/cao/NewsletterSubscriptionCAO.java,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -b -r1.19 -r1.20
--- NewsletterSubscriptionCAO.java 24 Oct 2008 02:19:03 -0000 1.19
+++ NewsletterSubscriptionCAO.java 27 Oct 2008 05:56:30 -0000 1.20
@@ -55,6 +55,8 @@
public Set<Node> getTermsByScriptionRecord(int authenticationId);
+ public void setLocal();
+
public int countSubscription(int id);
}
_______________________________________________
Cvs mailing list
[email protected]
http://lists.mmbase.org/mailman/listinfo/cvs
