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/13 17:19:11 UTC
svn commit: r1513544 - in /jspwiki/trunk: ./
jspwiki-site/src/site/trunk/content/jspwiki/development/ jspwiki-war/
jspwiki-war/src/main/filters/ jspwiki-war/src/main/java/org/apache/wiki/
jspwiki-war/src/main/resources/ini/ jspwiki-war/src/test/filters...
Author: gmazza
Date: Tue Aug 13 15:19:10 2013
New Revision: 1513544
URL: http://svn.apache.org/r1513544
Log:
Removed filtering of config files from JSPWiki WAR, simplified test configuration files.
Removed:
jspwiki/trunk/jspwiki-war/src/main/filters/
jspwiki/trunk/jspwiki-war/src/test/filters/
Modified:
jspwiki/trunk/ChangeLog
jspwiki/trunk/jspwiki-site/src/site/trunk/content/jspwiki/development/changelog.mdtext
jspwiki/trunk/jspwiki-war/pom.xml
jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/Release.java
jspwiki/trunk/jspwiki-war/src/main/resources/ini/jspwiki.properties
jspwiki/trunk/jspwiki-war/src/test/java/SamplePlugin2.java
jspwiki/trunk/jspwiki-war/src/test/java/org/apache/wiki/WikiEngineTest.java
jspwiki/trunk/jspwiki-war/src/test/java/org/apache/wiki/providers/VersioningFileProviderTest.java
jspwiki/trunk/jspwiki-war/src/test/java/org/apache/wiki/stress/StressTestSpeed.java
jspwiki/trunk/jspwiki-war/src/test/resources/jspwiki-custom.properties
jspwiki/trunk/jspwiki-war/src/test/resources/jspwiki-rcs-custom.properties
jspwiki/trunk/jspwiki-war/src/test/resources/jspwiki-vers-custom.properties
Modified: jspwiki/trunk/ChangeLog
URL: http://svn.apache.org/viewvc/jspwiki/trunk/ChangeLog?rev=1513544&r1=1513543&r2=1513544&view=diff
==============================================================================
--- jspwiki/trunk/ChangeLog (original)
+++ jspwiki/trunk/ChangeLog Tue Aug 13 15:19:10 2013
@@ -1,3 +1,11 @@
+2013-08-13 Glen Mazza (gmazza AT apache DOT org)
+
+ * 2.10.0-svn-38
+
+ * Updated all the test/*-custom.properties files, removed all non-necessary configuration items
+
+ * Removed no-longer-needed file filtering from the jspwiki WAR pom.
+
2013-08-11 Glen Mazza (gmazza AT apache DOT org)
* 2.10.0-svn-37
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=1513544&r1=1513543&r2=1513544&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 Tue Aug 13 15:19:10 2013
@@ -5,7 +5,7 @@ Title: Changelog
* 2.10.0-svn-37
* Updated it-test's selenium module to use new jspwiki-custom.properties system. IT tests only
- working 50% (same as before though).
+ working 50% presently (same as before though).
* Removed some values from our jspwiki-custom.properties files where the defaults in jspwiki.properties
are sufficient.
Modified: jspwiki/trunk/jspwiki-war/pom.xml
URL: http://svn.apache.org/viewvc/jspwiki/trunk/jspwiki-war/pom.xml?rev=1513544&r1=1513543&r2=1513544&view=diff
==============================================================================
--- jspwiki/trunk/jspwiki-war/pom.xml (original)
+++ jspwiki/trunk/jspwiki-war/pom.xml Tue Aug 13 15:19:10 2013
@@ -189,18 +189,6 @@
<build>
<finalName>JSPWiki</finalName>
- <!-- filtering: http://maven.apache.org/plugins/maven-resources-plugin/examples/filter.html -->
- <filters>
- <filter>src/main/filters/filters.properties</filter>
- </filters>
-
- <testResources>
- <testResource>
- <directory>src/test/resources</directory>
- <filtering>true</filtering>
- </testResource>
- </testResources>
-
<plugins>
<!-- With below plugin can deploy to an embedded Tomcat instance via:
mvn clean install tomcat7:run-war [-Dmaven.test.skip]
@@ -341,19 +329,8 @@
<plugin>
<artifactId>maven-war-plugin</artifactId>
<configuration>
- <filters>
- <filter>${pom.basedir}/src/main/filters/filters.properties</filter>
- </filters>
- <attachClasses>true</attachClasses>
+ <attachClasses>true</attachClasses>
<webResources>
- <resource>
- <directory>src/main/webapp/WEB-INF</directory>
- <targetPath>WEB-INF</targetPath>
- <includes>
- <include>jspwiki.properties</include>
- </includes>
- <filtering>true</filtering>
- </resource>
<!-- Output directory configured above with the YUICompressor Maven plugin
<resource>
<directory>${project.build.directory}/generated-sources/yuicompress</directory>
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=1513544&r1=1513543&r2=1513544&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 Tue Aug 13 15:19:10 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 = "37";
+ public static final String BUILD = "38";
/**
* This is the generic version string you should use
Modified: jspwiki/trunk/jspwiki-war/src/main/resources/ini/jspwiki.properties
URL: http://svn.apache.org/viewvc/jspwiki/trunk/jspwiki-war/src/main/resources/ini/jspwiki.properties?rev=1513544&r1=1513543&r2=1513544&view=diff
==============================================================================
--- jspwiki/trunk/jspwiki-war/src/main/resources/ini/jspwiki.properties (original)
+++ jspwiki/trunk/jspwiki-war/src/main/resources/ini/jspwiki.properties Tue Aug 13 15:19:10 2013
@@ -806,15 +806,18 @@ mail.from = JSPWiki <JS...@localhost>
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 = 25
+mail.smtp.port = 25
-# If you are using a webserver that is publically accessible it usually
+# Set what the user sees in the "from" line of the email
+#mail.from = JSPWiki <JS...@localhost>
+
+# If you are using a webserver that is publicly accessible it usually
# doesn't allow you to send mail anonymously
# (because then this mailserver would become an open relay).
# Therefore you can indicate your account information here...
#
-#mail.smtp.account = @mail.smtp.account@
-#mail.smtp.password = @mail.smtp.password@
+#mail.smtp.account = your.email@email.com
+#mail.smtp.password = yourEmailPassword
# The properties below control connection timeouts and TLS (encryption)
# if the mailserver supports it. The commented-out values are the defaults.
@@ -841,7 +844,6 @@ mail.smtp.host = 127.0.0.1
#log4j.appender.mail.From = JSPWiki@localhost
#log4j.appender.mail.Subject = Problem with JSPWiki!
#log4j.appender.mail.SMTPHost = mail
-
#log4j.appender.mail.layout = org.apache.log4j.PatternLayout
#log4j.appender.mail.layout.ConversionPattern =%d [%t] %p %c %x - %m%n
Modified: jspwiki/trunk/jspwiki-war/src/test/java/SamplePlugin2.java
URL: http://svn.apache.org/viewvc/jspwiki/trunk/jspwiki-war/src/test/java/SamplePlugin2.java?rev=1513544&r1=1513543&r2=1513544&view=diff
==============================================================================
--- jspwiki/trunk/jspwiki-war/src/test/java/SamplePlugin2.java (original)
+++ jspwiki/trunk/jspwiki-war/src/test/java/SamplePlugin2.java Tue Aug 13 15:19:10 2013
@@ -15,7 +15,8 @@
import org.apache.wiki.WikiContext;
import org.apache.wiki.WikiEngine;
-import org.apache.wiki.plugin.*;
+import org.apache.wiki.api.plugin.WikiPlugin;
+import org.apache.wiki.api.exceptions.PluginException;
import java.util.*;
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=1513544&r1=1513543&r2=1513544&view=diff
==============================================================================
--- jspwiki/trunk/jspwiki-war/src/test/java/org/apache/wiki/WikiEngineTest.java (original)
+++ jspwiki/trunk/jspwiki-war/src/test/java/org/apache/wiki/WikiEngineTest.java Tue Aug 13 15:19:10 2013
@@ -92,11 +92,11 @@ public class WikiEngineTest extends Test
TestEngine.emptyWorkDir();
}
- public void testNonExistantDirectory()
+ public void testNonExistentDirectory()
throws Exception
{
String tmpdir = System.getProperties().getProperty("java.io.tmpdir");
- String dirname = "non-existant-directory";
+ String dirname = "non-existent-directory";
String newdir = tmpdir + File.separator + dirname;
@@ -116,7 +116,7 @@ public class WikiEngineTest extends Test
/**
* Check that calling pageExists( String ) works.
*/
- public void testNonExistantPage()
+ public void testNonExistentPage()
throws Exception
{
String pagename = "Test1";
@@ -129,7 +129,7 @@ public class WikiEngineTest extends Test
/**
* Check that calling pageExists( WikiPage ) works.
*/
- public void testNonExistantPage2()
+ public void testNonExistentPage2()
throws Exception
{
WikiPage page = new WikiPage(m_engine, "Test1");
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=1513544&r1=1513543&r2=1513544&view=diff
==============================================================================
--- jspwiki/trunk/jspwiki-war/src/test/java/org/apache/wiki/providers/VersioningFileProviderTest.java (original)
+++ jspwiki/trunk/jspwiki-war/src/test/java/org/apache/wiki/providers/VersioningFileProviderTest.java Tue Aug 13 15:19:10 2013
@@ -214,7 +214,7 @@ public class VersioningFileProviderTest
assertEquals("ver3", text3, engine.getText( NAME1, 3 ) );
}
- public void testNonexistantPage()
+ public void testNonexistentPage()
{
assertNull( engine.getPage("fjewifjeiw") );
}
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=1513544&r1=1513543&r2=1513544&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 Tue Aug 13 15:19:10 2013
@@ -46,9 +46,6 @@ public final class StressTestSpeed exten
public void setUp()
throws Exception
{
- props.setProperty( "jspwiki.usePageCache", "true" );
- props.setProperty( "jspwiki.newRenderingEngine", "true" );
-
engine = new TestEngine(props);
}
Modified: jspwiki/trunk/jspwiki-war/src/test/resources/jspwiki-custom.properties
URL: http://svn.apache.org/viewvc/jspwiki/trunk/jspwiki-war/src/test/resources/jspwiki-custom.properties?rev=1513544&r1=1513543&r2=1513544&view=diff
==============================================================================
--- jspwiki/trunk/jspwiki-war/src/test/resources/jspwiki-custom.properties (original)
+++ jspwiki/trunk/jspwiki-war/src/test/resources/jspwiki-custom.properties Tue Aug 13 15:19:10 2013
@@ -14,42 +14,25 @@
# KIND, either express or implied. See the License for the
# specific language governing permissions and limitations
# under the License.
-
#
-# The only properties needed to be listed below are those that override
-# values in src/main/resources/ini/jspwiki.properties
+# Custom configuration file used by most JUnit tests overriding
+# certain default values in src/main/resources/ini/jspwiki.properties
#
-
-jspwiki.fileSystemProvider.pageDir = @tests.pagedir@
-jspwiki.workDir = @tests.workdir@
+jspwiki.fileSystemProvider.pageDir = target/test-classes/testrepository
+jspwiki.workDir = target/test-classes/testworkdir
jspwiki.searchProvider = BasicSearchProvider
jspwiki.translatorReader.camelCaseLinks = true
jspwiki.breakTitleWithSpaces = true
jspwiki.translatorReader.useOutlinkImage = false
-jspwiki.basicAttachmentProvider.storageDir = @tests.pagedir@
+jspwiki.basicAttachmentProvider.storageDir = target/test-classes/testrepository
jspwiki.encoding = ISO-8859-1
-jspwiki.filterConfig = @tests.filter@
+jspwiki.filterConfig = /filters.xml
jspwiki.baseURL = http://localhost/
jspwiki.referenceStyle = relative
jspwiki.authorizer=org.apache.wiki.TestAuthorizer
#
-# Special page references done for testing
-#
-jspwiki.specialPage.RecentChanges = RecentChanges.jsp
-jspwiki.specialPage.Search = Search.jsp
-
-#
-# 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/*
-
-#
# Security: use standard providers for user/group auth, user management
# and ACLs. Use a test userdatabase for storing users.
#
@@ -57,32 +40,30 @@ jspwiki.xmlGroupDatabaseFile = target/te
jspwiki.xmlUserDatabaseFile = target/test-classes/userdatabase.xml
jspwiki.admin.user = admin
+log4j.appender.FileLog.File = target/test-classes/jspwikitests.log
log4j.logger.SecurityLog=INFO, SecurityAppender
-
-log4j.appender.FileLog.File = @tests.logfile@
-
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 = target/test-classes/logs/security.log
log4j.appender.SecurityAppender.layout = org.apache.log4j.PatternLayout
log4j.appender.SecurityAppender.layout.ConversionPattern=%d %p - %m%n
-log4j.appender.TestContainerLog = org.apache.log4j.RollingFileAppender
-log4j.appender.TestContainerLog.MaxFileSize = 10MB
-log4j.appender.TestContainerLog.MaxBackupIndex = 14
-log4j.appender.TestContainerLog.layout = org.apache.log4j.PatternLayout
-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
-mail.from = JSPWiki <JS...@localhost>
-#mail.smtp.account =
-#mail.smtp.password =
+# Used by CommandResolverTest
+jspwiki.specialPage.RecentChanges = RecentChanges.jsp
+jspwiki.specialPage.Search = Search.jsp
-# Workflow test properties
+# Used by JSPWikiMarkupParserTest
+jspwiki.translatorReader.inlinePattern.1 = *.jpg
+jspwiki.translatorReader.inlinePattern.2 = *.png
+jspwiki.translatorReader.inlinePattern.3 = http://images.com/*
+
+# Used by WorkflowManagerTest
jspwiki.approver.workflow.saveWikiPage=
jspwiki.approver.workflow.foo=janne
jspwiki.approver.workflow.bar=Admin
+
+# Fields needed in order to run MailUtilTest
+#mail.smtp.host = 127.0.0.1
+#mail.smtp.port = 25
+#mail.from = JSPWiki <JS...@localhost>
+#mail.smtp.account =
+#mail.smtp.password =
Modified: jspwiki/trunk/jspwiki-war/src/test/resources/jspwiki-rcs-custom.properties
URL: http://svn.apache.org/viewvc/jspwiki/trunk/jspwiki-war/src/test/resources/jspwiki-rcs-custom.properties?rev=1513544&r1=1513543&r2=1513544&view=diff
==============================================================================
--- jspwiki/trunk/jspwiki-war/src/test/resources/jspwiki-rcs-custom.properties (original)
+++ jspwiki/trunk/jspwiki-war/src/test/resources/jspwiki-rcs-custom.properties Tue Aug 13 15:19:10 2013
@@ -14,48 +14,11 @@
# KIND, either express or implied. See the License for the
# specific language governing permissions and limitations
# under the License.
-
#
-# The only properties needed to be listed below are those that override
-# values in src/main/resources/ini/jspwiki.properties
+# Custom configuration file used by StressTestSpeed and RCSFileProviderTest
+# overriding below default values in src/main/resources/ini/jspwiki.properties
#
jspwiki.pageProvider = RCSFileProvider
-
-#
-# Determines where wiki files are kept.
-#
-jspwiki.fileSystemProvider.pageDir = @tests.pagedir@
-jspwiki.workDir = @tests.workdir@
-jspwiki.searchProvider = BasicSearchProvider
-jspwiki.specialPage.RecentChanges = RecentChanges.jsp
-jspwiki.specialPage.Search = Search.jsp
-
-#
-# 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/*
-
-#
-# Security: use standard providers for user/group auth, user management
-# and ACLs. Use a test userdatabase for storing users.
-#
-jspwiki.groupManager = org.apache.wiki.auth.authorize.DefaultGroupManager
-jspwiki.xmlUserDatabaseFile = tests/etc/userdatabase.xml
-jspwiki.admin.user = admin
-
-#
-# Log everything into a file.
-#
-log4j.appender.FileLog.File = @tests.logfile@
-
-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.layout = org.apache.log4j.PatternLayout
-log4j.appender.SecurityAppender.layout.ConversionPattern=%d %p - %m%n
-log4j.logger.SecurityLog=INFO, SecurityAppender
+jspwiki.fileSystemProvider.pageDir = target/test-classes/testrepository
+jspwiki.workDir = target/test-classes/testworkdir
+log4j.appender.FileLog.File = target/test-classes/jspwikitests.log
Modified: jspwiki/trunk/jspwiki-war/src/test/resources/jspwiki-vers-custom.properties
URL: http://svn.apache.org/viewvc/jspwiki/trunk/jspwiki-war/src/test/resources/jspwiki-vers-custom.properties?rev=1513544&r1=1513543&r2=1513544&view=diff
==============================================================================
--- jspwiki/trunk/jspwiki-war/src/test/resources/jspwiki-vers-custom.properties (original)
+++ jspwiki/trunk/jspwiki-war/src/test/resources/jspwiki-vers-custom.properties Tue Aug 13 15:19:10 2013
@@ -14,48 +14,14 @@
# KIND, either express or implied. See the License for the
# specific language governing permissions and limitations
# under the License.
-
#
-# The only properties needed to be listed below are those that override
-# values in src/main/resources/ini/jspwiki.properties
+# Custom configuration file loaded by StressTestVersioningProvider, MassiveRepositoryTest,
+# WikiEngineTest, and VersioningFileProviderTest
+# overriding certain default values in src/main/resources/ini/jspwiki.properties
#
jspwiki.pageProvider = VersioningFileProvider
-
-#
-# Determines where wiki files are kept.
-#
-jspwiki.fileSystemProvider.pageDir = @tests.pagedir@
-jspwiki.workDir = @tests.workdir@
-
-jspwiki.encoding = UTF-8
+jspwiki.fileSystemProvider.pageDir = target/test-classes/testrepository
+jspwiki.workDir = target/test-classes/testworkdir
+log4j.appender.FileLog.File = target/test-classes/jspwikitests.log
+# Stress/Massive tests very slow without switch to BasicSearchProvider
jspwiki.searchProvider = BasicSearchProvider
-
-jspwiki.specialPage.RecentChanges = RecentChanges.jsp
-jspwiki.specialPage.Search = Search.jsp
-
-#
-# 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/*
-
-#
-# Security: use standard providers for user/group auth, user management
-# and ACLs. Use a test userdatabase for storing users.
-#
-jspwiki.xmlUserDatabaseFile = tests/etc/userdatabase.xml
-jspwiki.admin.user = admin
-
-log4j.appender.FileLog.File = @tests.logfile@
-
-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.layout = org.apache.log4j.PatternLayout
-log4j.appender.SecurityAppender.layout.ConversionPattern=%d %p - %m%n
-log4j.logger.SecurityLog=INFO, SecurityAppender