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 2010/09/11 10:54:19 UTC
svn commit: r996100 - in /incubator/jspwiki/branches/JSPWIKI_2_8_BRANCH:
ChangeLog etc/jspwiki.properties.tmpl src/com/ecyrd/jspwiki/Release.java
src/com/ecyrd/jspwiki/TextUtil.java
src/com/ecyrd/jspwiki/auth/AuthenticationManager.java
Author: metskem
Date: Sat Sep 11 08:54:19 2010
New Revision: 996100
URL: http://svn.apache.org/viewvc?rev=996100&view=rev
Log:
2010-08-29 Harry Metske <me...@apache.org>
* 2.8.5-svn-1
* JSPWIKI-669 Support external properties in WikiEngine (idea from John McKinney)
You can now override individual properties in jspwiki.properties using standard
Java System properties.
* fixed the jspwiki.policy file name lookup in AuthenticationManager
Modified:
incubator/jspwiki/branches/JSPWIKI_2_8_BRANCH/ChangeLog
incubator/jspwiki/branches/JSPWIKI_2_8_BRANCH/etc/jspwiki.properties.tmpl
incubator/jspwiki/branches/JSPWIKI_2_8_BRANCH/src/com/ecyrd/jspwiki/Release.java
incubator/jspwiki/branches/JSPWIKI_2_8_BRANCH/src/com/ecyrd/jspwiki/TextUtil.java
incubator/jspwiki/branches/JSPWIKI_2_8_BRANCH/src/com/ecyrd/jspwiki/auth/AuthenticationManager.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=996100&r1=996099&r2=996100&view=diff
==============================================================================
--- incubator/jspwiki/branches/JSPWIKI_2_8_BRANCH/ChangeLog (original)
+++ incubator/jspwiki/branches/JSPWIKI_2_8_BRANCH/ChangeLog Sat Sep 11 08:54:19 2010
@@ -1,8 +1,12 @@
-2010-05-16 Harry Metske <me...@apache.org>
+2010-08-29 Harry Metske <me...@apache.org>
- * 2.8.4-svn-13
+ * 2.8.5-svn-1
- * JSPWIKI-646 JSPWiki cannot run without unpacking the war file
+ * JSPWIKI-669 Support external properties in WikiEngine (idea from John McKinney)
+ You can now override individual properties in jspwiki.properties using standard
+ Java System properties.
+
+ * fixed the jspwiki.policy file name lookup in AuthenticationManager
2010-05-08 Harry Metske <me...@apache.org>
Modified: incubator/jspwiki/branches/JSPWIKI_2_8_BRANCH/etc/jspwiki.properties.tmpl
URL: http://svn.apache.org/viewvc/incubator/jspwiki/branches/JSPWIKI_2_8_BRANCH/etc/jspwiki.properties.tmpl?rev=996100&r1=996099&r2=996100&view=diff
==============================================================================
--- incubator/jspwiki/branches/JSPWIKI_2_8_BRANCH/etc/jspwiki.properties.tmpl (original)
+++ incubator/jspwiki/branches/JSPWIKI_2_8_BRANCH/etc/jspwiki.properties.tmpl Sat Sep 11 08:54:19 2010
@@ -3,6 +3,10 @@
# This is the JSPWiki configuration file. You'll need to edit this
# a bit. The first few lines are the most important ones.
#
+# If you don't want to edit this file, you can override each individual
+# property by specifying the property name as a standard
+# Java System Property.
+#
# Wherever it is said that an option can be "true" or "false", you can
# also use "yes"/"no", or "on/off". Just for some convenience.
#
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=996100&r1=996099&r2=996100&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 Sat Sep 11 08:54:19 2010
@@ -66,7 +66,7 @@ public final class Release
public static final int REVISION = 8;
/** The minor revision. */
- public static final int MINORREVISION = 4;
+ public static final int MINORREVISION = 5;
/** The build number/identifier. This is a String as opposed to an integer, just
* so that people can add other identifiers to it. The build number is incremented
@@ -77,7 +77,7 @@ public final class Release
* <p>
* If the build identifier is empty, it is not added.
*/
- public static final String BUILD = "13";
+ public static final String BUILD = "1";
/**
* This is the generic version string you should use
Modified: incubator/jspwiki/branches/JSPWIKI_2_8_BRANCH/src/com/ecyrd/jspwiki/TextUtil.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/branches/JSPWIKI_2_8_BRANCH/src/com/ecyrd/jspwiki/TextUtil.java?rev=996100&r1=996099&r2=996100&view=diff
==============================================================================
--- incubator/jspwiki/branches/JSPWIKI_2_8_BRANCH/src/com/ecyrd/jspwiki/TextUtil.java (original)
+++ incubator/jspwiki/branches/JSPWIKI_2_8_BRANCH/src/com/ecyrd/jspwiki/TextUtil.java Sat Sep 11 08:54:19 2010
@@ -416,7 +416,7 @@ public final class TextUtil
String key,
int defVal )
{
- String val = props.getProperty( key );
+ String val = System.getProperties().getProperty( key, props.getProperty( key ) );
return parseIntParameter( val, defVal );
}
@@ -436,13 +436,12 @@ public final class TextUtil
*
* @since 2.0.11
*/
- public static boolean getBooleanProperty( Properties props,
- String key,
- boolean defval )
+ public static boolean getBooleanProperty( Properties props, String key, boolean defval )
{
- String val = props.getProperty( key );
+ String val = System.getProperties().getProperty( key, props.getProperty( key ) );
- if( val == null ) return defval;
+ if( val == null )
+ return defval;
return isPositive( val );
}
@@ -462,7 +461,7 @@ public final class TextUtil
String key,
String defval )
{
- String val = props.getProperty( key );
+ String val = System.getProperties().getProperty( key, props.getProperty( key ) );
if( val == null ) return defval;
Modified: incubator/jspwiki/branches/JSPWIKI_2_8_BRANCH/src/com/ecyrd/jspwiki/auth/AuthenticationManager.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/branches/JSPWIKI_2_8_BRANCH/src/com/ecyrd/jspwiki/auth/AuthenticationManager.java?rev=996100&r1=996099&r2=996100&view=diff
==============================================================================
--- incubator/jspwiki/branches/JSPWIKI_2_8_BRANCH/src/com/ecyrd/jspwiki/auth/AuthenticationManager.java (original)
+++ incubator/jspwiki/branches/JSPWIKI_2_8_BRANCH/src/com/ecyrd/jspwiki/auth/AuthenticationManager.java Sat Sep 11 08:54:19 2010
@@ -625,8 +625,8 @@ public final class AuthenticationManager
{
// create a tmp file of the policy loaded as an InputStream and return the URL to it
//
- InputStream is = engine.getServletContext().getResourceAsStream("/WEB-INF/" + name);
- File tmpFile = File.createTempFile("temp." + name, "");
+ InputStream is = engine.getServletContext().getResourceAsStream( name );
+ File tmpFile = File.createTempFile( "temp." + name, "" );
tmpFile.deleteOnExit();
OutputStream os = new FileOutputStream(tmpFile);