Update of
/var/cvs/contributions/CMSContainer_Portlets/portlets-banner/src/java/com/finalist/portlets/banner/search
In directory
james.mmbase.org:/tmp/cvs-serv10702/portlets-banner/src/java/com/finalist/portlets/banner/search
Modified Files:
RemoteSelectorAction.java SearchBannerInitAction.java
SearchBannerAction.java
Log Message:
CMSC-1064 Reduce mmapps.CloudProvider usage
Cycle dependency
See also:
http://cvs.mmbase.org/viewcvs/contributions/CMSContainer_Portlets/portlets-banner/src/java/com/finalist/portlets/banner/search
See also: http://www.mmbase.org/jira/browse/CMSC-1064
Index: RemoteSelectorAction.java
===================================================================
RCS file:
/var/cvs/contributions/CMSContainer_Portlets/portlets-banner/src/java/com/finalist/portlets/banner/search/RemoteSelectorAction.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- RemoteSelectorAction.java 10 Sep 2008 12:36:43 -0000 1.4
+++ RemoteSelectorAction.java 10 Sep 2008 12:45:27 -0000 1.5
@@ -1,8 +1,11 @@
package com.finalist.portlets.banner.search;
+import net.sf.mmapps.modules.cloudprovider.CloudProviderFactory;
+
import org.mmbase.bridge.Cloud;
import com.finalist.cmsc.navigation.select.forms.SelectorAction;
+import com.finalist.cmsc.services.publish.Publish;
public class RemoteSelectorAction extends SelectorAction {
@@ -11,6 +14,14 @@
return getCloudForAnonymousUpdate(true);
}
+ public Cloud getCloudForAnonymousUpdate(boolean isRemote) {
+ Cloud cloud = CloudProviderFactory.getCloudProvider().getCloud();
+ if (isRemote) {
+ return Publish.getRemoteCloud(cloud);
+ }
+ return cloud;
+ }
+
@Override
public String getRequiredRankStr() {
Index: SearchBannerInitAction.java
===================================================================
RCS file:
/var/cvs/contributions/CMSContainer_Portlets/portlets-banner/src/java/com/finalist/portlets/banner/search/SearchBannerInitAction.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- SearchBannerInitAction.java 10 Sep 2008 12:36:43 -0000 1.5
+++ SearchBannerInitAction.java 10 Sep 2008 12:45:27 -0000 1.6
@@ -5,12 +5,15 @@
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
+import net.sf.mmapps.modules.cloudprovider.CloudProviderFactory;
+
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.struts.action.*;
import org.mmbase.bridge.*;
import org.mmbase.bridge.util.SearchUtil;
+import com.finalist.cmsc.services.publish.Publish;
import com.finalist.cmsc.struts.MMBaseAction;
/**
@@ -47,6 +50,13 @@
return mapping.findForward("success");
}
+ public Cloud getCloudForAnonymousUpdate(boolean isRemote) {
+ Cloud cloud = CloudProviderFactory.getCloudProvider().getCloud();
+ if (isRemote) {
+ return Publish.getRemoteCloud(cloud);
+ }
+ return cloud;
+ }
@Override
public String getRequiredRankStr() {
Index: SearchBannerAction.java
===================================================================
RCS file:
/var/cvs/contributions/CMSContainer_Portlets/portlets-banner/src/java/com/finalist/portlets/banner/search/SearchBannerAction.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- SearchBannerAction.java 10 Sep 2008 12:36:43 -0000 1.6
+++ SearchBannerAction.java 10 Sep 2008 12:45:27 -0000 1.7
@@ -5,6 +5,8 @@
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
+import net.sf.mmapps.modules.cloudprovider.CloudProviderFactory;
+
import org.apache.commons.lang.StringUtils;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
@@ -15,6 +17,7 @@
import org.mmbase.storage.search.*;
import com.finalist.cmsc.mmbase.PropertiesUtil;
+import com.finalist.cmsc.services.publish.Publish;
import com.finalist.cmsc.struts.MMBaseAction;
/**
@@ -95,6 +98,14 @@
return mapping.findForward(action);
}
+ public Cloud getCloudForAnonymousUpdate(boolean isRemote) {
+ Cloud cloud = CloudProviderFactory.getCloudProvider().getCloud();
+ if (isRemote) {
+ return Publish.getRemoteCloud(cloud);
+ }
+ return cloud;
+ }
+
@Override
public String getRequiredRankStr() {
_______________________________________________
Cvs mailing list
[email protected]
http://lists.mmbase.org/mailman/listinfo/cvs