jspwiki-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From juanpa...@apache.org
Subject svn commit: r1608880 - in /jspwiki/trunk: ./ jspwiki-war/ jspwiki-war/src/test/java/org/apache/wiki/ jspwiki-war/src/test/java/org/apache/wiki/attachment/ jspwiki-war/src/test/java/org/apache/wiki/content/ jspwiki-war/src/test/java/org/apache/wiki/pars...
Date Tue, 08 Jul 2014 18:40:04 GMT
Author: juanpablo
Date: Tue Jul  8 18:40:03 2014
New Revision: 1608880

URL: http://svn.apache.org/r1608880
Log:
proper migration to ehcache 2.8.3

stripes updated to 1.5.8

added inceptionYear on builder pom, set to 2001 (o.a.w.Release dates from 06/07/2001) - was
missing on javadocs' footer

maven-surefire-plugin updated to 2.17

Modified:
    jspwiki/trunk/LICENSE
    jspwiki/trunk/jspwiki-war/pom.xml
    jspwiki/trunk/jspwiki-war/src/test/java/org/apache/wiki/ReferenceManagerTest.java
    jspwiki/trunk/jspwiki-war/src/test/java/org/apache/wiki/WikiEngineTest.java
    jspwiki/trunk/jspwiki-war/src/test/java/org/apache/wiki/attachment/AttachmentManagerTest.java
    jspwiki/trunk/jspwiki-war/src/test/java/org/apache/wiki/content/PageRenamerTest.java
    jspwiki/trunk/jspwiki-war/src/test/java/org/apache/wiki/parser/JSPWikiMarkupParserTest.java
    jspwiki/trunk/jspwiki-war/src/test/java/org/apache/wiki/plugin/PageViewPluginTest.java
    jspwiki/trunk/jspwiki-war/src/test/java/org/apache/wiki/plugin/RecentChangesPluginTest.java
    jspwiki/trunk/jspwiki-war/src/test/java/org/apache/wiki/plugin/ReferringUndefinedPagesPluginTest.java
    jspwiki/trunk/jspwiki-war/src/test/java/org/apache/wiki/plugin/UndefinedPagesPluginTest.java
    jspwiki/trunk/jspwiki-war/src/test/java/org/apache/wiki/providers/CachingProviderTest.java
    jspwiki/trunk/jspwiki-war/src/test/java/org/apache/wiki/providers/VersioningFileProviderTest.java
    jspwiki/trunk/jspwiki-war/src/test/java/org/apache/wiki/render/RenderingManagerTest.java
    jspwiki/trunk/jspwiki-war/src/test/java/org/apache/wiki/rss/RSSGeneratorTest.java
    jspwiki/trunk/jspwiki-war/src/test/java/org/apache/wiki/search/SearchManagerTest.java
    jspwiki/trunk/jspwiki-war/src/test/java/org/apache/wiki/stress/MassiveRepositoryTest.java
    jspwiki/trunk/jspwiki-war/src/test/java/org/apache/wiki/xmlrpc/RPCHandlerTest.java
    jspwiki/trunk/pom.xml

Modified: jspwiki/trunk/LICENSE
URL: http://svn.apache.org/viewvc/jspwiki/trunk/LICENSE?rev=1608880&r1=1608879&r2=1608880&view=diff
==============================================================================
--- jspwiki/trunk/LICENSE (original)
+++ jspwiki/trunk/LICENSE Tue Jul  8 18:40:03 2014
@@ -230,7 +230,7 @@ lucene-memory-4.7.0.jar                 
 mail-1.4.7.jar                              doc/LICENSE.cddl
 nekohtml-0.9.5.jar                          LICENSE
 oro-2.0.8.jar                               LICENSE
-ehcache-core-2.6.9.jar                      LICENSE
+ehcache-2.8.3.jar                           LICENSE
 sandler-0.5.jar                             doc/LICENSE.sandler
 servlet-api-2.5.jar                         doc/LICENSE.cddl
 slf4-api-1.7.7.jar                          doc/LICENSE.mit
@@ -248,7 +248,7 @@ junit-4.11.jar                          
 selenium-chrome-driver-2.42.0.jar           LICENSE
 selenium-firefox-driver-2.42.0.jar          LICENSE
 selenium-ie-driver-2.42.0.jar               LICENSE
