You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jspwiki.apache.org by me...@apache.org on 2009/06/07 13:06:02 UTC
svn commit: r782365 - in /incubator/jspwiki/branches/JSPWIKI_2_8_BRANCH:
ChangeLog src/com/ecyrd/jspwiki/PropertyReader.java
src/com/ecyrd/jspwiki/Release.java
Author: metskem
Date: Sun Jun 7 11:06:02 2009
New Revision: 782365
URL: http://svn.apache.org/viewvc?rev=782365&view=rev
Log:
2.8.3-svn-10 JSPWIKI-568 You can now specify a Java System Property jspwiki.propertyfile to specify the location of jspwiki.properties (thanks to Piotr Tarnowski)
Modified:
incubator/jspwiki/branches/JSPWIKI_2_8_BRANCH/ChangeLog
incubator/jspwiki/branches/JSPWIKI_2_8_BRANCH/src/com/ecyrd/jspwiki/PropertyReader.java
incubator/jspwiki/branches/JSPWIKI_2_8_BRANCH/src/com/ecyrd/jspwiki/Release.java
Modified: incubator/jspwiki/branches/JSPWIKI_2_8_BRANCH/ChangeLog
URL: http://svn.apache.org/viewvc/incubator/jspwiki/branches/JSPWIKI_2_8_BRANCH/ChangeLog?rev=782365&r1=782364&r2=782365&view=diff
==============================================================================
--- incubator/jspwiki/branches/JSPWIKI_2_8_BRANCH/ChangeLog (original)
+++ incubator/jspwiki/branches/JSPWIKI_2_8_BRANCH/ChangeLog Sun Jun 7 11:06:02 2009
@@ -1,3 +1,11 @@
+2009-06-07 Harry Metske <me...@apache.org>
+
+ * 2.8.3-svn-10
+
+ * JSPWIKI-568 jspwiki.propertyfile cannot be defined as system property
+ You can now specify a Java System Property jspwiki.propertyfile to specify
+ the location of jspwiki.properties (thanks to Piotr Tarnowski)
+
2009-06-03 Harry Metske <me...@apache.org>
* 2.8.3-svn-9
Modified: incubator/jspwiki/branches/JSPWIKI_2_8_BRANCH/src/com/ecyrd/jspwiki/PropertyReader.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/branches/JSPWIKI_2_8_BRANCH/src/com/ecyrd/jspwiki/PropertyReader.java?rev=782365&r1=782364&r2=782365&view=diff
==============================================================================
--- incubator/jspwiki/branches/JSPWIKI_2_8_BRANCH/src/com/ecyrd/jspwiki/PropertyReader.java (original)
+++ incubator/jspwiki/branches/JSPWIKI_2_8_BRANCH/src/com/ecyrd/jspwiki/PropertyReader.java Sun Jun 7 11:06:02 2009
@@ -43,8 +43,10 @@
private static final String DEFAULT_JSPWIKI_PROPERTIES = "/ini/default_jspwiki.properties";
- /** The web.xml parameter that defines where the config file is to be found.
- * If it is not defined, uses the default as defined by DEFAULT_PROPERTYFILE.
+ /** The servlet context parameter (from web.xml) that defines where the
+ * config file is to be found.
+ * If it is not defined, checks the Java System Property, if that is not defined either,
+ * uses the default as defined by DEFAULT_PROPERTYFILE.
* {@value #DEFAULT_PROPERTYFILE}
*/
public static final String PARAM_PROPERTYFILE = "jspwiki.propertyfile";
@@ -86,7 +88,8 @@
{}
/**
- * Loads the webapp properties based on servlet context information.
+ * Loads the webapp properties based on servlet context information,
+ * or (if absent) based on teh Java System Property PARAM_PROPERTYFILE .
* Returns a Properties object containing the settings, or null if unable
* to load it. (The default file is WEB-INF/jspwiki.properties, and can
* be overridden by setting PARAM_PROPERTYFILE in the server or webapp
@@ -115,7 +118,7 @@
*/
public static Properties loadWebAppProps( ServletContext context )
{
- String propertyFile = context.getInitParameter(PARAM_PROPERTYFILE);
+ String propertyFile = getInitParameter( context, PARAM_PROPERTYFILE );
InputStream propertyStream = null;
try
Modified: incubator/jspwiki/branches/JSPWIKI_2_8_BRANCH/src/com/ecyrd/jspwiki/Release.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/branches/JSPWIKI_2_8_BRANCH/src/com/ecyrd/jspwiki/Release.java?rev=782365&r1=782364&r2=782365&view=diff
==============================================================================
--- incubator/jspwiki/branches/JSPWIKI_2_8_BRANCH/src/com/ecyrd/jspwiki/Release.java (original)
+++ incubator/jspwiki/branches/JSPWIKI_2_8_BRANCH/src/com/ecyrd/jspwiki/Release.java Sun Jun 7 11:06:02 2009
@@ -77,7 +77,7 @@
* <p>
* If the build identifier is empty, it is not added.
*/
- public static final String BUILD = "9";
+ public static final String BUILD = "10";
/**
* This is the generic version string you should use