[portal-commits] JBoss Portal SVN: r6808 - in trunk/core: src/main/org/jboss/portal/core/portlet/user and 1 other directory.

Author: julien(a)jboss.com Date: 2007-03-23 17:20:15 -0400 (Fri, 23 Mar 2007) New Revision: 6808 Modified: trunk/core/build.xml trunk/core/src/main/org/jboss/portal/core/portlet/user/UserPortlet.java Log: disabling freemarker inclusion (minor) until it is in thirdparty Modified: trunk/core/build.xml =================================================================== --- trunk/core/build.xml 2007-03-23 16:35:34 UTC (rev 6807) +++ trunk/core/build.xml 2007-03-23 21:20:15 UTC (rev 6808) @@ -91,7 +91,7 @@ <path refid="jboss.cache.classpath"/> <path refid="jbossas/core.libs.classpath"/> <path refid="hibernate.hibernate.classpath"/> - <path refid="freemarker.freemarker.classpath"/> + <!--<path refid="freemarker.freemarker.classpath"/>--> <path refid="apache.ant.classpath"/> <path refid="apache.myfaces.classpath"/> <path refid="apache.log4j.classpath"/> @@ -338,7 +338,7 @@ <fileset dir="${javassist.javassist.lib}" includes="javassist.jar"/> <fileset dir="${apache.fileupload.lib}" includes="commons-fileupload.jar"/> <fileset dir="${jakarta.io.lib}" includes="commons-io.jar"/> - <fileset dir="${freemarker.freemarker.lib}" includes="freemarker.jar"/> + <!--<fileset dir="${freemarker.freemarker.lib}" includes="freemarker.jar"/>--> <fileset dir="${portals.bridges.lib}" includes="portals-bridges-common.jar"/> </copy> Modified: trunk/core/src/main/org/jboss/portal/core/portlet/user/UserPortlet.java =================================================================== --- trunk/core/src/main/org/jboss/portal/core/portlet/user/UserPortlet.java 2007-03-23 16:35:34 UTC (rev 6807) +++ trunk/core/src/main/org/jboss/portal/core/portlet/user/UserPortlet.java 2007-03-23 21:20:15 UTC (rev 6808) @@ -73,9 +73,9 @@ import org.jboss.portlet.JBossRenderRequest; import org.jboss.portlet.JBossRenderResponse; -import freemarker.template.Configuration; -import freemarker.template.Template; -import freemarker.template.TemplateException; +//import freemarker.template.Configuration; +//import freemarker.template.Template; +//import freemarker.template.TemplateException; /** * This portlet aims at managing users @@ -1092,21 +1092,23 @@ { throw new FileNotFoundException("Cannot load a suitable emailTemplate.tpl in templates/user"); } - InputStream in = config.openStream(); - Template tpl = new Template("emailTemplate", new InputStreamReader(in), new Configuration()); - StringWriter out = new StringWriter(); - tpl.process(modelRoot, out); - out.close(); - message = out.toString(); +// InputStream in = config.openStream(); +// Template tpl = new Template("emailTemplate", new InputStreamReader(in), new Configuration()); +// StringWriter out = new StringWriter(); +// tpl.process(modelRoot, out); +// out.close(); +// message = out.toString(); } catch (IOException e1) { // TODO Auto-generated catch block e1.printStackTrace(); - } catch (TemplateException e) { - // TODO Auto-generated catch block - e.printStackTrace(); } +// catch (TemplateException e) +// { +// // TODO Auto-generated catch block +// e.printStackTrace(); +// } return message; }