Author: gmazza
Date: Sun May 19 02:35:33 2013
New Revision: 1484212
URL: http://svn.apache.org/r1484212
Log:
Mavenized locations of remaining /etc files
Added:
incubator/jspwiki/trunk/src/main/config/dev/
incubator/jspwiki/trunk/src/main/config/dev/jspwiki-checkstyle.xml
- copied unchanged from r1484173,
incubator/jspwiki/trunk/etc/jspwiki-checkstyle.xml
incubator/jspwiki/trunk/src/main/config/dev/jspwiki-eclipse-codestyle.xml
- copied unchanged from r1484173,
incubator/jspwiki/trunk/etc/jspwiki-eclipse-codestyle.xml
incubator/jspwiki/trunk/src/main/config/jspwiki-container.policy
- copied unchanged from r1484173,
incubator/jspwiki/trunk/etc/jspwiki-container.policy
incubator/jspwiki/trunk/src/main/webapp/WEB-INF/groupdatabase.xml
- copied unchanged from r1484173,
incubator/jspwiki/trunk/etc/groupdatabase.xml
incubator/jspwiki/trunk/src/main/webapp/WEB-INF/jspwiki.properties
- copied, changed from r1484173,
incubator/jspwiki/trunk/etc/jspwiki.properties.tmpl
incubator/jspwiki/trunk/src/main/webapp/WEB-INF/userdatabase.xml
- copied unchanged from r1484173,
incubator/jspwiki/trunk/etc/userdatabase.xml
Removed:
incubator/jspwiki/trunk/etc/
Modified:
incubator/jspwiki/trunk/.classpath
incubator/jspwiki/trunk/ChangeLog
incubator/jspwiki/trunk/build.xml
incubator/jspwiki/trunk/pom.xml
incubator/jspwiki/trunk/src/main/java/org/apache/wiki/Release.java
incubator/jspwiki/trunk/src/main/java/org/apache/wiki/providers/BasicAttachmentProvider.java
Modified: incubator/jspwiki/trunk/.classpath
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/trunk/.classpath?rev=1484212&r1=1484211&r2=1484212&view=diff
==============================================================================
--- incubator/jspwiki/trunk/.classpath (original)
+++ incubator/jspwiki/trunk/.classpath Sun May 19 02:35:33 2013
@@ -25,7 +25,6 @@
<classpathentry kind="lib" path="lib/lucene-highlighter-3.6.0.jar"/>
<classpathentry kind="lib" path="lib/mail-1.4.jar"/>
<classpathentry kind="lib" path="lib/activation-1.1.jar"/>
- <classpathentry kind="lib" path="etc/i18n"/>
<classpathentry kind="lib" path="lib/freshcookies-security-0.60.jar"/>
<classpathentry kind="lib" path="lib/commons-httpclient-3.1.jar"/>
<classpathentry kind="lib" path="lib/commons-fileupload-1.2.1.jar"/>
Modified: incubator/jspwiki/trunk/ChangeLog
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/trunk/ChangeLog?rev=1484212&r1=1484211&r2=1484212&view=diff
==============================================================================
--- incubator/jspwiki/trunk/ChangeLog (original)
+++ incubator/jspwiki/trunk/ChangeLog Sun May 19 02:35:33 2013
@@ -1,5 +1,12 @@
2013-05-18 Glen Mazza (gmazza AT apache DOT org)
+ * 2.9.2-incubating-2
+
+ * Mavenized locations of remaining etc/ files.
+ * Defaulting storageDir to same "jspwiki-files" dir as pageDir.
+
+2013-05-18 Glen Mazza (gmazza AT apache DOT org)
+
* 2.9.2-incubating-1
* Removed filtering within DB and DB test creation scripts although
Modified: incubator/jspwiki/trunk/build.xml
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/trunk/build.xml?rev=1484212&r1=1484211&r2=1484212&view=diff
==============================================================================
--- incubator/jspwiki/trunk/build.xml (original)
+++ incubator/jspwiki/trunk/build.xml Sun May 19 02:35:33 2013
@@ -289,11 +289,11 @@
<target name="mkpropertyfile"
description="Builds the correct propertyfile from the
build.properties">
- <copy file="etc/jspwiki.properties.tmpl" tofile="etc/jspwiki.properties"
/>
+ <copy file="src/main/webapp/WEB-INF/jspwiki.properties"
tofile="target/etc/jspwiki.properties" />
<copy file="src/test/resources/jspwiki.properties"
tofile="target/test-classes/jspwiki.properties" />
<copy file="src/test/resources/jspwiki_rcs.properties"
tofile="target/test-classes/jspwiki_rcs.properties" />
<copy file="src/test/resources/jspwiki_vers.properties"
tofile="target/test-classes/jspwiki_vers.properties" />
- <replace file="etc/jspwiki.properties"
+ <replace file="target/etc/jspwiki.properties"
replacefilterfile="${build.properties}" />
<replace file="target/test-classes/jspwiki.properties"
replacefilterfile="${build.properties}" />
@@ -307,12 +307,11 @@
<target name="clean"
description="Cleans away all generated files.">
<delete file="cobertura.ser" />
- <delete dir="${tests.build}" />
+ <delete dir="${tests.build}" />
<delete dir="${code.build}" />
<delete dir="${tests.reports}" />
- <delete dir="${docs.javadoc}" />
+ <delete dir="${docs.javadoc}" />
<delete dir="${doc.rat}" />
- <delete file="etc/jspwiki.properties" />
<delete file="${code.i18n}/CoreResources_en.properties" />
<delete file="${code.i18n}/plugin/PluginResources_en.properties" />
<delete file="${code.i18n}/templates/default_en.properties" />
@@ -525,15 +524,15 @@
<lib file="${jarfile}" />
<!--lib file="${libs.tests}/stripes*.jar"/-->
<fileset dir="${code.resources}/webdocs" includes="**"
excludes="**/FCK/jsp" />
- <webinf dir="etc">
+ <webinf dir="target/etc">
<include name="jspwiki.properties" />
- <include name="userdatabase.xml" />
- <include name="groupdatabase.xml" />
</webinf>
<webinf dir="src/main/webapp/WEB-INF">
<include name="geronimo-web.xml" />
<include name="*.tld" />
<include name="jspwiki.policy" />
+ <include name="userdatabase.xml" />
+ <include name="groupdatabase.xml" />
</webinf>
</war>
Modified: incubator/jspwiki/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/trunk/pom.xml?rev=1484212&r1=1484211&r2=1484212&view=diff
==============================================================================
--- incubator/jspwiki/trunk/pom.xml (original)
+++ incubator/jspwiki/trunk/pom.xml Sun May 19 02:35:33 2013
@@ -276,12 +276,6 @@
<copy
file="src/main/resources/templates/default.properties"
tofile="target/classes/templates/default_en.properties"/>
<copy
file="src/main/resources/plugin/PluginResources.properties"
tofile="target/classes/plugin/PluginResources_en.properties"/>
- <copy file="etc/jspwiki.properties.tmpl"
tofile="etc/jspwiki.properties" />
-
- <!-- Filter the properties files -->
- <replace file="etc/jspwiki.properties"
- replacefilterfile="build.properties"
/>
-
<!-- Create web.xml files for testing -->
<copy file="src/main/webapp/WEB-INF/web.xml"
tofile="target/test-classes/WEB-INF/web.xml" />
@@ -398,13 +392,12 @@
<archiveClasses>true</archiveClasses>
<webResources>
<resource>
- <directory>etc</directory>
+ <directory>src/main/webapp/WEB-INF</directory>
<targetPath>WEB-INF</targetPath>
<includes>
- <include>userdatabase.xml</include>
- <include>groupdatabase.xml</include>
<include>jspwiki.properties</include>
</includes>
+ <filtering>true</filtering>
</resource>
<resource>
<directory>src/webdocs</directory>
Modified: incubator/jspwiki/trunk/src/main/java/org/apache/wiki/Release.java
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/main/java/org/apache/wiki/Release.java?rev=1484212&r1=1484211&r2=1484212&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/main/java/org/apache/wiki/Release.java
(original)
+++ incubator/jspwiki/trunk/src/main/java/org/apache/wiki/Release.java Sun May
19 02:35:33 2013
@@ -75,7 +75,7 @@ public final class Release
* <p>
* If the build identifier is empty, it is not added.
*/
- public static final String BUILD = "1";
+ public static final String BUILD = "2";
/**
* This is the generic version string you should use
Modified:
incubator/jspwiki/trunk/src/main/java/org/apache/wiki/providers/BasicAttachmentProvider.java
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/main/java/org/apache/wiki/providers/BasicAttachmentProvider.java?rev=1484212&r1=1484211&r2=1484212&view=diff
==============================================================================
---
incubator/jspwiki/trunk/src/main/java/org/apache/wiki/providers/BasicAttachmentProvider.java
(original)
+++
incubator/jspwiki/trunk/src/main/java/org/apache/wiki/providers/BasicAttachmentProvider.java
Sun May 19 02:35:33 2013
@@ -96,7 +96,8 @@ public class BasicAttachmentProvider
IOException
{
m_engine = engine;
- m_storageDir = TextUtil.getRequiredProperty( properties,
PROP_STORAGEDIR );
+ m_storageDir = TextUtil.getStringProperty( properties,
PROP_STORAGEDIR,
+ System.getProperty(
"user.home" ) + File.separator + "jspwiki-files" );
String patternString = engine.getWikiProperties().getProperty(
PROP_DISABLECACHE );
if ( patternString != null )
Copied: incubator/jspwiki/trunk/src/main/webapp/WEB-INF/jspwiki.properties
(from r1484173, incubator/jspwiki/trunk/etc/jspwiki.properties.tmpl)
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/main/webapp/WEB-INF/jspwiki.properties?p2=incubator/jspwiki/trunk/src/main/webapp/WEB-INF/jspwiki.properties&p1=incubator/jspwiki/trunk/etc/jspwiki.properties.tmpl&r1=1484173&r2=1484212&rev=1484212&view=diff
==============================================================================
--- incubator/jspwiki/trunk/etc/jspwiki.properties.tmpl (original)
+++ incubator/jspwiki/trunk/src/main/webapp/WEB-INF/jspwiki.properties Sun May
19 02:35:33 2013
@@ -108,9 +108,12 @@ jspwiki.usePageCache = true
# For example, use:
#
# jspwiki.fileSystemProvider.pageDir = C:\\Data\\jspwiki
-#
+#
+# If not provided, will default to a "jspwiki-files" directory
+# in the user's home folder.
#
+
#
# The JSPWiki working directory. If not set, a temporary path will
# be used. You can see the location of the workdir in the logs.
@@ -143,7 +146,9 @@ jspwiki.attachmentProvider = BasicAttach
#
# jspwiki.basicAttachmentProvider.storageDir = C:\\Data\\jspwiki
#
-jspwiki.basicAttachmentProvider.storageDir = @pagedir@
+# If not provided, will default to a "jspwiki-files" directory
+# in the user's home folder.
+#
#
# You can tell the BasicAttachmentProvider to add a flag
