You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jspwiki.apache.org by gm...@apache.org on 2013/05/20 22:39:55 UTC
svn commit: r1484586 - in /incubator/jspwiki/trunk: ChangeLog build.xml
src/main/config/wikipages/ src/main/java/org/apache/wiki/Release.java
src/wikipages/
Author: gmazza
Date: Mon May 20 20:39:53 2013
New Revision: 1484586
URL: http://svn.apache.org/r1484586
Log:
Mavenized location of wikipages files.
Added:
incubator/jspwiki/trunk/src/main/config/wikipages/
- copied from r1484582, incubator/jspwiki/trunk/src/wikipages/
Removed:
incubator/jspwiki/trunk/src/wikipages/
Modified:
incubator/jspwiki/trunk/ChangeLog
incubator/jspwiki/trunk/build.xml
incubator/jspwiki/trunk/src/main/java/org/apache/wiki/Release.java
Modified: incubator/jspwiki/trunk/ChangeLog
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/ChangeLog?rev=1484586&r1=1484585&r2=1484586&view=diff
==============================================================================
--- incubator/jspwiki/trunk/ChangeLog (original)
+++ incubator/jspwiki/trunk/ChangeLog Mon May 20 20:39:53 2013
@@ -1,3 +1,9 @@
+2013-05-20 Glen Mazza (gmazza AT apache DOT org)
+
+ * 2.9.2-incubating-4
+
+ * Mavenized location of src/wikipages files
+
2013-05-19 Glen Mazza (gmazza AT apache DOT org)
* 2.9.2-incubating-3
Modified: incubator/jspwiki/trunk/build.xml
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/build.xml?rev=1484586&r1=1484585&r2=1484586&view=diff
==============================================================================
--- incubator/jspwiki/trunk/build.xml (original)
+++ incubator/jspwiki/trunk/build.xml Mon May 20 20:39:53 2013
@@ -640,43 +640,43 @@
</target>
<!-- Creates a zip of all the core pages. The file which determines
- whether a page is a core page or not is found in src/wikipages/.corepages -->
+ whether a page is a core page or not is found in src/main/config/wikipages/.corepages -->
<target name="corepageszip" depends="installinit">
<zip zipfile="${install.fulldir}/${ant.project.name}-corepages_en.zip"
- basedir="src/wikipages/en" includesfile="src/wikipages/.corepages">
+ basedir="src/main/config/wikipages/en" includesfile="src/main/config/wikipages/.corepages">
</zip>
<zip zipfile="${install.fulldir}/${ant.project.name}-corepages_fi.zip"
- basedir="src/wikipages/fi" includesfile="src/wikipages/.corepages">
+ basedir="src/main/config/wikipages/fi" includesfile="src/main/config/wikipages/.corepages">
</zip>
<zip zipfile="${install.fulldir}/${ant.project.name}-corepages_de.zip"
- basedir="src/wikipages/de">
+ basedir="src/main/config/wikipages/de">
</zip>
<zip zipfile="${install.fulldir}/${ant.project.name}-corepages_zh_CN.zip"
- basedir="src/wikipages/zh_CN">
+ basedir="src/main/config/wikipages/zh_CN">
</zip>
<zip zipfile="${install.fulldir}/${ant.project.name}-corepages_es.zip"
- basedir="src/wikipages/es" includesfile="src/wikipages/.corepages">
+ basedir="src/main/config/wikipages/es" includesfile="src/main/config/wikipages/.corepages">
</zip>
<zip zipfile="${install.fulldir}/${ant.project.name}-corepages_nl.zip"
- basedir="src/wikipages/nl">
+ basedir="src/main/config/wikipages/nl">
</zip>
<zip zipfile="${install.fulldir}/${ant.project.name}-corepages_fr.zip"
- basedir="src/wikipages/fr">
+ basedir="src/main/config/wikipages/fr">
</zip>
<zip zipfile="${install.fulldir}/${ant.project.name}-corepages_it.zip"
- basedir="src/wikipages/it">
+ basedir="src/main/config/wikipages/it">
</zip>
<zip zipfile="${install.fulldir}/${ant.project.name}-corepages_pt_BR.zip"
- basedir="src/wikipages/pt_BR">
+ basedir="src/main/config/wikipages/pt_BR">
</zip>
<!-- Add other languages here -->
@@ -691,7 +691,7 @@
<zip zipfile="${install.fulldir}/${ant.project.name}-doc.zip">
<zipfileset dir="doc" prefix="doc" excludes="rat/**" />
- <zipfileset dir="src/wikipages" prefix="doc/wikipages" excludes="**/.??*" />
+ <zipfileset dir="src/main/config/wikipages" prefix="doc/wikipages" excludes="**/.??*" />
</zip>
</target>
@@ -1007,7 +1007,7 @@ If all of the tests ran successfully, th
<!-- Create a wiki page directory and point jspwiki.properties to it -->
<mkdir dir="@{context.dir}/wikipages" />
<copy toDir="@{context.dir}/wikipages" flatten="true" >
- <fileset dir="src/wikipages/en">
+ <fileset dir="src/main/config/wikipages/en">
<include name="Main.*" />
<include name="LeftMenu*.*" />
<include name="About.*" />
@@ -1479,14 +1479,14 @@ To automate the JAR signing processs, yo
Exclusions and their reasons:
- .* and .*/** are automatically created configuration files
- doc/LICENSE.* are third-party licenses
- - ${code.src}/wikipages/** are default wiki pages for use in JSPWiki installations
+ - ${code.src}/main/config/wikipages/** are default wiki pages for use in JSPWiki installations
- all others are directories which contain generated output and third-party binary libraries
-->
<report reportFile="${doc.rat}/rat-report.txt" addLicenseHeaders="false">
<fileset dir="."
excludes=".*, .*/**,
doc/LICENSE.*,
- ${code.resources}/wikipages/**,
+ ${code.resources}//**,
${code.build}/**,
${tests.build}/**,
${tests.reports}/**,
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=1484586&r1=1484585&r2=1484586&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 Mon May 20 20:39:53 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 = "3";
+ public static final String BUILD = "4";
/**
* This is the generic version string you should use