[xwiki-notifications] r6869 - xwiki-platform/xwiki-plugins/trunk/scheduler/src/main/java/com/xpn/xwiki/plugin/scheduler

[SVN]

Author: jvdrean
Date: 2008-01-16 19:16:41 +0100 (Wed, 16 Jan 2008)
New Revision: 6869

Modified:
   
xwiki-platform/xwiki-plugins/trunk/scheduler/src/main/java/com/xpn/xwiki/plugin/scheduler/SchedulerPlugin.java
Log:
XPWATCHLIST-7 : In virtual mode URLs in the emails always point to the same wiki

fixed

Modified: 
xwiki-platform/xwiki-plugins/trunk/scheduler/src/main/java/com/xpn/xwiki/plugin/scheduler/SchedulerPlugin.java
===================================================================
--- 
xwiki-platform/xwiki-plugins/trunk/scheduler/src/main/java/com/xpn/xwiki/plugin/scheduler/SchedulerPlugin.java
      2008-01-16 17:57:21 UTC (rev 6868)
+++ 
xwiki-platform/xwiki-plugins/trunk/scheduler/src/main/java/com/xpn/xwiki/plugin/scheduler/SchedulerPlugin.java
      2008-01-16 18:16:41 UTC (rev 6869)
@@ -40,8 +40,14 @@
 import org.quartz.Trigger;
 import org.quartz.impl.StdSchedulerFactory;
 
+import java.net.MalformedURLException;
+import java.net.URL;
 import java.text.ParseException;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Date;
+import java.util.Iterator;
+import java.util.List;
 
 /**
  * See [EMAIL PROTECTED] com.xpn.xwiki.plugin.scheduler.SchedulerPluginApi} 
for documentation.
@@ -199,8 +205,8 @@
             }
         }
 
-        //lets now build the stub context
-        XWikiContext scontext = new XWikiContext();
+        //lets now build the stub context        
+        XWikiContext scontext = (XWikiContext)context.clone();
         scontext.setWiki(context.getWiki());
 
         // We are sure the context request is a real servlet request
@@ -216,6 +222,13 @@
         scontext.setDatabase(cDb);
         scontext.setMainXWiki(context.getMainXWiki());
         scontext.setVirtual(context.isVirtual());
+        if (scontext.getURL() == null) {
+            try {
+                scontext.setURL(new URL("http://www.mystuburl.com/";));
+            } catch (Exception e) {
+                // the URL is well formed, I promise
+            }
+        }
 
         com.xpn.xwiki.web.XWikiURLFactory xurf = context.getURLFactory();
         if (xurf == null) {

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