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 2014/01/01 11:57:11 UTC
svn commit: r1554607 - in /jspwiki/trunk: ./
jspwiki-war/src/main/java/org/apache/wiki/
jspwiki-war/src/main/java/org/apache/wiki/plugin/
jspwiki-war/src/main/java/org/apache/wiki/providers/
jspwiki-war/src/main/resources/ini/ jspwiki-war/src/test/java...
Author: metskem
Date: Wed Jan 1 10:57:10 2014
New Revision: 1554607
URL: http://svn.apache.org/r1554607
Log:
2014-01-01 Harry Metske (metskem@apache.org)
* 2.10.0-svn-64
* dropped last pieces of RCS file support including ProviderConverter
Removed:
jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/providers/ProviderConverter.java
Modified:
jspwiki/trunk/ChangeLog
jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/Release.java
jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/plugin/WeblogPlugin.java
jspwiki/trunk/jspwiki-war/src/main/resources/ini/jspwiki.properties
jspwiki/trunk/jspwiki-war/src/test/java/org/apache/wiki/providers/VersioningFileProviderTest.java
Modified: jspwiki/trunk/ChangeLog
URL: http://svn.apache.org/viewvc/jspwiki/trunk/ChangeLog?rev=1554607&r1=1554606&r2=1554607&view=diff
==============================================================================
--- jspwiki/trunk/ChangeLog (original)
+++ jspwiki/trunk/ChangeLog Wed Jan 1 10:57:10 2014
@@ -1,3 +1,9 @@
+2014-01-01 Harry Metske (metskem@apache.org)
+
+ * 2.10.0-svn-64
+
+ * dropped last pieces of RCS file support including ProviderConverter
+
2013-12-31 Juan Pablo Santos (juanpablo AT apache DOT org)
* 2.10.0-svn-63
Modified: jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/Release.java
URL: http://svn.apache.org/viewvc/jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/Release.java?rev=1554607&r1=1554606&r2=1554607&view=diff
==============================================================================
--- jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/Release.java (original)
+++ jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/Release.java Wed Jan 1 10:57:10 2014
@@ -72,7 +72,7 @@ public final class Release {
* <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 when printing out the version. It is of
Modified: jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/plugin/WeblogPlugin.java
URL: http://svn.apache.org/viewvc/jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/plugin/WeblogPlugin.java?rev=1554607&r1=1554606&r2=1554607&view=diff
==============================================================================
--- jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/plugin/WeblogPlugin.java (original)
+++ jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/plugin/WeblogPlugin.java Wed Jan 1 10:57:10 2014
@@ -434,38 +434,10 @@ public class WeblogPlugin
if( pageName.startsWith( baseName ) )
{
- //
- // Check the creation date from the page name.
- // We do this because RCSFileProvider is very slow at getting a
- // specific page version.
- //
try
{
- //log.debug("Checking: "+pageName);
- int firstScore = pageName.indexOf('_',baseName.length()-1 );
- if( firstScore != -1 && firstScore+1 < pageName.length() )
- {
- int secondScore = pageName.indexOf('_', firstScore+1);
-
- if( secondScore != -1 )
- {
- String creationDate = pageName.substring( firstScore+1, secondScore );
-
- //log.debug(" Creation date: "+creationDate);
-
- Date pageDay = fmt.parse( creationDate );
-
- //
- // Add the first version of the page into the list. This way
- // the page modified date becomes the page creation date.
- //
- if( pageDay != null && pageDay.after(start) && pageDay.before(end) )
- {
- WikiPage firstVersion = mgr.getPageInfo( pageName, 1 );
- result.add( firstVersion );
- }
- }
- }
+ WikiPage firstVersion = mgr.getPageInfo( pageName, 1 );
+ result.add( firstVersion );
}
catch( Exception e )
{
Modified: jspwiki/trunk/jspwiki-war/src/main/resources/ini/jspwiki.properties
URL: http://svn.apache.org/viewvc/jspwiki/trunk/jspwiki-war/src/main/resources/ini/jspwiki.properties?rev=1554607&r1=1554606&r2=1554607&view=diff
==============================================================================
--- jspwiki/trunk/jspwiki-war/src/main/resources/ini/jspwiki.properties (original)
+++ jspwiki/trunk/jspwiki-war/src/main/resources/ini/jspwiki.properties Wed Jan 1 10:57:10 2014
@@ -51,12 +51,8 @@ jspwiki.baseURL=http://localhost:8080/JS
#
# Which page provider class to use. Possibilities are:
#
-# RCSFileProvider - for simple RCS-based file storage
# FileSystemProvider - for simple pure file storage with no version information
-# VersioningFileProvider - for simple, non-RCS based versioning storage.
-#
-# Note that if you're upgrading from JSPWiki 1.x, then you need to remove the
-# "org.apache.wiki." part from the beginning of the path.
+# VersioningFileProvider - for simple pure file storage with version information
#
jspwiki.pageProvider = FileSystemProvider
@@ -99,8 +95,7 @@ jspwiki.pageProvider = FileSystemProvide
jspwiki.usePageCache = true
#
-# Determines where wiki files are kept for FileSystemProvider
-# and RCSFileProvider, i.e.:
+# Determines where wiki files are kept for FileSystemProvider i.e.:
#
# jspwiki.fileSystemProvider.pageDir = /p/web/www-data/jspwiki/
#
Modified: jspwiki/trunk/jspwiki-war/src/test/java/org/apache/wiki/providers/VersioningFileProviderTest.java
URL: http://svn.apache.org/viewvc/jspwiki/trunk/jspwiki-war/src/test/java/org/apache/wiki/providers/VersioningFileProviderTest.java?rev=1554607&r1=1554606&r2=1554607&view=diff
==============================================================================
--- jspwiki/trunk/jspwiki-war/src/test/java/org/apache/wiki/providers/VersioningFileProviderTest.java (original)
+++ jspwiki/trunk/jspwiki-war/src/test/java/org/apache/wiki/providers/VersioningFileProviderTest.java Wed Jan 1 10:57:10 2014
@@ -252,10 +252,6 @@ public class VersioningFileProviderTest
File f = new File( files, NAME1+FileSystemProvider.FILE_EXT );
assertFalse( "file exists", f.exists() );
-
- f = new File( files, NAME1+".properties" );
-
- assertFalse( "RCS file exists", f.exists() );
}
public void testDeleteVersion()