jspwiki-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mets...@apache.org
Subject svn commit: r1735154 - in /jspwiki/trunk: ChangeLog jspwiki-war/src/main/java/org/apache/wiki/Release.java jspwiki-war/src/main/java/org/apache/wiki/providers/VersioningFileProvider.java
Date Tue, 15 Mar 2016 18:18:02 GMT
Author: metskem
Date: Tue Mar 15 18:18:01 2016
New Revision: 1735154

URL: http://svn.apache.org/viewvc?rev=1735154&view=rev
Log:
* 2.10.3-svn-6

       * Fixed JSPWIKI-931 VersioningFileProvider sets page author to "unknown" when it should
be an authenticated user

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/providers/VersioningFileProvider.java

Modified: jspwiki/trunk/ChangeLog
URL: http://svn.apache.org/viewvc/jspwiki/trunk/ChangeLog?rev=1735154&r1=1735153&r2=1735154&view=diff
==============================================================================
--- jspwiki/trunk/ChangeLog (original)
+++ jspwiki/trunk/ChangeLog Tue Mar 15 18:18:01 2016
@@ -1,3 +1,10 @@
+2016-03-15  Harry Metske (metskem@apache.org)
+
+       * 2.10.3-svn-6
+
+       * Fixed JSPWIKI-931 VersioningFileProvider sets page author to "unknown" when it should
be an authenticated user
+
+
 2016-03-12  Dirk Frederickx (brushed AT apache DOT org)
 
        * 2.10.3-svn-5  

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=1735154&r1=1735153&r2=1735154&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 Tue Mar 15 18:18:01
2016
@@ -72,7 +72,7 @@ public final class Release {
      *  <p>
      *  If the build identifier is empty, it is not added.
      */
-    public static final String     BUILD         = "5";
+    public static final String     BUILD         = "6";
 
     /**
      *  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/providers/VersioningFileProvider.java
URL: http://svn.apache.org/viewvc/jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/providers/VersioningFileProvider.java?rev=1735154&r1=1735153&r2=1735154&view=diff
==============================================================================
--- jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/providers/VersioningFileProvider.java
(original)
+++ jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/providers/VersioningFileProvider.java
Tue Mar 15 18:18:01 2016
@@ -491,7 +491,9 @@ public class VersioningFileProvider
             Properties props = getPageProperties( page.getName() );
 
             String authorFirst = null;
-            if ( firstUpdate )
+            // if the following file exists, we are NOT migrating from FileSystemProvider
+            File pagePropFile = new File(getPageDirectory() + File.separator + PAGEDIR +
File.separator + mangleName(page.getName()) + File.separator + "page" + FileSystemProvider.PROP_EXT);
+            if ( firstUpdate && ! pagePropFile.exists())
             {
                 // we might not yet have a versioned author because the
                 // old page was last maintained by FileSystemProvider



Mime
View raw message