Author: nbubna
Date: Tue Aug 7 11:16:50 2007
New Revision: 563601
URL: http://svn.apache.org/viewvc?view=rev&rev=563601
Log:
use same key for system property as we do for servlet init-param
Modified:
velocity/tools/branches/2.x/src/main/java/org/apache/velocity/tools/ToolManager.java
velocity/tools/branches/2.x/src/main/java/org/apache/velocity/tools/config/ConfigurationUtils.java
Modified:
velocity/tools/branches/2.x/src/main/java/org/apache/velocity/tools/ToolManager.java
URL:
http://svn.apache.org/viewvc/velocity/tools/branches/2.x/src/main/java/org/apache/velocity/tools/ToolManager.java?view=diff&rev=563601&r1=563600&r2=563601
==============================================================================
---
velocity/tools/branches/2.x/src/main/java/org/apache/velocity/tools/ToolManager.java
(original)
+++
velocity/tools/branches/2.x/src/main/java/org/apache/velocity/tools/ToolManager.java
Tue Aug 7 11:16:50 2007
@@ -47,8 +47,8 @@
/**
* Constructs an instance already configured to use the
* [EMAIL PROTECTED] ConfigurationUtils#getAutoLoaded()()} configuration
- * and any configuration specified via a "toolsConfig" system
- * property..
+ * and any configuration specified via a "org.apache.velocity.tools"
+ * system property.
*/
public ToolManager()
{
Modified:
velocity/tools/branches/2.x/src/main/java/org/apache/velocity/tools/config/ConfigurationUtils.java
URL:
http://svn.apache.org/viewvc/velocity/tools/branches/2.x/src/main/java/org/apache/velocity/tools/config/ConfigurationUtils.java?view=diff&rev=563601&r1=563600&r2=563601
==============================================================================
---
velocity/tools/branches/2.x/src/main/java/org/apache/velocity/tools/config/ConfigurationUtils.java
(original)
+++
velocity/tools/branches/2.x/src/main/java/org/apache/velocity/tools/config/ConfigurationUtils.java
Tue Aug 7 11:16:50 2007
@@ -47,7 +47,8 @@
public static final String AUTOLOADED_XML_PATH = "tools.xml";
public static final String AUTOLOADED_PROPS_PATH = "tools.properties";
- public static final String SYSTEM_PROPERTY_KEY = "toolsConfig";
+ public static final String SYSTEM_PROPERTY_KEY =
+ "org.apache.velocity.tools";
/**
* Returns the "default" [EMAIL PROTECTED] FactoryConfiguration}. This
includes
@@ -201,10 +202,10 @@
/**
* Returns a [EMAIL PROTECTED] FactoryConfiguration} loaded from the path
specified
- * in the "toolsConfig" system property (if any). If no such property has
- * been set [EMAIL PROTECTED] null} will be returned. If, however, there
is such a
- * property but no valid configuration file was found at the specified
- * location, this will throw a [EMAIL PROTECTED]
ResourceNotFoundException}.
+ * in the "org.apache.velocity.tools" system property (if any).
+ * If no such property has been set [EMAIL PROTECTED] null} will be
returned.
+ * @throws ResourceNotFoundException if the system property has a value
+ * but no configuration file was found at the specified location
*/
public static FactoryConfiguration findFromSystemProperty()
{
