[xwiki-notifications] r5505 - in xwiki-platform/xwiki-plugins/trunk: mailsender/src/main/java/com/xpn/xwiki/plugin/mailsender watchlist/src/main/java/com/xpn/xwiki/plugin/watchlist

[SVN]

Author: jvdrean
Date: 2007-10-26 12:30:56 +0200 (Fri, 26 Oct 2007)
New Revision: 5505

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 used in sendMailFromTemplate is no longer set in MailSenderPlugin

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-25 22:35:25 UTC (rev 5504)
+++ 
xwiki-platform/xwiki-plugins/trunk/mailsender/src/main/java/com/xpn/xwiki/plugin/mailsender/MailSenderPlugin.java
   2007-10-26 10:30:56 UTC (rev 5505)
@@ -448,8 +448,8 @@
         vcontext.put("to.bcc", bccAddr);
         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.XWiki xwikiApi = new 
com.xpn.xwiki.api.XWiki(context.getWiki(), context);
+        // vcontext.put("xwiki", xwikiApi);
 
         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-25 22:35:25 UTC (rev 5504)
+++ 
xwiki-platform/xwiki-plugins/trunk/watchlist/src/main/java/com/xpn/xwiki/plugin/watchlist/WatchListJob.java
 2007-10-26 10:30:56 UTC (rev 5505)
@@ -85,6 +85,15 @@
         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) {
@@ -262,7 +271,8 @@
         VelocityContext vcontext = new VelocityContext();
         vcontext.put("pseudo", userObj.display("first_name", "view"));
         vcontext.put("documents", updatedDocuments);
-        vcontext.put("interval", new Integer(interval));
+        vcontext.put("interval", new Integer(interval));
+        vcontext.put("xwiki", xwiki);
 
         // Get wiki's default language (default en)
         String language = xwiki.getXWikiPreference("default_language", "en");

_______________________________________________
notifications mailing list
notifications@xwiki.org
http://lists.xwiki.org/mailman/listinfo/notifications