-stripes-1.5.7-classloaderfix.jar            LICENSE
+stripes-1.5.8.jar                           LICENSE
 xercesImpl-2.6.2.jar                        LICENSE
 xml-apis-1.0.b2.jar                         LICENSE
 yuicompressor-2.4.7.jar                     doc/LICENSE.yui

Modified: jspwiki/trunk/jspwiki-war/pom.xml
URL: http://svn.apache.org/viewvc/jspwiki/trunk/jspwiki-war/pom.xml?rev=1608880&r1=1608879&r2=1608880&view=diff
==============================================================================
--- jspwiki/trunk/jspwiki-war/pom.xml (original)
+++ jspwiki/trunk/jspwiki-war/pom.xml Tue Jul  8 18:40:03 2014
@@ -70,8 +70,9 @@
 
     <dependency>
       <groupId>net.sf.ehcache</groupId>
-      <artifactId>ehcache-core</artifactId>
+      <artifactId>ehcache</artifactId>
     </dependency>
+    
     <dependency>
       <groupId>oro</groupId>
       <artifactId>oro</artifactId>
@@ -87,10 +88,10 @@
       <artifactId>log4j</artifactId>
     </dependency>
 
-      <dependency>
-          <groupId>org.slf4j</groupId>
-          <artifactId>slf4j-log4j12</artifactId>
-      </dependency>
+    <dependency>
+      <groupId>org.slf4j</groupId>
+      <artifactId>slf4j-log4j12</artifactId>
+    </dependency>
 
     <dependency>
       <groupId>com.metaparadigm</groupId>

Modified: jspwiki/trunk/jspwiki-war/src/test/java/org/apache/wiki/ReferenceManagerTest.java
URL: http://svn.apache.org/viewvc/jspwiki/trunk/jspwiki-war/src/test/java/org/apache/wiki/ReferenceManagerTest.java?rev=1608880&r1=1608879&r2=1608880&view=diff
==============================================================================
--- jspwiki/trunk/jspwiki-war/src/test/java/org/apache/wiki/ReferenceManagerTest.java (original)
+++ jspwiki/trunk/jspwiki-war/src/test/java/org/apache/wiki/ReferenceManagerTest.java Tue
Jul  8 18:40:03 2014
@@ -13,7 +13,6 @@
  */
 package org.apache.wiki;
 
-import java.io.File;
 import java.util.Collection;
 import java.util.Iterator;
 import java.util.Properties;
@@ -22,7 +21,6 @@ import java.util.Set;
 import junit.framework.Test;
 import junit.framework.TestCase;
 import junit.framework.TestSuite;
-
 import net.sf.ehcache.CacheManager;
 
 import org.apache.wiki.api.exceptions.WikiException;
@@ -70,7 +68,7 @@ public class ReferenceManagerTest extend
         // jspwiki always uses a singleton CacheManager, so
         // clear the cache at the end of every test case to avoid
         // polluting another test case
-        CacheManager.getInstance().removalAll();
+        CacheManager.getInstance().removeAllCaches();
     }
 
     public void testNonExistant1()

