From jspwiki-commits-return-1215howecatherine@example.com Sun Feb 01 12:54:57 2009 Return-Path: <jspwiki-commits-return-1215howecatherine@example.com> Delivered-To: howecatherine@example.com Received: (qmail 19294 invoked from network); 1 Feb 2009 12:54:56 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (83.161.120.155) by minotaur.apache.org with SMTP; 1 Feb 2009 12:54:56 -0000 Received: (qmail 39961 invoked by uid 500); 1 Feb 2009 12:54:56 -0000 Delivered-To: howecatherine@example.com Received: (qmail 39944 invoked by uid 500); 1 Feb 2009 12:54:56 -0000 Mailing-List: contact howecatherine@example.com; run by ezmlm Precedence: bulk List-Help: <mailto:howecatherine@example.com> List-Unsubscribe: <mailto:howecatherine@example.com> List-Post: <mailto:howecatherine@example.com> List-Id: <jspwiki-commits.incubator.apache.org> Reply-To: howecatherine@example.com Delivered-To: mailing list howecatherine@example.com Received: (qmail 39935 invoked by uid 99); 1 Feb 2009 12:54:55 -0000 Received: from nike.apache.org (HELO nike.apache.org) (83.161.120.155) by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 01 Feb 2009 04:54:55 -0800 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [83.161.120.155] (HELO eris.apache.org) (83.161.120.155) by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 01 Feb 2009 12:54:52 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id C4FD42388A2E; Sun, 1 Feb 2009 12:54:30 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r739757 - /incubator/jspwiki/trunk/build.xml Date: Sun, 01 Feb 2009 12:54:30 -0000 To: howecatherine@example.com From: howecatherine@example.com X-Mailer: svnmailer-1.0.8 Message-Id: <howecatherine@example.com> X-Virus-Checked: Checked by ClamAV on apache.org Author: metskem Date: Sun Feb 1 12:54:30 2009 New Revision: 739757 URL: http://svn.apache.org/viewvc?rev=739757&view=rev Log: JSPWIKI-438 Andrew's hint is correct, so I renamed variable "tests.src" to "tests" and introduced new variable "tests" Modified: incubator/jspwiki/trunk/build.xml Modified: incubator/jspwiki/trunk/build.xml URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/build.xml?rev=739757&r1=739756&r2=739757&view=diff ============================================================================== --- incubator/jspwiki/trunk/build.xml (original) +++ incubator/jspwiki/trunk/build.xml Sun Feb 1 12:54:30 2009 @@ -97,13 +97,14 @@ the user name, and the project name (defined above) --> <property name="tmpdir" value="${java.io.tmpdir}/${user.name}/${ant.project.name}" /> - <!-- The following three properties define the location of the - test sources, the location of the test .class files and the + <!-- The following properties define the location of the + test resources, the location of the sources, the location of the .class files and the directory where the test results are written in. --> - <property name="tests.src" value="tests" /> - <property name="tests.build" value="${tests.src}/build" /> - <property name="tests.reports" value="${tests.src}/reports" /> + <property name="tests" value="tests" /> + <property name="tests.src" value="${tests}/java" /> + <property name="tests.build" value="${tests}/build" /> + <property name="tests.reports" value="${tests}/reports" /> <!-- WAR properties --> <condition property="war.compile.jsps"> @@ -112,12 +113,12 @@ <!-- Web unit test properties --> <property name="webtests.browser" value="*firefox" /> - <property name="webtests.reports" value="${tests.src}/reports/selenium" /> - <property name="webtests.build" value="${tests.src}/build/webtests" /> + <property name="webtests.reports" value="${tests}/reports/selenium" /> + <property name="webtests.build" value="${tests}/build/webtests" /> <property name="webtests.port" value="10024" /> <property name="webtests.shutdown" value="19041" /> <property name="webtests.temp" value="${java.io.tmpdir}/webtests" /> - <property name="selenium-rc.jar" value="${tests.src}/lib/selenium-server-1.0-beta1.jar" /> + <property name="selenium-rc.jar" value="${tests}/lib/selenium-server-1.0-beta1.jar" /> <!-- The place where the javadocs are created --> @@ -161,10 +162,10 @@ <fileset dir="${code.web}/WEB-INF/lib"> <include name="*.jar" /> </fileset> - <fileset dir="${tests.src}/lib"> + <fileset dir="${tests}/lib"> <include name="*.jar" /> </fileset> - <pathelement path="${tests.src}/etc" /> + <pathelement path="${tests}/etc" /> </path> <!-- The prefix to use when reading environment variables --> @@ -187,16 +188,16 @@ <target name="mkpropertyfile" description="Builds the correct propertyfile from the build.properties"> <copy file="etc/jspwiki.properties.tmpl" tofile="${code.web}/WEB-INF/jspwiki.properties" /> - <copy file="${tests.src}/etc/jspwiki.properties.tmpl" tofile="${tests.src}/etc/jspwiki.properties" /> - <copy file="${tests.src}/etc/jspwiki_rcs.properties.tmpl" tofile="${tests.src}/etc/jspwiki_rcs.properties" /> - <copy file="${tests.src}/etc/jspwiki_vers.properties.tmpl" tofile="${tests.src}/etc/jspwiki_vers.properties" /> + <copy file="${tests}/etc/jspwiki.properties.tmpl" tofile="${tests}/etc/jspwiki.properties" /> + <copy file="${tests}/etc/jspwiki_rcs.properties.tmpl" tofile="${tests}/etc/jspwiki_rcs.properties" /> + <copy file="${tests}/etc/jspwiki_vers.properties.tmpl" tofile="${tests}/etc/jspwiki_vers.properties" /> <replace file="src/WebContent/WEB-INF/jspwiki.properties" replacefilterfile="${build.properties}" /> - <replace file="${tests.src}/etc/jspwiki.properties" + <replace file="${tests}/etc/jspwiki.properties" replacefilterfile="${build.properties}" /> - <replace file="${tests.src}/etc/jspwiki_rcs.properties" + <replace file="${tests}/etc/jspwiki_rcs.properties" replacefilterfile="${build.properties}" /> - <replace file="${tests.src}/etc/jspwiki_vers.properties" + <replace file="${tests}/etc/jspwiki_vers.properties" replacefilterfile="${build.properties}" /> </target> @@ -207,9 +208,9 @@ <delete dir="${code.build}" /> <delete dir="${tests.reports}" /> <delete file="src/WebContent/WEB-INF/jspwiki.properties" /> - <delete file="${tests.src}/etc/jspwiki.properties" /> - <delete file="${tests.src}/etc/jspwiki_rcs.properties" /> - <delete file="${tests.src}/etc/jspwiki_vers.properties" /> + <delete file="${tests}/etc/jspwiki.properties" /> + <delete file="${tests}/etc/jspwiki_rcs.properties" /> + <delete file="${tests}/etc/jspwiki_vers.properties" /> <delete> <fileset dir="." includes="**/*~" defaultexcludes="no"/> <fileset dir="." includes="**/#*#" defaultexcludes="no"/> @@ -248,7 +249,7 @@ tests. --> <target name="compiletests" depends="init,compile" description="Builds the test code."> - <javac srcdir="${tests.src}" + <javac srcdir="${tests}" destdir="${tests.build}" debug="true" deprecation="${deprecation}" @@ -352,7 +353,7 @@ <fileset dir="${tests.build}"> <include name="**/*.class"/> </fileset> - <fileset dir="${tests.src}"> + <fileset dir="${tests}"> <include name="com/**/*.properties"/> </fileset> </jar> @@ -477,8 +478,8 @@ </jar> <!-- Copy the Jasper runtime JAR --> <copy toDir="${code.build}"> - <fileset dir="${tests.src}/lib" includes="jasper-runtime-*.jar"/> - <fileset dir="${tests.src}/lib" includes="commons-el-*.jar"/> + <fileset dir="${tests}/lib" includes="jasper-runtime-*.jar"/> + <fileset dir="${tests}/lib" includes="commons-el-*.jar"/> </copy> </target> @@ -489,7 +490,7 @@ <attribute name="src"/> <attribute name="args" default=""/> <sequential> - <java jar="${tests.src}/lib/yuicompressor-2.3.3.jar" + <java jar="${tests}/lib/yuicompressor-2.3.3.jar" output="${tmpdir}/compress/@{src}" fork="true"> <arg line="'${code.web}/@{src}' @{args}" /> @@ -672,13 +673,13 @@ <target name="tests-init" depends="mkpropertyfile"> <!-- Build up the /etc directory for testing --> - <delete file="${tests.src}/etc/userdatabase.xml" /> - <delete file="${tests.src}/etc/userdatabase.xml.old" /> - <copy file="${tests.src}/etc/userdatabase.xml.tmpl" toFile="${tests.src}/etc/userdatabase.xml"/> - <delete file="${tests.src}/etc/groupdatabase.xml" /> - <delete file="${tests.src}/etc/groupdatabase.xml.old" /> - <copy file="${tests.src}/etc/groupdatabase.xml.tmpl" toFile="${tests.src}/etc/groupdatabase.xml"/> - <mkdir dir="${tests.src}/etc/WEB-INF" /> + <delete file="${tests}/etc/userdatabase.xml" /> + <delete file="${tests}/etc/userdatabase.xml.old" /> + <copy file="${tests}/etc/userdatabase.xml.tmpl" toFile="${tests}/etc/userdatabase.xml"/> + <delete file="${tests}/etc/groupdatabase.xml" /> + <delete file="${tests}/etc/groupdatabase.xml.old" /> + <copy file="${tests}/etc/groupdatabase.xml.tmpl" toFile="${tests}/etc/groupdatabase.xml"/> + <mkdir dir="${tests}/etc/WEB-INF" /> <!-- Create web.xml files for testing --> <copy file="${code.web}/WEB-INF/web.xml" tofile="${webtests.build}/web.xml.custom" overwrite="true" /> @@ -700,15 +701,15 @@ <replace file="${webtests.build}/web.xml.container" token="REMOVE ME TO ENABLE CONTAINER-MANAGED AUTH --&gt;" value="" /> <copy file="${webtests.build}/web.xml.container" - tofile="${tests.src}/etc/WEB-INF/web.xml" overwrite="true" /> + tofile="${tests}/etc/WEB-INF/web.xml" overwrite="true" /> <!-- Copy the DTDs and jspwiki.properties to the test WEB-INF --> - <mkdir dir="${tests.src}/etc/WEB-INF/dtd" /> - <copy toDir="${tests.src}/etc/WEB-INF/dtd"> + <mkdir dir="${tests}/etc/WEB-INF/dtd" /> + <copy toDir="${tests}/etc/WEB-INF/dtd"> <fileset dir="${basedir}/etc/dtd/" /> </copy> <copy file="${code.web}/WEB-INF/jspwiki.properties" - tofile="${tests.src}/etc/WEB-INF/jspwiki.properties" overwrite="true" /> + tofile="${tests}/etc/WEB-INF/jspwiki.properties" overwrite="true" /> </target> <!-- This target runs the JUnit tests that are available @@ -752,11 +753,11 @@ </batchtest> </junit> - <junitreport todir="${tests.src}"> + <junitreport todir="${tests}"> <fileset dir="${tests.reports}"> <include name="**/TEST-*.xml" /> </fileset> - <report format="noframes" todir="${tests.src}" /> + <report format="noframes" todir="${tests}" /> </junitreport> </target> @@ -774,17 +775,17 @@ <formatter type="plain" /> <formatter type="xml" usefile="yes" /> <batchtest todir="${tests.reports}"> - <fileset dir="${tests.src}"> + <fileset dir="${tests}"> <include name="**/AuthorizationManagerTest.java" /> </fileset> </batchtest> </junit> - <junitreport todir="${tests.src}"> + <junitreport todir="${tests}"> <fileset dir="${tests.reports}"> <include name="**/TEST-*.xml" /> </fileset> - <report format="noframes" todir="${tests.src}" /> + <report format="noframes" todir="${tests}" /> </junitreport> </target> @@ -814,7 +815,7 @@ <mkdir dir="${webtests.build}" /> <!-- Create the master jspwiki.properties template for all webtests --> - <copy file="${tests.src}/etc/jspwiki.properties" + <copy file="${tests}/etc/jspwiki.properties" toFile="${webtests.build}/jspwiki.properties.tmpl" flatten="true" /> <propertyfile file="${webtests.build}/jspwiki.properties.tmpl"> <entry key="jspwiki.authorizer" value="com.ecyrd.jspwiki.auth.authorize.WebContainerAuthorizer" /> @@ -890,7 +891,7 @@ <echo message="Creating Selenium test scripts..."/> <mkdir dir="@{context.dir}/selenium" /> <copy flatten="true" toDir="@{context.dir}/selenium"> - <fileset dir="${tests.src}/etc/selenium/tests/all" /> + <fileset dir="${tests}/etc/selenium/tests/all" /> <filterset> <filter token="selenium.context" value="@{context}" /> </filterset> @@ -923,7 +924,7 @@ <include name="commons-logging.properties" /> <include name="jspwiki.policy" /> </fileset> - <fileset dir="${tests.src}/etc" includes="userdatabase.xml groupdatabase.xml" /> + <fileset dir="${tests}/etc" includes="userdatabase.xml groupdatabase.xml" /> </copy> <copy toFile="@{context.dir}/webapp/WEB-INF/web.xml" file="@{webxml}" flatten="true" /> @@ -1154,12 +1155,12 @@ <check-file file="${jdbc.driver.jar}" prop="jdbc.jar.present" /> <!-- Bulk-copy the table setup/teardown scripts --> - <property name="tests.db.scripts" value="${tests.src}/etc/db/${jdbc.driver.id}" /> + <property name="tests.db.scripts" value="${tests}/etc/db/${jdbc.driver.id}" /> <mkdir dir="${tests.db.scripts}" /> <copy toDir="${tests.db.scripts}" overwrite="true"> <fileset dir="${db.scripts}" /> <filterset> - <filtersfile file="${tests.src}/etc/jspwiki.properties" /> + <filtersfile file="${tests}/etc/jspwiki.properties" /> <filtersfile file="build.properties" /> </filterset> </copy> @@ -1177,7 +1178,7 @@ <property name="db.props.exist" value="true" /> <!-- Dump all of the JDBC properties where our test scripts can find them --> - <echoproperties prefix="jdbc." destfile="${tests.src}/etc/db/jdbc.properties" /> + <echoproperties prefix="jdbc." destfile="${tests}/etc/db/jdbc.properties" /> </target> <target name="db-setup" depends="db-properties,hsql-init" if="db.props.exist"> @@ -1226,7 +1227,7 @@ <target name="hsql-check-start" depends="db-properties"> <echo message="Checking to see if Hypersonic JDBC server is running already." /> - <property file="${tests.src}/etc/db/hsql/server.properties" prefix="hsql" /> + <property file="${tests}/etc/db/hsql/server.properties" prefix="hsql" /> <fail unless="hsql.server.port">Failed to load Hypersonic JDBC properties from ${tests.src}/etc/db/hsql/server.properties</fail> <condition property="hsql.up"> <socket server="localhost" port="${hsql.server.port}" /> From jspwiki-commits-return-1216howecatherine@example.com Sun Feb 01 14:11:27 2009 Return-Path: <jspwiki-commits-return-1216howecatherine@example.com> Delivered-To: howecatherine@example.com Received: (qmail 57112 invoked from network); 1 Feb 2009 14:11:27 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (83.161.120.155) by minotaur.apache.org with SMTP; 1 Feb 2009 14:11:27 -0000 Received: (qmail 89140 invoked by uid 500); 1 Feb 2009 14:11:27 -0000 Delivered-To: howecatherine@example.com Received: (qmail 89131 invoked by uid 500); 1 Feb 2009 14:11:27 -0000 Mailing-List: contact howecatherine@example.com; run by ezmlm Precedence: bulk List-Help: <mailto:howecatherine@example.com> List-Unsubscribe: <mailto:howecatherine@example.com> List-Post: <mailto:howecatherine@example.com> List-Id: <jspwiki-commits.incubator.apache.org> Reply-To: howecatherine@example.com Delivered-To: mailing list howecatherine@example.com Received: (qmail 89122 invoked by uid 99); 1 Feb 2009 14:11:27 -0000 Received: from nike.apache.org (HELO nike.apache.org) (83.161.120.155) by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 01 Feb 2009 06:11:27 -0800 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [83.161.120.155] (HELO eris.apache.org) (83.161.120.155) by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 01 Feb 2009 14:11:25 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id D10DD238889C; Sun, 1 Feb 2009 14:11:04 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r739768 - in /incubator/jspwiki/trunk: etc/i18n/CoreResources.properties tests/java/com/ecyrd/jspwiki/VariableManagerTest.java Date: Sun, 01 Feb 2009 14:11:04 -0000 To: howecatherine@example.com From: howecatherine@example.com X-Mailer: svnmailer-1.0.8 Message-Id: <howecatherine@example.com> X-Virus-Checked: Checked by ClamAV on apache.org Author: metskem Date: Sun Feb 1 14:11:04 2009 New Revision: 739768 URL: http://svn.apache.org/viewvc?rev=739768&view=rev Log: JSPWIKI-460 add missing entry to CoreResources.properties, remove blank in testcase Modified: incubator/jspwiki/trunk/etc/i18n/CoreResources.properties incubator/jspwiki/trunk/tests/java/com/ecyrd/jspwiki/VariableManagerTest.java Modified: incubator/jspwiki/trunk/etc/i18n/CoreResources.properties URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/etc/i18n/CoreResources.properties?rev=739768&r1=739767&r2=739768&view=diff ============================================================================== --- incubator/jspwiki/trunk/etc/i18n/CoreResources.properties (original) +++ incubator/jspwiki/trunk/etc/i18n/CoreResources.properties Sun Feb 1 14:11:04 2009 @@ -206,8 +206,9 @@ varmgr.authenticated=authenticated varmgr.asserted=asserted varmgr.anonymous=anonymous -varmgr.dateformat.invalid=No valid dateformat was provided: -varmgr.dateformat.noformat=No dateformat was provided. +varmgr.dateformat.invalid.format=No valid dateformat was provided: +varmgr.dateformat.noformat=No dateformat was provided. +varmgr.dateformat.invalid.parm=Unrecognized parameter: ############################################################################### ## Default Resource Bundle file for the Stripes Framework. Values should be Modified: incubator/jspwiki/trunk/tests/java/com/ecyrd/jspwiki/VariableManagerTest.java URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/tests/java/com/ecyrd/jspwiki/VariableManagerTest.java?rev=739768&r1=739767&r2=739768&view=diff ============================================================================== --- incubator/jspwiki/trunk/tests/java/com/ecyrd/jspwiki/VariableManagerTest.java (original) +++ incubator/jspwiki/trunk/tests/java/com/ecyrd/jspwiki/VariableManagerTest.java Sun Feb 1 14:11:04 2009 @@ -221,7 +221,7 @@ // test with a wrong named parm // String res = m_variableManager.expandVariables( m_context, ">>>>>{$timestamp wrongparm=bla}<<<<<" ); - assertEquals( ">>>>>Unrecognized parameter: wrongparm<<<<<", res ); + assertEquals( ">>>>>Unrecognized parameter:wrongparm<<<<<", res ); } public void testTimeStamp4() throws Exception From jspwiki-commits-return-1217howecatherine@example.com Sun Feb 01 18:05:44 2009 Return-Path: <jspwiki-commits-return-1217howecatherine@example.com> Delivered-To: howecatherine@example.com Received: (qmail 56705 invoked from network); 1 Feb 2009 18:05:44 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (83.161.120.155) by minotaur.apache.org with SMTP; 1 Feb 2009 18:05:44 -0000 Received: (qmail 33574 invoked by uid 500); 1 Feb 2009 18:05:44 -0000 Delivered-To: howecatherine@example.com Received: (qmail 33561 invoked by uid 500); 1 Feb 2009 18:05:44 -0000 Mailing-List: contact howecatherine@example.com; run by ezmlm Precedence: bulk List-Help: <mailto:howecatherine@example.com> List-Unsubscribe: <mailto:howecatherine@example.com> List-Post: <mailto:howecatherine@example.com> List-Id: <jspwiki-commits.incubator.apache.org> Reply-To: howecatherine@example.com Delivered-To: mailing list howecatherine@example.com Received: (qmail 33552 invoked by uid 99); 1 Feb 2009 18:05:44 -0000 Received: from athena.apache.org (HELO athena.apache.org) (83.161.120.155) by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 01 Feb 2009 10:05:44 -0800 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [83.161.120.155] (HELO eris.apache.org) (83.161.120.155) by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 01 Feb 2009 18:05:39 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 3D8982388A5D; Sun, 1 Feb 2009 18:05:19 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r739802 [1/13] - in /incubator/jspwiki/trunk: ./ doc/ etc/ etc/i18n/ etc/ini/ src/WebContent/ src/WebContent/WEB-INF/ src/WebContent/admin/ src/WebContent/scripts/ src/WebContent/templates/default/ src/WebContent/templates/default/admin/ sr... Date: Sun, 01 Feb 2009 18:04:50 -0000 To: howecatherine@example.com From: howecatherine@example.com X-Mailer: svnmailer-1.0.8 Message-Id: <howecatherine@example.com> X-Virus-Checked: Checked by ClamAV on apache.org Author: jalkanen Date: Sun Feb 1 18:04:05 2009 New Revision: 739802 URL: http://svn.apache.org/viewvc?rev=739802&view=rev Log: JSPWIKI-38: Renamed packages to org.apache.wiki.* Added: incubator/jspwiki/trunk/src/java/org/apache/wiki/ incubator/jspwiki/trunk/src/java/org/apache/wiki/InternalWikiException.java - copied, changed from r739575, incubator/jspwiki/trunk/src/java/com/ecyrd/jspwiki/InternalWikiException.java incubator/jspwiki/trunk/src/java/org/apache/wiki/JCRWikiPage.java - copied, changed from r739575, incubator/jspwiki/trunk/src/java/com/ecyrd/jspwiki/JCRWikiPage.java incubator/jspwiki/trunk/src/java/org/apache/wiki/LinkCollector.java - copied, changed from r739575, incubator/jspwiki/trunk/src/java/com/ecyrd/jspwiki/LinkCollector.java incubator/jspwiki/trunk/src/java/org/apache/wiki/NoRequiredPropertyException.java - copied, changed from r739575, incubator/jspwiki/trunk/src/java/com/ecyrd/jspwiki/NoRequiredPropertyException.java incubator/jspwiki/trunk/src/java/org/apache/wiki/NoSuchVariableException.java - copied, changed from r739575, incubator/jspwiki/trunk/src/java/com/ecyrd/jspwiki/NoSuchVariableException.java incubator/jspwiki/trunk/src/java/org/apache/wiki/PageLock.java - copied, changed from r739575, incubator/jspwiki/trunk/src/java/com/ecyrd/jspwiki/PageLock.java incubator/jspwiki/trunk/src/java/org/apache/wiki/PageManager.java - copied, changed from r739575, incubator/jspwiki/trunk/src/java/com/ecyrd/jspwiki/PageManager.java incubator/jspwiki/trunk/src/java/org/apache/wiki/PageTimeComparator.java - copied, changed from r739575, incubator/jspwiki/trunk/src/java/com/ecyrd/jspwiki/PageTimeComparator.java incubator/jspwiki/trunk/src/java/org/apache/wiki/PropertyReader.java - copied, changed from r739575, incubator/jspwiki/trunk/src/java/com/ecyrd/jspwiki/PropertyReader.java incubator/jspwiki/trunk/src/java/org/apache/wiki/ReferenceManager.java - copied, changed from r739575, incubator/jspwiki/trunk/src/java/com/ecyrd/jspwiki/ReferenceManager.java incubator/jspwiki/trunk/src/java/org/apache/wiki/Release.java - copied, changed from r739575, incubator/jspwiki/trunk/src/java/com/ecyrd/jspwiki/Release.java incubator/jspwiki/trunk/src/java/org/apache/wiki/StringTransmutator.java - copied, changed from r739575, incubator/jspwiki/trunk/src/java/com/ecyrd/jspwiki/StringTransmutator.java incubator/jspwiki/trunk/src/java/org/apache/wiki/VariableManager.java - copied, changed from r739575, incubator/jspwiki/trunk/src/java/com/ecyrd/jspwiki/VariableManager.java incubator/jspwiki/trunk/src/java/org/apache/wiki/WikiContext.java - copied, changed from r739575, incubator/jspwiki/trunk/src/java/com/ecyrd/jspwiki/WikiContext.java incubator/jspwiki/trunk/src/java/org/apache/wiki/WikiEngine.java - copied, changed from r739575, incubator/jspwiki/trunk/src/java/com/ecyrd/jspwiki/WikiEngine.java incubator/jspwiki/trunk/src/java/org/apache/wiki/WikiProvider.java - copied, changed from r739575, incubator/jspwiki/trunk/src/java/com/ecyrd/jspwiki/WikiProvider.java incubator/jspwiki/trunk/src/java/org/apache/wiki/WikiServlet.java - copied, changed from r739575, incubator/jspwiki/trunk/src/java/com/ecyrd/jspwiki/WikiServlet.java incubator/jspwiki/trunk/src/java/org/apache/wiki/WikiSession.java - copied, changed from r739575, incubator/jspwiki/trunk/src/java/com/ecyrd/jspwiki/WikiSession.java incubator/jspwiki/trunk/src/java/org/apache/wiki/action/ - copied from r739575, incubator/jspwiki/trunk/src/java/com/ecyrd/jspwiki/action/ incubator/jspwiki/trunk/src/java/org/apache/wiki/api/ - copied from r739575, incubator/jspwiki/trunk/src/java/org/apache/jspwiki/api/ incubator/jspwiki/trunk/src/java/org/apache/wiki/attachment/ - copied from r739575, incubator/jspwiki/trunk/src/java/com/ecyrd/jspwiki/attachment/ incubator/jspwiki/trunk/src/java/org/apache/wiki/auth/ incubator/jspwiki/trunk/src/java/org/apache/wiki/auth/AuthenticationManager.java - copied, changed from r739575, incubator/jspwiki/trunk/src/java/com/ecyrd/jspwiki/auth/AuthenticationManager.java incubator/jspwiki/trunk/src/java/org/apache/wiki/auth/AuthorizationManager.java - copied, changed from r739575, incubator/jspwiki/trunk/src/java/com/ecyrd/jspwiki/auth/AuthorizationManager.java incubator/jspwiki/trunk/src/java/org/apache/wiki/auth/Authorizer.java - copied, changed from r739575, incubator/jspwiki/trunk/src/java/com/ecyrd/jspwiki/auth/Authorizer.java incubator/jspwiki/trunk/src/java/org/apache/wiki/auth/GroupPrincipal.java - copied, changed from r739575, incubator/jspwiki/trunk/src/java/com/ecyrd/jspwiki/auth/GroupPrincipal.java incubator/jspwiki/trunk/src/java/org/apache/wiki/auth/NoSuchPrincipalException.java - copied, changed from r739575, incubator/jspwiki/trunk/src/java/com/ecyrd/jspwiki/auth/NoSuchPrincipalException.java incubator/jspwiki/trunk/src/java/org/apache/wiki/auth/PrincipalComparator.java - copied, changed from r739575, incubator/jspwiki/trunk/src/java/com/ecyrd/jspwiki/auth/PrincipalComparator.java incubator/jspwiki/trunk/src/java/org/apache/wiki/auth/SecurityVerifier.java - copied, changed from r739575, incubator/jspwiki/trunk/src/java/com/ecyrd/jspwiki/auth/SecurityVerifier.java incubator/jspwiki/trunk/src/java/org/apache/wiki/auth/SessionMonitor.java - copied, changed from r739575, incubator/jspwiki/trunk/src/java/com/ecyrd/jspwiki/auth/SessionMonitor.java incubator/jspwiki/trunk/src/java/org/apache/wiki/auth/UserManager.java - copied, changed from r739575, incubator/jspwiki/trunk/src/java/com/ecyrd/jspwiki/auth/UserManager.java incubator/jspwiki/trunk/src/java/org/apache/wiki/auth/WikiPrincipal.java - copied, changed from r739575, incubator/jspwiki/trunk/src/java/com/ecyrd/jspwiki/auth/WikiPrincipal.java incubator/jspwiki/trunk/src/java/org/apache/wiki/auth/WikiSecurityException.java - copied, changed from r739575, incubator/jspwiki/trunk/src/java/com/ecyrd/jspwiki/auth/WikiSecurityException.java incubator/jspwiki/trunk/src/java/org/apache/wiki/auth/acl/ - copied from r739575, incubator/jspwiki/trunk/src/java/com/ecyrd/jspwiki/auth/acl/ incubator/jspwiki/trunk/src/java/org/apache/wiki/auth/authorize/ - copied from r739575, incubator/jspwiki/trunk/src/java/com/ecyrd/jspwiki/auth/authorize/ incubator/jspwiki/trunk/src/java/org/apache/wiki/auth/login/ - copied from r739575, incubator/jspwiki/trunk/src/java/com/ecyrd/jspwiki/auth/login/ incubator/jspwiki/trunk/src/java/org/apache/wiki/auth/package.html - copied unchanged from r739575, incubator/jspwiki/trunk/src/java/com/ecyrd/jspwiki/auth/package.html incubator/jspwiki/trunk/src/java/org/apache/wiki/auth/permissions/ - copied from r739575, incubator/jspwiki/trunk/src/java/com/ecyrd/jspwiki/auth/permissions/ incubator/jspwiki/trunk/src/java/org/apache/wiki/auth/user/ - copied from r739575, incubator/jspwiki/trunk/src/java/com/ecyrd/jspwiki/auth/user/ incubator/jspwiki/trunk/src/java/org/apache/wiki/content/ - copied from r739575, incubator/jspwiki/trunk/src/java/com/ecyrd/jspwiki/content/ incubator/jspwiki/trunk/src/java/org/apache/wiki/dav/ incubator/jspwiki/trunk/src/java/org/apache/wiki/dav/AttachmentDavProvider.java - copied, changed from r739575, incubator/jspwiki/trunk/src/java/com/ecyrd/jspwiki/dav/AttachmentDavProvider.java incubator/jspwiki/trunk/src/java/org/apache/wiki/dav/DavContext.java - copied, changed from r739575, incubator/jspwiki/trunk/src/java/com/ecyrd/jspwiki/dav/DavContext.java incubator/jspwiki/trunk/src/java/org/apache/wiki/dav/DavPath.java - copied, changed from r739575, incubator/jspwiki/trunk/src/java/com/ecyrd/jspwiki/dav/DavPath.java incubator/jspwiki/trunk/src/java/org/apache/wiki/dav/DavProvider.java - copied, changed from r739575, incubator/jspwiki/trunk/src/java/com/ecyrd/jspwiki/dav/DavProvider.java incubator/jspwiki/trunk/src/java/org/apache/wiki/dav/DavUtil.java - copied, changed from r739575, incubator/jspwiki/trunk/src/java/com/ecyrd/jspwiki/dav/DavUtil.java incubator/jspwiki/trunk/src/java/org/apache/wiki/dav/HTMLPagesDavProvider.java - copied, changed from r739575, incubator/jspwiki/trunk/src/java/com/ecyrd/jspwiki/dav/HTMLPagesDavProvider.java incubator/jspwiki/trunk/src/java/org/apache/wiki/dav/RawPagesDavProvider.java - copied, changed from r739575, incubator/jspwiki/trunk/src/java/com/ecyrd/jspwiki/dav/RawPagesDavProvider.java incubator/jspwiki/trunk/src/java/org/apache/wiki/dav/WebdavServlet.java - copied, changed from r739575, incubator/jspwiki/trunk/src/java/com/ecyrd/jspwiki/dav/WebdavServlet.java incubator/jspwiki/trunk/src/java/org/apache/wiki/dav/WikiDavProvider.java - copied, changed from r739575, incubator/jspwiki/trunk/src/java/com/ecyrd/jspwiki/dav/WikiDavProvider.java incubator/jspwiki/trunk/src/java/org/apache/wiki/dav/WikiDavServlet.java - copied, changed from r739575, incubator/jspwiki/trunk/src/java/com/ecyrd/jspwiki/dav/WikiDavServlet.java incubator/jspwiki/trunk/src/java/org/apache/wiki/dav/WikiRootProvider.java - copied, changed from r739575, incubator/jspwiki/trunk/src/java/com/ecyrd/jspwiki/dav/WikiRootProvider.java incubator/jspwiki/trunk/src/java/org/apache/wiki/dav/items/ - copied from r739575, incubator/jspwiki/trunk/src/java/com/ecyrd/jspwiki/dav/items/ incubator/jspwiki/trunk/src/java/org/apache/wiki/dav/methods/ - copied from r739575, incubator/jspwiki/trunk/src/java/com/ecyrd/jspwiki/dav/methods/ incubator/jspwiki/trunk/src/java/org/apache/wiki/diff/ - copied from r739575, incubator/jspwiki/trunk/src/java/com/ecyrd/jspwiki/diff/ incubator/jspwiki/trunk/src/java/org/apache/wiki/event/ - copied from r739575, incubator/jspwiki/trunk/src/java/com/ecyrd/jspwiki/event/ incubator/jspwiki/trunk/src/java/org/apache/wiki/filters/ - copied from r739575, incubator/jspwiki/trunk/src/java/com/ecyrd/jspwiki/filters/ incubator/jspwiki/trunk/src/java/org/apache/wiki/forms/ - copied from r739575, incubator/jspwiki/trunk/src/java/com/ecyrd/jspwiki/forms/ incubator/jspwiki/trunk/src/java/org/apache/wiki/htmltowiki/ - copied from r739575, incubator/jspwiki/trunk/src/java/com/ecyrd/jspwiki/htmltowiki/ incubator/jspwiki/trunk/src/java/org/apache/wiki/i18n/ - copied from r739575, incubator/jspwiki/trunk/src/java/com/ecyrd/jspwiki/i18n/ incubator/jspwiki/trunk/src/java/org/apache/wiki/log/ - copied from r739575, incubator/jspwiki/trunk/src/java/com/ecyrd/jspwiki/log/ incubator/jspwiki/trunk/src/java/org/apache/wiki/management/ - copied from r739575, incubator/jspwiki/trunk/src/java/com/ecyrd/management/ incubator/jspwiki/trunk/src/java/org/apache/wiki/modules/ - copied from r739575, incubator/jspwiki/trunk/src/java/com/ecyrd/jspwiki/modules/ incubator/jspwiki/trunk/src/java/org/apache/wiki/package.html - copied unchanged from r739575, incubator/jspwiki/trunk/src/java/com/ecyrd/jspwiki/package.html incubator/jspwiki/trunk/src/java/org/apache/wiki/parser/ - copied from r739575, incubator/jspwiki/trunk/src/java/com/ecyrd/jspwiki/parser/ incubator/jspwiki/trunk/src/java/org/apache/wiki/plugin/ - copied from r739575, incubator/jspwiki/trunk/src/java/com/ecyrd/jspwiki/plugin/ incubator/jspwiki/trunk/src/java/org/apache/wiki/preferences/ - copied from r739575, incubator/jspwiki/trunk/src/java/com/ecyrd/jspwiki/preferences/ incubator/jspwiki/trunk/src/java/org/apache/wiki/providers/ - copied from r739575, incubator/jspwiki/trunk/src/java/com/ecyrd/jspwiki/providers/ incubator/jspwiki/trunk/src/java/org/apache/wiki/render/ - copied from r739575, incubator/jspwiki/trunk/src/java/com/ecyrd/jspwiki/render/ incubator/jspwiki/trunk/src/java/org/apache/wiki/rpc/ incubator/jspwiki/trunk/src/java/org/apache/wiki/rpc/RPCCallable.java - copied, changed from r739575, incubator/jspwiki/trunk/src/java/com/ecyrd/jspwiki/rpc/RPCCallable.java incubator/jspwiki/trunk/src/java/org/apache/wiki/rpc/RPCManager.java - copied, changed from r739575, incubator/jspwiki/trunk/src/java/com/ecyrd/jspwiki/rpc/RPCManager.java incubator/jspwiki/trunk/src/java/org/apache/wiki/rpc/atom/ - copied from r739575, incubator/jspwiki/trunk/src/java/com/ecyrd/jspwiki/rpc/atom/ incubator/jspwiki/trunk/src/java/org/apache/wiki/rpc/json/ - copied from r739575, incubator/jspwiki/trunk/src/java/com/ecyrd/jspwiki/rpc/json/ incubator/jspwiki/trunk/src/java/org/apache/wiki/rss/ - copied from r739575, incubator/jspwiki/trunk/src/java/com/ecyrd/jspwiki/rss/ incubator/jspwiki/trunk/src/java/org/apache/wiki/search/ - copied from r739575, incubator/jspwiki/trunk/src/java/com/ecyrd/jspwiki/search/ incubator/jspwiki/trunk/src/java/org/apache/wiki/tags/ - copied from r739575, incubator/jspwiki/trunk/src/java/com/ecyrd/jspwiki/tags/ incubator/jspwiki/trunk/src/java/org/apache/wiki/ui/ incubator/jspwiki/trunk/src/java/org/apache/wiki/ui/Editor.java - copied, changed from r739575, incubator/jspwiki/trunk/src/java/com/ecyrd/jspwiki/ui/Editor.java incubator/jspwiki/trunk/src/java/org/apache/wiki/ui/EditorManager.java - copied, changed from r739575, incubator/jspwiki/trunk/src/java/com/ecyrd/jspwiki/ui/EditorManager.java incubator/jspwiki/trunk/src/java/org/apache/wiki/ui/GenericHTTPHandler.java - copied, changed from r739575, incubator/jspwiki/trunk/src/java/com/ecyrd/jspwiki/ui/GenericHTTPHandler.java incubator/jspwiki/trunk/src/java/org/apache/wiki/ui/InputValidator.java - copied, changed from r739575, incubator/jspwiki/trunk/src/java/com/ecyrd/jspwiki/ui/InputValidator.java incubator/jspwiki/trunk/src/java/org/apache/wiki/ui/Installer.java - copied, changed from r739575, incubator/jspwiki/trunk/src/java/com/ecyrd/jspwiki/ui/Installer.java incubator/jspwiki/trunk/src/java/org/apache/wiki/ui/TemplateManager.java - copied, changed from r739575, incubator/jspwiki/trunk/src/java/com/ecyrd/jspwiki/ui/TemplateManager.java incubator/jspwiki/trunk/src/java/org/apache/wiki/ui/WikiJSPFilter.java - copied, changed from r739575, incubator/jspwiki/trunk/src/java/com/ecyrd/jspwiki/ui/WikiJSPFilter.java incubator/jspwiki/trunk/src/java/org/apache/wiki/ui/WikiRequestWrapper.java - copied, changed from r739575, incubator/jspwiki/trunk/src/java/com/ecyrd/jspwiki/ui/WikiRequestWrapper.java incubator/jspwiki/trunk/src/java/org/apache/wiki/ui/WikiServletFilter.java - copied, changed from r739575, incubator/jspwiki/trunk/src/java/com/ecyrd/jspwiki/ui/WikiServletFilter.java incubator/jspwiki/trunk/src/java/org/apache/wiki/ui/admin/ incubator/jspwiki/trunk/src/java/org/apache/wiki/ui/admin/AdminBean.java - copied, changed from r739575, incubator/jspwiki/trunk/src/java/com/ecyrd/jspwiki/ui/admin/AdminBean.java incubator/jspwiki/trunk/src/java/org/apache/wiki/ui/admin/AdminBeanManager.java - copied, changed from r739575, incubator/jspwiki/trunk/src/java/com/ecyrd/jspwiki/ui/admin/AdminBeanManager.java incubator/jspwiki/trunk/src/java/org/apache/wiki/ui/admin/SimpleAdminBean.java - copied, changed from r739575, incubator/jspwiki/trunk/src/java/com/ecyrd/jspwiki/ui/admin/SimpleAdminBean.java incubator/jspwiki/trunk/src/java/org/apache/wiki/ui/admin/WikiFormAdminBean.java - copied, changed from r739575, incubator/jspwiki/trunk/src/java/com/ecyrd/jspwiki/ui/admin/WikiFormAdminBean.java incubator/jspwiki/trunk/src/java/org/apache/wiki/ui/admin/beans/ - copied from r739575, incubator/jspwiki/trunk/src/java/com/ecyrd/jspwiki/ui/admin/beans/ incubator/jspwiki/trunk/src/java/org/apache/wiki/ui/admin/package.html - copied, changed from r739575, incubator/jspwiki/trunk/src/java/com/ecyrd/jspwiki/ui/admin/package.html incubator/jspwiki/trunk/src/java/org/apache/wiki/ui/migrator/ - copied from r739575, incubator/jspwiki/trunk/src/java/com/ecyrd/jspwiki/ui/migrator/ incubator/jspwiki/trunk/src/java/org/apache/wiki/ui/package.html - copied, changed from r739575, incubator/jspwiki/trunk/src/java/com/ecyrd/jspwiki/ui/package.html incubator/jspwiki/trunk/src/java/org/apache/wiki/ui/progress/ - copied from r739575, incubator/jspwiki/trunk/src/java/com/ecyrd/jspwiki/ui/progress/ incubator/jspwiki/trunk/src/java/org/apache/wiki/ui/stripes/ - copied from r739575, incubator/jspwiki/trunk/src/java/com/ecyrd/jspwiki/ui/stripes/ incubator/jspwiki/trunk/src/java/org/apache/wiki/url/ - copied from r739575, incubator/jspwiki/trunk/src/java/com/ecyrd/jspwiki/url/ incubator/jspwiki/trunk/src/java/org/apache/wiki/util/ - copied from r739575, incubator/jspwiki/trunk/src/java/com/ecyrd/jspwiki/util/ incubator/jspwiki/trunk/src/java/org/apache/wiki/workflow/ - copied from r739575, incubator/jspwiki/trunk/src/java/com/ecyrd/jspwiki/workflow/ incubator/jspwiki/trunk/src/java/org/apache/wiki/xmlrpc/ - copied from r739575, incubator/jspwiki/trunk/src/java/com/ecyrd/jspwiki/xmlrpc/ incubator/jspwiki/trunk/tests/java/org/ incubator/jspwiki/trunk/tests/java/org/apache/ incubator/jspwiki/trunk/tests/java/org/apache/wiki/ incubator/jspwiki/trunk/tests/java/org/apache/wiki/AllTests.java - copied, changed from r739575, incubator/jspwiki/trunk/tests/java/com/ecyrd/jspwiki/AllTests.java incubator/jspwiki/trunk/tests/java/org/apache/wiki/FileUtilTest.java - copied, changed from r739575, incubator/jspwiki/trunk/tests/java/com/ecyrd/jspwiki/FileUtilTest.java incubator/jspwiki/trunk/tests/java/org/apache/wiki/PageManagerTest.java - copied, changed from r739575, incubator/jspwiki/trunk/tests/java/com/ecyrd/jspwiki/PageManagerTest.java incubator/jspwiki/trunk/tests/java/org/apache/wiki/PropertyReaderTest.java - copied, changed from r739575, incubator/jspwiki/trunk/tests/java/com/ecyrd/jspwiki/PropertyReaderTest.java incubator/jspwiki/trunk/tests/java/org/apache/wiki/ReferenceManagerTest.java - copied, changed from r739575, incubator/jspwiki/trunk/tests/java/com/ecyrd/jspwiki/ReferenceManagerTest.java incubator/jspwiki/trunk/tests/java/org/apache/wiki/ReleaseTest.java - copied, changed from r739575, incubator/jspwiki/trunk/tests/java/com/ecyrd/jspwiki/ReleaseTest.java incubator/jspwiki/trunk/tests/java/org/apache/wiki/TestAuthorizer.java - copied, changed from r739575, incubator/jspwiki/trunk/tests/java/com/ecyrd/jspwiki/TestAuthorizer.java incubator/jspwiki/trunk/tests/java/org/apache/wiki/TestEngine.java - copied, changed from r739575, incubator/jspwiki/trunk/tests/java/com/ecyrd/jspwiki/TestEngine.java incubator/jspwiki/trunk/tests/java/org/apache/wiki/TestJDBCDataSource.java - copied, changed from r739575, incubator/jspwiki/trunk/tests/java/com/ecyrd/jspwiki/TestJDBCDataSource.java incubator/jspwiki/trunk/tests/java/org/apache/wiki/TestJNDIContext.java - copied, changed from r739575, incubator/jspwiki/trunk/tests/java/com/ecyrd/jspwiki/TestJNDIContext.java incubator/jspwiki/trunk/tests/java/org/apache/wiki/TextUtilTest.java - copied, changed from r739575, incubator/jspwiki/trunk/tests/java/com/ecyrd/jspwiki/TextUtilTest.java incubator/jspwiki/trunk/tests/java/org/apache/wiki/Util.java - copied, changed from r739575, incubator/jspwiki/trunk/tests/java/com/ecyrd/jspwiki/Util.java incubator/jspwiki/trunk/tests/java/org/apache/wiki/VariableManagerTest.java - copied, changed from r739575, incubator/jspwiki/trunk/tests/java/com/ecyrd/jspwiki/VariableManagerTest.java incubator/jspwiki/trunk/tests/java/org/apache/wiki/WikiEngineTest.java - copied, changed from r739575, incubator/jspwiki/trunk/tests/java/com/ecyrd/jspwiki/WikiEngineTest.java incubator/jspwiki/trunk/tests/java/org/apache/wiki/WikiSessionTest.java - copied, changed from r739575, incubator/jspwiki/trunk/tests/java/com/ecyrd/jspwiki/WikiSessionTest.java incubator/jspwiki/trunk/tests/java/org/apache/wiki/action/ - copied from r739575, incubator/jspwiki/trunk/tests/java/com/ecyrd/jspwiki/action/ incubator/jspwiki/trunk/tests/java/org/apache/wiki/attachment/ - copied from r739575, incubator/jspwiki/trunk/tests/java/com/ecyrd/jspwiki/attachment/ incubator/jspwiki/trunk/tests/java/org/apache/wiki/auth/ incubator/jspwiki/trunk/tests/java/org/apache/wiki/auth/AllTests.java - copied, changed from r739575, incubator/jspwiki/trunk/tests/java/com/ecyrd/jspwiki/auth/AllTests.java incubator/jspwiki/trunk/tests/java/org/apache/wiki/auth/AuthenticationManagerTest.java - copied, changed from r739575, incubator/jspwiki/trunk/tests/java/com/ecyrd/jspwiki/auth/AuthenticationManagerTest.java incubator/jspwiki/trunk/tests/java/org/apache/wiki/auth/AuthorizationManagerTest.java - copied, changed from r739575, incubator/jspwiki/trunk/tests/java/com/ecyrd/jspwiki/auth/AuthorizationManagerTest.java incubator/jspwiki/trunk/tests/java/org/apache/wiki/auth/GroupManagerTest.java - copied, changed from r739575, incubator/jspwiki/trunk/tests/java/com/ecyrd/jspwiki/auth/GroupManagerTest.java incubator/jspwiki/trunk/tests/java/org/apache/wiki/auth/SecurityEventTrap.java - copied, changed from r739575, incubator/jspwiki/trunk/tests/java/com/ecyrd/jspwiki/auth/SecurityEventTrap.java incubator/jspwiki/trunk/tests/java/org/apache/wiki/auth/UserManagerTest.java - copied, changed from r739575, incubator/jspwiki/trunk/tests/java/com/ecyrd/jspwiki/auth/UserManagerTest.java incubator/jspwiki/trunk/tests/java/org/apache/wiki/auth/Users.java - copied, changed from r739575, incubator/jspwiki/trunk/tests/java/com/ecyrd/jspwiki/auth/Users.java incubator/jspwiki/trunk/tests/java/org/apache/wiki/auth/acl/ - copied from r739575, incubator/jspwiki/trunk/tests/java/com/ecyrd/jspwiki/auth/acl/ incubator/jspwiki/trunk/tests/java/org/apache/wiki/auth/authorize/ - copied from r739575, incubator/jspwiki/trunk/tests/java/com/ecyrd/jspwiki/auth/authorize/ incubator/jspwiki/trunk/tests/java/org/apache/wiki/auth/login/ - copied from r739575, incubator/jspwiki/trunk/tests/java/com/ecyrd/jspwiki/auth/login/ incubator/jspwiki/trunk/tests/java/org/apache/wiki/auth/permissions/ - copied from r739575, incubator/jspwiki/trunk/tests/java/com/ecyrd/jspwiki/auth/permissions/ incubator/jspwiki/trunk/tests/java/org/apache/wiki/auth/user/ - copied from r739575, incubator/jspwiki/trunk/tests/java/com/ecyrd/jspwiki/auth/user/ incubator/jspwiki/trunk/tests/java/org/apache/wiki/content/ - copied from r739575, incubator/jspwiki/trunk/tests/java/com/ecyrd/jspwiki/content/ incubator/jspwiki/trunk/tests/java/org/apache/wiki/dav/ - copied from r739575, incubator/jspwiki/trunk/tests/java/com/ecyrd/jspwiki/dav/ incubator/jspwiki/trunk/tests/java/org/apache/wiki/diff/ - copied from r739575, incubator/jspwiki/trunk/tests/java/com/ecyrd/jspwiki/diff/ incubator/jspwiki/trunk/tests/java/org/apache/wiki/filters/ - copied from r739575, incubator/jspwiki/trunk/tests/java/com/ecyrd/jspwiki/filters/ incubator/jspwiki/trunk/tests/java/org/apache/wiki/htmltowiki/ - copied from r739575, incubator/jspwiki/trunk/tests/java/com/ecyrd/jspwiki/htmltowiki/ incubator/jspwiki/trunk/tests/java/org/apache/wiki/parser/ - copied from r739575, incubator/jspwiki/trunk/tests/java/com/ecyrd/jspwiki/parser/ incubator/jspwiki/trunk/tests/java/org/apache/wiki/plugin/ - copied from r739575, incubator/jspwiki/trunk/tests/java/com/ecyrd/jspwiki/plugin/ incubator/jspwiki/trunk/tests/java/org/apache/wiki/providers/ - copied from r739575, incubator/jspwiki/trunk/tests/java/com/ecyrd/jspwiki/providers/ incubator/jspwiki/trunk/tests/java/org/apache/wiki/render/ - copied from r739575, incubator/jspwiki/trunk/tests/java/com/ecyrd/jspwiki/render/ incubator/jspwiki/trunk/tests/java/org/apache/wiki/rss/ - copied from r739575, incubator/jspwiki/trunk/tests/java/com/ecyrd/jspwiki/rss/ incubator/jspwiki/trunk/tests/java/org/apache/wiki/search/ - copied from r739575, incubator/jspwiki/trunk/tests/java/com/ecyrd/jspwiki/search/ incubator/jspwiki/trunk/tests/java/org/apache/wiki/ui/ incubator/jspwiki/trunk/tests/java/org/apache/wiki/ui/AllTests.java - copied, changed from r739575, incubator/jspwiki/trunk/tests/java/com/ecyrd/jspwiki/ui/AllTests.java incubator/jspwiki/trunk/tests/java/org/apache/wiki/ui/InputValidatorTest.java - copied, changed from r739575, incubator/jspwiki/trunk/tests/java/com/ecyrd/jspwiki/ui/InputValidatorTest.java incubator/jspwiki/trunk/tests/java/org/apache/wiki/ui/migrator/ - copied from r739575, incubator/jspwiki/trunk/tests/java/com/ecyrd/jspwiki/ui/migrator/ incubator/jspwiki/trunk/tests/java/org/apache/wiki/ui/stripes/ - copied from r739575, incubator/jspwiki/trunk/tests/java/com/ecyrd/jspwiki/ui/stripes/ incubator/jspwiki/trunk/tests/java/org/apache/wiki/url/ - copied from r739575, incubator/jspwiki/trunk/tests/java/com/ecyrd/jspwiki/url/ incubator/jspwiki/trunk/tests/java/org/apache/wiki/util/ - copied from r739575, incubator/jspwiki/trunk/tests/java/com/ecyrd/jspwiki/util/ incubator/jspwiki/trunk/tests/java/org/apache/wiki/web/ - copied from r739575, incubator/jspwiki/trunk/tests/java/com/ecyrd/jspwiki/web/ incubator/jspwiki/trunk/tests/java/org/apache/wiki/workflow/ - copied from r739575, incubator/jspwiki/trunk/tests/java/com/ecyrd/jspwiki/workflow/ incubator/jspwiki/trunk/tests/java/org/apache/wiki/xmlrpc/ - copied from r739575, incubator/jspwiki/trunk/tests/java/com/ecyrd/jspwiki/xmlrpc/ Removed: incubator/jspwiki/trunk/src/java/com/ecyrd/jspwiki/InternalWikiException.java incubator/jspwiki/trunk/src/java/com/ecyrd/jspwiki/JCRWikiPage.java incubator/jspwiki/trunk/src/java/com/ecyrd/jspwiki/LinkCollector.java incubator/jspwiki/trunk/src/java/com/ecyrd/jspwiki/NoRequiredPropertyException.java incubator/jspwiki/trunk/src/java/com/ecyrd/jspwiki/NoSuchVariableException.java incubator/jspwiki/trunk/src/java/com/ecyrd/jspwiki/PageLock.java incubator/jspwiki/trunk/src/java/com/ecyrd/jspwiki/PageManager.java incubator/jspwiki/trunk/src/java/com/ecyrd/jspwiki/PageTimeComparator.java incubator/jspwiki/trunk/src/java/com/ecyrd/jspwiki/PropertyReader.java incubator/jspwiki/trunk/src/java/com/ecyrd/jspwiki/ReferenceManager.java incubator/jspwiki/trunk/src/java/com/ecyrd/jspwiki/Release.java incubator/jspwiki/trunk/src/java/com/ecyrd/jspwiki/StringTransmutator.java incubator/jspwiki/trunk/src/java/com/ecyrd/jspwiki/VariableManager.java incubator/jspwiki/trunk/src/java/com/ecyrd/jspwiki/WikiContext.java incubator/jspwiki/trunk/src/java/com/ecyrd/jspwiki/WikiEngine.java incubator/jspwiki/trunk/src/java/com/ecyrd/jspwiki/WikiProvider.java incubator/jspwiki/trunk/src/java/com/ecyrd/jspwiki/WikiServlet.java incubator/jspwiki/trunk/src/java/com/ecyrd/jspwiki/WikiSession.java incubator/jspwiki/trunk/src/java/com/ecyrd/jspwiki/action/ incubator/jspwiki/trunk/src/java/com/ecyrd/jspwiki/attachment/ incubator/jspwiki/trunk/src/java/com/ecyrd/jspwiki/auth/AuthenticationManager.java incubator/jspwiki/trunk/src/java/com/ecyrd/jspwiki/auth/AuthorizationManager.java incubator/jspwiki/trunk/src/java/com/ecyrd/jspwiki/auth/Authorizer.java incubator/jspwiki/trunk/src/java/com/ecyrd/jspwiki/auth/GroupPrincipal.java incubator/jspwiki/trunk/src/java/com/ecyrd/jspwiki/auth/NoSuchPrincipalException.java incubator/jspwiki/trunk/src/java/com/ecyrd/jspwiki/auth/PrincipalComparator.java incubator/jspwiki/trunk/src/java/com/ecyrd/jspwiki/auth/SecurityVerifier.java incubator/jspwiki/trunk/src/java/com/ecyrd/jspwiki/auth/SessionMonitor.java incubator/jspwiki/trunk/src/java/com/ecyrd/jspwiki/auth/UserManager.java incubator/jspwiki/trunk/src/java/com/ecyrd/jspwiki/auth/WikiPrincipal.java incubator/jspwiki/trunk/src/java/com/ecyrd/jspwiki/auth/WikiSecurityException.java incubator/jspwiki/trunk/src/java/com/ecyrd/jspwiki/auth/acl/ incubator/jspwiki/trunk/src/java/com/ecyrd/jspwiki/auth/authorize/ incubator/jspwiki/trunk/src/java/com/ecyrd/jspwiki/auth/login/ incubator/jspwiki/trunk/src/java/com/ecyrd/jspwiki/auth/package.html incubator/jspwiki/trunk/src/java/com/ecyrd/jspwiki/auth/permissions/ incubator/jspwiki/trunk/src/java/com/ecyrd/jspwiki/auth/user/ incubator/jspwiki/trunk/src/java/com/ecyrd/jspwiki/content/ incubator/jspwiki/trunk/src/java/com/ecyrd/jspwiki/dav/AttachmentDavProvider.java incubator/jspwiki/trunk/src/java/com/ecyrd/jspwiki/dav/DavContext.java incubator/jspwiki/trunk/src/java/com/ecyrd/jspwiki/dav/DavPath.java incubator/jspwiki/trunk/src/java/com/ecyrd/jspwiki/dav/DavProvider.java incubator/jspwiki/trunk/src/java/com/ecyrd/jspwiki/dav/DavUtil.java incubator/jspwiki/trunk/src/java/com/ecyrd/jspwiki/dav/HTMLPagesDavProvider.java incubator/jspwiki/trunk/src/java/com/ecyrd/jspwiki/dav/RawPagesDavProvider.java incubator/jspwiki/trunk/src/java/com/ecyrd/jspwiki/dav/WebdavServlet.java incubator/jspwiki/trunk/src/java/com/ecyrd/jspwiki/dav/WikiDavProvider.java incubator/jspwiki/trunk/src/java/com/ecyrd/jspwiki/dav/WikiDavServlet.java incubator/jspwiki/trunk/src/java/com/ecyrd/jspwiki/dav/WikiRootProvider.java incubator/jspwiki/trunk/src/java/com/ecyrd/jspwiki/dav/items/ incubator/jspwiki/trunk/src/java/com/ecyrd/jspwiki/dav/methods/ incubator/jspwiki/trunk/src/java/com/ecyrd/jspwiki/diff/ incubator/jspwiki/trunk/src/java/com/ecyrd/jspwiki/event/ incubator/jspwiki/trunk/src/java/com/ecyrd/jspwiki/filters/ incubator/jspwiki/trunk/src/java/com/ecyrd/jspwiki/forms/ incubator/jspwiki/trunk/src/java/com/ecyrd/jspwiki/htmltowiki/ incubator/jspwiki/trunk/src/java/com/ecyrd/jspwiki/i18n/ incubator/jspwiki/trunk/src/java/com/ecyrd/jspwiki/log/ incubator/jspwiki/trunk/src/java/com/ecyrd/jspwiki/modules/ incubator/jspwiki/trunk/src/java/com/ecyrd/jspwiki/package.html incubator/jspwiki/trunk/src/java/com/ecyrd/jspwiki/parser/ incubator/jspwiki/trunk/src/java/com/ecyrd/jspwiki/plugin/ incubator/jspwiki/trunk/src/java/com/ecyrd/jspwiki/preferences/ incubator/jspwiki/trunk/src/java/com/ecyrd/jspwiki/providers/ incubator/jspwiki/trunk/src/java/com/ecyrd/jspwiki/render/ incubator/jspwiki/trunk/src/java/com/ecyrd/jspwiki/rpc/RPCCallable.java incubator/jspwiki/trunk/src/java/com/ecyrd/jspwiki/rpc/RPCManager.java incubator/jspwiki/trunk/src/java/com/ecyrd/jspwiki/rpc/atom/ incubator/jspwiki/trunk/src/java/com/ecyrd/jspwiki/rpc/json/ incubator/jspwiki/trunk/src/java/com/ecyrd/jspwiki/rss/ incubator/jspwiki/trunk/src/java/com/ecyrd/jspwiki/search/ incubator/jspwiki/trunk/src/java/com/ecyrd/jspwiki/tags/ incubator/jspwiki/trunk/src/java/com/ecyrd/jspwiki/ui/Editor.java incubator/jspwiki/trunk/src/java/com/ecyrd/jspwiki/ui/EditorManager.java incubator/jspwiki/trunk/src/java/com/ecyrd/jspwiki/ui/GenericHTTPHandler.java incubator/jspwiki/trunk/src/java/com/ecyrd/jspwiki/ui/InputValidator.java incubator/jspwiki/trunk/src/java/com/ecyrd/jspwiki/ui/Installer.java incubator/jspwiki/trunk/src/java/com/ecyrd/jspwiki/ui/TemplateManager.java incubator/jspwiki/trunk/src/java/com/ecyrd/jspwiki/ui/WikiJSPFilter.java incubator/jspwiki/trunk/src/java/com/ecyrd/jspwiki/ui/WikiRequestWrapper.java incubator/jspwiki/trunk/src/java/com/ecyrd/jspwiki/ui/WikiServletFilter.java incubator/jspwiki/trunk/src/java/com/ecyrd/jspwiki/ui/admin/AdminBean.java incubator/jspwiki/trunk/src/java/com/ecyrd/jspwiki/ui/admin/AdminBeanManager.java incubator/jspwiki/trunk/src/java/com/ecyrd/jspwiki/ui/admin/SimpleAdminBean.java incubator/jspwiki/trunk/src/java/com/ecyrd/jspwiki/ui/admin/WikiFormAdminBean.java incubator/jspwiki/trunk/src/java/com/ecyrd/jspwiki/ui/admin/beans/ incubator/jspwiki/trunk/src/java/com/ecyrd/jspwiki/ui/admin/package.html incubator/jspwiki/trunk/src/java/com/ecyrd/jspwiki/ui/migrator/ incubator/jspwiki/trunk/src/java/com/ecyrd/jspwiki/ui/package.html incubator/jspwiki/trunk/src/java/com/ecyrd/jspwiki/ui/progress/ incubator/jspwiki/trunk/src/java/com/ecyrd/jspwiki/ui/stripes/ incubator/jspwiki/trunk/src/java/com/ecyrd/jspwiki/url/ incubator/jspwiki/trunk/src/java/com/ecyrd/jspwiki/util/ incubator/jspwiki/trunk/src/java/com/ecyrd/jspwiki/workflow/ incubator/jspwiki/trunk/src/java/com/ecyrd/jspwiki/xmlrpc/ incubator/jspwiki/trunk/src/java/com/ecyrd/management/ incubator/jspwiki/trunk/src/java/org/apache/jspwiki/api/ incubator/jspwiki/trunk/tests/java/com/ecyrd/jspwiki/AllTests.java incubator/jspwiki/trunk/tests/java/com/ecyrd/jspwiki/FileUtilTest.java incubator/jspwiki/trunk/tests/java/com/ecyrd/jspwiki/PageManagerTest.java incubator/jspwiki/trunk/tests/java/com/ecyrd/jspwiki/PropertyReaderTest.java incubator/jspwiki/trunk/tests/java/com/ecyrd/jspwiki/ReferenceManagerTest.java incubator/jspwiki/trunk/tests/java/com/ecyrd/jspwiki/ReleaseTest.java incubator/jspwiki/trunk/tests/java/com/ecyrd/jspwiki/TestAuthorizer.java incubator/jspwiki/trunk/tests/java/com/ecyrd/jspwiki/TestEngine.java incubator/jspwiki/trunk/tests/java/com/ecyrd/jspwiki/TestJDBCDataSource.java incubator/jspwiki/trunk/tests/java/com/ecyrd/jspwiki/TestJNDIContext.java incubator/jspwiki/trunk/tests/java/com/ecyrd/jspwiki/TextUtilTest.java incubator/jspwiki/trunk/tests/java/com/ecyrd/jspwiki/Util.java incubator/jspwiki/trunk/tests/java/com/ecyrd/jspwiki/VariableManagerTest.java incubator/jspwiki/trunk/tests/java/com/ecyrd/jspwiki/WikiEngineTest.java incubator/jspwiki/trunk/tests/java/com/ecyrd/jspwiki/WikiSessionTest.java incubator/jspwiki/trunk/tests/java/com/ecyrd/jspwiki/action/ incubator/jspwiki/trunk/tests/java/com/ecyrd/jspwiki/attachment/ incubator/jspwiki/trunk/tests/java/com/ecyrd/jspwiki/auth/AllTests.java incubator/jspwiki/trunk/tests/java/com/ecyrd/jspwiki/auth/AuthenticationManagerTest.java incubator/jspwiki/trunk/tests/java/com/ecyrd/jspwiki/auth/AuthorizationManagerTest.java incubator/jspwiki/trunk/tests/java/com/ecyrd/jspwiki/auth/GroupManagerTest.java incubator/jspwiki/trunk/tests/java/com/ecyrd/jspwiki/auth/SecurityEventTrap.java incubator/jspwiki/trunk/tests/java/com/ecyrd/jspwiki/auth/UserManagerTest.java incubator/jspwiki/trunk/tests/java/com/ecyrd/jspwiki/auth/Users.java incubator/jspwiki/trunk/tests/java/com/ecyrd/jspwiki/auth/acl/ incubator/jspwiki/trunk/tests/java/com/ecyrd/jspwiki/auth/authorize/ incubator/jspwiki/trunk/tests/java/com/ecyrd/jspwiki/auth/login/ incubator/jspwiki/trunk/tests/java/com/ecyrd/jspwiki/auth/permissions/ incubator/jspwiki/trunk/tests/java/com/ecyrd/jspwiki/auth/user/ incubator/jspwiki/trunk/tests/java/com/ecyrd/jspwiki/content/ incubator/jspwiki/trunk/tests/java/com/ecyrd/jspwiki/dav/ incubator/jspwiki/trunk/tests/java/com/ecyrd/jspwiki/diff/ incubator/jspwiki/trunk/tests/java/com/ecyrd/jspwiki/filters/ incubator/jspwiki/trunk/tests/java/com/ecyrd/jspwiki/htmltowiki/ incubator/jspwiki/trunk/tests/java/com/ecyrd/jspwiki/parser/ incubator/jspwiki/trunk/tests/java/com/ecyrd/jspwiki/plugin/ incubator/jspwiki/trunk/tests/java/com/ecyrd/jspwiki/providers/ incubator/jspwiki/trunk/tests/java/com/ecyrd/jspwiki/render/ incubator/jspwiki/trunk/tests/java/com/ecyrd/jspwiki/rss/ incubator/jspwiki/trunk/tests/java/com/ecyrd/jspwiki/search/ incubator/jspwiki/trunk/tests/java/com/ecyrd/jspwiki/ui/AllTests.java incubator/jspwiki/trunk/tests/java/com/ecyrd/jspwiki/ui/InputValidatorTest.java incubator/jspwiki/trunk/tests/java/com/ecyrd/jspwiki/ui/migrator/ incubator/jspwiki/trunk/tests/java/com/ecyrd/jspwiki/ui/stripes/ incubator/jspwiki/trunk/tests/java/com/ecyrd/jspwiki/url/ incubator/jspwiki/trunk/tests/java/com/ecyrd/jspwiki/util/ incubator/jspwiki/trunk/tests/java/com/ecyrd/jspwiki/web/ incubator/jspwiki/trunk/tests/java/com/ecyrd/jspwiki/workflow/ incubator/jspwiki/trunk/tests/java/com/ecyrd/jspwiki/xmlrpc/ Modified: incubator/jspwiki/trunk/ChangeLog incubator/jspwiki/trunk/build.xml incubator/jspwiki/trunk/doc/README - Stripes Migration incubator/jspwiki/trunk/etc/i18n/CoreResources.properties incubator/jspwiki/trunk/etc/i18n/CoreResources_de.properties incubator/jspwiki/trunk/etc/i18n/CoreResources_es.properties incubator/jspwiki/trunk/etc/i18n/CoreResources_fi.properties incubator/jspwiki/trunk/etc/i18n/CoreResources_fr.properties incubator/jspwiki/trunk/etc/i18n/CoreResources_it.properties incubator/jspwiki/trunk/etc/i18n/CoreResources_nl.properties incubator/jspwiki/trunk/etc/i18n/CoreResources_ru.properties incubator/jspwiki/trunk/etc/i18n/CoreResources_zh_CN.properties incubator/jspwiki/trunk/etc/ini/classmappings.xml incubator/jspwiki/trunk/etc/ini/jspwiki_module.xml incubator/jspwiki/trunk/etc/jspwiki.properties.tmpl incubator/jspwiki/trunk/src/WebContent/Captcha.jsp incubator/jspwiki/trunk/src/WebContent/Comment.jsp incubator/jspwiki/trunk/src/WebContent/CookieError.jsp incubator/jspwiki/trunk/src/WebContent/CreateProfile.jsp incubator/jspwiki/trunk/src/WebContent/Delete.jsp incubator/jspwiki/trunk/src/WebContent/DeleteGroup.jsp incubator/jspwiki/trunk/src/WebContent/Diff.jsp incubator/jspwiki/trunk/src/WebContent/Edit.jsp incubator/jspwiki/trunk/src/WebContent/EditGroup.jsp incubator/jspwiki/trunk/src/WebContent/Error.jsp incubator/jspwiki/trunk/src/WebContent/Group.jsp incubator/jspwiki/trunk/src/WebContent/Install.jsp incubator/jspwiki/trunk/src/WebContent/LoginForm.jsp incubator/jspwiki/trunk/src/WebContent/Logout.jsp incubator/jspwiki/trunk/src/WebContent/LostPassword.jsp incubator/jspwiki/trunk/src/WebContent/Message.jsp incubator/jspwiki/trunk/src/WebContent/NewBlogEntry.jsp incubator/jspwiki/trunk/src/WebContent/NewGroup.jsp incubator/jspwiki/trunk/src/WebContent/PageInfo.jsp incubator/jspwiki/trunk/src/WebContent/PageModified.jsp incubator/jspwiki/trunk/src/WebContent/Preview.jsp incubator/jspwiki/trunk/src/WebContent/Rename.jsp incubator/jspwiki/trunk/src/WebContent/Search.jsp incubator/jspwiki/trunk/src/WebContent/SisterSites.jsp incubator/jspwiki/trunk/src/WebContent/Upload.jsp incubator/jspwiki/trunk/src/WebContent/UserPreferences.jsp incubator/jspwiki/trunk/src/WebContent/WEB-INF/jspwiki.policy incubator/jspwiki/trunk/src/WebContent/WEB-INF/jspwiki.tld incubator/jspwiki/trunk/src/WebContent/WEB-INF/web.xml incubator/jspwiki/trunk/src/WebContent/Wiki.jsp incubator/jspwiki/trunk/src/WebContent/Workflow.jsp incubator/jspwiki/trunk/src/WebContent/admin/Admin.jsp incubator/jspwiki/trunk/src/WebContent/admin/SecurityConfig.jsp incubator/jspwiki/trunk/src/WebContent/rss.jsp incubator/jspwiki/trunk/src/WebContent/scripts/jspwiki-common.js incubator/jspwiki/trunk/src/WebContent/templates/default/AJAXCategories.jsp incubator/jspwiki/trunk/src/WebContent/templates/default/AJAXPreview.jsp incubator/jspwiki/trunk/src/WebContent/templates/default/AJAXSearch.jsp incubator/jspwiki/trunk/src/WebContent/templates/default/AttachmentTab.jsp incubator/jspwiki/trunk/src/WebContent/templates/default/CommentContent.jsp incubator/jspwiki/trunk/src/WebContent/templates/default/DiffTab.jsp incubator/jspwiki/trunk/src/WebContent/templates/default/EditContent.jsp incubator/jspwiki/trunk/src/WebContent/templates/default/EditGroupContent.jsp incubator/jspwiki/trunk/src/WebContent/templates/default/Favorites.jsp incubator/jspwiki/trunk/src/WebContent/templates/default/FindContent.jsp incubator/jspwiki/trunk/src/WebContent/templates/default/Footer.jsp incubator/jspwiki/trunk/src/WebContent/templates/default/GroupContent.jsp incubator/jspwiki/trunk/src/WebContent/templates/default/GroupTab.jsp incubator/jspwiki/trunk/src/WebContent/templates/default/Header.jsp incubator/jspwiki/trunk/src/WebContent/templates/default/InfoContent.jsp incubator/jspwiki/trunk/src/WebContent/templates/default/LoginContent.jsp incubator/jspwiki/trunk/src/WebContent/templates/default/LostPasswordContent.jsp incubator/jspwiki/trunk/src/WebContent/templates/default/NewGroupContent.jsp incubator/jspwiki/trunk/src/WebContent/templates/default/PageActionsTop.jsp incubator/jspwiki/trunk/src/WebContent/templates/default/PageContent.jsp incubator/jspwiki/trunk/src/WebContent/templates/default/PageTab.jsp incubator/jspwiki/trunk/src/WebContent/templates/default/PreferencesTab.jsp incubator/jspwiki/trunk/src/WebContent/templates/default/PreviewContent.jsp incubator/jspwiki/trunk/src/WebContent/templates/default/ProfileTab.jsp incubator/jspwiki/trunk/src/WebContent/templates/default/UploadTemplate.jsp incubator/jspwiki/trunk/src/WebContent/templates/default/UserBox.jsp incubator/jspwiki/trunk/src/WebContent/templates/default/ViewTemplate.jsp incubator/jspwiki/trunk/src/WebContent/templates/default/WorkflowContent.jsp incubator/jspwiki/trunk/src/WebContent/templates/default/admin/AdminTemplate.jsp incubator/jspwiki/trunk/src/WebContent/templates/default/admin/UserManagement.jsp incubator/jspwiki/trunk/src/WebContent/templates/default/commonheader.jsp incubator/jspwiki/trunk/src/WebContent/templates/default/editors/FCK.jsp incubator/jspwiki/trunk/src/WebContent/templates/default/editors/plain.jsp incubator/jspwiki/trunk/src/WebContent/templates/default/editors/preview.jsp incubator/jspwiki/trunk/src/java/org/apache/wiki/action/AbstractActionBean.java incubator/jspwiki/trunk/src/java/org/apache/wiki/action/AbstractPageActionBean.java incubator/jspwiki/trunk/src/java/org/apache/wiki/action/AdministerProfilesActionBean.java incubator/jspwiki/trunk/src/java/org/apache/wiki/action/AttachActionBean.java incubator/jspwiki/trunk/src/java/org/apache/wiki/action/CommentActionBean.java incubator/jspwiki/trunk/src/java/org/apache/wiki/action/DeleteActionBean.java incubator/jspwiki/trunk/src/java/org/apache/wiki/action/EditActionBean.java incubator/jspwiki/trunk/src/java/org/apache/wiki/action/ErrorActionBean.java incubator/jspwiki/trunk/src/java/org/apache/wiki/action/GroupActionBean.java incubator/jspwiki/trunk/src/java/org/apache/wiki/action/InstallActionBean.java incubator/jspwiki/trunk/src/java/org/apache/wiki/action/LoginActionBean.java incubator/jspwiki/trunk/src/java/org/apache/wiki/action/MessageActionBean.java incubator/jspwiki/trunk/src/java/org/apache/wiki/action/NewBlogEntryActionBean.java incubator/jspwiki/trunk/src/java/org/apache/wiki/action/NewPageActionBean.java incubator/jspwiki/trunk/src/java/org/apache/wiki/action/NoneActionBean.java incubator/jspwiki/trunk/src/java/org/apache/wiki/action/PageModifiedActionBean.java incubator/jspwiki/trunk/src/java/org/apache/wiki/action/RSSActionBean.java incubator/jspwiki/trunk/src/java/org/apache/wiki/action/RenameActionBean.java incubator/jspwiki/trunk/src/java/org/apache/wiki/action/SearchActionBean.java incubator/jspwiki/trunk/src/java/org/apache/wiki/action/UploadActionBean.java incubator/jspwiki/trunk/src/java/org/apache/wiki/action/UserPreferencesActionBean.java incubator/jspwiki/trunk/src/java/org/apache/wiki/action/UserProfileActionBean.java incubator/jspwiki/trunk/src/java/org/apache/wiki/action/ViewActionBean.java incubator/jspwiki/trunk/src/java/org/apache/wiki/action/WikiActionBean.java incubator/jspwiki/trunk/src/java/org/apache/wiki/action/WikiContextFactory.java incubator/jspwiki/trunk/src/java/org/apache/wiki/action/WorkflowActionBean.java incubator/jspwiki/trunk/src/java/org/apache/wiki/action/package.html incubator/jspwiki/trunk/src/java/org/apache/wiki/api/FilterException.java incubator/jspwiki/trunk/src/java/org/apache/wiki/api/ModuleData.java incubator/jspwiki/trunk/src/java/org/apache/wiki/api/PageFilter.java incubator/jspwiki/trunk/src/java/org/apache/wiki/api/PluginException.java incubator/jspwiki/trunk/src/java/org/apache/wiki/api/Release.java incubator/jspwiki/trunk/src/java/org/apache/wiki/api/WikiEngine.java incubator/jspwiki/trunk/src/java/org/apache/wiki/api/WikiException.java incubator/jspwiki/trunk/src/java/org/apache/wiki/api/WikiPage.java incubator/jspwiki/trunk/src/java/org/apache/wiki/api/WikiPlugin.java incubator/jspwiki/trunk/src/java/org/apache/wiki/api/WikiRenderer.java incubator/jspwiki/trunk/src/java/org/apache/wiki/api/WikiSession.java incubator/jspwiki/trunk/src/java/org/apache/wiki/attachment/Attachment.java incubator/jspwiki/trunk/src/java/org/apache/wiki/attachment/AttachmentManager.java incubator/jspwiki/trunk/src/java/org/apache/wiki/attachment/AttachmentServlet.java incubator/jspwiki/trunk/src/java/org/apache/wiki/attachment/DynamicAttachment.java incubator/jspwiki/trunk/src/java/org/apache/wiki/attachment/DynamicAttachmentProvider.java incubator/jspwiki/trunk/src/java/org/apache/wiki/attachment/package.html incubator/jspwiki/trunk/src/java/org/apache/wiki/auth/acl/Acl.java incubator/jspwiki/trunk/src/java/org/apache/wiki/auth/acl/AclEntry.java incubator/jspwiki/trunk/src/java/org/apache/wiki/auth/acl/AclEntryImpl.java incubator/jspwiki/trunk/src/java/org/apache/wiki/auth/acl/AclImpl.java incubator/jspwiki/trunk/src/java/org/apache/wiki/auth/acl/AclManager.java incubator/jspwiki/trunk/src/java/org/apache/wiki/auth/acl/DefaultAclManager.java incubator/jspwiki/trunk/src/java/org/apache/wiki/auth/acl/UnresolvedPrincipal.java incubator/jspwiki/trunk/src/java/org/apache/wiki/auth/authorize/Group.java incubator/jspwiki/trunk/src/java/org/apache/wiki/auth/authorize/GroupDatabase.java incubator/jspwiki/trunk/src/java/org/apache/wiki/auth/authorize/GroupManager.java incubator/jspwiki/trunk/src/java/org/apache/wiki/auth/authorize/JDBCGroupDatabase.java incubator/jspwiki/trunk/src/java/org/apache/wiki/auth/authorize/Role.java incubator/jspwiki/trunk/src/java/org/apache/wiki/auth/authorize/WebAuthorizer.java incubator/jspwiki/trunk/src/java/org/apache/wiki/auth/authorize/WebContainerAuthorizer.java incubator/jspwiki/trunk/src/java/org/apache/wiki/auth/authorize/XMLGroupDatabase.java incubator/jspwiki/trunk/src/java/org/apache/wiki/auth/login/AbstractLoginModule.java incubator/jspwiki/trunk/src/java/org/apache/wiki/auth/login/AnonymousLoginModule.java incubator/jspwiki/trunk/src/java/org/apache/wiki/auth/login/AuthorizerCallback.java incubator/jspwiki/trunk/src/java/org/apache/wiki/auth/login/CookieAssertionLoginModule.java incubator/jspwiki/trunk/src/java/org/apache/wiki/auth/login/CookieAuthenticationLoginModule.java incubator/jspwiki/trunk/src/java/org/apache/wiki/auth/login/HttpRequestCallback.java incubator/jspwiki/trunk/src/java/org/apache/wiki/auth/login/LocaleCallback.java incubator/jspwiki/trunk/src/java/org/apache/wiki/auth/login/PrincipalWrapper.java incubator/jspwiki/trunk/src/java/org/apache/wiki/auth/login/UserDatabaseCallback.java incubator/jspwiki/trunk/src/java/org/apache/wiki/auth/login/UserDatabaseLoginModule.java incubator/jspwiki/trunk/src/java/org/apache/wiki/auth/login/WebContainerCallbackHandler.java incubator/jspwiki/trunk/src/java/org/apache/wiki/auth/login/WebContainerLoginModule.java incubator/jspwiki/trunk/src/java/org/apache/wiki/auth/login/WikiCallbackHandler.java incubator/jspwiki/trunk/src/java/org/apache/wiki/auth/login/WikiEngineCallback.java incubator/jspwiki/trunk/src/java/org/apache/wiki/auth/permissions/AllPermission.java incubator/jspwiki/trunk/src/java/org/apache/wiki/auth/permissions/AllPermissionCollection.java incubator/jspwiki/trunk/src/java/org/apache/wiki/auth/permissions/GroupPermission.java incubator/jspwiki/trunk/src/java/org/apache/wiki/auth/permissions/PagePermission.java incubator/jspwiki/trunk/src/java/org/apache/wiki/auth/permissions/PermissionFactory.java incubator/jspwiki/trunk/src/java/org/apache/wiki/auth/permissions/WikiPermission.java incubator/jspwiki/trunk/src/java/org/apache/wiki/auth/user/AbstractUserDatabase.java incubator/jspwiki/trunk/src/java/org/apache/wiki/auth/user/DefaultUserProfile.java incubator/jspwiki/trunk/src/java/org/apache/wiki/auth/user/DuplicateUserException.java incubator/jspwiki/trunk/src/java/org/apache/wiki/auth/user/JDBCUserDatabase.java incubator/jspwiki/trunk/src/java/org/apache/wiki/auth/user/UserDatabase.java incubator/jspwiki/trunk/src/java/org/apache/wiki/auth/user/UserProfile.java incubator/jspwiki/trunk/src/java/org/apache/wiki/auth/user/XMLUserDatabase.java incubator/jspwiki/trunk/src/java/org/apache/wiki/content/ContentManager.java incubator/jspwiki/trunk/src/java/org/apache/wiki/content/PageRenamer.java incubator/jspwiki/trunk/src/java/org/apache/wiki/content/WikiName.java incubator/jspwiki/trunk/src/java/org/apache/wiki/dav/items/AttachmentDirectoryItem.java incubator/jspwiki/trunk/src/java/org/apache/wiki/dav/items/AttachmentItem.java incubator/jspwiki/trunk/src/java/org/apache/wiki/dav/items/DavItem.java incubator/jspwiki/trunk/src/java/org/apache/wiki/dav/items/DirectoryItem.java incubator/jspwiki/trunk/src/java/org/apache/wiki/dav/items/HTMLPageDavItem.java incubator/jspwiki/trunk/src/java/org/apache/wiki/dav/items/PageDavItem.java incubator/jspwiki/trunk/src/java/org/apache/wiki/dav/items/TopLevelDavItem.java incubator/jspwiki/trunk/src/java/org/apache/wiki/dav/methods/DavMethod.java incubator/jspwiki/trunk/src/java/org/apache/wiki/dav/methods/GetMethod.java incubator/jspwiki/trunk/src/java/org/apache/wiki/dav/methods/PropFindMethod.java incubator/jspwiki/trunk/src/java/org/apache/wiki/dav/methods/PropPatchMethod.java incubator/jspwiki/trunk/src/java/org/apache/wiki/diff/ContextualDiffProvider.java incubator/jspwiki/trunk/src/java/org/apache/wiki/diff/DiffProvider.java incubator/jspwiki/trunk/src/java/org/apache/wiki/diff/DifferenceManager.java incubator/jspwiki/trunk/src/java/org/apache/wiki/diff/ExternalDiffProvider.java incubator/jspwiki/trunk/src/java/org/apache/wiki/diff/TraditionalDiffProvider.java incubator/jspwiki/trunk/src/java/org/apache/wiki/event/PageEventFilter.java incubator/jspwiki/trunk/src/java/org/apache/wiki/event/WikiEngineEvent.java incubator/jspwiki/trunk/src/java/org/apache/wiki/event/WikiEvent.java incubator/jspwiki/trunk/src/java/org/apache/wiki/event/WikiEventListener.java incubator/jspwiki/trunk/src/java/org/apache/wiki/event/WikiEventManager.java incubator/jspwiki/trunk/src/java/org/apache/wiki/event/WikiEventUtils.java incubator/jspwiki/trunk/src/java/org/apache/wiki/event/WikiPageEvent.java incubator/jspwiki/trunk/src/java/org/apache/wiki/event/WikiPageRenameEvent.java incubator/jspwiki/trunk/src/java/org/apache/wiki/event/WikiSecurityEvent.java incubator/jspwiki/trunk/src/java/org/apache/wiki/event/WorkflowEvent.java incubator/jspwiki/trunk/src/java/org/apache/wiki/filters/BasicPageFilter.java incubator/jspwiki/trunk/src/java/org/apache/wiki/filters/CreoleFilter.java incubator/jspwiki/trunk/src/java/org/apache/wiki/filters/FilterManager.java incubator/jspwiki/trunk/src/java/org/apache/wiki/filters/PageFilter.java incubator/jspwiki/trunk/src/java/org/apache/wiki/filters/PingWeblogsComFilter.java incubator/jspwiki/trunk/src/java/org/apache/wiki/filters/ProfanityFilter.java incubator/jspwiki/trunk/src/java/org/apache/wiki/filters/RedirectException.java incubator/jspwiki/trunk/src/java/org/apache/wiki/filters/SpamFilter.java incubator/jspwiki/trunk/src/java/org/apache/wiki/forms/FormClose.java incubator/jspwiki/trunk/src/java/org/apache/wiki/forms/FormElement.java incubator/jspwiki/trunk/src/java/org/apache/wiki/forms/FormHandler.java incubator/jspwiki/trunk/src/java/org/apache/wiki/forms/FormInfo.java incubator/jspwiki/trunk/src/java/org/apache/wiki/forms/FormInput.java incubator/jspwiki/trunk/src/java/org/apache/wiki/forms/FormOpen.java incubator/jspwiki/trunk/src/java/org/apache/wiki/forms/FormOutput.java incubator/jspwiki/trunk/src/java/org/apache/wiki/forms/FormSelect.java incubator/jspwiki/trunk/src/java/org/apache/wiki/forms/FormSet.java incubator/jspwiki/trunk/src/java/org/apache/wiki/forms/FormTextarea.java incubator/jspwiki/trunk/src/java/org/apache/wiki/forms/package.html incubator/jspwiki/trunk/src/java/org/apache/wiki/htmltowiki/ForgetNullValuesLinkedHashMap.java incubator/jspwiki/trunk/src/java/org/apache/wiki/htmltowiki/HtmlStringToWikiTranslator.java incubator/jspwiki/trunk/src/java/org/apache/wiki/htmltowiki/PersistentMapDecorator.java incubator/jspwiki/trunk/src/java/org/apache/wiki/htmltowiki/PropertiesUtils.java incubator/jspwiki/trunk/src/java/org/apache/wiki/htmltowiki/WhitespaceTrimWriter.java incubator/jspwiki/trunk/src/java/org/apache/wiki/htmltowiki/XHtmlElementToWikiTranslator.java incubator/jspwiki/trunk/src/java/org/apache/wiki/htmltowiki/XHtmlToWikiConfig.java incubator/jspwiki/trunk/src/java/org/apache/wiki/i18n/InternationalizationManager.java incubator/jspwiki/trunk/src/java/org/apache/wiki/log/Logger.java incubator/jspwiki/trunk/src/java/org/apache/wiki/log/LoggerFactory.java incubator/jspwiki/trunk/src/java/org/apache/wiki/log/LoggerImpl.java incubator/jspwiki/trunk/src/java/org/apache/wiki/log/package.html incubator/jspwiki/trunk/src/java/org/apache/wiki/management/SimpleMBean.java incubator/jspwiki/trunk/src/java/org/apache/wiki/modules/InternalModule.java incubator/jspwiki/trunk/src/java/org/apache/wiki/modules/ModuleManager.java incubator/jspwiki/trunk/src/java/org/apache/wiki/modules/WikiModuleInfo.java incubator/jspwiki/trunk/src/java/org/apache/wiki/parser/CreoleToJSPWikiTranslator.java incubator/jspwiki/trunk/src/java/org/apache/wiki/parser/Heading.java incubator/jspwiki/trunk/src/java/org/apache/wiki/parser/HeadingListener.java incubator/jspwiki/trunk/src/java/org/apache/wiki/parser/JSPWikiMarkupParser.java incubator/jspwiki/trunk/src/java/org/apache/wiki/parser/LinkParser.java incubator/jspwiki/trunk/src/java/org/apache/wiki/parser/MarkupParser.java incubator/jspwiki/trunk/src/java/org/apache/wiki/parser/ParseException.java incubator/jspwiki/trunk/src/java/org/apache/wiki/parser/PluginContent.java incubator/jspwiki/trunk/src/java/org/apache/wiki/parser/VariableContent.java incubator/jspwiki/trunk/src/java/org/apache/wiki/parser/WikiDocument.java incubator/jspwiki/trunk/src/java/org/apache/wiki/plugin/AbstractReferralPlugin.java incubator/jspwiki/trunk/src/java/org/apache/wiki/plugin/BugReportHandler.java incubator/jspwiki/trunk/src/java/org/apache/wiki/plugin/Counter.java incubator/jspwiki/trunk/src/java/org/apache/wiki/plugin/CurrentTimePlugin.java incubator/jspwiki/trunk/src/java/org/apache/wiki/plugin/Denounce.java incubator/jspwiki/trunk/src/java/org/apache/wiki/plugin/Groups.java incubator/jspwiki/trunk/src/java/org/apache/wiki/plugin/IfPlugin.java incubator/jspwiki/trunk/src/java/org/apache/wiki/plugin/Image.java incubator/jspwiki/trunk/src/java/org/apache/wiki/plugin/IndexPlugin.java incubator/jspwiki/trunk/src/java/org/apache/wiki/plugin/InitializablePlugin.java incubator/jspwiki/trunk/src/java/org/apache/wiki/plugin/InsertPage.java incubator/jspwiki/trunk/src/java/org/apache/wiki/plugin/ListLocksPlugin.java incubator/jspwiki/trunk/src/java/org/apache/wiki/plugin/Note.java incubator/jspwiki/trunk/src/java/org/apache/wiki/plugin/ParserStagePlugin.java incubator/jspwiki/trunk/src/java/org/apache/wiki/plugin/PluginIndexPlugin.java incubator/jspwiki/trunk/src/java/org/apache/wiki/plugin/PluginManager.java incubator/jspwiki/trunk/src/java/org/apache/wiki/plugin/RPCSamplePlugin.java incubator/jspwiki/trunk/src/java/org/apache/wiki/plugin/RecentChangesPlugin.java incubator/jspwiki/trunk/src/java/org/apache/wiki/plugin/ReferredPagesPlugin.java incubator/jspwiki/trunk/src/java/org/apache/wiki/plugin/ReferringPagesPlugin.java incubator/jspwiki/trunk/src/java/org/apache/wiki/plugin/Search.java incubator/jspwiki/trunk/src/java/org/apache/wiki/plugin/SessionsPlugin.java incubator/jspwiki/trunk/src/java/org/apache/wiki/plugin/TableOfContents.java incubator/jspwiki/trunk/src/java/org/apache/wiki/plugin/UndefinedPagesPlugin.java incubator/jspwiki/trunk/src/java/org/apache/wiki/plugin/UnusedPagesPlugin.java incubator/jspwiki/trunk/src/java/org/apache/wiki/plugin/WeblogArchivePlugin.java incubator/jspwiki/trunk/src/java/org/apache/wiki/plugin/WeblogEntryPlugin.java incubator/jspwiki/trunk/src/java/org/apache/wiki/plugin/WeblogPlugin.java incubator/jspwiki/trunk/src/java/org/apache/wiki/plugin/WikiPlugin.java incubator/jspwiki/trunk/src/java/org/apache/wiki/plugin/package.html incubator/jspwiki/trunk/src/java/org/apache/wiki/preferences/Preferences.java incubator/jspwiki/trunk/src/java/org/apache/wiki/providers/AbstractFileProvider.java incubator/jspwiki/trunk/src/java/org/apache/wiki/providers/BasicAttachmentProvider.java incubator/jspwiki/trunk/src/java/org/apache/wiki/providers/CachingAttachmentProvider.java incubator/jspwiki/trunk/src/java/org/apache/wiki/providers/CachingProvider.java incubator/jspwiki/trunk/src/java/org/apache/wiki/providers/FastSearch.java incubator/jspwiki/trunk/src/java/org/apache/wiki/providers/FileSystemProvider.java incubator/jspwiki/trunk/src/java/org/apache/wiki/providers/NoSuchVersionException.java incubator/jspwiki/trunk/src/java/org/apache/wiki/providers/ProviderException.java incubator/jspwiki/trunk/src/java/org/apache/wiki/providers/RCSFileProvider.java incubator/jspwiki/trunk/src/java/org/apache/wiki/providers/RepositoryModifiedException.java incubator/jspwiki/trunk/src/java/org/apache/wiki/providers/VersioningFileProvider.java incubator/jspwiki/trunk/src/java/org/apache/wiki/providers/VersioningProvider.java incubator/jspwiki/trunk/src/java/org/apache/wiki/providers/WikiAttachmentProvider.java incubator/jspwiki/trunk/src/java/org/apache/wiki/providers/WikiPageProvider.java incubator/jspwiki/trunk/src/java/org/apache/wiki/render/CleanTextRenderer.java incubator/jspwiki/trunk/src/java/org/apache/wiki/render/CreoleRenderer.java incubator/jspwiki/trunk/src/java/org/apache/wiki/render/RenderingManager.java incubator/jspwiki/trunk/src/java/org/apache/wiki/render/WikiRenderer.java incubator/jspwiki/trunk/src/java/org/apache/wiki/render/WysiwygEditingRenderer.java incubator/jspwiki/trunk/src/java/org/apache/wiki/render/XHTMLRenderer.java incubator/jspwiki/trunk/src/java/org/apache/wiki/rpc/atom/AtomAPIServlet.java incubator/jspwiki/trunk/src/java/org/apache/wiki/rpc/json/JSONRPCManager.java incubator/jspwiki/trunk/src/java/org/apache/wiki/rss/AtomFeed.java incubator/jspwiki/trunk/src/java/org/apache/wiki/rss/Entry.java incubator/jspwiki/trunk/src/java/org/apache/wiki/rss/Feed.java incubator/jspwiki/trunk/src/java/org/apache/wiki/rss/RSS10Feed.java incubator/jspwiki/trunk/src/java/org/apache/wiki/rss/RSS20Feed.java incubator/jspwiki/trunk/src/java/org/apache/wiki/rss/RSSGenerator.java incubator/jspwiki/trunk/src/java/org/apache/wiki/rss/RSSThread.java incubator/jspwiki/trunk/src/java/org/apache/wiki/search/BasicSearchProvider.java incubator/jspwiki/trunk/src/java/org/apache/wiki/search/LuceneSearchProvider.java incubator/jspwiki/trunk/src/java/org/apache/wiki/search/QueryItem.java incubator/jspwiki/trunk/src/java/org/apache/wiki/search/SearchManager.java incubator/jspwiki/trunk/src/java/org/apache/wiki/search/SearchMatcher.java incubator/jspwiki/trunk/src/java/org/apache/wiki/search/SearchProvider.java incubator/jspwiki/trunk/src/java/org/apache/wiki/search/SearchResult.java incubator/jspwiki/trunk/src/java/org/apache/wiki/search/SearchResultComparator.java incubator/jspwiki/trunk/src/java/org/apache/wiki/search/package.html incubator/jspwiki/trunk/src/java/org/apache/wiki/tags/AdminBeanIteratorInfo.java incubator/jspwiki/trunk/src/java/org/apache/wiki/tags/AdminBeanIteratorTag.java incubator/jspwiki/trunk/src/java/org/apache/wiki/tags/AttachmentsIteratorInfo.java incubator/jspwiki/trunk/src/java/org/apache/wiki/tags/AttachmentsIteratorTag.java incubator/jspwiki/trunk/src/java/org/apache/wiki/tags/AuthorTag.java incubator/jspwiki/trunk/src/java/org/apache/wiki/tags/BaseURLTag.java incubator/jspwiki/trunk/src/java/org/apache/wiki/tags/BreadcrumbsTag.java incubator/jspwiki/trunk/src/java/org/apache/wiki/tags/CalendarTag.java incubator/jspwiki/trunk/src/java/org/apache/wiki/tags/CheckLockInfo.java incubator/jspwiki/trunk/src/java/org/apache/wiki/tags/CheckLockTag.java incubator/jspwiki/trunk/src/java/org/apache/wiki/tags/CheckRequestContextTag.java incubator/jspwiki/trunk/src/java/org/apache/wiki/tags/CheckVersionTag.java incubator/jspwiki/trunk/src/java/org/apache/wiki/tags/CommentLinkTag.java incubator/jspwiki/trunk/src/java/org/apache/wiki/tags/ContentEncodingTag.java incubator/jspwiki/trunk/src/java/org/apache/wiki/tags/ContentTag.java incubator/jspwiki/trunk/src/java/org/apache/wiki/tags/CookieTag.java incubator/jspwiki/trunk/src/java/org/apache/wiki/tags/DiffLinkTag.java incubator/jspwiki/trunk/src/java/org/apache/wiki/tags/EditLinkTag.java incubator/jspwiki/trunk/src/java/org/apache/wiki/tags/EditorIteratorInfo.java incubator/jspwiki/trunk/src/java/org/apache/wiki/tags/EditorIteratorTag.java incubator/jspwiki/trunk/src/java/org/apache/wiki/tags/EditorTag.java incubator/jspwiki/trunk/src/java/org/apache/wiki/tags/FeedDiscoveryTag.java incubator/jspwiki/trunk/src/java/org/apache/wiki/tags/HasAttachmentsTag.java incubator/jspwiki/trunk/src/java/org/apache/wiki/tags/HistoryIteratorInfo.java incubator/jspwiki/trunk/src/java/org/apache/wiki/tags/HistoryIteratorTag.java incubator/jspwiki/trunk/src/java/org/apache/wiki/tags/IfNoSearchResultsTag.java incubator/jspwiki/trunk/src/java/org/apache/wiki/tags/IncludeResourcesTag.java incubator/jspwiki/trunk/src/java/org/apache/wiki/tags/IncludeTag.java incubator/jspwiki/trunk/src/java/org/apache/wiki/tags/InsertDiffTag.java incubator/jspwiki/trunk/src/java/org/apache/wiki/tags/InsertPageTag.java incubator/jspwiki/trunk/src/java/org/apache/wiki/tags/IteratorTag.java incubator/jspwiki/trunk/src/java/org/apache/wiki/tags/LinkTag.java incubator/jspwiki/trunk/src/java/org/apache/wiki/tags/LinkToParentTag.java incubator/jspwiki/trunk/src/java/org/apache/wiki/tags/LinkToTag.java incubator/jspwiki/trunk/src/java/org/apache/wiki/tags/MessagesTag.java incubator/jspwiki/trunk/src/java/org/apache/wiki/tags/NextVersionTag.java incubator/jspwiki/trunk/src/java/org/apache/wiki/tags/NoSuchPageTag.java incubator/jspwiki/trunk/src/java/org/apache/wiki/tags/PageDateTag.java incubator/jspwiki/trunk/src/java/org/apache/wiki/tags/PageExistsTag.java incubator/jspwiki/trunk/src/java/org/apache/wiki/tags/PageInfoLinkTag.java incubator/jspwiki/trunk/src/java/org/apache/wiki/tags/PageNameTag.java incubator/jspwiki/trunk/src/java/org/apache/wiki/tags/PageSizeTag.java incubator/jspwiki/trunk/src/java/org/apache/wiki/tags/PageTypeTag.java incubator/jspwiki/trunk/src/java/org/apache/wiki/tags/PageVersionTag.java incubator/jspwiki/trunk/src/java/org/apache/wiki/tags/ParamHandler.java incubator/jspwiki/trunk/src/java/org/apache/wiki/tags/ParamTag.java incubator/jspwiki/trunk/src/java/org/apache/wiki/tags/ParentPageNameTag.java incubator/jspwiki/trunk/src/java/org/apache/wiki/tags/PermissionTag.java incubator/jspwiki/trunk/src/java/org/apache/wiki/tags/PluginTag.java incubator/jspwiki/trunk/src/java/org/apache/wiki/tags/PreviousVersionTag.java incubator/jspwiki/trunk/src/java/org/apache/wiki/tags/RSSImageLinkTag.java incubator/jspwiki/trunk/src/java/org/apache/wiki/tags/RSSLinkTag.java incubator/jspwiki/trunk/src/java/org/apache/wiki/tags/RequestResourceTag.java incubator/jspwiki/trunk/src/java/org/apache/wiki/tags/SearchResultIteratorInfo.java incubator/jspwiki/trunk/src/java/org/apache/wiki/tags/SearchResultIteratorTag.java incubator/jspwiki/trunk/src/java/org/apache/wiki/tags/SearchResultsSizeTag.java incubator/jspwiki/trunk/src/java/org/apache/wiki/tags/SearchResultsTag.java incubator/jspwiki/trunk/src/java/org/apache/wiki/tags/SetPaginationTag.java incubator/jspwiki/trunk/src/java/org/apache/wiki/tags/TabTag.java incubator/jspwiki/trunk/src/java/org/apache/wiki/tags/TabbedSectionTag.java incubator/jspwiki/trunk/src/java/org/apache/wiki/tags/TemplateDirTag.java incubator/jspwiki/trunk/src/java/org/apache/wiki/tags/TranslateTag.java incubator/jspwiki/trunk/src/java/org/apache/wiki/tags/UploadLinkTag.java incubator/jspwiki/trunk/src/java/org/apache/wiki/tags/UserCheckTag.java incubator/jspwiki/trunk/src/java/org/apache/wiki/tags/UserNameTag.java incubator/jspwiki/trunk/src/java/org/apache/wiki/tags/UserProfileTag.java incubator/jspwiki/trunk/src/java/org/apache/wiki/tags/VariableTag.java incubator/jspwiki/trunk/src/java/org/apache/wiki/tags/WikiBodyTag.java incubator/jspwiki/trunk/src/java/org/apache/wiki/tags/WikiLinkTag.java incubator/jspwiki/trunk/src/java/org/apache/wiki/tags/WikiTagBase.java incubator/jspwiki/trunk/src/java/org/apache/wiki/tags/package.html incubator/jspwiki/trunk/src/java/org/apache/wiki/ui/admin/beans/CoreBean.java incubator/jspwiki/trunk/src/java/org/apache/wiki/ui/admin/beans/PlainEditorAdminBean.java incubator/jspwiki/trunk/src/java/org/apache/wiki/ui/admin/beans/PluginBean.java incubator/jspwiki/trunk/src/java/org/apache/wiki/ui/admin/beans/SearchManagerBean.java incubator/jspwiki/trunk/src/java/org/apache/wiki/ui/admin/beans/UserBean.java incubator/jspwiki/trunk/src/java/org/apache/wiki/ui/migrator/AbstractJspTransformer.java incubator/jspwiki/trunk/src/java/org/apache/wiki/ui/migrator/AbstractNode.java incubator/jspwiki/trunk/src/java/org/apache/wiki/ui/migrator/Attribute.java incubator/jspwiki/trunk/src/java/org/apache/wiki/ui/migrator/BundleMigrator.java incubator/jspwiki/trunk/src/java/org/apache/wiki/ui/migrator/JSPWikiJspTransformer.java incubator/jspwiki/trunk/src/java/org/apache/wiki/ui/migrator/JspDocument.java incubator/jspwiki/trunk/src/java/org/apache/wiki/ui/migrator/JspMigrator.java incubator/jspwiki/trunk/src/java/org/apache/wiki/ui/migrator/JspParser.java incubator/jspwiki/trunk/src/java/org/apache/wiki/ui/migrator/JspTransformer.java incubator/jspwiki/trunk/src/java/org/apache/wiki/ui/migrator/Node.java incubator/jspwiki/trunk/src/java/org/apache/wiki/ui/migrator/NodeType.java incubator/jspwiki/trunk/src/java/org/apache/wiki/ui/migrator/StripesJspTransformer.java incubator/jspwiki/trunk/src/java/org/apache/wiki/ui/migrator/Tag.java incubator/jspwiki/trunk/src/java/org/apache/wiki/ui/migrator/Text.java incubator/jspwiki/trunk/src/java/org/apache/wiki/ui/progress/ProgressItem.java incubator/jspwiki/trunk/src/java/org/apache/wiki/ui/progress/ProgressManager.java incubator/jspwiki/trunk/src/java/org/apache/wiki/ui/stripes/DefaultWikiContext.java incubator/jspwiki/trunk/src/java/org/apache/wiki/ui/stripes/GroupTypeConverter.java incubator/jspwiki/trunk/src/java/org/apache/wiki/ui/stripes/HandlerInfo.java incubator/jspwiki/trunk/src/java/org/apache/wiki/ui/stripes/HandlerPermission.java incubator/jspwiki/trunk/src/java/org/apache/wiki/ui/stripes/LineDelimitedTypeConverter.java incubator/jspwiki/trunk/src/java/org/apache/wiki/ui/stripes/LocaleConverter.java incubator/jspwiki/trunk/src/java/org/apache/wiki/ui/stripes/PrincipalTypeConverter.java incubator/jspwiki/trunk/src/java/org/apache/wiki/ui/stripes/TimeZoneConverter.java incubator/jspwiki/trunk/src/java/org/apache/wiki/ui/stripes/WikiActionBeanContext.java incubator/jspwiki/trunk/src/java/org/apache/wiki/ui/stripes/WikiExceptionHandler.java incubator/jspwiki/trunk/src/java/org/apache/wiki/ui/stripes/WikiInterceptor.java incubator/jspwiki/trunk/src/java/org/apache/wiki/ui/stripes/WikiPageTypeConverter.java incubator/jspwiki/trunk/src/java/org/apache/wiki/ui/stripes/WikiRequestContext.java incubator/jspwiki/trunk/src/java/org/apache/wiki/ui/stripes/WikiRuntimeConfiguration.java incubator/jspwiki/trunk/src/java/org/apache/wiki/url/DefaultURLConstructor.java incubator/jspwiki/trunk/src/java/org/apache/wiki/url/ShortURLConstructor.java incubator/jspwiki/trunk/src/java/org/apache/wiki/url/ShortViewURLConstructor.java incubator/jspwiki/trunk/src/java/org/apache/wiki/url/StripesURLConstructor.java incubator/jspwiki/trunk/src/java/org/apache/wiki/url/URLConstructor.java incubator/jspwiki/trunk/src/java/org/apache/wiki/util/BlogUtil.java incubator/jspwiki/trunk/src/java/org/apache/wiki/util/ClassUtil.java incubator/jspwiki/trunk/src/java/org/apache/wiki/util/CommentedProperties.java incubator/jspwiki/trunk/src/java/org/apache/wiki/util/CryptoUtil.java incubator/jspwiki/trunk/src/java/org/apache/wiki/util/FileUtil.java incubator/jspwiki/trunk/src/java/org/apache/wiki/util/FormUtil.java incubator/jspwiki/trunk/src/java/org/apache/wiki/util/HttpUtil.java incubator/jspwiki/trunk/src/java/org/apache/wiki/util/MailUtil.java incubator/jspwiki/trunk/src/java/org/apache/wiki/util/PriorityList.java incubator/jspwiki/trunk/src/java/org/apache/wiki/util/ProviderConverter.java incubator/jspwiki/trunk/src/java/org/apache/wiki/util/RegExpUtil.java incubator/jspwiki/trunk/src/java/org/apache/wiki/util/Serializer.java incubator/jspwiki/trunk/src/java/org/apache/wiki/util/TextUtil.java incubator/jspwiki/trunk/src/java/org/apache/wiki/util/TimedCounterList.java incubator/jspwiki/trunk/src/java/org/apache/wiki/util/UtilJ2eeCompat.java incubator/jspwiki/trunk/src/java/org/apache/wiki/util/WatchDog.java incubator/jspwiki/trunk/src/java/org/apache/wiki/util/Watchable.java incubator/jspwiki/trunk/src/java/org/apache/wiki/util/WikiBackgroundThread.java incubator/jspwiki/trunk/src/java/org/apache/wiki/util/package.html incubator/jspwiki/trunk/src/java/org/apache/wiki/workflow/AbstractStep.java incubator/jspwiki/trunk/src/java/org/apache/wiki/workflow/Decision.java incubator/jspwiki/trunk/src/java/org/apache/wiki/workflow/DecisionQueue.java incubator/jspwiki/trunk/src/java/org/apache/wiki/workflow/DecisionRequiredException.java incubator/jspwiki/trunk/src/java/org/apache/wiki/workflow/Fact.java incubator/jspwiki/trunk/src/java/org/apache/wiki/workflow/NoSuchOutcomeException.java incubator/jspwiki/trunk/src/java/org/apache/wiki/workflow/Outcome.java incubator/jspwiki/trunk/src/java/org/apache/wiki/workflow/SimpleDecision.java incubator/jspwiki/trunk/src/java/org/apache/wiki/workflow/SimpleNotification.java incubator/jspwiki/trunk/src/java/org/apache/wiki/workflow/Step.java incubator/jspwiki/trunk/src/java/org/apache/wiki/workflow/SystemPrincipal.java incubator/jspwiki/trunk/src/java/org/apache/wiki/workflow/Task.java incubator/jspwiki/trunk/src/java/org/apache/wiki/workflow/Workflow.java incubator/jspwiki/trunk/src/java/org/apache/wiki/workflow/WorkflowBuilder.java incubator/jspwiki/trunk/src/java/org/apache/wiki/workflow/WorkflowManager.java incubator/jspwiki/trunk/src/java/org/apache/wiki/xmlrpc/AbstractRPCHandler.java incubator/jspwiki/trunk/src/java/org/apache/wiki/xmlrpc/MetaWeblogHandler.java incubator/jspwiki/trunk/src/java/org/apache/wiki/xmlrpc/RPCHandler.java incubator/jspwiki/trunk/src/java/org/apache/wiki/xmlrpc/RPCHandlerUTF8.java incubator/jspwiki/trunk/src/java/org/apache/wiki/xmlrpc/RPCServlet.java incubator/jspwiki/trunk/src/java/org/apache/wiki/xmlrpc/WikiRPCHandler.java incubator/jspwiki/trunk/src/wikipages/de/FullRecentChanges.txt incubator/jspwiki/trunk/src/wikipages/de/RecentChanges.txt incubator/jspwiki/trunk/src/wikipages/de/UndefinedPages.txt incubator/jspwiki/trunk/src/wikipages/de/UnusedPages.txt incubator/jspwiki/trunk/src/wikipages/en/FullRecentChanges.txt incubator/jspwiki/trunk/src/wikipages/en/RecentChanges.txt incubator/jspwiki/trunk/src/wikipages/en/UndefinedPages.txt incubator/jspwiki/trunk/src/wikipages/en/UnusedPages.txt incubator/jspwiki/trunk/src/wikipages/es/FullRecentChanges.txt incubator/jspwiki/trunk/src/wikipages/es/RecentChanges.txt incubator/jspwiki/trunk/src/wikipages/es/UndefinedPages.txt incubator/jspwiki/trunk/src/wikipages/es/UnusedPages.txt incubator/jspwiki/trunk/src/wikipages/fr/FullRecentChanges.txt incubator/jspwiki/trunk/src/wikipages/fr/RecentChanges.txt incubator/jspwiki/trunk/src/wikipages/it/FullRecentChanges.txt incubator/jspwiki/trunk/src/wikipages/it/RecentChanges.txt incubator/jspwiki/trunk/src/wikipages/it/UndefinedPages.txt incubator/jspwiki/trunk/src/wikipages/it/UnusedPages.txt incubator/jspwiki/trunk/src/wikipages/nl/FullRecentChanges.txt incubator/jspwiki/trunk/src/wikipages/nl/RecentChanges.txt incubator/jspwiki/trunk/src/wikipages/nl/UndefinedPages.txt incubator/jspwiki/trunk/src/wikipages/nl/UnusedPages.txt incubator/jspwiki/trunk/src/wikipages/zh_CN/FullRecentChanges.txt incubator/jspwiki/trunk/src/wikipages/zh_CN/RecentChanges.txt incubator/jspwiki/trunk/src/wikipages/zh_CN/UndefinedPages.txt incubator/jspwiki/trunk/src/wikipages/zh_CN/UnusedPages.txt incubator/jspwiki/trunk/tests/etc/TestPlugins.txt incubator/jspwiki/trunk/tests/etc/filters.xml incubator/jspwiki/trunk/tests/etc/ini/jspwiki_module.xml incubator/jspwiki/trunk/tests/etc/jspwiki-testUserPolicy.policy incubator/jspwiki/trunk/tests/etc/jspwiki.policy incubator/jspwiki/trunk/tests/etc/jspwiki.properties.tmpl incubator/jspwiki/trunk/tests/etc/jspwiki_rcs.properties.tmpl incubator/jspwiki/trunk/tests/etc/jspwiki_vers.properties.tmpl incubator/jspwiki/trunk/tests/java/SamplePlugin2.java incubator/jspwiki/trunk/tests/java/TranslationsCheck.java incubator/jspwiki/trunk/tests/java/com/foo/SamplePlugin3.java incubator/jspwiki/trunk/tests/java/org/apache/wiki/action/AllTests.java incubator/jspwiki/trunk/tests/java/org/apache/wiki/action/GroupActionBeanTest.java incubator/jspwiki/trunk/tests/java/org/apache/wiki/action/LoginActionBeanTest.java incubator/jspwiki/trunk/tests/java/org/apache/wiki/action/RenameActionBeanTest.java incubator/jspwiki/trunk/tests/java/org/apache/wiki/action/UserPreferencesActionBeanTest.java incubator/jspwiki/trunk/tests/java/org/apache/wiki/action/UserProfileActionBeanTest.java incubator/jspwiki/trunk/tests/java/org/apache/wiki/action/ViewActionBeanTest.java incubator/jspwiki/trunk/tests/java/org/apache/wiki/action/WikiContextFactoryTest.java incubator/jspwiki/trunk/tests/java/org/apache/wiki/attachment/AllTests.java incubator/jspwiki/trunk/tests/java/org/apache/wiki/attachment/AttachmentManagerTest.java incubator/jspwiki/trunk/tests/java/org/apache/wiki/auth/acl/AclEntryImplTest.java incubator/jspwiki/trunk/tests/java/org/apache/wiki/auth/acl/AclImplTest.java incubator/jspwiki/trunk/tests/java/org/apache/wiki/auth/acl/AllTests.java incubator/jspwiki/trunk/tests/java/org/apache/wiki/auth/acl/DefaultAclManagerTest.java incubator/jspwiki/trunk/tests/java/org/apache/wiki/auth/authorize/AllTests.java incubator/jspwiki/trunk/tests/java/org/apache/wiki/auth/authorize/GroupTest.java incubator/jspwiki/trunk/tests/java/org/apache/wiki/auth/authorize/JDBCGroupDatabaseTest.java incubator/jspwiki/trunk/tests/java/org/apache/wiki/auth/authorize/WebContainerAuthorizerTest.java incubator/jspwiki/trunk/tests/java/org/apache/wiki/auth/authorize/XMLGroupDatabaseTest.java incubator/jspwiki/trunk/tests/java/org/apache/wiki/auth/login/AllTests.java incubator/jspwiki/trunk/tests/java/org/apache/wiki/auth/login/AnonymousLoginModuleTest.java incubator/jspwiki/trunk/tests/java/org/apache/wiki/auth/login/CookieAssertionLoginModuleTest.java incubator/jspwiki/trunk/tests/java/org/apache/wiki/auth/login/UserDatabaseLoginModuleTest.java incubator/jspwiki/trunk/tests/java/org/apache/wiki/auth/login/WebContainerLoginModuleTest.java incubator/jspwiki/trunk/tests/java/org/apache/wiki/auth/permissions/AllPermissionCollectionTest.java incubator/jspwiki/trunk/tests/java/org/apache/wiki/auth/permissions/AllPermissionTest.java incubator/jspwiki/trunk/tests/java/org/apache/wiki/auth/permissions/AllTests.java incubator/jspwiki/trunk/tests/java/org/apache/wiki/auth/permissions/GroupPermissionTest.java incubator/jspwiki/trunk/tests/java/org/apache/wiki/auth/permissions/PagePermissionTest.java incubator/jspwiki/trunk/tests/java/org/apache/wiki/auth/permissions/WikiPermissionTest.java incubator/jspwiki/trunk/tests/java/org/apache/wiki/auth/user/AllTests.java incubator/jspwiki/trunk/tests/java/org/apache/wiki/auth/user/JDBCUserDatabaseTest.java incubator/jspwiki/trunk/tests/java/org/apache/wiki/auth/user/UserProfileTest.java incubator/jspwiki/trunk/tests/java/org/apache/wiki/auth/user/XMLUserDatabaseTest.java incubator/jspwiki/trunk/tests/java/org/apache/wiki/content/AllTests.java incubator/jspwiki/trunk/tests/java/org/apache/wiki/content/ContentManagerTest.java incubator/jspwiki/trunk/tests/java/org/apache/wiki/content/PageRenamerTest.java incubator/jspwiki/trunk/tests/java/org/apache/wiki/content/WikiNameTest.java incubator/jspwiki/trunk/tests/java/org/apache/wiki/dav/AllTests.java incubator/jspwiki/trunk/tests/java/org/apache/wiki/dav/AttachmentDavProviderTest.java incubator/jspwiki/trunk/tests/java/org/apache/wiki/dav/DavPathTest.java incubator/jspwiki/trunk/tests/java/org/apache/wiki/dav/HTMLPagesDavProviderTest.java incubator/jspwiki/trunk/tests/java/org/apache/wiki/dav/RawPagesDavProviderTest.java incubator/jspwiki/trunk/tests/java/org/apache/wiki/diff/AllTests.java incubator/jspwiki/trunk/tests/java/org/apache/wiki/diff/ContextualDiffProviderTest.java incubator/jspwiki/trunk/tests/java/org/apache/wiki/filters/AllTests.java incubator/jspwiki/trunk/tests/java/org/apache/wiki/filters/FilterManagerTest.java incubator/jspwiki/trunk/tests/java/org/apache/wiki/filters/TestFilter.java incubator/jspwiki/trunk/tests/java/org/apache/wiki/htmltowiki/AllTests.java incubator/jspwiki/trunk/tests/java/org/apache/wiki/htmltowiki/HtmlStringToWikiTranslatorTest.java incubator/jspwiki/trunk/tests/java/org/apache/wiki/parser/AllTests.java incubator/jspwiki/trunk/tests/java/org/apache/wiki/parser/CreoleToJSPWikiTranslatorTest.java incubator/jspwiki/trunk/tests/java/org/apache/wiki/parser/JSPWikiMarkupParserTest.java incubator/jspwiki/trunk/tests/java/org/apache/wiki/parser/MarkupParserTest.java incubator/jspwiki/trunk/tests/java/org/apache/wiki/plugin/AllTests.java incubator/jspwiki/trunk/tests/java/org/apache/wiki/plugin/CounterPluginTest.java incubator/jspwiki/trunk/tests/java/org/apache/wiki/plugin/DenouncePluginTest.java incubator/jspwiki/trunk/tests/java/org/apache/wiki/plugin/GroupsTest.java incubator/jspwiki/trunk/tests/java/org/apache/wiki/plugin/IndexPluginTest.java incubator/jspwiki/trunk/tests/java/org/apache/wiki/plugin/InsertPageTest.java incubator/jspwiki/trunk/tests/java/org/apache/wiki/plugin/JavaScriptPlugin.java incubator/jspwiki/trunk/tests/java/org/apache/wiki/plugin/PluginIndexPluginTest.java incubator/jspwiki/trunk/tests/java/org/apache/wiki/plugin/PluginManagerTest.java incubator/jspwiki/trunk/tests/java/org/apache/wiki/plugin/ReferredPagesPluginTest.java incubator/jspwiki/trunk/tests/java/org/apache/wiki/plugin/ReferringPagesPluginTest.java incubator/jspwiki/trunk/tests/java/org/apache/wiki/plugin/SamplePlugin.java incubator/jspwiki/trunk/tests/java/org/apache/wiki/plugin/TableOfContentsTest.java incubator/jspwiki/trunk/tests/java/org/apache/wiki/plugin/UndefinedPagesPluginTest.java incubator/jspwiki/trunk/tests/java/org/apache/wiki/providers/AllTests.java incubator/jspwiki/trunk/tests/java/org/apache/wiki/providers/BasicAttachmentProviderTest.java incubator/jspwiki/trunk/tests/java/org/apache/wiki/providers/CachingProviderTest.java incubator/jspwiki/trunk/tests/java/org/apache/wiki/providers/CounterProvider.java incubator/jspwiki/trunk/tests/java/org/apache/wiki/providers/FileSystemProviderTest.java incubator/jspwiki/trunk/tests/java/org/apache/wiki/providers/RCSFileProviderTest.java incubator/jspwiki/trunk/tests/java/org/apache/wiki/providers/VersioningFileProviderTest.java incubator/jspwiki/trunk/tests/java/org/apache/wiki/providers/VerySimpleProvider.java incubator/jspwiki/trunk/tests/java/org/apache/wiki/render/AllTests.java incubator/jspwiki/trunk/tests/java/org/apache/wiki/render/CreoleRendererTest.java incubator/jspwiki/trunk/tests/java/org/apache/wiki/render/RenderingManagerTest.java incubator/jspwiki/trunk/tests/java/org/apache/wiki/render/WysiwygEditingRendererTest.java incubator/jspwiki/trunk/tests/java/org/apache/wiki/rss/AllTests.java incubator/jspwiki/trunk/tests/java/org/apache/wiki/rss/RSSGeneratorTest.java incubator/jspwiki/trunk/tests/java/org/apache/wiki/search/AllTests.java incubator/jspwiki/trunk/tests/java/org/apache/wiki/search/SearchManagerTest.java incubator/jspwiki/trunk/tests/java/org/apache/wiki/ui/migrator/AllTests.java incubator/jspwiki/trunk/tests/java/org/apache/wiki/ui/migrator/BundleMigratorTest.java incubator/jspwiki/trunk/tests/java/org/apache/wiki/ui/migrator/JSPWikiJspTransformerTest.java incubator/jspwiki/trunk/tests/java/org/apache/wiki/ui/migrator/JspDocumentTest.java incubator/jspwiki/trunk/tests/java/org/apache/wiki/ui/migrator/JspParserTest.java incubator/jspwiki/trunk/tests/java/org/apache/wiki/ui/migrator/StripesJspTransformerTest.java incubator/jspwiki/trunk/tests/java/org/apache/wiki/ui/migrator/TagTest.java incubator/jspwiki/trunk/tests/java/org/apache/wiki/ui/stripes/AllTests.java incubator/jspwiki/trunk/tests/java/org/apache/wiki/ui/stripes/HandlerInfoTest.java incubator/jspwiki/trunk/tests/java/org/apache/wiki/url/AllTests.java incubator/jspwiki/trunk/tests/java/org/apache/wiki/url/DefaultURLConstructorTest.java incubator/jspwiki/trunk/tests/java/org/apache/wiki/url/ShortURLConstructorTest.java incubator/jspwiki/trunk/tests/java/org/apache/wiki/url/ShortViewURLConstructorTest.java incubator/jspwiki/trunk/tests/java/org/apache/wiki/util/AllTests.java incubator/jspwiki/trunk/tests/java/org/apache/wiki/util/ClassUtilTest.java incubator/jspwiki/trunk/tests/java/org/apache/wiki/util/CommentedPropertiesTest.java incubator/jspwiki/trunk/tests/java/org/apache/wiki/util/CryptoUtilTest.java incubator/jspwiki/trunk/tests/java/org/apache/wiki/util/MailUtilTest.java incubator/jspwiki/trunk/tests/java/org/apache/wiki/util/PriorityListTest.java incubator/jspwiki/trunk/tests/java/org/apache/wiki/util/SerializerTest.java incubator/jspwiki/trunk/tests/java/org/apache/wiki/util/TextUtilTest.java incubator/jspwiki/trunk/tests/java/org/apache/wiki/util/TimedCounterListTest.java incubator/jspwiki/trunk/tests/java/org/apache/wiki/util/UtilJ2eeCompatTest.java incubator/jspwiki/trunk/tests/java/org/apache/wiki/web/AllTests.java incubator/jspwiki/trunk/tests/java/org/apache/wiki/web/TestContainer.java incubator/jspwiki/trunk/tests/java/org/apache/wiki/workflow/AllTests.java incubator/jspwiki/trunk/tests/java/org/apache/wiki/workflow/ApprovalWorkflowTest.java incubator/jspwiki/trunk/tests/java/org/apache/wiki/workflow/DecisionQueueTest.java incubator/jspwiki/trunk/tests/java/org/apache/wiki/workflow/FactTest.java incubator/jspwiki/trunk/tests/java/org/apache/wiki/workflow/OutcomeTest.java incubator/jspwiki/trunk/tests/java/org/apache/wiki/workflow/SimpleDecisionTest.java incubator/jspwiki/trunk/tests/java/org/apache/wiki/workflow/TaskTest.java incubator/jspwiki/trunk/tests/java/org/apache/wiki/workflow/WorkflowManagerTest.java incubator/jspwiki/trunk/tests/java/org/apache/wiki/workflow/WorkflowTest.java incubator/jspwiki/trunk/tests/java/org/apache/wiki/xmlrpc/AllTests.java incubator/jspwiki/trunk/tests/java/org/apache/wiki/xmlrpc/RPCHandlerTest.java incubator/jspwiki/trunk/tests/java/stress/MassiveRepositoryTest.java incubator/jspwiki/trunk/tests/java/stress/StressTestRCSProvider.java incubator/jspwiki/trunk/tests/java/stress/StressTestSpeed.java incubator/jspwiki/trunk/tests/java/stress/StressTestVersioningProvider.java Modified: incubator/jspwiki/trunk/ChangeLog URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/ChangeLog?rev=739802&r1=739801&r2=739802&view=diff ============================================================================== --- incubator/jspwiki/trunk/ChangeLog (original) +++ incubator/jspwiki/trunk/ChangeLog Sun Feb 1 18:04:05 2009 @@ -1,3 +1,11 @@ +2009-01-30 Janne Jalkanen <howecatherine@example.com> + + * 3.0.0-svn-60 + + * [JSPWIKI-38] Packages renamed to the "org.apache.wiki" -hierarchy. + Certain documentation files like UPGRADING were not touched - they need + to be checked for 3.0 anyway. + 2009-01-30 Andrew Jaquith <howecatherine@example.com> * 3.0.0-svn-59 From jspwiki-commits-return-1218howecatherine@example.com Sun Feb 01 18:05:57 2009 Return-Path: <jspwiki-commits-return-1218howecatherine@example.com> Delivered-To: howecatherine@example.com Received: (qmail 56808 invoked from network); 1 Feb 2009 18:05:56 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (83.161.120.155) by minotaur.apache.org with SMTP; 1 Feb 2009 18:05:56 -0000 Received: (qmail 34070 invoked by uid 500); 1 Feb 2009 18:05:49 -0000 Delivered-To: howecatherine@example.com Received: (qmail 34061 invoked by uid 500); 1 Feb 2009 18:05:49 -0000 Mailing-List: contact howecatherine@example.com; run by ezmlm Precedence: bulk List-Help: <mailto:howecatherine@example.com> List-Unsubscribe: <mailto:howecatherine@example.com> List-Post: <mailto:howecatherine@example.com> List-Id: <jspwiki-commits.incubator.apache.org> Reply-To: howecatherine@example.com Delivered-To: mailing list howecatherine@example.com Received: (qmail 33955 invoked by uid 99); 1 Feb 2009 18:05:49 -0000 Received: from nike.apache.org (HELO nike.apache.org) (83.161.120.155) by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 01 Feb 2009 10:05:48 -0800 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [83.161.120.155] (HELO eris.apache.org) (83.161.120.155) by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 01 Feb 2009 18:05:42 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 639F52388B35; Sun, 1 Feb 2009 18:05:19 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r739802 [4/13] - in /incubator/jspwiki/trunk: ./ doc/ etc/ etc/i18n/ etc/ini/ src/WebContent/ src/WebContent/WEB-INF/ src/WebContent/admin/ src/WebContent/scripts/ src/WebContent/templates/default/ src/WebContent/templates/default/admin/ sr... Date: Sun, 01 Feb 2009 18:04:50 -0000 To: howecatherine@example.com From: howecatherine@example.com X-Mailer: svnmailer-1.0.8 Message-Id: <howecatherine@example.com> X-Virus-Checked: Checked by ClamAV on apache.org Copied: incubator/jspwiki/trunk/src/java/org/apache/wiki/WikiEngine.java (from r739575, incubator/jspwiki/trunk/src/java/com/ecyrd/jspwiki/WikiEngine.java) URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/java/org/apache/wiki/WikiEngine.java?p2=incubator/jspwiki/trunk/src/java/org/apache/wiki/WikiEngine.java&p1=incubator/jspwiki/trunk/src/java/com/ecyrd/jspwiki/WikiEngine.java&r1=739575&r2=739802&rev=739802&view=diff ============================================================================== --- incubator/jspwiki/trunk/src/java/com/ecyrd/jspwiki/WikiEngine.java (original) +++ incubator/jspwiki/trunk/src/java/org/apache/wiki/WikiEngine.java Sun Feb 1 18:04:05 2009 @@ -18,7 +18,7 @@ specific language governing permissions and limitations under the License. */ -package com.ecyrd.jspwiki; +package org.apache.wiki; import java.io.File; import java.io.IOException; @@ -37,52 +37,52 @@ import net.sourceforge.stripes.action.RedirectResolution; import org.apache.commons.lang.time.StopWatch; -import org.apache.jspwiki.api.FilterException; -import org.apache.jspwiki.api.WikiException; -import org.apache.jspwiki.api.WikiPage; - -import com.ecyrd.jspwiki.action.WikiActionBean; -import com.ecyrd.jspwiki.action.WikiContextFactory; -import com.ecyrd.jspwiki.attachment.Attachment; -import com.ecyrd.jspwiki.attachment.AttachmentManager; -import com.ecyrd.jspwiki.auth.AuthenticationManager; -import com.ecyrd.jspwiki.auth.AuthorizationManager; -import com.ecyrd.jspwiki.auth.UserManager; -import com.ecyrd.jspwiki.auth.acl.AclManager; -import com.ecyrd.jspwiki.auth.acl.DefaultAclManager; -import com.ecyrd.jspwiki.auth.authorize.GroupManager; -import com.ecyrd.jspwiki.content.ContentManager; -import com.ecyrd.jspwiki.content.PageRenamer; -import com.ecyrd.jspwiki.content.WikiName; -import com.ecyrd.jspwiki.diff.DifferenceManager; -import com.ecyrd.jspwiki.event.WikiEngineEvent; -import com.ecyrd.jspwiki.event.WikiEventListener; -import com.ecyrd.jspwiki.event.WikiEventManager; -import com.ecyrd.jspwiki.filters.FilterManager; -import com.ecyrd.jspwiki.i18n.InternationalizationManager; -import com.ecyrd.jspwiki.log.Logger; -import com.ecyrd.jspwiki.log.LoggerFactory; -import com.ecyrd.jspwiki.parser.JSPWikiMarkupParser; -import com.ecyrd.jspwiki.parser.MarkupParser; -import com.ecyrd.jspwiki.parser.WikiDocument; -import com.ecyrd.jspwiki.plugin.PluginManager; -import com.ecyrd.jspwiki.providers.ProviderException; -import com.ecyrd.jspwiki.providers.WikiPageProvider; -import com.ecyrd.jspwiki.render.RenderingManager; -import com.ecyrd.jspwiki.rss.RSSGenerator; -import com.ecyrd.jspwiki.rss.RSSThread; -import com.ecyrd.jspwiki.search.SearchManager; -import com.ecyrd.jspwiki.ui.EditorManager; -import com.ecyrd.jspwiki.ui.TemplateManager; -import com.ecyrd.jspwiki.ui.admin.AdminBeanManager; -import com.ecyrd.jspwiki.ui.progress.ProgressManager; -import com.ecyrd.jspwiki.ui.stripes.WikiActionBeanContext; -import com.ecyrd.jspwiki.ui.stripes.WikiInterceptor; -import com.ecyrd.jspwiki.url.URLConstructor; -import com.ecyrd.jspwiki.util.ClassUtil; -import com.ecyrd.jspwiki.util.TextUtil; -import com.ecyrd.jspwiki.util.WatchDog; -import com.ecyrd.jspwiki.workflow.*; +import org.apache.wiki.action.WikiActionBean; +import org.apache.wiki.action.WikiContextFactory; +import org.apache.wiki.api.FilterException; +import org.apache.wiki.api.WikiException; +import org.apache.wiki.api.WikiPage; +import org.apache.wiki.attachment.Attachment; +import org.apache.wiki.attachment.AttachmentManager; +import org.apache.wiki.auth.AuthenticationManager; +import org.apache.wiki.auth.AuthorizationManager; +import org.apache.wiki.auth.UserManager; +import org.apache.wiki.auth.acl.AclManager; +import org.apache.wiki.auth.acl.DefaultAclManager; +import org.apache.wiki.auth.authorize.GroupManager; +import org.apache.wiki.content.ContentManager; +import org.apache.wiki.content.PageRenamer; +import org.apache.wiki.content.WikiName; +import org.apache.wiki.diff.DifferenceManager; +import org.apache.wiki.event.WikiEngineEvent; +import org.apache.wiki.event.WikiEventListener; +import org.apache.wiki.event.WikiEventManager; +import org.apache.wiki.filters.FilterManager; +import org.apache.wiki.i18n.InternationalizationManager; +import org.apache.wiki.log.Logger; +import org.apache.wiki.log.LoggerFactory; +import org.apache.wiki.parser.JSPWikiMarkupParser; +import org.apache.wiki.parser.MarkupParser; +import org.apache.wiki.parser.WikiDocument; +import org.apache.wiki.plugin.PluginManager; +import org.apache.wiki.providers.ProviderException; +import org.apache.wiki.providers.WikiPageProvider; +import org.apache.wiki.render.RenderingManager; +import org.apache.wiki.rss.RSSGenerator; +import org.apache.wiki.rss.RSSThread; +import org.apache.wiki.search.SearchManager; +import org.apache.wiki.ui.EditorManager; +import org.apache.wiki.ui.TemplateManager; +import org.apache.wiki.ui.admin.AdminBeanManager; +import org.apache.wiki.ui.progress.ProgressManager; +import org.apache.wiki.ui.stripes.WikiActionBeanContext; +import org.apache.wiki.ui.stripes.WikiInterceptor; +import org.apache.wiki.url.URLConstructor; +import org.apache.wiki.util.ClassUtil; +import org.apache.wiki.util.TextUtil; +import org.apache.wiki.util.WatchDog; +import org.apache.wiki.workflow.*; + /** * Provides Wiki services to the JSP page. @@ -100,7 +100,7 @@ */ public class WikiEngine { - private static final String ATTR_WIKIENGINE = "com.ecyrd.jspwiki.WikiEngine"; + private static final String ATTR_WIKIENGINE = "org.apache.wiki.WikiEngine"; private static final Logger log = LoggerFactory.getLogger(WikiEngine.class); @@ -519,7 +519,7 @@ // Initialize the WikiContextFactory -- this MUST be done after setting the baseURL m_contextFactory = new WikiContextFactory( this, props ); - Class urlclass = ClassUtil.findClass( "com.ecyrd.jspwiki.url", + Class urlclass = ClassUtil.findClass( "org.apache.wiki.url", TextUtil.getStringProperty( props, PROP_URLCONSTRUCTOR, "DefaultURLConstructor" ) ); m_urlConstructor = (URLConstructor) urlclass.newInstance(); m_urlConstructor.initialize( this, props ); @@ -1071,7 +1071,7 @@ * <p>If the page is a special page, then returns a direct URL * to that page. Otherwise returns <code>null</code>. * This method delegates requests to - * {@link com.ecyrd.jspwiki.action.WikiContextFactory#getSpecialPageResolution(String)}. + * {@link org.apache.wiki.action.WikiContextFactory#getSpecialPageResolution(String)}. * </p> * <p> * Special pages are defined in jspwiki.properties using the jspwiki.specialPage @@ -1256,7 +1256,7 @@ * Returns the correct page name, or null, if no such * page can be found. Aliases are considered. This * method simply delegates to - * {@link com.ecyrd.jspwiki.action.WikiContextFactory#getFinalPageName(String)}. + * {@link org.apache.wiki.action.WikiContextFactory#getFinalPageName(String)}. * @since 2.0 * @param page Page name. * @return The rewritten page name, or null, if the page does not exist. @@ -1325,7 +1325,7 @@ } /** - * Returns the {@link com.ecyrd.jspwiki.workflow.WorkflowManager} associated with this + * Returns the {@link org.apache.wiki.workflow.WorkflowManager} associated with this * WikiEngine. If the WIkiEngine has not been initialized, this method will return * <code>null</code>. * @return the task queue @@ -1709,10 +1709,10 @@ * Writes the WikiText of a page into the * page repository. If the <code>jspwiki.properties</code> file contains * the property <code>jspwiki.approver.workflow.saveWikiPage</code> and - * its value resolves to a valid user, {@link com.ecyrd.jspwiki.auth.authorize.Group} - * or {@link com.ecyrd.jspwiki.auth.authorize.Role}, this method will - * place a {@link com.ecyrd.jspwiki.workflow.Decision} in the approver's - * workflow inbox and throw a {@link com.ecyrd.jspwiki.workflow.DecisionRequiredException}. + * its value resolves to a valid user, {@link org.apache.wiki.auth.authorize.Group} + * or {@link org.apache.wiki.auth.authorize.Role}, this method will + * place a {@link org.apache.wiki.workflow.Decision} in the approver's + * workflow inbox and throw a {@link org.apache.wiki.workflow.DecisionRequiredException}. * If the submitting user is authenticated and the page save is rejected, * a notification will be placed in the user's decision queue. * @@ -1721,9 +1721,9 @@ * @param text The Wiki markup for the page. * @throws WikiException if the save operation encounters an error during the * save operation. If the page-save operation requires approval, the exception will - * be of type {@link com.ecyrd.jspwiki.workflow.DecisionRequiredException}. Individual - * PageFilters, such as the {@link com.ecyrd.jspwiki.filters.SpamFilter} may also - * throw a {@link com.ecyrd.jspwiki.filters.RedirectException}. + * be of type {@link org.apache.wiki.workflow.DecisionRequiredException}. Individual + * PageFilters, such as the {@link org.apache.wiki.filters.SpamFilter} may also + * throw a {@link org.apache.wiki.filters.RedirectException}. */ public void saveText( WikiContext context, String text ) throws WikiException @@ -2155,34 +2155,34 @@ * <p>Factory method to create a named WikiContext from a supplied HTTP request. * This method is designed to be called <em>only</em> from within JSP scriptlets; * core classes in JSPWiki itself are expected to use either - * {@link com.ecyrd.jspwiki.action.WikiContextFactory#newContext(HttpServletRequest, HttpServletResponse, String)} + * {@link org.apache.wiki.action.WikiContextFactory#newContext(HttpServletRequest, HttpServletResponse, String)} * or - * {@link com.ecyrd.jspwiki.action.WikiContextFactory#newViewContext(HttpServletRequest, HttpServletResponse, WikiPage)} + * {@link org.apache.wiki.action.WikiContextFactory#newViewContext(HttpServletRequest, HttpServletResponse, WikiPage)} * instead.</p> - * <p>Note to JSP authors: JSPs that are bound to a {@link com.ecyrd.jspwiki.action.WikiActionBean} + * <p>Note to JSP authors: JSPs that are bound to a {@link org.apache.wiki.action.WikiActionBean} * and/or contain a <code>&lt;stripes:useActionBean&gt;</code> tag will automatically - * cause a WikiActionBean and {@link com.ecyrd.jspwiki.ui.stripes.WikiActionBeanContext} + * cause a WikiActionBean and {@link org.apache.wiki.ui.stripes.WikiActionBeanContext} * (a WikiContext object) to be created and bound in request scope. This WikiContext * instance will already exist by the time this method is called. So that the Stripes-provided * WikiContext is not overwritten inadvertently, this method uses the following algorithm * to safely return the WikiContext:</p> * <ul> * <li>If the request scope is non-null, it is examined for the presence of an ActionBean bound using the - * key {@link com.ecyrd.jspwiki.ui.stripes.WikiInterceptor#ATTR_ACTIONBEAN})</li> + * key {@link org.apache.wiki.ui.stripes.WikiInterceptor#ATTR_ACTIONBEAN})</li> * <li>If an ActionBean is found, its WikiActionBeanContext is returned - * (via {@link com.ecyrd.jspwiki.action.WikiActionBean#getContext()}</li> + * (via {@link org.apache.wiki.action.WikiActionBean#getContext()}</li> * <li>Otherwise, a new WikiContext is created by delegating to - * {@link com.ecyrd.jspwiki.action.WikiContextFactory#newContext(HttpServletRequest, HttpServletResponse, String)}</li> + * {@link org.apache.wiki.action.WikiContextFactory#newContext(HttpServletRequest, HttpServletResponse, String)}</li> * </ul> * <p>JSPs that are bound to WikiActionBeans can also recover the Stripes-stashed * WikiActionBean by calling - * {@link com.ecyrd.jspwiki.action.WikiContextFactory#findContext(javax.servlet.jsp.PageContext)} + * {@link org.apache.wiki.action.WikiContextFactory#findContext(javax.servlet.jsp.PageContext)} * instead of this method.</p> * @param request the HTTP request * @param requestContext the named context to use * @return the WikiActionBeanContext previously stashed by Stripes, or a new WikiContext if one was not found - * @see com.ecyrd.jspwiki.action.WikiContextFactory#newContext(HttpServletRequest, HttpServletResponse, String) - * @see com.ecyrd.jspwiki.action.WikiContextFactory#newViewContext(HttpServletRequest, HttpServletResponse, WikiPage) + * @see org.apache.wiki.action.WikiContextFactory#newContext(HttpServletRequest, HttpServletResponse, String) + * @see org.apache.wiki.action.WikiContextFactory#newViewContext(HttpServletRequest, HttpServletResponse, WikiPage) * @since 2.1.15. * @deprecated this method is retained for backwards compatibility with JSPs */ Copied: incubator/jspwiki/trunk/src/java/org/apache/wiki/WikiProvider.java (from r739575, incubator/jspwiki/trunk/src/java/com/ecyrd/jspwiki/WikiProvider.java) URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/java/org/apache/wiki/WikiProvider.java?p2=incubator/jspwiki/trunk/src/java/org/apache/wiki/WikiProvider.java&p1=incubator/jspwiki/trunk/src/java/com/ecyrd/jspwiki/WikiProvider.java&r1=739575&r2=739802&rev=739802&view=diff ============================================================================== --- incubator/jspwiki/trunk/src/java/com/ecyrd/jspwiki/WikiProvider.java (original) +++ incubator/jspwiki/trunk/src/java/org/apache/wiki/WikiProvider.java Sun Feb 1 18:04:05 2009 @@ -18,7 +18,7 @@ specific language governing permissions and limitations under the License. */ -package com.ecyrd.jspwiki; +package org.apache.wiki; import java.util.Properties; import java.io.IOException; Copied: incubator/jspwiki/trunk/src/java/org/apache/wiki/WikiServlet.java (from r739575, incubator/jspwiki/trunk/src/java/com/ecyrd/jspwiki/WikiServlet.java) URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/java/org/apache/wiki/WikiServlet.java?p2=incubator/jspwiki/trunk/src/java/org/apache/wiki/WikiServlet.java&p1=incubator/jspwiki/trunk/src/java/com/ecyrd/jspwiki/WikiServlet.java&r1=739575&r2=739802&rev=739802&view=diff ============================================================================== --- incubator/jspwiki/trunk/src/java/com/ecyrd/jspwiki/WikiServlet.java (original) +++ incubator/jspwiki/trunk/src/java/org/apache/wiki/WikiServlet.java Sun Feb 1 18:04:05 2009 @@ -18,16 +18,18 @@ specific language governing permissions and limitations under the License. */ -package com.ecyrd.jspwiki; +package org.apache.wiki; import javax.servlet.*; import javax.servlet.http.*; + +import org.apache.wiki.log.Logger; +import org.apache.wiki.log.LoggerFactory; +import org.apache.wiki.url.DefaultURLConstructor; + import java.io.*; -import com.ecyrd.jspwiki.log.Logger; -import com.ecyrd.jspwiki.log.LoggerFactory; -import com.ecyrd.jspwiki.url.DefaultURLConstructor; /** * This provides a master servlet for dealing with short urls. It mostly does @@ -61,7 +63,7 @@ * Destroys the WikiServlet; called by the servlet container * when shutting down the webapp. This method calls the * protected method {@link WikiEngine#shutdown()}, which - * sends {@link com.ecyrd.jspwiki.event.WikiEngineEvent#SHUTDOWN} + * sends {@link org.apache.wiki.event.WikiEngineEvent#SHUTDOWN} * events to registered listeners. * @see javax.servlet.GenericServlet#destroy() */ Copied: incubator/jspwiki/trunk/src/java/org/apache/wiki/WikiSession.java (from r739575, incubator/jspwiki/trunk/src/java/com/ecyrd/jspwiki/WikiSession.java) URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/java/org/apache/wiki/WikiSession.java?p2=incubator/jspwiki/trunk/src/java/org/apache/wiki/WikiSession.java&p1=incubator/jspwiki/trunk/src/java/com/ecyrd/jspwiki/WikiSession.java&r1=739575&r2=739802&rev=739802&view=diff ============================================================================== --- incubator/jspwiki/trunk/src/java/com/ecyrd/jspwiki/WikiSession.java (original) +++ incubator/jspwiki/trunk/src/java/org/apache/wiki/WikiSession.java Sun Feb 1 18:04:05 2009 @@ -18,7 +18,7 @@ specific language governing permissions and limitations under the License. */ -package com.ecyrd.jspwiki; +package org.apache.wiki; import java.security.AccessControlException; import java.security.Principal; @@ -29,18 +29,19 @@ import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpSession; -import com.ecyrd.jspwiki.log.Logger; -import com.ecyrd.jspwiki.log.LoggerFactory; +import org.apache.wiki.auth.*; +import org.apache.wiki.auth.authorize.Group; +import org.apache.wiki.auth.authorize.GroupManager; +import org.apache.wiki.auth.authorize.Role; +import org.apache.wiki.auth.user.UserDatabase; +import org.apache.wiki.auth.user.UserProfile; +import org.apache.wiki.event.WikiEvent; +import org.apache.wiki.event.WikiEventListener; +import org.apache.wiki.event.WikiSecurityEvent; +import org.apache.wiki.log.Logger; +import org.apache.wiki.log.LoggerFactory; + -import com.ecyrd.jspwiki.auth.*; -import com.ecyrd.jspwiki.auth.authorize.Group; -import com.ecyrd.jspwiki.auth.authorize.GroupManager; -import com.ecyrd.jspwiki.auth.authorize.Role; -import com.ecyrd.jspwiki.auth.user.UserDatabase; -import com.ecyrd.jspwiki.auth.user.UserProfile; -import com.ecyrd.jspwiki.event.WikiEvent; -import com.ecyrd.jspwiki.event.WikiEventListener; -import com.ecyrd.jspwiki.event.WikiSecurityEvent; /** * <p>Represents a long-running wiki session, with an associated user Principal, @@ -61,14 +62,14 @@ * <p>To keep track of the Principals each user posseses, each WikiSession * stores a JAAS Subject. Various login processes add or remove Principals * when users authenticate or log out.</p> - * <p>WikiSession implements the {@link com.ecyrd.jspwiki.event.WikiEventListener} + * <p>WikiSession implements the {@link org.apache.wiki.event.WikiEventListener} * interface and listens for group add/change/delete events fired by * event sources the WikiSession is registered with. Normally, - * {@link com.ecyrd.jspwiki.auth.AuthenticationManager} registers each WikiSession - * with the {@link com.ecyrd.jspwiki.auth.authorize.GroupManager} + * {@link org.apache.wiki.auth.AuthenticationManager} registers each WikiSession + * with the {@link org.apache.wiki.auth.authorize.GroupManager} * so it can catch group events. Thus, when a user is added to a - * {@link com.ecyrd.jspwiki.auth.authorize.Group}, a corresponding - * {@link com.ecyrd.jspwiki.auth.GroupPrincipal} is injected into + * {@link org.apache.wiki.auth.authorize.Group}, a corresponding + * {@link org.apache.wiki.auth.GroupPrincipal} is injected into * the Subject's Principal set. Likewise, when the user is removed from * the Group or the Group is deleted, the GroupPrincipal is removed * from the Subject. The effect that this strategy produces is extremely @@ -195,9 +196,9 @@ * true if any of these conditions are true:</p> * <ul> * <li>The session's Principal set contains - * {@link com.ecyrd.jspwiki.auth.authorize.Role#ANONYMOUS}</li> + * {@link org.apache.wiki.auth.authorize.Role#ANONYMOUS}</li> * <li>The session's Principal set contains - * {@link com.ecyrd.jspwiki.auth.WikiPrincipal#GUEST}</li> + * {@link org.apache.wiki.auth.WikiPrincipal#GUEST}</li> * <li>The Principal returned by {@link #getUserPrincipal()} evaluates * to an IP address.</li> * </ul> @@ -221,7 +222,7 @@ * <code>LOGIN_NAME</code>; the first one found is the login principal. * If one is not found, this method returns the first principal that isn't * of type Role or GroupPrincipal. If neither of these conditions hold, this method returns - * {@link com.ecyrd.jspwiki.auth.WikiPrincipal#GUEST}. + * {@link org.apache.wiki.auth.WikiPrincipal#GUEST}. * @return the login Principal. If it is a PrincipalWrapper containing an * externally-provided Principal, the object returned is the Principal, not * the wrapper around it. @@ -241,7 +242,7 @@ * collection that that isn't of type Role or GroupPrincipal is the primary.</li> * </ol> * If no primary user Principal is found, this method returns - * {@link com.ecyrd.jspwiki.auth.WikiPrincipal#GUEST}. + * {@link org.apache.wiki.auth.WikiPrincipal#GUEST}. * @return the primary user Principal */ public final Principal getUserPrincipal() @@ -357,7 +358,7 @@ * are those in the Subject's principal collection that aren't of type Role or * of type GroupPrincipal. This is a defensive copy. * @return Returns the user principal - * @see com.ecyrd.jspwiki.auth.AuthenticationManager#isUserPrincipal(Principal) + * @see org.apache.wiki.auth.AuthenticationManager#isUserPrincipal(Principal) */ public final Principal[] getPrincipals() { @@ -438,7 +439,7 @@ * Listens for WikiEvents generated by source objects such as the * GroupManager. This method adds Principals to the private Subject managed * by the WikiSession. - * @see com.ecyrd.jspwiki.event.WikiEventListener#actionPerformed(com.ecyrd.jspwiki.event.WikiEvent) + * @see org.apache.wiki.event.WikiEventListener#actionPerformed(org.apache.wiki.event.WikiEvent) * {@inheritDoc} */ public final void actionPerformed( WikiEvent event ) @@ -624,7 +625,7 @@ * each Principal. If the user is a member of the group, an equivalent * GroupPrincipal is injected into the user's principal set. Existing * GroupPrincipals are flushed and replaced. This method should generally be - * called after a user's {@link com.ecyrd.jspwiki.auth.user.UserProfile} is + * called after a user's {@link org.apache.wiki.auth.user.UserProfile} is * saved. If the wiki session is null, or there is no matching user profile, * the method returns silently. */ @@ -753,7 +754,7 @@ /** * Static factory method that creates a new "guest" session containing a single - * user Principal {@link com.ecyrd.jspwiki.auth.WikiPrincipal#GUEST}, + * user Principal {@link org.apache.wiki.auth.WikiPrincipal#GUEST}, * plus the role principals {@link Role#ALL} and * {@link Role#ANONYMOUS}. This method also adds the session as a listener * for GroupManager, AuthenticationManager and UserManager events. Modified: incubator/jspwiki/trunk/src/java/org/apache/wiki/action/AbstractActionBean.java URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/java/org/apache/wiki/action/AbstractActionBean.java?rev=739802&r1=739575&r2=739802&view=diff ============================================================================== --- incubator/jspwiki/trunk/src/java/org/apache/wiki/action/AbstractActionBean.java (original) +++ incubator/jspwiki/trunk/src/java/org/apache/wiki/action/AbstractActionBean.java Sun Feb 1 18:04:05 2009 @@ -19,15 +19,16 @@ under the License. */ -package com.ecyrd.jspwiki.action; +package org.apache.wiki.action; + +import org.apache.wiki.ui.stripes.WikiActionBeanContext; import net.sourceforge.stripes.action.ActionBeanContext; -import com.ecyrd.jspwiki.ui.stripes.WikiActionBeanContext; /** * <p> - * Abstract ActionBean superclass for all wiki actions, such as page actions ({@link com.ecyrd.jspwiki.WikiContext} + * Abstract ActionBean superclass for all wiki actions, such as page actions ({@link org.apache.wiki.WikiContext} * and subclasses), group actions (e.g., {@link GroupActionBean}), user * actions (e.g., {@link UserPreferencesActionBean}) and others. * </p> Modified: incubator/jspwiki/trunk/src/java/org/apache/wiki/action/AbstractPageActionBean.java URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/java/org/apache/wiki/action/AbstractPageActionBean.java?rev=739802&r1=739575&r2=739802&view=diff ============================================================================== --- incubator/jspwiki/trunk/src/java/org/apache/wiki/action/AbstractPageActionBean.java (original) +++ incubator/jspwiki/trunk/src/java/org/apache/wiki/action/AbstractPageActionBean.java Sun Feb 1 18:04:05 2009 @@ -19,22 +19,22 @@ under the License. */ -package com.ecyrd.jspwiki.action; +package org.apache.wiki.action; import net.sourceforge.stripes.validation.Validate; -import org.apache.jspwiki.api.WikiPage; +import org.apache.wiki.api.WikiPage; /** * Abstract {@link WikiActionBean} subclass used by all ActionBeans that use and - * process {@link org.apache.jspwiki.api.WikiPage} objects bound to the + * process {@link org.apache.wiki.api.WikiPage} objects bound to the * <code>page</code> request parameter. In particular, this subclass contains * special processing logic that ensures that, the <code>page</code> * properties of this object and its related - * {@link com.ecyrd.jspwiki.WikiContext} are set to the same value. When + * {@link org.apache.wiki.WikiContext} are set to the same value. When * {@link #setPage(WikiPage)} is called by, for example, the Stripes controller, * the underlying - * {@link com.ecyrd.jspwiki.ui.stripes.WikiActionBeanContext#setPage(WikiPage)} + * {@link org.apache.wiki.ui.stripes.WikiActionBeanContext#setPage(WikiPage)} * method is called also. */ public class AbstractPageActionBean extends AbstractActionBean @@ -54,7 +54,7 @@ /** * Sets the WikiPage property for this ActionBean, and also sets the * WikiActionBeanContext's page property to the same value by calling - * {@link com.ecyrd.jspwiki.ui.stripes.WikiActionBeanContext#setPage(WikiPage)}. + * {@link org.apache.wiki.ui.stripes.WikiActionBeanContext#setPage(WikiPage)}. * * @param page the wiki page. */ Modified: incubator/jspwiki/trunk/src/java/org/apache/wiki/action/AdministerProfilesActionBean.java URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/java/org/apache/wiki/action/AdministerProfilesActionBean.java?rev=739802&r1=739575&r2=739802&view=diff ============================================================================== --- incubator/jspwiki/trunk/src/java/org/apache/wiki/action/AdministerProfilesActionBean.java (original) +++ incubator/jspwiki/trunk/src/java/org/apache/wiki/action/AdministerProfilesActionBean.java Sun Feb 1 18:04:05 2009 @@ -19,20 +19,21 @@ under the License. */ -package com.ecyrd.jspwiki.action; +package org.apache.wiki.action; import java.util.List; +import org.apache.wiki.auth.NoSuchPrincipalException; +import org.apache.wiki.auth.WikiSecurityException; +import org.apache.wiki.auth.user.UserDatabase; +import org.apache.wiki.auth.user.UserProfile; +import org.apache.wiki.ui.stripes.WikiRequestContext; + import net.sourceforge.stripes.action.*; import net.sourceforge.stripes.validation.EmailTypeConverter; import net.sourceforge.stripes.validation.Validate; import net.sourceforge.stripes.validation.ValidateNestedProperties; -import com.ecyrd.jspwiki.auth.NoSuchPrincipalException; -import com.ecyrd.jspwiki.auth.WikiSecurityException; -import com.ecyrd.jspwiki.auth.user.UserDatabase; -import com.ecyrd.jspwiki.auth.user.UserProfile; -import com.ecyrd.jspwiki.ui.stripes.WikiRequestContext; /** * Manages the administration of UserProfiles, from the Administer Profiles Modified: incubator/jspwiki/trunk/src/java/org/apache/wiki/action/AttachActionBean.java URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/java/org/apache/wiki/action/AttachActionBean.java?rev=739802&r1=739575&r2=739802&view=diff ============================================================================== --- incubator/jspwiki/trunk/src/java/org/apache/wiki/action/AttachActionBean.java (original) +++ incubator/jspwiki/trunk/src/java/org/apache/wiki/action/AttachActionBean.java Sun Feb 1 18:04:05 2009 @@ -19,17 +19,18 @@ under the License. */ -package com.ecyrd.jspwiki.action; +package org.apache.wiki.action; + +import org.apache.wiki.attachment.Attachment; +import org.apache.wiki.auth.permissions.PagePermission; +import org.apache.wiki.ui.stripes.HandlerPermission; +import org.apache.wiki.ui.stripes.WikiRequestContext; import net.sourceforge.stripes.action.DefaultHandler; import net.sourceforge.stripes.action.HandlesEvent; import net.sourceforge.stripes.action.Resolution; import net.sourceforge.stripes.action.UrlBinding; -import com.ecyrd.jspwiki.attachment.Attachment; -import com.ecyrd.jspwiki.auth.permissions.PagePermission; -import com.ecyrd.jspwiki.ui.stripes.HandlerPermission; -import com.ecyrd.jspwiki.ui.stripes.WikiRequestContext; @UrlBinding("/attach/{page}/{attachment}") public class AttachActionBean extends AbstractPageActionBean Modified: incubator/jspwiki/trunk/src/java/org/apache/wiki/action/CommentActionBean.java URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/java/org/apache/wiki/action/CommentActionBean.java?rev=739802&r1=739575&r2=739802&view=diff ============================================================================== --- incubator/jspwiki/trunk/src/java/org/apache/wiki/action/CommentActionBean.java (original) +++ incubator/jspwiki/trunk/src/java/org/apache/wiki/action/CommentActionBean.java Sun Feb 1 18:04:05 2009 @@ -19,15 +19,16 @@ under the License. */ -package com.ecyrd.jspwiki.action; +package org.apache.wiki.action; + +import org.apache.wiki.auth.permissions.PagePermission; +import org.apache.wiki.ui.stripes.HandlerPermission; +import org.apache.wiki.ui.stripes.WikiRequestContext; import net.sourceforge.stripes.action.HandlesEvent; import net.sourceforge.stripes.action.Resolution; import net.sourceforge.stripes.action.UrlBinding; -import com.ecyrd.jspwiki.auth.permissions.PagePermission; -import com.ecyrd.jspwiki.ui.stripes.HandlerPermission; -import com.ecyrd.jspwiki.ui.stripes.WikiRequestContext; @UrlBinding("/Comment.jsp") public class CommentActionBean extends AbstractPageActionBean Modified: incubator/jspwiki/trunk/src/java/org/apache/wiki/action/DeleteActionBean.java URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/java/org/apache/wiki/action/DeleteActionBean.java?rev=739802&r1=739575&r2=739802&view=diff ============================================================================== --- incubator/jspwiki/trunk/src/java/org/apache/wiki/action/DeleteActionBean.java (original) +++ incubator/jspwiki/trunk/src/java/org/apache/wiki/action/DeleteActionBean.java Sun Feb 1 18:04:05 2009 @@ -19,15 +19,16 @@ under the License. */ -package com.ecyrd.jspwiki.action; +package org.apache.wiki.action; + +import org.apache.wiki.auth.permissions.PagePermission; +import org.apache.wiki.ui.stripes.HandlerPermission; +import org.apache.wiki.ui.stripes.WikiRequestContext; import net.sourceforge.stripes.action.HandlesEvent; import net.sourceforge.stripes.action.Resolution; import net.sourceforge.stripes.action.UrlBinding; -import com.ecyrd.jspwiki.auth.permissions.PagePermission; -import com.ecyrd.jspwiki.ui.stripes.HandlerPermission; -import com.ecyrd.jspwiki.ui.stripes.WikiRequestContext; @UrlBinding("/Delete.jsp") public class DeleteActionBean extends AbstractPageActionBean Modified: incubator/jspwiki/trunk/src/java/org/apache/wiki/action/EditActionBean.java URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/java/org/apache/wiki/action/EditActionBean.java?rev=739802&r1=739575&r2=739802&view=diff ============================================================================== --- incubator/jspwiki/trunk/src/java/org/apache/wiki/action/EditActionBean.java (original) +++ incubator/jspwiki/trunk/src/java/org/apache/wiki/action/EditActionBean.java Sun Feb 1 18:04:05 2009 @@ -19,19 +19,20 @@ under the License. */ -package com.ecyrd.jspwiki.action; +package org.apache.wiki.action; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpSession; +import org.apache.wiki.WikiContext; +import org.apache.wiki.auth.permissions.PagePermission; +import org.apache.wiki.filters.SpamFilter; +import org.apache.wiki.ui.EditorManager; +import org.apache.wiki.ui.stripes.HandlerPermission; +import org.apache.wiki.ui.stripes.WikiRequestContext; + import net.sourceforge.stripes.action.*; -import com.ecyrd.jspwiki.WikiContext; -import com.ecyrd.jspwiki.auth.permissions.PagePermission; -import com.ecyrd.jspwiki.filters.SpamFilter; -import com.ecyrd.jspwiki.ui.EditorManager; -import com.ecyrd.jspwiki.ui.stripes.HandlerPermission; -import com.ecyrd.jspwiki.ui.stripes.WikiRequestContext; @HttpCache( allow = false ) @UrlBinding( "/Edit.jsp" ) Modified: incubator/jspwiki/trunk/src/java/org/apache/wiki/action/ErrorActionBean.java URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/java/org/apache/wiki/action/ErrorActionBean.java?rev=739802&r1=739575&r2=739802&view=diff ============================================================================== --- incubator/jspwiki/trunk/src/java/org/apache/wiki/action/ErrorActionBean.java (original) +++ incubator/jspwiki/trunk/src/java/org/apache/wiki/action/ErrorActionBean.java Sun Feb 1 18:04:05 2009 @@ -19,9 +19,9 @@ under the License. */ -package com.ecyrd.jspwiki.action; +package org.apache.wiki.action; -import com.ecyrd.jspwiki.ui.stripes.WikiRequestContext; +import org.apache.wiki.ui.stripes.WikiRequestContext; import net.sourceforge.stripes.action.*; Modified: incubator/jspwiki/trunk/src/java/org/apache/wiki/action/GroupActionBean.java URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/java/org/apache/wiki/action/GroupActionBean.java?rev=739802&r1=739575&r2=739802&view=diff ============================================================================== --- incubator/jspwiki/trunk/src/java/org/apache/wiki/action/GroupActionBean.java (original) +++ incubator/jspwiki/trunk/src/java/org/apache/wiki/action/GroupActionBean.java Sun Feb 1 18:04:05 2009 @@ -19,31 +19,32 @@ under the License. */ -package com.ecyrd.jspwiki.action; +package org.apache.wiki.action; import java.security.Principal; import java.util.ArrayList; import java.util.List; +import org.apache.wiki.WikiEngine; +import org.apache.wiki.auth.WikiSecurityException; +import org.apache.wiki.auth.authorize.Group; +import org.apache.wiki.auth.authorize.GroupManager; +import org.apache.wiki.auth.authorize.Role; +import org.apache.wiki.auth.permissions.GroupPermission; +import org.apache.wiki.auth.permissions.WikiPermission; +import org.apache.wiki.ui.stripes.HandlerPermission; +import org.apache.wiki.ui.stripes.LineDelimitedTypeConverter; +import org.apache.wiki.ui.stripes.WikiRequestContext; + import net.sourceforge.stripes.action.*; import net.sourceforge.stripes.exception.StripesRuntimeException; import net.sourceforge.stripes.validation.*; -import com.ecyrd.jspwiki.WikiEngine; -import com.ecyrd.jspwiki.auth.WikiSecurityException; -import com.ecyrd.jspwiki.auth.authorize.Group; -import com.ecyrd.jspwiki.auth.authorize.GroupManager; -import com.ecyrd.jspwiki.auth.authorize.Role; -import com.ecyrd.jspwiki.auth.permissions.GroupPermission; -import com.ecyrd.jspwiki.auth.permissions.WikiPermission; -import com.ecyrd.jspwiki.ui.stripes.LineDelimitedTypeConverter; -import com.ecyrd.jspwiki.ui.stripes.HandlerPermission; -import com.ecyrd.jspwiki.ui.stripes.WikiRequestContext; /** * <p> * Views, creates, modifies and deletes - * {@link com.ecyrd.jspwiki.auth.authorize.Group} objects. The event handler + * {@link org.apache.wiki.auth.authorize.Group} objects. The event handler * methods are the following: * </p> * <ul> @@ -60,12 +61,12 @@ * {@link #setGroup(Group)}. Normally, this is set automatically by the Stripes * controller, which extracts the parameter <code>group</code> from the HTTP * request and converts it into a Group via - * {@link com.ecyrd.jspwiki.ui.stripes.GroupTypeConverter}. + * {@link org.apache.wiki.ui.stripes.GroupTypeConverter}. * </p> * <p> * All of the event handlers require the user to possess an appropriate - * {@link com.ecyrd.jspwiki.auth.permissions.GroupPermission} to execute. See - * each handler method's {@link com.ecyrd.jspwiki.ui.stripes.HandlerPermission} + * {@link org.apache.wiki.auth.permissions.GroupPermission} to execute. See + * each handler method's {@link org.apache.wiki.ui.stripes.HandlerPermission} * for details. * </p> */ @@ -136,7 +137,7 @@ * Saves an existing wiki Group. The members of the group to be saved are * returned by the method {@link #getMembers()}; these members are usually * set automatically by the - * {@link com.ecyrd.jspwiki.ui.stripes.PrincipalTypeConverter}. + * {@link org.apache.wiki.ui.stripes.PrincipalTypeConverter}. * * @return {@link net.sourceforge.stripes.action.ForwardResolution} to the * view page. @@ -156,9 +157,9 @@ * Saves a new wiki Group. The members of the group to be saved are returned * by the method {@link #getMembers()}; these members are usually set * automatically by the - * {@link com.ecyrd.jspwiki.ui.stripes.PrincipalTypeConverter}. This method + * {@link org.apache.wiki.ui.stripes.PrincipalTypeConverter}. This method * functions identically to {@link #save()} except that the - * {@link com.ecyrd.jspwiki.auth.permissions.GroupPermission} required to + * {@link org.apache.wiki.auth.permissions.GroupPermission} required to * execute it is different. * * @return {@link net.sourceforge.stripes.action.ForwardResolution} to the Modified: incubator/jspwiki/trunk/src/java/org/apache/wiki/action/InstallActionBean.java URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/java/org/apache/wiki/action/InstallActionBean.java?rev=739802&r1=739575&r2=739802&view=diff ============================================================================== --- incubator/jspwiki/trunk/src/java/org/apache/wiki/action/InstallActionBean.java (original) +++ incubator/jspwiki/trunk/src/java/org/apache/wiki/action/InstallActionBean.java Sun Feb 1 18:04:05 2009 @@ -19,19 +19,20 @@ under the License. */ -package com.ecyrd.jspwiki.action; +package org.apache.wiki.action; import java.security.Permission; +import org.apache.wiki.WikiEngine; +import org.apache.wiki.auth.NoSuchPrincipalException; +import org.apache.wiki.auth.UserManager; +import org.apache.wiki.auth.permissions.AllPermission; +import org.apache.wiki.auth.user.UserDatabase; +import org.apache.wiki.ui.Installer; +import org.apache.wiki.ui.stripes.WikiRequestContext; + import net.sourceforge.stripes.action.*; -import com.ecyrd.jspwiki.WikiEngine; -import com.ecyrd.jspwiki.auth.NoSuchPrincipalException; -import com.ecyrd.jspwiki.auth.UserManager; -import com.ecyrd.jspwiki.auth.permissions.AllPermission; -import com.ecyrd.jspwiki.auth.user.UserDatabase; -import com.ecyrd.jspwiki.ui.Installer; -import com.ecyrd.jspwiki.ui.stripes.WikiRequestContext; @UrlBinding( "/Install.jsp" ) public class InstallActionBean extends AbstractActionBean Modified: incubator/jspwiki/trunk/src/java/org/apache/wiki/action/LoginActionBean.java URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/java/org/apache/wiki/action/LoginActionBean.java?rev=739802&r1=739575&r2=739802&view=diff ============================================================================== --- incubator/jspwiki/trunk/src/java/org/apache/wiki/action/LoginActionBean.java (original) +++ incubator/jspwiki/trunk/src/java/org/apache/wiki/action/LoginActionBean.java Sun Feb 1 18:04:05 2009 @@ -19,7 +19,7 @@ under the License. */ -package com.ecyrd.jspwiki.action; +package org.apache.wiki.action; import java.security.Principal; import java.text.MessageFormat; @@ -33,26 +33,27 @@ import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpSession; +import org.apache.wiki.WikiContext; +import org.apache.wiki.WikiEngine; +import org.apache.wiki.WikiSession; +import org.apache.wiki.auth.NoSuchPrincipalException; +import org.apache.wiki.auth.WikiSecurityException; +import org.apache.wiki.auth.login.CookieAssertionLoginModule; +import org.apache.wiki.auth.login.CookieAuthenticationLoginModule; +import org.apache.wiki.auth.permissions.WikiPermission; +import org.apache.wiki.auth.user.UserDatabase; +import org.apache.wiki.auth.user.UserProfile; +import org.apache.wiki.log.Logger; +import org.apache.wiki.log.LoggerFactory; +import org.apache.wiki.ui.stripes.HandlerPermission; +import org.apache.wiki.ui.stripes.WikiRequestContext; +import org.apache.wiki.util.MailUtil; +import org.apache.wiki.util.TextUtil; + import net.sourceforge.stripes.action.*; import net.sourceforge.stripes.util.UrlBuilder; import net.sourceforge.stripes.validation.*; -import com.ecyrd.jspwiki.WikiContext; -import com.ecyrd.jspwiki.WikiEngine; -import com.ecyrd.jspwiki.WikiSession; -import com.ecyrd.jspwiki.auth.NoSuchPrincipalException; -import com.ecyrd.jspwiki.auth.WikiSecurityException; -import com.ecyrd.jspwiki.auth.login.CookieAssertionLoginModule; -import com.ecyrd.jspwiki.auth.login.CookieAuthenticationLoginModule; -import com.ecyrd.jspwiki.auth.permissions.WikiPermission; -import com.ecyrd.jspwiki.auth.user.UserDatabase; -import com.ecyrd.jspwiki.auth.user.UserProfile; -import com.ecyrd.jspwiki.log.Logger; -import com.ecyrd.jspwiki.log.LoggerFactory; -import com.ecyrd.jspwiki.ui.stripes.HandlerPermission; -import com.ecyrd.jspwiki.ui.stripes.WikiRequestContext; -import com.ecyrd.jspwiki.util.MailUtil; -import com.ecyrd.jspwiki.util.TextUtil; @UrlBinding( "/Login.action" ) public class LoginActionBean extends AbstractActionBean Modified: incubator/jspwiki/trunk/src/java/org/apache/wiki/action/MessageActionBean.java URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/java/org/apache/wiki/action/MessageActionBean.java?rev=739802&r1=739575&r2=739802&view=diff ============================================================================== --- incubator/jspwiki/trunk/src/java/org/apache/wiki/action/MessageActionBean.java (original) +++ incubator/jspwiki/trunk/src/java/org/apache/wiki/action/MessageActionBean.java Sun Feb 1 18:04:05 2009 @@ -19,9 +19,9 @@ under the License. */ -package com.ecyrd.jspwiki.action; +package org.apache.wiki.action; -import com.ecyrd.jspwiki.ui.stripes.WikiRequestContext; +import org.apache.wiki.ui.stripes.WikiRequestContext; import net.sourceforge.stripes.action.*; Modified: incubator/jspwiki/trunk/src/java/org/apache/wiki/action/NewBlogEntryActionBean.java URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/java/org/apache/wiki/action/NewBlogEntryActionBean.java?rev=739802&r1=739575&r2=739802&view=diff ============================================================================== --- incubator/jspwiki/trunk/src/java/org/apache/wiki/action/NewBlogEntryActionBean.java (original) +++ incubator/jspwiki/trunk/src/java/org/apache/wiki/action/NewBlogEntryActionBean.java Sun Feb 1 18:04:05 2009 @@ -19,15 +19,16 @@ under the License. */ -package com.ecyrd.jspwiki.action; +package org.apache.wiki.action; + +import org.apache.wiki.auth.permissions.WikiPermission; +import org.apache.wiki.ui.stripes.HandlerPermission; +import org.apache.wiki.ui.stripes.WikiRequestContext; import net.sourceforge.stripes.action.HandlesEvent; import net.sourceforge.stripes.action.Resolution; import net.sourceforge.stripes.action.UrlBinding; -import com.ecyrd.jspwiki.auth.permissions.WikiPermission; -import com.ecyrd.jspwiki.ui.stripes.HandlerPermission; -import com.ecyrd.jspwiki.ui.stripes.WikiRequestContext; @UrlBinding("/NewBlogEntry.jsp") public class NewBlogEntryActionBean extends AbstractActionBean Modified: incubator/jspwiki/trunk/src/java/org/apache/wiki/action/NewPageActionBean.java URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/java/org/apache/wiki/action/NewPageActionBean.java?rev=739802&r1=739575&r2=739802&view=diff ============================================================================== --- incubator/jspwiki/trunk/src/java/org/apache/wiki/action/NewPageActionBean.java (original) +++ incubator/jspwiki/trunk/src/java/org/apache/wiki/action/NewPageActionBean.java Sun Feb 1 18:04:05 2009 @@ -19,15 +19,16 @@ under the License. */ -package com.ecyrd.jspwiki.action; +package org.apache.wiki.action; + +import org.apache.wiki.auth.permissions.WikiPermission; +import org.apache.wiki.ui.stripes.HandlerPermission; +import org.apache.wiki.ui.stripes.WikiRequestContext; import net.sourceforge.stripes.action.HandlesEvent; import net.sourceforge.stripes.action.Resolution; import net.sourceforge.stripes.action.UrlBinding; -import com.ecyrd.jspwiki.auth.permissions.WikiPermission; -import com.ecyrd.jspwiki.ui.stripes.HandlerPermission; -import com.ecyrd.jspwiki.ui.stripes.WikiRequestContext; @UrlBinding("/NewPage.jsp") public class NewPageActionBean extends AbstractActionBean Modified: incubator/jspwiki/trunk/src/java/org/apache/wiki/action/NoneActionBean.java URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/java/org/apache/wiki/action/NoneActionBean.java?rev=739802&r1=739575&r2=739802&view=diff ============================================================================== --- incubator/jspwiki/trunk/src/java/org/apache/wiki/action/NoneActionBean.java (original) +++ incubator/jspwiki/trunk/src/java/org/apache/wiki/action/NoneActionBean.java Sun Feb 1 18:04:05 2009 @@ -19,9 +19,9 @@ under the License. */ -package com.ecyrd.jspwiki.action; +package org.apache.wiki.action; -import com.ecyrd.jspwiki.ui.stripes.WikiRequestContext; +import org.apache.wiki.ui.stripes.WikiRequestContext; import net.sourceforge.stripes.action.DefaultHandler; import net.sourceforge.stripes.action.HandlesEvent; Modified: incubator/jspwiki/trunk/src/java/org/apache/wiki/action/PageModifiedActionBean.java URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/java/org/apache/wiki/action/PageModifiedActionBean.java?rev=739802&r1=739575&r2=739802&view=diff ============================================================================== --- incubator/jspwiki/trunk/src/java/org/apache/wiki/action/PageModifiedActionBean.java (original) +++ incubator/jspwiki/trunk/src/java/org/apache/wiki/action/PageModifiedActionBean.java Sun Feb 1 18:04:05 2009 @@ -19,15 +19,16 @@ under the License. */ -package com.ecyrd.jspwiki.action; +package org.apache.wiki.action; + +import org.apache.wiki.auth.permissions.PagePermission; +import org.apache.wiki.ui.stripes.HandlerPermission; +import org.apache.wiki.ui.stripes.WikiRequestContext; import net.sourceforge.stripes.action.HandlesEvent; import net.sourceforge.stripes.action.Resolution; import net.sourceforge.stripes.action.UrlBinding; -import com.ecyrd.jspwiki.auth.permissions.PagePermission; -import com.ecyrd.jspwiki.ui.stripes.HandlerPermission; -import com.ecyrd.jspwiki.ui.stripes.WikiRequestContext; @UrlBinding( "/PageModified.jsp" ) public class PageModifiedActionBean extends AbstractActionBean Modified: incubator/jspwiki/trunk/src/java/org/apache/wiki/action/RSSActionBean.java URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/java/org/apache/wiki/action/RSSActionBean.java?rev=739802&r1=739575&r2=739802&view=diff ============================================================================== --- incubator/jspwiki/trunk/src/java/org/apache/wiki/action/RSSActionBean.java (original) +++ incubator/jspwiki/trunk/src/java/org/apache/wiki/action/RSSActionBean.java Sun Feb 1 18:04:05 2009 @@ -19,15 +19,16 @@ under the License. */ -package com.ecyrd.jspwiki.action; +package org.apache.wiki.action; + +import org.apache.wiki.auth.permissions.PagePermission; +import org.apache.wiki.ui.stripes.HandlerPermission; +import org.apache.wiki.ui.stripes.WikiRequestContext; import net.sourceforge.stripes.action.HandlesEvent; import net.sourceforge.stripes.action.Resolution; import net.sourceforge.stripes.action.UrlBinding; -import com.ecyrd.jspwiki.auth.permissions.PagePermission; -import com.ecyrd.jspwiki.ui.stripes.HandlerPermission; -import com.ecyrd.jspwiki.ui.stripes.WikiRequestContext; @UrlBinding( "/rss.jsp" ) public class RSSActionBean extends AbstractActionBean Modified: incubator/jspwiki/trunk/src/java/org/apache/wiki/action/RenameActionBean.java URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/java/org/apache/wiki/action/RenameActionBean.java?rev=739802&r1=739575&r2=739802&view=diff ============================================================================== --- incubator/jspwiki/trunk/src/java/org/apache/wiki/action/RenameActionBean.java (original) +++ incubator/jspwiki/trunk/src/java/org/apache/wiki/action/RenameActionBean.java Sun Feb 1 18:04:05 2009 @@ -19,12 +19,18 @@ under the License. */ -package com.ecyrd.jspwiki.action; +package org.apache.wiki.action; import javax.servlet.http.HttpServletRequest; -import org.apache.jspwiki.api.WikiException; -import org.apache.jspwiki.api.WikiPage; +import org.apache.wiki.WikiEngine; +import org.apache.wiki.api.WikiException; +import org.apache.wiki.api.WikiPage; +import org.apache.wiki.auth.permissions.PagePermission; +import org.apache.wiki.log.Logger; +import org.apache.wiki.log.LoggerFactory; +import org.apache.wiki.ui.stripes.HandlerPermission; +import org.apache.wiki.ui.stripes.WikiRequestContext; import net.sourceforge.stripes.action.HandlesEvent; import net.sourceforge.stripes.action.RedirectResolution; @@ -32,16 +38,10 @@ import net.sourceforge.stripes.action.UrlBinding; import net.sourceforge.stripes.validation.*; -import com.ecyrd.jspwiki.WikiEngine; -import com.ecyrd.jspwiki.auth.permissions.PagePermission; -import com.ecyrd.jspwiki.log.Logger; -import com.ecyrd.jspwiki.log.LoggerFactory; -import com.ecyrd.jspwiki.ui.stripes.HandlerPermission; -import com.ecyrd.jspwiki.ui.stripes.WikiRequestContext; /** * <p> - * Renames a {@link org.apache.jspwiki.api.WikiPage}. This ActionBean parses and extracts two request + * Renames a {@link org.apache.wiki.api.WikiPage}. This ActionBean parses and extracts two request * parameters: * </p> * <h3>Request parameters</h3> @@ -114,7 +114,7 @@ /** * Handler method that renames the current wiki page. If the rename * operation does not succeed for any reason, this method throws a - * {@link org.apache.jspwiki.api.WikiException}. + * {@link org.apache.wiki.api.WikiException}. * * @return a redirection to the renamed wiki page * @throws WikiException if the page cannot be renamed Modified: incubator/jspwiki/trunk/src/java/org/apache/wiki/action/SearchActionBean.java URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/java/org/apache/wiki/action/SearchActionBean.java?rev=739802&r1=739575&r2=739802&view=diff ============================================================================== --- incubator/jspwiki/trunk/src/java/org/apache/wiki/action/SearchActionBean.java (original) +++ incubator/jspwiki/trunk/src/java/org/apache/wiki/action/SearchActionBean.java Sun Feb 1 18:04:05 2009 @@ -19,9 +19,9 @@ under the License. */ -package com.ecyrd.jspwiki.action; +package org.apache.wiki.action; -import com.ecyrd.jspwiki.ui.stripes.WikiRequestContext; +import org.apache.wiki.ui.stripes.WikiRequestContext; import net.sourceforge.stripes.action.*; Modified: incubator/jspwiki/trunk/src/java/org/apache/wiki/action/UploadActionBean.java URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/java/org/apache/wiki/action/UploadActionBean.java?rev=739802&r1=739575&r2=739802&view=diff ============================================================================== --- incubator/jspwiki/trunk/src/java/org/apache/wiki/action/UploadActionBean.java (original) +++ incubator/jspwiki/trunk/src/java/org/apache/wiki/action/UploadActionBean.java Sun Feb 1 18:04:05 2009 @@ -19,15 +19,16 @@ under the License. */ -package com.ecyrd.jspwiki.action; +package org.apache.wiki.action; + +import org.apache.wiki.auth.permissions.PagePermission; +import org.apache.wiki.ui.stripes.HandlerPermission; +import org.apache.wiki.ui.stripes.WikiRequestContext; import net.sourceforge.stripes.action.HandlesEvent; import net.sourceforge.stripes.action.Resolution; import net.sourceforge.stripes.action.UrlBinding; -import com.ecyrd.jspwiki.auth.permissions.PagePermission; -import com.ecyrd.jspwiki.ui.stripes.HandlerPermission; -import com.ecyrd.jspwiki.ui.stripes.WikiRequestContext; @UrlBinding( "/Upload.jsp" ) public class UploadActionBean extends AbstractActionBean Modified: incubator/jspwiki/trunk/src/java/org/apache/wiki/action/UserPreferencesActionBean.java URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/java/org/apache/wiki/action/UserPreferencesActionBean.java?rev=739802&r1=739575&r2=739802&view=diff ============================================================================== --- incubator/jspwiki/trunk/src/java/org/apache/wiki/action/UserPreferencesActionBean.java (original) +++ incubator/jspwiki/trunk/src/java/org/apache/wiki/action/UserPreferencesActionBean.java Sun Feb 1 18:04:05 2009 @@ -19,7 +19,7 @@ under the License. */ -package com.ecyrd.jspwiki.action; +package org.apache.wiki.action; import java.security.Principal; import java.util.Locale; @@ -28,21 +28,22 @@ import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpSession; +import org.apache.wiki.WikiContext; +import org.apache.wiki.auth.login.CookieAssertionLoginModule; +import org.apache.wiki.auth.permissions.WikiPermission; +import org.apache.wiki.log.Logger; +import org.apache.wiki.log.LoggerFactory; +import org.apache.wiki.preferences.Preferences; +import org.apache.wiki.ui.EditorManager; +import org.apache.wiki.ui.TemplateManager; +import org.apache.wiki.ui.stripes.HandlerPermission; +import org.apache.wiki.ui.stripes.WikiActionBeanContext; +import org.apache.wiki.ui.stripes.WikiRequestContext; + import net.sourceforge.stripes.action.*; import net.sourceforge.stripes.controller.LifecycleStage; import net.sourceforge.stripes.validation.Validate; -import com.ecyrd.jspwiki.WikiContext; -import com.ecyrd.jspwiki.auth.login.CookieAssertionLoginModule; -import com.ecyrd.jspwiki.auth.permissions.WikiPermission; -import com.ecyrd.jspwiki.log.Logger; -import com.ecyrd.jspwiki.log.LoggerFactory; -import com.ecyrd.jspwiki.preferences.Preferences; -import com.ecyrd.jspwiki.ui.EditorManager; -import com.ecyrd.jspwiki.ui.TemplateManager; -import com.ecyrd.jspwiki.ui.stripes.HandlerPermission; -import com.ecyrd.jspwiki.ui.stripes.WikiActionBeanContext; -import com.ecyrd.jspwiki.ui.stripes.WikiRequestContext; /** * @author Andrew Jaquith @@ -184,10 +185,10 @@ /** * Pre-action that loads the available set of skins, languages, time formats * and time zones based on the current template returned by - * {@link com.ecyrd.jspwiki.ui.stripes.WikiActionBeanContext#getTemplate()}. + * {@link org.apache.wiki.ui.stripes.WikiActionBeanContext#getTemplate()}. * It also pre-populates the form values with the preferences stored in the * session attribute - * {@link com.ecyrd.jspwiki.preferences.Preferences#SESSIONPREFS}. + * {@link org.apache.wiki.preferences.Preferences#SESSIONPREFS}. * * @return always returns <code>null</code> */ Modified: incubator/jspwiki/trunk/src/java/org/apache/wiki/action/UserProfileActionBean.java URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/java/org/apache/wiki/action/UserProfileActionBean.java?rev=739802&r1=739575&r2=739802&view=diff ============================================================================== --- incubator/jspwiki/trunk/src/java/org/apache/wiki/action/UserProfileActionBean.java (original) +++ incubator/jspwiki/trunk/src/java/org/apache/wiki/action/UserProfileActionBean.java Sun Feb 1 18:04:05 2009 @@ -19,29 +19,30 @@ under the License. */ -package com.ecyrd.jspwiki.action; +package org.apache.wiki.action; import java.security.Principal; +import org.apache.wiki.WikiEngine; +import org.apache.wiki.WikiSession; +import org.apache.wiki.auth.AuthenticationManager; +import org.apache.wiki.auth.NoSuchPrincipalException; +import org.apache.wiki.auth.UserManager; +import org.apache.wiki.auth.login.CookieAssertionLoginModule; +import org.apache.wiki.auth.permissions.WikiPermission; +import org.apache.wiki.auth.user.UserDatabase; +import org.apache.wiki.auth.user.UserProfile; +import org.apache.wiki.log.Logger; +import org.apache.wiki.log.LoggerFactory; +import org.apache.wiki.ui.stripes.HandlerPermission; +import org.apache.wiki.ui.stripes.WikiActionBeanContext; +import org.apache.wiki.ui.stripes.WikiRequestContext; +import org.apache.wiki.workflow.DecisionRequiredException; + import net.sourceforge.stripes.action.*; import net.sourceforge.stripes.controller.LifecycleStage; import net.sourceforge.stripes.validation.*; -import com.ecyrd.jspwiki.WikiEngine; -import com.ecyrd.jspwiki.WikiSession; -import com.ecyrd.jspwiki.auth.AuthenticationManager; -import com.ecyrd.jspwiki.auth.NoSuchPrincipalException; -import com.ecyrd.jspwiki.auth.UserManager; -import com.ecyrd.jspwiki.auth.login.CookieAssertionLoginModule; -import com.ecyrd.jspwiki.auth.permissions.WikiPermission; -import com.ecyrd.jspwiki.auth.user.UserDatabase; -import com.ecyrd.jspwiki.auth.user.UserProfile; -import com.ecyrd.jspwiki.log.Logger; -import com.ecyrd.jspwiki.log.LoggerFactory; -import com.ecyrd.jspwiki.ui.stripes.HandlerPermission; -import com.ecyrd.jspwiki.ui.stripes.WikiActionBeanContext; -import com.ecyrd.jspwiki.ui.stripes.WikiRequestContext; -import com.ecyrd.jspwiki.workflow.DecisionRequiredException; /** * @author Andrew Jaquith Modified: incubator/jspwiki/trunk/src/java/org/apache/wiki/action/ViewActionBean.java URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/java/org/apache/wiki/action/ViewActionBean.java?rev=739802&r1=739575&r2=739802&view=diff ============================================================================== --- incubator/jspwiki/trunk/src/java/org/apache/wiki/action/ViewActionBean.java (original) +++ incubator/jspwiki/trunk/src/java/org/apache/wiki/action/ViewActionBean.java Sun Feb 1 18:04:05 2009 @@ -19,23 +19,23 @@ under the License. */ -package com.ecyrd.jspwiki.action; +package org.apache.wiki.action; import net.sourceforge.stripes.action.*; import net.sourceforge.stripes.controller.LifecycleStage; import net.sourceforge.stripes.validation.ValidationError; import net.sourceforge.stripes.validation.ValidationErrors; -import org.apache.jspwiki.api.WikiException; -import org.apache.jspwiki.api.WikiPage; +import org.apache.wiki.WikiEngine; +import org.apache.wiki.api.WikiException; +import org.apache.wiki.api.WikiPage; +import org.apache.wiki.auth.permissions.PagePermission; +import org.apache.wiki.content.ContentManager; +import org.apache.wiki.log.Logger; +import org.apache.wiki.log.LoggerFactory; +import org.apache.wiki.ui.stripes.HandlerPermission; +import org.apache.wiki.ui.stripes.WikiRequestContext; -import com.ecyrd.jspwiki.WikiEngine; -import com.ecyrd.jspwiki.auth.permissions.PagePermission; -import com.ecyrd.jspwiki.content.ContentManager; -import com.ecyrd.jspwiki.log.Logger; -import com.ecyrd.jspwiki.log.LoggerFactory; -import com.ecyrd.jspwiki.ui.stripes.HandlerPermission; -import com.ecyrd.jspwiki.ui.stripes.WikiRequestContext; /** * Displays the wiki page a users requested, resolving special page names and @@ -64,7 +64,7 @@ * for one, or a "special page" reference. This method considers * special page names from <code>jspwiki.properties</code>, and possible aliases. * To determine whether the page is a special page, this method calls - * {@link com.ecyrd.jspwiki.action.WikiContextFactory#getSpecialPageResolution(String)}. + * {@link org.apache.wiki.action.WikiContextFactory#getSpecialPageResolution(String)}. * @return a {@link net.sourceforge.stripes.action.RedirectResolution} to the special * page's real URL, if a special page was specified, or <code>null</code> otherwise */ Modified: incubator/jspwiki/trunk/src/java/org/apache/wiki/action/WikiActionBean.java URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/java/org/apache/wiki/action/WikiActionBean.java?rev=739802&r1=739575&r2=739802&view=diff ============================================================================== --- incubator/jspwiki/trunk/src/java/org/apache/wiki/action/WikiActionBean.java (original) +++ incubator/jspwiki/trunk/src/java/org/apache/wiki/action/WikiActionBean.java Sun Feb 1 18:04:05 2009 @@ -19,9 +19,9 @@ under the License. */ -package com.ecyrd.jspwiki.action; +package org.apache.wiki.action; -import com.ecyrd.jspwiki.ui.stripes.WikiActionBeanContext; +import org.apache.wiki.ui.stripes.WikiActionBeanContext; import net.sourceforge.stripes.action.ActionBean; import net.sourceforge.stripes.action.ActionBeanContext; Modified: incubator/jspwiki/trunk/src/java/org/apache/wiki/action/WikiContextFactory.java URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/java/org/apache/wiki/action/WikiContextFactory.java?rev=739802&r1=739575&r2=739802&view=diff ============================================================================== --- incubator/jspwiki/trunk/src/java/org/apache/wiki/action/WikiContextFactory.java (original) +++ incubator/jspwiki/trunk/src/java/org/apache/wiki/action/WikiContextFactory.java Sun Feb 1 18:04:05 2009 @@ -19,7 +19,7 @@ under the License. */ -package com.ecyrd.jspwiki.action; +package org.apache.wiki.action; import java.lang.reflect.Method; import java.net.URI; @@ -39,22 +39,22 @@ import net.sourceforge.stripes.mock.MockHttpSession; import net.sourceforge.stripes.util.ResolverUtil; -import org.apache.jspwiki.api.WikiException; -import org.apache.jspwiki.api.WikiPage; +import org.apache.wiki.*; +import org.apache.wiki.api.WikiException; +import org.apache.wiki.api.WikiPage; +import org.apache.wiki.auth.SessionMonitor; +import org.apache.wiki.content.ContentManager; +import org.apache.wiki.content.WikiName; +import org.apache.wiki.log.Logger; +import org.apache.wiki.log.LoggerFactory; +import org.apache.wiki.parser.MarkupParser; +import org.apache.wiki.providers.ProviderException; +import org.apache.wiki.tags.WikiTagBase; +import org.apache.wiki.ui.stripes.HandlerInfo; +import org.apache.wiki.ui.stripes.WikiActionBeanContext; +import org.apache.wiki.url.StripesURLConstructor; +import org.apache.wiki.util.TextUtil; -import com.ecyrd.jspwiki.*; -import com.ecyrd.jspwiki.auth.SessionMonitor; -import com.ecyrd.jspwiki.content.ContentManager; -import com.ecyrd.jspwiki.content.WikiName; -import com.ecyrd.jspwiki.log.Logger; -import com.ecyrd.jspwiki.log.LoggerFactory; -import com.ecyrd.jspwiki.parser.MarkupParser; -import com.ecyrd.jspwiki.providers.ProviderException; -import com.ecyrd.jspwiki.tags.WikiTagBase; -import com.ecyrd.jspwiki.ui.stripes.HandlerInfo; -import com.ecyrd.jspwiki.ui.stripes.WikiActionBeanContext; -import com.ecyrd.jspwiki.url.StripesURLConstructor; -import com.ecyrd.jspwiki.util.TextUtil; /** * <p> @@ -83,7 +83,7 @@ public static final String ATTR_WIKISESSION = "wikiSession"; /** Default list of packages to search for WikiActionBean implementations. */ - public static final String DEFAULT_ACTIONBEAN_PACKAGES = "com.ecyrd.jspwiki.action"; + public static final String DEFAULT_ACTIONBEAN_PACKAGES = "org.apache.wiki.action"; /** * Property in jspwiki.properties that specifies packages to search for @@ -102,7 +102,7 @@ * This method can be used to find the WikiContext programmatically from a * JSP PageContext. We check the request context. The wiki context, if it * exists, is looked up using the key - * {@link com.ecyrd.jspwiki.tags.WikiTagBase#ATTR_CONTEXT}. + * {@link org.apache.wiki.tags.WikiTagBase#ATTR_CONTEXT}. * * @since 2.4 * @param pageContext the JSP page context @@ -119,7 +119,7 @@ * <p> * Saves the supplied WikiContext, and the related WikiEngine and * WikiSession, in request scope. The WikiContext is saved as an attribute - * named {@link com.ecyrd.jspwiki.tags.WikiTagBase#ATTR_CONTEXT}. The + * named {@link org.apache.wiki.tags.WikiTagBase#ATTR_CONTEXT}. The * WikiEngine is also saved as {@link #ATTR_WIKIENGINE}, and the * WikiSession as {@link #ATTR_WIKISESSION}. Among other things, by saving * these items as attributes, they can be accessed via JSP Expression @@ -129,7 +129,7 @@ * Note: when the WikiContext is saved, it will be guaranteed to have a * non-null WikiPage. If the context as supplied has a WikiPage that is * <code>null</code>, the - * {@link com.ecyrd.jspwiki.WikiEngine#getFrontPage()} will be consulted, + * {@link org.apache.wiki.WikiEngine#getFrontPage()} will be consulted, * and that page will be used. * </p> * @@ -203,7 +203,7 @@ * Looks up and returns the correct HandlerInfo class corresponding to a * supplied wiki context. The supplied context name is matched against the * values annotated using - * {@link com.ecyrd.jspwiki.ui.stripes.WikiRequestContext}. If a match is not + * {@link org.apache.wiki.ui.stripes.WikiRequestContext}. If a match is not * found, this method throws an IllegalArgumentException. * * @param requestContext the context to look up Modified: incubator/jspwiki/trunk/src/java/org/apache/wiki/action/WorkflowActionBean.java URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/java/org/apache/wiki/action/WorkflowActionBean.java?rev=739802&r1=739575&r2=739802&view=diff ============================================================================== --- incubator/jspwiki/trunk/src/java/org/apache/wiki/action/WorkflowActionBean.java (original) +++ incubator/jspwiki/trunk/src/java/org/apache/wiki/action/WorkflowActionBean.java Sun Feb 1 18:04:05 2009 @@ -19,11 +19,11 @@ under the License. */ -package com.ecyrd.jspwiki.action; +package org.apache.wiki.action; -import com.ecyrd.jspwiki.auth.permissions.PagePermission; -import com.ecyrd.jspwiki.ui.stripes.HandlerPermission; -import com.ecyrd.jspwiki.ui.stripes.WikiRequestContext; +import org.apache.wiki.auth.permissions.PagePermission; +import org.apache.wiki.ui.stripes.HandlerPermission; +import org.apache.wiki.ui.stripes.WikiRequestContext; import net.sourceforge.stripes.action.*; Modified: incubator/jspwiki/trunk/src/java/org/apache/wiki/action/package.html URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/java/org/apache/wiki/action/package.html?rev=739802&r1=739575&r2=739802&view=diff ============================================================================== --- incubator/jspwiki/trunk/src/java/org/apache/wiki/action/package.html (original) +++ incubator/jspwiki/trunk/src/java/org/apache/wiki/action/package.html Sun Feb 1 18:04:05 2009 @@ -36,7 +36,7 @@ href="http://stripes.sourceforge.net/docs/current/taglib/stripes/useActionBean.html">&lt;stripes:useActionBean&gt;</a></code> tags to every top-level JSP. Retrieve the ActionBean later in content JSPs via {@link - com.ecyrd.jspwiki.ui.stripes.WikiInterceptor#findActionBean(ServletRequest)}.&nbsp;<a + org.apache.wiki.ui.stripes.WikiInterceptor#findActionBean(ServletRequest)}.&nbsp;<a href="#2"><small>More...</small></a></li> <li>In JSPs, use EL syntax to access properties of the current
{'source': 'Apache Software Foundation Public Mail Archives'}