velocity-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jvan...@apache.org
Subject cvs commit: jakarta-velocity/src/java/org/apache/velocity/runtime RuntimeConstants.java
Date Wed, 14 Mar 2001 21:51:24 GMT
jvanzyl     01/03/14 13:51:24

  Modified:    src/java/org/apache/velocity/runtime RuntimeConstants.java
  Log:
  - cleanup of the Runtime configuration keys.
  
  Revision  Changes    Path
  1.18      +90 -43    jakarta-velocity/src/java/org/apache/velocity/runtime/RuntimeConstants.java
  
  Index: RuntimeConstants.java
  ===================================================================
  RCS file: /home/cvs/jakarta-velocity/src/java/org/apache/velocity/runtime/RuntimeConstants.java,v
  retrieving revision 1.17
  retrieving revision 1.18
  diff -u -r1.17 -r1.18
  --- RuntimeConstants.java	2001/03/12 07:20:13	1.17
  +++ RuntimeConstants.java	2001/03/14 21:51:21	1.18
  @@ -64,6 +64,12 @@
        * ----------------------------------------------------------------------
        */
   
  +    /*
  +     * ----------------------------------------------------------------------
  +     * L O G G I N G  C O N F I G U R A T I O N
  +     * ----------------------------------------------------------------------
  +     */
  +
       /** 
        * Location of the velocity log file.
        */
  @@ -87,99 +93,126 @@
       public static final String RUNTIME_LOG_INFO_STACKTRACE = 
           "runtime.log.info.stacktrace";
   
  +    /**
  +     * Logging of invalid references.
  +     */
  +    public static final String RUNTIME_LOG_REFERENCE_LOG_INVALID  = 
  +        "runtime.log.invalid.references";
  +
       /** 
        * The encoding to use for the template.
        */
       public static final String TEMPLATE_ENCODING = "template.encoding";
  -    
  -    /** 
  -     * Initial counter value in #foreach directives.
  +
  +    /*
  +     * ----------------------------------------------------------------------
  +     * D I R E C T I V E  C O N F I G U R A T I O N
  +     * ----------------------------------------------------------------------
  +     * Directive properties are of the form:
  +     * 
  +     * directive.<directive-name>.<property>
  +     * ----------------------------------------------------------------------
        */
  -    public static final String COUNTER_NAME = "counter.name";
   
       /** 
        * Initial counter value in #foreach directives.
        */
  -    public static final String COUNTER_INITIAL_VALUE = "counter.initial.value";
  +    public static final String COUNTER_NAME = 
  +        "directive.foreach.counter.name";
   
       /** 
  -     * Default Content type for output.
  +     * Initial counter value in #foreach directives.
        */
  -    public static final String DEFAULT_CONTENT_TYPE = "default.contentType";
  +    public static final String COUNTER_INITIAL_VALUE = 
  +        "directive.foreach.counter.initial.value";
   
       /**
  -     * The public handle for setting a path in
  -     * the FileResourceLoader.
  +     * Starting tag for error messages triggered by passing
  +     * a parameter not allowed in the #include directive. Only
  +     * string literals, and references are allowed.
        */
  -    public static final String FILE_RESOURCE_LOADER_PATH = "file.resource.path";
  -
  +    public static String ERRORMSG_START = 
  +        "directive.include.output.errormsg.start";
  +    
       /**
  -     * The public handle for setting a jar to search in
  -     * the JarResourceLoader.
  +     * Ending tag for error messages triggered by passing
  +     * a parameter not allowed in the #include directive. Only
  +     * string literals, and references are allowed.
        */
  -    public static final String JAR_RESOURCE_LOADER_PATH = "jar.resource.path";
  +    public static String ERRORMSG_END  = 
  +        "directive.include.output.errormsg.end";
   
       /**
  -     * The public handle for turning the caching on in the
  -     * FileResourceLoader.
  +     * Maximum recursion depth allowed for the #parse directive.
        */
  -    public static final String FILE_RESOURCE_LOADER_CACHING = "file.cache";
  +    public static String PARSE_DIRECTIVE_MAXDEPTH 
  +        = "directive.parse.max.depth";
   
  -    /**
  -     * Logging of invalid references.
  +
  +    /*
  +     * ----------------------------------------------------------------------
  +     * R E S O U R C E  L O A D E R  C O N F I G U R A T I O N
  +     * ----------------------------------------------------------------------
        */
  -    public static final String RUNTIME_LOG_REFERENCE_LOG_INVALID  = 
  -        "runtime.log.reference.log_invalid";
   
       /**
  -     * Starting tag for error messages triggered by passing
  -     * a parameter not allowed in the #include directive. Only
  -     * string literals, and references are allowed.
  +     * Key used to retrieve the names of the resource loaders
  +     * to be used. In a properties file they may appear as
  +     * the following:
  +     *
  +     * resource.loader = file,classpath
        */
  -    public static String ERRORMSG_START = "include.output.errormsg.start";
  -    
  +    public static final String RESOURCE_LOADER = "resource.loader";
  +
       /**
  -     * Ending tag for error messages triggered by passing
  -     * a parameter not allowed in the #include directive. Only
  -     * string literals, and references are allowed.
  +     * The public handle for setting a path in
  +     * the FileResourceLoader.
        */
  -    public static String ERRORMSG_END  = "include.output.errormsg.end";
  +    public static final String FILE_RESOURCE_LOADER_PATH =
  +        "file.resource.loader.path";
   
       /**
  -     * Maximum recursion depth allowed for the #parse directive.
  +     * The public handle for turning the caching on in the
  +     * FileResourceLoader.
        */
  -    public static String PARSE_DIRECTIVE_MAXDEPTH = "parse_directive.maxdepth";
  +    public static final String FILE_RESOURCE_LOADER_CACHE = 
  +        "file.resource.loader.cache";
   
  -    /**
  -     *  Switch for the interpolation facility for string literals
  +    /*
  +     * ----------------------------------------------------------------------
  +     * V E L O C I M A C R O  C O N F I G U R A T I O N
  +     * ----------------------------------------------------------------------
        */
  -    public static String INTERPOLATE_STRINGLITERALS = "stringliterals.interpolate";
   
  -    /** name of global Velocimacro library template */
  -    public static final String VM_GLOBAL_LIBRARY = "velocimacro.library.global";
  +    /** 
  +     * Name of global Velocimacro library template.
  +     */
  +    public static final String VM_GLOBAL_LIBRARY = "velocimacro.global.library";
   
  -    /** name of local Velocimacro library template */
  -    public static final String VM_LOCAL_LIBRARY  = "velocimacro.library.local";
  +    /** 
  +     * Name of local Velocimacro library template.
  +     */
  +    public static final String VM_LOCAL_LIBRARY  = "velocimacro.local.library";
   
       /** 
        * boolean (true/false) default true : allow 
        * inline (in-template) macro definitions 
        */
       public static final String VM_PERM_ALLOW_INLINE  = 
  -        "velocimacro.permissions.allowInline";
  +        "velocimacro.permissions.allow.inline";
   
       /**
        * boolean (true/false) default false : allow inline 
        * (in-template) macro definitions to replace existing 
        */
       public final static String VM_PERM_ALLOW_INLINE_REPLACE_GLOBAL  = 
  -        "velocimacro.permissions.allowInlineToReplaceGlobal";
  +        "velocimacro.permissions.allow.inline.to.replace.global";
       
       /** 
        * Switch for forcing inline macros to be local : default false.
        */
       public final static String VM_PERM_INLINE_LOCAL = 
  -        "velocimacro.permissions.allowInlineLocalScope";
  +        "velocimacro.permissions.allow.inline.local.scope";
   
       /** 
        * Switch for VM blather : default true.
  @@ -189,7 +222,21 @@
      /** 
       * switch for local context in VM : default true 
       */
  -    public final static String VM_CONTEXT_LOCALSCOPE = "velocimacro.context.localscope";
  +    public final static String VM_CONTEXT_LOCALSCOPE = 
  +        "velocimacro.context.localscope";
  +
  +    /*
  +     * ----------------------------------------------------------------------
  +     * G E N E R A L  R U N T I M E  C O N F I G U R A T I O N
  +     * ----------------------------------------------------------------------
  +     */
  +
  +    /**
  +     *  Switch for the interpolation facility for string literals
  +     */
  +    public static String INTERPOLATE_STRINGLITERALS = 
  +        "runtime.interpolate.string.literals";
  +
   
       /*
        * ----------------------------------------------------------------------
  
  
  

Mime
View raw message