You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jspwiki.apache.org by me...@apache.org on 2008/08/24 13:49:19 UTC
svn commit: r688496 - in /incubator/jspwiki/trunk: ./ src/com/ecyrd/jspwiki/
src/com/ecyrd/jspwiki/auth/authorize/ src/com/ecyrd/jspwiki/render/
tests/com/ecyrd/jspwiki/ui/ tests/etc/selenium/ tests/etc/selenium/tests/all/
Author: metskem
Date: Sun Aug 24 04:49:19 2008
New Revision: 688496
URL: http://svn.apache.org/viewvc?rev=688496&view=rev
Log:
2.7.0-alpha-27 GPG key added, minor corrections/additions to UPGRADING and selenium readme.txt
changes in build.xml, new ViewPageSource selenium test, get rid of compile warnings and erors
Added:
incubator/jspwiki/trunk/tests/etc/selenium/tests/all/ViewPageSource.html
Modified:
incubator/jspwiki/trunk/ChangeLog
incubator/jspwiki/trunk/KEYS
incubator/jspwiki/trunk/UPGRADING
incubator/jspwiki/trunk/build.properties
incubator/jspwiki/trunk/build.xml
incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/Release.java
incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/WikiPage.java
incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/auth/authorize/GroupManager.java
incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/render/WysiwygEditingRenderer.java
incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/ui/InputValidatorTest.java
incubator/jspwiki/trunk/tests/etc/selenium/readme.txt
incubator/jspwiki/trunk/tests/etc/selenium/tests/all/TestSuite.html
Modified: incubator/jspwiki/trunk/ChangeLog
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/ChangeLog?rev=688496&r1=688495&r2=688496&view=diff
==============================================================================
--- incubator/jspwiki/trunk/ChangeLog (original)
+++ incubator/jspwiki/trunk/ChangeLog Sun Aug 24 04:49:19 2008
@@ -1,3 +1,24 @@
+2008-08-24 Harry Metske <ha...@gmail.com>
+
+ * 2.7.0-alpha-27
+
+ * added my GPG key to KEYS
+
+ * minor corrections/additions to UPGRADING
+
+ * minor corrections/additions to the selenium readme.txt
+
+ * added ${java.home}/../lib/tools.jar to path.tests, set jspwiki.login.throttling=false and some other comments in build.xml
+
+ * added firefox-2 browser option (as extra comment) to build.properties
+
+ * added new simple ViewPageSource selenium test
+
+ * get rid of compile warning in WikiPage and WysiwygEditingRenderer and GroupManager
+
+ * compile error in InputValidatorTest
+
+
2008-08-23 Dirk Frederickx <di...@gmail.com>
* 2.7.0-alpha-26
Modified: incubator/jspwiki/trunk/KEYS
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/KEYS?rev=688496&r1=688495&r2=688496&view=diff
==============================================================================
--- incubator/jspwiki/trunk/KEYS (original)
+++ incubator/jspwiki/trunk/KEYS Sun Aug 24 04:49:19 2008
@@ -54,3 +54,41 @@
tiRp/Vwf6k09otoAAJ9y+8BUDND51/D9y2lvZUL4e4f3GQ==
=zvWP
-----END PGP PUBLIC KEY BLOCK-----
+
+pub 1024D/C1281CDC 2008-08-22
+uid Harry Metske <ha...@gmail.com>
+uid Harry Metske <me...@apache.org>
+sub 2048g/2143C3AC 2008-08-22
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+Version: GnuPG v1.4.6 (GNU/Linux)
+
+mQGiBEiuciURBACCRpSYDNC9Yqf+Pr5AOkwjJpRNpxmqc8ElyT72N0OlU85MlW/8
+YP1TbSJMtD+71Z5/5rVBbLuCeLSsZiAwDp99YMUGPpvuzgOkCiqrlkE5AdkVtq4i
+WOSHE5HIycq552vE+oO4pi0w9o4Ev/itOu4f3HGl9iKu6gbPYxpAZYauhwCgjA+4
+uOW2Kivp1WOU5iwKVhLKAxUD/0sd8sV7gWBBm+DOBiSlNh0pOoMrUIAgNszQ646Q
+0Ej36yOzaU2WLsGF7vcTZmAz1uYQ1VCxFskqzbiJ8TOJso3lxYtqt2wvqYqnKjPh
+eTzGmbWBexRiTqOar2p5Mufo1t5T99piZ0k58g+5gTXRdLyNo/xsgamVfSVVinVI
+FNlAA/4nTklbXet+hIXknwjhMl54bNzCL43j5CHDV8ysP/iTVTlLgBOajNA7oo55
+zlCZeOJORCEmiFRRbUPiGPWHynFtX5ehPGqPU/yCGA5Aw70guv9Z6vOxVIgBWRFl
+kgEZpWSa+bZXTJMI/E/a4jS599Ox/L/JpOQUAUubLQhJSaarJrQhSGFycnkgTWV0
+c2tlIDxtZXRza2VtQGFwYWNoZS5vcmc+iGAEExECACAFAkiudIcCGwMGCwkIBwMC
+BBUCCAMEFgIDAQIeAQIXgAAKCRCVXr6owSgc3HkhAJ974IZDHirpjtougOQ6MzDy
+HDbCZwCfY95xdULr7woqS3726EjgIzt83ki0JUhhcnJ5IE1ldHNrZSA8aGFycnku
+bWV0c2tlQGdtYWlsLmNvbT6IYwQTEQIAIwIbAwYLCQgHAwIEFQIIAwQWAgMBAh4B
+AheABQJIrnUlAhkBAAoJEJVevqjBKBzcZkcAn1YzUkAED/o2C24v+zGSUlQ6o64V
+AJ0fdQ06ywCApD9lP/sEpuHRBhe4RrkCDQRIrnI5EAgA9kqmIMJQQ+vpx41jur/k
+n0dt23347SQVS7tsPZ5x4Y0J/4WzTcmn4sMEsWjTtiDa2cP/V35keVjSp4jGAaA2
+tOIAOo5na4GIdTBKvovanrx8LX44fV1jH+sSDmcUuLREIMR4RXzc5BPmeCYjWEA8
+yf4Pk5WouHUZoKhprC/RKfCoVAAVAypGPOzjJNAaxf/lDMhlfhJIPNnHye2Lpi2R
+yJvFeqnOMjjqneUkL+DVHThSp8YcmBmEB5c/NVD7v++hxnoawP8QQg7lYEsjjF86
+M2wvUSG9ar4JlYCZgpkP0qI3CnXmo+pudk9lQMMBNpVeeDn6xI7mny+U8q30WpiA
+ewADBggAgSkI8nZw6KGCmHRw9vS1C+uMz6O1n1NX0BPOzt751ecYO9F2uSFU10Db
+1rU1N1nEjLrvFSwvL/qatK7Z8LamvaR/gJ7CTvCnP6wq8qaLJgQrgnlCGx824dey
+7/4yBfzCwcXK8sLIJatXO7h5iaxGrcipovSeJ2HRmKHJA0jU3qS5i+JQyTyHs3Tc
+wxE/P/wb/IO7QRe08Y/a54pAyoGBSKAkpPfDBFfLr2s53p0u1iGsDlDBJXDIcG7d
+z9zUq+AokaVZ+/WfhiH5hRg2OqQrbM6fsKG6lrpU/Pufa5wxEWffayKqNJ5GGf7j
+miuwNNeINrOR68tF+G+kEZUs0C0+W4hJBBgRAgAJBQJIrnI5AhsMAAoJEJVevqjB
+KBzciR0AoIBnTYzCbqv2x17gFExsYoTPRY8iAJ4rdu/lVVtNiGM3TMThzy3/EOUt
+Rw==
+=dBz2
+-----END PGP PUBLIC KEY BLOCK-----
\ No newline at end of file
Modified: incubator/jspwiki/trunk/UPGRADING
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/UPGRADING?rev=688496&r1=688495&r2=688496&view=diff
==============================================================================
--- incubator/jspwiki/trunk/UPGRADING (original)
+++ incubator/jspwiki/trunk/UPGRADING Sun Aug 24 04:49:19 2008
@@ -85,7 +85,7 @@
(You should remove any older versions of these jars from WEB-INF/lib.)
- -> Remove the following files from yoru existing WEB-INF/lib:
+ -> Remove the following files from your existing WEB-INF/lib:
jug-asl-2.0.0.jar, multipartrequest.jar
E. Upgrading security features
@@ -116,7 +116,7 @@
If this property is not set, JSPWiki will default (as before) to the
UserDatabaseLoginModule implementation.
- Note that parameters passed to your custom LoginModule is now expressed in
+ Note that parameters passed to your custom LoginModule are now expressed in
jspwiki.properties also, as key/value pairs, rather than in the JAAS config
file. The parameter names and values will be loaded to a Map and passed to
the LoginModule as the 'options' parameter when its initialize() method
@@ -141,10 +141,10 @@
add the following columns to your users table:
column name type
- ----------------------------
- uid bigint (or other long integer equivalent)
- lockExpiry timestamp
- attributes longvarchar (or other large text/memo field)
+ --------------------------------------------------------------------------------------------
+ uid bigint (or other long integer equivalent)
+ lockExpiry timestamp
+ attributes longvarchar (or other large text/memo field)
The primary key should also be changed to the 'uid' column. The column names
can be re-mapped in jspwiki.properties similar to other JDBC columns.
@@ -187,6 +187,9 @@
widely used yet, but we expect it to be useful for security logging
in future releases of JSPWiki.
+ You can migrate your existing UserDatabase with a conversion utility
+ available at http://www.jspwiki.org/wiki/UserDatabaseConversion
+
UPGRADE INSTRUCTIONS FOR DEVELOPERS
-----------------------------------
@@ -299,7 +302,8 @@
removed so that it can no longer be instantiated. It is retained strictly for
reverse compatibility.
- -> Class PageRenamer was moved to package com.ecyrd.jspwiki.content.
+ -> Class PageRenamer was moved to package com.ecyrd.jspwiki.content and completely rewritten
+ because of licensing issues
-> Class com.ecyrd.jspwiki.WikiSession method getLoginContext() was removed.
@@ -315,4 +319,6 @@
-> For security reasons, class com.ecyrd.jspwiki.auth.user.DefaultUserProfile
was made final.
- -> Class com.ecyrd.jspwiki.rpc.RPCManager's constructor is now protected.
\ No newline at end of file
+ -> Class com.ecyrd.jspwiki.rpc.RPCManager's constructor is now protected.
+
+ -> Class com.ecyrd.jspwiki.plugin.BugReportHandler had it's public parameter names changed to PARAM_xxx
\ No newline at end of file
Modified: incubator/jspwiki/trunk/build.properties
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/build.properties?rev=688496&r1=688495&r2=688496&view=diff
==============================================================================
--- incubator/jspwiki/trunk/build.properties (original)
+++ incubator/jspwiki/trunk/build.properties Sun Aug 24 04:49:19 2008
@@ -53,6 +53,8 @@
# Which browser to use?
webtests.browser=*safari
+# if you run firefox, and it is not in your PATH, you can specify this :
+#webtests.browser=*firefox /usr/lib/firefox/firefox-2-bin
# For generating API diffs (you must have DependencyFinder installed)
#dependencyfinder.dir=../lib/DependencyFinder
Modified: incubator/jspwiki/trunk/build.xml
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/build.xml?rev=688496&r1=688495&r2=688496&view=diff
==============================================================================
--- incubator/jspwiki/trunk/build.xml (original)
+++ incubator/jspwiki/trunk/build.xml Sun Aug 24 04:49:19 2008
@@ -152,6 +152,7 @@
<path id="path.tests">
<pathelement location="${jarfile}" />
<pathelement location="${testjarfile}" />
+ <pathelement location="${java.home}/../lib/tools.jar" />
<fileset dir="lib">
<include name="*.jar" />
</fileset>
@@ -708,6 +709,7 @@
<entry key="jspwiki.userdatabase.hashPrefix" value="false" />
<entry key="log4j.appender.TestContainerLog.File" value="${basedir}/${webtests.build}/testcontainer.log" />
<entry key="jspwiki-x.securityconfig.enable" value="true" />
+ <entry key="jspwiki.login.throttling" value="false" />
</propertyfile>
<!-- Build the custom auth WAR -->
@@ -887,6 +889,8 @@
output="${webtests.build}/@{context}/selenium/selenium.log">
<!--
<arg line="-browserSessionReuse" />
+ <arg line="-log" />
+ <arg line="${webtests.reports}/@{context}.selenium.log" />
-->
<arg line="-htmlSuite" />
<arg line='"${webtests.browser}"' />
Modified: incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/Release.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/Release.java?rev=688496&r1=688495&r2=688496&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/Release.java (original)
+++ incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/Release.java Sun Aug 24 04:49:19 2008
@@ -77,7 +77,7 @@
* <p>
* If the build identifier is empty, it is not added.
*/
- public static final String BUILD = "26";
+ public static final String BUILD = "27";
/**
* This is the generic version string you should use
Modified: incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/WikiPage.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/WikiPage.java?rev=688496&r1=688495&r2=688496&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/WikiPage.java (original)
+++ incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/WikiPage.java Sun Aug 24 04:49:19 2008
@@ -33,7 +33,6 @@
/**
* Simple wrapper class for the Wiki page attributes. The Wiki page
* content is moved around in Strings, though.
- * @param <V>
*/
// FIXME: We need to rethink how metadata is being used - probably the
Modified: incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/auth/authorize/GroupManager.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/auth/authorize/GroupManager.java?rev=688496&r1=688495&r2=688496&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/auth/authorize/GroupManager.java (original)
+++ incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/auth/authorize/GroupManager.java Sun Aug 24 04:49:19 2008
@@ -578,7 +578,6 @@
*/
public final void validateGroup( WikiContext context, Group group )
{
- WikiSession session = context.getWikiSession();
InputValidator validator = new InputValidator( MESSAGES_KEY, context );
// Name cannot be null or one of the restricted names
Modified: incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/render/WysiwygEditingRenderer.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/render/WysiwygEditingRenderer.java?rev=688496&r1=688495&r2=688496&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/render/WysiwygEditingRenderer.java (original)
+++ incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/render/WysiwygEditingRenderer.java Sun Aug 24 04:49:19 2008
@@ -45,7 +45,7 @@
{
private static final String A_ELEMENT = "a";
- private static final String PRE_ELEMENT = "pre";
+// private static final String PRE_ELEMENT = "pre";
private static final String CLASS_ATTRIBUTE = "class";
private static final String HREF_ATTRIBUTE = "href";
private static final String TITLE_ATTRIBUTE = "title";
Modified: incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/ui/InputValidatorTest.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/ui/InputValidatorTest.java?rev=688496&r1=688495&r2=688496&view=diff
==============================================================================
--- incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/ui/InputValidatorTest.java (original)
+++ incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/ui/InputValidatorTest.java Sun Aug 24 04:49:19 2008
@@ -12,7 +12,8 @@
import junit.framework.TestSuite;
import com.ecyrd.jspwiki.TestEngine;
-import com.ecyrd.jspwiki.WikiSession;
+import com.ecyrd.jspwiki.WikiContext;
+import com.ecyrd.jspwiki.WikiPage;
public class InputValidatorTest extends TestCase
{
@@ -27,8 +28,8 @@
Properties props = new Properties();
props.load( TestEngine.findTestProperties() );
testEngine = new TestEngine( props );
- WikiSession session = WikiSession.getWikiSession( testEngine, testEngine.newHttpRequest() );
- val = new InputValidator( TEST, session );
+ WikiContext context = new WikiContext( testEngine, new WikiPage(testEngine,"dummyPage"));
+ val = new InputValidator( TEST, context );
}
public void testUnsafePattern()
Modified: incubator/jspwiki/trunk/tests/etc/selenium/readme.txt
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/tests/etc/selenium/readme.txt?rev=688496&r1=688495&r2=688496&view=diff
==============================================================================
--- incubator/jspwiki/trunk/tests/etc/selenium/readme.txt (original)
+++ incubator/jspwiki/trunk/tests/etc/selenium/readme.txt Sun Aug 24 04:49:19 2008
@@ -22,7 +22,7 @@
Start the Selenium server...
-java -jar tests/lib/selenium-server-0.9.2-patched.jar -interactive
+java -jar tests/lib/selenium-server-1.0-beta1.jar -interactive
Open Firefox.
Set the browser proxy to localhost:4444
@@ -33,7 +33,7 @@
CREATING TESTS
--------------
Selenium-IDE is the preferred way to create test files. The master
-test suite file is tests/etc/selenium/tests/JSPWikiTestSuite.html.
+test suite file is tests/etc/selenium/tests/TestSuite.html.
You can add a new test file (such as one recorded in Selenium-IDE) to
the suite file by appending a table row like this:
Modified: incubator/jspwiki/trunk/tests/etc/selenium/tests/all/TestSuite.html
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/tests/etc/selenium/tests/all/TestSuite.html?rev=688496&r1=688495&r2=688496&view=diff
==============================================================================
--- incubator/jspwiki/trunk/tests/etc/selenium/tests/all/TestSuite.html (original)
+++ incubator/jspwiki/trunk/tests/etc/selenium/tests/all/TestSuite.html Sun Aug 24 04:49:19 2008
@@ -45,9 +45,12 @@
<tr><td><a href="./CreateGroupLoginName.html">Create Group (LoginName)</a></td></tr>
<tr><td><a href="./CreateGroupWikiName.html">Create Group (WikiName)</a></td></tr>
- <!-- User profile/preferences tests -->
- <tr><td><a href="./RenameProfile.html">Rename Profile</a></td></tr>
-
+ <!-- User profile/preferences tests -->
+ <tr><td><a href="./RenameProfile.html">Rename Profile</a></td></tr>
+
+ <!-- View Page Source Test -->
+ <tr><td><a href="./ViewPageSource.html">View Page Source</a></td></tr>
+
</tbody>
</table>
Added: incubator/jspwiki/trunk/tests/etc/selenium/tests/all/ViewPageSource.html
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/tests/etc/selenium/tests/all/ViewPageSource.html?rev=688496&view=auto
==============================================================================
--- incubator/jspwiki/trunk/tests/etc/selenium/tests/all/ViewPageSource.html (added)
+++ incubator/jspwiki/trunk/tests/etc/selenium/tests/all/ViewPageSource.html Sun Aug 24 04:49:19 2008
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
+<head profile="http://selenium-ide.openqa.org/profiles/test-case">
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
+<link rel="selenium.base" href="" />
+<title>ViewPageSource</title>
+</head>
+<body>
+<table cellpadding="1" cellspacing="1" border="1">
+<thead>
+<tr><td rowspan="1" colspan="3">ViewPageSource</td></tr>
+</thead><tbody>
+ <tr><td>store</td> <td>/@selenium.context@</td> <td>baseUrl</td></tr>
+ <tr><td>open</td> <td>${baseUrl}/Wiki.jsp?page=Main</td> <td> </td></tr>
+ <tr><td>verifyTextPresent</td> <td>You have successfully installed</td> <td> </td></tr>
+ <tr><td rowspan="1" colspan="3"> Simply do View Page Source and check if you get it<br/></td> </tr>
+ <tr><td>open</td> <td>${baseUrl}/Wiki.jsp?page=Main&skin=raw</td> <td> </td></tr>
+ <tr><td>verifyTextPresent</td> <td>You have successfully installed [JSPWiki|About].</td> <td> </td></tr>
+</tbody></table>
+</body>
+</html>