You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jspwiki.apache.org by gm...@apache.org on 2013/08/09 00:13:46 UTC
svn commit: r1512071 [2/2] - in /jspwiki/trunk: ./
jspwiki-site/src/site/trunk/content/jspwiki/development/
jspwiki-site/src/site/trunk/templates/
jspwiki-war/src/main/java/org/apache/wiki/
jspwiki-war/src/main/java/org/apache/wiki/ui/ jspwiki-war/src/...
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=1512071&r1=1512070&r2=1512071&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 Thu Aug 8 22:13:45 2013
@@ -40,8 +40,7 @@ public class SearchManagerTest extends T
Properties props;
protected void setUp() throws Exception {
- props = new Properties();
- props.load( TestEngine.findTestProperties() );
+ Properties props = TestEngine.getTestProperties();
String workDir = props.getProperty( "jspwiki.workDir" );
String workRepo = props.getProperty( "jspwiki.fileSystemProvider.pageDir" );
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=1512071&r1=1512070&r2=1512071&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 Thu Aug 8 22:13:45 2013
@@ -32,7 +32,7 @@ import org.apache.wiki.util.TextUtil;
public class MassiveRepositoryTest extends TestCase
{
- Properties props = new Properties();
+ Properties props = TestEngine.getTestProperties("/jspwiki-vers-custom.properties");
TestEngine engine;
@@ -40,7 +40,6 @@ public class MassiveRepositoryTest exten
{
super.setUp();
- props.load( TestEngine.findTestProperties("/jspwiki_vers.properties") );
props.setProperty( CachingProvider.PROP_CACHECAPACITY, "1000" );
Modified: jspwiki/trunk/jspwiki-war/src/test/java/org/apache/wiki/stress/StressTestSpeed.java
URL: http://svn.apache.org/viewvc/jspwiki/trunk/jspwiki-war/src/test/java/org/apache/wiki/stress/StressTestSpeed.java?rev=1512071&r1=1512070&r2=1512071&view=diff
==============================================================================
--- jspwiki/trunk/jspwiki-war/src/test/java/org/apache/wiki/stress/StressTestSpeed.java (original)
+++ jspwiki/trunk/jspwiki-war/src/test/java/org/apache/wiki/stress/StressTestSpeed.java Thu Aug 8 22:13:45 2013
@@ -34,7 +34,7 @@ public final class StressTestSpeed exten
private static int ITERATIONS = 100;
public static final String NAME1 = "Test1";
- Properties props = new Properties();
+ Properties props = TestEngine.getTestProperties("/jspwiki-rcs-custom.properties");
TestEngine engine;
@@ -46,8 +46,6 @@ public final class StressTestSpeed exten
public void setUp()
throws Exception
{
- props.load( TestEngine.findTestProperties("/jspwiki_rcs.properties") );
-
props.setProperty( "jspwiki.usePageCache", "true" );
props.setProperty( "jspwiki.newRenderingEngine", "true" );
Modified: jspwiki/trunk/jspwiki-war/src/test/java/org/apache/wiki/stress/StressTestVersioningProvider.java
URL: http://svn.apache.org/viewvc/jspwiki/trunk/jspwiki-war/src/test/java/org/apache/wiki/stress/StressTestVersioningProvider.java?rev=1512071&r1=1512070&r2=1512071&view=diff
==============================================================================
--- jspwiki/trunk/jspwiki-war/src/test/java/org/apache/wiki/stress/StressTestVersioningProvider.java (original)
+++ jspwiki/trunk/jspwiki-war/src/test/java/org/apache/wiki/stress/StressTestVersioningProvider.java Thu Aug 8 22:13:45 2013
@@ -29,7 +29,7 @@ public class StressTestVersioningProvide
{
public static final String NAME1 = "Test1";
- Properties props = new Properties();
+ Properties props = TestEngine.getTestProperties("/jspwiki-vers-custom.properties");
TestEngine engine;
@@ -41,8 +41,6 @@ public class StressTestVersioningProvide
public void setUp()
throws Exception
{
- props.load( TestEngine.findTestProperties("/jspwiki_vers.properties") );
-
props.setProperty( CachingProvider.PROP_CACHECAPACITY, "10000" );
engine = new TestEngine(props);
}
Modified: jspwiki/trunk/jspwiki-war/src/test/java/org/apache/wiki/ui/CommandResolverTest.java
URL: http://svn.apache.org/viewvc/jspwiki/trunk/jspwiki-war/src/test/java/org/apache/wiki/ui/CommandResolverTest.java?rev=1512071&r1=1512070&r2=1512071&view=diff
==============================================================================
--- jspwiki/trunk/jspwiki-war/src/test/java/org/apache/wiki/ui/CommandResolverTest.java (original)
+++ jspwiki/trunk/jspwiki-war/src/test/java/org/apache/wiki/ui/CommandResolverTest.java Thu Aug 8 22:13:45 2013
@@ -43,9 +43,8 @@ public class CommandResolverTest extends
protected void setUp() throws Exception
{
- Properties props = new Properties();
- props.load( TestEngine.findTestProperties() );
- props.put( WikiEngine.PROP_MATCHPLURALS, "yes" );
+ Properties props = TestEngine.getTestProperties();
+ props.setProperty( WikiEngine.PROP_MATCHPLURALS, "yes" );
m_engine = new TestEngine( props );
resolver = m_engine.getCommandResolver();
m_engine.saveText( "SinglePage", "This is a test." );
@@ -231,9 +230,6 @@ public class CommandResolverTest extends
url = resolver.getSpecialPageReference( "Search" );
assertEquals( "http://localhost/Search.jsp", url );
- url = resolver.getSpecialPageReference( "Search" );
- assertEquals( "http://localhost/Search.jsp", url );
-
// UserPrefs doesn't exist in our test properties
url = resolver.getSpecialPageReference( "UserPrefs" );
assertNull( url );
Modified: jspwiki/trunk/jspwiki-war/src/test/java/org/apache/wiki/ui/GroupCommandTest.java
URL: http://svn.apache.org/viewvc/jspwiki/trunk/jspwiki-war/src/test/java/org/apache/wiki/ui/GroupCommandTest.java?rev=1512071&r1=1512070&r2=1512071&view=diff
==============================================================================
--- jspwiki/trunk/jspwiki-war/src/test/java/org/apache/wiki/ui/GroupCommandTest.java (original)
+++ jspwiki/trunk/jspwiki-war/src/test/java/org/apache/wiki/ui/GroupCommandTest.java Thu Aug 8 22:13:45 2013
@@ -36,8 +36,7 @@ public class GroupCommandTest extends Te
{
protected void setUp() throws Exception
{
- Properties props = new Properties();
- props.load( TestEngine.findTestProperties() );
+ Properties props = TestEngine.getTestProperties();
new TestEngine( props );
}
Modified: jspwiki/trunk/jspwiki-war/src/test/java/org/apache/wiki/ui/InputValidatorTest.java
URL: http://svn.apache.org/viewvc/jspwiki/trunk/jspwiki-war/src/test/java/org/apache/wiki/ui/InputValidatorTest.java?rev=1512071&r1=1512070&r2=1512071&view=diff
==============================================================================
--- jspwiki/trunk/jspwiki-war/src/test/java/org/apache/wiki/ui/InputValidatorTest.java (original)
+++ jspwiki/trunk/jspwiki-war/src/test/java/org/apache/wiki/ui/InputValidatorTest.java Thu Aug 8 22:13:45 2013
@@ -43,8 +43,7 @@ public class InputValidatorTest extends
protected void setUp() throws Exception
{
- Properties props = new Properties();
- props.load( TestEngine.findTestProperties() );
+ Properties props = TestEngine.getTestProperties();
testEngine = new TestEngine( props );
WikiContext context = new WikiContext( testEngine, new WikiPage(testEngine,"dummyPage"));
val = new InputValidator( TEST, context );
Modified: jspwiki/trunk/jspwiki-war/src/test/java/org/apache/wiki/ui/PageCommandTest.java
URL: http://svn.apache.org/viewvc/jspwiki/trunk/jspwiki-war/src/test/java/org/apache/wiki/ui/PageCommandTest.java?rev=1512071&r1=1512070&r2=1512071&view=diff
==============================================================================
--- jspwiki/trunk/jspwiki-war/src/test/java/org/apache/wiki/ui/PageCommandTest.java (original)
+++ jspwiki/trunk/jspwiki-war/src/test/java/org/apache/wiki/ui/PageCommandTest.java Thu Aug 8 22:13:45 2013
@@ -40,8 +40,7 @@ public class PageCommandTest extends Tes
protected void setUp() throws Exception
{
- Properties props = new Properties();
- props.load( TestEngine.findTestProperties() );
+ Properties props = TestEngine.getTestProperties();
testEngine = new TestEngine( props );
testEngine.saveText( "TestPage", "This is a test." );
testPage = testEngine.getPage( "TestPage" );
Modified: jspwiki/trunk/jspwiki-war/src/test/java/org/apache/wiki/ui/WikiCommandTest.java
URL: http://svn.apache.org/viewvc/jspwiki/trunk/jspwiki-war/src/test/java/org/apache/wiki/ui/WikiCommandTest.java?rev=1512071&r1=1512070&r2=1512071&view=diff
==============================================================================
--- jspwiki/trunk/jspwiki-war/src/test/java/org/apache/wiki/ui/WikiCommandTest.java (original)
+++ jspwiki/trunk/jspwiki-war/src/test/java/org/apache/wiki/ui/WikiCommandTest.java Thu Aug 8 22:13:45 2013
@@ -38,8 +38,7 @@ public class WikiCommandTest extends Tes
protected void setUp() throws Exception
{
- Properties props = new Properties();
- props.load( TestEngine.findTestProperties() );
+ Properties props = TestEngine.getTestProperties();
testEngine = new TestEngine( props );
wiki = testEngine.getApplicationName();
}
Modified: jspwiki/trunk/jspwiki-war/src/test/java/org/apache/wiki/url/DefaultURLConstructorTest.java
URL: http://svn.apache.org/viewvc/jspwiki/trunk/jspwiki-war/src/test/java/org/apache/wiki/url/DefaultURLConstructorTest.java?rev=1512071&r1=1512070&r2=1512071&view=diff
==============================================================================
--- jspwiki/trunk/jspwiki-war/src/test/java/org/apache/wiki/url/DefaultURLConstructorTest.java (original)
+++ jspwiki/trunk/jspwiki-war/src/test/java/org/apache/wiki/url/DefaultURLConstructorTest.java Thu Aug 8 22:13:45 2013
@@ -37,13 +37,8 @@ public class DefaultURLConstructorTest e
{
TestEngine testEngine;
- Properties props = new Properties();
+ Properties props = TestEngine.getTestProperties();
- protected void setUp() throws Exception
- {
- props.load( TestEngine.findTestProperties() );
- }
-
private URLConstructor getConstructor( String baseURL, String prefix )
throws WikiException
{
Modified: jspwiki/trunk/jspwiki-war/src/test/java/org/apache/wiki/url/ShortURLConstructorTest.java
URL: http://svn.apache.org/viewvc/jspwiki/trunk/jspwiki-war/src/test/java/org/apache/wiki/url/ShortURLConstructorTest.java?rev=1512071&r1=1512070&r2=1512071&view=diff
==============================================================================
--- jspwiki/trunk/jspwiki-war/src/test/java/org/apache/wiki/url/ShortURLConstructorTest.java (original)
+++ jspwiki/trunk/jspwiki-war/src/test/java/org/apache/wiki/url/ShortURLConstructorTest.java Thu Aug 8 22:13:45 2013
@@ -37,13 +37,8 @@ public class ShortURLConstructorTest ext
{
TestEngine testEngine;
- Properties props = new Properties();
+ Properties props = TestEngine.getTestProperties();
- protected void setUp() throws Exception
- {
- props.load( TestEngine.findTestProperties() );
- }
-
private URLConstructor getConstructor( String baseURL, String prefix )
throws WikiException
{
Modified: jspwiki/trunk/jspwiki-war/src/test/java/org/apache/wiki/url/ShortViewURLConstructorTest.java
URL: http://svn.apache.org/viewvc/jspwiki/trunk/jspwiki-war/src/test/java/org/apache/wiki/url/ShortViewURLConstructorTest.java?rev=1512071&r1=1512070&r2=1512071&view=diff
==============================================================================
--- jspwiki/trunk/jspwiki-war/src/test/java/org/apache/wiki/url/ShortViewURLConstructorTest.java (original)
+++ jspwiki/trunk/jspwiki-war/src/test/java/org/apache/wiki/url/ShortViewURLConstructorTest.java Thu Aug 8 22:13:45 2013
@@ -37,13 +37,8 @@ public class ShortViewURLConstructorTest
{
TestEngine testEngine;
- Properties props = new Properties();
+ Properties props = TestEngine.getTestProperties();
- protected void setUp() throws Exception
- {
- props.load( TestEngine.findTestProperties() );
- }
-
private URLConstructor getConstructor( String baseURL, String prefix )
throws WikiException
{
Modified: jspwiki/trunk/jspwiki-war/src/test/java/org/apache/wiki/util/FileUtilTest.java
URL: http://svn.apache.org/viewvc/jspwiki/trunk/jspwiki-war/src/test/java/org/apache/wiki/util/FileUtilTest.java?rev=1512071&r1=1512070&r2=1512071&view=diff
==============================================================================
--- jspwiki/trunk/jspwiki-war/src/test/java/org/apache/wiki/util/FileUtilTest.java (original)
+++ jspwiki/trunk/jspwiki-war/src/test/java/org/apache/wiki/util/FileUtilTest.java Thu Aug 8 22:13:45 2013
@@ -37,13 +37,8 @@ public class FileUtilTest extends TestCa
public FileUtilTest( String s )
{
super( s );
- Properties props = new Properties();
- try
- {
- props.load( TestEngine.findTestProperties() );
- PropertyConfigurator.configure(props);
- }
- catch( IOException e ) {}
+ Properties props = TestEngine.getTestProperties();
+ PropertyConfigurator.configure(props);
}
public void setUp()
Modified: jspwiki/trunk/jspwiki-war/src/test/java/org/apache/wiki/util/MailUtilTest.java
URL: http://svn.apache.org/viewvc/jspwiki/trunk/jspwiki-war/src/test/java/org/apache/wiki/util/MailUtilTest.java?rev=1512071&r1=1512070&r2=1512071&view=diff
==============================================================================
--- jspwiki/trunk/jspwiki-war/src/test/java/org/apache/wiki/util/MailUtilTest.java (original)
+++ jspwiki/trunk/jspwiki-war/src/test/java/org/apache/wiki/util/MailUtilTest.java Thu Aug 8 22:13:45 2013
@@ -46,7 +46,7 @@ import org.apache.wiki.util.MailUtil;
*/
public class MailUtilTest extends TestCase
{
- Properties m_props = new Properties();
+ Properties m_props = TestEngine.getTestProperties();
WikiContext m_context;
@@ -68,7 +68,6 @@ public class MailUtilTest extends TestCa
public void setUp()
throws Exception
{
- m_props.load( TestEngine.findTestProperties() );
PropertyConfigurator.configure(m_props);
TestEngine testEngine = new TestEngine( m_props );
Modified: jspwiki/trunk/jspwiki-war/src/test/java/org/apache/wiki/workflow/ApprovalWorkflowTest.java
URL: http://svn.apache.org/viewvc/jspwiki/trunk/jspwiki-war/src/test/java/org/apache/wiki/workflow/ApprovalWorkflowTest.java?rev=1512071&r1=1512070&r2=1512071&view=diff
==============================================================================
--- jspwiki/trunk/jspwiki-war/src/test/java/org/apache/wiki/workflow/ApprovalWorkflowTest.java (original)
+++ jspwiki/trunk/jspwiki-war/src/test/java/org/apache/wiki/workflow/ApprovalWorkflowTest.java Thu Aug 8 22:13:45 2013
@@ -46,8 +46,7 @@ public class ApprovalWorkflowTest extend
protected void setUp() throws Exception
{
super.setUp();
- Properties props = new Properties();
- props.load(TestEngine.findTestProperties());
+ Properties props = TestEngine.getTestProperties();
// Explicitly turn on Admin approvals for page saves and our sample approval workflow
props.put("jspwiki.approver.workflow.saveWikiPage", "Admin");
Modified: jspwiki/trunk/jspwiki-war/src/test/java/org/apache/wiki/workflow/DecisionQueueTest.java
URL: http://svn.apache.org/viewvc/jspwiki/trunk/jspwiki-war/src/test/java/org/apache/wiki/workflow/DecisionQueueTest.java?rev=1512071&r1=1512070&r2=1512071&view=diff
==============================================================================
--- jspwiki/trunk/jspwiki-war/src/test/java/org/apache/wiki/workflow/DecisionQueueTest.java (original)
+++ jspwiki/trunk/jspwiki-war/src/test/java/org/apache/wiki/workflow/DecisionQueueTest.java Thu Aug 8 22:13:45 2013
@@ -52,8 +52,7 @@ public class DecisionQueueTest extends T
protected void setUp() throws Exception
{
super.setUp();
- Properties props = new Properties();
- props.load(TestEngine.findTestProperties());
+ Properties props = TestEngine.getTestProperties();
m_engine = new TestEngine(props);
m_queue = m_engine.getWorkflowManager().getDecisionQueue();
adminSession = m_engine.adminSession();
Modified: jspwiki/trunk/jspwiki-war/src/test/java/org/apache/wiki/workflow/OutcomeTest.java
URL: http://svn.apache.org/viewvc/jspwiki/trunk/jspwiki-war/src/test/java/org/apache/wiki/workflow/OutcomeTest.java?rev=1512071&r1=1512070&r2=1512071&view=diff
==============================================================================
--- jspwiki/trunk/jspwiki-war/src/test/java/org/apache/wiki/workflow/OutcomeTest.java (original)
+++ jspwiki/trunk/jspwiki-war/src/test/java/org/apache/wiki/workflow/OutcomeTest.java Thu Aug 8 22:13:45 2013
@@ -54,8 +54,7 @@ public class OutcomeTest extends TestCas
public void testMessage() throws Exception
{
- Properties props = new Properties();
- props.load(TestEngine.findTestProperties());
+ Properties props = TestEngine.getTestProperties();
WikiEngine engine = new TestEngine(props);
InternationalizationManager i18n = engine.getInternationalizationManager();
String core = "templates.default";
Modified: jspwiki/trunk/jspwiki-war/src/test/java/org/apache/wiki/workflow/WorkflowManagerTest.java
URL: http://svn.apache.org/viewvc/jspwiki/trunk/jspwiki-war/src/test/java/org/apache/wiki/workflow/WorkflowManagerTest.java?rev=1512071&r1=1512070&r2=1512071&view=diff
==============================================================================
--- jspwiki/trunk/jspwiki-war/src/test/java/org/apache/wiki/workflow/WorkflowManagerTest.java (original)
+++ jspwiki/trunk/jspwiki-war/src/test/java/org/apache/wiki/workflow/WorkflowManagerTest.java Thu Aug 8 22:13:45 2013
@@ -37,8 +37,7 @@ public class WorkflowManagerTest extends
protected void setUp() throws Exception
{
super.setUp();
- Properties props = new Properties();
- props.load(TestEngine.findTestProperties());
+ Properties props = TestEngine.getTestProperties();
m_engine = new TestEngine(props);
wm = m_engine.getWorkflowManager();
// Create a workflow with 3 steps, with a Decision in the middle
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=1512071&r1=1512070&r2=1512071&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 Thu Aug 8 22:13:45 2013
@@ -30,7 +30,7 @@ public class RPCHandlerTest extends Test
{
TestEngine m_engine;
RPCHandler m_handler;
- Properties m_props;
+ Properties m_props = TestEngine.getTestProperties();
static final String NAME1 = "Test";
@@ -42,9 +42,6 @@ public class RPCHandlerTest extends Test
public void setUp()
throws Exception
{
- m_props = new Properties();
- m_props.load( TestEngine.findTestProperties() );
-
m_engine = new TestEngine( m_props );
m_handler = new RPCHandler();
Copied: jspwiki/trunk/jspwiki-war/src/test/resources/jspwiki-custom.properties (from r1511676, jspwiki/trunk/jspwiki-war/src/test/resources/jspwiki.properties)
URL: http://svn.apache.org/viewvc/jspwiki/trunk/jspwiki-war/src/test/resources/jspwiki-custom.properties?p2=jspwiki/trunk/jspwiki-war/src/test/resources/jspwiki-custom.properties&p1=jspwiki/trunk/jspwiki-war/src/test/resources/jspwiki.properties&r1=1511676&r2=1512071&rev=1512071&view=diff
==============================================================================
--- jspwiki/trunk/jspwiki-war/src/test/resources/jspwiki.properties (original)
+++ jspwiki/trunk/jspwiki-war/src/test/resources/jspwiki-custom.properties Thu Aug 8 22:13:45 2013
@@ -16,52 +16,26 @@
# under the License.
#
-# Property file for tests.
+# The only properties needed to be listed below are those that override
+# values in src/main/resources/ini/jspwiki.properties
#
-#
-# Which page provider class to use. Possibilities are:
-#
-# RCSFileProvider for simple RCS-based file storage
-# FileSystemProvider for simple pure file storage with no version information
-#
-jspwiki.pageProvider = org.apache.wiki.providers.FileSystemProvider
-jspwiki.usePageCache = true
-#
-# Determines where wiki files are kept.
-#
jspwiki.fileSystemProvider.pageDir = @tests.pagedir@
jspwiki.workDir = @tests.workdir@
+jspwiki.searchProvider = BasicSearchProvider
jspwiki.translatorReader.camelCaseLinks = true
-
jspwiki.breakTitleWithSpaces = true
-
-jspwiki.translatorReader.matchEnglishPlurals = true
jspwiki.translatorReader.useOutlinkImage = false
-
-jspwiki.attachmentProvider = BasicAttachmentProvider
jspwiki.basicAttachmentProvider.storageDir = @tests.pagedir@
-
jspwiki.encoding = ISO-8859-1
-
jspwiki.filterConfig = @tests.filter@
-
jspwiki.baseURL = http://localhost/
jspwiki.referenceStyle = relative
-jspwiki.searchProvider = BasicSearchProvider
jspwiki.authorizer=org.apache.wiki.TestAuthorizer
#
-# Special page references.
-#
-# The URL is relative to Wiki.jsp. However, if you use
-# a full, absolute URL, you can also do that.
-#
-# Example to redirect all requests to a page called 'OriginalWiki'
-# to the original wikiwiki at http://c2.com/cgi/wiki
-#
-# jspwiki.specialPage.OriginalWiki = http://c2.com/cgi/wiki
+# Special page references done for testing
#
jspwiki.specialPage.RecentChanges = RecentChanges.jsp
jspwiki.specialPage.Search = Search.jsp
@@ -72,14 +46,11 @@ jspwiki.specialPage.Search = Search.jsp
jspwiki.interWikiRef.JSPWiki = http://www.ecyrd.com/JSPWiki/Wiki.jsp?page=%s
-jspwiki.rss.generate = false
-
#
# Define which image types are inlined.
# These are your standard glob expressions (just like in your
# Windows or UNIX shells).
#
-
jspwiki.translatorReader.inlinePattern.1 = *.jpg
jspwiki.translatorReader.inlinePattern.2 = *.png
jspwiki.translatorReader.inlinePattern.3 = http://images.com/*
@@ -88,44 +59,13 @@ jspwiki.translatorReader.inlinePattern.3
# Security: use standard providers for user/group auth, user management
# and ACLs. Use a test userdatabase for storing users.
#
-jspwiki.aclManager = org.apache.wiki.auth.acl.DefaultAclManager
-#jspwiki.authorizer = org.apache.wiki.auth.authorize.WebContainerAuthorizer
-jspwiki.groupdatabase = org.apache.wiki.auth.authorize.XMLGroupDatabase
jspwiki.xmlGroupDatabaseFile = target/test-classes/groupdatabase.xml
-jspwiki.userdatabase = org.apache.wiki.auth.user.XMLUserDatabase
jspwiki.xmlUserDatabaseFile = target/test-classes/userdatabase.xml
jspwiki.admin.user = admin
-jspwiki.userdatabase.datasource=jdbc/UserDatabase
-jspwiki.groupdatabase.datasource=jdbc/GroupDatabase
-
-#
-# Configure logs.
-#
-# Send mail on alerts
-#
-#
-# Log only interesting stuff on screen.
-#
-#log4j.appender.console = org.apache.log4j.ConsoleAppender
-#log4j.appender.console.Threshold = WARN
-
-#log4j.appender.console.layout = org.apache.log4j.PatternLayout
-#log4j.appender.console.layout.ConversionPattern = %-5p: %m%n
-
-#
-# Log everything into a file.
-log4j.rootCategory=INFO,FileLog
-# log4j.logger.org.apache.wiki=INFO, FileLog
-log4j.logger.org.mortbay=INFO, TestContainerLog
log4j.logger.SecurityLog=INFO, SecurityAppender
-log4j.appender.FileLog = org.apache.log4j.RollingFileAppender
-log4j.appender.FileLog.MaxFileSize = 10MB
-log4j.appender.FileLog.MaxBackupIndex = 14
log4j.appender.FileLog.File = @tests.logfile@
-log4j.appender.FileLog.layout = org.apache.log4j.PatternLayout
-log4j.appender.FileLog.layout.ConversionPattern=%d [%t] %p %c %x - %m%n
log4j.appender.SecurityAppender = org.apache.log4j.RollingFileAppender
log4j.appender.SecurityAppender.MaxFileSize = 10MB
@@ -141,7 +81,6 @@ log4j.appender.TestContainerLog.layout =
log4j.appender.TestContainerLog.layout.ConversionPattern=%d [%t] %p %c %x - %m%n
log4j.appender.TestContainerLog.File= @testcontainerlog@
-
# JavaMail properties
mail.smtp.host = 127.0.0.1
mail.smtp.port = 25
Copied: jspwiki/trunk/jspwiki-war/src/test/resources/jspwiki-rcs-custom.properties (from r1511676, jspwiki/trunk/jspwiki-war/src/test/resources/jspwiki_rcs.properties)
URL: http://svn.apache.org/viewvc/jspwiki/trunk/jspwiki-war/src/test/resources/jspwiki-rcs-custom.properties?p2=jspwiki/trunk/jspwiki-war/src/test/resources/jspwiki-rcs-custom.properties&p1=jspwiki/trunk/jspwiki-war/src/test/resources/jspwiki_rcs.properties&r1=1511676&r2=1512071&rev=1512071&view=diff
==============================================================================
--- jspwiki/trunk/jspwiki-war/src/test/resources/jspwiki_rcs.properties (original)
+++ jspwiki/trunk/jspwiki-war/src/test/resources/jspwiki-rcs-custom.properties Thu Aug 8 22:13:45 2013
@@ -16,13 +16,8 @@
# under the License.
#
-# Property file for tests.
-#
-#
-# Which page provider class to use. Possibilities are:
-#
-# RCSFileProvider for simple RCS-based file storage
-# FileSystemProvider for simple pure file storage with no version information
+# The only properties needed to be listed below are those that override
+# values in src/main/resources/ini/jspwiki.properties
#
jspwiki.pageProvider = RCSFileProvider
@@ -32,25 +27,8 @@ jspwiki.pageProvider = RCSFileProvider
jspwiki.fileSystemProvider.pageDir = @tests.pagedir@
jspwiki.workDir = @tests.workdir@
jspwiki.searchProvider = BasicSearchProvider
-
-#
-# Special page references.
-#
-# The URL is relative to Wiki.jsp. However, if you use
-# a full, absolute URL, you can also do that.
-#
-# Example to redirect all requests to a page called 'OriginalWiki'
-# to the original wikiwiki at http://c2.com/cgi/wiki
-#
-# jspwiki.specialPage.OriginalWiki = http://c2.com/cgi/wiki
-#
jspwiki.specialPage.RecentChanges = RecentChanges.jsp
jspwiki.specialPage.Search = Search.jsp
-
-# InterWiki links The %s is replaced with the page reference (specify
-# multiple times to get multiple references). Page references should
-# appear in format : [wiki:wikipage].
-
jspwiki.interWikiRef.JSPWiki = http://www.ecyrd.com/JSPWiki/Wiki.jsp?page=%s
#
@@ -58,7 +36,6 @@ jspwiki.interWikiRef.JSPWiki = http://ww
# These are your standard glob expressions (just like in your
# Windows or UNIX shells).
#
-
jspwiki.translatorReader.inlinePattern.1 = *.jpg
jspwiki.translatorReader.inlinePattern.2 = *.png
jspwiki.translatorReader.inlinePattern.3 = http://images.com/*
@@ -67,61 +44,14 @@ jspwiki.translatorReader.inlinePattern.3
# Security: use standard providers for user/group auth, user management
# and ACLs. Use a test userdatabase for storing users.
#
-jspwiki.aclManager = org.apache.wiki.auth.acl.DefaultAclManager
-jspwiki.authorizer = org.apache.wiki.auth.authorize.WebContainerAuthorizer
jspwiki.groupManager = org.apache.wiki.auth.authorize.DefaultGroupManager
-jspwiki.userdatabase = org.apache.wiki.auth.user.XMLUserDatabase
jspwiki.xmlUserDatabaseFile = tests/etc/userdatabase.xml
jspwiki.admin.user = admin
-jspwiki.userdatabase.datasource=jdbc/UserDatabase
-jspwiki.userdatabase.table=users
-jspwiki.userdatabase.uid=uid
-jspwiki.userdatabase.email=email
-jspwiki.userdatabase.fullName=full_name
-jspwiki.userdatabase.loginName=login_name
-jspwiki.userdatabase.password=password
-jspwiki.userdatabase.wikiName=wiki_name
-jspwiki.userdatabase.created=created
-jspwiki.userdatabase.modified=modified
-jspwiki.userdatabase.lockExpiry=lock_expiry
-jspwiki.userdatabase.attributes=attributes
-jspwiki.userdatabase.roleTable=roles
-jspwiki.userdatabase.role=role
-jspwiki.groupdatabase.datasource=jdbc/GroupDatabase
-jspwiki.groupdatabase.table=groups
-jspwiki.groupdatabase.membertable=group_members
-jspwiki.groupdatabase.created=created
-jspwiki.groupdatabase.creator=creator
-jspwiki.groupdatabase.name=name
-jspwiki.groupdatabase.member=member
-jspwiki.groupdatabase.modified=modified
-jspwiki.groupdatabase.modifier=modifier
-
-#
-# Configure logs.
-#
-# Send mail on alerts
-#
-#
-# Log only interesting stuff on screen.
-#
-#log4j.appender.console = org.apache.log4j.ConsoleAppender
-#log4j.appender.console.Threshold = WARN
-
-#log4j.appender.console.layout = org.apache.log4j.PatternLayout
-#log4j.appender.console.layout.ConversionPattern = %-5p: %m%n
-
#
# Log everything into a file.
#
-log4j.appender.FileLog = org.apache.log4j.RollingFileAppender
-log4j.appender.FileLog.MaxFileSize = 10MB
-log4j.appender.FileLog.MaxBackupIndex = 14
log4j.appender.FileLog.File = @tests.logfile@
-log4j.appender.FileLog.layout = org.apache.log4j.PatternLayout
-log4j.appender.FileLog.layout.ConversionPattern=%d [%t] %p %c %x - %m%n
-log4j.rootCategory=DEBUG,FileLog
log4j.appender.SecurityAppender = org.apache.log4j.RollingFileAppender
log4j.appender.SecurityAppender.MaxFileSize = 10MB
Copied: jspwiki/trunk/jspwiki-war/src/test/resources/jspwiki-vers-custom.properties (from r1511676, jspwiki/trunk/jspwiki-war/src/test/resources/jspwiki_vers.properties)
URL: http://svn.apache.org/viewvc/jspwiki/trunk/jspwiki-war/src/test/resources/jspwiki-vers-custom.properties?p2=jspwiki/trunk/jspwiki-war/src/test/resources/jspwiki-vers-custom.properties&p1=jspwiki/trunk/jspwiki-war/src/test/resources/jspwiki_vers.properties&r1=1511676&r2=1512071&rev=1512071&view=diff
==============================================================================
--- jspwiki/trunk/jspwiki-war/src/test/resources/jspwiki_vers.properties (original)
+++ jspwiki/trunk/jspwiki-war/src/test/resources/jspwiki-vers-custom.properties Thu Aug 8 22:13:45 2013
@@ -16,13 +16,8 @@
# under the License.
#
-# Property file for tests.
-#
-#
-# Which page provider class to use. Possibilities are:
-#
-# RCSFileProvider for simple RCS-based file storage
-# FileSystemProvider for simple pure file storage with no version information
+# The only properties needed to be listed below are those that override
+# values in src/main/resources/ini/jspwiki.properties
#
jspwiki.pageProvider = VersioningFileProvider
@@ -35,17 +30,6 @@ jspwiki.workDir = @tests.workdir@
jspwiki.encoding = UTF-8
jspwiki.searchProvider = BasicSearchProvider
-#
-# Special page references.
-#
-# The URL is relative to Wiki.jsp. However, if you use
-# a full, absolute URL, you can also do that.
-#
-# Example to redirect all requests to a page called 'OriginalWiki'
-# to the original wikiwiki at http://c2.com/cgi/wiki
-#
-# jspwiki.specialPage.OriginalWiki = http://c2.com/cgi/wiki
-#
jspwiki.specialPage.RecentChanges = RecentChanges.jsp
jspwiki.specialPage.Search = Search.jsp
@@ -69,61 +53,10 @@ jspwiki.translatorReader.inlinePattern.3
# Security: use standard providers for user/group auth, user management
# and ACLs. Use a test userdatabase for storing users.
#
-jspwiki.aclManager = org.apache.wiki.auth.acl.DefaultAclManager
-jspwiki.authorizer = org.apache.wiki.auth.authorize.WebContainerAuthorizer
-jspwiki.groupManager = org.apache.wiki.auth.authorize.DefaultGroupManager
-jspwiki.userdatabase = org.apache.wiki.auth.user.XMLUserDatabase
jspwiki.xmlUserDatabaseFile = tests/etc/userdatabase.xml
jspwiki.admin.user = admin
-jspwiki.userdatabase.datasource=jdbc/UserDatabase
-jspwiki.userdatabase.table=users
-jspwiki.userdatabase.uid=uid
-jspwiki.userdatabase.email=email
-jspwiki.userdatabase.fullName=full_name
-jspwiki.userdatabase.loginName=login_name
-jspwiki.userdatabase.password=password
-jspwiki.userdatabase.wikiName=wiki_name
-jspwiki.userdatabase.created=created
-jspwiki.userdatabase.modified=modified
-jspwiki.userdatabase.lockExpiry=lock_expiry
-jspwiki.userdatabase.attributes=attributes
-jspwiki.userdatabase.roleTable=roles
-jspwiki.userdatabase.role=role
-jspwiki.groupdatabase.datasource=jdbc/GroupDatabase
-jspwiki.groupdatabase.table=groups
-jspwiki.groupdatabase.membertable=group_members
-jspwiki.groupdatabase.created=created
-jspwiki.groupdatabase.creator=creator
-jspwiki.groupdatabase.name=name
-jspwiki.groupdatabase.member=member
-jspwiki.groupdatabase.modified=modified
-jspwiki.groupdatabase.modifier=modifier
-
-#
-# Configure logs.
-#
-# Send mail on alerts
-#
-#
-# Log only interesting stuff on screen.
-#
-#log4j.appender.console = org.apache.log4j.ConsoleAppender
-#log4j.appender.console.Threshold = WARN
-
-#log4j.appender.console.layout = org.apache.log4j.PatternLayout
-#log4j.appender.console.layout.ConversionPattern = %-5p: %m%n
-
-#
-# Log everything into a file.
-#
-log4j.appender.FileLog = org.apache.log4j.RollingFileAppender
-log4j.appender.FileLog.MaxFileSize = 10MB
-log4j.appender.FileLog.MaxBackupIndex = 14
log4j.appender.FileLog.File = @tests.logfile@
-log4j.appender.FileLog.layout = org.apache.log4j.PatternLayout
-log4j.appender.FileLog.layout.ConversionPattern=%d [%t] %p %c %x - %m%n
-log4j.rootCategory=DEBUG,FileLog
log4j.appender.SecurityAppender = org.apache.log4j.RollingFileAppender
log4j.appender.SecurityAppender.MaxFileSize = 10MB