Update of
/var/cvs/contributions/CMSContainer_Modules/directreaction/src/java/com/finalist/cmsc/resources/forms
In directory
james.mmbase.org:/tmp/cvs-serv16268/directreaction/src/java/com/finalist/cmsc/resources/forms
Modified Files:
ReactionAction.java DeleteReactionAction.java
Log Message:
CMSC-1040 Move some sources from net.sf.mmapps.remotepublishing to cmsc cvs
Changed source to depend on servicemanagement instead of publish-remote
See also:
http://cvs.mmbase.org/viewcvs/contributions/CMSContainer_Modules/directreaction/src/java/com/finalist/cmsc/resources/forms
See also: http://www.mmbase.org/jira/browse/CMSC-1040
Index: ReactionAction.java
===================================================================
RCS file:
/var/cvs/contributions/CMSContainer_Modules/directreaction/src/java/com/finalist/cmsc/resources/forms/ReactionAction.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- ReactionAction.java 12 Dec 2007 13:43:17 -0000 1.4
+++ ReactionAction.java 1 Aug 2008 14:47:49 -0000 1.5
@@ -1,8 +1,6 @@
package com.finalist.cmsc.resources.forms;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.Map;
+import java.util.*;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
@@ -10,19 +8,14 @@
import net.sf.mmapps.modules.cloudprovider.CloudProvider;
import net.sf.mmapps.modules.cloudprovider.CloudProviderFactory;
-import org.apache.struts.action.ActionForm;
-import org.apache.struts.action.ActionForward;
-import org.apache.struts.action.ActionMapping;
-import org.mmbase.bridge.Cloud;
-import org.mmbase.bridge.Node;
-import org.mmbase.bridge.NodeList;
-import org.mmbase.bridge.NodeManager;
-import org.mmbase.bridge.NodeQuery;
-import org.mmbase.remotepublishing.CloudManager;
+import org.apache.struts.action.*;
+import org.mmbase.bridge.*;
import org.mmbase.storage.search.RelationStep;
import org.mmbase.storage.search.Step;
-import org.mmbase.util.logging.Logging;
import org.mmbase.util.logging.Logger;
+import org.mmbase.util.logging.Logging;
+
+import com.finalist.cmsc.services.publish.Publish;
public class ReactionAction extends SearchAction {
@@ -68,7 +61,7 @@
* running in single-war-file mode.
*/
try{
- Cloud remoteCloud = CloudManager.getCloud(cloud, "live.server");
+ Cloud remoteCloud = Publish.getRemoteCloud(cloud);
return remoteCloud; //In case there is a live.server
} catch(NoClassDefFoundError e){
return cloud; //In case there is only a staging
(single) server
@@ -76,11 +69,13 @@
}
+ @Override
public String getRequiredRankStr() {
return null;
}
+ @Override
protected void addConstraints(SearchForm searchForm, NodeManager
nodeManager,
QueryStringComposer queryStringComposer, NodeQuery query) {
ReactionForm form = (ReactionForm) searchForm;
Index: DeleteReactionAction.java
===================================================================
RCS file:
/var/cvs/contributions/CMSContainer_Modules/directreaction/src/java/com/finalist/cmsc/resources/forms/DeleteReactionAction.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- DeleteReactionAction.java 26 Nov 2007 11:42:02 -0000 1.3
+++ DeleteReactionAction.java 1 Aug 2008 14:47:49 -0000 1.4
@@ -3,14 +3,12 @@
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
-import org.apache.struts.action.ActionForm;
-import org.apache.struts.action.ActionForward;
-import org.apache.struts.action.ActionMapping;
+import org.apache.struts.action.*;
import org.mmbase.bridge.Cloud;
-import org.mmbase.remotepublishing.CloudManager;
import org.mmbase.util.logging.Logger;
import org.mmbase.util.logging.Logging;
+import com.finalist.cmsc.services.publish.Publish;
import com.finalist.cmsc.struts.MMBaseAction;
public class DeleteReactionAction extends DeleteSecondaryContentAction {
@@ -27,7 +25,7 @@
String number = deleteForm.getObjectnumber();
if
(MMBaseAction.ADMINISTRATOR.equals(cloud.getUser().getRank().toString())) {
log.debug("deleting secondary content: " + number);
- Cloud remoteCloud = getRemoteCloud(cloud);
+ Cloud remoteCloud = Publish.getRemoteCloud(cloud);
remoteCloud.getNode(number).delete(true);
}
else {
@@ -40,13 +38,7 @@
}
-
- public Cloud getRemoteCloud(Cloud cloud) {
- Cloud remoteCloud = CloudManager.getCloud(cloud, "live.server");
- return remoteCloud;
- }
-
-
+ @Override
public String getRequiredRankStr() {
return ADMINISTRATOR;
}
_______________________________________________
Cvs mailing list
[email protected]
http://lists.mmbase.org/mailman/listinfo/cvs
