You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@velocity.apache.org by wg...@apache.org on 2005/01/15 08:57:18 UTC
svn commit: r125256 - /jakarta/velocity/trunk/src/java/org/apache/velocity/servlet/VelocityServlet.java
Author: wglass
Date: Fri Jan 14 23:57:17 2005
New Revision: 125256
URL: http://svn.apache.org/viewcvs?view=rev&rev=125256
Log:
now retrieves properties via servletcontext.getResourceAsStream (which works in a WAR). http://issues.apache.org/bugzilla/show_bug.cgi?id=17058
Modified:
jakarta/velocity/trunk/src/java/org/apache/velocity/servlet/VelocityServlet.java
Modified: jakarta/velocity/trunk/src/java/org/apache/velocity/servlet/VelocityServlet.java
Url: http://svn.apache.org/viewcvs/jakarta/velocity/trunk/src/java/org/apache/velocity/servlet/VelocityServlet.java?view=diff&rev=125256&p1=jakarta/velocity/trunk/src/java/org/apache/velocity/servlet/VelocityServlet.java&r1=125255&p2=jakarta/velocity/trunk/src/java/org/apache/velocity/servlet/VelocityServlet.java&r2=125256
==============================================================================
--- jakarta/velocity/trunk/src/java/org/apache/velocity/servlet/VelocityServlet.java (original)
+++ jakarta/velocity/trunk/src/java/org/apache/velocity/servlet/VelocityServlet.java Fri Jan 14 23:57:17 2005
@@ -91,7 +91,7 @@
* @author <a href="mailto:geirm@optonline.net">Geir Magnusson Jr.</a>
* @author <a href="kjohnson@transparent.com">Kent Johnson</a>
* @author <a href="dlr@finemaltcoding.com">Daniel Rall</a>
- * $Id: VelocityServlet.java,v 1.57 2004/03/20 03:35:51 dlr Exp $
+ * $Id$
*/
public abstract class VelocityServlet extends HttpServlet
{
@@ -299,14 +299,7 @@
if ( propsFile != null )
{
- String realPath = getServletContext().getRealPath(propsFile);
-
- if ( realPath != null )
- {
- propsFile = realPath;
- }
-
- p.load( new FileInputStream(propsFile) );
+ p.load(getServletContext().getResourceAsStream(propsFile));
}
return p;
---------------------------------------------------------------------
To unsubscribe, e-mail: velocity-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: velocity-dev-help@jakarta.apache.org