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 [1/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/...
Author: gmazza
Date: Thu Aug 8 22:13:45 2013
New Revision: 1512071
URL: http://svn.apache.org/r1512071
Log:
Switched to the jspwiki-custom.properties file mechanism, works on Tomcat and JUnit tests, Selenium updates forthcoming.
Added:
jspwiki/trunk/jspwiki-war/src/main/resources/ini/jspwiki.properties
- copied, changed from r1511676, jspwiki/trunk/jspwiki-war/src/main/webapp/WEB-INF/jspwiki.properties
jspwiki/trunk/jspwiki-war/src/test/resources/jspwiki-custom.properties
- copied, changed from r1511676, jspwiki/trunk/jspwiki-war/src/test/resources/jspwiki.properties
jspwiki/trunk/jspwiki-war/src/test/resources/jspwiki-rcs-custom.properties
- copied, changed from r1511676, jspwiki/trunk/jspwiki-war/src/test/resources/jspwiki_rcs.properties
jspwiki/trunk/jspwiki-war/src/test/resources/jspwiki-vers-custom.properties
- copied, changed from r1511676, jspwiki/trunk/jspwiki-war/src/test/resources/jspwiki_vers.properties
Removed:
jspwiki/trunk/jspwiki-war/src/main/resources/ini/default_jspwiki.properties
jspwiki/trunk/jspwiki-war/src/main/webapp/WEB-INF/jspwiki.properties
jspwiki/trunk/jspwiki-war/src/test/resources/jspwiki.properties
jspwiki/trunk/jspwiki-war/src/test/resources/jspwiki_rcs.properties
jspwiki/trunk/jspwiki-war/src/test/resources/jspwiki_vers.properties
Modified:
jspwiki/trunk/ChangeLog
jspwiki/trunk/jspwiki-site/src/site/trunk/content/jspwiki/development/changelog.mdtext
jspwiki/trunk/jspwiki-site/src/site/trunk/templates/release.mdtext
jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/PropertyReader.java
jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/Release.java
jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/ui/CommandResolver.java
jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/ui/Installer.java
jspwiki/trunk/jspwiki-war/src/test/java/org/apache/wiki/AllTests.java
jspwiki/trunk/jspwiki-war/src/test/java/org/apache/wiki/PageManagerTest.java
jspwiki/trunk/jspwiki-war/src/test/java/org/apache/wiki/ReferenceManagerTest.java
jspwiki/trunk/jspwiki-war/src/test/java/org/apache/wiki/TestEngine.java
jspwiki/trunk/jspwiki-war/src/test/java/org/apache/wiki/VariableManagerTest.java
jspwiki/trunk/jspwiki-war/src/test/java/org/apache/wiki/WikiEngineTest.java
jspwiki/trunk/jspwiki-war/src/test/java/org/apache/wiki/WikiSessionTest.java
jspwiki/trunk/jspwiki-war/src/test/java/org/apache/wiki/attachment/AttachmentManagerTest.java
jspwiki/trunk/jspwiki-war/src/test/java/org/apache/wiki/auth/AuthenticationManagerTest.java
jspwiki/trunk/jspwiki-war/src/test/java/org/apache/wiki/auth/AuthorizationManagerTest.java
jspwiki/trunk/jspwiki-war/src/test/java/org/apache/wiki/auth/GroupManagerTest.java
jspwiki/trunk/jspwiki-war/src/test/java/org/apache/wiki/auth/UserManagerTest.java
jspwiki/trunk/jspwiki-war/src/test/java/org/apache/wiki/auth/acl/AclImplTest.java
jspwiki/trunk/jspwiki-war/src/test/java/org/apache/wiki/auth/acl/DefaultAclManagerTest.java
jspwiki/trunk/jspwiki-war/src/test/java/org/apache/wiki/auth/authorize/GroupTest.java
jspwiki/trunk/jspwiki-war/src/test/java/org/apache/wiki/auth/authorize/JDBCGroupDatabaseTest.java
jspwiki/trunk/jspwiki-war/src/test/java/org/apache/wiki/auth/authorize/WebContainerAuthorizerTest.java
jspwiki/trunk/jspwiki-war/src/test/java/org/apache/wiki/auth/authorize/XMLGroupDatabaseTest.java
jspwiki/trunk/jspwiki-war/src/test/java/org/apache/wiki/auth/login/AnonymousLoginModuleTest.java
jspwiki/trunk/jspwiki-war/src/test/java/org/apache/wiki/auth/login/CookieAssertionLoginModuleTest.java
jspwiki/trunk/jspwiki-war/src/test/java/org/apache/wiki/auth/login/UserDatabaseLoginModuleTest.java
jspwiki/trunk/jspwiki-war/src/test/java/org/apache/wiki/auth/login/WebContainerLoginModuleTest.java
jspwiki/trunk/jspwiki-war/src/test/java/org/apache/wiki/auth/user/UserProfileTest.java
jspwiki/trunk/jspwiki-war/src/test/java/org/apache/wiki/auth/user/XMLUserDatabaseTest.java
jspwiki/trunk/jspwiki-war/src/test/java/org/apache/wiki/content/PageRenamerTest.java
jspwiki/trunk/jspwiki-war/src/test/java/org/apache/wiki/diff/ContextualDiffProviderTest.java
jspwiki/trunk/jspwiki-war/src/test/java/org/apache/wiki/filters/DefaultFilterManagerTest.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/CounterPluginTest.java
jspwiki/trunk/jspwiki-war/src/test/java/org/apache/wiki/plugin/DefaultPluginManagerTest.java
jspwiki/trunk/jspwiki-war/src/test/java/org/apache/wiki/plugin/GroupsTest.java
jspwiki/trunk/jspwiki-war/src/test/java/org/apache/wiki/plugin/IfPluginTest.java
jspwiki/trunk/jspwiki-war/src/test/java/org/apache/wiki/plugin/InsertPageTest.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/ReferringPagesPluginTest.java
jspwiki/trunk/jspwiki-war/src/test/java/org/apache/wiki/plugin/TableOfContentsTest.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/BasicAttachmentProviderTest.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/FileSystemProviderTest.java
jspwiki/trunk/jspwiki-war/src/test/java/org/apache/wiki/providers/RCSFileProviderTest.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/CreoleRendererTest.java
jspwiki/trunk/jspwiki-war/src/test/java/org/apache/wiki/render/RenderingManagerTest.java
jspwiki/trunk/jspwiki-war/src/test/java/org/apache/wiki/render/WysiwygEditingRendererTest.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/stress/StressTestSpeed.java
jspwiki/trunk/jspwiki-war/src/test/java/org/apache/wiki/stress/StressTestVersioningProvider.java
jspwiki/trunk/jspwiki-war/src/test/java/org/apache/wiki/ui/CommandResolverTest.java
jspwiki/trunk/jspwiki-war/src/test/java/org/apache/wiki/ui/GroupCommandTest.java
jspwiki/trunk/jspwiki-war/src/test/java/org/apache/wiki/ui/InputValidatorTest.java
jspwiki/trunk/jspwiki-war/src/test/java/org/apache/wiki/ui/PageCommandTest.java
jspwiki/trunk/jspwiki-war/src/test/java/org/apache/wiki/ui/WikiCommandTest.java
jspwiki/trunk/jspwiki-war/src/test/java/org/apache/wiki/url/DefaultURLConstructorTest.java
jspwiki/trunk/jspwiki-war/src/test/java/org/apache/wiki/url/ShortURLConstructorTest.java
jspwiki/trunk/jspwiki-war/src/test/java/org/apache/wiki/url/ShortViewURLConstructorTest.java
jspwiki/trunk/jspwiki-war/src/test/java/org/apache/wiki/util/FileUtilTest.java
jspwiki/trunk/jspwiki-war/src/test/java/org/apache/wiki/util/MailUtilTest.java
jspwiki/trunk/jspwiki-war/src/test/java/org/apache/wiki/workflow/ApprovalWorkflowTest.java
jspwiki/trunk/jspwiki-war/src/test/java/org/apache/wiki/workflow/DecisionQueueTest.java
jspwiki/trunk/jspwiki-war/src/test/java/org/apache/wiki/workflow/OutcomeTest.java
jspwiki/trunk/jspwiki-war/src/test/java/org/apache/wiki/workflow/WorkflowManagerTest.java
jspwiki/trunk/jspwiki-war/src/test/java/org/apache/wiki/xmlrpc/RPCHandlerTest.java
Modified: jspwiki/trunk/ChangeLog
URL: http://svn.apache.org/viewvc/jspwiki/trunk/ChangeLog?rev=1512071&r1=1512070&r2=1512071&view=diff
==============================================================================
--- jspwiki/trunk/ChangeLog (original)
+++ jspwiki/trunk/ChangeLog Thu Aug 8 22:13:45 2013
@@ -1,4 +1,17 @@
-2013-08-07 Glen Mazza (gmazza AT apache DOT org)
+2013-08-09 Glen Mazza (gmazza AT apache DOT org)
+
+ * 2.10.0-svn-36
+
+ * Introducted new jspwiki-custom.properties file, which can be placed in test/resources for JUnit tests
+ or externally to the WAR (for Tomcat, $CATALINA_HOME/lib) and will be picked up automatically by
+ JSPWiki. Only those elements that you're changing from default src/main/resources/ini/jspwiki.properties
+ need addition to the custom properties file. I still need to convert the Selenium tests to the new format.
+
+ * Renamed jspwiki.properties, _rcs.properties, and _vers.properties file with new -custom suffix in src/test/resources
+ (can be named anything as JUnit tests hardcode the names). Removed elements that are the same as those
+ in the default jspwiki.properties file.
+
+2013-08-08 Glen Mazza (gmazza AT apache DOT org)
* 2.10.0-svn-35
@@ -6,7 +19,7 @@
2013-08-07 Glen Mazza (gmazza AT apache DOT org)
- * 2.10.0-svn-34
+ * 2.10.0-svn-34find
* Upgrade from Jetty used in unit test cases from v. 7.6.7 to v. 9.0.4
Modified: jspwiki/trunk/jspwiki-site/src/site/trunk/content/jspwiki/development/changelog.mdtext
URL: http://svn.apache.org/viewvc/jspwiki/trunk/jspwiki-site/src/site/trunk/content/jspwiki/development/changelog.mdtext?rev=1512071&r1=1512070&r2=1512071&view=diff
==============================================================================
--- jspwiki/trunk/jspwiki-site/src/site/trunk/content/jspwiki/development/changelog.mdtext (original)
+++ jspwiki/trunk/jspwiki-site/src/site/trunk/content/jspwiki/development/changelog.mdtext Thu Aug 8 22:13:45 2013
@@ -2,6 +2,12 @@ Title: Changelog
#### 2013-08-07 Glen Mazza (gmazza AT apache DOT org)
+* 2.10.0-svn-35
+
+* Partial revert of Jetty to v. 8.1.12 so it can still run with the JDK 6 used by Jenkins.
+
+#### 2013-08-07 Glen Mazza (gmazza AT apache DOT org)
+
* 2.10.0-svn-34
* Upgrade from Jetty used in unit test cases from v. 7.6.7 to v. 9.0.4
Modified: jspwiki/trunk/jspwiki-site/src/site/trunk/templates/release.mdtext
URL: http://svn.apache.org/viewvc/jspwiki/trunk/jspwiki-site/src/site/trunk/templates/release.mdtext?rev=1512071&r1=1512070&r2=1512071&view=diff
==============================================================================
--- jspwiki/trunk/jspwiki-site/src/site/trunk/templates/release.mdtext (original)
+++ jspwiki/trunk/jspwiki-site/src/site/trunk/templates/release.mdtext Thu Aug 8 22:13:45 2013
@@ -1 +1 @@
-JSPWiki v2.10.0-svn-34
\ No newline at end of file
+JSPWiki v2.10.0-svn-35
\ No newline at end of file
Modified: jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/PropertyReader.java
URL: http://svn.apache.org/viewvc/jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/PropertyReader.java?rev=1512071&r1=1512070&r2=1512071&view=diff
==============================================================================
--- jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/PropertyReader.java (original)
+++ jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/PropertyReader.java Thu Aug 8 22:13:45 2013
@@ -26,7 +26,6 @@ import java.util.*;
import javax.servlet.ServletContext;
-import org.apache.wiki.api.exceptions.WikiException;
import org.apache.wiki.util.TextUtil;
/**
@@ -40,16 +39,20 @@ import org.apache.wiki.util.TextUtil;
*/
public final class PropertyReader
{
+ /**
+ * Path to the base property file, usually overridden by values provided in
+ * a jspwiki-custom.properties file
+ * {@value #DEFAULT_JSPWIKI_CONFIG}
+ */
+ public static final String DEFAULT_JSPWIKI_CONFIG = "/ini/jspwiki.properties";
- private static final String DEFAULT_JSPWIKI_PROPERTIES = "/ini/default_jspwiki.properties";
-
- /** The servlet context parameter (from web.xml) that defines where the
+ /** The servlet context parameter (from web.xml) that defines where the
* config file is to be found.
* If it is not defined, checks the Java System Property, if that is not defined either,
* uses the default as defined by DEFAULT_PROPERTYFILE.
- * {@value #DEFAULT_PROPERTYFILE}
+ * {@value #DEFAULT_JSPWIKI_CONFIG}
*/
- public static final String PARAM_PROPERTYFILE = "jspwiki.propertyfile";
+ public static final String PARAM_PROPERTYFILE = "jspwiki.custom.config";
/**
* The prefix when you are cascading properties.
@@ -58,29 +61,11 @@ public final class PropertyReader
*/
public static final String PARAM_PROPERTYFILE_CASCADEPREFIX = "jspwiki.propertyfile.cascade.";
- /** Path to the default property file.
- * {@value #DEFAULT_PROPERTYFILE}
- */
- public static final String DEFAULT_PROPERTYFILE = "/WEB-INF/jspwiki.properties";
+ public static final String CUSTOM_JSPWIKI_CONFIG = "/jspwiki-custom.properties";
private static final String PARAM_VAR_DECLARATION = "var.";
private static final String PARAM_VAR_IDENTIFIER = "$";
-
- /**
- * Contains the default properties for JSPWiki.
- */
- private static final String[] DEFAULT_PROPERTIES =
- { "jspwiki.specialPage.Login", "Login.jsp",
- "jspwiki.specialPage.Logout", "Logout.jsp",
- "jspwiki.specialPage.CreateGroup", "NewGroup.jsp",
- "jspwiki.specialPage.CreateProfile", "Register.jsp",
- "jspwiki.specialPage.EditProfile", "UserPreferences.jsp",
- "jspwiki.specialPage.Preferences", "UserPreferences.jsp",
- "jspwiki.specialPage.Search", "Search.jsp",
- "jspwiki.specialPage.FindPage", "FindPage.jsp"};
-
-
/**
* Private constructor to prevent instantiation.
*/
@@ -123,29 +108,34 @@ public final class PropertyReader
try
{
+ // we'll need this to get at our properties files in the classpath
+ Class config_class = Class.forName("org.apache.wiki.PropertyReader");
+
//
// Figure out where our properties lie.
//
if( propertyFile == null )
{
- context.log("No "+PARAM_PROPERTYFILE
- +" defined for this context, using default from "+DEFAULT_PROPERTYFILE);
- // Use the default property file.
- propertyStream = context.getResourceAsStream(DEFAULT_PROPERTYFILE);
+ context.log("No " + PARAM_PROPERTYFILE + " defined for this context, " +
+ "looking for custom properties file with default name of: " + CUSTOM_JSPWIKI_CONFIG);
+ // Use the custom property file at the default location
+ propertyStream = config_class.getResourceAsStream(CUSTOM_JSPWIKI_CONFIG);
}
else
{
- context.log("Reading properties from "+propertyFile+" instead of default.");
+ context.log(PARAM_PROPERTYFILE + " defined, using " + propertyFile + " as the custom properties file.");
propertyStream = new FileInputStream( new File(propertyFile) );
}
+ Properties props = getDefaultProperties();
if( propertyStream == null )
{
- throw new WikiException("Property file cannot be found!"+propertyFile);
+ context.log("No custom property file found, relying on JSPWiki defaults.");
+ }
+ else
+ {
+ props.load( propertyStream );
}
-
- Properties props = getDefaultProperties();
- props.load( propertyStream );
//this will add additional properties to the default ones:
context.log("Loading cascading properties...");
@@ -180,15 +170,14 @@ public final class PropertyReader
/**
- * Returns the default property set as a Properties object.
- *
- * @return The default property set.
+ * Returns the property set as a Properties object.
+ *
+ * @return A property set.
*/
public static Properties getDefaultProperties()
{
- Properties props = new Properties( TextUtil.createProperties( DEFAULT_PROPERTIES ) );
-
- InputStream in = PropertyReader.class.getResourceAsStream( DEFAULT_JSPWIKI_PROPERTIES );
+ Properties props = new Properties();
+ InputStream in = PropertyReader.class.getResourceAsStream( DEFAULT_JSPWIKI_CONFIG );
if( in != null )
{
@@ -198,13 +187,65 @@ public final class PropertyReader
}
catch( IOException e )
{
- System.err.println("Unable to load default propertyfile '"+DEFAULT_JSPWIKI_PROPERTIES+"'"+e.getMessage());
+ System.err.println("Unable to load default propertyfile '" + DEFAULT_JSPWIKI_CONFIG + "'" + e.getMessage());
+ }
+ finally
+ {
+ try
+ {
+ if( in != null ) in.close();
+ }
+ catch( IOException e )
+ {
+ System.err.println("Unable to close stream for property file - something must be seriously wrong.");
+ }
}
}
return props;
}
+ /**
+ * Returns a property set consisting of the default Property Set overlaid with a custom property set
+ *
+ * @param fileName Reference to the custom override file
+ * @return A property set consisting of the default property set and custom property set, with
+ * the latter's properties replacing the former for any common values
+ */
+ public static Properties getCombinedProperties(String fileName)
+ {
+ Properties newPropertySet = getDefaultProperties();
+ InputStream in = PropertyReader.class.getResourceAsStream( fileName );
+
+ if( in != null )
+ {
+ try
+ {
+ newPropertySet.load( in );
+ }
+ catch( IOException e )
+ {
+ System.err.println("Unable to load propertyfile '" + fileName + "'" + e.getMessage());
+ }
+ finally
+ {
+ try
+ {
+ if( in != null ) in.close();
+ }
+ catch( IOException e )
+ {
+ System.err.println("Unable to close stream for property file - something must be seriously wrong.");
+ }
+ }
+ }
+ else
+ {
+ System.err.println("*** Custom property file \"" + fileName + "\" not found, relying on default file alone.");
+ }
+
+ return newPropertySet;
+ }
/**
* Returns the ServletContext Init parameter if has been set, otherwise
Modified: jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/Release.java
URL: http://svn.apache.org/viewvc/jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/Release.java?rev=1512071&r1=1512070&r2=1512071&view=diff
==============================================================================
--- jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/Release.java (original)
+++ jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/Release.java Thu Aug 8 22:13:45 2013
@@ -75,7 +75,7 @@ public final class Release
* <p>
* If the build identifier is empty, it is not added.
*/
- public static final String BUILD = "35";
+ public static final String BUILD = "36";
/**
* This is the generic version string you should use
Modified: jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/ui/CommandResolver.java
URL: http://svn.apache.org/viewvc/jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/ui/CommandResolver.java?rev=1512071&r1=1512070&r2=1512071&view=diff
==============================================================================
--- jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/ui/CommandResolver.java (original)
+++ jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/ui/CommandResolver.java Thu Aug 8 22:13:45 2013
@@ -117,14 +117,12 @@ public final class CommandResolver
// the "special page" prefix. Create maps that allow us
// look up the correct Command based on special page name.
// If a matching command isn't found, create a RedirectCommand.
- for( Iterator i = properties.entrySet().iterator(); i.hasNext(); )
+ for(String key : properties.stringPropertyNames())
{
- Map.Entry entry = (Map.Entry) i.next();
- String key = (String) entry.getKey();
if ( key.startsWith( PROP_SPECIALPAGE ) )
{
String specialPage = key.substring( PROP_SPECIALPAGE.length() );
- String jsp = (String) entry.getValue();
+ String jsp = (String) properties.getProperty(key);
if ( specialPage != null && jsp != null )
{
specialPage = specialPage.trim();
Modified: jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/ui/Installer.java
URL: http://svn.apache.org/viewvc/jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/ui/Installer.java?rev=1512071&r1=1512070&r2=1512071&view=diff
==============================================================================
--- jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/ui/Installer.java (original)
+++ jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/ui/Installer.java Thu Aug 8 22:13:45 2013
@@ -53,7 +53,6 @@ public class Installer
public static final String ADMIN_ID = "admin";
public static final String ADMIN_NAME = "Administrator";
public static final String INSTALL_INFO = "Installer.Info";
- public static final String INSTALL_WARNING = "Installer.Warning";
public static final String INSTALL_ERROR = "Installer.Error";
public static final String APP_NAME = WikiEngine.PROP_APPNAME;
public static final String BASE_URL = WikiEngine.PROP_BASEURL;
@@ -78,7 +77,7 @@ public class Installer
// Get the servlet context, and file for properties
ServletContext context = config.getServletContext();
String path = context.getRealPath("/");
- m_propertyFile = new File( path, PropertyReader.DEFAULT_PROPERTYFILE );
+ m_propertyFile = new File( path, PropertyReader.DEFAULT_JSPWIKI_CONFIG );
m_props = new CommentedProperties();
// Stash the request
@@ -306,7 +305,6 @@ public class Installer
/**
* Sets a property based on the value of an HTTP request parameter.
* If the parameter is not found, a default value is used instead.
- * @param request the HTTP request
* @param param the parameter containing the value we will extract
* @param defaultValue the default to use if the parameter was not passed
* in the request
@@ -324,7 +322,7 @@ public class Installer
/**
* Simply sanitizes any path which contains backslashes (sometimes Windows
* users may have them) by expanding them to double-backslashes
- * @param s the key of the property to sanitize
+ * @param key the key of the property to sanitize
*/
private void sanitizePath( String key )
{
@@ -337,7 +335,7 @@ public class Installer
/**
* Simply sanitizes any URL which contains backslashes (sometimes Windows
* users may have them)
- * @param s the key of the property to sanitize
+ * @param key the key of the property to sanitize
*/
private void sanitizeURL( String key )
{
Copied: jspwiki/trunk/jspwiki-war/src/main/resources/ini/jspwiki.properties (from r1511676, jspwiki/trunk/jspwiki-war/src/main/webapp/WEB-INF/jspwiki.properties)
URL: http://svn.apache.org/viewvc/jspwiki/trunk/jspwiki-war/src/main/resources/ini/jspwiki.properties?p2=jspwiki/trunk/jspwiki-war/src/main/resources/ini/jspwiki.properties&p1=jspwiki/trunk/jspwiki-war/src/main/webapp/WEB-INF/jspwiki.properties&r1=1511676&r2=1512071&rev=1512071&view=diff
==============================================================================
--- jspwiki/trunk/jspwiki-war/src/main/webapp/WEB-INF/jspwiki.properties (original)
+++ jspwiki/trunk/jspwiki-war/src/main/resources/ini/jspwiki.properties Thu Aug 8 22:13:45 2013
@@ -33,7 +33,7 @@
# the actual web name (http://my.com/mywiki) of the application, but usually
# it is the same.
#
-jspwiki.applicationName = @appname@
+jspwiki.applicationName = JSPWiki
#
# Describe where your wiki lives (the real URL through which it is available
@@ -364,6 +364,12 @@ jspwiki.specialPage.Login = Login.jsp
jspwiki.specialPage.NewGroup = NewGroup.jsp
jspwiki.specialPage.UserPreferences = UserPreferences.jsp
jspwiki.specialPage.Workflow = Workflow.jsp
+jspwiki.specialPage.Logout = Logout.jsp
+jspwiki.specialPage.CreateProfile = Register.jsp
+jspwiki.specialPage.EditProfile = UserPreferences.jsp
+jspwiki.specialPage.Preferences = UserPreferences.jsp
+jspwiki.specialPage.FindPage = FindPage.jsp
+jspwiki.specialPage.RecentChanges=RecentChanges.jsp
#############################################################################
#
@@ -783,7 +789,7 @@ jspwiki.groupdatabase.modifier=modifier
# If you're going to use a stand-alone mail session, you will surely want
# to configure it, otherwise the internal default value will be used.
#
-mail.from = @mail.from@
+mail.from = JSPWiki <JS...@localhost>
# B. JNDI Resource Factory Configuration. JSPWiki will try this first.
# You will need to configure your container to provide a JavaMail
@@ -797,10 +803,10 @@ mail.from = @mail.from@
# C. Stand-alone Resource Factory. JSPWiki will use these values if JNDI fails.
#
# Your SMTP host (i.e. the one which sends email)
-mail.smtp.host = @mail.smtp.host@
+mail.smtp.host = 127.0.0.1
# If for some reason the standard smtp port (25) is blocked, you can change it here
-#mail.smtp.port = @mail.smtp.port@
+#mail.smtp.port = 25
# If you are using a webserver that is publically accessible it usually
# doesn't allow you to send mail anonymously
@@ -846,7 +852,7 @@ mail.smtp.host = @mail.smtp.host@
log4j.appender.FileLog = org.apache.log4j.RollingFileAppender
log4j.appender.FileLog.MaxFileSize = 10MB
log4j.appender.FileLog.MaxBackupIndex = 14
-log4j.appender.FileLog.File = @logfile@
+log4j.appender.FileLog.File = jspwiki.log
log4j.appender.FileLog.layout = org.apache.log4j.PatternLayout
log4j.appender.FileLog.layout.ConversionPattern=%d [%t] %p %c %x - %m%n
@@ -873,7 +879,7 @@ log4j.rootCategory=INFO,FileLog
#log4j.appender.SecurityAppender = org.apache.log4j.RollingFileAppender
#log4j.appender.SecurityAppender.MaxFileSize = 10MB
#log4j.appender.SecurityAppender.MaxBackupIndex = 14
-#log4j.appender.SecurityAppender.File = @securitylog@
+#log4j.appender.SecurityAppender.File = security.log
#log4j.appender.SecurityAppender.layout = org.apache.log4j.PatternLayout
#log4j.appender.SecurityAppender.layout.ConversionPattern=%d %p - %m%n
@@ -885,7 +891,7 @@ log4j.rootCategory=INFO,FileLog
#log4j.appender.SpamAppender = org.apache.log4j.RollingFileAppender
#log4j.appender.SpamAppender.MaxFileSize = 10MB
#log4j.appender.SpamAppender.MaxBackupIndex = 14
-#log4j.appender.SpamAppender.File = @spamlog@
+#log4j.appender.SpamAppender.File = spamlog.log
#log4j.appender.SpamAppender.layout = org.apache.log4j.PatternLayout
#log4j.appender.SpamAppender.layout.ConversionPattern=%d{ISO8601} %m%n
@@ -910,4 +916,75 @@ log4j.rootCategory=INFO,FileLog
# Uncomment the next line to require the Admin group to approve new user profiles
#jspwiki.approver.workflow.createUserProfile=Admin
+###########################################################################
+#
+# Default Template properties
+#
+# Set the name of the skin.
+# Default value is PlainVanilla
+jspwiki.defaultprefs.template.skinname =PlainVanilla
+
+# Set the format of dates
+jspwiki.defaultprefs.template.dateformat =dd-MMM-yyyy HH:mm
+
+# Set the timezone of the display date/times
+# By default, the timezone is read from the server
+# jspwiki.defaultprefs.template.timezone =GMT+01:00
+
+# Set position of the favorites menu (aka left menu)
+# The value determines the css-class used to change the position of the #favorites block
+# Possible values: fav-left or fav-right
+# Default value is fav-left
+jspwiki.defaultprefs.template.orientation =fav-left
+
+# Set editor type : plain, WikiWizard, FCK
+jspwiki.defaultprefs.template.editor =plain
+
+# Set section editing on/off : allow editing of page sections
+# Note: currently this is only compatible with the plain editor
+#jspwiki.defaultprefs.template.sectionediting =on
+
+# Set the language
+# By default, the language is read from the client browser http request
+# jspwiki.defaultprefs.template.language =en
+
+# List of selectable timeformats
+jspwiki.defaultprefs.timeformat.01=d/MM
+jspwiki.defaultprefs.timeformat.02=d/MM/yy
+jspwiki.defaultprefs.timeformat.03=d/MM/yyyy
+jspwiki.defaultprefs.timeformat.04=dd/MM/yy
+jspwiki.defaultprefs.timeformat.05=dd/MM/yyyy
+jspwiki.defaultprefs.timeformat.06=EEE, dd/MM/yyyy
+jspwiki.defaultprefs.timeformat.07=EEE, dd/MM/yyyy, Z
+jspwiki.defaultprefs.timeformat.08=EEE, dd/MM/yyyy, zzzz
+jspwiki.defaultprefs.timeformat.09=d/MM/yy HH:mm
+jspwiki.defaultprefs.timeformat.10=d/MM/yy hh:mm a
+jspwiki.defaultprefs.timeformat.11=d/MM/yy hh:mm a, Z
+jspwiki.defaultprefs.timeformat.12=dd-MMM
+jspwiki.defaultprefs.timeformat.13=dd-MMM-yy
+jspwiki.defaultprefs.timeformat.14=dd-MMM-yyyy
+jspwiki.defaultprefs.timeformat.15=EEE, dd-MMM-yyyy
+jspwiki.defaultprefs.timeformat.16=EEE, dd-MMM-yyyy, Z
+jspwiki.defaultprefs.timeformat.17=EEE, dd-MMM-yyyy, zzzz
+jspwiki.defaultprefs.timeformat.18=dd-MMM-yyyy HH:mm
+jspwiki.defaultprefs.timeformat.19=dd-MMM-yyyy hh:mm a
+jspwiki.defaultprefs.timeformat.20=dd-MMM-yyyy hh:mm a, Z
+jspwiki.defaultprefs.timeformat.21=MMMM dd, yyyy
+jspwiki.defaultprefs.timeformat.22=MMMM dd, yyyy HH:mm
+jspwiki.defaultprefs.timeformat.23=MMMM dd, yyyy hh:mm a
+jspwiki.defaultprefs.timeformat.24=MMMM, EEE dd,yyyy hh:mm a
+jspwiki.defaultprefs.timeformat.25=MMMM, EEEE dd,yyyy hh:mm a
+jspwiki.defaultprefs.timeformat.26=dd.MM.yyyy
+jspwiki.defaultprefs.timeformat.27=dd.MM.yyyy, HH:mm
+jspwiki.defaultprefs.timeformat.28=dd.MM.yyyy, HH:mm zz
+jspwiki.defaultprefs.timeformat.29=EEEE, dd.MM.yyyy
+jspwiki.defaultprefs.timeformat.30=EE, dd.MM.yyyy, HH:mm zz
+jspwiki.defaultprefs.timeformat.31=EEEE, d. MMMM yyyy, HH:mm zz
+jspwiki.defaultprefs.timeformat.32=yyyy-MM-dd, HH:mm zz
+jspwiki.defaultprefs.timeformat.33=yyyy-MM-dd, EEEE
+jspwiki.defaultprefs.timeformat.34=d.M.yyyy
+jspwiki.defaultprefs.timeformat.35=d.M.yyyy H:mm
+jspwiki.defaultprefs.timeformat.36=yyyy-MM-dd HH:mm:ss
+jspwiki.defaultprefs.timeformat.37=yyyyMMdd'T'HHmmss
+
### End of configuration file.
Modified: jspwiki/trunk/jspwiki-war/src/test/java/org/apache/wiki/AllTests.java
URL: http://svn.apache.org/viewvc/jspwiki/trunk/jspwiki-war/src/test/java/org/apache/wiki/AllTests.java?rev=1512071&r1=1512070&r2=1512071&view=diff
==============================================================================
--- jspwiki/trunk/jspwiki-war/src/test/java/org/apache/wiki/AllTests.java (original)
+++ jspwiki/trunk/jspwiki-war/src/test/java/org/apache/wiki/AllTests.java Thu Aug 8 22:13:45 2013
@@ -37,20 +37,12 @@ public class AllTests extends TestCase
//
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 )
+ Properties props = TestEngine.getTestProperties();
+ if( props == null )
{
+ fail( "No property file found!" );
}
+ PropertyConfigurator.configure(props);
}
public AllTests( String s )
Modified: jspwiki/trunk/jspwiki-war/src/test/java/org/apache/wiki/PageManagerTest.java
URL: http://svn.apache.org/viewvc/jspwiki/trunk/jspwiki-war/src/test/java/org/apache/wiki/PageManagerTest.java?rev=1512071&r1=1512070&r2=1512071&view=diff
==============================================================================
--- jspwiki/trunk/jspwiki-war/src/test/java/org/apache/wiki/PageManagerTest.java (original)
+++ jspwiki/trunk/jspwiki-war/src/test/java/org/apache/wiki/PageManagerTest.java Thu Aug 8 22:13:45 2013
@@ -32,7 +32,7 @@ import org.apache.wiki.providers.Caching
public class PageManagerTest extends TestCase
{
- Properties props = new Properties();
+ Properties props = TestEngine.getTestProperties();
TestEngine engine;
@@ -44,7 +44,6 @@ public class PageManagerTest extends Tes
public void setUp()
throws Exception
{
- props.load( TestEngine.findTestProperties() );
PropertyConfigurator.configure(props);
engine = new TestEngine(props);
}
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=1512071&r1=1512070&r2=1512071&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 Thu Aug 8 22:13:45 2013
@@ -30,7 +30,7 @@ import org.apache.wiki.providers.FileSys
*/
public class ReferenceManagerTest extends TestCase
{
- Properties props = new Properties();
+ Properties props = TestEngine.getTestProperties();
TestEngine engine;
ReferenceManager mgr;
@@ -42,7 +42,6 @@ public class ReferenceManagerTest extend
public void setUp()
throws Exception
{
- props.load( TestEngine.findTestProperties() );
props.setProperty( "jspwiki.translatorReader.matchEnglishPlurals", "true");
//
Modified: jspwiki/trunk/jspwiki-war/src/test/java/org/apache/wiki/TestEngine.java
URL: http://svn.apache.org/viewvc/jspwiki/trunk/jspwiki-war/src/test/java/org/apache/wiki/TestEngine.java?rev=1512071&r1=1512070&r2=1512071&view=diff
==============================================================================
--- jspwiki/trunk/jspwiki-war/src/test/java/org/apache/wiki/TestEngine.java (original)
+++ jspwiki/trunk/jspwiki-war/src/test/java/org/apache/wiki/TestEngine.java Thu Aug 8 22:13:45 2013
@@ -61,6 +61,9 @@ public class TestEngine extends WikiEngi
private WikiSession m_janneWikiSession = null;
private WikiSession m_guestWikiSession = null;
+ // combined properties file (jspwiki.properties + custom override, if any)
+ private static Properties combinedProperties = null;
+
/**
* Creates WikiSession with the privileges of the administrative user.
* For testing purposes, obviously.
@@ -156,26 +159,36 @@ public class TestEngine extends WikiEngi
}
public static void emptyWorkDir(Properties properties) {
- try {
- if (properties == null) {
- properties = new Properties();
- properties.load( findTestProperties() );
- }
+ if (properties == null) {
+ properties = getTestProperties();
+ }
- String workdir = properties.getProperty( WikiEngine.PROP_WORKDIR );
- if ( workdir != null ) {
- File f = new File( workdir );
-
- if (f.exists() && f.isDirectory() && new File( f, "refmgr.ser" ).exists()) {
- System.out.println( "Deleting " + f.getAbsolutePath() );
- deleteAll( f );
- }
+ String workdir = properties.getProperty( WikiEngine.PROP_WORKDIR );
+ if ( workdir != null ) {
+ File f = new File( workdir );
+
+ if (f.exists() && f.isDirectory() && new File( f, "refmgr.ser" ).exists()) {
+ // System.out.println( "Deleting " + f.getAbsolutePath() );
+ deleteAll( f );
}
- } catch (IOException e) {
- System.out.println( e );
}
}
+ public static final Properties getTestProperties() {
+ if (combinedProperties == null) {
+ combinedProperties = PropertyReader.getCombinedProperties(PropertyReader.CUSTOM_JSPWIKI_CONFIG);
+ }
+ // better to make a copy via putAll instead of Properties(properties)
+ // constructor, see http://stackoverflow.com/a/2004900
+ Properties propCopy = new Properties();
+ propCopy.putAll(combinedProperties);
+ return propCopy;
+ }
+
+ public static final Properties getTestProperties(String customPropFile) {
+ return PropertyReader.getCombinedProperties(customPropFile);
+ }
+/*
public static final InputStream findTestProperties()
{
return findTestProperties( "/jspwiki.properties" );
@@ -189,7 +202,7 @@ public class TestEngine extends WikiEngi
return in;
}
-
+*/
/**
* Deletes all files under this directory, and does them recursively.
*/
@@ -240,11 +253,10 @@ public class TestEngine extends WikiEngi
*/
public void deleteTestPage( String name )
{
- Properties properties = new Properties();
+ Properties properties = getTestProperties();
try
{
- properties.load( findTestProperties() );
String files = properties.getProperty( FileSystemProvider.PROP_PAGEDIR );
File f = new File( files, mangleName(name)+FileSystemProvider.FILE_EXT );
@@ -271,11 +283,10 @@ public class TestEngine extends WikiEngi
*/
public static void deleteAttachments( String page )
{
- Properties properties = new Properties();
+ Properties properties = getTestProperties();
try
{
- properties.load( findTestProperties() );
String files = properties.getProperty( BasicAttachmentProvider.PROP_STORAGEDIR );
File f = new File( files, TextUtil.urlEncodeUTF8( page ) + BasicAttachmentProvider.DIR_EXTENSION );
Modified: jspwiki/trunk/jspwiki-war/src/test/java/org/apache/wiki/VariableManagerTest.java
URL: http://svn.apache.org/viewvc/jspwiki/trunk/jspwiki-war/src/test/java/org/apache/wiki/VariableManagerTest.java?rev=1512071&r1=1512070&r2=1512071&view=diff
==============================================================================
--- jspwiki/trunk/jspwiki-war/src/test/java/org/apache/wiki/VariableManagerTest.java (original)
+++ jspwiki/trunk/jspwiki-war/src/test/java/org/apache/wiki/VariableManagerTest.java Thu Aug 8 22:13:45 2013
@@ -39,19 +39,13 @@ public class VariableManagerTest extends
public void setUp()
throws Exception
{
- Properties props = new Properties();
- try
- {
- props.load( TestEngine.findTestProperties() );
- PropertyConfigurator.configure(props);
+ Properties props = TestEngine.getTestProperties();
+ PropertyConfigurator.configure(props);
- m_variableManager = new VariableManager( props );
- TestEngine testEngine = new TestEngine( props );
- m_context = new WikiContext( testEngine,
- new WikiPage( testEngine, PAGE_NAME ) );
-
- }
- catch( IOException e ) {}
+ m_variableManager = new VariableManager( props );
+ TestEngine testEngine = new TestEngine( props );
+ m_context = new WikiContext( testEngine,
+ new WikiPage( testEngine, PAGE_NAME ) );
}
public void tearDown()
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=1512071&r1=1512070&r2=1512071&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 Thu Aug 8 22:13:45 2013
@@ -44,7 +44,7 @@ public class WikiEngineTest extends Test
public static final String NAME1 = "Test1";
public static final long PAGEPROVIDER_RESCAN_PERIOD = 2;
- Properties props = new Properties();
+ Properties props = TestEngine.getTestProperties();
TestEngine m_engine;
@@ -67,8 +67,6 @@ public class WikiEngineTest extends Test
public void setUp()
throws Exception
{
- props.load( TestEngine.findTestProperties() );
-
props.setProperty( WikiEngine.PROP_MATCHPLURALS, "true" );
// We'll need a shorter-than-default consistency check for
// the page-changed checks. This will cause additional load
@@ -847,12 +845,11 @@ public class WikiEngineTest extends Test
public void testOldVersionVars()
throws Exception
{
- Properties pr = new Properties();
- pr.load( TestEngine.findTestProperties("/jspwiki_vers.properties"));
-
- pr.setProperty( PageManager.PROP_USECACHE, "true" );
+ Properties props = TestEngine.getTestProperties("/jspwiki-vers-custom.properties");
+
+ props.setProperty( PageManager.PROP_USECACHE, "true" );
- TestEngine engine = new TestEngine( pr );
+ TestEngine engine = new TestEngine( props );
engine.saveText( NAME1, "[{SET foo=bar}]" );
Modified: jspwiki/trunk/jspwiki-war/src/test/java/org/apache/wiki/WikiSessionTest.java
URL: http://svn.apache.org/viewvc/jspwiki/trunk/jspwiki-war/src/test/java/org/apache/wiki/WikiSessionTest.java?rev=1512071&r1=1512070&r2=1512071&view=diff
==============================================================================
--- jspwiki/trunk/jspwiki-war/src/test/java/org/apache/wiki/WikiSessionTest.java (original)
+++ jspwiki/trunk/jspwiki-war/src/test/java/org/apache/wiki/WikiSessionTest.java Thu Aug 8 22:13:45 2013
@@ -51,8 +51,7 @@ public class WikiSessionTest extends Tes
protected void setUp() throws Exception
{
super.setUp();
- Properties props = new Properties();
- props.load( TestEngine.findTestProperties() );
+ Properties props = TestEngine.getTestProperties();
m_engine = new TestEngine( props );
}
@@ -195,8 +194,7 @@ public class WikiSessionTest extends Tes
public void testAuthenticationCookieWhenOn() throws WikiException, ServletException, IOException
{
- Properties props = new Properties();
- props.load( TestEngine.findTestProperties() );
+ Properties props = TestEngine.getTestProperties();
props.setProperty( AuthenticationManager.PROP_ALLOW_COOKIE_AUTH, "true");
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=1512071&r1=1512070&r2=1512071&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 Thu Aug 8 22:13:45 2013
@@ -32,7 +32,7 @@ public class AttachmentManagerTest exten
public static final String NAME1 = "TestPage";
public static final String NAMEU = "TestPage\u00e6";
- Properties props = new Properties();
+ Properties props = TestEngine.getTestProperties();
TestEngine m_engine;
AttachmentManager m_manager;
@@ -47,8 +47,6 @@ public class AttachmentManagerTest exten
public void setUp()
throws Exception
{
- props.load( TestEngine.findTestProperties() );
-
m_engine = new TestEngine(props);
m_manager = m_engine.getAttachmentManager();
Modified: jspwiki/trunk/jspwiki-war/src/test/java/org/apache/wiki/auth/AuthenticationManagerTest.java
URL: http://svn.apache.org/viewvc/jspwiki/trunk/jspwiki-war/src/test/java/org/apache/wiki/auth/AuthenticationManagerTest.java?rev=1512071&r1=1512070&r2=1512071&view=diff
==============================================================================
--- jspwiki/trunk/jspwiki-war/src/test/java/org/apache/wiki/auth/AuthenticationManagerTest.java (original)
+++ jspwiki/trunk/jspwiki-war/src/test/java/org/apache/wiki/auth/AuthenticationManagerTest.java Thu Aug 8 22:13:45 2013
@@ -103,8 +103,7 @@ public class AuthenticationManagerTest e
public void setUp() throws Exception
{
- Properties props = new Properties();
- props.load( TestEngine.findTestProperties() );
+ Properties props = TestEngine.getTestProperties();
m_engine = new TestEngine( props );
m_auth = m_engine.getAuthenticationManager();
m_groupMgr = m_engine.getGroupManager();
@@ -119,8 +118,7 @@ public class AuthenticationManagerTest e
*/
public void testCustomAuthorizer() throws Exception
{
- Properties props = new Properties();
- props.load( TestEngine.findTestProperties() );
+ Properties props = TestEngine.getTestProperties();
props.put( AuthorizationManager.PROP_AUTHORIZER, "org.apache.wiki.auth.AuthenticationManagerTest$DummyAuthorizer" );
m_engine = new TestEngine( props );
@@ -149,8 +147,7 @@ public class AuthenticationManagerTest e
public void testCustomJAASLoginModule() throws Exception
{
- Properties props = new Properties();
- props.load( TestEngine.findTestProperties() );
+ Properties props = TestEngine.getTestProperties();
// Supply a custom LoginModule class
props.put( "jspwiki.loginModule.class", "org.apache.wiki.auth.login.CookieAssertionLoginModule" );
@@ -164,8 +161,7 @@ public class AuthenticationManagerTest e
public void testCustomJAASLoginModuleOptions() throws Exception
{
- Properties props = new Properties();
- props.load( TestEngine.findTestProperties() );
+ Properties props = TestEngine.getTestProperties();
// Supply a custom LoginModule options
props.put( "jspwiki.loginModule.options.key1", "value1" );
Modified: jspwiki/trunk/jspwiki-war/src/test/java/org/apache/wiki/auth/AuthorizationManagerTest.java
URL: http://svn.apache.org/viewvc/jspwiki/trunk/jspwiki-war/src/test/java/org/apache/wiki/auth/AuthorizationManagerTest.java?rev=1512071&r1=1512070&r2=1512071&view=diff
==============================================================================
--- jspwiki/trunk/jspwiki-war/src/test/java/org/apache/wiki/auth/AuthorizationManagerTest.java (original)
+++ jspwiki/trunk/jspwiki-war/src/test/java/org/apache/wiki/auth/AuthorizationManagerTest.java Thu Aug 8 22:13:45 2013
@@ -87,8 +87,7 @@ public class AuthorizationManagerTest ex
public void setUp() throws Exception
{
- Properties props = new Properties();
- props.load( TestEngine.findTestProperties() );
+ Properties props = TestEngine.getTestProperties();
// Make sure we are using the default security policy file jspwiki.policy
props.put( AuthorizationManager.POLICY, AuthorizationManager.DEFAULT_POLICY );
@@ -687,8 +686,7 @@ public class AuthorizationManagerTest ex
public void testUserPolicy() throws Exception
{
- Properties props = new Properties();
- props.load( TestEngine.findTestProperties() );
+ Properties props = TestEngine.getTestProperties();
// Make sure we are using the default security policy file jspwiki.policy
props.put( AuthorizationManager.POLICY, "jspwiki-testUserPolicy.policy" );
Modified: jspwiki/trunk/jspwiki-war/src/test/java/org/apache/wiki/auth/GroupManagerTest.java
URL: http://svn.apache.org/viewvc/jspwiki/trunk/jspwiki-war/src/test/java/org/apache/wiki/auth/GroupManagerTest.java?rev=1512071&r1=1512070&r2=1512071&view=diff
==============================================================================
--- jspwiki/trunk/jspwiki-war/src/test/java/org/apache/wiki/auth/GroupManagerTest.java (original)
+++ jspwiki/trunk/jspwiki-war/src/test/java/org/apache/wiki/auth/GroupManagerTest.java Thu Aug 8 22:13:45 2013
@@ -51,8 +51,7 @@ public class GroupManagerTest extends Te
public void setUp() throws Exception
{
- Properties props = new Properties();
- props.load( TestEngine.findTestProperties() );
+ Properties props = TestEngine.getTestProperties();
m_engine = new TestEngine( props );
m_groupMgr = m_engine.getGroupManager();
Modified: jspwiki/trunk/jspwiki-war/src/test/java/org/apache/wiki/auth/UserManagerTest.java
URL: http://svn.apache.org/viewvc/jspwiki/trunk/jspwiki-war/src/test/java/org/apache/wiki/auth/UserManagerTest.java?rev=1512071&r1=1512070&r2=1512071&view=diff
==============================================================================
--- jspwiki/trunk/jspwiki-war/src/test/java/org/apache/wiki/auth/UserManagerTest.java (original)
+++ jspwiki/trunk/jspwiki-war/src/test/java/org/apache/wiki/auth/UserManagerTest.java Thu Aug 8 22:13:45 2013
@@ -51,9 +51,8 @@ public class UserManagerTest extends Tes
protected void setUp() throws Exception
{
super.setUp();
- Properties props = new Properties();
- props.load( TestEngine.findTestProperties() );
-
+ Properties props = TestEngine.getTestProperties();
+
// Make sure user profile save workflow is OFF
props.remove( "jspwiki.approver"+UserManager.SAVE_APPROVER );
@@ -77,9 +76,8 @@ public class UserManagerTest extends Tes
/** Call this setup program to use the save-profile workflow. */
protected void setUpWithWorkflow() throws Exception
{
- Properties props = new Properties();
- props.load( TestEngine.findTestProperties() );
-
+ Properties props = TestEngine.getTestProperties();
+
// Turn on user profile saves by the Admin group
props.put( "jspwiki.approver."+UserManager.SAVE_APPROVER, "Admin" );
Modified: jspwiki/trunk/jspwiki-war/src/test/java/org/apache/wiki/auth/acl/AclImplTest.java
URL: http://svn.apache.org/viewvc/jspwiki/trunk/jspwiki-war/src/test/java/org/apache/wiki/auth/acl/AclImplTest.java?rev=1512071&r1=1512070&r2=1512071&view=diff
==============================================================================
--- jspwiki/trunk/jspwiki-war/src/test/java/org/apache/wiki/auth/acl/AclImplTest.java (original)
+++ jspwiki/trunk/jspwiki-war/src/test/java/org/apache/wiki/auth/acl/AclImplTest.java Thu Aug 8 22:13:45 2013
@@ -65,8 +65,7 @@ public class AclImplTest extends TestCas
public void setUp() throws Exception
{
super.setUp();
- Properties props = new Properties();
- props.load( TestEngine.findTestProperties() );
+ Properties props = TestEngine.getTestProperties();
TestEngine engine = new TestEngine( props );
m_groupMgr = engine.getGroupManager();
m_session = WikiSessionTest.adminSession( engine );
Modified: jspwiki/trunk/jspwiki-war/src/test/java/org/apache/wiki/auth/acl/DefaultAclManagerTest.java
URL: http://svn.apache.org/viewvc/jspwiki/trunk/jspwiki-war/src/test/java/org/apache/wiki/auth/acl/DefaultAclManagerTest.java?rev=1512071&r1=1512070&r2=1512071&view=diff
==============================================================================
--- jspwiki/trunk/jspwiki-war/src/test/java/org/apache/wiki/auth/acl/DefaultAclManagerTest.java (original)
+++ jspwiki/trunk/jspwiki-war/src/test/java/org/apache/wiki/auth/acl/DefaultAclManagerTest.java Thu Aug 8 22:13:45 2013
@@ -47,8 +47,7 @@ public class DefaultAclManagerTest
public void setUp()
throws Exception
{
- Properties props = new Properties();
- props.load( TestEngine.findTestProperties() );
+ Properties props = TestEngine.getTestProperties();
m_engine = new TestEngine(props);
String text = "Foo";
Modified: jspwiki/trunk/jspwiki-war/src/test/java/org/apache/wiki/auth/authorize/GroupTest.java
URL: http://svn.apache.org/viewvc/jspwiki/trunk/jspwiki-war/src/test/java/org/apache/wiki/auth/authorize/GroupTest.java?rev=1512071&r1=1512070&r2=1512071&view=diff
==============================================================================
--- jspwiki/trunk/jspwiki-war/src/test/java/org/apache/wiki/auth/authorize/GroupTest.java (original)
+++ jspwiki/trunk/jspwiki-war/src/test/java/org/apache/wiki/auth/authorize/GroupTest.java Thu Aug 8 22:13:45 2013
@@ -41,8 +41,7 @@ public class GroupTest extends TestCase
public void setUp() throws Exception
{
- Properties props = new Properties();
- props.load( TestEngine.findTestProperties() );
+ Properties props = TestEngine.getTestProperties();
WikiEngine engine = new TestEngine( props );
m_wiki = engine.getApplicationName();
Modified: jspwiki/trunk/jspwiki-war/src/test/java/org/apache/wiki/auth/authorize/JDBCGroupDatabaseTest.java
URL: http://svn.apache.org/viewvc/jspwiki/trunk/jspwiki-war/src/test/java/org/apache/wiki/auth/authorize/JDBCGroupDatabaseTest.java?rev=1512071&r1=1512070&r2=1512071&view=diff
==============================================================================
--- jspwiki/trunk/jspwiki-war/src/test/java/org/apache/wiki/auth/authorize/JDBCGroupDatabaseTest.java (original)
+++ jspwiki/trunk/jspwiki-war/src/test/java/org/apache/wiki/auth/authorize/JDBCGroupDatabaseTest.java Thu Aug 8 22:13:45 2013
@@ -57,8 +57,7 @@ public class JDBCGroupDatabaseTest exten
super.setUp();
m_hu.setUp();
- Properties props = new Properties();
- props.load( TestEngine.findTestProperties() );
+ Properties props = TestEngine.getTestProperties();
WikiEngine engine = new TestEngine( props );
m_wiki = engine.getApplicationName();
Modified: jspwiki/trunk/jspwiki-war/src/test/java/org/apache/wiki/auth/authorize/WebContainerAuthorizerTest.java
URL: http://svn.apache.org/viewvc/jspwiki/trunk/jspwiki-war/src/test/java/org/apache/wiki/auth/authorize/WebContainerAuthorizerTest.java?rev=1512071&r1=1512070&r2=1512071&view=diff
==============================================================================
--- jspwiki/trunk/jspwiki-war/src/test/java/org/apache/wiki/auth/authorize/WebContainerAuthorizerTest.java (original)
+++ jspwiki/trunk/jspwiki-war/src/test/java/org/apache/wiki/auth/authorize/WebContainerAuthorizerTest.java Thu Aug 8 22:13:45 2013
@@ -44,8 +44,7 @@ public class WebContainerAuthorizerTest
public void setUp() throws Exception
{
- Properties props = new Properties();
- props.load( TestEngine.findTestProperties() );
+ Properties props = TestEngine.getTestProperties();
m_engine = new TestEngine( props );
m_authorizer = new WebContainerAuthorizer();
m_authorizer.initialize( m_engine, props );
Modified: jspwiki/trunk/jspwiki-war/src/test/java/org/apache/wiki/auth/authorize/XMLGroupDatabaseTest.java
URL: http://svn.apache.org/viewvc/jspwiki/trunk/jspwiki-war/src/test/java/org/apache/wiki/auth/authorize/XMLGroupDatabaseTest.java?rev=1512071&r1=1512070&r2=1512071&view=diff
==============================================================================
--- jspwiki/trunk/jspwiki-war/src/test/java/org/apache/wiki/auth/authorize/XMLGroupDatabaseTest.java (original)
+++ jspwiki/trunk/jspwiki-war/src/test/java/org/apache/wiki/auth/authorize/XMLGroupDatabaseTest.java Thu Aug 8 22:13:45 2013
@@ -46,8 +46,7 @@ public class XMLGroupDatabaseTest extend
protected void setUp() throws Exception
{
super.setUp();
- Properties props = new Properties();
- props.load( TestEngine.findTestProperties() );
+ Properties props = TestEngine.getTestProperties();
WikiEngine engine = new TestEngine( props );
m_db = new XMLGroupDatabase();
m_db.initialize( engine, props );
Modified: jspwiki/trunk/jspwiki-war/src/test/java/org/apache/wiki/auth/login/AnonymousLoginModuleTest.java
URL: http://svn.apache.org/viewvc/jspwiki/trunk/jspwiki-war/src/test/java/org/apache/wiki/auth/login/AnonymousLoginModuleTest.java?rev=1512071&r1=1512070&r2=1512071&view=diff
==============================================================================
--- jspwiki/trunk/jspwiki-war/src/test/java/org/apache/wiki/auth/login/AnonymousLoginModuleTest.java (original)
+++ jspwiki/trunk/jspwiki-war/src/test/java/org/apache/wiki/auth/login/AnonymousLoginModuleTest.java Thu Aug 8 22:13:45 2013
@@ -103,8 +103,7 @@ public class AnonymousLoginModuleTest ex
*/
protected void setUp() throws Exception
{
- Properties props = new Properties();
- props.load( TestEngine.findTestProperties() );
+ Properties props = TestEngine.getTestProperties();
props.put(XMLUserDatabase.PROP_USERDATABASE, "target/test-classes/userdatabase.xml" );
m_engine = new TestEngine(props);
m_db = new XMLUserDatabase();
Modified: jspwiki/trunk/jspwiki-war/src/test/java/org/apache/wiki/auth/login/CookieAssertionLoginModuleTest.java
URL: http://svn.apache.org/viewvc/jspwiki/trunk/jspwiki-war/src/test/java/org/apache/wiki/auth/login/CookieAssertionLoginModuleTest.java?rev=1512071&r1=1512070&r2=1512071&view=diff
==============================================================================
--- jspwiki/trunk/jspwiki-war/src/test/java/org/apache/wiki/auth/login/CookieAssertionLoginModuleTest.java (original)
+++ jspwiki/trunk/jspwiki-war/src/test/java/org/apache/wiki/auth/login/CookieAssertionLoginModuleTest.java Thu Aug 8 22:13:45 2013
@@ -114,8 +114,7 @@ public class CookieAssertionLoginModuleT
*/
protected void setUp() throws Exception
{
- Properties props = new Properties();
- props.load( TestEngine.findTestProperties() );
+ Properties props = TestEngine.getTestProperties();
props.put(XMLUserDatabase.PROP_USERDATABASE, "target/test-classes/userdatabase.xml" );
m_engine = new TestEngine(props);
m_db = new XMLUserDatabase();
Modified: jspwiki/trunk/jspwiki-war/src/test/java/org/apache/wiki/auth/login/UserDatabaseLoginModuleTest.java
URL: http://svn.apache.org/viewvc/jspwiki/trunk/jspwiki-war/src/test/java/org/apache/wiki/auth/login/UserDatabaseLoginModuleTest.java?rev=1512071&r1=1512070&r2=1512071&view=diff
==============================================================================
--- jspwiki/trunk/jspwiki-war/src/test/java/org/apache/wiki/auth/login/UserDatabaseLoginModuleTest.java (original)
+++ jspwiki/trunk/jspwiki-war/src/test/java/org/apache/wiki/auth/login/UserDatabaseLoginModuleTest.java Thu Aug 8 22:13:45 2013
@@ -118,8 +118,7 @@ public class UserDatabaseLoginModuleTest
*/
protected void setUp() throws Exception
{
- Properties props = new Properties();
- props.load( TestEngine.findTestProperties() );
+ Properties props = TestEngine.getTestProperties();
props.put(XMLUserDatabase.PROP_USERDATABASE, "target/test-classes/userdatabase.xml" );
m_engine = new TestEngine(props);
m_db = new XMLUserDatabase();
Modified: jspwiki/trunk/jspwiki-war/src/test/java/org/apache/wiki/auth/login/WebContainerLoginModuleTest.java
URL: http://svn.apache.org/viewvc/jspwiki/trunk/jspwiki-war/src/test/java/org/apache/wiki/auth/login/WebContainerLoginModuleTest.java?rev=1512071&r1=1512070&r2=1512071&view=diff
==============================================================================
--- jspwiki/trunk/jspwiki-war/src/test/java/org/apache/wiki/auth/login/WebContainerLoginModuleTest.java (original)
+++ jspwiki/trunk/jspwiki-war/src/test/java/org/apache/wiki/auth/login/WebContainerLoginModuleTest.java Thu Aug 8 22:13:45 2013
@@ -112,8 +112,7 @@ public class WebContainerLoginModuleTest
*/
protected void setUp() throws Exception
{
- Properties props = new Properties();
- props.load( TestEngine.findTestProperties() );
+ Properties props = TestEngine.getTestProperties();
props.put(XMLUserDatabase.PROP_USERDATABASE, "target/test-classes/userdatabase.xml" );
m_engine = new TestEngine(props);
m_db = new XMLUserDatabase();
Modified: jspwiki/trunk/jspwiki-war/src/test/java/org/apache/wiki/auth/user/UserProfileTest.java
URL: http://svn.apache.org/viewvc/jspwiki/trunk/jspwiki-war/src/test/java/org/apache/wiki/auth/user/UserProfileTest.java?rev=1512071&r1=1512070&r2=1512071&view=diff
==============================================================================
--- jspwiki/trunk/jspwiki-war/src/test/java/org/apache/wiki/auth/user/UserProfileTest.java (original)
+++ jspwiki/trunk/jspwiki-war/src/test/java/org/apache/wiki/auth/user/UserProfileTest.java Thu Aug 8 22:13:45 2013
@@ -40,8 +40,7 @@ public class UserProfileTest extends Tes
public void setUp()
throws Exception
{
- Properties props = new Properties();
- props.load( TestEngine.findTestProperties() );
+ Properties props = TestEngine.getTestProperties();
PropertyConfigurator.configure(props);
WikiEngine engine = new TestEngine(props);
m_db = engine.getUserManager().getUserDatabase();
Modified: jspwiki/trunk/jspwiki-war/src/test/java/org/apache/wiki/auth/user/XMLUserDatabaseTest.java
URL: http://svn.apache.org/viewvc/jspwiki/trunk/jspwiki-war/src/test/java/org/apache/wiki/auth/user/XMLUserDatabaseTest.java?rev=1512071&r1=1512070&r2=1512071&view=diff
==============================================================================
--- jspwiki/trunk/jspwiki-war/src/test/java/org/apache/wiki/auth/user/XMLUserDatabaseTest.java (original)
+++ jspwiki/trunk/jspwiki-war/src/test/java/org/apache/wiki/auth/user/XMLUserDatabaseTest.java Thu Aug 8 22:13:45 2013
@@ -49,8 +49,7 @@ public class XMLUserDatabaseTest extends
protected void setUp() throws Exception
{
super.setUp();
- Properties props = new Properties();
- props.load( TestEngine.findTestProperties() );
+ Properties props = TestEngine.getTestProperties();
props.put(XMLUserDatabase.PROP_USERDATABASE, "target/test-classes/userdatabase.xml" );
WikiEngine engine = new TestEngine(props);
m_db = new XMLUserDatabase();
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=1512071&r1=1512070&r2=1512071&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 Thu Aug 8 22:13:45 2013
@@ -36,10 +36,8 @@ public class PageRenamerTest extends Tes
protected void setUp() throws Exception
{
super.setUp();
-
- Properties props = new Properties();
-
- props.load( TestEngine.findTestProperties() );
+
+ Properties props = TestEngine.getTestProperties();
props.setProperty( WikiEngine.PROP_MATCHPLURALS, "true" );
Modified: jspwiki/trunk/jspwiki-war/src/test/java/org/apache/wiki/diff/ContextualDiffProviderTest.java
URL: http://svn.apache.org/viewvc/jspwiki/trunk/jspwiki-war/src/test/java/org/apache/wiki/diff/ContextualDiffProviderTest.java?rev=1512071&r1=1512070&r2=1512071&view=diff
==============================================================================
--- jspwiki/trunk/jspwiki-war/src/test/java/org/apache/wiki/diff/ContextualDiffProviderTest.java (original)
+++ jspwiki/trunk/jspwiki-war/src/test/java/org/apache/wiki/diff/ContextualDiffProviderTest.java Thu Aug 8 22:13:45 2013
@@ -192,13 +192,12 @@ public class ContextualDiffProviderTest
specializedNotation(diff);
- Properties props = new Properties();
+ Properties props = TestEngine.getTestProperties();
if (null != contextLimit)
props.put(ContextualDiffProvider.PROP_UNCHANGED_CONTEXT_LIMIT, contextLimit);
diff.initialize(null, props);
- props.load( TestEngine.findTestProperties() );
PropertyConfigurator.configure(props);
TestEngine engine = new TestEngine(props);
Modified: jspwiki/trunk/jspwiki-war/src/test/java/org/apache/wiki/filters/DefaultFilterManagerTest.java
URL: http://svn.apache.org/viewvc/jspwiki/trunk/jspwiki-war/src/test/java/org/apache/wiki/filters/DefaultFilterManagerTest.java?rev=1512071&r1=1512070&r2=1512071&view=diff
==============================================================================
--- jspwiki/trunk/jspwiki-war/src/test/java/org/apache/wiki/filters/DefaultFilterManagerTest.java (original)
+++ jspwiki/trunk/jspwiki-war/src/test/java/org/apache/wiki/filters/DefaultFilterManagerTest.java Thu Aug 8 22:13:45 2013
@@ -33,7 +33,7 @@ import org.apache.wiki.api.engine.Filter
import org.apache.wiki.api.filters.PageFilter;
public class DefaultFilterManagerTest extends TestCase {
- Properties props = new Properties();
+ Properties props = TestEngine.getTestProperties();
TestEngine engine;
@@ -42,7 +42,6 @@ public class DefaultFilterManagerTest ex
}
public void setUp() throws Exception {
- props.load( TestEngine.findTestProperties() );
PropertyConfigurator.configure(props);
engine = new TestEngine(props);
}
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=1512071&r1=1512070&r2=1512071&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 Thu Aug 8 22:13:45 2013
@@ -43,7 +43,7 @@ import org.apache.wiki.util.TextUtil;
public class JSPWikiMarkupParserTest extends TestCase
{
- Properties props = new Properties();
+ Properties props = TestEngine.getTestProperties();
Vector<String> created = new Vector<String>();
static final String PAGE_NAME = "testpage";
@@ -59,8 +59,6 @@ public class JSPWikiMarkupParserTest ext
public void setUp()
throws Exception
{
- props.load( TestEngine.findTestProperties() );
-
props.setProperty( "jspwiki.translatorReader.matchEnglishPlurals", "true" );
testEngine = new TestEngine( props );
}
@@ -136,7 +134,7 @@ public class JSPWikiMarkupParserTest ext
ServletException,
WikiException
{
- props.load( TestEngine.findTestProperties() );
+ props = TestEngine.getTestProperties();
props.setProperty( "jspwiki.translatorReader.useRelNofollow", "true" );
TestEngine testEngine2 = new TestEngine( props );
Modified: jspwiki/trunk/jspwiki-war/src/test/java/org/apache/wiki/plugin/CounterPluginTest.java
URL: http://svn.apache.org/viewvc/jspwiki/trunk/jspwiki-war/src/test/java/org/apache/wiki/plugin/CounterPluginTest.java?rev=1512071&r1=1512070&r2=1512071&view=diff
==============================================================================
--- jspwiki/trunk/jspwiki-war/src/test/java/org/apache/wiki/plugin/CounterPluginTest.java (original)
+++ jspwiki/trunk/jspwiki-war/src/test/java/org/apache/wiki/plugin/CounterPluginTest.java Thu Aug 8 22:13:45 2013
@@ -41,7 +41,7 @@ import org.apache.wiki.render.XHTMLRende
public class CounterPluginTest extends TestCase
{
- Properties props = new Properties();
+ Properties props = TestEngine.getTestProperties();
TestEngine testEngine;
public CounterPluginTest( String s )
@@ -52,8 +52,6 @@ public class CounterPluginTest extends T
public void setUp()
throws Exception
{
- props.load( TestEngine.findTestProperties() );
-
testEngine = new TestEngine(props);
}
Modified: jspwiki/trunk/jspwiki-war/src/test/java/org/apache/wiki/plugin/DefaultPluginManagerTest.java
URL: http://svn.apache.org/viewvc/jspwiki/trunk/jspwiki-war/src/test/java/org/apache/wiki/plugin/DefaultPluginManagerTest.java?rev=1512071&r1=1512070&r2=1512071&view=diff
==============================================================================
--- jspwiki/trunk/jspwiki-war/src/test/java/org/apache/wiki/plugin/DefaultPluginManagerTest.java (original)
+++ jspwiki/trunk/jspwiki-war/src/test/java/org/apache/wiki/plugin/DefaultPluginManagerTest.java Thu Aug 8 22:13:45 2013
@@ -35,7 +35,7 @@ public class DefaultPluginManagerTest ex
{
public static final String NAME1 = "Test1";
- Properties props = new Properties();
+ Properties props = TestEngine.getTestProperties();
WikiEngine engine;
@@ -51,8 +51,6 @@ public class DefaultPluginManagerTest ex
public void setUp()
throws Exception
{
- props.load( TestEngine.findTestProperties() );
-
engine = new TestEngine(props);
context = new WikiContext( engine, new WikiPage(engine, "Testpage") );
manager = new DefaultPluginManager( engine, props );
Modified: jspwiki/trunk/jspwiki-war/src/test/java/org/apache/wiki/plugin/GroupsTest.java
URL: http://svn.apache.org/viewvc/jspwiki/trunk/jspwiki-war/src/test/java/org/apache/wiki/plugin/GroupsTest.java?rev=1512071&r1=1512070&r2=1512071&view=diff
==============================================================================
--- jspwiki/trunk/jspwiki-war/src/test/java/org/apache/wiki/plugin/GroupsTest.java (original)
+++ jspwiki/trunk/jspwiki-war/src/test/java/org/apache/wiki/plugin/GroupsTest.java Thu Aug 8 22:13:45 2013
@@ -29,7 +29,7 @@ import org.apache.wiki.TestEngine;
public class GroupsTest extends TestCase
{
- Properties props = new Properties();
+ Properties props = TestEngine.getTestProperties();
TestEngine testEngine;
public GroupsTest( String s )
@@ -40,8 +40,6 @@ public class GroupsTest extends TestCase
public void setUp()
throws Exception
{
- props.load( TestEngine.findTestProperties() );
-
testEngine = new TestEngine(props);
}
Modified: jspwiki/trunk/jspwiki-war/src/test/java/org/apache/wiki/plugin/IfPluginTest.java
URL: http://svn.apache.org/viewvc/jspwiki/trunk/jspwiki-war/src/test/java/org/apache/wiki/plugin/IfPluginTest.java?rev=1512071&r1=1512070&r2=1512071&view=diff
==============================================================================
--- jspwiki/trunk/jspwiki-war/src/test/java/org/apache/wiki/plugin/IfPluginTest.java (original)
+++ jspwiki/trunk/jspwiki-war/src/test/java/org/apache/wiki/plugin/IfPluginTest.java Thu Aug 8 22:13:45 2013
@@ -44,9 +44,8 @@ public class IfPluginTest extends TestCa
protected void setUp() throws Exception
{
super.setUp();
-
- Properties props = new Properties();
- props.load( TestEngine.findTestProperties() );
+
+ Properties props = TestEngine.getTestProperties();
testEngine = new TestEngine( props );
}
Modified: jspwiki/trunk/jspwiki-war/src/test/java/org/apache/wiki/plugin/InsertPageTest.java
URL: http://svn.apache.org/viewvc/jspwiki/trunk/jspwiki-war/src/test/java/org/apache/wiki/plugin/InsertPageTest.java?rev=1512071&r1=1512070&r2=1512071&view=diff
==============================================================================
--- jspwiki/trunk/jspwiki-war/src/test/java/org/apache/wiki/plugin/InsertPageTest.java (original)
+++ jspwiki/trunk/jspwiki-war/src/test/java/org/apache/wiki/plugin/InsertPageTest.java Thu Aug 8 22:13:45 2013
@@ -29,12 +29,10 @@ import junit.framework.TestSuite;
public class InsertPageTest extends TestCase
{
protected TestEngine testEngine;
- protected Properties props = new Properties();
+ Properties props = TestEngine.getTestProperties();
protected void setUp() throws Exception
{
- props.load( TestEngine.findTestProperties() );
-
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=1512071&r1=1512070&r2=1512071&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 Thu Aug 8 22:13:45 2013
@@ -32,7 +32,7 @@ import org.apache.wiki.api.engine.Plugin
public class PageViewPluginTest extends TestCase
{
- Properties props = new Properties();
+ Properties props = TestEngine.getTestProperties();
TestEngine testEngine;
@@ -47,8 +47,6 @@ public class PageViewPluginTest extends
public void setUp() throws Exception
{
- props.load( TestEngine.findTestProperties() );
-
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=1512071&r1=1512070&r2=1512071&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 Thu Aug 8 22:13:45 2013
@@ -31,7 +31,7 @@ import org.apache.wiki.WikiPage;
import org.apache.wiki.api.engine.PluginManager;
public class RecentChangesPluginTest extends TestCase {
- Properties props = new Properties();
+ Properties props = TestEngine.getTestProperties();
TestEngine testEngine;
@@ -40,8 +40,6 @@ public class RecentChangesPluginTest ext
PluginManager manager;
public void setUp() throws Exception {
- props.load(TestEngine.findTestProperties());
-
testEngine = new TestEngine(props);
testEngine.saveText("TestPage01", "Some Text for testing 01");
Modified: jspwiki/trunk/jspwiki-war/src/test/java/org/apache/wiki/plugin/ReferringPagesPluginTest.java
URL: http://svn.apache.org/viewvc/jspwiki/trunk/jspwiki-war/src/test/java/org/apache/wiki/plugin/ReferringPagesPluginTest.java?rev=1512071&r1=1512070&r2=1512071&view=diff
==============================================================================
--- jspwiki/trunk/jspwiki-war/src/test/java/org/apache/wiki/plugin/ReferringPagesPluginTest.java (original)
+++ jspwiki/trunk/jspwiki-war/src/test/java/org/apache/wiki/plugin/ReferringPagesPluginTest.java Thu Aug 8 22:13:45 2013
@@ -34,7 +34,7 @@ import org.apache.wiki.api.exceptions.Pl
public class ReferringPagesPluginTest extends TestCase
{
- Properties props = new Properties();
+ Properties props = TestEngine.getTestProperties();
TestEngine engine;
WikiContext context;
PluginManager manager;
@@ -47,8 +47,6 @@ public class ReferringPagesPluginTest ex
public void setUp()
throws Exception
{
- props.load( TestEngine.findTestProperties() );
-
props.setProperty( "jspwiki.breakTitleWithSpaces", "false" );
engine = new TestEngine(props);
Modified: jspwiki/trunk/jspwiki-war/src/test/java/org/apache/wiki/plugin/TableOfContentsTest.java
URL: http://svn.apache.org/viewvc/jspwiki/trunk/jspwiki-war/src/test/java/org/apache/wiki/plugin/TableOfContentsTest.java?rev=1512071&r1=1512070&r2=1512071&view=diff
==============================================================================
--- jspwiki/trunk/jspwiki-war/src/test/java/org/apache/wiki/plugin/TableOfContentsTest.java (original)
+++ jspwiki/trunk/jspwiki-war/src/test/java/org/apache/wiki/plugin/TableOfContentsTest.java Thu Aug 8 22:13:45 2013
@@ -48,11 +48,8 @@ public class TableOfContentsTest extends
protected void setUp() throws Exception
{
super.setUp();
-
- Properties props = new Properties();
-
- props.load(TestEngine.findTestProperties());
-
+
+ Properties props = TestEngine.getTestProperties();
testEngine = new TestEngine( props );
}
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=1512071&r1=1512070&r2=1512071&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 Thu Aug 8 22:13:45 2013
@@ -33,7 +33,7 @@ import org.apache.wiki.api.exceptions.Pl
public class UndefinedPagesPluginTest extends TestCase
{
- Properties props = new Properties();
+ Properties props = TestEngine.getTestProperties();
TestEngine testEngine;
WikiContext context;
PluginManager manager;
@@ -46,8 +46,6 @@ public class UndefinedPagesPluginTest ex
public void setUp()
throws Exception
{
- props.load( TestEngine.findTestProperties() );
-
testEngine = new TestEngine(props);
testEngine.saveText( "TestPage", "Reference to [Foobar]." );
Modified: jspwiki/trunk/jspwiki-war/src/test/java/org/apache/wiki/providers/BasicAttachmentProviderTest.java
URL: http://svn.apache.org/viewvc/jspwiki/trunk/jspwiki-war/src/test/java/org/apache/wiki/providers/BasicAttachmentProviderTest.java?rev=1512071&r1=1512070&r2=1512071&view=diff
==============================================================================
--- jspwiki/trunk/jspwiki-war/src/test/java/org/apache/wiki/providers/BasicAttachmentProviderTest.java (original)
+++ jspwiki/trunk/jspwiki-war/src/test/java/org/apache/wiki/providers/BasicAttachmentProviderTest.java Thu Aug 8 22:13:45 2013
@@ -41,7 +41,7 @@ public class BasicAttachmentProviderTest
public static final String NAME1 = "TestPage";
public static final String NAME2 = "TestPageToo";
- Properties props = new Properties();
+ Properties props = TestEngine.getTestProperties();
TestEngine m_engine;
@@ -60,8 +60,6 @@ public class BasicAttachmentProviderTest
public void setUp()
throws Exception
{
- props.load( TestEngine.findTestProperties() );
-
m_engine = new TestEngine(props);
TestEngine.deleteAll( new File(TextUtil.getRequiredProperty( props, BasicAttachmentProvider.PROP_STORAGEDIR )) );
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=1512071&r1=1512070&r2=1512071&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 Thu Aug 8 22:13:45 2013
@@ -48,8 +48,7 @@ public class CachingProviderTest extends
{
TestEngine.emptyWorkDir();
- Properties props2 = new Properties();
- props2.load( TestEngine.findTestProperties() );
+ Properties props2 = TestEngine.getTestProperties();
testEngine = new TestEngine(props2);
PropertyConfigurator.configure(props2);
}
@@ -66,8 +65,7 @@ public class CachingProviderTest extends
public void testInitialization()
throws Exception
{
- Properties props = new Properties();
- props.load( TestEngine.findTestProperties() );
+ Properties props = TestEngine.getTestProperties();
props.setProperty( "jspwiki.usePageCache", "true" );
props.setProperty( "jspwiki.pageProvider", "org.apache.wiki.providers.CounterProvider" );
@@ -92,8 +90,7 @@ public class CachingProviderTest extends
public void testSneakyAdd()
throws Exception
{
- Properties props = new Properties();
- props.load( TestEngine.findTestProperties() );
+ Properties props = TestEngine.getTestProperties();
props.setProperty( "jspwiki.cachingProvider.cacheCheckInterval", "2" );
Modified: jspwiki/trunk/jspwiki-war/src/test/java/org/apache/wiki/providers/FileSystemProviderTest.java
URL: http://svn.apache.org/viewvc/jspwiki/trunk/jspwiki-war/src/test/java/org/apache/wiki/providers/FileSystemProviderTest.java?rev=1512071&r1=1512070&r2=1512071&view=diff
==============================================================================
--- jspwiki/trunk/jspwiki-war/src/test/java/org/apache/wiki/providers/FileSystemProviderTest.java (original)
+++ jspwiki/trunk/jspwiki-war/src/test/java/org/apache/wiki/providers/FileSystemProviderTest.java Thu Aug 8 22:13:45 2013
@@ -40,7 +40,7 @@ public class FileSystemProviderTest exte
FileSystemProvider m_provider;
FileSystemProvider m_providerUTF8;
String m_pagedir;
- Properties props = new Properties();
+ Properties props = TestEngine.getTestProperties();
TestEngine m_engine;
@@ -60,7 +60,6 @@ public class FileSystemProviderTest exte
props.setProperty( FileSystemProvider.PROP_PAGEDIR,
m_pagedir );
- props2.load( TestEngine.findTestProperties() );
PropertyConfigurator.configure(props2);
m_engine = new TestEngine(props);
Modified: jspwiki/trunk/jspwiki-war/src/test/java/org/apache/wiki/providers/RCSFileProviderTest.java
URL: http://svn.apache.org/viewvc/jspwiki/trunk/jspwiki-war/src/test/java/org/apache/wiki/providers/RCSFileProviderTest.java?rev=1512071&r1=1512070&r2=1512071&view=diff
==============================================================================
--- jspwiki/trunk/jspwiki-war/src/test/java/org/apache/wiki/providers/RCSFileProviderTest.java (original)
+++ jspwiki/trunk/jspwiki-war/src/test/java/org/apache/wiki/providers/RCSFileProviderTest.java Thu Aug 8 22:13:45 2013
@@ -42,7 +42,7 @@ public class RCSFileProviderTest extends
{
public static final String NAME1 = "Test1";
- Properties props = new Properties();
+ Properties props = TestEngine.getTestProperties("/jspwiki-rcs-custom.properties");
TestEngine engine;
@@ -56,8 +56,6 @@ public class RCSFileProviderTest extends
public void setUp()
throws Exception
{
- props.load( TestEngine.findTestProperties("/jspwiki_rcs.properties") );
-
engine = new TestEngine(props);
checkIfRCSIsInPath();
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=1512071&r1=1512070&r2=1512071&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 Thu Aug 8 22:13:45 2013
@@ -41,7 +41,7 @@ public class VersioningFileProviderTest
{
public static final String NAME1 = "Test1";
- Properties props = new Properties();
+ Properties props = TestEngine.getTestProperties("/jspwiki-vers-custom.properties");
TestEngine engine;
@@ -53,8 +53,6 @@ public class VersioningFileProviderTest
public void setUp()
throws Exception
{
- props.load( TestEngine.findTestProperties("/jspwiki_vers.properties") );
-
engine = new TestEngine(props);
}
Modified: jspwiki/trunk/jspwiki-war/src/test/java/org/apache/wiki/render/CreoleRendererTest.java
URL: http://svn.apache.org/viewvc/jspwiki/trunk/jspwiki-war/src/test/java/org/apache/wiki/render/CreoleRendererTest.java?rev=1512071&r1=1512070&r2=1512071&view=diff
==============================================================================
--- jspwiki/trunk/jspwiki-war/src/test/java/org/apache/wiki/render/CreoleRendererTest.java (original)
+++ jspwiki/trunk/jspwiki-war/src/test/java/org/apache/wiki/render/CreoleRendererTest.java Thu Aug 8 22:13:45 2013
@@ -38,8 +38,7 @@ public class CreoleRendererTest extends
protected void setUp() throws Exception
{
- Properties props = new Properties();
- props.load(TestEngine.findTestProperties());
+ Properties props = TestEngine.getTestProperties();
m_testEngine = new TestEngine(props);
super.setUp();
}
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=1512071&r1=1512070&r2=1512071&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 Thu Aug 8 22:13:45 2013
@@ -39,9 +39,7 @@ public class RenderingManagerTest extend
protected void setUp() throws Exception
{
- Properties props = new Properties();
- props.load( TestEngine.findTestProperties() );
-
+ Properties props = TestEngine.getTestProperties();
m_engine = new TestEngine( props );
m_manager = new RenderingManager();
Modified: jspwiki/trunk/jspwiki-war/src/test/java/org/apache/wiki/render/WysiwygEditingRendererTest.java
URL: http://svn.apache.org/viewvc/jspwiki/trunk/jspwiki-war/src/test/java/org/apache/wiki/render/WysiwygEditingRendererTest.java?rev=1512071&r1=1512070&r2=1512071&view=diff
==============================================================================
--- jspwiki/trunk/jspwiki-war/src/test/java/org/apache/wiki/render/WysiwygEditingRendererTest.java (original)
+++ jspwiki/trunk/jspwiki-war/src/test/java/org/apache/wiki/render/WysiwygEditingRendererTest.java Thu Aug 8 22:13:45 2013
@@ -38,8 +38,7 @@ public class WysiwygEditingRendererTest
protected void setUp() throws Exception
{
- Properties props = new Properties();
- props.load(TestEngine.findTestProperties());
+ Properties props = TestEngine.getTestProperties();
testEngine = new TestEngine(props);
super.setUp();
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=1512071&r1=1512070&r2=1512071&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 Thu Aug 8 22:13:45 2013
@@ -45,7 +45,7 @@ import junit.framework.TestSuite;
public class RSSGeneratorTest extends TestCase
{
TestEngine m_testEngine;
- Properties props = new Properties();
+ Properties props = TestEngine.getTestProperties();
public RSSGeneratorTest( String arg0 )
{
@@ -54,8 +54,6 @@ public class RSSGeneratorTest extends Te
protected void setUp() throws Exception
{
- props.load( TestEngine.findTestProperties() );
-
props.setProperty( WikiEngine.PROP_BASEURL, "http://localhost/" );
props.setProperty( RSSGenerator.PROP_GENERATE_RSS, "true" );
m_testEngine = new TestEngine(props);