dlr 01/08/15 14:48:00
Modified: src/services/java/org/apache/fulcrum/velocity
TurbineVelocityService.java
Log:
Added some URI type constants.
Revision Changes Path
1.6 +17 -6
jakarta-turbine-fulcrum/src/services/java/org/apache/fulcrum/velocity/TurbineVelocityService.java
Index: TurbineVelocityService.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine-fulcrum/src/services/java/org/apache/fulcrum/velocity/TurbineVelocityService.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -u -r1.5 -r1.6
--- TurbineVelocityService.java 2001/08/15 21:19:31 1.5
+++ TurbineVelocityService.java 2001/08/15 21:48:00 1.6
@@ -91,7 +91,7 @@
* @author <a href="mailto:[EMAIL PROTECTED]";>Jason van Zyl</a>
* @author <a href="mailto:[EMAIL PROTECTED]";>Sean Legassick</a>
* @author <a href="mailto:[EMAIL PROTECTED]";>Daniel Rall</a>
- * @version $Id: TurbineVelocityService.java,v 1.5 2001/08/15 21:19:31 dlr Exp $
+ * @version $Id: TurbineVelocityService.java,v 1.6 2001/08/15 21:48:00 dlr Exp $
*/
public class TurbineVelocityService
extends BaseTemplateEngineService
@@ -109,6 +109,16 @@
private static final String DEFAULT_CHAR_SET = "ISO-8859-1";
/**
+ * The prefix used for URIs which are of type <code>jar</code>.
+ */
+ private static final String JAR_PREFIX = "jar:";
+
+ /**
+ * The prefix used for URIs which are of type <code>absolute</code>.
+ */
+ private static final String ABSOLUTE_PREFIX = "absolute:";
+
+ /**
* Performs early initialization of this Turbine service.
*/
public void init()
@@ -364,7 +374,7 @@
for (Iterator j = paths.iterator(); j.hasNext();)
{
path = (String) j.next();
- if (path.startsWith("jar:file"))
+ if (path.startsWith(JAR_PREFIX + "file"))
{
// A local jar resource URL path is a bit more
// complicated, but we can translate it as well.
@@ -379,14 +389,15 @@
entry = "!/";
path = path.substring(9);
}
- path = "jar:file:" + getRealPath(path) + entry;
+ path = JAR_PREFIX + "file:" + getRealPath(path) +
+ entry;
}
- else if (path.startsWith("absolute:"))
+ else if (path.startsWith(ABSOLUTE_PREFIX))
{
- path = path.substring ("absolute:".length(),
+ path = path.substring (ABSOLUTE_PREFIX.length(),
path.length());
}
- else if (!path.startsWith("jar:"))
+ else if (!path.startsWith(JAR_PREFIX))
{
// But we don't translate remote jar URLs.
path = getRealPath(path);
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
