Update of
/var/cvs/contributions/CMSContainer_Portlets/portlets-emailalert/src/java/com/finalist/emailalert
In directory
james.mmbase.org:/tmp/cvs-serv10702/portlets-emailalert/src/java/com/finalist/emailalert
Modified Files:
UnsubscribeAction.java ConfirmAction.java
Log Message:
CMSC-1064 Reduce mmapps.CloudProvider usage
Cycle dependency
See also:
http://cvs.mmbase.org/viewcvs/contributions/CMSContainer_Portlets/portlets-emailalert/src/java/com/finalist/emailalert
See also: http://www.mmbase.org/jira/browse/CMSC-1064
Index: UnsubscribeAction.java
===================================================================
RCS file:
/var/cvs/contributions/CMSContainer_Portlets/portlets-emailalert/src/java/com/finalist/emailalert/UnsubscribeAction.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- UnsubscribeAction.java 10 Sep 2008 12:36:43 -0000 1.4
+++ UnsubscribeAction.java 10 Sep 2008 12:45:27 -0000 1.5
@@ -3,6 +3,8 @@
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
+import net.sf.mmapps.modules.cloudprovider.CloudProviderFactory;
+
import org.apache.struts.action.*;
import org.mmbase.bridge.*;
import org.mmbase.bridge.util.SearchUtil;
@@ -11,7 +13,7 @@
import org.mmbase.util.logging.Logger;
import org.mmbase.util.logging.Logging;
-import com.finalist.cmsc.struts.MMBaseAction;
+import com.finalist.cmsc.services.publish.Publish;
import com.finalist.cmsc.util.HttpUtil;
public class UnsubscribeAction extends Action {
@@ -25,7 +27,7 @@
String pageNumber = httpServletRequest.getParameter("p");
String emailAddress = httpServletRequest.getParameter("s");
String returnUrl = null;
- Cloud cloud = MMBaseAction.getCloudForAnonymousUpdate(false);
+ Cloud cloud = getCloudForAnonymousUpdate(false);
if (emailAddress != null && pageNumber != null) {
Node subscriberNode = null;
try {
@@ -62,6 +64,14 @@
return null;
}
+ public Cloud getCloudForAnonymousUpdate(boolean isRemote) {
+ Cloud cloud = CloudProviderFactory.getCloudProvider().getCloud();
+ if (isRemote) {
+ return Publish.getRemoteCloud(cloud);
+ }
+ return cloud;
+ }
+
private void unsubscribePage(Cloud cloud, Node subscriberNode, Node
pageNode) {
NodeManager relationNodeManager = cloud.getNodeManager("subscriberel");
Index: ConfirmAction.java
===================================================================
RCS file:
/var/cvs/contributions/CMSContainer_Portlets/portlets-emailalert/src/java/com/finalist/emailalert/ConfirmAction.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- ConfirmAction.java 10 Sep 2008 12:36:43 -0000 1.4
+++ ConfirmAction.java 10 Sep 2008 12:45:27 -0000 1.5
@@ -3,13 +3,15 @@
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
+import net.sf.mmapps.modules.cloudprovider.CloudProviderFactory;
+
import org.apache.struts.action.*;
import org.mmbase.bridge.*;
import org.mmbase.bridge.util.SearchUtil;
import org.mmbase.util.logging.Logger;
import org.mmbase.util.logging.Logging;
-import com.finalist.cmsc.struts.MMBaseAction;
+import com.finalist.cmsc.services.publish.Publish;
import com.finalist.cmsc.util.HttpUtil;
public class ConfirmAction extends Action {
@@ -23,7 +25,7 @@
String emailAddress = httpServletRequest.getParameter("s");
String returnUrl = null;
- Cloud cloud = MMBaseAction.getCloudForAnonymousUpdate(false);
+ Cloud cloud = getCloudForAnonymousUpdate(false);
if (emailAddress != null) {
Node subscriberNode = null;
try {
@@ -50,6 +52,13 @@
return null;
}
+ public Cloud getCloudForAnonymousUpdate(boolean isRemote) {
+ Cloud cloud = CloudProviderFactory.getCloudProvider().getCloud();
+ if (isRemote) {
+ return Publish.getRemoteCloud(cloud);
+ }
+ return cloud;
+ }
private String getConfirmationLink(Cloud cloud) {
String link = null;
_______________________________________________
Cvs mailing list
[email protected]
http://lists.mmbase.org/mailman/listinfo/cvs
