You are viewing a plain text version of this content. The canonical link for it is here.
Posted to jetspeed-dev@portals.apache.org by rw...@apache.org on 2005/12/06 09:58:20 UTC
svn commit: r354378 - in /portals/jetspeed-2/trunk:
components/portal/src/java/org/apache/jetspeed/ajax/AJAXServiceImpl.java
components/portal/src/java/org/apache/jetspeed/velocity/JetspeedVelocityViewServlet.java
src/webapp/WEB-INF/velocity.properties
Author: rwatler
Date: Tue Dec 6 00:58:17 2005
New Revision: 354378
URL: http://svn.apache.org/viewcvs?rev=354378&view=rev
Log:
use file system loader for velocity templates to support change modification detection and caching
Modified:
portals/jetspeed-2/trunk/components/portal/src/java/org/apache/jetspeed/ajax/AJAXServiceImpl.java
portals/jetspeed-2/trunk/components/portal/src/java/org/apache/jetspeed/velocity/JetspeedVelocityViewServlet.java
portals/jetspeed-2/trunk/src/webapp/WEB-INF/velocity.properties
Modified: portals/jetspeed-2/trunk/components/portal/src/java/org/apache/jetspeed/ajax/AJAXServiceImpl.java
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/components/portal/src/java/org/apache/jetspeed/ajax/AJAXServiceImpl.java?rev=354378&r1=354377&r2=354378&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/components/portal/src/java/org/apache/jetspeed/ajax/AJAXServiceImpl.java (original)
+++ portals/jetspeed-2/trunk/components/portal/src/java/org/apache/jetspeed/ajax/AJAXServiceImpl.java Tue Dec 6 00:58:17 2005
@@ -68,6 +68,7 @@
engine = new VelocityEngine();
Properties props = new Properties();
props.load(request.getContext().getResourceAsStream("/WEB-INF/velocity.properties"));
+ props.setProperty("file.resource.loader.path", request.getContext().getRealPath("/"));
engine.init();
}
Modified: portals/jetspeed-2/trunk/components/portal/src/java/org/apache/jetspeed/velocity/JetspeedVelocityViewServlet.java
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/components/portal/src/java/org/apache/jetspeed/velocity/JetspeedVelocityViewServlet.java?rev=354378&r1=354377&r2=354378&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/components/portal/src/java/org/apache/jetspeed/velocity/JetspeedVelocityViewServlet.java (original)
+++ portals/jetspeed-2/trunk/components/portal/src/java/org/apache/jetspeed/velocity/JetspeedVelocityViewServlet.java Tue Dec 6 00:58:17 2005
@@ -594,10 +594,9 @@
// base configuration velocimacro.library property
velocity.setApplicationAttribute(SERVLET_CONTEXT_KEY, getServletContext());
velocity.setProperty(VelocityEngine.RUNTIME_LOG_LOGSYSTEM_CLASS, "org.apache.velocity.tools.view.servlet.ServletLogger");
- velocity.setProperty(VelocityEngine.RESOURCE_LOADER, "webapp");
- velocity.setProperty("webapp.resource.loader.class", "org.apache.velocity.tools.view.servlet.WebappLoader");
ExtendedProperties configuration = loadConfiguration(getServletConfig());
configuration.addProperty("velocimacro.library", macros.getAppRelativePath());
+ configuration.setProperty("file.resource.loader.path", getServletContext().getRealPath("/"));
velocity.setExtendedProperties(configuration);
// initialize and return velocity engine
Modified: portals/jetspeed-2/trunk/src/webapp/WEB-INF/velocity.properties
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/src/webapp/WEB-INF/velocity.properties?rev=354378&r1=354377&r2=354378&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/src/webapp/WEB-INF/velocity.properties (original)
+++ portals/jetspeed-2/trunk/src/webapp/WEB-INF/velocity.properties Tue Dec 6 00:58:17 2005
@@ -77,27 +77,22 @@
#
#
#----------------------------------------------------------------------------
-resource.loader = webapp
-webapp.resource.loader.cache = true
-webapp.resource.loader.modificationCheckInterval = 10
-webapp.resource.loader.template.path = .
-#template.loader.1.public.name = File
-#template.loader.1.description = Velocity File Template Loader
-#template.loader.1.class = org.apache.velocity.runtime.loader.FileTemplateLoader
-#template.loader.1.template.path = .
-#template.loader.1.cache = false
-#template.loader.1.modificationCheckInterval = 2
+# Resources
+resource.loader = file
+file.resource.loader.class = org.apache.velocity.runtime.resource.loader.FileResourceLoader
+file.resource.loader.cache = true
+file.resource.loader.modificationCheckInterval = 10
+#
+# This dynamic property must be set at runtime. See JetspeedVelocityViewServlet.java.
+#
+# file.resource.loader.path = ${applicationRoot}
+#
+# Velocimacros
velocimacro.library.autoreload = true
velocimacro.permissions.allow.inline.to.replace.global = true
-velocimacro.library = /WEB-INF/VM_global_library.vm, /WEB-INF/jetspeed_macros.vm
-
-#template.loader.2.public.name = URL
-#template.loader.2.description = Velocity URL Template Loader
-#template.loader.2.class = org.apache.velocity.runtime.loader.URLTemplateLoader
-#template.loader.2.template.path = http://localhost/templates/
-#template.loader.2.cache = false
+velocimacro.library = /WEB-INF/jetspeed_macros.vm
#----------------------------------------------------------------------------
# E X T E R N A L S E R V I C E I N I T I A L I Z A T I O N
---------------------------------------------------------------------
To unsubscribe, e-mail: jetspeed-dev-unsubscribe@portals.apache.org
For additional commands, e-mail: jetspeed-dev-help@portals.apache.org