Update of
/var/cvs/contributions/CMSContainer_Portlets/portlets-banner/src/java/com/finalist/portlets/banner/search
In directory
james.mmbase.org:/tmp/cvs-serv10364/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
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.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- RemoteSelectorAction.java 1 Aug 2008 14:46:29 -0000 1.3
+++ RemoteSelectorAction.java 10 Sep 2008 12:36:43 -0000 1.4
@@ -1,20 +1,14 @@
package com.finalist.portlets.banner.search;
-import net.sf.mmapps.modules.cloudprovider.CloudProvider;
-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 {
@Override
public Cloud getCloud() {
- CloudProvider cloudProvider = CloudProviderFactory.getCloudProvider();
- Cloud cloud = cloudProvider.getCloud();
- return Publish.getRemoteCloud(cloud);
+ return getCloudForAnonymousUpdate(true);
}
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.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- SearchBannerInitAction.java 1 Aug 2008 14:46:29 -0000 1.4
+++ SearchBannerInitAction.java 10 Sep 2008 12:36:43 -0000 1.5
@@ -5,16 +5,12 @@
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
-import net.sf.mmapps.modules.cloudprovider.CloudProvider;
-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;
/**
@@ -37,7 +33,7 @@
HttpServletResponse response, Cloud cld) throws Exception {
BannerForm bannerForm = (BannerForm) form;
- Cloud cloud = getCloud(bannerForm.isRemote());
+ Cloud cloud = getCloudForAnonymousUpdate(bannerForm.isRemote());
NodeManager manager = cloud.getNodeManager("customer");
NodeQuery query = manager.createQuery();
@@ -57,18 +53,6 @@
return null;
}
-
- private Cloud getCloud(boolean isRemote) {
- CloudProvider cloudProvider = CloudProviderFactory.getCloudProvider();
- Cloud cloud = cloudProvider.getCloud();
- log.debug("Using remote cloud?: " + isRemote);
- if (isRemote) {
- return Publish.getRemoteCloud(cloud);
- }
- return cloud;
- }
-
-
private List<Map<String, Object>> populateCustomersRows(NodeList nodes) {
List<Map<String, Object>> rows = new ArrayList<Map<String, Object>>();
for (NodeIterator iter = nodes.nodeIterator(); iter.hasNext();) {
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.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- SearchBannerAction.java 1 Aug 2008 14:46:29 -0000 1.5
+++ SearchBannerAction.java 10 Sep 2008 12:36:43 -0000 1.6
@@ -5,9 +5,6 @@
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
-import net.sf.mmapps.modules.cloudprovider.CloudProvider;
-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;
@@ -18,7 +15,6 @@
import org.mmbase.storage.search.*;
import com.finalist.cmsc.mmbase.PropertiesUtil;
-import com.finalist.cmsc.services.publish.Publish;
import com.finalist.cmsc.struts.MMBaseAction;
/**
@@ -47,7 +43,7 @@
BannerForm bannerForm = (BannerForm) form;
log.debug("Searching on remote cloud? " + bannerForm.isRemote());
- Cloud cloud = getCloud(bannerForm.isRemote());
+ Cloud cloud = getCloudForAnonymousUpdate(bannerForm.isRemote());
int count = 0;
int offset = 0;
@@ -155,17 +151,6 @@
return attachments != null && attachments.size() > 0;
}
-
- private Cloud getCloud(boolean isRemote) {
- CloudProvider cloudProvider = CloudProviderFactory.getCloudProvider();
- Cloud cloud = cloudProvider.getCloud();
- log.debug("Using remote cloud?: " + isRemote);
- if (isRemote) {
- return Publish.getRemoteCloud(cloud);
- }
- return cloud;
- }
-
private void addConstraint(Query query, NodeManager manager, Step step,
String fieldName, String value) {
if (StringUtils.isBlank(value)) {
return;
_______________________________________________
Cvs mailing list
[email protected]
http://lists.mmbase.org/mailman/listinfo/cvs
