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/25 17:11:51 UTC
svn commit: r1517306 - in /jspwiki/trunk: ./ jspwiki-it-tests/
jspwiki-it-tests/jspwiki-selenium-tests/src/main/resources/
jspwiki-site/src/site/trunk/content/jspwiki/development/
jspwiki-site/src/site/trunk/templates/ jspwiki-war/src/main/java/org/apa...
Author: gmazza
Date: Sun Aug 25 15:11:51 2013
New Revision: 1517306
URL: http://svn.apache.org/r1517306
Log:
Removed unused config from IT tests' jspwiki-custom.properties.
Modified:
jspwiki/trunk/ChangeLog
jspwiki/trunk/jspwiki-it-tests/jspwiki-selenium-tests/src/main/resources/jspwiki-custom.properties
jspwiki/trunk/jspwiki-it-tests/pom.xml
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/Release.java
jspwiki/trunk/jspwiki-war/src/main/resources/ini/jspwiki.properties
Modified: jspwiki/trunk/ChangeLog
URL: http://svn.apache.org/viewvc/jspwiki/trunk/ChangeLog?rev=1517306&r1=1517305&r2=1517306&view=diff
==============================================================================
--- jspwiki/trunk/ChangeLog (original)
+++ jspwiki/trunk/ChangeLog Sun Aug 25 15:11:51 2013
@@ -1,3 +1,11 @@
+2013-08-25 Glen Mazza (gmazza AT apache DOT org)
+
+ * 2.10.0-svn-44
+
+ * Added jspwiki.login.throttling (default true, as in Java code) to default jspwiki.properties
+
+ * Removed unnecessary config from IT test's jspwiki-custom.properties.
+
2013-08-24 Glen Mazza (gmazza AT apache DOT org)
* No revision number (IT tests change only)
Modified: jspwiki/trunk/jspwiki-it-tests/jspwiki-selenium-tests/src/main/resources/jspwiki-custom.properties
URL: http://svn.apache.org/viewvc/jspwiki/trunk/jspwiki-it-tests/jspwiki-selenium-tests/src/main/resources/jspwiki-custom.properties?rev=1517306&r1=1517305&r2=1517306&view=diff
==============================================================================
--- jspwiki/trunk/jspwiki-it-tests/jspwiki-selenium-tests/src/main/resources/jspwiki-custom.properties (original)
+++ jspwiki/trunk/jspwiki-it-tests/jspwiki-selenium-tests/src/main/resources/jspwiki-custom.properties Sun Aug 25 15:11:51 2013
@@ -15,7 +15,7 @@
# specific language governing permissions and limitations
# under the License.
#
-# VALUES INJECTED BY WEB TESTS
+# Values injected by web tests
#
jspwiki.groupdatabase = ${it-jspwiki.groupdatabase}
jspwiki.referenceStyle = ${it-jspwiki.referenceStyle}
@@ -26,7 +26,6 @@ jspwiki.fileSystemProvider.pageDir
jspwiki.basicAttachmentProvider.storageDir = ./${project.artifactId}/target/test-classes/test-repo/attachments
jspwiki.workDir = ./${project.artifactId}/target/test-classes/workdir-${project.artifactId}
log4j.appender.FileLog.File = ./${project.artifactId}/target/test-classes/jspwiki-${project.artifactId}.log
-log4j.appender.TestContainerLog.File = ./${project.artifactId}/target/test-classes/container-${project.artifactId}.log
log4j.appender.SecurityAppender.File = ./${project.artifactId}/target/test-classes/security-${project.artifactId}.log
#
@@ -35,32 +34,9 @@ log4j.appender.SecurityAppender.File
jspwiki.xmlGroupDatabaseFile = ${it-jspwiki.context}/target/test-classes/groupdatabase.xml
jspwiki.xmlUserDatabaseFile = ${it-jspwiki.context}/target/test-classes/userdatabase.xml
-jspwiki.login.throttling = false
-jspwiki-x.securityconfig.enable = true
-jspwiki.translatorReader.camelCaseLinks = true
-jspwiki.breakTitleWithSpaces = true
-jspwiki.translatorReader.useOutlinkImage = false
-jspwiki.encoding = ISO-8859-1
-jspwiki.searchProvider = BasicSearchProvider
+jspwiki.login.throttling = false
log4j.logger.SecurityLog=INFO, SecurityAppender
-
log4j.appender.SecurityAppender = org.apache.log4j.RollingFileAppender
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.layout = org.apache.log4j.PatternLayout
-log4j.appender.TestContainerLog.layout.ConversionPattern=%d [%t] %p %c %x - %m%n
-
-server.port=9001
-server.database.0=file:jspwiki.hsqldb
-server.dbname.0=jspwiki
-
-jdbc.admin.id=SA
-jdbc.admin.password=
-jdbc.driver.class=org.hsqldb.jdbc.JDBCDriver
-jdbc.driver.id=hsql
-jdbc.driver.url=jdbc\:hsqldb\:hsql\://localhost/jspwiki
-jdbc.user.id=jspwiki
-jdbc.user.password=password
Modified: jspwiki/trunk/jspwiki-it-tests/pom.xml
URL: http://svn.apache.org/viewvc/jspwiki/trunk/jspwiki-it-tests/pom.xml?rev=1517306&r1=1517305&r2=1517306&view=diff
==============================================================================
--- jspwiki/trunk/jspwiki-it-tests/pom.xml (original)
+++ jspwiki/trunk/jspwiki-it-tests/pom.xml Sun Aug 25 15:11:51 2013
@@ -53,7 +53,7 @@
<filtering>true</filtering>
</testResource>
</testResources>
-
+
<resources>
<resource><!-- this enables tests reuse [2/2] -->
<directory>${project.basedir}/../jspwiki-selenium-tests/src/main/resources</directory>
@@ -116,7 +116,7 @@
<configuration>
<browser>*googlechrome</browser>
<startURL>http://localhost:8080/${project.artifactId}/</startURL>
- <suite>target/test-classes/selenium/TestSuite.html</suite>
+ <suite>target/test-classes/selenium/TestSuite.html</suite>
<background>true</background>
</configuration>
<executions>
@@ -126,10 +126,10 @@
<goals>
<goal>selenese</goal>
</goals>
- </execution>
+ </execution>
</executions>
</plugin>
-
+
<!-- Additional Tomcat configuration (JNDI lookups for DB access, tomcat-users.xml file)
located in pom.xml of submodules using them. -->
<plugin>
@@ -170,7 +170,7 @@
</plugins>
</pluginManagement>
</build>
-
+
<dependencies>
<dependency>
<groupId>org.apache.jspwiki</groupId>
@@ -178,7 +178,7 @@
<version>${project.version}</version>
<type>war</type>
</dependency>
-
+
<dependency>
<groupId>org.seleniumhq.selenium</groupId>
<!-- (un)comment based on your browser preferences for tests execution -->
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=1517306&r1=1517305&r2=1517306&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 Sun Aug 25 15:11:51 2013
@@ -1,5 +1,36 @@
Title: Changelog
+#### 2013-08-24 Glen Mazza (gmazza AT apache DOT org)
+
+* No revision number (IT tests change only)
+
+* jspwiki-it-test-container-jdbc test now working, so all five IT test submodules are working
+ (except for RenameProfile which fails with all tests).
+
+* renamed the two "container" tests to more descriptive "cma" (container-managed authentication).
+
+#### 2013-08-22 Glen Mazza (gmazza AT apache DOT org)
+
+* No revision number (IT tests change only)
+
+* For IT tests switched to Brian Matthew's inmemdb-maven-plugin used by Roller, creates an in-memory
+ HSQLDB database with a lifespan that of the IT tests themselves (so no Ant tasks and no DB drop
+ scripts needed).
+
+* jspwiki-it-test-custom-jdbc test now working, only one still not operative is -container-jdbc,
+ which is up from 0 to 25 percent working.
+
+#### 2013-08-22 Glen Mazza (gmazza AT apache DOT org)
+
+* 2.10.0-svn-43
+
+* Changed jspwiki.propertyfile.cascade to jspwiki.custom.cascade to emphasize cascading is done
+ on top of new jspwiki-custom.properties file if present, the default properties file only if not
+ present.
+
+* Changed some internal constants from "propertyfile" to "custom" so they more accurately reflect
+ their meaning in 2.10.
+
#### 2013-08-17 Glen Mazza (gmazza AT apache DOT org)
* 2.10.0-svn-42
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=1517306&r1=1517305&r2=1517306&view=diff
==============================================================================
--- jspwiki/trunk/jspwiki-site/src/site/trunk/templates/release.mdtext (original)
+++ jspwiki/trunk/jspwiki-site/src/site/trunk/templates/release.mdtext Sun Aug 25 15:11:51 2013
@@ -1 +1 @@
-JSPWiki v2.10.0-svn-42
\ No newline at end of file
+JSPWiki v2.10.0-svn-43
\ No newline at end of file
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=1517306&r1=1517305&r2=1517306&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 Sun Aug 25 15:11:51 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 = "43";
+ public static final String BUILD = "44";
/**
* 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=1517306&r1=1517305&r2=1517306&view=diff
==============================================================================
--- jspwiki/trunk/jspwiki-war/src/main/resources/ini/jspwiki.properties (original)
+++ jspwiki/trunk/jspwiki-war/src/main/resources/ini/jspwiki.properties Sun Aug 25 15:11:51 2013
@@ -508,7 +508,12 @@ jspwiki.loginModule.class = org.apache.w
#jspwiki.loginModule.options.param1 = value1
#jspwiki.loginModule.options.param2 = value2
-#
+#
+# Login Throttling - Whether logins should be throttled to limit bruce-force attempts.
+#
+jspwiki.login.throttling=true
+
+#
# Cookie authentication & assertion
#
# If this value is set to "true", then JSPWiki will allow you to "assert" an