jspwiki-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ajaqu...@apache.org
Subject svn commit: r721912 - in /incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH: ./ tests/com/ecyrd/jspwiki/ tests/com/ecyrd/jspwiki/attachment/ tests/com/ecyrd/jspwiki/auth/user/ tests/com/ecyrd/jspwiki/dav/ tests/com/ecyrd/jspwiki/diff/ tests/com/ecy...
Date Sun, 30 Nov 2008 22:30:59 GMT
Author: ajaquith
Date: Sun Nov 30 14:30:58 2008
New Revision: 721912

URL: http://svn.apache.org/viewvc?rev=721912&view=rev
Log:
Partial merge with trunk...

Modified:
    incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/.classpath
    incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/tests/com/ecyrd/jspwiki/AllTests.java
    incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/tests/com/ecyrd/jspwiki/FileUtilTest.java
    incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/tests/com/ecyrd/jspwiki/PageManagerTest.java
    incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/tests/com/ecyrd/jspwiki/ReferenceManagerTest.java
    incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/tests/com/ecyrd/jspwiki/TestEngine.java
    incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/tests/com/ecyrd/jspwiki/VariableManagerTest.java
    incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/tests/com/ecyrd/jspwiki/attachment/AttachmentManagerTest.java
    incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/tests/com/ecyrd/jspwiki/auth/user/UserProfileTest.java
    incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/tests/com/ecyrd/jspwiki/dav/AttachmentDavProviderTest.java
    incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/tests/com/ecyrd/jspwiki/diff/ContextualDiffProviderTest.java
    incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/tests/com/ecyrd/jspwiki/filters/FilterManagerTest.java
    incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/tests/com/ecyrd/jspwiki/parser/JSPWikiMarkupParserTest.java
    incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/tests/com/ecyrd/jspwiki/providers/CachingProviderTest.java
    incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/tests/com/ecyrd/jspwiki/providers/CounterProvider.java
    incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/tests/com/ecyrd/jspwiki/providers/FileSystemProviderTest.java
    incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/tests/com/ecyrd/jspwiki/util/MailUtilTest.java
    incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/tests/com/ecyrd/jspwiki/web/TestContainer.java
    incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/tests/com/ecyrd/jspwiki/xmlrpc/RPCHandlerTest.java

Modified: incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/.classpath
URL: http://svn.apache.org/viewvc/incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/.classpath?rev=721912&r1=721911&r2=721912&view=diff
==============================================================================
--- incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/.classpath (original)
+++ incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/.classpath Sun Nov 30 14:30:58 2008
@@ -3,10 +3,8 @@
 	<classpathentry excluding="**/package.html|images/|webdocs/|wikipages/" kind="src" output="build"
path="src"/>
 	<classpathentry excluding="etc/|build/|reports/|lib/" kind="src" output="tests/build"
path="tests"/>
 	<classpathentry kind="lib" path="lib/commons-lang-2.3.jar"/>
-	<classpathentry kind="lib" path="lib/commons-logging-api.jar"/>
 	<classpathentry kind="lib" path="lib/ecs.jar"/>
 	<classpathentry kind="lib" path="lib/jdom.jar"/>
-	<classpathentry kind="lib" path="lib/log4j-1.2.14.jar"/>
 	<classpathentry kind="lib" path="lib/akismet-java-1.02.jar"/>
 	<classpathentry kind="lib" path="lib/jabsorb-1.3.jar"/>
 	<classpathentry kind="lib" path="lib/xmlrpc.jar"/>
@@ -41,5 +39,7 @@
 	<classpathentry kind="lib" path="tests/lib/selenium-server-1.0-beta1.jar"/>
 	<classpathentry kind="lib" path="lib/stripes-1.5.jar" sourcepath="/stripes-1.5/stripes/src"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+	<classpathentry kind="lib" path="lib/slf4j-api-1.5.6.jar"/>
+	<classpathentry kind="lib" path="lib/jul-to-slf4j-1.5.6.jar"/>
 	<classpathentry kind="output" path="classes"/>
 </classpath>

Modified: incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/tests/com/ecyrd/jspwiki/AllTests.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/tests/com/ecyrd/jspwiki/AllTests.java?rev=721912&r1=721911&r2=721912&view=diff
==============================================================================
--- incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/tests/com/ecyrd/jspwiki/AllTests.java
(original)
+++ incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/tests/com/ecyrd/jspwiki/AllTests.java
Sun Nov 30 14:30:58 2008
@@ -1,40 +1,13 @@
 
 package com.ecyrd.jspwiki;
 
