You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@turbine.apache.org by Jason van Zyl <jv...@apache.org> on 2001/09/17 20:59:06 UTC
Re: cvs commit: jakarta-turbine-3/src/java/org/apache/turbine
Turbine.java TurbineConstants.java
On 9/17/01 2:48 PM, "jon@apache.org" <jo...@apache.org> wrote:
> jon 01/09/17 11:48:45
>
> Modified: src/java/org/apache/turbine Turbine.java
> TurbineConstants.java
> Log:
> make more constants
>
> jason: the /logs directory should become a TR.props setting
Yup, I just have to rearrange some stuff in the init to do it. The config
isn't loaded yet, and I have to clean up some stuff in the Log.java so that
some form of logging can occur when the logging isn't initialized. Chicken
of my egg.
> Revision Changes Path
> 1.8 +3 -3
> jakarta-turbine-3/src/java/org/apache/turbine/Turbine.java
>
> Index: Turbine.java
> ===================================================================
> RCS file:
> /home/cvs/jakarta-turbine-3/src/java/org/apache/turbine/Turbine.java,v
> retrieving revision 1.7
> retrieving revision 1.8
> diff -u -r1.7 -r1.8
> --- Turbine.java 2001/09/15 18:02:58 1.7
> +++ Turbine.java 2001/09/17 18:48:45 1.8
> @@ -111,7 +111,7 @@
> * @author <a href="mailto:krzewski@e-point.pl">Rafal Krzewski</a>
> * @author <a href="mailto:jvanzyl@apache.org">Jason van Zyl</a>
> * @author <a href="mailto:dlr@finemaltcoding.com">Daniel Rall</a>
> - * @version $Id: Turbine.java,v 1.7 2001/09/15 18:02:58 jvanzyl Exp $
> + * @version $Id: Turbine.java,v 1.8 2001/09/17 18:48:45 jon Exp $
> */
> public class Turbine
> extends HttpServlet
> @@ -506,7 +506,7 @@
> // context if not otherwise set.
> applicationRoot = config.getInitParameter(APPLICATION_ROOT);
>
> - if (applicationRoot == null || applicationRoot.equals("webContext"))
> + if (applicationRoot == null || applicationRoot.equals(WEB_CONTEXT))
> {
> applicationRoot = config.getServletContext().getRealPath("");
> }
> @@ -584,7 +584,7 @@
> moduleLoader.init();
>
> // Set some system properties
> - ExtendedProperties systemProperties = configuration.subset("system");
> + ExtendedProperties systemProperties = configuration.subset(SYSTEM);
>
> if (systemProperties != null)
> {
>
>
>
> 1.4 +7 -0
> jakarta-turbine-3/src/java/org/apache/turbine/TurbineConstants.java
>
> Index: TurbineConstants.java
> ===================================================================
> RCS file:
>
/home/cvs/jakarta-turbine-3/src/java/org/apache/turbine/TurbineConstants.jav
a,> v
> retrieving revision 1.3
> retrieving revision 1.4
> diff -u -r1.3 -r1.4
> --- TurbineConstants.java 2001/09/15 16:37:04 1.3
> +++ TurbineConstants.java 2001/09/17 18:48:45 1.4
> @@ -319,4 +319,11 @@
> * application runs from.
> */
> public static final String APPLICATION_ROOT = "applicationRoot";
> +
> + public static final String WEB_CONTEXT = "webContext";
> +
> + /**
> + * configuration subset
> + */
> + public static final String SYSTEM = "system";
> }
>
>
>
>
> ---------------------------------------------------------------------
> To unsubscribe, e-mail: turbine-dev-unsubscribe@jakarta.apache.org
> For additional commands, e-mail: turbine-dev-help@jakarta.apache.org
--
jvz.
Jason van Zyl
http://tambora.zenplex.org
http://jakarta.apache.org/turbine
http://jakarta.apache.org/velocity
http://jakarta.apache.org/alexandria
http://jakarta.apache.org/commons
---------------------------------------------------------------------
To unsubscribe, e-mail: turbine-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: turbine-dev-help@jakarta.apache.org
Re: cvs commit: jakarta-turbine-3/src/java/org/apache/turbine
Turbine.java TurbineConstants.java
Posted by Jon Stevens <jo...@latchkey.com>.
on 9/17/01 11:59 AM, "Jason van Zyl" <jv...@apache.org> wrote:
> Yup, I just have to rearrange some stuff in the init to do it. The config
> isn't loaded yet, and I have to clean up some stuff in the Log.java so that
> some form of logging can occur when the logging isn't initialized. Chicken
> of my egg.
Ah...ok...cool...
-jon
---------------------------------------------------------------------
To unsubscribe, e-mail: turbine-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: turbine-dev-help@jakarta.apache.org