Author: metskem
Date: Fri Oct 31 12:34:12 2008
New Revision: 709543
URL: http://svn.apache.org/viewvc?rev=709543&view=rev
Log:
2.8.1-svn-2 JSPWIKI-406 Renaming a page back to the old name destroys text
changes of the page, thanks to Stefan Bohn. Changed two annoying log.error's to
log.warn's
Modified:
incubator/jspwiki/branches/JSPWIKI_2_8_BRANCH/ChangeLog
incubator/jspwiki/branches/JSPWIKI_2_8_BRANCH/src/com/ecyrd/jspwiki/Release.java
incubator/jspwiki/branches/JSPWIKI_2_8_BRANCH/src/com/ecyrd/jspwiki/auth/authorize/XMLGroupDatabase.java
incubator/jspwiki/branches/JSPWIKI_2_8_BRANCH/src/com/ecyrd/jspwiki/auth/user/XMLUserDatabase.java
incubator/jspwiki/branches/JSPWIKI_2_8_BRANCH/src/com/ecyrd/jspwiki/providers/CachingProvider.java
Modified: incubator/jspwiki/branches/JSPWIKI_2_8_BRANCH/ChangeLog
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/branches/JSPWIKI_2_8_BRANCH/ChangeLog?rev=709543&r1=709542&r2=709543&view=diff
==============================================================================
--- incubator/jspwiki/branches/JSPWIKI_2_8_BRANCH/ChangeLog (original)
+++ incubator/jspwiki/branches/JSPWIKI_2_8_BRANCH/ChangeLog Fri Oct 31 12:34:12
2008
@@ -1,3 +1,11 @@
+2008-10-31 Harry Metske <[EMAIL PROTECTED]>
+
+ * 2.8.1-svn-2
+
+ * [JSPWIKI-406] Renaming a page back to the old name
+ destroys text changes of the page, thanks to Stefan Bohn.
+ * changed two annoying log.error's to log.warn's
+
2008-10-21 Janne Jalkanen <[EMAIL PROTECTED]>
* 2.8.1-svn-1
Modified:
incubator/jspwiki/branches/JSPWIKI_2_8_BRANCH/src/com/ecyrd/jspwiki/Release.java
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/branches/JSPWIKI_2_8_BRANCH/src/com/ecyrd/jspwiki/Release.java?rev=709543&r1=709542&r2=709543&view=diff
==============================================================================
---
incubator/jspwiki/branches/JSPWIKI_2_8_BRANCH/src/com/ecyrd/jspwiki/Release.java
(original)
+++
incubator/jspwiki/branches/JSPWIKI_2_8_BRANCH/src/com/ecyrd/jspwiki/Release.java
Fri Oct 31 12:34:12 2008
@@ -77,7 +77,7 @@
* <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/branches/JSPWIKI_2_8_BRANCH/src/com/ecyrd/jspwiki/auth/authorize/XMLGroupDatabase.java
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/branches/JSPWIKI_2_8_BRANCH/src/com/ecyrd/jspwiki/auth/authorize/XMLGroupDatabase.java?rev=709543&r1=709542&r2=709543&view=diff
==============================================================================
---
incubator/jspwiki/branches/JSPWIKI_2_8_BRANCH/src/com/ecyrd/jspwiki/auth/authorize/XMLGroupDatabase.java
(original)
+++
incubator/jspwiki/branches/JSPWIKI_2_8_BRANCH/src/com/ecyrd/jspwiki/auth/authorize/XMLGroupDatabase.java
Fri Oct 31 12:34:12 2008
@@ -199,7 +199,7 @@
String file = props.getProperty( PROP_DATABASE );
if ( file == null )
{
- log.error( "XML group database property " + PROP_DATABASE + " not
found; trying " + defaultFile );
+ log.warn( "XML group database property " + PROP_DATABASE + " not
found; trying " + defaultFile );
m_file = defaultFile;
}
else
Modified:
incubator/jspwiki/branches/JSPWIKI_2_8_BRANCH/src/com/ecyrd/jspwiki/auth/user/XMLUserDatabase.java
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/branches/JSPWIKI_2_8_BRANCH/src/com/ecyrd/jspwiki/auth/user/XMLUserDatabase.java?rev=709543&r1=709542&r2=709543&view=diff
==============================================================================
---
incubator/jspwiki/branches/JSPWIKI_2_8_BRANCH/src/com/ecyrd/jspwiki/auth/user/XMLUserDatabase.java
(original)
+++
incubator/jspwiki/branches/JSPWIKI_2_8_BRANCH/src/com/ecyrd/jspwiki/auth/user/XMLUserDatabase.java
Fri Oct 31 12:34:12 2008
@@ -277,7 +277,7 @@
String file = props.getProperty( PROP_USERDATABASE );
if( file == null )
{
- log.error( "XML user database property " + PROP_USERDATABASE + "
not found; trying " + defaultFile );
+ log.warn( "XML user database property " + PROP_USERDATABASE + "
not found; trying " + defaultFile );
c_file = defaultFile;
}
else
Modified:
incubator/jspwiki/branches/JSPWIKI_2_8_BRANCH/src/com/ecyrd/jspwiki/providers/CachingProvider.java
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/branches/JSPWIKI_2_8_BRANCH/src/com/ecyrd/jspwiki/providers/CachingProvider.java?rev=709543&r1=709542&r2=709543&view=diff
==============================================================================
---
incubator/jspwiki/branches/JSPWIKI_2_8_BRANCH/src/com/ecyrd/jspwiki/providers/CachingProvider.java
(original)
+++
incubator/jspwiki/branches/JSPWIKI_2_8_BRANCH/src/com/ecyrd/jspwiki/providers/CachingProvider.java
Fri Oct 31 12:34:12 2008
@@ -853,14 +853,21 @@
synchronized(this)
{
// Clear any cached version of the old page
- log.debug("Removing page "+from+" from cache");
- m_cache.removeEntry( from );
-
+ log.debug("Removing from page "+from+" from cache");
+// m_cache.removeEntry( from );
+ m_cache.putInCache( from, null );
+ m_textCache.putInCache( from, null );
+ m_historyCache.putInCache( from, null );
+ m_negCache.putInCache( from, from );
// Clear the cache for the to page, if that page already exists
//if ( m_cache.get( to ) != null )
//{
- log.debug("Removing page "+to+" from cache");
- m_cache.removeEntry( to );
+ log.debug("Removing to page "+to+" from cache");
+// m_cache.removeEntry( to );
+ m_cache.putInCache( to, null );
+ m_textCache.putInCache( to, null );
+ m_historyCache.putInCache( to, null );
+ m_negCache.putInCache( to, to );
//}
}
}
