Update of
/var/cvs/contributions/CMSContainer_Modules/egemmail/src/java/com/finalist/cmsc/egemmail/forms
In directory
james.mmbase.org:/tmp/cvs-serv29259/egemmail/src/java/com/finalist/cmsc/egemmail/forms
Modified Files:
EgemExportAction.java
Log Message:
CMSC-779 - add remote methods for number, node and urls
See also:
http://cvs.mmbase.org/viewcvs/contributions/CMSContainer_Modules/egemmail/src/java/com/finalist/cmsc/egemmail/forms
See also: http://www.mmbase.org/jira/browse/CMSC-779
Index: EgemExportAction.java
===================================================================
RCS file:
/var/cvs/contributions/CMSContainer_Modules/egemmail/src/java/com/finalist/cmsc/egemmail/forms/EgemExportAction.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -b -r1.9 -r1.10
--- EgemExportAction.java 28 Nov 2007 10:33:54 -0000 1.9
+++ EgemExportAction.java 25 Feb 2008 14:18:12 -0000 1.10
@@ -30,7 +30,6 @@
private static final String EGEMMAIL_ADMIN_USER = "egemmail.admin.user";
private static final String EGEMMAIL_ADMIN_PASSWORD =
"egemmail.admin.password";
// private static final String EGEMMAIL_BEHEER_URL = "egemmail.beheer.url";
- private static final String EGEMMAIL_LIVEPATH = "egemmail.livepath";
private static Logger log =
Logging.getLoggerInstance(EgemExportAction.class.getName());
@@ -76,7 +75,7 @@
Map<String, Object> postParams = new HashMap<String, Object>();
Node node = cloud.getNode(entry.getKey());
- String liveUrl = getContentUrl(node);
+ String liveUrl = Publish.getRemoteContentUrl(node);
if (liveUrl != null) {
postParams.put("url", liveUrl);
@@ -155,19 +154,6 @@
}
}
-
- private String getContentUrl(Node node) {
- if (Publish.isPublished(node) && Search.hasContentPages(node)) {
- int remoteNumber = Publish.getLiveNumber(node);
- String livePath = PropertiesUtil.getProperty(EGEMMAIL_LIVEPATH);
- String appPath = "/content/" + remoteNumber;
-
- return livePath + appPath;
- }
- return null;
- }
-
-
@SuppressWarnings("unchecked")
protected void mergeState(EgemExportForm form, HttpServletRequest request) {
Set<Integer> newlySelectedNodes = new HashSet<Integer>();
_______________________________________________
Cvs mailing list
[email protected]
http://lists.mmbase.org/mailman/listinfo/cvs
