You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jspwiki.apache.org by ju...@apache.org on 2013/01/09 20:38:28 UTC
svn commit: r1431027 - in /incubator/jspwiki/trunk: build.properties
etc/jspwiki.properties.tmpl
src/org/apache/wiki/providers/AbstractFileProvider.java
Author: juanpablo
Date: Wed Jan 9 19:38:27 2013
New Revision: 1431027
URL: http://svn.apache.org/viewvc?rev=1431027&view=rev
Log:
* fixed JSPWIKI-757 Have default file direction location be in relative directory instead of
hardcoded /p/dir1/dir2. If jspwiki.fileSystemProvider.pageDir in jspwiki.properties isn't
provided, it will default to ${user.home}/jspwiki-files
Modified:
incubator/jspwiki/trunk/build.properties
incubator/jspwiki/trunk/etc/jspwiki.properties.tmpl
incubator/jspwiki/trunk/src/org/apache/wiki/providers/AbstractFileProvider.java
Modified: incubator/jspwiki/trunk/build.properties
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/build.properties?rev=1431027&r1=1431026&r2=1431027&view=diff
==============================================================================
--- incubator/jspwiki/trunk/build.properties (original)
+++ incubator/jspwiki/trunk/build.properties Wed Jan 9 19:38:27 2013
@@ -24,7 +24,6 @@
# jspwiki.properties-file when it is run.
#
@appname@=JSPWiki
-@pagedir@=/p/web/www-data/jspwiki/
@logfile@=/tmp/jspwiki.log
@securitylog@=/tmp/security.log
@spamlog@=/tmp/spamlog.log
Modified: incubator/jspwiki/trunk/etc/jspwiki.properties.tmpl
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/etc/jspwiki.properties.tmpl?rev=1431027&r1=1431026&r2=1431027&view=diff
==============================================================================
--- incubator/jspwiki/trunk/etc/jspwiki.properties.tmpl (original)
+++ incubator/jspwiki/trunk/etc/jspwiki.properties.tmpl Wed Jan 9 19:38:27 2013
@@ -100,14 +100,16 @@ jspwiki.usePageCache = true
#
# Determines where wiki files are kept for FileSystemProvider
-# and RCSFileProvider
+# and RCSFileProvider, i.e.:
+#
+# jspwiki.fileSystemProvider.pageDir = /p/web/www-data/jspwiki/
#
# If you're using Windows, then you must duplicate the backslashes.
# For example, use:
#
# jspwiki.fileSystemProvider.pageDir = C:\\Data\\jspwiki
-#
-jspwiki.fileSystemProvider.pageDir = @pagedir@
+#
+#
#
# The JSPWiki working directory. If not set, a temporary path will
Modified: incubator/jspwiki/trunk/src/org/apache/wiki/providers/AbstractFileProvider.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/org/apache/wiki/providers/AbstractFileProvider.java?rev=1431027&r1=1431026&r2=1431027&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/org/apache/wiki/providers/AbstractFileProvider.java (original)
+++ incubator/jspwiki/trunk/src/org/apache/wiki/providers/AbstractFileProvider.java Wed Jan 9 19:38:27 2013
@@ -78,7 +78,8 @@ public abstract class AbstractFileProvid
IOException, FileNotFoundException
{
log.debug("Initing FileSystemProvider");
- m_pageDirectory = WikiEngine.getRequiredProperty( properties, PROP_PAGEDIR );
+ m_pageDirectory = TextUtil.getStringProperty( properties, PROP_PAGEDIR,
+ System.getProperty( "user.home" ) + File.separator + "jspwiki-files" );
File f = new File(m_pageDirectory);