Update of
/var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/cao
In directory
james.mmbase.org:/tmp/cvs-serv12453/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.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- AbstractCAO.java 27 Oct 2008 05:56:30 -0000 1.3
+++ AbstractCAO.java 28 Oct 2008 11:13:36 -0000 1.4
@@ -1,27 +1,18 @@
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() {
- if(isLocal || ServerUtil.isSingle()) {
- return cloud;
- }
- else {
- return Publish.getRemoteCloud(cloud);
- }
- }
- public void setLocal() {
- isLocal = true;
+ CloudProvider provider = CloudProviderFactory.getCloudProvider();
+ return provider.getCloud();
}
}
Index: CloudProviderBean.java
===================================================================
RCS file:
/var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/cao/CloudProviderBean.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- CloudProviderBean.java 27 Oct 2008 05:56:30 -0000 1.3
+++ CloudProviderBean.java 28 Oct 2008 11:13:36 -0000 1.4
@@ -1,12 +1,10 @@
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 net.sf.mmapps.modules.cloudprovider.CloudProviderFactory;
+import net.sf.mmapps.modules.cloudprovider.CloudProvider;
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.12
retrieving revision 1.13
diff -u -b -r1.12 -r1.13
--- NewsLetterStatisticCAO.java 27 Oct 2008 05:56:30 -0000 1.12
+++ NewsLetterStatisticCAO.java 28 Oct 2008 11:13:36 -0000 1.13
@@ -28,5 +28,4 @@
*/
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.11
retrieving revision 1.12
diff -u -b -r1.11 -r1.12
--- NewsletterCAO.java 27 Oct 2008 05:56:30 -0000 1.11
+++ NewsletterCAO.java 28 Oct 2008 11:13:36 -0000 1.12
@@ -22,5 +22,4 @@
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.15
retrieving revision 1.16
diff -u -b -r1.15 -r1.16
--- NewsletterPublicationCAO.java 27 Oct 2008 05:56:30 -0000 1.15
+++ NewsletterPublicationCAO.java 28 Oct 2008 11:13:36 -0000 1.16
@@ -31,5 +31,4 @@
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.20
retrieving revision 1.21
diff -u -b -r1.20 -r1.21
--- NewsletterSubscriptionCAO.java 27 Oct 2008 05:56:30 -0000 1.20
+++ NewsletterSubscriptionCAO.java 28 Oct 2008 11:13:36 -0000 1.21
@@ -55,8 +55,6 @@
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
