Author: jvdrean
Date: 2007-10-26 20:09:07 +0200 (Fri, 26 Oct 2007)
New Revision: 5527
Modified:
xwiki-platform/xwiki-plugins/trunk/mailsender/src/main/java/com/xpn/xwiki/plugin/mailsender/MailSenderPlugin.java
xwiki-platform/xwiki-plugins/trunk/watchlist/src/main/java/com/xpn/xwiki/plugin/watchlist/WatchListJob.java
Log:
Context related fixes, again :)
Modified:
xwiki-platform/xwiki-plugins/trunk/mailsender/src/main/java/com/xpn/xwiki/plugin/mailsender/MailSenderPlugin.java
===================================================================
---
xwiki-platform/xwiki-plugins/trunk/mailsender/src/main/java/com/xpn/xwiki/plugin/mailsender/MailSenderPlugin.java
2007-10-26 16:50:54 UTC (rev 5526)
+++
xwiki-platform/xwiki-plugins/trunk/mailsender/src/main/java/com/xpn/xwiki/plugin/mailsender/MailSenderPlugin.java
2007-10-26 18:09:07 UTC (rev 5527)
@@ -445,13 +445,8 @@
vcontext.put("to.name", toAddr);
vcontext.put("to.address", toAddr);
vcontext.put("to.bcc", bccAddr);
- vcontext.put("bounce", fromAddr);
+ vcontext.put("bounce", fromAddr);
- com.xpn.xwiki.api.XWiki xwikiApi = new
com.xpn.xwiki.api.XWiki(context.getWiki(), context);
- vcontext.put("xwiki", xwikiApi);
- com.xpn.xwiki.api.Context contextApi = new
com.xpn.xwiki.api.Context(context);
- vcontext.put("context", contextApi);
-
return vcontext;
}
Modified:
xwiki-platform/xwiki-plugins/trunk/watchlist/src/main/java/com/xpn/xwiki/plugin/watchlist/WatchListJob.java
===================================================================
---
xwiki-platform/xwiki-plugins/trunk/watchlist/src/main/java/com/xpn/xwiki/plugin/watchlist/WatchListJob.java
2007-10-26 16:50:54 UTC (rev 5526)
+++
xwiki-platform/xwiki-plugins/trunk/watchlist/src/main/java/com/xpn/xwiki/plugin/watchlist/WatchListJob.java
2007-10-26 18:09:07 UTC (rev 5527)
@@ -20,17 +20,14 @@
package com.xpn.xwiki.plugin.watchlist;
-import com.xpn.xwiki.XWiki;
-import com.xpn.xwiki.XWikiContext;
import com.xpn.xwiki.XWikiException;
import com.xpn.xwiki.api.Document;
import com.xpn.xwiki.api.Object;
-import com.xpn.xwiki.doc.XWikiDocument;
import com.xpn.xwiki.objects.BaseObject;
import com.xpn.xwiki.plugin.mailsender.MailSenderPlugin;
import com.xpn.xwiki.plugin.mailsender.MailSenderPluginApi;
-import com.xpn.xwiki.user.api.XWikiRightService;
import org.apache.velocity.VelocityContext;
+import org.hibernate.engine.Collections;
import org.quartz.Job;
import org.quartz.JobDataMap;
import org.quartz.JobExecutionContext;
@@ -82,18 +79,9 @@
public void execute(JobExecutionContext context) throws
JobExecutionException
{
// Set required objects
- init(context);
+ init(context);
try {
- String user = xcontext.getUser();
- Document admin = xwiki.getDocument("XWiki.Admin");
- Object watchlist =
admin.getObject(WatchListPlugin.WATCHLIST_CLASS);
- String watchedPages = (String)watchlist.display("pages", "view");
- com.xpn.xwiki.web.XWikiURLFactory factory =
xcontext.getURLFactory();
- String externalURL = admin.getExternalURL();
- } catch (XWikiException e) {}
-
- try {
// Retreive notification subscribers
Collection subscribers = retrieveNotificationSubscribers();
if (subscribers != null && subscribers.size() > 0) {
@@ -139,7 +127,7 @@
*/
private List filter(List updatedDocuments,
Object notificationCriteria, String subscriber) throws XWikiException
- {
+ {
String spaceCriterion = (String)notificationCriteria.display("spaces",
"view");
String documentCriterion =
(String)notificationCriteria.display("documents", "view");
String query = (String)notificationCriteria.display("query", "view");
@@ -147,10 +135,11 @@
List watchedDocuments = new ArrayList();
if (spaceCriterion.length() == 0 && documentCriterion.length() == 0
&& query.length() == 0) {
- Iterator docIt = updatedDocuments.iterator();
+ /* Iterator docIt = updatedDocuments.iterator();
while (docIt.hasNext()) {
watchedDocuments.add(docIt.next());
- }
+ } */
+ return new ArrayList();
}
List filteredDocumentList = new ArrayList();
_______________________________________________
notifications mailing list
[email protected]
http://lists.xwiki.org/mailman/listinfo/notifications
