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/02/06 18:54:43 UTC
svn commit: r741653 - in /incubator/jspwiki/trunk: ChangeLog
build.properties build.xml etc/dtd/ lib/
src/java/org/apache/wiki/Release.java
src/java/org/apache/wiki/content/PageRenamer.java
Author: metskem
Date: Fri Feb 6 17:54:42 2009
New Revision: 741653
URL: http://svn.apache.org/viewvc?rev=741653&view=rev
Log:
3.0.0-svn-64
JSPWIKI-477 Renamed pages are no longer in the Lucene index
deletion of the ./lib directory
deletion of the ./etc/dtd directory (containing web-app_2_3.dtd)
more tweaks to build.xml
Removed:
incubator/jspwiki/trunk/etc/dtd/
incubator/jspwiki/trunk/lib/
Modified:
incubator/jspwiki/trunk/ChangeLog
incubator/jspwiki/trunk/build.properties
incubator/jspwiki/trunk/build.xml
incubator/jspwiki/trunk/src/java/org/apache/wiki/Release.java
incubator/jspwiki/trunk/src/java/org/apache/wiki/content/PageRenamer.java
Modified: incubator/jspwiki/trunk/ChangeLog
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/ChangeLog?rev=741653&r1=741652&r2=741653&view=diff
==============================================================================
--- incubator/jspwiki/trunk/ChangeLog (original)
+++ incubator/jspwiki/trunk/ChangeLog Fri Feb 6 17:54:42 2009
@@ -1,3 +1,16 @@
+2009-02-06 Harry Metske <me...@apache.org>
+
+ * 3.0.0-svn-64
+
+ * JSPWIKI-477 Renamed pages are no longer in the Lucene index
+ * deletion of the ./lib directory
+ * deletion of the ./etc/dtd directory (containing web-app_2_3.dtd)
+ * more tweaks to build.xml
+ no duplicates in the warfile anymore now
+ take the web.xml that has been filled with compiled jsp stuff
+ but still more improvements necessary
+ (should we have a priha.properties in WEB-INF/classes ?)
+
2009-02-05 Andrew Jaquith <ajaquith AT apache DOT org>
* 3.0.0-svn-63
Modified: incubator/jspwiki/trunk/build.properties
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/build.properties?rev=741653&r1=741652&r2=741653&view=diff
==============================================================================
--- incubator/jspwiki/trunk/build.properties (original)
+++ incubator/jspwiki/trunk/build.properties Fri Feb 6 17:54:42 2009
@@ -28,7 +28,7 @@
# Set this property to 'true' if you want to build WARs
# that contain pre-compiled JSPs (which load faster).
-#compile.jsps = false
+compile.jsps = true
# Enable these if you wish to create a static content tarball
# for use with Apache or another front-end web server.
Modified: incubator/jspwiki/trunk/build.xml
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/build.xml?rev=741653&r1=741652&r2=741653&view=diff
==============================================================================
--- incubator/jspwiki/trunk/build.xml (original)
+++ incubator/jspwiki/trunk/build.xml Fri Feb 6 17:54:42 2009
@@ -385,7 +385,7 @@
<delete quiet="true">
<fileset dir="${code.build}" includes="JSPWiki-jsp.jar,jasper-runtime-*.jar,commons-el-*.jar"/>
</delete>
- <!--<copy file="etc/web.xml" toFile="${code.build}/web.xml" overwrite="true" /> -->
+ <copy file="${code.web}/WEB-INF/web.xml" toFile="${code.build}/web.xml" overwrite="false" />
</target>
<target name="war" depends="war-init,jar,jar-compiled-jsps,compressedjs"
@@ -396,20 +396,14 @@
<delete file="${warfile}" />
<war destfile="${warfile}"
- webxml="${code.web}/WEB-INF/web.xml" duplicate="preserve">
+ webxml="${code.build}/web.xml" duplicate="preserve">
<lib file="${jarfile}" />
<lib file="${code.build}/JSPWiki-jsp.jar" />
<lib file="${code.build}/jasper-runtime-*.jar" />
<lib file="${code.build}/commons-el-*.jar" />
<fileset dir="${tmpdir}/compress/webdocs/" includes="**/*.js" />
<fileset dir="${tmpdir}/compress/webdocs/" includes="**/*.css" />
- <fileset dir="${code.web}" includes="**" excludes="**/servlet-api.jar **/jsp-api.jar" />
- <!--
- <classes dir="etc">
- <include name="oscache.properties" />
- <include name="log4j.properties" />
- </classes>
- -->
+ <fileset dir="${code.web}" includes="**" excludes="**/servlet-api.jar **/jsp-api.jar WEB-INF/web.xml" />
</war>
</target>
Modified: incubator/jspwiki/trunk/src/java/org/apache/wiki/Release.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/java/org/apache/wiki/Release.java?rev=741653&r1=741652&r2=741653&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/java/org/apache/wiki/Release.java (original)
+++ incubator/jspwiki/trunk/src/java/org/apache/wiki/Release.java Fri Feb 6 17:54:42 2009
@@ -77,7 +77,7 @@
* <p>
* If the build identifier is empty, it is not added.
*/
- public static final String BUILD = "63";
+ public static final String BUILD = "64";
/**
* This is the generic version string you should use
Modified: incubator/jspwiki/trunk/src/java/org/apache/wiki/content/PageRenamer.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/java/org/apache/wiki/content/PageRenamer.java?rev=741653&r1=741652&r2=741653&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/java/org/apache/wiki/content/PageRenamer.java (original)
+++ incubator/jspwiki/trunk/src/java/org/apache/wiki/content/PageRenamer.java Fri Feb 6 17:54:42 2009
@@ -161,7 +161,12 @@
updateReferrers( context, fromPage, toPage, referrers );
}
+ //
+ // re-index the page
+ //
+ engine.getSearchManager().reindexPage(toPage);
+
//
// Done, return the new name.
//