Author: dandre
Date: Wed Oct 30 23:06:48 2013
New Revision: 4645
Log:
use VelocityEngine in multiple instances mode to avoid confict between
VelociTemplate and GedArt
Modified:
trunk/AncestrisCore/modules.renderer.velocity/src/ancestris/renderer/velocity/VelocityRenderer.java
trunk/AncestrisCore/reports/src/ancestris/reports/gedart/DocReport.java
Modified:
trunk/AncestrisCore/modules.renderer.velocity/src/ancestris/renderer/velocity/VelocityRenderer.java
==============================================================================
---
trunk/AncestrisCore/modules.renderer.velocity/src/ancestris/renderer/velocity/VelocityRenderer.java
(original)
+++
trunk/AncestrisCore/modules.renderer.velocity/src/ancestris/renderer/velocity/VelocityRenderer.java
Wed Oct 30 23:06:48 2013
@@ -19,7 +19,7 @@
import java.io.File;
import java.io.Writer;
import org.apache.velocity.VelocityContext;
-import org.apache.velocity.app.Velocity;
+import org.apache.velocity.app.VelocityEngine;
import org.apache.velocity.tools.generic.DateTool;
import org.apache.velocity.tools.generic.ListTool;
import org.openide.modules.Places;
@@ -29,6 +29,7 @@
public class VelocityRenderer implements Renderer {
private VelocityContext context;
+ private static VelocityEngine engine = new VelocityEngine();
// private Writer out;
// public Charset CHARSET;
private static final File TEMPLATE_DIR = Places.getUserDirectory();
@@ -41,19 +42,19 @@
// }
//
try {
- Velocity.setProperty("resource.loader", "file,class");
- Velocity.setProperty("class.resource.loader.class",
+ engine.setProperty("resource.loader", "file,class");
+ engine.setProperty("class.resource.loader.class",
"org.apache.velocity.runtime.resource.loader.ClasspathResourceLoader");
- Velocity.setProperty("class.resource.loader.cache", "true");
- Velocity.setProperty("file.resource.loader.path",
TEMPLATE_DIR.getPath());
- Velocity.setProperty("file.resource.loader.cache", "false");
+ engine.setProperty("class.resource.loader.cache", "true");
+ engine.setProperty("file.resource.loader.path",
TEMPLATE_DIR.getPath());
+ engine.setProperty("file.resource.loader.cache", "false");
- Velocity.setProperty("directive.set.null.allowed", "true");
+ engine.setProperty("directive.set.null.allowed", "true");
// TODO: pour ne pas interpoller {$v} ... il faudrait mettre false
// TODO: Mais pour #parse("$TEMPLATE/...") il faudrait mettre true
- Velocity.setProperty("runtime.interpolate.string.literals",
"true");
- Velocity.init();
+ engine.setProperty("runtime.interpolate.string.literals", "true");
+ engine.init();
} catch (Exception e) {
System.out.println("Problem initializing Velocity : " + e);
@@ -133,7 +134,7 @@
@Override
public void render(String template, Writer out) {
try {
- Velocity.mergeTemplate(template, "ISO-8859-1",
+ engine.mergeTemplate(template, "ISO-8859-1",
context, out);
} catch (Exception ee) {
}
Modified:
trunk/AncestrisCore/reports/src/ancestris/reports/gedart/DocReport.java
==============================================================================
--- trunk/AncestrisCore/reports/src/ancestris/reports/gedart/DocReport.java
(original)
+++ trunk/AncestrisCore/reports/src/ancestris/reports/gedart/DocReport.java
Wed Oct 30 23:06:48 2013
@@ -28,7 +28,7 @@
import java.util.regex.Pattern;
import org.apache.velocity.VelocityContext;
-import org.apache.velocity.app.Velocity;
+import org.apache.velocity.app.VelocityEngine;
import org.apache.velocity.tools.generic.DateTool;
import org.apache.velocity.tools.generic.ListTool;
@@ -36,6 +36,7 @@
@SuppressWarnings("unchecked")
public class DocReport {
private VelocityContext context;
+ private static VelocityEngine engine = new VelocityEngine();
private Writer out;
public Charset CHARSET;
@@ -45,19 +46,19 @@
catch (Exception e) {CHARSET = Charset.forName("ISO-8859-1");}
try {
- Velocity.setProperty("resource.loader", "file,class");
+ engine.setProperty("resource.loader", "file,class");
// Velocity.setProperty("class.resource.loader.class",
//
"org.apache.velocity.runtime.resource.loader.ClasspathResourceLoader");
//
Velocity.setProperty("class.resource.loader.cache","true");
- Velocity.setProperty("file.resource.loader.path","/");
-
Velocity.setProperty("file.resource.loader.cache","true");
+ engine.setProperty("file.resource.loader.path","/");
+ engine.setProperty("file.resource.loader.cache","true");
-
Velocity.setProperty("directive.set.null.allowed","true");
+ engine.setProperty("directive.set.null.allowed","true");
// TODO: pour ne pas interpoller {$v} ... il faudrait
mettre false
// TODO: Mais pour #parse("$TEMPLATE/...") il faudrait
mettre true
-
Velocity.setProperty("runtime.interpolate.string.literals","true");
- Velocity.init();
+
engine.setProperty("runtime.interpolate.string.literals","true");
+ engine.init();
} catch (Exception e) {
System.out.println("Problem initializing Velocity : " +
e);
@@ -130,7 +131,7 @@
void render(String template) {
//StringWriter w = new StringWriter();
try {
- Velocity.mergeTemplate(template, "ISO-8859-1",
+ engine.mergeTemplate(template, "ISO-8859-1",
context, out);
} catch (Exception ee) {
}
---------------------------------------------------------------------
Site Web Ancestris : http://www.ancestris.org
<*> Pour vous desinscrire de cette liste, envoyez un mail a :
[email protected]
<*> Pour obtenir de l'aide sur les commandes de la liste :
[email protected]
Pour obtenir tous les messages lies a ce fil de discussion, cliquez sur le
lien ci-dessous, cela ouvrira votre logiciel de messagerie. Il vous suffira
d'envoyer le message :
[email protected]
