You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@turbine.apache.org by jt...@apache.org on 2002/03/21 19:42:29 UTC
cvs commit: jakarta-turbine-3/src/java/org/apache/turbine/pipeline DefaultResolver.java
jtaylor 02/03/21 10:42:29
Modified: src/java/org/apache/turbine/pipeline DefaultResolver.java
Log:
Patch that removes hardcoding of extension in DefaultResolver, so you can
use something other than '.vm'
Submitted by: Gareth Coltman ( gareth_coltman@majorband.co.uk )
Revision Changes Path
1.14 +4 -3 jakarta-turbine-3/src/java/org/apache/turbine/pipeline/DefaultResolver.java
Index: DefaultResolver.java
===================================================================
RCS file: /home/cvs/jakarta-turbine-3/src/java/org/apache/turbine/pipeline/DefaultResolver.java,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- DefaultResolver.java 20 Mar 2002 01:55:28 -0000 1.13
+++ DefaultResolver.java 21 Mar 2002 18:42:29 -0000 1.14
@@ -132,7 +132,7 @@
*
* @author <a href="mailto:jvanzyl@apache.org">Jason van Zyl</a>
* @author <a href="mailto:mikeh@apache.org">Mike Haberman</a>
- * @version $Id: DefaultResolver.java,v 1.13 2002/03/20 01:55:28 brekke Exp $
+ * @version $Id: DefaultResolver.java,v 1.14 2002/03/21 18:42:29 jtaylor Exp $
*/
public class DefaultResolver
implements Resolver, TurbineConstants
@@ -229,7 +229,8 @@
i--;
}
- String extension = ".vm";
+ String extension = Turbine.getConfiguration()
+ .getString("template.default.extension");
// Try first an exact match for a module having the same
// name as the input template, traverse then upper level
@@ -259,7 +260,7 @@
// Only the main level left.
j = 1;
}
- pckage.append("Default").append(extension);
+ pckage.append("Default").append(".").append(extension);
}
// Not found, return the default module name.
--
To unsubscribe, e-mail: <ma...@jakarta.apache.org>
For additional commands, e-mail: <ma...@jakarta.apache.org>
Re: cvs commit: jakarta-turbine-3/src/java/org/apache/turbine/pipeline DefaultResolver.java
Posted by Daniel Rall <dl...@finemaltcoding.com>.
I like the change, but there should be a second argument of ".vm" to
provide a default (just in case there is no template.default.extension
property in TR.props).
jtaylor@apache.org writes:
> jtaylor 02/03/21 10:42:29
>
> Modified: src/java/org/apache/turbine/pipeline DefaultResolver.java
> Log:
> Patch that removes hardcoding of extension in DefaultResolver, so you can
> use something other than '.vm'
>
> Submitted by: Gareth Coltman ( gareth_coltman@majorband.co.uk )
>
> Revision Changes Path
> 1.14 +4 -3 jakarta-turbine-3/src/java/org/apache/turbine/pipeline/DefaultResolver.java
>
> Index: DefaultResolver.java
> ===================================================================
> RCS file: /home/cvs/jakarta-turbine-3/src/java/org/apache/turbine/pipeline/DefaultResolver.java,v
> retrieving revision 1.13
> retrieving revision 1.14
> diff -u -r1.13 -r1.14
> --- DefaultResolver.java 20 Mar 2002 01:55:28 -0000 1.13
> +++ DefaultResolver.java 21 Mar 2002 18:42:29 -0000 1.14
> @@ -132,7 +132,7 @@
> *
> * @author <a href="mailto:jvanzyl@apache.org">Jason van Zyl</a>
> * @author <a href="mailto:mikeh@apache.org">Mike Haberman</a>
> - * @version $Id: DefaultResolver.java,v 1.13 2002/03/20 01:55:28 brekke Exp $
> + * @version $Id: DefaultResolver.java,v 1.14 2002/03/21 18:42:29 jtaylor Exp $
> */
> public class DefaultResolver
> implements Resolver, TurbineConstants
> @@ -229,7 +229,8 @@
> i--;
> }
>
> - String extension = ".vm";
> + String extension = Turbine.getConfiguration()
> + .getString("<template.default.extension");
>
> // Try first an exact match for a module having the same
> // name as the input template, traverse then upper level
> @@ -259,7 +260,7 @@
> // Only the main level left.
> j = 1;
> }
> - pckage.append("Default").append(extension);
> + pckage.append("Default").append(".").append(extension);
> }
>
> // Not found, return the default module name.
>
>
>
>
> --
> To unsubscribe, e-mail: <ma...@jakarta.apache.org>
> For additional commands, e-mail: <ma...@jakarta.apache.org>
--
To unsubscribe, e-mail: <ma...@jakarta.apache.org>
For additional commands, e-mail: <ma...@jakarta.apache.org>