r936 - in xwiki/trunk: . lib src/main/java/com/xpn/xwiki src/main/java/com/xpn/xwiki/render/groovy src/main/java/com/xpn/xwiki/util src/main/web/templates

[Ludovic Dubost]

Author: ludovic
Date: 2006-02-20 00:55:33 +0100 (Mon, 20 Feb 2006)
New Revision: 936

Added:
   xwiki/trunk/lib/groovy-all-1.0-jsr-04.jar
Removed:
   xwiki/trunk/lib/groovy-all-1.0-jsr-01.jar
Modified:
   xwiki/trunk/build.xml
   xwiki/trunk/src/main/java/com/xpn/xwiki/XWiki.java
   xwiki/trunk/src/main/java/com/xpn/xwiki/render/groovy/GroovyTemplateEngine.java
   xwiki/trunk/src/main/java/com/xpn/xwiki/util/Util.java
   xwiki/trunk/src/main/web/templates/textarea_text.vm
Log:
Updated to Groovy jsr04
Fix GroovyTemplateEngine.java for Groovy JSR 04
Support multiple users in xwiki.sendMail api using comma separated lists
Made noaccents function static


Modified: xwiki/trunk/build.xml
===================================================================
--- xwiki/trunk/build.xml	2006-02-16 08:56:48 UTC (rev 935)
+++ xwiki/trunk/build.xml	2006-02-19 23:55:33 UTC (rev 936)
@@ -88,7 +88,7 @@
      	radeox.jar,
      	portlet.jar,
      	xmlrpc-1.2.jar,
-     	groovy-all-1.0-jsr-01.jar,
+     	groovy-all-1.0-jsr-04.jar,
      	xalan-2.6.0.jar,xerces.jar-2.4.0,xml-apis-2.0.2,jimi.jar,avalon-framework-4.1.5.jar,fop-0.20.5.jar,jtidy.jar,
     	batik-all-1.6.jar,
     	ldap.jar,

Deleted: xwiki/trunk/lib/groovy-all-1.0-jsr-01.jar
===================================================================
(Binary files differ)

Added: xwiki/trunk/lib/groovy-all-1.0-jsr-04.jar
===================================================================
(Binary files differ)


Property changes on: xwiki/trunk/lib/groovy-all-1.0-jsr-04.jar
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Modified: xwiki/trunk/src/main/java/com/xpn/xwiki/XWiki.java
===================================================================
--- xwiki/trunk/src/main/java/com/xpn/xwiki/XWiki.java	2006-02-16 08:56:48 UTC (rev 935)
+++ xwiki/trunk/src/main/java/com/xpn/xwiki/XWiki.java	2006-02-19 23:55:33 UTC (rev 936)
@@ -1858,7 +1858,7 @@
     }
 
     public void sendMessage(String sender, String recipient, String message, XWikiContext context) throws XWikiException {
-        String[] recip = {recipient};
+        String[] recip = recipient.split(",");
         sendMessage(sender, recip, message, context);
     }
 

Modified: xwiki/trunk/src/main/java/com/xpn/xwiki/render/groovy/GroovyTemplateEngine.java
===================================================================
--- xwiki/trunk/src/main/java/com/xpn/xwiki/render/groovy/GroovyTemplateEngine.java	2006-02-16 08:56:48 UTC (rev 935)
+++ xwiki/trunk/src/main/java/com/xpn/xwiki/render/groovy/GroovyTemplateEngine.java	2006-02-19 23:55:33 UTC (rev 936)
@@ -176,7 +176,11 @@
                if (c == '\"') {
                    sw.write('\\');
                }
-               sw.write(c);
+               if ((c!='\r')&&(c!='\n'))
+                 sw.write(c);
+               else if (c=='\n') {
+                 sw.write("\");out.println();out.print(\"");
+               }
            }
            endScript(sw);
            String result = sw.toString();
@@ -190,7 +194,7 @@
        }
 
        private void endScript(StringWriter sw) {
-           sw.write("\");\n");
+           sw.write("\");");
        }
 
        /**

Modified: xwiki/trunk/src/main/java/com/xpn/xwiki/util/Util.java
===================================================================
--- xwiki/trunk/src/main/java/com/xpn/xwiki/util/Util.java	2006-02-16 08:56:48 UTC (rev 935)
+++ xwiki/trunk/src/main/java/com/xpn/xwiki/util/Util.java	2006-02-19 23:55:33 UTC (rev 936)
@@ -209,7 +209,7 @@
         return ArrayUtils.contains(sarray, name);
     }
 
-    public String noaccents(String text) {
+    public static String noaccents(String text) {
         String temp = text;
         String orig = "àâäéèêëîïôöùûü";
         String targ = "aaaeeeeiioouuu";

Modified: xwiki/trunk/src/main/web/templates/textarea_text.vm
===================================================================
--- xwiki/trunk/src/main/web/templates/textarea_text.vm	2006-02-16 08:56:48 UTC (rev 935)
+++ xwiki/trunk/src/main/web/templates/textarea_text.vm	2006-02-19 23:55:33 UTC (rev 936)
@@ -1 +1 @@
-Text editor
\ No newline at end of file
+ <!-- Text Editor -->
\ No newline at end of file