You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jspwiki.apache.org by aj...@apache.org on 2008/08/21 03:42:17 UTC
svn commit: r687534 - in
/incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH: ./ doc/
src/com/ecyrd/jspwiki/ src/com/ecyrd/jspwiki/attachment/
src/com/ecyrd/jspwiki/content/ src/com/ecyrd/jspwiki/parser/
src/com/ecyrd/jspwiki/plugin/ src/com/ecyrd/j...
Author: ajaquith
Date: Wed Aug 20 18:42:15 2008
New Revision: 687534
URL: http://svn.apache.org/viewvc?rev=687534&view=rev
Log:
Merged STRIPES_BRANCH with trunk revision 687528.
Added:
incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/KEYS
- copied unchanged from r687533, incubator/jspwiki/trunk/KEYS
incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/wikipages/de/
- copied from r687533, incubator/jspwiki/trunk/src/wikipages/de/
incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/wikipages/de/About.txt
- copied unchanged from r687533, incubator/jspwiki/trunk/src/wikipages/de/About.txt
incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/wikipages/de/Alias.txt
- copied unchanged from r687533, incubator/jspwiki/trunk/src/wikipages/de/Alias.txt
incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/wikipages/de/ApprovalRequiredForPageChanges.txt
- copied unchanged from r687533, incubator/jspwiki/trunk/src/wikipages/de/ApprovalRequiredForPageChanges.txt
incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/wikipages/de/ApprovalRequiredForUserProfiles.txt
- copied unchanged from r687533, incubator/jspwiki/trunk/src/wikipages/de/ApprovalRequiredForUserProfiles.txt
incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/wikipages/de/Community.txt
- copied unchanged from r687533, incubator/jspwiki/trunk/src/wikipages/de/Community.txt
incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/wikipages/de/CopyrightNotice.txt
- copied unchanged from r687533, incubator/jspwiki/trunk/src/wikipages/de/CopyrightNotice.txt
incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/wikipages/de/EditPageHelp.txt
- copied unchanged from r687533, incubator/jspwiki/trunk/src/wikipages/de/EditPageHelp.txt
incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/wikipages/de/FullRecentChanges.txt
- copied unchanged from r687533, incubator/jspwiki/trunk/src/wikipages/de/FullRecentChanges.txt
incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/wikipages/de/LeftMenu.txt
- copied unchanged from r687533, incubator/jspwiki/trunk/src/wikipages/de/LeftMenu.txt
incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/wikipages/de/LeftMenuFooter.txt
- copied unchanged from r687533, incubator/jspwiki/trunk/src/wikipages/de/LeftMenuFooter.txt
incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/wikipages/de/LoginHelp.txt
- copied unchanged from r687533, incubator/jspwiki/trunk/src/wikipages/de/LoginHelp.txt
incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/wikipages/de/Main.txt
- copied unchanged from r687533, incubator/jspwiki/trunk/src/wikipages/de/Main.txt
incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/wikipages/de/MoreMenu.txt
- copied unchanged from r687533, incubator/jspwiki/trunk/src/wikipages/de/MoreMenu.txt
incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/wikipages/de/News.txt
- copied unchanged from r687533, incubator/jspwiki/trunk/src/wikipages/de/News.txt
incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/wikipages/de/OneMinuteWiki.txt
- copied unchanged from r687533, incubator/jspwiki/trunk/src/wikipages/de/OneMinuteWiki.txt
incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/wikipages/de/PageAlias.txt
- copied unchanged from r687533, incubator/jspwiki/trunk/src/wikipages/de/PageAlias.txt
incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/wikipages/de/PageIndex.txt
- copied unchanged from r687533, incubator/jspwiki/trunk/src/wikipages/de/PageIndex.txt
incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/wikipages/de/RecentChanges.txt
- copied unchanged from r687533, incubator/jspwiki/trunk/src/wikipages/de/RecentChanges.txt
incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/wikipages/de/RejectedMessage.txt
- copied unchanged from r687533, incubator/jspwiki/trunk/src/wikipages/de/RejectedMessage.txt
incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/wikipages/de/SandBox.txt
- copied unchanged from r687533, incubator/jspwiki/trunk/src/wikipages/de/SandBox.txt
incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/wikipages/de/SearchPageHelp.txt
- copied unchanged from r687533, incubator/jspwiki/trunk/src/wikipages/de/SearchPageHelp.txt
incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/wikipages/de/SystemInfo.txt
- copied unchanged from r687533, incubator/jspwiki/trunk/src/wikipages/de/SystemInfo.txt
incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/wikipages/de/TextFormattingRules.txt
- copied unchanged from r687533, incubator/jspwiki/trunk/src/wikipages/de/TextFormattingRules.txt
incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/wikipages/de/TitleBox.txt
- copied unchanged from r687533, incubator/jspwiki/trunk/src/wikipages/de/TitleBox.txt
incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/wikipages/de/UndefinedPages.txt
- copied unchanged from r687533, incubator/jspwiki/trunk/src/wikipages/de/UndefinedPages.txt
incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/wikipages/de/UnusedPages.txt
- copied unchanged from r687533, incubator/jspwiki/trunk/src/wikipages/de/UnusedPages.txt
incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/wikipages/de/WikiEtiquette.txt
- copied unchanged from r687533, incubator/jspwiki/trunk/src/wikipages/de/WikiEtiquette.txt
incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/wikipages/de/WikiGruppen.txt
- copied unchanged from r687533, incubator/jspwiki/trunk/src/wikipages/de/WikiGruppen.txt
incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/tests/lib/stripes-1.5.jar (props changed)
- copied unchanged from r687533, incubator/jspwiki/trunk/tests/lib/stripes-1.5.jar
Modified:
incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/.classpath
incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/ChangeLog
incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/build.xml
incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/doc/Compiling.txt
incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/Release.java
incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/WikiPage.java
incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/attachment/AttachmentManager.java
incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/content/PageRenamer.java
incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/parser/JSPWikiMarkupParser.java
incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/plugin/AbstractReferralPlugin.java
incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/plugin/BugReportHandler.java
incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/plugin/Counter.java
incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/plugin/CurrentTimePlugin.java
incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/plugin/Denounce.java
incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/plugin/Groups.java
incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/plugin/IfPlugin.java
incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/plugin/Image.java
incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/plugin/IndexPlugin.java
incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/plugin/InsertPage.java
incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/plugin/ListLocksPlugin.java
incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/plugin/Note.java
incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/plugin/PluginManager.java
incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/plugin/RPCSamplePlugin.java
incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/plugin/RecentChangesPlugin.java
incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/plugin/ReferredPagesPlugin.java
incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/plugin/Search.java
incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/plugin/SessionsPlugin.java
incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/plugin/TableOfContents.java
incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/plugin/UndefinedPagesPlugin.java
incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/plugin/UnusedPagesPlugin.java
incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/plugin/WeblogArchivePlugin.java
incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/plugin/WeblogEntryPlugin.java
incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/plugin/WeblogPlugin.java
incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/providers/CachingAttachmentProvider.java
incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/providers/CachingProvider.java
incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/wikipages/en/LeftMenuFooter.txt
incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/wikipages/en/RejectedMessage.txt
incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/wikipages/en/WikiEtiquette.txt
incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/tests/com/ecyrd/jspwiki/content/PageRenamerTest.java
incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/tests/com/ecyrd/jspwiki/parser/JSPWikiMarkupParserTest.java
Modified: incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/.classpath
URL: http://svn.apache.org/viewvc/incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/.classpath?rev=687534&r1=687533&r2=687534&view=diff
==============================================================================
--- incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/.classpath (original)
+++ incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/.classpath Wed Aug 20 18:42:15 2008
@@ -37,7 +37,7 @@
<classpathentry kind="lib" path="tests/lib/jasper-runtime-5.5.25.jar"/>
<classpathentry kind="lib" path="tests/lib/jetty-jmx-5.1.14.jar"/>
<classpathentry kind="lib" path="tests/lib/jetty-plus-5.1.14.jar"/>
- <classpathentry kind="lib" path="tests/lib/jetty-servlet-5.1.14.jar" sourcepath="/Users/arj/workspace/lib/jetty-5.1.14/src"/>
+ <classpathentry kind="lib" path="tests/lib/jetty-servlet-5.1.14.jar"/>
<classpathentry kind="lib" path="lib/stripes-1.5.jar" sourcepath="/stripes-1.5/stripes/src"/>
<classpathentry kind="lib" path="tests/lib/selenium-server-1.0-beta1.jar"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.launching.macosx.MacOSXType/JVM 1.5.0"/>
Modified: incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/ChangeLog
URL: http://svn.apache.org/viewvc/incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/ChangeLog?rev=687534&r1=687533&r2=687534&view=diff
==============================================================================
--- incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/ChangeLog (original)
+++ incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/ChangeLog Wed Aug 20 18:42:15 2008
@@ -1,3 +1,71 @@
+2008-08-20 Andrew Jaquith <ajaquith AT apache DOT org>
+
+ * 2.7.0-alpha-23
+
+ * Changed Stripes test jar to the released 1.5 version (congrats to Tim
+ and the team).
+
+2008-08-20 Janne Jalkanen <ja...@apache.org>
+
+ * 2.7.0-alpha-22
+
+ * JSPWIKI-27: Managed to duplicate this pesky bug from way old times.
+ Looks like this was caused by a misread of the OSCache javadocs -
+ but I am not sure if the fix causes new problems.
+
+ * JSPWIKI-353: Fixed wrong i18n key in PluginManager which showed
+ up if the plugin threw an exception.
+
+ * JSPWIKI-352: Fixed a long-standing bug with ACLs being leaked
+ from one page to another if the InsertPageTag was used.
+
+ * Added a KEYS file to the top-level dir. It would be a good idea
+ if all committers added their current GPG keys to it.
+
+2008-08-18 Harry Metske <ha...@gmail.com>
+
+ * 2.7.0-alpha-21
+
+ * [JSPWIKI-349] updated (German) corepages, credits to Florian again
+
+2008-08-17 Harry Metske <ha...@gmail.com>
+
+ * 2.7.0-alpha-20
+
+ * [JSPWIKI-340] updated (english) corepages and README, mostly editorial changes,
+ a brief summary :
+ - Java 5.0 is now a requirement for compiling (instead 1.4.2)
+ - Servlet API 2.2 is mentioned, is this still enough ? (I haven't checked)
+ - Removed dead link to tjworld.net/help/kb/0001_iis6-Tomcat5-JK2.html#conConnector
+ - Removed links to JSPWiki 2.2 , 2.3 and 2.4 documentation
+
+2008-08-16 Janne Jalkanen <ja...@apache.org>
+
+ * 2.7.0-alpha-19
+
+ * JSPWIKI-315: Fixed issues with upper/lowercase filtering in
+ AttachmentManager
+
+ * JSPWIKI-325: Patch from Harry to sort out plugin parameters and their
+ javadocs.
+
+ * JSPWIKI-307: Pages with & in their names were not being parsed properly
+ in links.
+
+2008-08-15 Harry Metske <ha...@gmail.com>
+
+ * 2.7.0-alpha-18
+
+ * [JSPWIKI-339] added German core pages, many thanks to Florian again !
+
+2008-08-14 Harry Metske <ha...@gmail.com>
+
+ * 2.7.0-alpha-17
+
+ * [JSPWIKI-238] PageRenamer now correctly handles links containing blanks
+ Added an additional JUnit test for this, there is stil one failing JUnit test however (attachment handling).
+ PageRenamer still needs improvement.
+
2008-08-14 Andrew Jaquith <ajaquith AT apache DOT org>
* 2.7.0-alpha-16
@@ -112,7 +180,7 @@
* JSPWIKI-320: removed all httpRequest.setCharacterEncoding() calls (except in WikiServletFilter)
because they were called too late, reported by Clay Atkins
-2008-07-31 Andrew Jaquith <ajaquith AT apache DOT org>
+2008-08-06 Andrew Jaquith <ajaquith AT apache DOT org>
* 2.7.0-alpha-8
Modified: incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/build.xml
URL: http://svn.apache.org/viewvc/incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/build.xml?rev=687534&r1=687533&r2=687534&view=diff
==============================================================================
--- incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/build.xml (original)
+++ incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/build.xml Wed Aug 20 18:42:15 2008
@@ -519,6 +519,10 @@
basedir="src/wikipages/fi" includesfile="src/wikipages/.corepages">
</zip>
+ <zip zipfile="${install.fulldir}/${ant.project.name}-corepages_de.zip"
+ basedir="src/wikipages/de">
+ </zip>
+
<!-- Add other languages here -->
</target>
Modified: incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/doc/Compiling.txt
URL: http://svn.apache.org/viewvc/incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/doc/Compiling.txt?rev=687534&r1=687533&r2=687534&view=diff
==============================================================================
--- incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/doc/Compiling.txt (original)
+++ incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/doc/Compiling.txt Wed Aug 20 18:42:15 2008
@@ -1,6 +1,5 @@
-Since you have the source, you'll probably want to know how to compile
-it.
+Since you have the source, you'll probably want to know how to compile it.
Some of JSPWiki is in the form of JSP pages, so you don't need to
compile them: the JSP container will take care of that. However,
@@ -11,10 +10,9 @@
You'll need the following programs:
-- J2SDK 1.4 (I use the one from Sun Microsystems; I haven't tested any
- others.)
+- J2SDK 5.0 (I use the one from Sun Microsystems; I haven't tested any others.)
- Jakarta Ant 1.5 (available from http://jakarta.apache.org/ant)
-- servlet API 2.2 (servlet.jar, available from Sun.)
+- Servlet API 2.4 (servlet.jar, available from Sun Microsystems.)
- JUnit 3.7 (from www.junit.org, required for running tests)
@@ -37,7 +35,7 @@
ant jar : builds the JSPWiki.jar into build/
You can customize your compilation by changing the contents of the
-build.properties -file, or better yet, make your own compilation
+build.properties file, or better yet, make your own compilation
script where you override the build.properties-property. For example,
to use your own build.properties-file called "my.properties", make a
small shell script and call it "my_build.sh":
@@ -68,5 +66,3 @@
however, that to keep the archive size down, I haven't included them
in the source distribution. You may need to copy them by hand from
somewhere, or the binary distribution.
-
-
Modified: incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/Release.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/Release.java?rev=687534&r1=687533&r2=687534&view=diff
==============================================================================
--- incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/Release.java (original)
+++ incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/Release.java Wed Aug 20 18:42:15 2008
@@ -77,7 +77,7 @@
* <p>
* If the build identifier is empty, it is not added.
*/
- public static final String BUILD = "16";
+ public static final String BUILD = "23";
/**
* This is the generic version string you should use
Modified: incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/WikiPage.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/WikiPage.java?rev=687534&r1=687533&r2=687534&view=diff
==============================================================================
--- incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/WikiPage.java (original)
+++ incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/WikiPage.java Wed Aug 20 18:42:15 2008
@@ -21,15 +21,19 @@
package com.ecyrd.jspwiki;
import java.util.Date;
+import java.util.Enumeration;
import java.util.HashMap;
import java.util.Map;
import com.ecyrd.jspwiki.auth.acl.Acl;
+import com.ecyrd.jspwiki.auth.acl.AclEntry;
+import com.ecyrd.jspwiki.auth.acl.AclImpl;
import com.ecyrd.jspwiki.providers.WikiPageProvider;
/**
* 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
@@ -324,28 +328,35 @@
*/
public Object clone()
{
- try
- {
- WikiPage p = (WikiPage)super.clone();
+ WikiPage p = new WikiPage( m_engine, m_name );
- p.m_engine = m_engine;
- p.m_name = m_name;
- p.m_wiki = m_wiki;
+ p.m_wiki = m_wiki;
+
+ p.m_author = m_author;
+ p.m_version = m_version;
+ p.m_lastModified = m_lastModified != null ? (Date)m_lastModified.clone() : null;
+
+ p.m_fileSize = m_fileSize;
+
+ for( Map.Entry<String,Object> entry : m_attributes.entrySet() )
+ {
+ p.m_attributes.put( entry.getKey(),
+ entry.getValue() );
+ }
+
+ if( m_accessList != null )
+ {
+ p.m_accessList = new AclImpl();
- p.m_author = m_author;
- p.m_version = m_version;
- p.m_lastModified = m_lastModified != null ? (Date)m_lastModified.clone() : null;
-
- p.m_fileSize = m_fileSize;
-
- p.m_attributes.putAll(m_attributes);
+ for( Enumeration entries = m_accessList.entries(); entries.hasMoreElements(); )
+ {
+ AclEntry e = (AclEntry)entries.nextElement();
- return p;
+ p.m_accessList.addEntry( e );
+ }
}
- catch( CloneNotSupportedException e )
- {}
-
- return null;
+
+ return p;
}
/**
Modified: incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/attachment/AttachmentManager.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/attachment/AttachmentManager.java?rev=687534&r1=687533&r2=687534&view=diff
==============================================================================
--- incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/attachment/AttachmentManager.java (original)
+++ incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/attachment/AttachmentManager.java Wed Aug 20 18:42:15 2008
@@ -613,12 +613,13 @@
//
filename = filename.trim();
- // If file name ends with .jsp, the user is being naughty!
- if ( filename.endsWith( ".jsp" ) || filename.endsWith( ".JSP" ) )
+ // If file name ends with .jsp or .jspf, the user is being naughty!
+ if( filename.toLowerCase().endsWith( ".jsp" ) || filename.toLowerCase().endsWith(".jspf") )
{
- AttachmentServlet.log.error( "Illegal file name." );
+ log.info( "Attempt to upload a file with a .jsp/.jspf extension. In certain cases this" +
+ " can trigger unwanted security side effects, so we're preventing it." );
- throw new WikiException( "Illegal file name." );
+ throw new WikiException( "Unwanted file name." );
}
//
Modified: incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/content/PageRenamer.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/content/PageRenamer.java?rev=687534&r1=687533&r2=687534&view=diff
==============================================================================
--- incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/content/PageRenamer.java (original)
+++ incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/content/PageRenamer.java Wed Aug 20 18:42:15 2008
@@ -362,6 +362,13 @@
// System.out.println(" "+p+" :: "+p2);
//
+ // if the original contains blanks, then we should introduce a link, for example: [My Page] => [My Page|My Renamed Page]
+ int blank = reallink.indexOf( " ");
+ if (blank!=-1) {
+ return reallink + "|" + newlink;
+ }
+
+ //
// Yes, these point to the same page.
//
if( reallink.equals(from) )
Modified: incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/parser/JSPWikiMarkupParser.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/parser/JSPWikiMarkupParser.java?rev=687534&r1=687533&r2=687534&view=diff
==============================================================================
--- incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/parser/JSPWikiMarkupParser.java (original)
+++ incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/parser/JSPWikiMarkupParser.java Wed Aug 20 18:42:15 2008
@@ -919,19 +919,47 @@
}
else if( ch == '&' )
{
- for( int j = (i < buf.length()-1 ) ? i+1 : i; j < buf.length(); j++ )
+ //
+ // If the following is an XML entity reference (&#.*;) we'll
+ // leave it as it is; otherwise we'll replace it with an &
+ //
+
+ boolean isEntity = false;
+ StringBuilder entityBuf = new StringBuilder();
+
+ if( i < buf.length() -1 )
{
- int ch2 = buf.charAt(j);
- if( ch2 == ';' )
+ for( int j = i; j < buf.length(); j++ )
{
- tmpBuf.append(ch);
- break;
- }
- if( ch2 != '#' && !Character.isLetterOrDigit( (char)ch2) )
- {
- tmpBuf.append("&"); break;
+ char ch2 = buf.charAt(j);
+
+ if( Character.isLetterOrDigit( ch2 ) || (ch2 == '#' && j == i+1) || ch2 == ';' || ch2 == '&' )
+ {
+ entityBuf.append(ch2);
+
+ if( ch2 == ';' )
+ {
+ isEntity = true;
+ break;
+ }
+ }
+ else
+ {
+ break;
+ }
}
}
+
+ if( isEntity )
+ {
+ tmpBuf.append( entityBuf );
+ i = i + entityBuf.length() - 1;
+ }
+ else
+ {
+ tmpBuf.append("&");
+ }
+
}
else
{
@@ -1331,7 +1359,7 @@
if( !m_parseAccessRules ) return m_currentElement;
Acl acl;
- WikiPage page = m_context.getPage();
+ WikiPage page = m_context.getRealPage();
// UserDatabase db = m_context.getEngine().getUserDatabase();
if( ruleLine.startsWith( "{" ) )
Modified: incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/plugin/AbstractReferralPlugin.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/plugin/AbstractReferralPlugin.java?rev=687534&r1=687533&r2=687534&view=diff
==============================================================================
--- incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/plugin/AbstractReferralPlugin.java (original)
+++ incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/plugin/AbstractReferralPlugin.java Wed Aug 20 18:42:15 2008
@@ -39,15 +39,17 @@
/**
* This is a base class for all plugins using referral things.
*
- * <p>Parameters also valid for all subclasses.</p>
+ * <p>Parameters (also valid for all subclasses of this class) : </p>
* <ul>
- * <li><b>maxwidth</b>: maximum width of generated links</li>
- * <li><b>separator</b>: separator between generated links (wikitext)</li>
- * <li><b>after</b>: output after the link</li>
- * <li><b>before</b>: output before the link</li>
- * <li><b>show</b>: Either "pages" (default) or "count". When "count", shows only the count
- * of pages which match. (Since 2.8)</li>
- * <li><b>showLastModified</b>: When show=count, shows also the last modified date. (Since 2.8)</li>
+ * <li><b>maxwidth</b> - maximum width of generated links</li>
+ * <li><b>separator</b> - separator between generated links (wikitext)</li>
+ * <li><b>after</b> - output after the link</li>
+ * <li><b>before</b> - output before the link</li>
+ * <li><b>exclude</b> - a regular expression of pages to exclude from the list. </li>
+ * <li><b>include</b> - a regular expression of pages to include in the list. </li>
+ * <li><b>show</b> - value is either "pages" (default) or "count". When "count" is specified, shows only the count
+ * of pages which match. (since 2.8)</li>
+ * <li><b>showLastModified</b> - When show=count, shows also the last modified date. (since 2.8)</li>
* </ul>
*
*/
Modified: incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/plugin/BugReportHandler.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/plugin/BugReportHandler.java?rev=687534&r1=687533&r2=687534&view=diff
==============================================================================
--- incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/plugin/BugReportHandler.java (original)
+++ incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/plugin/BugReportHandler.java Wed Aug 20 18:42:15 2008
@@ -39,9 +39,13 @@
/**
* Provides a handler for bug reports. Still under construction.
*
+ * <p>Parameters : </p>
* <ul>
- * <li>"title" = title of the bug. This is required. If it is empty (as in "")
- * it is a signal to the handler to return quietly.</li>
+ * <li><b>title</b> - title of the bug, this is required. If it is empty (as in "") it is a signal to the handler to return quietly.</li>
+ * <li><b>description</b> - description of the bug.</li>
+ * <li><b>version</b> - version</li>
+ * <li><b>map</b> - I have no idea </li>
+ * <li><b>page</b> - The name of the page to be created for this bug report </li>
* </ul>
*
*/
@@ -50,11 +54,16 @@
{
private static Logger log = Logger.getLogger( BugReportHandler.class );
- public static final String TITLE = "title";
- public static final String DESCRIPTION = "description";
- public static final String VERSION = "version";
- public static final String MAPPINGS = "map";
- public static final String PAGE = "page";
+ /** Parameter name for setting the title. Value is <tt>{@value}</tt>. */
+ public static final String PARAM_TITLE = "title";
+ /** Parameter name for setting the description. Value is <tt>{@value}</tt>. */
+ public static final String PARAM_DESCRIPTION = "description";
+ /** Parameter name for setting the version. Value is <tt>{@value}</tt>. */
+ public static final String PARAM_VERSION = "version";
+ /** Parameter name for setting the map. Value is <tt>{@value}</tt>. */
+ public static final String PARAM_MAPPINGS = "map";
+ /** Parameter name for setting the page. Value is <tt>{@value}</tt>. */
+ public static final String PARAM_PAGE = "page";
private static final String DEFAULT_DATEFORMAT = "dd-MMM-yyyy HH:mm:ss zzz";
@@ -71,9 +80,9 @@
SimpleDateFormat format = new SimpleDateFormat( DEFAULT_DATEFORMAT );
ResourceBundle rb = context.getBundle(WikiPlugin.CORE_PLUGINS_RESOURCEBUNDLE);
- title = (String) params.get( TITLE );
- description = (String) params.get( DESCRIPTION );
- version = (String) params.get( VERSION );
+ title = (String) params.get( PARAM_TITLE );
+ description = (String) params.get( PARAM_DESCRIPTION );
+ version = (String) params.get( PARAM_VERSION );
Principal wup = context.getCurrentUser();
@@ -88,7 +97,7 @@
if( description == null ) description = "";
if( version == null ) version = "unknown";
- Properties mappings = parseMappings( (String) params.get( MAPPINGS ) );
+ Properties mappings = parseMappings( (String) params.get( PARAM_MAPPINGS ) );
//
// Start things
@@ -104,9 +113,9 @@
//
// Outputting of basic data
//
- out.println("|"+mappings.getProperty(TITLE,"Title")+"|"+title);
+ out.println("|"+mappings.getProperty(PARAM_TITLE,"Title")+"|"+title);
out.println("|"+mappings.getProperty("date","Date")+"|"+format.format(d));
- out.println("|"+mappings.getProperty(VERSION,"Version")+"|"+version);
+ out.println("|"+mappings.getProperty(PARAM_VERSION,"Version")+"|"+version);
if( submitter != null )
{
out.println("|"+mappings.getProperty("submitter","Submitter")+
@@ -120,11 +129,11 @@
{
Map.Entry entry = (Map.Entry) i.next();
- if( entry.getKey().equals( TITLE ) ||
- entry.getKey().equals( DESCRIPTION ) ||
- entry.getKey().equals( VERSION ) ||
- entry.getKey().equals( MAPPINGS ) ||
- entry.getKey().equals( PAGE ) ||
+ if( entry.getKey().equals( PARAM_TITLE ) ||
+ entry.getKey().equals( PARAM_DESCRIPTION ) ||
+ entry.getKey().equals( PARAM_VERSION ) ||
+ entry.getKey().equals( PARAM_MAPPINGS ) ||
+ entry.getKey().equals( PARAM_PAGE ) ||
entry.getKey().toString().startsWith("_") )
{
// Ignore this
@@ -154,7 +163,7 @@
// Now create a new page for this bug report
//
String pageName = findNextPage( context, title,
- (String)params.get( PAGE ) );
+ (String)params.get( PARAM_PAGE ) );
WikiPage newPage = new WikiPage( context.getEngine(), pageName );
WikiContext newContext = (WikiContext)context.clone();
Modified: incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/plugin/Counter.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/plugin/Counter.java?rev=687534&r1=687533&r2=687534&view=diff
==============================================================================
--- incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/plugin/Counter.java (original)
+++ incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/plugin/Counter.java Wed Aug 20 18:42:15 2008
@@ -24,17 +24,16 @@
import java.util.*;
/**
- * Provides a page-specific counter.
- * <P>Parameters
- * <UL>
- * <LI>name - Name of the counter. Optional.
- * <LI>increment - The amount to increment, may be a negative value, default is 1. Optional.
- * <LI>showResult - Should the counter value be visible on the page, default is true. Optional.
- * </UL>
+ * Provides a page-specific counter, it is reset every time a page is rendered, so it is not usable as a hitcounter.
+ * <br>Stores a variable in the WikiContext called "counter", with the name of the optionally specified variable "name".
+ * <br>For example: If name is "thispage", then the variable name is called "counter-thispage".
*
- * Stores a variable in the WikiContext called "counter", with the name of the
- * optionally attached. For example:<BR>
- * If name is "thispage", then the variable name is called "counter-thispage".
+ * <p>Parameters : </p>
+ * <ul>
+ * <li><b>name</b> - Name of the counter. Optional.</li>
+ * <li><b>increment</b> - The amount to increment, may be a negative value, default is 1. Optional.</li>
+ * <li><b>showResult</b> - Should the counter value be visible on the page, default is true. Optional.</li>
+ * </ul>
*
* @since 1.9.30
*/
@@ -43,9 +42,13 @@
{
// private static Logger log = Logger.getLogger( Counter.class );
+ /** Parameter name for setting the name. Value is <tt>{@value}</tt>. */
public static final String PARAM_NAME = "name";
+ /** Parameter name for setting the increment. Value is <tt>{@value}</tt>. */
public static final String PARAM_INCREMENT = "increment";
+ /** Parameter name for setting the showResult. Value is <tt>{@value}</tt>. */
public static final String PARAM_SHOW_RESULT = "showResult";
+ /** Parameter name for setting the start. Value is <tt>{@value}</tt>. */
public static final String PARAM_START = "start";
public static final String DEFAULT_NAME = "counter";
private static final int DEFAULT_INCREMENT = 1;
Modified: incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/plugin/CurrentTimePlugin.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/plugin/CurrentTimePlugin.java?rev=687534&r1=687533&r2=687534&view=diff
==============================================================================
--- incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/plugin/CurrentTimePlugin.java (original)
+++ incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/plugin/CurrentTimePlugin.java Wed Aug 20 18:42:15 2008
@@ -32,7 +32,9 @@
/**
* Just displays the current date and time.
* The time format is exactly like in the java.text.SimpleDateFormat class.
- *
+ *
+ * <p>Parameters : </p>
+ * NONE
* @since 1.7.8
* @see java.text.SimpleDateFormat
*/
Modified: incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/plugin/Denounce.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/plugin/Denounce.java?rev=687534&r1=687533&r2=687534&view=diff
==============================================================================
--- incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/plugin/Denounce.java (original)
+++ incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/plugin/Denounce.java Wed Aug 20 18:42:15 2008
@@ -34,8 +34,14 @@
import javax.servlet.http.HttpServletRequest;
/**
- * Denounces a link by removing it from any search engine. The bots are listed
- * in com/ecyrd/jspwiki/plugin/denounce.properties.
+ * Denounces a link by removing it from any search engine.
+ * <br> The bots are listed in com/ecyrd/jspwiki/plugin/denounce.properties.
+ *
+ * <p>Parameters : </p>
+ * <ul>
+ * <li><b>link</b> - The link to be denounced, this parameter is required</li>
+ * <li><b>text</b> - The text to use, defaults to the link</li>
+ * </ul>
*
* @since 2.1.40.
*/
@@ -43,7 +49,9 @@
{
private static Logger log = Logger.getLogger(Denounce.class);
+ /** Parameter name for setting the link. Value is <tt>{@value}</tt>. */
public static final String PARAM_LINK = "link";
+ /** Parameter name for setting the text. Value is <tt>{@value}</tt>. */
public static final String PARAM_TEXT = "text";
private static final String PROPERTYFILE = "com/ecyrd/jspwiki/plugin/denounce.properties";
Modified: incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/plugin/Groups.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/plugin/Groups.java?rev=687534&r1=687533&r2=687534&view=diff
==============================================================================
--- incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/plugin/Groups.java (original)
+++ incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/plugin/Groups.java Wed Aug 20 18:42:15 2008
@@ -32,8 +32,12 @@
/**
* <p>Prints the groups managed by this wiki, separated by commas.
- * The groups are sorted in ascending order, and are hyperlinked
- * to the page that displays the group's members.</p>
+ * <br>The groups are sorted in ascending order, and are hyperlinked to the page that displays the group's members.
+ * </p>
+ * <p>Parameters : </p>
+ * NONE
+ *
+ *
* @since 2.4.19
* @author Andrew Jaquith
*/
Modified: incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/plugin/IfPlugin.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/plugin/IfPlugin.java?rev=687534&r1=687533&r2=687534&view=diff
==============================================================================
--- incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/plugin/IfPlugin.java (original)
+++ incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/plugin/IfPlugin.java Wed Aug 20 18:42:15 2008
@@ -36,14 +36,14 @@
* You can also use shorthand "If" to run it.
* Parameters:
* <ul>
- * <li>group - A "|" -separated list of group names.
- * <li>user - A "|" -separated list of user names.
- * <li>ip - A "|" -separated list of ip addresses.
- * <li>var - A wiki variable
- * <li>page - A page name
- * <li>contains - A Perl5 regexp pattern
- * <li>is - A Perl5 regexp pattern
- * <li>exists - "true" or "false".
+ * <li><b>group</b> - A "|" -separated list of group names.
+ * <li><b>user</b> - A "|" -separated list of user names.
+ * <li><b>ip</b> - A "|" -separated list of ip addresses.
+ * <li><b>var</b> - A wiki variable
+ * <li><b>page</b> - A page name
+ * <li><b>contains</b> - A Perl5 regexp pattern
+ * <li><b>is</b> - A Perl5 regexp pattern
+ * <li><b>exists</b> - "true" or "false".
* </ul>
*
* <p>If any of them match, the body of the plugin is executed. You can
Modified: incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/plugin/Image.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/plugin/Image.java?rev=687534&r1=687533&r2=687534&view=diff
==============================================================================
--- incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/plugin/Image.java (original)
+++ incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/plugin/Image.java Wed Aug 20 18:42:15 2008
@@ -27,9 +27,24 @@
import com.ecyrd.jspwiki.providers.ProviderException;
/**
- * Provides an image plugin for better control than is possible with
- * a simple image inclusion.
+ * Provides an image plugin for better control than is possible with a simple image inclusion.
+ * <br> Most parameters are equivalents of the html image attributes.
*
+ * <p>Parameters : </p>
+ * <ul>
+ * <li><b>src</b> - the source (a URL) of the image (required parameter)</li>
+ * <li><b>align</b> - the alignment of the image</li>
+ * <li><b>height</b> - the height of the image</li>
+ * <li><b>width</b> - the width of the image</li>
+ * <li><b>alt</b> - alternate text</li>
+ * <li><b>caption</b> - the caption for the image</li>
+ * <li><b>link</b> - the hyperlink for the image</li>
+ * <li><b>target</b> - the target (frame) to be used for opening the image</li>
+ * <li><b>style</b> - the style attribute of the image</li>
+ * <li><b>class</b> - the associated class for the image</li>
+ * <li><b>border</b> - the border for the image</li>
+ * </ul>
+ *
* @since 2.1.4.
*/
// FIXME: It is not yet possible to do wiki internal links. In order to
@@ -38,17 +53,28 @@
public class Image
implements WikiPlugin
{
+ /** The parameter name for setting the src. Value is <tt>{@value}</tt>. */
public static final String PARAM_SRC = "src";
+ /** The parameter name for setting the align. Value is <tt>{@value}</tt>. */
public static final String PARAM_ALIGN = "align";
+ /** The parameter name for setting the height. Value is <tt>{@value}</tt>. */
public static final String PARAM_HEIGHT = "height";
+ /** The parameter name for setting the width. Value is <tt>{@value}</tt>. */
public static final String PARAM_WIDTH = "width";
+ /** The parameter name for setting the alt. Value is <tt>{@value}</tt>. */
public static final String PARAM_ALT = "alt";
+ /** The parameter name for setting the caption. Value is <tt>{@value}</tt>. */
public static final String PARAM_CAPTION = "caption";
+ /** The parameter name for setting the link. Value is <tt>{@value}</tt>. */
public static final String PARAM_LINK = "link";
+ /** The parameter name for setting the target. Value is <tt>{@value}</tt>. */
public static final String PARAM_TARGET = "target";
+ /** The parameter name for setting the style. Value is <tt>{@value}</tt>. */
public static final String PARAM_STYLE = "style";
+ /** The parameter name for setting the class. Value is <tt>{@value}</tt>. */
public static final String PARAM_CLASS = "class";
// public static final String PARAM_MAP = "map";
+ /** The parameter name for setting the border. Value is <tt>{@value}</tt>. */
public static final String PARAM_BORDER = "border";
/**
Modified: incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/plugin/IndexPlugin.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/plugin/IndexPlugin.java?rev=687534&r1=687533&r2=687534&view=diff
==============================================================================
--- incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/plugin/IndexPlugin.java (original)
+++ incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/plugin/IndexPlugin.java Wed Aug 20 18:42:15 2008
@@ -32,22 +32,18 @@
import com.ecyrd.jspwiki.providers.ProviderException;
/**
- * A plugin which creates an index of pages according to a certain
- * pattern.
+ * A plugin that creates an index of pages according to a certain pattern.
+ * <br>The default is to include all pages.
* <p>
* This is a complete rewrite of the old IndexPlugin under an Apache license.
- * <p>
- * Usage:
+ * <p>Parameters (From AbstractReferralPlugin) : </p>
* <ul>
* <li><b>include</b> - A regexp pattern for marking which pages should be included.</li>
* <li><b>exclude</b> - A regexp pattern for marking which pages should be excluded.</li>
* </ul>
- * The default is to include all pages.
*/
-public class IndexPlugin implements WikiPlugin
+public class IndexPlugin extends AbstractReferralPlugin implements WikiPlugin
{
- public static final String PARAM_INCLUDE = "include";
- public static final String PARAM_EXCLUDE = "exclude";
private static Logger log = Logger.getLogger( IndexPlugin.class );
/**
Modified: incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/plugin/InsertPage.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/plugin/InsertPage.java?rev=687534&r1=687533&r2=687534&view=diff
==============================================================================
--- incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/plugin/InsertPage.java (original)
+++ incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/plugin/InsertPage.java Wed Aug 20 18:42:15 2008
@@ -29,17 +29,33 @@
/**
* Inserts page contents. Muchos thanks to Scott Hurlbert for the initial code.
*
+ * <p>Parameters : </p>
+ * <ul>
+ * <li><b>page</b> - the name of the page to be inserted</li>
+ * <li><b>style</b> - the style to use</li>
+ * <li><b>maxlength</b> - the maximum length of the page to be inserted (page contents)</li>
+ * <li><b>class</b> - the class to use</li>
+ * <li><b>section</b> - the section of the page that has to be inserted (separated by "----"</li>
+ * <li><b>default</b> - the text to insert if the requested page does not exist</li>
+ * </ul>
+ *
* @since 2.1.37
* @author Scott Hurlbert
*/
public class InsertPage
implements WikiPlugin
{
+ /** Parameter name for setting the page. Value is <tt>{@value}</tt>. */
public static final String PARAM_PAGENAME = "page";
+ /** Parameter name for setting the style. Value is <tt>{@value}</tt>. */
public static final String PARAM_STYLE = "style";
+ /** Parameter name for setting the maxlength. Value is <tt>{@value}</tt>. */
public static final String PARAM_MAXLENGTH = "maxlength";
+ /** Parameter name for setting the class. Value is <tt>{@value}</tt>. */
public static final String PARAM_CLASS = "class";
+ /** Parameter name for setting the section. Value is <tt>{@value}</tt>. */
public static final String PARAM_SECTION = "section";
+ /** Parameter name for setting the default. Value is <tt>{@value}</tt>. */
public static final String PARAM_DEFAULT = "default";
private static final String DEFAULT_STYLE = "";
Modified: incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/plugin/ListLocksPlugin.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/plugin/ListLocksPlugin.java?rev=687534&r1=687533&r2=687534&view=diff
==============================================================================
--- incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/plugin/ListLocksPlugin.java (original)
+++ incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/plugin/ListLocksPlugin.java Wed Aug 20 18:42:15 2008
@@ -27,6 +27,8 @@
* This is a plugin for the administrator: It allows him to see in a single
* glance who is editing what.
*
+ * <p>Parameters : </p>
+ * NONE
* @since 2.0.22.
*/
public class ListLocksPlugin
Modified: incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/plugin/Note.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/plugin/Note.java?rev=687534&r1=687533&r2=687534&view=diff
==============================================================================
--- incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/plugin/Note.java (original)
+++ incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/plugin/Note.java Wed Aug 20 18:42:15 2008
@@ -39,6 +39,11 @@
* his concept.
* <p>
*
+ * <p>Parameters : </p>
+ * <ul>
+ * <li><b>_cmdline</b> - the commentText</li>
+ * </ul>
+ *
* @author John Volkar
* @author Scott Hulbert
*/
Modified: incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/plugin/PluginManager.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/plugin/PluginManager.java?rev=687534&r1=687533&r2=687534&view=diff
==============================================================================
--- incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/plugin/PluginManager.java (original)
+++ incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/plugin/PluginManager.java Wed Aug 20 18:42:15 2008
@@ -74,7 +74,7 @@
* The class name can be shortened, and marked without the package.
* For example, "FunnyPlugin" would be expanded to
* "com.ecyrd.jspwiki.plugin.FunnyPlugin" automatically. It is also
- * possible to defined other packages, by setting the
+ * possible to define other packages, by setting the
* "jspwiki.plugin.searchPath" property. See the included
* jspwiki.properties file for examples.
* <P>
@@ -406,7 +406,7 @@
return stackTrace( params, t );
}
- throw new PluginException( rb.getString( "plugin.error.pluginfailed" ), t );
+ throw new PluginException( rb.getString( "plugin.error.failed" ), t );
}
}
Modified: incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/plugin/RPCSamplePlugin.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/plugin/RPCSamplePlugin.java?rev=687534&r1=687533&r2=687534&view=diff
==============================================================================
--- incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/plugin/RPCSamplePlugin.java (original)
+++ incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/plugin/RPCSamplePlugin.java Wed Aug 20 18:42:15 2008
@@ -29,6 +29,9 @@
/**
* Simple plugin which shows how to add JSON calls to your plugin.
*
+ * <p>Parameters : </p>
+ * NONE
+ *
* @since 2.5.4
*/
public class RPCSamplePlugin implements WikiPlugin, RPCCallable
@@ -39,6 +42,9 @@
* @param echo The parameter
* @return the string <code>JSON says:</code>, plus the value
* supplied by the <code>echo</code> parameter
+ *
+ * <p>Parameters : </p>
+ * NONE
*/
public String myFunction(String echo)
{
Modified: incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/plugin/RecentChangesPlugin.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/plugin/RecentChangesPlugin.java?rev=687534&r1=687533&r2=687534&view=diff
==============================================================================
--- incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/plugin/RecentChangesPlugin.java (original)
+++ incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/plugin/RecentChangesPlugin.java Wed Aug 20 18:42:15 2008
@@ -37,21 +37,31 @@
import com.ecyrd.jspwiki.preferences.Preferences.TimeFormat;
/**
- * Returns the Recent Changes.
- *
- * Parameters: since=number of days,
- * format=(compact|full)
+ * Returns the Recent Changes in the wiki being a date-sorted list of page names.
*
+ * <p>Parameters : </p>
+ * <ul>
+ * <li><b>since</b> - show changes from the last n days, for example since=5 shows only the pages that were changed in the last five days</li>
+ * <li><b>format</b> - (full|compact) : if "full", then display a long version with all possible info. If "compact", then be as compact as possible.</li>
+ * <li><b>timeFormat</b> - the time format to use, the default is "HH:mm:ss"</li>
+ * <li><b>dateFormat</b> - the date format to use, the default is "dd.MM.yyyy"</li>
+ * </ul>
+ *
*/
public class RecentChangesPlugin
implements WikiPlugin
{
+ /** Parameter name for the separator format. Value is <tt>{@value}</tt>. */
public static final String PARAM_FORMAT = "format";
+ /** Parameter name for the separator timeFormat. Value is <tt>{@value}</tt>. */
public static final String PARAM_TIME_FORMAT = "timeFormat";
+ /** Parameter name for the separator dateFormat. Value is <tt>{@value}</tt>. */
public static final String PARAM_DATE_FORMAT = "dateFormat";
/** How many days we show by default. */
private static final int DEFAULT_DAYS = 100*365;
+ public static final String DEFAULT_TIME_FORMAT ="HH:mm:ss";
+ public static final String DEFAULT_DATE_FORMAT ="dd.MM.yyyy";
private static Logger log = Logger.getLogger( RecentChangesPlugin.class );
@@ -231,7 +241,7 @@
// something like: dateFormat='' timeformat='' which is a odd, but probably okay.
private DateFormat getTimeFormat( WikiContext context, Map params )
{
- String formatString = get(params, "HH:mm:ss", PARAM_TIME_FORMAT);
+ String formatString = get(params, DEFAULT_TIME_FORMAT, PARAM_TIME_FORMAT);
if ("".equals(formatString.trim()))
return Preferences.getDateFormat( context, TimeFormat.TIME );
@@ -243,7 +253,7 @@
private DateFormat getDateFormat( WikiContext context, Map params )
{
- String formatString = get(params, "dd.MM.yyyy", PARAM_DATE_FORMAT);
+ String formatString = get(params, DEFAULT_DATE_FORMAT, PARAM_DATE_FORMAT);
if ("".equals(formatString.trim()))
return Preferences.getDateFormat( context, TimeFormat.DATE );
Modified: incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/plugin/ReferredPagesPlugin.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/plugin/ReferredPagesPlugin.java?rev=687534&r1=687533&r2=687534&view=diff
==============================================================================
--- incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/plugin/ReferredPagesPlugin.java (original)
+++ incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/plugin/ReferredPagesPlugin.java Wed Aug 20 18:42:15 2008
@@ -31,16 +31,15 @@
/**
* Displays the pages referring to the current page.
*
- * <P>Parameters</P>
- * <UL>
- * <LI>name: Name of the root page. Default name of calling page
- * <LI>type: local|externalattachment
- * <LI>depth: How many levels of pages to be parsed.
- * <LI>include: Include only these pages. (eg. include='UC.*|BP.*' )
- * <LI>exclude: Exclude with this pattern. (eg. exclude='LeftMenu' )
- * <LI>format: full|compact
- * <br>FULL now expands all levels correctly
- * </UL>
+ * <p>Parameters</p>
+ * <ul>
+ * <li><b>name</b> - Name of the root page. Default name of calling page
+ * <li><b>type</b> - local|externalattachment
+ * <li><b>depth</b> - How many levels of pages to be parsed.
+ * <li><b>include</b> - Include only these pages. (eg. include='UC.*|BP.*' )
+ * <li><b>exclude</b> - Exclude with this pattern. (eg. exclude='LeftMenu' )
+ * <li><b>format</b> - full|compact, FULL now expands all levels correctly
+ * </ul>
*
* @author Dirk Frederickx
*/
Modified: incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/plugin/Search.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/plugin/Search.java?rev=687534&r1=687533&r2=687534&view=diff
==============================================================================
--- incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/plugin/Search.java (original)
+++ incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/plugin/Search.java Wed Aug 20 18:42:15 2008
@@ -34,7 +34,15 @@
import com.ecyrd.jspwiki.providers.ProviderException;
/**
- *
+ * The "Search" plugin allows you to access the JSPWiki search routines and show the displays in an array on your page.
+ *
+ * <p>Parameters : </p>
+ * <ul>
+ * <li><b>query</b> - String. A standard JSPWiki search query.</li>
+ * <li><b>set</b> - String. The JSPWiki context variable that will hold the results of the query. This allows you to pass your queries to other plugins on the same page as well. </li>
+ * <li><b>max</b> - Integer. How many search results are shown at maximum.</li>
+ * </ul>
+ *
* @since
*/
public class Search implements WikiPlugin
Modified: incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/plugin/SessionsPlugin.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/plugin/SessionsPlugin.java?rev=687534&r1=687533&r2=687534&view=diff
==============================================================================
--- incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/plugin/SessionsPlugin.java (original)
+++ incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/plugin/SessionsPlugin.java Wed Aug 20 18:42:15 2008
@@ -33,14 +33,17 @@
* <p>Displays information about active wiki sessions. The parameter
* <code>property</code> specifies what information is displayed.
* If omitted, the number of sessions is returned.
- * Valid values for the <code>property</code> parameter
- * include:</p>
+ *
+ * <p>Parameters : </p>
+ * <ul>
+ * <li><b>property</b> - specify what output to display, valid values are:</li>
* <ul>
* <li><code>users</code> - returns a comma-separated list of
* users</li>
* <li><code>distinctUsers</code> - will only show
* distinct users.
* </ul>
+ * </ul>
* @since 2.3.84
* @author Andrew Jaquith
*/
Modified: incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/plugin/TableOfContents.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/plugin/TableOfContents.java?rev=687534&r1=687533&r2=687534&view=diff
==============================================================================
--- incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/plugin/TableOfContents.java (original)
+++ incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/plugin/TableOfContents.java Wed Aug 20 18:42:15 2008
@@ -31,7 +31,8 @@
import java.io.IOException;
/**
- * Provides a table of contents. Possible parameters are:
+ * Provides a table of contents.
+ * <p>Parameters : </p>
* <ul>
* <li><b>title</b> - The title of the table of contents.</li>
* <li><b>numbered</b> - if true, generates automatically numbers for the headings.</li>
Modified: incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/plugin/UndefinedPagesPlugin.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/plugin/UndefinedPagesPlugin.java?rev=687534&r1=687533&r2=687534&view=diff
==============================================================================
--- incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/plugin/UndefinedPagesPlugin.java (original)
+++ incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/plugin/UndefinedPagesPlugin.java Wed Aug 20 18:42:15 2008
@@ -26,11 +26,12 @@
/**
* Plugin that enumerates the pages in the wiki that have not yet been defined.
- * Parameters: none.<BR>
- * From AbstractReferralPlugin:<BR>
- * separator: How to separate generated links; default is a wikitext line break,
- * producing a vertical list.<BR>
- * maxwidth: maximum width, in chars, of generated links.
+ *
+ * Parameters (from AbstractReferralPlugin):
+ * <ul>
+ * <li><b>separator</b> - how to separate generated links; default is a wikitext line break, producing a vertical list</li>
+ * <li><b> maxwidth</b> - maximum width, in chars, of generated links.</li>
+ * </ul>
*
*/
public class UndefinedPagesPlugin
Modified: incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/plugin/UnusedPagesPlugin.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/plugin/UnusedPagesPlugin.java?rev=687534&r1=687533&r2=687534&view=diff
==============================================================================
--- incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/plugin/UnusedPagesPlugin.java (original)
+++ incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/plugin/UnusedPagesPlugin.java Wed Aug 20 18:42:15 2008
@@ -27,11 +27,11 @@
* Plugin for displaying pages that are not linked to in other pages.
* Uses the ReferenceManager.
* <p>
- * Parameters: none. <BR>
- * From AbstractReferralPlugin:<BR>
- * separator: How to separate generated links; default is a wikitext line break,
- * producing a vertical list.<BR>
- * maxwidth: maximum width, in chars, of generated links.
+ * Parameters (from AbstractReferralPlugin):
+ * <ul>
+ * <li><b>separator</b> - how to separate generated links; default is a wikitext line break, producing a vertical list</li>
+ * <li><b> maxwidth</b> - maximum width, in chars, of generated links.</li>
+ * </ul>
*
*/
public class UnusedPagesPlugin
Modified: incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/plugin/WeblogArchivePlugin.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/plugin/WeblogArchivePlugin.java?rev=687534&r1=687533&r2=687534&view=diff
==============================================================================
--- incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/plugin/WeblogArchivePlugin.java (original)
+++ incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/plugin/WeblogArchivePlugin.java Wed Aug 20 18:42:15 2008
@@ -30,12 +30,18 @@
/**
* Creates a list of all weblog entries on a monthly basis.
*
+ * <p>Parameters : </p>
+ * <ul>
+ * <li><b>page</b> - the page name</li>
+ * </ul>
+ *
* @since 1.9.21
*/
public class WeblogArchivePlugin implements WikiPlugin
{
private static Logger log = Logger.getLogger(WeblogArchivePlugin.class);
+ /** Parameter name for setting the page. Value is <tt>{@value}</tt>. */
public static final String PARAM_PAGE = "page";
private SimpleDateFormat m_monthUrlFormat;
Modified: incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/plugin/WeblogEntryPlugin.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/plugin/WeblogEntryPlugin.java?rev=687534&r1=687533&r2=687534&view=diff
==============================================================================
--- incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/plugin/WeblogEntryPlugin.java (original)
+++ incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/plugin/WeblogEntryPlugin.java Wed Aug 20 18:42:15 2008
@@ -30,6 +30,12 @@
/**
* Builds a simple weblog.
*
+ * <p>Parameters : </p>
+ * <ul>
+ * <li><b>entrytext</b> - text of the link </li>
+ * <li><b>page</b> - if set, the entry is added to the named blog page. The default is the current page. </li>
+ * </ul>
+ *
* @since 1.9.21
*/
public class WeblogEntryPlugin implements WikiPlugin
@@ -38,6 +44,7 @@
private static final int MAX_BLOG_ENTRIES = 10000; // Just a precaution.
+ /** Parameter name for setting the entrytext Value is <tt>{@value}</tt>. */
public static final String PARAM_ENTRYTEXT = "entrytext";
/**
* Optional parameter: page that actually contains the blog.
@@ -45,6 +52,7 @@
* somewhere else than on the page itself.
*/
// "page" for uniform naming with WeblogPlugin...
+ /** Parameter name for setting the page Value is <tt>{@value}</tt>. */
public static final String PARAM_BLOGNAME = "page";
/**
Modified: incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/plugin/WeblogPlugin.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/plugin/WeblogPlugin.java?rev=687534&r1=687533&r2=687534&view=diff
==============================================================================
--- incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/plugin/WeblogPlugin.java (original)
+++ incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/plugin/WeblogPlugin.java Wed Aug 20 18:42:15 2008
@@ -51,17 +51,17 @@
* <p>%p - Page name</p>
* <p>Parameters:</p>
* <ul>
- * <li>page - which page is used to do the blog; default is the current page.</li>
- * <li>entryFormat - how to display the date on pages, using the J2SE SimpleDateFormat
+ * <li><b>page</b> - which page is used to do the blog; default is the current page.</li>
+ * <li><b>entryFormat</b> - how to display the date on pages, using the J2SE SimpleDateFormat
* syntax. Defaults to the current locale's DateFormat.LONG format
* for the date, and current locale's DateFormat.SHORT for the time.
* Thus, for the US locale this will print dates similar to
* this: September 4, 2005 11:54 PM</li>
- * <li>days - how many days the weblog aggregator should show. If set to
+ * <li><b>days</b> - how many days the weblog aggregator should show. If set to
* "all", shows all pages.</li>
- * <li>pageformat - What the entry pages should look like.</li>
- * <li>startDate - Date when to start. Format is "ddMMyy."</li>
- * <li>maxEntries - How many entries to show at most.</li>
+ * <li><b>pageformat</b> - What the entry pages should look like.</li>
+ * <li><b>startDate</b> - Date when to start. Format is "ddMMyy."</li>
+ * <li><b>maxEntries</b> - How many entries to show at most.</li>
* </ul>
* <p>The "days" and "startDate" can also be sent in HTTP parameters,
* and the names are "weblog.days" and "weblog.startDate", respectively.</p>
@@ -87,11 +87,17 @@
/** The default date format used in the blog entry page names. */
public static final String DEFAULT_DATEFORMAT = "ddMMyy";
+ /** Parameter name for the startDate. Value is <tt>{@value}</tt>. */
public static final String PARAM_STARTDATE = "startDate";
+ /** Parameter name for the entryFormat. Value is <tt>{@value}</tt>. */
public static final String PARAM_ENTRYFORMAT = "entryFormat";
+ /** Parameter name for the days. Value is <tt>{@value}</tt>. */
public static final String PARAM_DAYS = "days";
+ /** Parameter name for the allowComments. Value is <tt>{@value}</tt>. */
public static final String PARAM_ALLOWCOMMENTS = "allowComments";
+ /** Parameter name for the maxEntries. Value is <tt>{@value}</tt>. */
public static final String PARAM_MAXENTRIES = "maxEntries";
+ /** Parameter name for the page. Value is <tt>{@value}</tt>. */
public static final String PARAM_PAGE = "page";
/** The attribute which is stashed to the WikiPage attributes to check if a page
Modified: incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/providers/CachingAttachmentProvider.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/providers/CachingAttachmentProvider.java?rev=687534&r1=687533&r2=687534&view=diff
==============================================================================
--- incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/providers/CachingAttachmentProvider.java (original)
+++ incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/providers/CachingAttachmentProvider.java Wed Aug 20 18:42:15 2008
@@ -147,7 +147,7 @@
{
m_provider.putAttachmentData( att, data );
- m_cache.flushEntry( att.getParentName() );
+ m_cache.removeEntry( att.getParentName() );
att.setLastModified(new Date());
m_attCache.putInCache(att.getName(), att);
}
Modified: incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/providers/CachingProvider.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/providers/CachingProvider.java?rev=687534&r1=687533&r2=687534&view=diff
==============================================================================
--- incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/providers/CachingProvider.java (original)
+++ incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/providers/CachingProvider.java Wed Aug 20 18:42:15 2008
@@ -273,10 +273,10 @@
m_cache.putInCache( name, refreshed );
// Requests for this page are now no longer denied
- m_negCache.putInCache( name, null );
+ m_negCache.removeEntry( name );
- m_textCache.flushEntry( name );
- m_historyCache.flushEntry( name );
+ m_textCache.removeEntry( name );
+ m_historyCache.removeEntry( name );
wasUpdated = true;
return refreshed;
@@ -289,9 +289,9 @@
m_cache.putInCache( name, refreshed );
// Requests for this page are now no longer denied
- m_negCache.putInCache( name, null );
- m_textCache.flushEntry( name );
- m_historyCache.flushEntry( name );
+ m_negCache.removeEntry( name );
+ m_textCache.removeEntry( name );
+ m_historyCache.removeEntry( name );
wasUpdated = true;
throw new RepositoryModifiedException( "Modified: "+name, name );
@@ -589,10 +589,10 @@
// Refresh caches properly
- m_cache.flushEntry( page.getName() );
- m_textCache.flushEntry( page.getName() );
- m_historyCache.flushEntry( page.getName() );
- m_negCache.flushEntry( page.getName() );
+ m_cache.removeEntry( page.getName() );
+ m_textCache.removeEntry( page.getName() );
+ m_historyCache.removeEntry( page.getName() );
+ m_negCache.removeEntry( page.getName() );
// Refresh caches
try
@@ -813,9 +813,9 @@
if( version == WikiPageProvider.LATEST_VERSION ||
version == latestcached )
{
- m_cache.flushEntry( pageName );
- m_textCache.putInCache( pageName, null );
- m_historyCache.putInCache( pageName, null );
+ m_cache.removeEntry( pageName );
+ m_textCache.removeEntry( pageName );
+ m_historyCache.removeEntry( pageName );
}
m_provider.deleteVersion( pageName, version );
@@ -854,13 +854,13 @@
{
// Clear any cached version of the old page
log.debug("Removing page "+from+" from cache");
- m_cache.flushEntry( from );
+ m_cache.removeEntry( from );
// Clear the cache for the to page, if that page already exists
//if ( m_cache.get( to ) != null )
//{
log.debug("Removing page "+to+" from cache");
- m_cache.flushEntry( to );
+ m_cache.removeEntry( to );
//}
}
}
@@ -926,11 +926,14 @@
public void cacheEntryRemoved( CacheEntryEvent arg0 )
{
- WikiPage item = (WikiPage) arg0.getEntry().getContent();
-
- if( item != null )
+ if( arg0.getEntry() != null )
{
- m_allItems.remove( item.getName() );
+ WikiPage item = (WikiPage) arg0.getEntry().getContent();
+
+ if( item != null )
+ {
+ m_allItems.remove( item.getName() );
+ }
}
}
Modified: incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/wikipages/en/LeftMenuFooter.txt
URL: http://svn.apache.org/viewvc/incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/wikipages/en/LeftMenuFooter.txt?rev=687534&r1=687533&r2=687534&view=diff
==============================================================================
--- incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/wikipages/en/LeftMenuFooter.txt (original)
+++ incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/wikipages/en/LeftMenuFooter.txt Wed Aug 20 18:42:15 2008
@@ -1,2 +1,2 @@
-
+----
Modified: incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/wikipages/en/RejectedMessage.txt
URL: http://svn.apache.org/viewvc/incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/wikipages/en/RejectedMessage.txt?rev=687534&r1=687533&r2=687534&view=diff
==============================================================================
--- incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/wikipages/en/RejectedMessage.txt (original)
+++ incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/wikipages/en/RejectedMessage.txt Wed Aug 20 18:42:15 2008
@@ -1,4 +1,4 @@
-Your edit has been rejected due to the following reason:
+Your edit has been rejected for to the following reason:
%%(padding: 4px; margin: 3em; border: 1px inset; background: #eeeeee)
[{$message}]
%%
Modified: incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/wikipages/en/WikiEtiquette.txt
URL: http://svn.apache.org/viewvc/incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/wikipages/en/WikiEtiquette.txt?rev=687534&r1=687533&r2=687534&view=diff
==============================================================================
--- incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/wikipages/en/WikiEtiquette.txt (original)
+++ incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/wikipages/en/WikiEtiquette.txt Wed Aug 20 18:42:15 2008
@@ -13,7 +13,7 @@
* You are free to contribute anonymously, but it is preferred that you sign your comments with your name (or handle). It is common to prepend the signature with '--' like this: ''-- [Janne Jalkanen]'' (While you're at it, you are free to create your own wikipage and tell us about yourself.)
* A good way is also to put your name first, like this: ''[Janne Jalkanen] : I'd like to say that...''
-* Think before you comment. [WikiWiki] is not a high-speed conversation board. It's not a news server either. What you say will stay here forever (yeah, we do take backups) for everyone to see and comment.
+* Think before you comment. [WikiWiki] is not a high-speed conversation board. It's not a news server either. What you say will stay here forever (if you delete your comment, it is still in the previous version of the page) for everyone to see and comment.
!!Creating WikiNames
* A good [WikiName] is short and descriptive. If the name is logical and easy many more people will link to it.
Modified: incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/tests/com/ecyrd/jspwiki/content/PageRenamerTest.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/tests/com/ecyrd/jspwiki/content/PageRenamerTest.java?rev=687534&r1=687533&r2=687534&view=diff
==============================================================================
--- incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/tests/com/ecyrd/jspwiki/content/PageRenamerTest.java (original)
+++ incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/tests/com/ecyrd/jspwiki/content/PageRenamerTest.java Wed Aug 20 18:42:15 2008
@@ -38,6 +38,8 @@
TestEngine.deleteTestPage("Test");
TestEngine.deleteTestPage("CdauthNew");
TestEngine.deleteTestPage("Cdauth");
+ TestEngine.deleteTestPage("TestPageReferring");
+ TestEngine.deleteTestPage("TestPageReferredNew");
TestEngine.emptyWorkDir();
}
@@ -428,6 +430,30 @@
assertEquals( "~[Link to TestPage2|TestPage2|target='_new']", m_engine.getText( "TestPage" ).trim() );
}
+ /**
+ * Test for a referrer containing blanks
+ *
+ * @throws Exception
+ */
+ public void testReferrerChangeWithBlanks() throws Exception
+ {
+ m_engine.saveText( "TestPageReferred", "bla bla bla som content" );
+ m_engine.saveText( "TestPageReferring", "[Test Page Referred]" );
+
+ rename( "TestPageReferred", "TestPageReferredNew" );
+
+ String data = m_engine.getPureText( "TestPageReferring", WikiProvider.LATEST_VERSION );
+ assertEquals( "page not renamed", "[Test Page Referred|TestPageReferredNew]", data.trim() );
+
+ Collection refs = m_engine.getReferenceManager().findReferrers( "TestPageReferred" );
+ assertNull( "oldpage", refs );
+
+ refs = m_engine.getReferenceManager().findReferrers( "TestPageReferredNew" );
+ assertEquals( "new size", 1, refs.size() );
+ assertEquals( "wrong ref", "TestPageReferring", (String) refs.iterator().next() );
+ }
+
+
public static Test suite()
{
return new TestSuite( PageRenamerTest.class );
Modified: incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/tests/com/ecyrd/jspwiki/parser/JSPWikiMarkupParserTest.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/tests/com/ecyrd/jspwiki/parser/JSPWikiMarkupParserTest.java?rev=687534&r1=687533&r2=687534&view=diff
==============================================================================
--- incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/tests/com/ecyrd/jspwiki/parser/JSPWikiMarkupParserTest.java (original)
+++ incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/tests/com/ecyrd/jspwiki/parser/JSPWikiMarkupParserTest.java Wed Aug 20 18:42:15 2008
@@ -2611,7 +2611,27 @@
assertEquals( "<a class=\"external\" href=\"http://www.host.com/du="> <img src="foobar" onerror="alert(document.cookie)"/>\">http://www.host.com/du="> <img src="foobar" onerror="alert(document.cookie)"/></a>", dst );
}
+
+ public void testAmpersand1() throws Exception
+ {
+ newPage( "Foo&Bar" );
+ String src = "[Foo&Bar]";
+
+ String dst = translate(src);
+
+ assertEquals( "<a class=\"wikipage\" href=\"/Wiki.jsp?page=Foo%26Bar\">Foo&Bar</a>", dst );
+ }
+ public void testAmpersand2() throws Exception
+ {
+ newPage( "Foo & Bar" );
+ String src = "[Foo & Bar]";
+
+ String dst = translate(src);
+
+ assertEquals( "<a class=\"wikipage\" href=\"/Wiki.jsp?page=Foo%20%26%20Bar\">Foo & Bar</a>", dst );
+ }
+
// This is a random find: the following page text caused an eternal loop in V2.0.x.
private static final String brokenPageText =
"Please ''check [RecentChanges].\n" +
Propchange: incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/tests/lib/stripes-1.5.jar
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream