From do-not-reply at jboss.org Fri Jan 29 07:49:34 2010
Content-Type: multipart/mixed; boundary="===============8239140513028920204=="
MIME-Version: 1.0
From: do-not-reply at jboss.org
To: gatein-commits at lists.jboss.org
Subject: [gatein-commits] gatein SVN: r1470 - in
 portal/trunk/component/scripting/src: test/java/org/exoplatform/groovyscript
 and 1 other directory.
Date: Fri, 29 Jan 2010 07:49:34 -0500
Message-ID: <201001291249.o0TCnYLq004884@svn01.web.mwc.hst.phx2.redhat.com>

--===============8239140513028920204==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: trong.tran
Date: 2010-01-29 07:49:33 -0500 (Fri, 29 Jan 2010)
New Revision: 1470

Added:
   portal/trunk/component/scripting/src/test/java/org/exoplatform/groovyscr=
ipt/TestGroovyTemplateEngine.java
Modified:
   portal/trunk/component/scripting/src/main/java/org/exoplatform/groovyscr=
ipt/GroovyTemplate.java
Log:
GTNPORTAL-553 Correct the name of template file if having "-" sign included

Modified: portal/trunk/component/scripting/src/main/java/org/exoplatform/gr=
oovyscript/GroovyTemplate.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- portal/trunk/component/scripting/src/main/java/org/exoplatform/groovysc=
ript/GroovyTemplate.java	2010-01-29 12:27:28 UTC (rev 1469)
+++ portal/trunk/component/scripting/src/main/java/org/exoplatform/groovysc=
ript/GroovyTemplate.java	2010-01-29 12:49:33 UTC (rev 1470)
@@ -70,6 +70,8 @@
       if (templateName =3D=3D null)
       {
          templateName =3D "fic";
+      } else {
+         templateName =3D templateName.replaceAll("-", "_");
       }
 =

       //

Added: portal/trunk/component/scripting/src/test/java/org/exoplatform/groov=
yscript/TestGroovyTemplateEngine.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- portal/trunk/component/scripting/src/test/java/org/exoplatform/groovysc=
ript/TestGroovyTemplateEngine.java	                        (rev 0)
+++ portal/trunk/component/scripting/src/test/java/org/exoplatform/groovysc=
ript/TestGroovyTemplateEngine.java	2010-01-29 12:49:33 UTC (rev 1470)
@@ -0,0 +1,41 @@
+/**
+ * Copyright (C) 2009 eXo Platform SAS.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.exoplatform.groovyscript;
+
+import junit.framework.TestCase;
+
+import java.io.IOException;
+
+/**
+ * @author <a href=3D"mailto:trong.tran(a)exoplatform.com">Trong Tran</a>
+ * @version $Revision$
+ */
+public class TestGroovyTemplateEngine extends TestCase
+{
+   public void testFileName() throws IOException, TemplateCompilationExcep=
tion
+   {
+      =

+      GroovyTemplateEngine engine_ =3D new GroovyTemplateEngine();
+      try {
+         GroovyTemplate template =3D engine_.createTemplate("/path/to/file=
-lt.gtmpl", "file-lt.gtmpl", "content of the file.gtmpl");
+      } catch (GroovyCompilationException e) {
+         fail("Creating GroovyTemplate is failed ");
+      }
+   }
+}


--===============8239140513028920204==--