Author: jalkanen
Date: Wed Jun 11 13:30:37 2008
New Revision: 666830
URL: http://svn.apache.org/viewvc?rev=666830&view=rev
Log:
JSPWIKI-290: ReferenceManager was not updating the page references correctly
after a rename.
Added:
incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/PageManagerTest.java
incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/content/
incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/content/AllTests.java
incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/content/PageRenamerTest.java
- copied, changed from r666821,
incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/PageRenamerTest.java
Removed:
incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/PageRenamerTest.java
Modified:
incubator/jspwiki/trunk/ChangeLog
incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/Release.java
incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/content/PageRenamer.java
incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/AllTests.java
Modified: incubator/jspwiki/trunk/ChangeLog
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/trunk/ChangeLog?rev=666830&r1=666829&r2=666830&view=diff
==============================================================================
--- incubator/jspwiki/trunk/ChangeLog (original)
+++ incubator/jspwiki/trunk/ChangeLog Wed Jun 11 13:30:37 2008
@@ -1,5 +1,12 @@
2008-06-09 Janne Jalkanen <[EMAIL PROTECTED]>
+ * 2.7.0-svn-37
+
+ * JSPWIKI-290: ReferenceManager was not updating the page
+ references correctly after a rename. Fix by Harry Metske.
+
+2008-06-09 Janne Jalkanen <[EMAIL PROTECTED]>
+
* 2.7.0-svn-36
* JSPWIKI-14: checkPermissions code in MetaWeblogHandler is now
Modified: incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/Release.java
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/Release.java?rev=666830&r1=666829&r2=666830&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/Release.java (original)
+++ incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/Release.java Wed Jun 11
13:30:37 2008
@@ -77,7 +77,7 @@
* <p>
* If the build identifier is empty, it is not added.
*/
- public static final String BUILD = "36";
+ public static final String BUILD = "37";
/**
* This is the generic version string you should use
Modified: incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/content/PageRenamer.java
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/content/PageRenamer.java?rev=666830&r1=666829&r2=666830&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/content/PageRenamer.java
(original)
+++ incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/content/PageRenamer.java Wed
Jun 11 13:30:37 2008
@@ -144,8 +144,7 @@
//
engine.getReferenceManager().pageRemoved( fromPage );
- engine.getReferenceManager().updateReferences( renameTo,
- engine.scanWikiLinks(
toPage, engine.getPureText( toPage )) );
+ engine.updateReferences( toPage );
//
// Update referrers first
@@ -218,8 +217,7 @@
try
{
engine.getPageManager().putPageText( p, newText );
- engine.getReferenceManager().updateReferences(
p.getName(),
-
engine.scanWikiLinks( p, engine.getPureText( p )) );
+ engine.updateReferences( p );
}
catch( ProviderException e )
{
Modified: incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/AllTests.java
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/AllTests.java?rev=666830&r1=666829&r2=666830&view=diff
==============================================================================
--- incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/AllTests.java (original)
+++ incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/AllTests.java Wed Jun 11
13:30:37 2008
@@ -1,12 +1,17 @@
package com.ecyrd.jspwiki;
-import java.util.Properties;
-import org.apache.log4j.PropertyConfigurator;
import java.io.IOException;
import java.io.InputStream;
+import java.util.Properties;
+
+import junit.framework.Test;
+import junit.framework.TestCase;
+import junit.framework.TestSuite;
+
+import org.apache.log4j.PropertyConfigurator;
-import junit.framework.*;
+import com.ecyrd.jspwiki.content.PageRenamerTest;
public class AllTests extends TestCase
{
@@ -43,7 +48,6 @@
suite.addTest( FileUtilTest.suite() );
suite.addTest( PageManagerTest.suite() );
- suite.addTest( PageRenamerTest.suite() );
suite.addTest( PropertyReaderTest.suite() );
suite.addTest( ReferenceManagerTest.suite() );
suite.addTest( ReleaseTest.suite() );
@@ -53,6 +57,7 @@
// suite.addTest( TranslatorReaderTest.suite() );
suite.addTest( WikiSessionTest.suite() );
suite.addTest( WikiEngineTest.suite() );
+ suite.addTest( com.ecyrd.jspwiki.content.AllTests.suite() );
suite.addTest( com.ecyrd.jspwiki.attachment.AllTests.suite() );
suite.addTest( com.ecyrd.jspwiki.auth.AllTests.suite() );
suite.addTest( com.ecyrd.jspwiki.dav.AllTests.suite() );
Added: incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/PageManagerTest.java
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/PageManagerTest.java?rev=666830&view=auto
==============================================================================
--- incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/PageManagerTest.java (added)
+++ incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/PageManagerTest.java Wed
Jun 11 13:30:37 2008
@@ -0,0 +1,61 @@
+
+package com.ecyrd.jspwiki;
+
+import java.util.Properties;
+
+import junit.framework.Test;
+import junit.framework.TestCase;
+import junit.framework.TestSuite;
+
+import org.apache.log4j.PropertyConfigurator;
+
+import com.ecyrd.jspwiki.PageManager;
+import com.ecyrd.jspwiki.providers.CachingProvider;
+
+public class PageManagerTest extends TestCase
+{
+ Properties props = new Properties();
+
+ TestEngine engine;
+
+ public PageManagerTest( String s )
+ {
+ super( s );
+ }
+
+ public void setUp()
+ throws Exception
+ {
+ props.load( TestEngine.findTestProperties() );
+ PropertyConfigurator.configure(props);
+ engine = new TestEngine(props);
+ }
+
+ public void tearDown()
+ {
+ }
+
+ public void testPageCacheExists()
+ throws Exception
+ {
+ props.setProperty( "jspwiki.usePageCache", "true" );
+ PageManager m = new PageManager( engine, props );
+
+ assertTrue( m.getProvider() instanceof CachingProvider );
+ }
+
+ public void testPageCacheNotInUse()
+ throws Exception
+ {
+ props.setProperty( "jspwiki.usePageCache", "false" );
+ PageManager m = new PageManager( engine, props );
+
+ assertTrue( !(m.getProvider() instanceof CachingProvider) );
+ }
+
+ public static Test suite()
+ {
+ return new TestSuite( PageManagerTest.class );
+ }
+
+}
Added: incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/content/AllTests.java
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/content/AllTests.java?rev=666830&view=auto
==============================================================================
--- incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/content/AllTests.java
(added)
+++ incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/content/AllTests.java Wed
Jun 11 13:30:37 2008
@@ -0,0 +1,25 @@
+
+package com.ecyrd.jspwiki.content;
+
+import com.ecyrd.jspwiki.PageManagerTest;
+
+import junit.framework.Test;
+import junit.framework.TestCase;
+import junit.framework.TestSuite;
+
+public class AllTests extends TestCase
+{
+ public AllTests( String s )
+ {
+ super( s );
+ }
+
+ public static Test suite()
+ {
+ TestSuite suite = new TestSuite("JSPWiki Content Unit Tests");
+
+ suite.addTest( PageRenamerTest.suite() );
+
+ return suite;
+ }
+}
Copied:
incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/content/PageRenamerTest.java
(from r666821,
incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/PageRenamerTest.java)
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/content/PageRenamerTest.java?p2=incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/content/PageRenamerTest.java&p1=incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/PageRenamerTest.java&r1=666821&r2=666830&rev=666830&view=diff
==============================================================================
--- incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/PageRenamerTest.java
(original)
+++
incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/content/PageRenamerTest.java
Wed Jun 11 13:30:37 2008
@@ -1,4 +1,4 @@
-package com.ecyrd.jspwiki;
+package com.ecyrd.jspwiki.content;
import java.util.Collection;
import java.util.Properties;
@@ -7,6 +7,7 @@
import junit.framework.TestCase;
import junit.framework.TestSuite;
+import com.ecyrd.jspwiki.*;
import com.ecyrd.jspwiki.attachment.Attachment;
public class PageRenamerTest extends TestCase