-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;
-
 public class AllTests extends TestCase
 {
-    //
-    //  Ensure everything runs properly and that we can locate all necessary
-    //  thingies.
-    //
-    static
-    {
-        Properties props = new Properties();
-        try
-        {
-            InputStream pin = TestEngine.findTestProperties();
-            if( pin == null )
-            {
-                fail( "No property file found!" );
-            }
-            props.load( pin );
-            PropertyConfigurator.configure(props);
-        }
-        catch( IOException e ) 
-        {
-        }
-    }
-
+ 
     public AllTests( String s )
     {
         super( s );

Modified: incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/tests/com/ecyrd/jspwiki/FileUtilTest.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/tests/com/ecyrd/jspwiki/FileUtilTest.java?rev=721912&r1=721911&r2=721912&view=diff
==============================================================================
--- incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/tests/com/ecyrd/jspwiki/FileUtilTest.java
(original)
+++ incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/tests/com/ecyrd/jspwiki/FileUtilTest.java
Sun Nov 30 14:30:58 2008
@@ -3,23 +3,13 @@
 
 import junit.framework.*;
 import java.io.*;
-import java.util.*;
-import org.apache.log4j.*;
 
 public class FileUtilTest extends TestCase
 {
     public FileUtilTest( String s )
     {
         super( s );
-        Properties props = new Properties();
-        try
-        {
-            props.load( TestEngine.findTestProperties() );
-            PropertyConfigurator.configure(props);
-        }
-        catch( IOException e ) {}
     }
-
     public void setUp()
         throws Exception
     {

Modified: incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/tests/com/ecyrd/jspwiki/PageManagerTest.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/tests/com/ecyrd/jspwiki/PageManagerTest.java?rev=721912&r1=721911&r2=721912&view=diff
==============================================================================
--- incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/tests/com/ecyrd/jspwiki/PageManagerTest.java
(original)
+++ incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/tests/com/ecyrd/jspwiki/PageManagerTest.java
Sun Nov 30 14:30:58 2008
@@ -7,8 +7,6 @@
 import junit.framework.TestCase;
 import junit.framework.TestSuite;
 
-import org.apache.log4j.PropertyConfigurator;
-
 import com.ecyrd.jspwiki.PageManager;
 import com.ecyrd.jspwiki.providers.CachingProvider;
 
@@ -27,7 +25,6 @@
         throws Exception
     {
         props.load( TestEngine.findTestProperties() );
-        PropertyConfigurator.configure(props);
         engine = new TestEngine(props);
     }
 

Modified: incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/tests/com/ecyrd/jspwiki/ReferenceManagerTest.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/tests/com/ecyrd/jspwiki/ReferenceManagerTest.java?rev=721912&r1=721911&r2=721912&view=diff
==============================================================================
--- incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/tests/com/ecyrd/jspwiki/ReferenceManagerTest.java
(original)
+++ incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/tests/com/ecyrd/jspwiki/ReferenceManagerTest.java
Sun Nov 30 14:30:58 2008
@@ -199,8 +199,6 @@
         assertTrue( "Foobar unreferenced", c.size()==1 && ((String) c.iterator().next()).equals("TestPage")
);
 
         c = mgr.findReferrers( "Foobar" );
-        Iterator it = c.iterator();
-        String s1 = (String)it.next();
         assertTrue( "Foobar referrers", 
                     c.size()==2 );
     }
@@ -239,9 +237,6 @@
         Collection c = mgr.findReferrers( "Foobars" );
         assertEquals( "Foobars referrers count", 2, c.size() );
 
-        Iterator i = c.iterator();
-        String first = (String) i.next();
-
         assertTrue( "Foobars referrers", 
                     c.contains("TestPage") && c.contains("Foobar"));
     }

Modified: incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/tests/com/ecyrd/jspwiki/TestEngine.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/tests/com/ecyrd/jspwiki/TestEngine.java?rev=721912&r1=721911&r2=721912&view=diff
==============================================================================
--- incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/tests/com/ecyrd/jspwiki/TestEngine.java
(original)
+++ incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/tests/com/ecyrd/jspwiki/TestEngine.java
Sun Nov 30 14:30:58 2008
@@ -15,7 +15,8 @@
 import net.sourceforge.stripes.mock.MockRoundtrip;
 import net.sourceforge.stripes.mock.MockServletContext;
 
-import org.apache.log4j.Logger;
+import com.ecyrd.jspwiki.log.Logger;
+import com.ecyrd.jspwiki.log.LoggerFactory;
 
 import com.ecyrd.jspwiki.action.WikiActionBean;
 import com.ecyrd.jspwiki.attachment.Attachment;
@@ -44,7 +45,7 @@
  */
 public class TestEngine extends WikiEngine
 {
-    static Logger log = Logger.getLogger( TestEngine.class );
+    static Logger log = LoggerFactory.getLogger( TestEngine.class );
 
     private WikiSession m_adminWikiSession = null;
     private WikiSession m_janneWikiSession = null;

Modified: incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/tests/com/ecyrd/jspwiki/VariableManagerTest.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/tests/com/ecyrd/jspwiki/VariableManagerTest.java?rev=721912&r1=721911&r2=721912&view=diff
==============================================================================
--- incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/tests/com/ecyrd/jspwiki/VariableManagerTest.java
(original)
+++ incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/tests/com/ecyrd/jspwiki/VariableManagerTest.java
Sun Nov 30 14:30:58 2008
@@ -4,7 +4,6 @@
 import junit.framework.*;
 import java.io.*;
 import java.util.*;
-import org.apache.log4j.*;
 
 public class VariableManagerTest extends TestCase
 {
@@ -25,7 +24,6 @@
         try
         {
             props.load( TestEngine.findTestProperties() );
-            PropertyConfigurator.configure(props);
 
             m_variableManager = new VariableManager( props );
             TestEngine testEngine = new TestEngine( props );

Modified: incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/tests/com/ecyrd/jspwiki/attachment/AttachmentManagerTest.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/tests/com/ecyrd/jspwiki/attachment/AttachmentManagerTest.java?rev=721912&r1=721911&r2=721912&view=diff
==============================================================================
--- incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/tests/com/ecyrd/jspwiki/attachment/AttachmentManagerTest.java
(original)
+++ incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/tests/com/ecyrd/jspwiki/attachment/AttachmentManagerTest.java
Sun Nov 30 14:30:58 2008
@@ -63,8 +63,8 @@
         TestEngine.deleteTestPage( NAME1 );
         TestEngine.deleteTestPage( NAMEU );
 
-        m_engine.deleteAttachments(NAME1);
-        m_engine.deleteAttachments(NAMEU);
+        TestEngine.deleteAttachments(NAME1);
+        TestEngine.deleteAttachments(NAMEU);
 
         TestEngine.emptyWorkDir();
     }

Modified: incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/tests/com/ecyrd/jspwiki/auth/user/UserProfileTest.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/tests/com/ecyrd/jspwiki/auth/user/UserProfileTest.java?rev=721912&r1=721911&r2=721912&view=diff
==============================================================================
--- incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/tests/com/ecyrd/jspwiki/auth/user/UserProfileTest.java
(original)
+++ incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/tests/com/ecyrd/jspwiki/auth/user/UserProfileTest.java
Sun Nov 30 14:30:58 2008
@@ -7,8 +7,6 @@
 import junit.framework.TestCase;
 import junit.framework.TestSuite;
 
-import org.apache.log4j.PropertyConfigurator;
-
 import com.ecyrd.jspwiki.TestEngine;
 import com.ecyrd.jspwiki.WikiEngine;
 
@@ -25,7 +23,6 @@
     {
             Properties props = new Properties();
             props.load( TestEngine.findTestProperties() );
-            PropertyConfigurator.configure(props);
             WikiEngine engine  = new TestEngine(props);
             m_db = engine.getUserManager().getUserDatabase();
     }

Modified: incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/tests/com/ecyrd/jspwiki/dav/AttachmentDavProviderTest.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/tests/com/ecyrd/jspwiki/dav/AttachmentDavProviderTest.java?rev=721912&r1=721911&r2=721912&view=diff
==============================================================================
--- incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/tests/com/ecyrd/jspwiki/dav/AttachmentDavProviderTest.java
(original)
+++ incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/tests/com/ecyrd/jspwiki/dav/AttachmentDavProviderTest.java
Sun Nov 30 14:30:58 2008
@@ -30,7 +30,7 @@
 
     protected void tearDown() throws Exception
     {
-        engine.deleteAttachments( "TestPage" );
+        TestEngine.deleteAttachments( "TestPage" );
         TestEngine.deleteTestPage("TestPage");
     }
 

Modified: incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/tests/com/ecyrd/jspwiki/diff/ContextualDiffProviderTest.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/tests/com/ecyrd/jspwiki/diff/ContextualDiffProviderTest.java?rev=721912&r1=721911&r2=721912&view=diff
==============================================================================
--- incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/tests/com/ecyrd/jspwiki/diff/ContextualDiffProviderTest.java
(original)
+++ incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/tests/com/ecyrd/jspwiki/diff/ContextualDiffProviderTest.java
Sun Nov 30 14:30:58 2008
@@ -7,8 +7,6 @@
 import junit.framework.TestCase;
 import junit.framework.TestSuite;
 
-import org.apache.log4j.PropertyConfigurator;
-
 import com.ecyrd.jspwiki.*;
 
 public class ContextualDiffProviderTest extends TestCase
@@ -179,7 +177,6 @@
         diff.initialize(null, props);
 
         props.load( TestEngine.findTestProperties() );
-        PropertyConfigurator.configure(props);
         TestEngine engine = new TestEngine(props);
         
         WikiContext ctx = engine.getWikiContextFactory().newViewContext( null, null, new
WikiPage(engine,"Dummy") );

Modified: incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/tests/com/ecyrd/jspwiki/filters/FilterManagerTest.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/tests/com/ecyrd/jspwiki/filters/FilterManagerTest.java?rev=721912&r1=721911&r2=721912&view=diff
==============================================================================
--- incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/tests/com/ecyrd/jspwiki/filters/FilterManagerTest.java
(original)
+++ incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/tests/com/ecyrd/jspwiki/filters/FilterManagerTest.java
Sun Nov 30 14:30:58 2008
@@ -4,8 +4,6 @@
 import junit.framework.*;
 import java.util.*;
 
-import org.apache.log4j.*;
-
 import com.ecyrd.jspwiki.*;
 
 public class FilterManagerTest extends TestCase
@@ -23,7 +21,6 @@
         throws Exception
     {
         props.load( TestEngine.findTestProperties() );
-        PropertyConfigurator.configure(props);
         engine = new TestEngine(props);
     }
 

Modified: incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/tests/com/ecyrd/jspwiki/parser/JSPWikiMarkupParserTest.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/tests/com/ecyrd/jspwiki/parser/JSPWikiMarkupParserTest.java?rev=721912&r1=721911&r2=721912&view=diff
==============================================================================
--- incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/tests/com/ecyrd/jspwiki/parser/JSPWikiMarkupParserTest.java
(original)
+++ incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/tests/com/ecyrd/jspwiki/parser/JSPWikiMarkupParserTest.java
Sun Nov 30 14:30:58 2008
@@ -65,7 +65,7 @@
             String name = (String) i.next();
 
             TestEngine.deleteTestPage(name);
-            testEngine.deleteAttachments(name);
+            TestEngine.deleteAttachments(name);
         }
 
         created.clear();

Modified: incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/tests/com/ecyrd/jspwiki/providers/CachingProviderTest.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/tests/com/ecyrd/jspwiki/providers/CachingProviderTest.java?rev=721912&r1=721911&r2=721912&view=diff
==============================================================================
--- incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/tests/com/ecyrd/jspwiki/providers/CachingProviderTest.java
(original)
+++ incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/tests/com/ecyrd/jspwiki/providers/CachingProviderTest.java
Sun Nov 30 14:30:58 2008
@@ -9,8 +9,6 @@
 import java.io.StringReader;
 import java.util.*;
 
-import org.apache.log4j.*;
-
 import com.ecyrd.jspwiki.*;
 
 public class CachingProviderTest extends TestCase
@@ -24,11 +22,6 @@
         throws Exception
     {
         TestEngine.emptyWorkDir();
-
-        Properties props2 = new Properties();
-
-        props2.load( TestEngine.findTestProperties() );
-        PropertyConfigurator.configure(props2);
     }
 
     public void tearDown()

Modified: incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/tests/com/ecyrd/jspwiki/providers/CounterProvider.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/tests/com/ecyrd/jspwiki/providers/CounterProvider.java?rev=721912&r1=721911&r2=721912&view=diff
==============================================================================
--- incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/tests/com/ecyrd/jspwiki/providers/CounterProvider.java
(original)
+++ incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/tests/com/ecyrd/jspwiki/providers/CounterProvider.java
Sun Nov 30 14:30:58 2008
@@ -22,7 +22,8 @@
 
 import java.util.*;
 
-import org.apache.log4j.*;
+import com.ecyrd.jspwiki.log.Logger;
+import com.ecyrd.jspwiki.log.LoggerFactory;
 
 import com.ecyrd.jspwiki.*;
 
@@ -38,7 +39,7 @@
     public int m_getAllPagesCalls = 0;
     public int m_initCalls        = 0;
 
-    static Logger log = Logger.getLogger( CounterProvider.class );
+    static Logger log = LoggerFactory.getLogger( CounterProvider.class );
 
     WikiPage[]    m_pages         = new WikiPage[0];
     

Modified: incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/tests/com/ecyrd/jspwiki/providers/FileSystemProviderTest.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/tests/com/ecyrd/jspwiki/providers/FileSystemProviderTest.java?rev=721912&r1=721911&r2=721912&view=diff
==============================================================================
--- incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/tests/com/ecyrd/jspwiki/providers/FileSystemProviderTest.java
(original)
+++ incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/tests/com/ecyrd/jspwiki/providers/FileSystemProviderTest.java
Sun Nov 30 14:30:58 2008
@@ -5,8 +5,6 @@
 import java.io.*;
 import java.util.*;
 
-import org.apache.log4j.*;
-
 import com.ecyrd.jspwiki.*;
 
 public class FileSystemProviderTest extends TestCase
@@ -28,15 +26,10 @@
     {
         m_pagedir = System.getProperties().getProperty("java.io.tmpdir");
 
-        Properties props2 = new Properties();
-
         props.setProperty( PageManager.PROP_PAGEPROVIDER, "FileSystemProvider" );
         props.setProperty( FileSystemProvider.PROP_PAGEDIR, 
                            m_pagedir );
 
-        props2.load( TestEngine.findTestProperties() );
-        PropertyConfigurator.configure(props2);
-        
         m_engine = new TestEngine(props);
 
         m_provider = new FileSystemProvider();

Modified: incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/tests/com/ecyrd/jspwiki/util/MailUtilTest.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/tests/com/ecyrd/jspwiki/util/MailUtilTest.java?rev=721912&r1=721911&r2=721912&view=diff
==============================================================================
--- incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/tests/com/ecyrd/jspwiki/util/MailUtilTest.java
(original)
+++ incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/tests/com/ecyrd/jspwiki/util/MailUtilTest.java
Sun Nov 30 14:30:58 2008
@@ -10,8 +10,6 @@
 import junit.framework.TestCase;
 import junit.framework.TestSuite;
 
-import org.apache.log4j.PropertyConfigurator;
-
 import com.ecyrd.jspwiki.TestEngine;
 import com.ecyrd.jspwiki.WikiContext;
 import com.ecyrd.jspwiki.WikiPage;
@@ -51,7 +49,6 @@
         throws Exception
     {
         m_props.load( TestEngine.findTestProperties() );
-        PropertyConfigurator.configure(m_props);
         
         TestEngine testEngine = new TestEngine( m_props );
         

Modified: incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/tests/com/ecyrd/jspwiki/web/TestContainer.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/tests/com/ecyrd/jspwiki/web/TestContainer.java?rev=721912&r1=721911&r2=721912&view=diff
==============================================================================
--- incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/tests/com/ecyrd/jspwiki/web/TestContainer.java
(original)
+++ incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/tests/com/ecyrd/jspwiki/web/TestContainer.java
Sun Nov 30 14:30:58 2008
@@ -29,7 +29,8 @@
 import javax.naming.InitialContext;
 import javax.naming.NameNotFoundException;
 
-import org.apache.log4j.Logger;
+import com.ecyrd.jspwiki.log.Logger;
+import com.ecyrd.jspwiki.log.LoggerFactory;
 import org.hsqldb.jdbc.jdbcDataSource;
 import org.mortbay.http.*;
 import org.mortbay.http.handler.SecurityHandler;
@@ -75,7 +76,7 @@
     /** Number of jetty threads for the server. */
     private static int jettyThreads = DEFAULT_JETTY_THREADS;
 
-    private static final Logger log = Logger.getLogger( TestContainer.class );
+    private static final Logger log = LoggerFactory.getLogger( TestContainer.class );
 
     /**
      * Starts up a test server for a particular web application on the specified

Modified: incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/tests/com/ecyrd/jspwiki/xmlrpc/RPCHandlerTest.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/tests/com/ecyrd/jspwiki/xmlrpc/RPCHandlerTest.java?rev=721912&r1=721911&r2=721912&view=diff
==============================================================================
--- incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/tests/com/ecyrd/jspwiki/xmlrpc/RPCHandlerTest.java
(original)
+++ incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/tests/com/ecyrd/jspwiki/xmlrpc/RPCHandlerTest.java
Sun Nov 30 14:30:58 2008
@@ -37,7 +37,7 @@
     public void tearDown()
     {
         TestEngine.deleteTestPage( NAME1 );
-        m_engine.deleteAttachments( NAME1 );
+        TestEngine.deleteAttachments( NAME1 );
         TestEngine.emptyWorkDir();
     }
 



Mime
View raw message