Update of
/var/cvs/contributions/CMSContainer_Portlets/portlets-guestbook/src/java/com/finalist/portlets/guestbook/search
In directory
james.mmbase.org:/tmp/cvs-serv10364/portlets-guestbook/src/java/com/finalist/portlets/guestbook/search
Modified Files:
DeleteGuestMessageAction.java SearchGuestBookAction.java
Log Message:
CMSC-1064 Reduce mmapps.CloudProvider usage
See also:
http://cvs.mmbase.org/viewcvs/contributions/CMSContainer_Portlets/portlets-guestbook/src/java/com/finalist/portlets/guestbook/search
See also: http://www.mmbase.org/jira/browse/CMSC-1064
Index: DeleteGuestMessageAction.java
===================================================================
RCS file:
/var/cvs/contributions/CMSContainer_Portlets/portlets-guestbook/src/java/com/finalist/portlets/guestbook/search/DeleteGuestMessageAction.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- DeleteGuestMessageAction.java 1 Aug 2008 14:46:29 -0000 1.5
+++ DeleteGuestMessageAction.java 10 Sep 2008 12:36:43 -0000 1.6
@@ -3,9 +3,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.struts.action.*;
import org.mmbase.bridge.Cloud;
import org.mmbase.util.logging.Logger;
@@ -13,7 +10,6 @@
import com.finalist.cmsc.resources.forms.DeleteSecondaryContentAction;
import com.finalist.cmsc.resources.forms.DeleteSecondaryContentForm;
-import com.finalist.cmsc.services.publish.Publish;
public class DeleteGuestMessageAction extends DeleteSecondaryContentAction {
@@ -29,7 +25,7 @@
String number = deleteForm.getObjectnumber();
log.debug("deleting secondary content: " + number);
boolean isRemote =
Boolean.parseBoolean(request.getParameter("isRemote"));
- Cloud remoteCloud = getCloud(isRemote);
+ Cloud remoteCloud = getCloudForAnonymousUpdate(isRemote);
remoteCloud.getNode(number).delete(true);
String returnurl = deleteForm.getReturnurl();
@@ -38,18 +34,6 @@
}
-
- 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;
- }
-
-
@Override
public String getRequiredRankStr() {
return BASIC_USER;
Index: SearchGuestBookAction.java
===================================================================
RCS file:
/var/cvs/contributions/CMSContainer_Portlets/portlets-guestbook/src/java/com/finalist/portlets/guestbook/search/SearchGuestBookAction.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- SearchGuestBookAction.java 1 Aug 2008 14:46:29 -0000 1.6
+++ SearchGuestBookAction.java 10 Sep 2008 12:36:43 -0000 1.7
@@ -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 com.finalist.cmsc.mmbase.PropertiesUtil;
import com.finalist.cmsc.resources.forms.QueryStringComposer;
-import com.finalist.cmsc.services.publish.Publish;
import com.finalist.cmsc.struts.MMBaseAction;
/**
@@ -45,7 +41,7 @@
List<Map<String, Object>> rows = new ArrayList<Map<String, Object>>();
QueryStringComposer queryStringComposer = new QueryStringComposer();
GuestBookForm guestBookForm = (GuestBookForm) form;
- Cloud cloud = getCloud(guestBookForm.isRemote());
+ Cloud cloud = getCloudForAnonymousUpdate(guestBookForm.isRemote());
int count = 0;
int offset = 0;
if (guestBookForm.getOffset() != null &&
guestBookForm.getOffset().matches("\\d+")) {
@@ -136,17 +132,6 @@
}
- 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 String getParameterAsString(HttpServletRequest request, String
name, String defaultValue) {
String value = request.getParameter(name);
if (StringUtils.isBlank(value)) {
_______________________________________________
Cvs mailing list
[email protected]
http://lists.mmbase.org/mailman/listinfo/cvs