Modified: jspwiki/trunk/jspwiki-war/src/test/java/org/apache/wiki/WikiEngineTest.java
URL: http://svn.apache.org/viewvc/jspwiki/trunk/jspwiki-war/src/test/java/org/apache/wiki/WikiEngineTest.java?rev=1608880&r1=1608879&r2=1608880&view=diff
==============================================================================
--- jspwiki/trunk/jspwiki-war/src/test/java/org/apache/wiki/WikiEngineTest.java (original)
+++ jspwiki/trunk/jspwiki-war/src/test/java/org/apache/wiki/WikiEngineTest.java Tue Jul  8
18:40:03 2014
@@ -67,7 +67,7 @@ public class WikiEngineTest extends Test
     {
         props.setProperty( WikiEngine.PROP_MATCHPLURALS, "true" );
 
-        CacheManager.getInstance().removalAll();
+        CacheManager.getInstance().removeAllCaches();
 
         TestEngine.emptyWorkDir();
         m_engine = new TestEngine(props);        

Modified: jspwiki/trunk/jspwiki-war/src/test/java/org/apache/wiki/attachment/AttachmentManagerTest.java
URL: http://svn.apache.org/viewvc/jspwiki/trunk/jspwiki-war/src/test/java/org/apache/wiki/attachment/AttachmentManagerTest.java?rev=1608880&r1=1608879&r2=1608880&view=diff
==============================================================================
--- jspwiki/trunk/jspwiki-war/src/test/java/org/apache/wiki/attachment/AttachmentManagerTest.java
(original)
+++ jspwiki/trunk/jspwiki-war/src/test/java/org/apache/wiki/attachment/AttachmentManagerTest.java
Tue Jul  8 18:40:03 2014
@@ -55,7 +55,7 @@ public class AttachmentManagerTest exten
     {
         CacheManager m_cacheManager = CacheManager.getInstance();
         m_cacheManager.clearAll();
-        m_cacheManager.removalAll();
+        m_cacheManager.removeAllCaches();
 
         m_engine  = new TestEngine(props);
         m_manager = m_engine.getAttachmentManager();
@@ -244,7 +244,7 @@ public class AttachmentManagerTest exten
 
         m_manager.storeAttachment( att, makeAttachmentFile() );
 
-        Collection c = m_manager.listAttachments( new WikiPage(m_engine, NAME1) );
+        Collection<?> c = m_manager.listAttachments( new WikiPage(m_engine, NAME1)
);
 
         assertEquals( "Length", 1, c.size() );
 

Modified: jspwiki/trunk/jspwiki-war/src/test/java/org/apache/wiki/content/PageRenamerTest.java
URL: http://svn.apache.org/viewvc/jspwiki/trunk/jspwiki-war/src/test/java/org/apache/wiki/content/PageRenamerTest.java?rev=1608880&r1=1608879&r2=1608880&view=diff
==============================================================================
--- jspwiki/trunk/jspwiki-war/src/test/java/org/apache/wiki/content/PageRenamerTest.java (original)
+++ jspwiki/trunk/jspwiki-war/src/test/java/org/apache/wiki/content/PageRenamerTest.java Tue
Jul  8 18:40:03 2014
@@ -24,9 +24,13 @@ import java.util.Properties;
 import junit.framework.Test;
 import junit.framework.TestCase;
 import junit.framework.TestSuite;
-
 import net.sf.ehcache.CacheManager;
-import org.apache.wiki.*;
+
+import org.apache.wiki.TestEngine;
+import org.apache.wiki.WikiContext;
+import org.apache.wiki.WikiEngine;
+import org.apache.wiki.WikiPage;
+import org.apache.wiki.WikiProvider;
 import org.apache.wiki.api.exceptions.WikiException;
 import org.apache.wiki.attachment.Attachment;
 
@@ -42,7 +46,7 @@ public class PageRenamerTest extends Tes
 
         props.setProperty( WikiEngine.PROP_MATCHPLURALS, "true" );
 
-        CacheManager.getInstance().removalAll();
+        CacheManager.getInstance().removeAllCaches();
 
         TestEngine.emptyWorkDir();
 

Modified: jspwiki/trunk/jspwiki-war/src/test/java/org/apache/wiki/parser/JSPWikiMarkupParserTest.java
URL: http://svn.apache.org/viewvc/jspwiki/trunk/jspwiki-war/src/test/java/org/apache/wiki/parser/JSPWikiMarkupParserTest.java?rev=1608880&r1=1608879&r2=1608880&view=diff
==============================================================================
--- jspwiki/trunk/jspwiki-war/src/test/java/org/apache/wiki/parser/JSPWikiMarkupParserTest.java
(original)
+++ jspwiki/trunk/jspwiki-war/src/test/java/org/apache/wiki/parser/JSPWikiMarkupParserTest.java
Tue Jul  8 18:40:03 2014
@@ -65,7 +65,7 @@ public class JSPWikiMarkupParserTest ext
     public void setUp()
     throws Exception
     {
-        CacheManager.getInstance().removalAll();
+        CacheManager.getInstance().removeAllCaches();
 
         props.setProperty( "jspwiki.translatorReader.matchEnglishPlurals", "true" );
         testEngine = new TestEngine( props );

Modified: jspwiki/trunk/jspwiki-war/src/test/java/org/apache/wiki/plugin/PageViewPluginTest.java
URL: http://svn.apache.org/viewvc/jspwiki/trunk/jspwiki-war/src/test/java/org/apache/wiki/plugin/PageViewPluginTest.java?rev=1608880&r1=1608879&r2=1608880&view=diff
==============================================================================
--- jspwiki/trunk/jspwiki-war/src/test/java/org/apache/wiki/plugin/PageViewPluginTest.java
(original)
+++ jspwiki/trunk/jspwiki-war/src/test/java/org/apache/wiki/plugin/PageViewPluginTest.java
Tue Jul  8 18:40:03 2014
@@ -23,8 +23,8 @@ import java.util.Properties;
 import junit.framework.Test;
 import junit.framework.TestCase;
 import junit.framework.TestSuite;
-
 import net.sf.ehcache.CacheManager;
+
 import org.apache.wiki.TestEngine;
 import org.apache.wiki.WikiContext;
 import org.apache.wiki.WikiPage;
@@ -48,7 +48,7 @@ public class PageViewPluginTest extends 
 
     public void setUp() throws Exception
     {
-        CacheManager.getInstance().removalAll();
+        CacheManager.getInstance().removeAllCaches();
         testEngine = new TestEngine( props );
 
         // create pages that should be counted

Modified: jspwiki/trunk/jspwiki-war/src/test/java/org/apache/wiki/plugin/RecentChangesPluginTest.java
URL: http://svn.apache.org/viewvc/jspwiki/trunk/jspwiki-war/src/test/java/org/apache/wiki/plugin/RecentChangesPluginTest.java?rev=1608880&r1=1608879&r2=1608880&view=diff
==============================================================================
--- jspwiki/trunk/jspwiki-war/src/test/java/org/apache/wiki/plugin/RecentChangesPluginTest.java
(original)
+++ jspwiki/trunk/jspwiki-war/src/test/java/org/apache/wiki/plugin/RecentChangesPluginTest.java
Tue Jul  8 18:40:03 2014
@@ -41,7 +41,7 @@ public class RecentChangesPluginTest ext
     PluginManager manager;
 
     public void setUp() throws Exception {
-        CacheManager.getInstance().removalAll();
+        CacheManager.getInstance().removeAllCaches();
         testEngine = new TestEngine(props);
 
         testEngine.saveText("TestPage01", "Some Text for testing 01");

Modified: jspwiki/trunk/jspwiki-war/src/test/java/org/apache/wiki/plugin/ReferringUndefinedPagesPluginTest.java
URL: http://svn.apache.org/viewvc/jspwiki/trunk/jspwiki-war/src/test/java/org/apache/wiki/plugin/ReferringUndefinedPagesPluginTest.java?rev=1608880&r1=1608879&r2=1608880&view=diff
==============================================================================
--- jspwiki/trunk/jspwiki-war/src/test/java/org/apache/wiki/plugin/ReferringUndefinedPagesPluginTest.java
(original)
+++ jspwiki/trunk/jspwiki-war/src/test/java/org/apache/wiki/plugin/ReferringUndefinedPagesPluginTest.java
Tue Jul  8 18:40:03 2014
@@ -41,7 +41,7 @@ public class ReferringUndefinedPagesPlug
 	PluginManager manager;
 
 	public void setUp() throws Exception {
-        CacheManager.getInstance().removalAll();
+        CacheManager.getInstance().removeAllCaches();
 		testEngine = new TestEngine(props);
 
         testEngine.saveText("TestPage01", "Some Text for testing 01 which refers [NonExistingPageA]
");

Modified: jspwiki/trunk/jspwiki-war/src/test/java/org/apache/wiki/plugin/UndefinedPagesPluginTest.java
URL: http://svn.apache.org/viewvc/jspwiki/trunk/jspwiki-war/src/test/java/org/apache/wiki/plugin/UndefinedPagesPluginTest.java?rev=1608880&r1=1608879&r2=1608880&view=diff
==============================================================================
--- jspwiki/trunk/jspwiki-war/src/test/java/org/apache/wiki/plugin/UndefinedPagesPluginTest.java
(original)
+++ jspwiki/trunk/jspwiki-war/src/test/java/org/apache/wiki/plugin/UndefinedPagesPluginTest.java
Tue Jul  8 18:40:03 2014
@@ -21,11 +21,11 @@ package org.apache.wiki.plugin;
 
 import java.util.Properties;
 
+import junit.framework.Test;
 import junit.framework.TestCase;
 import junit.framework.TestSuite;
-import junit.framework.Test;
-
 import net.sf.ehcache.CacheManager;
+
 import org.apache.wiki.TestEngine;
 import org.apache.wiki.WikiContext;
 import org.apache.wiki.WikiPage;
@@ -47,7 +47,7 @@ public class UndefinedPagesPluginTest ex
     public void setUp()
         throws Exception
     {
-        CacheManager.getInstance().removalAll();
+        CacheManager.getInstance().removeAllCaches();
         testEngine = new TestEngine(props);
 
         testEngine.saveText( "TestPage", "Reference to [Foobar]." );

Modified: jspwiki/trunk/jspwiki-war/src/test/java/org/apache/wiki/providers/CachingProviderTest.java
URL: http://svn.apache.org/viewvc/jspwiki/trunk/jspwiki-war/src/test/java/org/apache/wiki/providers/CachingProviderTest.java?rev=1608880&r1=1608879&r2=1608880&view=diff
==============================================================================
--- jspwiki/trunk/jspwiki-war/src/test/java/org/apache/wiki/providers/CachingProviderTest.java
(original)
+++ jspwiki/trunk/jspwiki-war/src/test/java/org/apache/wiki/providers/CachingProviderTest.java
Tue Jul  8 18:40:03 2014
@@ -28,8 +28,8 @@ import java.util.Properties;
 import junit.framework.Test;
 import junit.framework.TestCase;
 import junit.framework.TestSuite;
-
 import net.sf.ehcache.CacheManager;
+
 import org.apache.log4j.PropertyConfigurator;
 import org.apache.wiki.TestEngine;
 import org.apache.wiki.WikiPage;
@@ -48,7 +48,7 @@ public class CachingProviderTest extends
         throws Exception
     {
         TestEngine.emptyWorkDir();
-        CacheManager.getInstance().removalAll();
+        CacheManager.getInstance().removeAllCaches();
 
         Properties props2 = TestEngine.getTestProperties();
         testEngine = new TestEngine(props2);

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=1608880&r1=1608879&r2=1608880&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
Tue Jul  8 18:40:03 2014
@@ -19,7 +19,11 @@
 
 package org.apache.wiki.providers;
 
-import java.io.*;
+import java.io.File;
+import java.io.FileWriter;
+import java.io.IOException;
+import java.io.StringReader;
+import java.io.Writer;
 import java.util.Collection;
 import java.util.List;
 import java.util.Properties;
@@ -85,7 +89,7 @@ public class VersioningFileProviderTest 
         // jspwiki always uses a singleton CacheManager, so
         // clear the cache at the end of every test case to avoid
         // polluting another test case
-        CacheManager.getInstance().removalAll();
+        CacheManager.getInstance().removeAllCaches();
     }
 
     /*

Modified: jspwiki/trunk/jspwiki-war/src/test/java/org/apache/wiki/render/RenderingManagerTest.java
URL: http://svn.apache.org/viewvc/jspwiki/trunk/jspwiki-war/src/test/java/org/apache/wiki/render/RenderingManagerTest.java?rev=1608880&r1=1608879&r2=1608880&view=diff
==============================================================================
--- jspwiki/trunk/jspwiki-war/src/test/java/org/apache/wiki/render/RenderingManagerTest.java
(original)
+++ jspwiki/trunk/jspwiki-war/src/test/java/org/apache/wiki/render/RenderingManagerTest.java
Tue Jul  8 18:40:03 2014
@@ -23,10 +23,9 @@ import java.util.Properties;
 import junit.framework.Test;
 import junit.framework.TestCase;
 import junit.framework.TestSuite;
-
 import net.sf.ehcache.CacheManager;
-import org.apache.commons.lang.time.StopWatch;
 
+import org.apache.commons.lang.time.StopWatch;
 import org.apache.wiki.TestEngine;
 import org.apache.wiki.WikiContext;
 import org.apache.wiki.WikiPage;
@@ -40,7 +39,7 @@ public class RenderingManagerTest extend
     
     protected void setUp() throws Exception
     {
-        CacheManager.getInstance().removalAll();
+        CacheManager.getInstance().removeAllCaches();
         Properties props = TestEngine.getTestProperties();
         m_engine = new TestEngine( props );
         

Modified: jspwiki/trunk/jspwiki-war/src/test/java/org/apache/wiki/rss/RSSGeneratorTest.java
URL: http://svn.apache.org/viewvc/jspwiki/trunk/jspwiki-war/src/test/java/org/apache/wiki/rss/RSSGeneratorTest.java?rev=1608880&r1=1608879&r2=1608880&view=diff
==============================================================================
--- jspwiki/trunk/jspwiki-war/src/test/java/org/apache/wiki/rss/RSSGeneratorTest.java (original)
+++ jspwiki/trunk/jspwiki-war/src/test/java/org/apache/wiki/rss/RSSGeneratorTest.java Tue
Jul  8 18:40:03 2014
@@ -57,7 +57,7 @@ public class RSSGeneratorTest extends Te
     {
         props.setProperty( WikiEngine.PROP_BASEURL, "http://localhost/" );
         props.setProperty( RSSGenerator.PROP_GENERATE_RSS, "true" );
-        CacheManager.getInstance().removalAll();
+        CacheManager.getInstance().removeAllCaches();
         m_testEngine = new TestEngine(props);
     }
 
@@ -84,10 +84,10 @@ public class RSSGeneratorTest extends Te
 
         WeblogPlugin blogplugin = new WeblogPlugin();
 
-        List entries = blogplugin.findBlogEntries( m_testEngine.getPageManager(),
-                                                   "TestBlog",
-                                                   new Date(0),
-                                                   new Date(Long.MAX_VALUE) );
+        List< ? > entries = blogplugin.findBlogEntries( m_testEngine.getPageManager(),
+                                                       "TestBlog",
+                                                        new Date(0),
+                                                        new Date(Long.MAX_VALUE) );
 
         Feed feed = new RSS10Feed( context );
         String blog = gen.generateBlogRSS( context, entries, feed );
@@ -114,10 +114,10 @@ public class RSSGeneratorTest extends Te
 
         WeblogPlugin blogplugin = new WeblogPlugin();
 
-        List entries = blogplugin.findBlogEntries( m_testEngine.getPageManager(),
-                                                   "TestBlog",
-                                                   new Date(0),
-                                                   new Date(Long.MAX_VALUE) );
+        List< ? > entries = blogplugin.findBlogEntries( m_testEngine.getPageManager(),
+                                                       "TestBlog",
+                                                        new Date(0),
+                                                        new Date(Long.MAX_VALUE) );
 
         Feed feed = new RSS20Feed( context );
         String blog = gen.generateBlogRSS( context, entries, feed );

Modified: jspwiki/trunk/jspwiki-war/src/test/java/org/apache/wiki/search/SearchManagerTest.java
URL: http://svn.apache.org/viewvc/jspwiki/trunk/jspwiki-war/src/test/java/org/apache/wiki/search/SearchManagerTest.java?rev=1608880&r1=1608879&r2=1608880&view=diff
==============================================================================
--- jspwiki/trunk/jspwiki-war/src/test/java/org/apache/wiki/search/SearchManagerTest.java
(original)
+++ jspwiki/trunk/jspwiki-war/src/test/java/org/apache/wiki/search/SearchManagerTest.java
Tue Jul  8 18:40:03 2014
@@ -49,7 +49,7 @@ public class SearchManagerTest extends T
         props.setProperty( "jspwiki.workDir", workDir + System.currentTimeMillis() );
         props.setProperty( "jspwiki.fileSystemProvider.pageDir", workRepo + System.currentTimeMillis()
);
 
-        CacheManager.getInstance().removalAll();
+        CacheManager.getInstance().removeAllCaches();
         m_engine = new TestEngine( props );
         m_mgr = m_engine.getSearchManager();
     }

Modified: jspwiki/trunk/jspwiki-war/src/test/java/org/apache/wiki/stress/MassiveRepositoryTest.java
URL: http://svn.apache.org/viewvc/jspwiki/trunk/jspwiki-war/src/test/java/org/apache/wiki/stress/MassiveRepositoryTest.java?rev=1608880&r1=1608879&r2=1608880&view=diff
==============================================================================
--- jspwiki/trunk/jspwiki-war/src/test/java/org/apache/wiki/stress/MassiveRepositoryTest.java
(original)
+++ jspwiki/trunk/jspwiki-war/src/test/java/org/apache/wiki/stress/MassiveRepositoryTest.java
Tue Jul  8 18:40:03 2014
@@ -47,7 +47,7 @@ public class MassiveRepositoryTest exten
 
         TestEngine.deleteAll(f);
 
-        CacheManager.getInstance().removalAll();
+        CacheManager.getInstance().removeAllCaches();
 
         engine = new TestEngine(props);
     }

Modified: jspwiki/trunk/jspwiki-war/src/test/java/org/apache/wiki/xmlrpc/RPCHandlerTest.java
URL: http://svn.apache.org/viewvc/jspwiki/trunk/jspwiki-war/src/test/java/org/apache/wiki/xmlrpc/RPCHandlerTest.java?rev=1608880&r1=1608879&r2=1608880&view=diff
==============================================================================
--- jspwiki/trunk/jspwiki-war/src/test/java/org/apache/wiki/xmlrpc/RPCHandlerTest.java (original)
+++ jspwiki/trunk/jspwiki-war/src/test/java/org/apache/wiki/xmlrpc/RPCHandlerTest.java Tue
Jul  8 18:40:03 2014
@@ -19,13 +19,22 @@
 
 package org.apache.wiki.xmlrpc;
 
+import java.util.Calendar;
+import java.util.Date;
+import java.util.Hashtable;
+import java.util.Properties;
+import java.util.Vector;
+
+import junit.framework.Test;
+import junit.framework.TestCase;
+import junit.framework.TestSuite;
 import net.sf.ehcache.CacheManager;
-import org.apache.wiki.*;
+
+import org.apache.wiki.TestEngine;
+import org.apache.wiki.WikiContext;
+import org.apache.wiki.WikiPage;
 import org.apache.wiki.attachment.Attachment;
-import junit.framework.*;
-import java.util.*;
-import org.apache.xmlrpc.*;
-import org.apache.wiki.xmlrpc.RPCHandler;
+import org.apache.xmlrpc.XmlRpcException;
 
 public class RPCHandlerTest extends TestCase
 {
@@ -43,7 +52,7 @@ public class RPCHandlerTest extends Test
     public void setUp()
         throws Exception
     {
-        CacheManager.getInstance().removalAll();
+        CacheManager.getInstance().removeAllCaches();
         m_engine = new TestEngine( m_props );
 
         m_handler = new RPCHandler();

Modified: jspwiki/trunk/pom.xml
URL: http://svn.apache.org/viewvc/jspwiki/trunk/pom.xml?rev=1608880&r1=1608879&r2=1608880&view=diff
==============================================================================
--- jspwiki/trunk/pom.xml (original)
+++ jspwiki/trunk/pom.xml Tue Jul  8 18:40:03 2014
@@ -33,6 +33,7 @@
   <packaging>pom</packaging>
   <description>Apache JSPWiki is a leading open source WikiWiki engine, feature-rich
     and built around standard J2EE components (Java, servlets, JSP).</description>
+  <inceptionYear>2001</inceptionYear>
   <url>http://jspwiki.apache.org/</url>
 
   <properties>
@@ -150,8 +151,8 @@
 
       <dependency>
         <groupId>net.sf.ehcache</groupId>
-        <artifactId>ehcache-core</artifactId>
-        <version>2.6.9</version>
+        <artifactId>ehcache</artifactId>
+        <version>2.8.3</version>
       </dependency>
 
       <dependency>
@@ -225,7 +226,7 @@
       <dependency>
         <groupId>net.sourceforge.stripes</groupId>
         <artifactId>stripes</artifactId>
-        <version>1.5.7-classloaderfix</version>
+        <version>1.5.8</version>
       </dependency>
 
       <!--
@@ -450,12 +451,12 @@
 
         <plugin>
           <artifactId>maven-surefire-plugin</artifactId>
-          <version>2.16</version>
+          <version>2.17</version>
         </plugin>
 
         <plugin>
           <artifactId>maven-surefire-report-plugin</artifactId>
-          <version>2.16</version>
+          <version>2.17</version>
         </plugin>
 
         <plugin>



Mime
View raw message