Home / Browse / JAMWiki / Mail / Archive

Donate

JAMWiki

Email Archive: jamwiki-commit (read-only)

[Jamwiki-commit] SF.net SVN: jamwiki:[3263] wiki/branches/wrh2

From: <wrh2@us...> - 2010-11-12 05:03

Revision: 3263
          http://jamwiki.svn.sourceforge.net/jamwiki/?rev=3263&view=rev
Author:   wrh2
Date:     2010-11-12 05:03:14 +0000 (Fri, 12 Nov 2010)

Log Message:
-----------
Merge:
  * Merge changes from trunk to the wrh2 branch.

Modified Paths:
--------------
    wiki/branches/wrh2/jamwiki-war/src/main/resources/jamwiki-configuration.xml

Property Changed:
----------------
    wiki/branches/wrh2/


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Thread View

Thread	Author	Date
[Jamwiki-commit] SF.net SVN: jamwiki:[2726] wiki/branches/wrh2	<wrh2@us...>

[Jamwiki-commit] SF.net SVN: jamwiki:[2775] wiki/branches/wrh2

From: <wrh2@us...> - 2009-11-21 17:44

Revision: 2775
          http://jamwiki.svn.sourceforge.net/jamwiki/?rev=2775&view=rev
Author:   wrh2
Date:     2009-11-21 17:44:44 +0000 (Sat, 21 Nov 2009)

Log Message:
-----------
MERGE:
  * Re-integrate changes from trunk.

Modified Paths:
--------------
    wiki/branches/wrh2/addons/bliki-parser/pom.xml
    wiki/branches/wrh2/addons/pom.xml
    wiki/branches/wrh2/jamwiki-core/pom.xml
    wiki/branches/wrh2/jamwiki-core/src/main/java/org/jamwiki/DataHandler.java
    wiki/branches/wrh2/jamwiki-core/src/main/java/org/jamwiki/WikiMessage.java
    wiki/branches/wrh2/jamwiki-core/src/main/java/org/jamwiki/WikiVersion.java
    wiki/branches/wrh2/jamwiki-core/src/main/java/org/jamwiki/model/Role.java
    wiki/branches/wrh2/jamwiki-core/src/main/java/org/jamwiki/parser/jflex/JFlexParserUtil.java
    wiki/branches/wrh2/jamwiki-core/src/main/java/org/jamwiki/parser/jflex/ParserFunctionUtil.java
    wiki/branches/wrh2/jamwiki-core/src/main/java/org/jamwiki/parser/jflex/TemplateTag.java
    wiki/branches/wrh2/jamwiki-core/src/main/java/org/jamwiki/parser/jflex/WikiLinkTag.java
    wiki/branches/wrh2/jamwiki-core/src/main/java/org/jamwiki/utils/LinkUtil.java
    wiki/branches/wrh2/jamwiki-core/src/main/java/org/jamwiki/utils/WikiUtil.java
    wiki/branches/wrh2/jamwiki-core/src/test/java/org/jamwiki/utils/WikiUtilTest.java
    wiki/branches/wrh2/jamwiki-core/src/test/resources/data/results/WikiLink1
    wiki/branches/wrh2/jamwiki-core/src/test/resources/data/topics/WikiLink1
    wiki/branches/wrh2/jamwiki-core/src/test/resources/jamwiki.properties
    wiki/branches/wrh2/jamwiki-war/pom.xml
    wiki/branches/wrh2/jamwiki-war/src/main/resources/ApplicationResources.properties
    wiki/branches/wrh2/jamwiki-war/src/main/resources/ApplicationResources_de.properties
    wiki/branches/wrh2/jamwiki-war/src/main/resources/ApplicationResources_ru.properties
    wiki/branches/wrh2/jamwiki-war/src/main/resources/ApplicationResources_zh_TW.properties
    wiki/branches/wrh2/jamwiki-war/src/main/resources/jamwiki-configuration.xml
    wiki/branches/wrh2/jamwiki-war/src/main/resources/pages/StyleSheet.txt
    wiki/branches/wrh2/jamwiki-war/src/main/webapp/CHANGELOG.txt
    wiki/branches/wrh2/jamwiki-war/src/main/webapp/CREDITS.txt
    wiki/branches/wrh2/jamwiki-war/src/main/webapp/README.txt
    wiki/branches/wrh2/jamwiki-war/src/main/webapp/UPGRADE.txt
    wiki/branches/wrh2/jamwiki-war/src/main/webapp/WEB-INF/jsp/admin.jsp
    wiki/branches/wrh2/jamwiki-war/src/main/webapp/WEB-INF/jsp/contributions.jsp
    wiki/branches/wrh2/jamwiki-war/src/main/webapp/WEB-INF/jsp/edit.jsp
    wiki/branches/wrh2/jamwiki-war/src/main/webapp/WEB-INF/jsp/error-display.jsp
    wiki/branches/wrh2/jamwiki-war/src/main/webapp/WEB-INF/jsp/history.jsp
    wiki/branches/wrh2/jamwiki-war/src/main/webapp/WEB-INF/jsp/log.jsp
    wiki/branches/wrh2/jamwiki-war/src/main/webapp/WEB-INF/jsp/printable.jsp
    wiki/branches/wrh2/jamwiki-war/src/main/webapp/WEB-INF/jsp/recent-changes.jsp
    wiki/branches/wrh2/jamwiki-war/src/main/webapp/WEB-INF/jsp/setup.jsp
    wiki/branches/wrh2/jamwiki-war/src/main/webapp/WEB-INF/jsp/topic.jsp
    wiki/branches/wrh2/jamwiki-war/src/main/webapp/WEB-INF/jsp/upgrade.jsp
    wiki/branches/wrh2/jamwiki-war/src/main/webapp/WEB-INF/jsp/view-topic-include.jsp
    wiki/branches/wrh2/jamwiki-war/src/main/webapp/WEB-INF/jsp/watchlist.jsp
    wiki/branches/wrh2/jamwiki-web/pom.xml
    wiki/branches/wrh2/jamwiki-web/src/main/java/org/jamwiki/authentication/JAMWikiAuthenticationConfiguration.java
    wiki/branches/wrh2/jamwiki-web/src/main/java/org/jamwiki/authentication/JAMWikiDaoImpl.java
    wiki/branches/wrh2/jamwiki-web/src/main/java/org/jamwiki/db/AnsiDataHandler.java
    wiki/branches/wrh2/jamwiki-web/src/main/java/org/jamwiki/db/DatabaseUpgrades.java
    wiki/branches/wrh2/jamwiki-web/src/main/java/org/jamwiki/db/WikiDatabase.java
    wiki/branches/wrh2/jamwiki-web/src/main/java/org/jamwiki/search/LuceneSearchEngine.java
    wiki/branches/wrh2/jamwiki-web/src/main/java/org/jamwiki/servlets/AdminServlet.java
    wiki/branches/wrh2/jamwiki-web/src/main/java/org/jamwiki/servlets/EditServlet.java
    wiki/branches/wrh2/jamwiki-web/src/main/java/org/jamwiki/servlets/ImportTiddlyWikiServlet.java
    wiki/branches/wrh2/jamwiki-web/src/main/java/org/jamwiki/servlets/JAMWikiServlet.java
    wiki/branches/wrh2/jamwiki-web/src/main/java/org/jamwiki/servlets/ManageServlet.java
    wiki/branches/wrh2/jamwiki-web/src/main/java/org/jamwiki/servlets/MoveServlet.java
    wiki/branches/wrh2/jamwiki-web/src/main/java/org/jamwiki/servlets/RegisterServlet.java
    wiki/branches/wrh2/jamwiki-web/src/main/java/org/jamwiki/servlets/RolesServlet.java
    wiki/branches/wrh2/jamwiki-web/src/main/java/org/jamwiki/servlets/ServletUtil.java
    wiki/branches/wrh2/jamwiki-web/src/main/java/org/jamwiki/servlets/WatchlistServlet.java
    wiki/branches/wrh2/javadiff/pom.xml
    wiki/branches/wrh2/pom.xml

Added Paths:
-----------
    wiki/branches/wrh2/jamwiki-core/src/main/java/org/jamwiki/migrate/
    wiki/branches/wrh2/jamwiki-core/src/main/java/org/jamwiki/migrate/MediaWikiXmlMigrator.java
    wiki/branches/wrh2/jamwiki-core/src/main/java/org/jamwiki/migrate/MigrationException.java
    wiki/branches/wrh2/jamwiki-core/src/main/java/org/jamwiki/migrate/MigrationUtil.java
    wiki/branches/wrh2/jamwiki-core/src/main/java/org/jamwiki/migrate/Migrator.java
    wiki/branches/wrh2/jamwiki-core/src/test/java/org/jamwiki/migrate/
    wiki/branches/wrh2/jamwiki-core/src/test/java/org/jamwiki/migrate/MigrationUtilTest.java
    wiki/branches/wrh2/jamwiki-core/src/test/resources/data/files/mediawiki-export-namespace-test.xml
    wiki/branches/wrh2/jamwiki-core/src/test/resources/data/files/mediawiki-export-one-topic-with-unsorted-history.xml
    wiki/branches/wrh2/jamwiki-core/src/test/resources/data/files/mediawiki-export-topic-name-with-question-mark.xml
    wiki/branches/wrh2/jamwiki-core/src/test/resources/data/files/mediawiki-export-two-topics-with-history.xml
    wiki/branches/wrh2/jamwiki-core/src/test/resources/data/results/Template5
    wiki/branches/wrh2/jamwiki-core/src/test/resources/data/results/Template_-_If
    wiki/branches/wrh2/jamwiki-core/src/test/resources/data/results/WikiCategory
    wiki/branches/wrh2/jamwiki-core/src/test/resources/data/topics/Category_-_Test
    wiki/branches/wrh2/jamwiki-core/src/test/resources/data/topics/Template5
    wiki/branches/wrh2/jamwiki-core/src/test/resources/data/topics/Template_-_If
    wiki/branches/wrh2/jamwiki-core/src/test/resources/data/topics/WikiCategory
    wiki/branches/wrh2/jamwiki-war/src/main/webapp/images/bullet.gif
    wiki/branches/wrh2/jamwiki-web/src/main/java/org/jamwiki/authentication/RoleImpl.java
    wiki/branches/wrh2/webtest/
    wiki/branches/wrh2/webtest/build.xml
    wiki/branches/wrh2/webtest/lib/
    wiki/branches/wrh2/webtest/lib/webtest/
    wiki/branches/wrh2/webtest/lib/webtest/bin/
    wiki/branches/wrh2/webtest/lib/webtest/bin/runWebtest.bat
    wiki/branches/wrh2/webtest/lib/webtest/bin/runWebtest.sh
    wiki/branches/wrh2/webtest/lib/webtest/bin/webtest.bat
    wiki/branches/wrh2/webtest/lib/webtest/bin/webtest.sh
    wiki/branches/wrh2/webtest/lib/webtest/lib/
    wiki/branches/wrh2/webtest/lib/webtest/lib/activation-1.1.jar
    wiki/branches/wrh2/webtest/lib/webtest/lib/bsf-2.4.0.jar
    wiki/branches/wrh2/webtest/lib/webtest/lib/classpath.xml
    wiki/branches/wrh2/webtest/lib/webtest/lib/commons-codec-1.3.jar
    wiki/branches/wrh2/webtest/lib/webtest/lib/commons-collections-3.2.jar
    wiki/branches/wrh2/webtest/lib/webtest/lib/commons-httpclient-3.1.jar
    wiki/branches/wrh2/webtest/lib/webtest/lib/commons-io-1.4.jar
    wiki/branches/wrh2/webtest/lib/webtest/lib/commons-lang-2.4.jar
    wiki/branches/wrh2/webtest/lib/webtest/lib/commons-logging-1.1.1.jar
    wiki/branches/wrh2/webtest/lib/webtest/lib/cssparser-0.9.5.jar
    wiki/branches/wrh2/webtest/lib/webtest/lib/fontbox-0.1.0-dev-patched-20060622.jar
    wiki/branches/wrh2/webtest/lib/webtest/lib/groovy-all-1.5.6.jar
    wiki/branches/wrh2/webtest/lib/webtest/lib/htmlunit-2.2.jar
    wiki/branches/wrh2/webtest/lib/webtest/lib/htmlunit-core-js-2.2.jar
    wiki/branches/wrh2/webtest/lib/webtest/lib/jline-0.9.94.jar
    wiki/branches/wrh2/webtest/lib/webtest/lib/junit-4.4.jar
    wiki/branches/wrh2/webtest/lib/webtest/lib/log4j-1.2.14.jar
    wiki/branches/wrh2/webtest/lib/webtest/lib/log4j.properties
    wiki/branches/wrh2/webtest/lib/webtest/lib/mail-1.4.jar
    wiki/branches/wrh2/webtest/lib/webtest/lib/nekohtml-1.9.8.jar
    wiki/branches/wrh2/webtest/lib/webtest/lib/oro-2.0.6.jar
    wiki/branches/wrh2/webtest/lib/webtest/lib/poi-3.1-FINAL.jar
    wiki/branches/wrh2/webtest/lib/webtest/lib/sac-1.3.jar
    wiki/branches/wrh2/webtest/lib/webtest/lib/taskdef.xml
    wiki/branches/wrh2/webtest/lib/webtest/lib/useWebTest.xml
    wiki/branches/wrh2/webtest/lib/webtest/lib/webtest.jar
    wiki/branches/wrh2/webtest/lib/webtest/lib/webtest_T.jar
    wiki/branches/wrh2/webtest/lib/webtest/lib/xalan-2.7.0.jar
    wiki/branches/wrh2/webtest/lib/webtest/resources/
    wiki/branches/wrh2/webtest/lib/webtest/resources/WebTestOverview2JUnit.xsl
    wiki/branches/wrh2/webtest/lib/webtest/resources/WebTestReport.xsl
    wiki/branches/wrh2/webtest/lib/webtest/resources/WebTestReportOverview.xsl
    wiki/branches/wrh2/webtest/lib/webtest/resources/WebTestReportSummaryExtractor.xsl
    wiki/branches/wrh2/webtest/lib/webtest/resources/checkstyle/
    wiki/branches/wrh2/webtest/lib/webtest/resources/checkstyle/checkstyle-frames.xsl
    wiki/branches/wrh2/webtest/lib/webtest/resources/checkstyle/config.xml
    wiki/branches/wrh2/webtest/lib/webtest/resources/checkstyle/suppressions.xml
    wiki/branches/wrh2/webtest/lib/webtest/resources/images/
    wiki/branches/wrh2/webtest/lib/webtest/resources/images/canoo.gif
    wiki/branches/wrh2/webtest/lib/webtest/resources/images/collapseall.png
    wiki/branches/wrh2/webtest/lib/webtest/resources/images/expandMinus.png
    wiki/branches/wrh2/webtest/lib/webtest/resources/images/expandPlus.png
    wiki/branches/wrh2/webtest/lib/webtest/resources/images/expandall.png
    wiki/branches/wrh2/webtest/lib/webtest/resources/images/failed.gif
    wiki/branches/wrh2/webtest/lib/webtest/resources/images/favicon.ico
    wiki/branches/wrh2/webtest/lib/webtest/resources/images/less.gif
    wiki/branches/wrh2/webtest/lib/webtest/resources/images/more.gif
    wiki/branches/wrh2/webtest/lib/webtest/resources/images/ok.gif
    wiki/branches/wrh2/webtest/lib/webtest/resources/images/optional.gif
    wiki/branches/wrh2/webtest/lib/webtest/resources/images/todo.gif
    wiki/branches/wrh2/webtest/lib/webtest/resources/images/webtest.jpg
    wiki/branches/wrh2/webtest/lib/webtest/resources/log/
    wiki/branches/wrh2/webtest/lib/webtest/resources/log/log.xsl
    wiki/branches/wrh2/webtest/lib/webtest/resources/pom.xsl
    wiki/branches/wrh2/webtest/lib/webtest/resources/report.css
    wiki/branches/wrh2/webtest/lib/webtest/resources/responseBrowser.html
    wiki/branches/wrh2/webtest/lib/webtest/resources/responseBrowser.js
    wiki/branches/wrh2/webtest/lib/webtest/resources/responseBrowserCommands.html
    wiki/branches/wrh2/webtest/lib/webtest/resources/responseBrowserPreviews.html
    wiki/branches/wrh2/webtest/lib/webtest/resources/results.dtd
    wiki/branches/wrh2/webtest/lib/webtest/resources/showHide.js
    wiki/branches/wrh2/webtest/lib/webtest/resources/sorttable.js
    wiki/branches/wrh2/webtest/lib/webtest/resources/testExistingNodes.xml
    wiki/branches/wrh2/webtest/lib/webtest/resources/testNoRootNode.xml
    wiki/branches/wrh2/webtest/lib/webtest/resources/testWrongRootNode.xml
    wiki/branches/wrh2/webtest/lib/webtest/resources/webtestsRunner.xml
    wiki/branches/wrh2/webtest/lib/webtest/tools/
    wiki/branches/wrh2/webtest/lib/webtest/tools/WebTestIcon.png
    wiki/branches/wrh2/webtest/lib/webtest/tools/WebTestMonitor.groovy
    wiki/branches/wrh2/webtest/lib/webtest/tools/WebTestParallelInit.groovy
    wiki/branches/wrh2/webtest/lib/webtest/tools/WebTestParallelWaitForCompletion.groovy
    wiki/branches/wrh2/webtest/lib/webtest/tools/generateDefinitions.groovy
    wiki/branches/wrh2/webtest/lib/webtest/tools/generateDtd.groovy
    wiki/branches/wrh2/webtest/lib/webtest/tools/spinner.gif
    wiki/branches/wrh2/webtest/lib/webtest/webtest.xml
    wiki/branches/wrh2/webtest/results/
    wiki/branches/wrh2/webtest/results/resources/
    wiki/branches/wrh2/webtest/results/resources/images/
    wiki/branches/wrh2/webtest/results/resources/images/canoo.gif
    wiki/branches/wrh2/webtest/results/resources/images/collapseall.png
    wiki/branches/wrh2/webtest/results/resources/images/expandMinus.png
    wiki/branches/wrh2/webtest/results/resources/images/expandPlus.png
    wiki/branches/wrh2/webtest/results/resources/images/expandall.png
    wiki/branches/wrh2/webtest/results/resources/images/failed.gif
    wiki/branches/wrh2/webtest/results/resources/images/favicon.ico
    wiki/branches/wrh2/webtest/results/resources/images/less.gif
    wiki/branches/wrh2/webtest/results/resources/images/more.gif
    wiki/branches/wrh2/webtest/results/resources/images/ok.gif
    wiki/branches/wrh2/webtest/results/resources/images/optional.gif
    wiki/branches/wrh2/webtest/results/resources/images/todo.gif
    wiki/branches/wrh2/webtest/results/resources/images/webtest.jpg
    wiki/branches/wrh2/webtest/results/resources/report.css
    wiki/branches/wrh2/webtest/results/resources/responseBrowser.html
    wiki/branches/wrh2/webtest/results/resources/responseBrowser.js
    wiki/branches/wrh2/webtest/results/resources/responseBrowserCommands.html
    wiki/branches/wrh2/webtest/results/resources/responseBrowserPreviews.html
    wiki/branches/wrh2/webtest/results/resources/showHide.js
    wiki/branches/wrh2/webtest/results/resources/sorttable.js
    wiki/branches/wrh2/webtest/tests/
    wiki/branches/wrh2/webtest/tests/allTests.xml
    wiki/branches/wrh2/webtest/tests/jamwikiAdminLoginTest.xml
    wiki/branches/wrh2/webtest/tests/jamwikiAdminLoginTestchangePwd.xml
    wiki/branches/wrh2/webtest/tests/jamwikiConfigurationTest.xml
    wiki/branches/wrh2/webtest/tests/jamwikiStartTest.xml
    wiki/branches/wrh2/webtest/webtest.properties

Removed Paths:
-------------
    wiki/branches/wrh2/jamwiki-core/src/main/java/org/jamwiki/migrate/MediaWikiXmlMigrator.java
    wiki/branches/wrh2/jamwiki-core/src/main/java/org/jamwiki/migrate/MigrationException.java
    wiki/branches/wrh2/jamwiki-core/src/main/java/org/jamwiki/migrate/MigrationUtil.java
    wiki/branches/wrh2/jamwiki-core/src/main/java/org/jamwiki/migrate/Migrator.java
    wiki/branches/wrh2/jamwiki-core/src/test/java/org/jamwiki/migrate/MigrationUtilTest.java
    wiki/branches/wrh2/jamwiki-war/src/main/webapp/images/button_java.png
    wiki/branches/wrh2/jamwiki-web/src/main/java/org/jamwiki/migrate/
    wiki/branches/wrh2/jamwiki-web/src/test/java/org/jamwiki/migrate/
    wiki/branches/wrh2/jamwiki-web/src/test/resources/
    wiki/branches/wrh2/webtest/build.xml
    wiki/branches/wrh2/webtest/lib/
    wiki/branches/wrh2/webtest/lib/webtest/
    wiki/branches/wrh2/webtest/lib/webtest/bin/
    wiki/branches/wrh2/webtest/lib/webtest/bin/runWebtest.bat
    wiki/branches/wrh2/webtest/lib/webtest/bin/runWebtest.sh
    wiki/branches/wrh2/webtest/lib/webtest/bin/webtest.bat
    wiki/branches/wrh2/webtest/lib/webtest/bin/webtest.sh
    wiki/branches/wrh2/webtest/lib/webtest/lib/
    wiki/branches/wrh2/webtest/lib/webtest/lib/activation-1.1.jar
    wiki/branches/wrh2/webtest/lib/webtest/lib/bsf-2.4.0.jar
    wiki/branches/wrh2/webtest/lib/webtest/lib/classpath.xml
    wiki/branches/wrh2/webtest/lib/webtest/lib/commons-codec-1.3.jar
    wiki/branches/wrh2/webtest/lib/webtest/lib/commons-collections-3.2.jar
    wiki/branches/wrh2/webtest/lib/webtest/lib/commons-httpclient-3.1.jar
    wiki/branches/wrh2/webtest/lib/webtest/lib/commons-io-1.4.jar
    wiki/branches/wrh2/webtest/lib/webtest/lib/commons-lang-2.4.jar
    wiki/branches/wrh2/webtest/lib/webtest/lib/commons-logging-1.1.1.jar
    wiki/branches/wrh2/webtest/lib/webtest/lib/cssparser-0.9.5.jar
    wiki/branches/wrh2/webtest/lib/webtest/lib/fontbox-0.1.0-dev-patched-20060622.jar
    wiki/branches/wrh2/webtest/lib/webtest/lib/groovy-all-1.5.6.jar
    wiki/branches/wrh2/webtest/lib/webtest/lib/htmlunit-2.2.jar
    wiki/branches/wrh2/webtest/lib/webtest/lib/htmlunit-core-js-2.2.jar
    wiki/branches/wrh2/webtest/lib/webtest/lib/jline-0.9.94.jar
    wiki/branches/wrh2/webtest/lib/webtest/lib/junit-4.4.jar
    wiki/branches/wrh2/webtest/lib/webtest/lib/log4j-1.2.14.jar
    wiki/branches/wrh2/webtest/lib/webtest/lib/log4j.properties
    wiki/branches/wrh2/webtest/lib/webtest/lib/mail-1.4.jar
    wiki/branches/wrh2/webtest/lib/webtest/lib/nekohtml-1.9.8.jar
    wiki/branches/wrh2/webtest/lib/webtest/lib/oro-2.0.6.jar
    wiki/branches/wrh2/webtest/lib/webtest/lib/poi-3.1-FINAL.jar
    wiki/branches/wrh2/webtest/lib/webtest/lib/sac-1.3.jar
    wiki/branches/wrh2/webtest/lib/webtest/lib/taskdef.xml
    wiki/branches/wrh2/webtest/lib/webtest/lib/useWebTest.xml
    wiki/branches/wrh2/webtest/lib/webtest/lib/webtest.jar
    wiki/branches/wrh2/webtest/lib/webtest/lib/webtest_T.jar
    wiki/branches/wrh2/webtest/lib/webtest/lib/xalan-2.7.0.jar
    wiki/branches/wrh2/webtest/lib/webtest/resources/
    wiki/branches/wrh2/webtest/lib/webtest/resources/WebTestOverview2JUnit.xsl
    wiki/branches/wrh2/webtest/lib/webtest/resources/WebTestReport.xsl
    wiki/branches/wrh2/webtest/lib/webtest/resources/WebTestReportOverview.xsl
    wiki/branches/wrh2/webtest/lib/webtest/resources/WebTestReportSummaryExtractor.xsl
    wiki/branches/wrh2/webtest/lib/webtest/resources/checkstyle/
    wiki/branches/wrh2/webtest/lib/webtest/resources/checkstyle/checkstyle-frames.xsl
    wiki/branches/wrh2/webtest/lib/webtest/resources/checkstyle/config.xml
    wiki/branches/wrh2/webtest/lib/webtest/resources/checkstyle/suppressions.xml
    wiki/branches/wrh2/webtest/lib/webtest/resources/images/
    wiki/branches/wrh2/webtest/lib/webtest/resources/images/canoo.gif
    wiki/branches/wrh2/webtest/lib/webtest/resources/images/collapseall.png
    wiki/branches/wrh2/webtest/lib/webtest/resources/images/expandMinus.png
    wiki/branches/wrh2/webtest/lib/webtest/resources/images/expandPlus.png
    wiki/branches/wrh2/webtest/lib/webtest/resources/images/expandall.png
    wiki/branches/wrh2/webtest/lib/webtest/resources/images/failed.gif
    wiki/branches/wrh2/webtest/lib/webtest/resources/images/favicon.ico
    wiki/branches/wrh2/webtest/lib/webtest/resources/images/less.gif
    wiki/branches/wrh2/webtest/lib/webtest/resources/images/more.gif
    wiki/branches/wrh2/webtest/lib/webtest/resources/images/ok.gif
    wiki/branches/wrh2/webtest/lib/webtest/resources/images/optional.gif
    wiki/branches/wrh2/webtest/lib/webtest/resources/images/todo.gif
    wiki/branches/wrh2/webtest/lib/webtest/resources/images/webtest.jpg
    wiki/branches/wrh2/webtest/lib/webtest/resources/log/
    wiki/branches/wrh2/webtest/lib/webtest/resources/log/log.xsl
    wiki/branches/wrh2/webtest/lib/webtest/resources/pom.xsl
    wiki/branches/wrh2/webtest/lib/webtest/resources/report.css
    wiki/branches/wrh2/webtest/lib/webtest/resources/responseBrowser.html
    wiki/branches/wrh2/webtest/lib/webtest/resources/responseBrowser.js
    wiki/branches/wrh2/webtest/lib/webtest/resources/responseBrowserCommands.html
    wiki/branches/wrh2/webtest/lib/webtest/resources/responseBrowserPreviews.html
    wiki/branches/wrh2/webtest/lib/webtest/resources/results.dtd
    wiki/branches/wrh2/webtest/lib/webtest/resources/showHide.js
    wiki/branches/wrh2/webtest/lib/webtest/resources/sorttable.js
    wiki/branches/wrh2/webtest/lib/webtest/resources/testExistingNodes.xml
    wiki/branches/wrh2/webtest/lib/webtest/resources/testNoRootNode.xml
    wiki/branches/wrh2/webtest/lib/webtest/resources/testWrongRootNode.xml
    wiki/branches/wrh2/webtest/lib/webtest/resources/webtestsRunner.xml
    wiki/branches/wrh2/webtest/lib/webtest/tools/
    wiki/branches/wrh2/webtest/lib/webtest/tools/WebTestIcon.png
    wiki/branches/wrh2/webtest/lib/webtest/tools/WebTestMonitor.groovy
    wiki/branches/wrh2/webtest/lib/webtest/tools/WebTestParallelInit.groovy
    wiki/branches/wrh2/webtest/lib/webtest/tools/WebTestParallelWaitForCompletion.groovy
    wiki/branches/wrh2/webtest/lib/webtest/tools/generateDefinitions.groovy
    wiki/branches/wrh2/webtest/lib/webtest/tools/generateDtd.groovy
    wiki/branches/wrh2/webtest/lib/webtest/tools/spinner.gif
    wiki/branches/wrh2/webtest/lib/webtest/webtest.xml
    wiki/branches/wrh2/webtest/results/
    wiki/branches/wrh2/webtest/results/resources/
    wiki/branches/wrh2/webtest/results/resources/images/
    wiki/branches/wrh2/webtest/results/resources/images/canoo.gif
    wiki/branches/wrh2/webtest/results/resources/images/collapseall.png
    wiki/branches/wrh2/webtest/results/resources/images/expandMinus.png
    wiki/branches/wrh2/webtest/results/resources/images/expandPlus.png
    wiki/branches/wrh2/webtest/results/resources/images/expandall.png
    wiki/branches/wrh2/webtest/results/resources/images/failed.gif
    wiki/branches/wrh2/webtest/results/resources/images/favicon.ico
    wiki/branches/wrh2/webtest/results/resources/images/less.gif
    wiki/branches/wrh2/webtest/results/resources/images/more.gif
    wiki/branches/wrh2/webtest/results/resources/images/ok.gif
    wiki/branches/wrh2/webtest/results/resources/images/optional.gif
    wiki/branches/wrh2/webtest/results/resources/images/todo.gif
    wiki/branches/wrh2/webtest/results/resources/images/webtest.jpg
    wiki/branches/wrh2/webtest/results/resources/report.css
    wiki/branches/wrh2/webtest/results/resources/responseBrowser.html
    wiki/branches/wrh2/webtest/results/resources/responseBrowser.js
    wiki/branches/wrh2/webtest/results/resources/responseBrowserCommands.html
    wiki/branches/wrh2/webtest/results/resources/responseBrowserPreviews.html
    wiki/branches/wrh2/webtest/results/resources/showHide.js
    wiki/branches/wrh2/webtest/results/resources/sorttable.js
    wiki/branches/wrh2/webtest/tests/
    wiki/branches/wrh2/webtest/tests/allTests.xml
    wiki/branches/wrh2/webtest/tests/jamwikiAdminLoginTest.xml
    wiki/branches/wrh2/webtest/tests/jamwikiAdminLoginTestchangePwd.xml
    wiki/branches/wrh2/webtest/tests/jamwikiConfigurationTest.xml
    wiki/branches/wrh2/webtest/tests/jamwikiStartTest.xml
    wiki/branches/wrh2/webtest/webtest.properties
    wiki/branches/wrh2/webtests/

Property Changed:
----------------
    wiki/branches/wrh2/


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Jamwiki-commit] SF.net SVN: jamwiki:[2792] wiki/branches/wrh2

From: <wrh2@us...> - 2009-12-16 05:12

Revision: 2792
          http://jamwiki.svn.sourceforge.net/jamwiki/?rev=2792&view=rev
Author:   wrh2
Date:     2009-12-16 05:12:19 +0000 (Wed, 16 Dec 2009)

Log Message:
-----------
Merge:
  * Reintegrate recent trunk changes.

Modified Paths:
--------------
    wiki/branches/wrh2/jamwiki-core/src/main/java/org/jamwiki/DataHandler.java
    wiki/branches/wrh2/jamwiki-core/src/main/java/org/jamwiki/SearchEngine.java
    wiki/branches/wrh2/jamwiki-core/src/main/java/org/jamwiki/utils/ImageUtil.java
    wiki/branches/wrh2/jamwiki-core/src/test/java/org/jamwiki/TestDataHandler.java
    wiki/branches/wrh2/jamwiki-war/src/main/resources/ApplicationResources_pl.properties
    wiki/branches/wrh2/jamwiki-war/src/main/resources/sql.ansi.properties
    wiki/branches/wrh2/jamwiki-war/src/main/resources/sql.mysql.properties
    wiki/branches/wrh2/jamwiki-war/src/main/webapp/CHANGELOG.txt
    wiki/branches/wrh2/jamwiki-war/src/main/webapp/UPGRADE.txt
    wiki/branches/wrh2/jamwiki-war/src/main/webapp/WEB-INF/applicationContext-security.xml
    wiki/branches/wrh2/jamwiki-war/src/main/webapp/WEB-INF/jamwiki-servlet.xml
    wiki/branches/wrh2/jamwiki-war/src/main/webapp/WEB-INF/web.xml
    wiki/branches/wrh2/jamwiki-web/pom.xml
    wiki/branches/wrh2/jamwiki-web/src/main/java/org/jamwiki/authentication/JAMWikiAuthenticationConfiguration.java
    wiki/branches/wrh2/jamwiki-web/src/main/java/org/jamwiki/authentication/JAMWikiAuthenticationConstants.java
    wiki/branches/wrh2/jamwiki-web/src/main/java/org/jamwiki/authentication/JAMWikiAuthenticationProcessingFilter.java
    wiki/branches/wrh2/jamwiki-web/src/main/java/org/jamwiki/authentication/JAMWikiAuthenticationProcessingFilterEntryPoint.java
    wiki/branches/wrh2/jamwiki-web/src/main/java/org/jamwiki/authentication/JAMWikiDaoImpl.java
    wiki/branches/wrh2/jamwiki-web/src/main/java/org/jamwiki/authentication/JAMWikiErrorMessageProvider.java
    wiki/branches/wrh2/jamwiki-web/src/main/java/org/jamwiki/authentication/JAMWikiPasswordEncoder.java
    wiki/branches/wrh2/jamwiki-web/src/main/java/org/jamwiki/authentication/JAMWikiPostAuthenticationFilter.java
    wiki/branches/wrh2/jamwiki-web/src/main/java/org/jamwiki/authentication/RoleImpl.java
    wiki/branches/wrh2/jamwiki-web/src/main/java/org/jamwiki/authentication/WikiUserDetails.java
    wiki/branches/wrh2/jamwiki-web/src/main/java/org/jamwiki/db/AnsiDataHandler.java
    wiki/branches/wrh2/jamwiki-web/src/main/java/org/jamwiki/db/AnsiQueryHandler.java
    wiki/branches/wrh2/jamwiki-web/src/main/java/org/jamwiki/db/QueryHandler.java
    wiki/branches/wrh2/jamwiki-web/src/main/java/org/jamwiki/search/LuceneSearchEngine.java
    wiki/branches/wrh2/jamwiki-web/src/main/java/org/jamwiki/servlets/JAMWikiLocaleInterceptor.java
    wiki/branches/wrh2/jamwiki-web/src/main/java/org/jamwiki/servlets/RegisterServlet.java
    wiki/branches/wrh2/jamwiki-web/src/main/java/org/jamwiki/servlets/ServletUtil.java
    wiki/branches/wrh2/jamwiki-web/src/main/java/org/jamwiki/servlets/SetupServlet.java
    wiki/branches/wrh2/jamwiki-web/src/main/java/org/jamwiki/servlets/UpgradeServlet.java
    wiki/branches/wrh2/jamwiki-web/src/main/java/org/jamwiki/servlets/UploadServlet.java
    wiki/branches/wrh2/pom.xml

Added Paths:
-----------
    wiki/branches/wrh2/jamwiki-web/src/main/java/org/jamwiki/authentication/JAMWikiAccessDeniedHandler.java
    wiki/branches/wrh2/jamwiki-web/src/main/java/org/jamwiki/authentication/JAMWikiAuthenticationFailureHandler.java

Removed Paths:
-------------
    wiki/branches/wrh2/jamwiki-web/src/main/java/org/jamwiki/authentication/JAMWikiExceptionTranslationFilter.java

Property Changed:
----------------
    wiki/branches/wrh2/


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Jamwiki-commit] SF.net SVN: jamwiki:[2878] wiki/branches/wrh2

From: <wrh2@us...> - 2010-02-11 05:45

Revision: 2878
          http://jamwiki.svn.sourceforge.net/jamwiki/?rev=2878&view=rev
Author:   wrh2
Date:     2010-02-11 05:45:39 +0000 (Thu, 11 Feb 2010)

Log Message:
-----------
Merge:
  * Merge trunk changes to wrh2 branch.

Modified Paths:
--------------
    wiki/branches/wrh2/addons/bliki-parser/src/main/java/org/jamwiki/parser/bliki/BlikiParser.java
    wiki/branches/wrh2/addons/bliki-parser/src/main/java/org/jamwiki/parser/bliki/JAMWikiModel.java
    wiki/branches/wrh2/jamwiki-core/src/main/java/org/jamwiki/DataHandler.java
    wiki/branches/wrh2/jamwiki-core/src/main/java/org/jamwiki/Environment.java
    wiki/branches/wrh2/jamwiki-core/src/main/java/org/jamwiki/migrate/MigrationUtil.java
    wiki/branches/wrh2/jamwiki-core/src/main/java/org/jamwiki/model/RecentChange.java
    wiki/branches/wrh2/jamwiki-core/src/main/java/org/jamwiki/model/RoleMap.java
    wiki/branches/wrh2/jamwiki-core/src/main/java/org/jamwiki/parser/ParserException.java
    wiki/branches/wrh2/jamwiki-core/src/main/java/org/jamwiki/parser/TableOfContents.java
    wiki/branches/wrh2/jamwiki-core/src/main/java/org/jamwiki/parser/jflex/HtmlLinkTag.java
    wiki/branches/wrh2/jamwiki-core/src/main/java/org/jamwiki/parser/jflex/IncludeOnlyTag.java
    wiki/branches/wrh2/jamwiki-core/src/main/java/org/jamwiki/parser/jflex/JFlexLexer.java
    wiki/branches/wrh2/jamwiki-core/src/main/java/org/jamwiki/parser/jflex/JFlexParser.java
    wiki/branches/wrh2/jamwiki-core/src/main/java/org/jamwiki/parser/jflex/JFlexParserUtil.java
    wiki/branches/wrh2/jamwiki-core/src/main/java/org/jamwiki/parser/jflex/JFlexTagItem.java
    wiki/branches/wrh2/jamwiki-core/src/main/java/org/jamwiki/parser/jflex/NoIncludeTag.java
    wiki/branches/wrh2/jamwiki-core/src/main/java/org/jamwiki/parser/jflex/ParserFunctionUtil.java
    wiki/branches/wrh2/jamwiki-core/src/main/java/org/jamwiki/parser/jflex/TemplateTag.java
    wiki/branches/wrh2/jamwiki-core/src/main/java/org/jamwiki/parser/jflex/WikiHeadingTag.java
    wiki/branches/wrh2/jamwiki-core/src/main/java/org/jamwiki/parser/jflex/WikiLinkTag.java
    wiki/branches/wrh2/jamwiki-core/src/main/java/org/jamwiki/parser/jflex/WikiReferenceTag.java
    wiki/branches/wrh2/jamwiki-core/src/main/java/org/jamwiki/parser/jflex/WikiReferencesTag.java
    wiki/branches/wrh2/jamwiki-core/src/main/java/org/jamwiki/parser/jflex/WikiSignatureTag.java
    wiki/branches/wrh2/jamwiki-core/src/main/java/org/jamwiki/utils/DiffUtil.java
    wiki/branches/wrh2/jamwiki-core/src/main/java/org/jamwiki/utils/Encryption.java
    wiki/branches/wrh2/jamwiki-core/src/main/java/org/jamwiki/utils/LinkUtil.java
    wiki/branches/wrh2/jamwiki-core/src/main/java/org/jamwiki/utils/TiddlyWiki2MediaWikiTranslator.java
    wiki/branches/wrh2/jamwiki-core/src/main/java/org/jamwiki/utils/TiddlyWikiParser.java
    wiki/branches/wrh2/jamwiki-core/src/main/java/org/jamwiki/utils/Utilities.java
    wiki/branches/wrh2/jamwiki-core/src/main/java/org/jamwiki/utils/WikiCache.java
    wiki/branches/wrh2/jamwiki-core/src/main/java/org/jamwiki/utils/WikiLogFormatter.java
    wiki/branches/wrh2/jamwiki-core/src/main/java/org/jamwiki/utils/WikiLogger.java
    wiki/branches/wrh2/jamwiki-core/src/main/java/org/jamwiki/utils/XMLUtil.java
    wiki/branches/wrh2/jamwiki-core/src/main/jflex/jamwiki-postprocessor.jflex
    wiki/branches/wrh2/jamwiki-core/src/main/jflex/jamwiki-preprocessor.jflex
    wiki/branches/wrh2/jamwiki-core/src/main/jflex/jamwiki-processor.jflex
    wiki/branches/wrh2/jamwiki-core/src/main/jflex/jamwiki-spliceprocessor.jflex
    wiki/branches/wrh2/jamwiki-core/src/test/java/org/jamwiki/TestDataHandler.java
    wiki/branches/wrh2/jamwiki-core/src/test/java/org/jamwiki/TestFileUtil.java
    wiki/branches/wrh2/jamwiki-core/src/test/java/org/jamwiki/migrate/MigrationUtilTest.java
    wiki/branches/wrh2/jamwiki-core/src/test/java/org/jamwiki/parser/ParserTest.java
    wiki/branches/wrh2/jamwiki-core/src/test/resources/data/results/HtmlNoAttributes1
    wiki/branches/wrh2/jamwiki-core/src/test/resources/data/results/HtmlWithAttributes1
    wiki/branches/wrh2/jamwiki-core/src/test/resources/data/results/HtmlXSS1
    wiki/branches/wrh2/jamwiki-core/src/test/resources/data/results/Preformatted1
    wiki/branches/wrh2/jamwiki-core/src/test/resources/data/results/Template5
    wiki/branches/wrh2/jamwiki-core/src/test/resources/data/results/WikiLink1
    wiki/branches/wrh2/jamwiki-core/src/test/resources/data/topics/HtmlNoAttributes1
    wiki/branches/wrh2/jamwiki-core/src/test/resources/data/topics/HtmlWithAttributes1
    wiki/branches/wrh2/jamwiki-core/src/test/resources/data/topics/HtmlXSS1
    wiki/branches/wrh2/jamwiki-core/src/test/resources/data/topics/Preformatted1
    wiki/branches/wrh2/jamwiki-core/src/test/resources/data/topics/Template5
    wiki/branches/wrh2/jamwiki-core/src/test/resources/data/topics/WikiLink1
    wiki/branches/wrh2/jamwiki-war/src/main/resources/ApplicationResources.properties
    wiki/branches/wrh2/jamwiki-war/src/main/resources/ApplicationResources_de.properties
    wiki/branches/wrh2/jamwiki-war/src/main/resources/ApplicationResources_fr.properties
    wiki/branches/wrh2/jamwiki-war/src/main/resources/ApplicationResources_ru.properties
    wiki/branches/wrh2/jamwiki-war/src/main/resources/pages/StartingPoints.txt
    wiki/branches/wrh2/jamwiki-war/src/main/resources/spam-blacklist.txt
    wiki/branches/wrh2/jamwiki-war/src/main/resources/sql.ansi.properties
    wiki/branches/wrh2/jamwiki-war/src/main/resources/sql.asa.properties
    wiki/branches/wrh2/jamwiki-war/src/main/resources/sql.db2.properties
    wiki/branches/wrh2/jamwiki-war/src/main/resources/sql.db2400.properties
    wiki/branches/wrh2/jamwiki-war/src/main/resources/sql.mssql.properties
    wiki/branches/wrh2/jamwiki-war/src/main/resources/sql.mysql.properties
    wiki/branches/wrh2/jamwiki-war/src/main/resources/sql.oracle.properties
    wiki/branches/wrh2/jamwiki-war/src/main/resources/sql.postgres.properties
    wiki/branches/wrh2/jamwiki-war/src/main/webapp/CHANGELOG.txt
    wiki/branches/wrh2/jamwiki-war/src/main/webapp/UPGRADE.txt
    wiki/branches/wrh2/jamwiki-war/src/main/webapp/WEB-INF/jamwiki-servlet.xml
    wiki/branches/wrh2/jamwiki-war/src/main/webapp/WEB-INF/jsp/admin-maintenance.jsp
    wiki/branches/wrh2/jamwiki-war/src/main/webapp/WEB-INF/jsp/admin.jsp
    wiki/branches/wrh2/jamwiki-web/src/main/java/org/jamwiki/db/AnsiDataHandler.java
    wiki/branches/wrh2/jamwiki-web/src/main/java/org/jamwiki/db/AnsiQueryHandler.java
    wiki/branches/wrh2/jamwiki-web/src/main/java/org/jamwiki/db/DB2400QueryHandler.java
    wiki/branches/wrh2/jamwiki-web/src/main/java/org/jamwiki/db/DB2QueryHandler.java
    wiki/branches/wrh2/jamwiki-web/src/main/java/org/jamwiki/db/DatabaseConnection.java
    wiki/branches/wrh2/jamwiki-web/src/main/java/org/jamwiki/db/DatabaseUpgrades.java
    wiki/branches/wrh2/jamwiki-web/src/main/java/org/jamwiki/db/OracleQueryHandler.java
    wiki/branches/wrh2/jamwiki-web/src/main/java/org/jamwiki/db/QueryHandler.java
    wiki/branches/wrh2/jamwiki-web/src/main/java/org/jamwiki/db/WikiDatabase.java
    wiki/branches/wrh2/jamwiki-web/src/main/java/org/jamwiki/search/LuceneSearchEngine.java
    wiki/branches/wrh2/jamwiki-web/src/main/java/org/jamwiki/servlets/AdminServlet.java
    wiki/branches/wrh2/jamwiki-web/src/main/java/org/jamwiki/servlets/ExportServlet.java
    wiki/branches/wrh2/jamwiki-web/src/main/java/org/jamwiki/servlets/ImportServlet.java
    wiki/branches/wrh2/jamwiki-web/src/main/java/org/jamwiki/servlets/ItemsServlet.java
    wiki/branches/wrh2/jamwiki-web/src/main/java/org/jamwiki/servlets/LoginServlet.java
    wiki/branches/wrh2/jamwiki-web/src/main/java/org/jamwiki/servlets/UpgradeServlet.java
    wiki/branches/wrh2/jamwiki-web/src/main/java/org/jamwiki/taglib/AbstractButtonTag.java
    wiki/branches/wrh2/jamwiki-web/src/main/java/org/jamwiki/taglib/AuthMsgTag.java
    wiki/branches/wrh2/jamwiki-web/src/main/java/org/jamwiki/taglib/EditCommentTag.java
    wiki/branches/wrh2/jamwiki-web/src/main/java/org/jamwiki/taglib/PaginationTag.java
    wiki/branches/wrh2/jamwiki-web/src/main/java/org/jamwiki/taglib/TextTag.java
    wiki/branches/wrh2/javadiff/src/main/java/org/incava/util/diff/Difference.java
    wiki/branches/wrh2/pom.xml

Added Paths:
-----------
    wiki/branches/wrh2/jamwiki-core/src/main/java/org/jamwiki/migrate/MediaWikiConstants.java
    wiki/branches/wrh2/jamwiki-core/src/main/java/org/jamwiki/migrate/MediaWikiXmlExporter.java
    wiki/branches/wrh2/jamwiki-core/src/main/java/org/jamwiki/migrate/MediaWikiXmlImporter.java
    wiki/branches/wrh2/jamwiki-core/src/main/java/org/jamwiki/migrate/TopicExporter.java
    wiki/branches/wrh2/jamwiki-core/src/main/java/org/jamwiki/migrate/TopicImporter.java
    wiki/branches/wrh2/jamwiki-core/src/main/java/org/jamwiki/parser/jflex/HtmlTagItem.java
    wiki/branches/wrh2/jamwiki-core/src/main/java/org/jamwiki/parser/jflex/JFlexParserTag.java
    wiki/branches/wrh2/jamwiki-core/src/main/java/org/jamwiki/parser/jflex/JavascriptTag.java
    wiki/branches/wrh2/jamwiki-core/src/main/java/org/jamwiki/parser/jflex/WikiBoldItalicTag.java
    wiki/branches/wrh2/jamwiki-core/src/main/jflex/jamwiki-html-processor.jflex
    wiki/branches/wrh2/jamwiki-core/src/test/resources/data/javascript/
    wiki/branches/wrh2/jamwiki-core/src/test/resources/data/javascript/Javascript
    wiki/branches/wrh2/jamwiki-core/src/test/resources/data/results/HtmlDivTags
    wiki/branches/wrh2/jamwiki-core/src/test/resources/data/results/HtmlList2
    wiki/branches/wrh2/jamwiki-core/src/test/resources/data/results/Javascript
    wiki/branches/wrh2/jamwiki-core/src/test/resources/data/results/Paragraph16
    wiki/branches/wrh2/jamwiki-core/src/test/resources/data/results/Table15
    wiki/branches/wrh2/jamwiki-core/src/test/resources/data/results/Table16
    wiki/branches/wrh2/jamwiki-core/src/test/resources/data/results/Template_-_Expr
    wiki/branches/wrh2/jamwiki-core/src/test/resources/data/topics/HtmlDivTags
    wiki/branches/wrh2/jamwiki-core/src/test/resources/data/topics/HtmlList2
    wiki/branches/wrh2/jamwiki-core/src/test/resources/data/topics/Javascript
    wiki/branches/wrh2/jamwiki-core/src/test/resources/data/topics/Paragraph16
    wiki/branches/wrh2/jamwiki-core/src/test/resources/data/topics/Table15
    wiki/branches/wrh2/jamwiki-core/src/test/resources/data/topics/Table16
    wiki/branches/wrh2/jamwiki-core/src/test/resources/data/topics/Template_-_Embed
    wiki/branches/wrh2/jamwiki-core/src/test/resources/data/topics/Template_-_Expr
    wiki/branches/wrh2/jamwiki-war/src/main/resources/ehcache-sample.xml
    wiki/branches/wrh2/jamwiki-war/src/main/resources/ehcache.xsd

Removed Paths:
-------------
    wiki/branches/wrh2/jamwiki-core/src/main/java/org/jamwiki/migrate/MediaWikiXmlMigrator.java
    wiki/branches/wrh2/jamwiki-core/src/main/java/org/jamwiki/migrate/Migrator.java
    wiki/branches/wrh2/jamwiki-core/src/test/resources/data/javascript/Javascript
    wiki/branches/wrh2/jamwiki-core/src/test/resources/data/results/HtmlNoAttributes2
    wiki/branches/wrh2/jamwiki-core/src/test/resources/data/results/HtmlNoAttributes3
    wiki/branches/wrh2/jamwiki-core/src/test/resources/data/results/HtmlWithAttributes2
    wiki/branches/wrh2/jamwiki-core/src/test/resources/data/results/HtmlWithAttributes3
    wiki/branches/wrh2/jamwiki-core/src/test/resources/data/results/HtmlXSS2
    wiki/branches/wrh2/jamwiki-core/src/test/resources/data/topics/HtmlNoAttributes2
    wiki/branches/wrh2/jamwiki-core/src/test/resources/data/topics/HtmlNoAttributes3
    wiki/branches/wrh2/jamwiki-core/src/test/resources/data/topics/HtmlWithAttributes2
    wiki/branches/wrh2/jamwiki-core/src/test/resources/data/topics/HtmlWithAttributes3
    wiki/branches/wrh2/jamwiki-core/src/test/resources/data/topics/HtmlXSS2
    wiki/branches/wrh2/jamwiki-web/src/main/java/org/jamwiki/db/WikiPreparedStatement.java
    wiki/branches/wrh2/jamwiki-web/src/main/java/org/jamwiki/db/WikiResultSet.java

Property Changed:
----------------
    wiki/branches/wrh2/


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Jamwiki-commit] SF.net SVN: jamwiki:[2880] wiki/branches/wrh2

From: <wrh2@us...> - 2010-02-14 06:26

Revision: 2880
          http://jamwiki.svn.sourceforge.net/jamwiki/?rev=2880&view=rev
Author:   wrh2
Date:     2010-02-14 06:26:01 +0000 (Sun, 14 Feb 2010)

Log Message:
-----------
Namespaces:
  * Add a jam_namespace table and a jam_namespace_translation table.  The end
    goal is to allow localized namespace names, better topic organization,
    and additional functionality.
  * First step.  Further commits will update the jam_topic table, add a
    management interface, and introduce new functionality.

Modified Paths:
--------------
    wiki/branches/wrh2/jamwiki-core/src/main/java/org/jamwiki/DataHandler.java
    wiki/branches/wrh2/jamwiki-core/src/main/java/org/jamwiki/migrate/MediaWikiConstants.java
    wiki/branches/wrh2/jamwiki-core/src/test/java/org/jamwiki/TestDataHandler.java
    wiki/branches/wrh2/jamwiki-war/src/main/resources/sql.ansi.properties
    wiki/branches/wrh2/jamwiki-war/src/main/resources/sql.hsql.properties
    wiki/branches/wrh2/jamwiki-web/src/main/java/org/jamwiki/db/AnsiDataHandler.java
    wiki/branches/wrh2/jamwiki-web/src/main/java/org/jamwiki/db/AnsiQueryHandler.java
    wiki/branches/wrh2/jamwiki-web/src/main/java/org/jamwiki/db/DatabaseUpgrades.java
    wiki/branches/wrh2/jamwiki-web/src/main/java/org/jamwiki/db/QueryHandler.java
    wiki/branches/wrh2/jamwiki-web/src/main/java/org/jamwiki/db/WikiDatabase.java
    wiki/branches/wrh2/jamwiki-web/src/main/java/org/jamwiki/servlets/UpgradeServlet.java

Added Paths:
-----------
    wiki/branches/wrh2/jamwiki-core/src/main/java/org/jamwiki/utils/Namespace.java


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Jamwiki-commit] SF.net SVN: jamwiki:[2882] wiki/branches/wrh2

From: <wrh2@us...> - 2010-02-15 05:26

Revision: 2882
          http://jamwiki.svn.sourceforge.net/jamwiki/?rev=2882&view=rev
Author:   wrh2
Date:     2010-02-15 05:26:09 +0000 (Mon, 15 Feb 2010)

Log Message:
-----------
Namespaces:
  * Add namespace_id to the jam_topic table.
  * Add code to automatically update existing installations with the new column.
  * Further commits will add code to update existing data and populate this
    column for new topics.

Modified Paths:
--------------
    wiki/branches/wrh2/jamwiki-war/src/main/resources/sql.ansi.properties
    wiki/branches/wrh2/jamwiki-war/src/main/resources/sql.asa.properties
    wiki/branches/wrh2/jamwiki-war/src/main/resources/sql.hsql.properties
    wiki/branches/wrh2/jamwiki-war/src/main/resources/sql.mssql.properties
    wiki/branches/wrh2/jamwiki-war/src/main/resources/sql.mysql.properties
    wiki/branches/wrh2/jamwiki-war/src/main/resources/sql.oracle.properties
    wiki/branches/wrh2/jamwiki-war/src/main/resources/sql.postgres.properties
    wiki/branches/wrh2/jamwiki-war/src/main/webapp/UPGRADE.txt
    wiki/branches/wrh2/jamwiki-web/src/main/java/org/jamwiki/db/AnsiDataHandler.java
    wiki/branches/wrh2/jamwiki-web/src/main/java/org/jamwiki/db/DatabaseUpgrades.java
    wiki/branches/wrh2/jamwiki-web/src/main/java/org/jamwiki/db/WikiDatabase.java


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Jamwiki-commit] SF.net SVN: jamwiki:[2883] wiki/branches/wrh2

From: <wrh2@us...> - 2010-02-17 04:30

Revision: 2883
          http://jamwiki.svn.sourceforge.net/jamwiki/?rev=2883&view=rev
Author:   wrh2
Date:     2010-02-17 04:30:18 +0000 (Wed, 17 Feb 2010)

Log Message:
-----------
Namespaces:
  * Convert the Namespaces enum to a class - custom namespaces can be created,
    so an enum is not the appropriate way to model this functionality.

Modified Paths:
--------------
    wiki/branches/wrh2/jamwiki-core/src/main/java/org/jamwiki/utils/Namespace.java
    wiki/branches/wrh2/jamwiki-web/src/main/java/org/jamwiki/db/WikiDatabase.java


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Jamwiki-commit] SF.net SVN: jamwiki:[2886] wiki/branches/wrh2

From: <wrh2@us...> - 2010-02-21 06:09

Revision: 2886
          http://jamwiki.svn.sourceforge.net/jamwiki/?rev=2886&view=rev
Author:   wrh2
Date:     2010-02-21 06:09:50 +0000 (Sun, 21 Feb 2010)

Log Message:
-----------
Namespaces:
  * Add a DataHandler.lookupNamespace() method for retrieving a Namespace given
    a namespace string.

Modified Paths:
--------------
    wiki/branches/wrh2/jamwiki-core/src/main/java/org/jamwiki/DataHandler.java
    wiki/branches/wrh2/jamwiki-core/src/main/java/org/jamwiki/utils/Namespace.java
    wiki/branches/wrh2/jamwiki-core/src/test/java/org/jamwiki/TestDataHandler.java
    wiki/branches/wrh2/jamwiki-web/src/main/java/org/jamwiki/db/AnsiDataHandler.java
    wiki/branches/wrh2/jamwiki-web/src/main/java/org/jamwiki/db/AnsiQueryHandler.java
    wiki/branches/wrh2/jamwiki-web/src/main/java/org/jamwiki/db/QueryHandler.java


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Jamwiki-commit] SF.net SVN: jamwiki:[2887] wiki/branches/wrh2

From: <wrh2@us...> - 2010-02-21 06:15

Revision: 2887
          http://jamwiki.svn.sourceforge.net/jamwiki/?rev=2887&view=rev
Author:   wrh2
Date:     2010-02-21 06:15:41 +0000 (Sun, 21 Feb 2010)

Log Message:
-----------
Merge:
  * Merge latest changes from trunk.

Modified Paths:
--------------
    wiki/branches/wrh2/jamwiki-core/src/main/java/org/jamwiki/parser/jflex/HtmlLinkTag.java
    wiki/branches/wrh2/jamwiki-core/src/main/java/org/jamwiki/parser/jflex/IncludeOnlyTag.java
    wiki/branches/wrh2/jamwiki-core/src/main/java/org/jamwiki/parser/jflex/JFlexLexer.java
    wiki/branches/wrh2/jamwiki-core/src/main/java/org/jamwiki/parser/jflex/JFlexParserTag.java
    wiki/branches/wrh2/jamwiki-core/src/main/java/org/jamwiki/parser/jflex/JavascriptTag.java
    wiki/branches/wrh2/jamwiki-core/src/main/java/org/jamwiki/parser/jflex/NoIncludeTag.java
    wiki/branches/wrh2/jamwiki-core/src/main/java/org/jamwiki/parser/jflex/TemplateTag.java
    wiki/branches/wrh2/jamwiki-core/src/main/java/org/jamwiki/parser/jflex/WikiHeadingTag.java
    wiki/branches/wrh2/jamwiki-core/src/main/java/org/jamwiki/parser/jflex/WikiLinkTag.java
    wiki/branches/wrh2/jamwiki-core/src/main/java/org/jamwiki/parser/jflex/WikiReferencesTag.java
    wiki/branches/wrh2/jamwiki-core/src/main/java/org/jamwiki/parser/jflex/WikiSignatureTag.java
    wiki/branches/wrh2/jamwiki-core/src/main/jflex/jamwiki-preprocessor.jflex
    wiki/branches/wrh2/jamwiki-core/src/test/resources/data/results/Template4
    wiki/branches/wrh2/jamwiki-core/src/test/resources/data/topics/Template4
    wiki/branches/wrh2/jamwiki-war/src/main/webapp/CHANGELOG.txt

Added Paths:
-----------
    wiki/branches/wrh2/jamwiki-core/src/test/resources/data/results/Template_-_Infinite
    wiki/branches/wrh2/jamwiki-core/src/test/resources/data/results/Template_-_Subst
    wiki/branches/wrh2/jamwiki-core/src/test/resources/data/topics/Template_-_Infinite
    wiki/branches/wrh2/jamwiki-core/src/test/resources/data/topics/Template_-_Subst

Property Changed:
----------------
    wiki/branches/wrh2/


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Jamwiki-commit] SF.net SVN: jamwiki:[2890] wiki/branches/wrh2

From: <wrh2@us...> - 2010-02-23 06:19

Revision: 2890
          http://jamwiki.svn.sourceforge.net/jamwiki/?rev=2890&view=rev
Author:   wrh2
Date:     2010-02-23 06:19:50 +0000 (Tue, 23 Feb 2010)

Log Message:
-----------
Namespaces:
  * Update wikiLink.getNamespace() to return a Namespace object.
  * This commit breaks custom namespaces - that will be cleaned up in future
    commits.
  * Note that NamespaceHandler will be completely removed in future commits.
  * This change was committed to a branch (instead of trunk) for a reason - USE
    AT YOUR OWN RISK!

Modified Paths:
--------------
    wiki/branches/wrh2/addons/bliki-parser/src/main/java/org/jamwiki/parser/bliki/JAMHTMLConverter.java
    wiki/branches/wrh2/addons/bliki-parser/src/main/java/org/jamwiki/parser/bliki/JAMWikiModel.java
    wiki/branches/wrh2/jamwiki-core/src/main/java/org/jamwiki/migrate/MediaWikiXmlImporter.java
    wiki/branches/wrh2/jamwiki-core/src/main/java/org/jamwiki/parser/jflex/JFlexParser.java
    wiki/branches/wrh2/jamwiki-core/src/main/java/org/jamwiki/parser/jflex/MagicWordUtil.java
    wiki/branches/wrh2/jamwiki-core/src/main/java/org/jamwiki/parser/jflex/WikiLinkTag.java
    wiki/branches/wrh2/jamwiki-core/src/main/java/org/jamwiki/utils/InterWikiHandler.java
    wiki/branches/wrh2/jamwiki-core/src/main/java/org/jamwiki/utils/LinkUtil.java
    wiki/branches/wrh2/jamwiki-core/src/main/java/org/jamwiki/utils/Namespace.java
    wiki/branches/wrh2/jamwiki-core/src/main/java/org/jamwiki/utils/WikiLink.java
    wiki/branches/wrh2/jamwiki-core/src/main/java/org/jamwiki/utils/WikiUtil.java
    wiki/branches/wrh2/jamwiki-core/src/test/java/org/jamwiki/TestDataHandler.java
    wiki/branches/wrh2/jamwiki-core/src/test/java/org/jamwiki/utils/LinkUtilTest.java
    wiki/branches/wrh2/jamwiki-core/src/test/java/org/jamwiki/utils/WikiLinkTest.java
    wiki/branches/wrh2/jamwiki-web/src/main/java/org/jamwiki/db/AnsiDataHandler.java
    wiki/branches/wrh2/jamwiki-web/src/main/java/org/jamwiki/servlets/EditServlet.java
    wiki/branches/wrh2/jamwiki-web/src/main/java/org/jamwiki/servlets/MoveServlet.java
    wiki/branches/wrh2/jamwiki-web/src/main/java/org/jamwiki/servlets/ServletUtil.java
    wiki/branches/wrh2/jamwiki-web/src/main/java/org/jamwiki/servlets/WikiPageInfo.java


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Jamwiki-commit] SF.net SVN: jamwiki:[2891] wiki/branches/wrh2

From: <wrh2@us...> - 2010-02-23 06:27

Revision: 2891
          http://jamwiki.svn.sourceforge.net/jamwiki/?rev=2891&view=rev
Author:   wrh2
Date:     2010-02-23 06:26:54 +0000 (Tue, 23 Feb 2010)

Log Message:
-----------
Merge:
  * Merge latest changes from trunk.

Modified Paths:
--------------
    wiki/branches/wrh2/jamwiki-war/src/main/resources/ApplicationResources_zh_CN.properties
    wiki/branches/wrh2/jamwiki-war/src/main/webapp/CHANGELOG.txt
    wiki/branches/wrh2/pom.xml

Property Changed:
----------------
    wiki/branches/wrh2/


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Jamwiki-commit] SF.net SVN: jamwiki:[2893] wiki/branches/wrh2

From: <wrh2@us...> - 2010-02-25 04:48

Revision: 2893
          http://jamwiki.svn.sourceforge.net/jamwiki/?rev=2893&view=rev
Author:   wrh2
Date:     2010-02-25 04:48:46 +0000 (Thu, 25 Feb 2010)

Log Message:
-----------
Namespaces:
  * Remove most of the remaining uses of NamespaceHandler.  This breaks
    any site using custom namespaces, something that will be fixed in future
    commits.

Modified Paths:
--------------
    wiki/branches/wrh2/jamwiki-core/src/main/java/org/jamwiki/migrate/MediaWikiConstants.java
    wiki/branches/wrh2/jamwiki-core/src/main/java/org/jamwiki/parser/jflex/ParserFunctionUtil.java
    wiki/branches/wrh2/jamwiki-core/src/main/java/org/jamwiki/parser/jflex/TemplateTag.java
    wiki/branches/wrh2/jamwiki-core/src/main/java/org/jamwiki/parser/jflex/WikiSignatureTag.java
    wiki/branches/wrh2/jamwiki-core/src/main/java/org/jamwiki/utils/ImageUtil.java
    wiki/branches/wrh2/jamwiki-core/src/main/java/org/jamwiki/utils/LinkUtil.java
    wiki/branches/wrh2/jamwiki-core/src/main/java/org/jamwiki/utils/NamespaceHandler.java
    wiki/branches/wrh2/jamwiki-core/src/main/java/org/jamwiki/utils/WikiUtil.java
    wiki/branches/wrh2/jamwiki-web/src/main/java/org/jamwiki/servlets/CategoryServlet.java
    wiki/branches/wrh2/jamwiki-web/src/main/java/org/jamwiki/servlets/ItemsServlet.java
    wiki/branches/wrh2/jamwiki-web/src/main/java/org/jamwiki/servlets/JAMWikiServlet.java
    wiki/branches/wrh2/jamwiki-web/src/main/java/org/jamwiki/servlets/ServletUtil.java
    wiki/branches/wrh2/jamwiki-web/src/main/java/org/jamwiki/servlets/TranslationServlet.java
    wiki/branches/wrh2/jamwiki-web/src/main/java/org/jamwiki/servlets/UploadServlet.java
    wiki/branches/wrh2/jamwiki-web/src/main/java/org/jamwiki/servlets/WikiPageInfo.java


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Jamwiki-commit] SF.net SVN: jamwiki:[2894] wiki/branches/wrh2

From: <wrh2@us...> - 2010-02-27 23:17

Revision: 2894
          http://jamwiki.svn.sourceforge.net/jamwiki/?rev=2894&view=rev
Author:   wrh2
Date:     2010-02-27 23:16:57 +0000 (Sat, 27 Feb 2010)

Log Message:
-----------
Namespaces:
  * RIP NamespaceHandler.
  * Add DataHandler.lookupNamespaces() to retrieve all available namespaces.
  * Update jam_namespace to add a main_namespace_id column.

Modified Paths:
--------------
    wiki/branches/wrh2/jamwiki-core/src/main/java/org/jamwiki/DataHandler.java
    wiki/branches/wrh2/jamwiki-core/src/main/java/org/jamwiki/parser/jflex/MagicWordUtil.java
    wiki/branches/wrh2/jamwiki-core/src/main/java/org/jamwiki/parser/jflex/WikiLinkTag.java
    wiki/branches/wrh2/jamwiki-core/src/main/java/org/jamwiki/utils/Namespace.java
    wiki/branches/wrh2/jamwiki-core/src/main/java/org/jamwiki/utils/WikiUtil.java
    wiki/branches/wrh2/jamwiki-core/src/test/java/org/jamwiki/TestDataHandler.java
    wiki/branches/wrh2/jamwiki-war/src/main/resources/sql.ansi.properties
    wiki/branches/wrh2/jamwiki-war/src/main/resources/sql.hsql.properties
    wiki/branches/wrh2/jamwiki-war/src/main/webapp/UPGRADE.txt
    wiki/branches/wrh2/jamwiki-web/src/main/java/org/jamwiki/db/AnsiDataHandler.java
    wiki/branches/wrh2/jamwiki-web/src/main/java/org/jamwiki/db/AnsiQueryHandler.java
    wiki/branches/wrh2/jamwiki-web/src/main/java/org/jamwiki/db/QueryHandler.java
    wiki/branches/wrh2/jamwiki-web/src/main/java/org/jamwiki/db/WikiDatabase.java
    wiki/branches/wrh2/jamwiki-web/src/main/java/org/jamwiki/servlets/EditServlet.java
    wiki/branches/wrh2/jamwiki-web/src/main/java/org/jamwiki/servlets/MoveServlet.java

Added Paths:
-----------
    wiki/branches/wrh2/jamwiki-core/src/test/java/org/jamwiki/utils/NamespaceTest.java

Removed Paths:
-------------
    wiki/branches/wrh2/jamwiki-core/src/main/java/org/jamwiki/utils/NamespaceHandler.java
    wiki/branches/wrh2/jamwiki-core/src/test/java/org/jamwiki/utils/NamespaceHandlerTest.java


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Jamwiki-commit] SF.net SVN: jamwiki:[2902] wiki/branches/wrh2

From: <wrh2@us...> - 2010-03-01 04:29

Revision: 2902
          http://jamwiki.svn.sourceforge.net/jamwiki/?rev=2902&view=rev
Author:   wrh2
Date:     2010-03-01 04:29:01 +0000 (Mon, 01 Mar 2010)

Log Message:
-----------
Merge:
  * Merge bugfixes and translation updates from trunk.

Modified Paths:
--------------
    wiki/branches/wrh2/jamwiki-war/src/main/resources/ApplicationResources_de.properties
    wiki/branches/wrh2/jamwiki-war/src/main/resources/ApplicationResources_nl.properties
    wiki/branches/wrh2/jamwiki-war/src/main/webapp/CHANGELOG.txt
    wiki/branches/wrh2/jamwiki-war/src/main/webapp/UPGRADE.txt
    wiki/branches/wrh2/jamwiki-web/src/main/java/org/jamwiki/db/AnsiDataHandler.java
    wiki/branches/wrh2/jamwiki-web/src/main/java/org/jamwiki/search/LuceneSearchEngine.java
    wiki/branches/wrh2/jamwiki-web/src/main/java/org/jamwiki/servlets/MoveServlet.java
    wiki/branches/wrh2/pom.xml

Property Changed:
----------------
    wiki/branches/wrh2/


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Jamwiki-commit] SF.net SVN: jamwiki:[2910] wiki/branches/wrh2

From: <wrh2@us...> - 2010-03-03 06:56

Revision: 2910
          http://jamwiki.svn.sourceforge.net/jamwiki/?rev=2910&view=rev
Author:   wrh2
Date:     2010-03-03 06:55:54 +0000 (Wed, 03 Mar 2010)

Log Message:
-----------
Merge:
  * Merge latest changes from trunk.

Modified Paths:
--------------
    wiki/branches/wrh2/jamwiki-core/src/main/java/org/jamwiki/parser/jflex/ParserFunctionUtil.java
    wiki/branches/wrh2/jamwiki-core/src/main/java/org/jamwiki/parser/jflex/TemplateTag.java
    wiki/branches/wrh2/jamwiki-core/src/test/java/org/jamwiki/parser/ParserTest.java
    wiki/branches/wrh2/jamwiki-core/src/test/resources/data/results/Template5
    wiki/branches/wrh2/jamwiki-core/src/test/resources/data/topics/Template5
    wiki/branches/wrh2/jamwiki-war/src/main/resources/ApplicationResources_zh_CN.properties
    wiki/branches/wrh2/jamwiki-war/src/main/resources/pages/BottomArea.txt
    wiki/branches/wrh2/jamwiki-war/src/main/resources/pages/de/BottomArea.txt
    wiki/branches/wrh2/jamwiki-war/src/main/resources/pages/es/BottomArea.txt
    wiki/branches/wrh2/jamwiki-war/src/main/resources/pages/gl/BottomArea.txt
    wiki/branches/wrh2/jamwiki-war/src/main/resources/pages/zh-TW/BottomArea.txt
    wiki/branches/wrh2/jamwiki-war/src/main/webapp/CHANGELOG.txt
    wiki/branches/wrh2/jamwiki-web/src/main/java/org/jamwiki/servlets/MoveServlet.java

Added Paths:
-----------
    wiki/branches/wrh2/jamwiki-core/src/test/resources/data/results/Template_-_Ifeq
    wiki/branches/wrh2/jamwiki-core/src/test/resources/data/results/Template_-_Paramtest
    wiki/branches/wrh2/jamwiki-core/src/test/resources/data/topics/Template_-_Ifeq
    wiki/branches/wrh2/jamwiki-core/src/test/resources/data/topics/Template_-_Paramtest

Property Changed:
----------------
    wiki/branches/wrh2/


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Jamwiki-commit] SF.net SVN: jamwiki:[2912] wiki/branches/wrh2

From: <wrh2@us...> - 2010-03-03 07:05

Revision: 2912
          http://jamwiki.svn.sourceforge.net/jamwiki/?rev=2912&view=rev
Author:   wrh2
Date:     2010-03-03 07:04:59 +0000 (Wed, 03 Mar 2010)

Log Message:
-----------
Merge:
  * Merge latest changes from trunk.

Modified Paths:
--------------
    wiki/branches/wrh2/jamwiki-web/src/main/java/org/jamwiki/servlets/MoveServlet.java

Property Changed:
----------------
    wiki/branches/wrh2/


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Jamwiki-commit] SF.net SVN: jamwiki:[2916] wiki/branches/wrh2

From: <wrh2@us...> - 2010-03-05 05:16

Revision: 2916
          http://jamwiki.svn.sourceforge.net/jamwiki/?rev=2916&view=rev
Author:   wrh2
Date:     2010-03-05 05:16:11 +0000 (Fri, 05 Mar 2010)

Log Message:
-----------
Special:VirtualWiki:
  * New Special:VirtualWiki page for administering virtual wikis and
    namespaces.

Modified Paths:
--------------
    wiki/branches/wrh2/jamwiki-core/src/test/resources/ApplicationResources.properties
    wiki/branches/wrh2/jamwiki-core/src/test/resources/jamwiki-configuration.xml
    wiki/branches/wrh2/jamwiki-war/src/main/resources/ApplicationResources.properties
    wiki/branches/wrh2/jamwiki-war/src/main/resources/jamwiki-configuration.xml
    wiki/branches/wrh2/jamwiki-war/src/main/webapp/CHANGELOG.txt
    wiki/branches/wrh2/jamwiki-war/src/main/webapp/WEB-INF/applicationContext-security.xml
    wiki/branches/wrh2/jamwiki-war/src/main/webapp/WEB-INF/jamwiki-servlet.xml
    wiki/branches/wrh2/jamwiki-war/src/main/webapp/WEB-INF/jsp/admin-maintenance.jsp
    wiki/branches/wrh2/jamwiki-war/src/main/webapp/WEB-INF/jsp/all-special-pages.jsp
    wiki/branches/wrh2/jamwiki-web/src/main/java/org/jamwiki/servlets/AdminServlet.java
    wiki/branches/wrh2/jamwiki-web/src/main/java/org/jamwiki/servlets/JAMWikiServlet.java

Added Paths:
-----------
    wiki/branches/wrh2/jamwiki-war/src/main/webapp/WEB-INF/jsp/admin-virtual-wiki.jsp
    wiki/branches/wrh2/jamwiki-web/src/main/java/org/jamwiki/servlets/AdminVirtualWikiServlet.java


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Jamwiki-commit] SF.net SVN: jamwiki:[2925] wiki/branches/wrh2

From: <wrh2@us...> - 2010-03-06 20:36

Revision: 2925
          http://jamwiki.svn.sourceforge.net/jamwiki/?rev=2925&view=rev
Author:   wrh2
Date:     2010-03-06 20:36:31 +0000 (Sat, 06 Mar 2010)

Log Message:
-----------
Merge:
  * Merge latest changes from trunk.

Modified Paths:
--------------
    wiki/branches/wrh2/jamwiki-war/src/main/resources/pages/StyleSheet.txt
    wiki/branches/wrh2/jamwiki-war/src/main/webapp/CHANGELOG.txt
    wiki/branches/wrh2/jamwiki-war/src/main/webapp/UPGRADE.txt
    wiki/branches/wrh2/jamwiki-war/src/main/webapp/WEB-INF/jsp/admin-maintenance.jsp
    wiki/branches/wrh2/jamwiki-war/src/main/webapp/WEB-INF/jsp/admin-manage.jsp
    wiki/branches/wrh2/jamwiki-war/src/main/webapp/WEB-INF/jsp/admin-roles.jsp
    wiki/branches/wrh2/jamwiki-war/src/main/webapp/WEB-INF/jsp/admin-translation.jsp
    wiki/branches/wrh2/jamwiki-war/src/main/webapp/WEB-INF/jsp/admin.jsp
    wiki/branches/wrh2/jamwiki-war/src/main/webapp/WEB-INF/jsp/login.jsp
    wiki/branches/wrh2/jamwiki-war/src/main/webapp/WEB-INF/jsp/move.jsp
    wiki/branches/wrh2/jamwiki-war/src/main/webapp/WEB-INF/jsp/register.jsp
    wiki/branches/wrh2/jamwiki-web/src/main/java/org/jamwiki/servlets/UpgradeServlet.java

Property Changed:
----------------
    wiki/branches/wrh2/


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Jamwiki-commit] SF.net SVN: jamwiki:[2928] wiki/branches/wrh2

From: <wrh2@us...> - 2010-03-08 00:18

Revision: 2928
          http://jamwiki.svn.sourceforge.net/jamwiki/?rev=2928&view=rev
Author:   wrh2
Date:     2010-03-08 00:18:35 +0000 (Mon, 08 Mar 2010)

Log Message:
-----------
Namespaces:
  * Add namespace display to Special:VirtualWiki.  Read-only for the moment.

Modified Paths:
--------------
    wiki/branches/wrh2/jamwiki-war/src/main/resources/ApplicationResources.properties
    wiki/branches/wrh2/jamwiki-war/src/main/webapp/WEB-INF/jsp/admin-virtual-wiki.jsp
    wiki/branches/wrh2/jamwiki-web/src/main/java/org/jamwiki/db/AnsiQueryHandler.java
    wiki/branches/wrh2/jamwiki-web/src/main/java/org/jamwiki/servlets/AdminVirtualWikiServlet.java


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Jamwiki-commit] SF.net SVN: jamwiki:[2930] wiki/branches/wrh2

From: <wrh2@us...> - 2010-03-08 00:33

Revision: 2930
          http://jamwiki.svn.sourceforge.net/jamwiki/?rev=2930&view=rev
Author:   wrh2
Date:     2010-03-08 00:33:44 +0000 (Mon, 08 Mar 2010)

Log Message:
-----------
Namespaces:
  * Move the Namespace class to the org.jamwiki.model package.

Modified Paths:
--------------
    wiki/branches/wrh2/addons/bliki-parser/src/main/java/org/jamwiki/parser/bliki/JAMHTMLConverter.java
    wiki/branches/wrh2/addons/bliki-parser/src/main/java/org/jamwiki/parser/bliki/JAMWikiModel.java
    wiki/branches/wrh2/jamwiki-core/src/main/java/org/jamwiki/DataHandler.java
    wiki/branches/wrh2/jamwiki-core/src/main/java/org/jamwiki/WikiConfiguration.java
    wiki/branches/wrh2/jamwiki-core/src/main/java/org/jamwiki/migrate/MediaWikiConstants.java
    wiki/branches/wrh2/jamwiki-core/src/main/java/org/jamwiki/parser/jflex/MagicWordUtil.java
    wiki/branches/wrh2/jamwiki-core/src/main/java/org/jamwiki/parser/jflex/ParserFunctionUtil.java
    wiki/branches/wrh2/jamwiki-core/src/main/java/org/jamwiki/parser/jflex/TemplateTag.java
    wiki/branches/wrh2/jamwiki-core/src/main/java/org/jamwiki/parser/jflex/WikiLinkTag.java
    wiki/branches/wrh2/jamwiki-core/src/main/java/org/jamwiki/parser/jflex/WikiSignatureTag.java
    wiki/branches/wrh2/jamwiki-core/src/main/java/org/jamwiki/utils/ImageUtil.java
    wiki/branches/wrh2/jamwiki-core/src/main/java/org/jamwiki/utils/InterWikiHandler.java
    wiki/branches/wrh2/jamwiki-core/src/main/java/org/jamwiki/utils/LinkUtil.java
    wiki/branches/wrh2/jamwiki-core/src/main/java/org/jamwiki/utils/WikiLink.java
    wiki/branches/wrh2/jamwiki-core/src/main/java/org/jamwiki/utils/WikiUtil.java
    wiki/branches/wrh2/jamwiki-core/src/test/java/org/jamwiki/TestDataHandler.java
    wiki/branches/wrh2/jamwiki-core/src/test/java/org/jamwiki/utils/WikiLinkTest.java
    wiki/branches/wrh2/jamwiki-web/src/main/java/org/jamwiki/db/AnsiDataHandler.java
    wiki/branches/wrh2/jamwiki-web/src/main/java/org/jamwiki/db/AnsiQueryHandler.java
    wiki/branches/wrh2/jamwiki-web/src/main/java/org/jamwiki/db/QueryHandler.java
    wiki/branches/wrh2/jamwiki-web/src/main/java/org/jamwiki/db/WikiDatabase.java
    wiki/branches/wrh2/jamwiki-web/src/main/java/org/jamwiki/servlets/AdminVirtualWikiServlet.java
    wiki/branches/wrh2/jamwiki-web/src/main/java/org/jamwiki/servlets/CategoryServlet.java
    wiki/branches/wrh2/jamwiki-web/src/main/java/org/jamwiki/servlets/EditServlet.java
    wiki/branches/wrh2/jamwiki-web/src/main/java/org/jamwiki/servlets/ItemsServlet.java
    wiki/branches/wrh2/jamwiki-web/src/main/java/org/jamwiki/servlets/JAMWikiServlet.java
    wiki/branches/wrh2/jamwiki-web/src/main/java/org/jamwiki/servlets/MoveServlet.java
    wiki/branches/wrh2/jamwiki-web/src/main/java/org/jamwiki/servlets/ServletUtil.java
    wiki/branches/wrh2/jamwiki-web/src/main/java/org/jamwiki/servlets/TranslationServlet.java
    wiki/branches/wrh2/jamwiki-web/src/main/java/org/jamwiki/servlets/UploadServlet.java
    wiki/branches/wrh2/jamwiki-web/src/main/java/org/jamwiki/servlets/WikiPageInfo.java

Added Paths:
-----------
    wiki/branches/wrh2/jamwiki-core/src/main/java/org/jamwiki/model/Namespace.java
    wiki/branches/wrh2/jamwiki-core/src/test/java/org/jamwiki/model/
    wiki/branches/wrh2/jamwiki-core/src/test/java/org/jamwiki/model/NamespaceTest.java

Removed Paths:
-------------
    wiki/branches/wrh2/jamwiki-core/src/main/java/org/jamwiki/utils/Namespace.java
    wiki/branches/wrh2/jamwiki-core/src/test/java/org/jamwiki/utils/NamespaceTest.java


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Jamwiki-commit] SF.net SVN: jamwiki:[2931] wiki/branches/wrh2

From: <wrh2@us...> - 2010-03-09 06:01

Revision: 2931
          http://jamwiki.svn.sourceforge.net/jamwiki/?rev=2931&view=rev
Author:   wrh2
Date:     2010-03-09 06:00:57 +0000 (Tue, 09 Mar 2010)

Log Message:
-----------
Namespaces:
  * Add capabilities for adding/updating virtualwiki-specific namespaces via
    the Special:VirtualWiki interface.

Modified Paths:
--------------
    wiki/branches/wrh2/jamwiki-core/src/main/java/org/jamwiki/DataHandler.java
    wiki/branches/wrh2/jamwiki-core/src/main/java/org/jamwiki/model/Namespace.java
    wiki/branches/wrh2/jamwiki-core/src/test/java/org/jamwiki/TestDataHandler.java
    wiki/branches/wrh2/jamwiki-war/src/main/resources/sql.ansi.properties
    wiki/branches/wrh2/jamwiki-war/src/main/webapp/WEB-INF/jsp/admin-virtual-wiki.jsp
    wiki/branches/wrh2/jamwiki-web/src/main/java/org/jamwiki/db/AnsiDataHandler.java
    wiki/branches/wrh2/jamwiki-web/src/main/java/org/jamwiki/db/AnsiQueryHandler.java
    wiki/branches/wrh2/jamwiki-web/src/main/java/org/jamwiki/db/QueryHandler.java
    wiki/branches/wrh2/jamwiki-web/src/main/java/org/jamwiki/servlets/AdminVirtualWikiServlet.java


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Jamwiki-commit] SF.net SVN: jamwiki:[2933] wiki/branches/wrh2

From: <wrh2@us...> - 2010-03-09 06:46

Revision: 2933
          http://jamwiki.svn.sourceforge.net/jamwiki/?rev=2933&view=rev
Author:   wrh2
Date:     2010-03-09 06:46:41 +0000 (Tue, 09 Mar 2010)

Log Message:
-----------
Merge:
  * Merge latest changes from trunk.

Modified Paths:
--------------
    wiki/branches/wrh2/jamwiki-web/src/main/java/org/jamwiki/db/AnsiDataHandler.java

Property Changed:
----------------
    wiki/branches/wrh2/


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Jamwiki-commit] SF.net SVN: jamwiki:[2934] wiki/branches/wrh2

From: <wrh2@us...> - 2010-03-11 07:13

Revision: 2934
          http://jamwiki.svn.sourceforge.net/jamwiki/?rev=2934&view=rev
Author:   wrh2
Date:     2010-03-11 07:13:25 +0000 (Thu, 11 Mar 2010)

Log Message:
-----------
Namespaces:
  * Add code to allow virtual-wiki specific namespaces.
  * Remove the unused WikiPageInfo.getNamespace() method.
  * Remove the unused WikiUtil.findNamespaceForTopicType() method.
  * Clean up several other methods by passing Namespace instead of namespace
    label.
  * WARNING: Use at your own risk!  This is minimally tested on my laptop and
    changes a LOT of code.

Modified Paths:
--------------
    wiki/branches/wrh2/addons/bliki-parser/src/main/java/org/jamwiki/parser/bliki/JAMWikiModel.java
    wiki/branches/wrh2/jamwiki-core/src/main/java/org/jamwiki/DataHandler.java
    wiki/branches/wrh2/jamwiki-core/src/main/java/org/jamwiki/migrate/MediaWikiConstants.java
    wiki/branches/wrh2/jamwiki-core/src/main/java/org/jamwiki/migrate/MediaWikiXmlExporter.java
    wiki/branches/wrh2/jamwiki-core/src/main/java/org/jamwiki/migrate/MediaWikiXmlImporter.java
    wiki/branches/wrh2/jamwiki-core/src/main/java/org/jamwiki/model/Namespace.java
    wiki/branches/wrh2/jamwiki-core/src/main/java/org/jamwiki/parser/jflex/JFlexParser.java
    wiki/branches/wrh2/jamwiki-core/src/main/java/org/jamwiki/parser/jflex/JFlexParserUtil.java
    wiki/branches/wrh2/jamwiki-core/src/main/java/org/jamwiki/parser/jflex/MagicWordUtil.java
    wiki/branches/wrh2/jamwiki-core/src/main/java/org/jamwiki/parser/jflex/ParserFunctionUtil.java
    wiki/branches/wrh2/jamwiki-core/src/main/java/org/jamwiki/parser/jflex/TemplateTag.java
    wiki/branches/wrh2/jamwiki-core/src/main/java/org/jamwiki/parser/jflex/WikiLinkTag.java
    wiki/branches/wrh2/jamwiki-core/src/main/java/org/jamwiki/parser/jflex/WikiSignatureTag.java
    wiki/branches/wrh2/jamwiki-core/src/main/java/org/jamwiki/utils/ImageUtil.java
    wiki/branches/wrh2/jamwiki-core/src/main/java/org/jamwiki/utils/LinkUtil.java
    wiki/branches/wrh2/jamwiki-core/src/main/java/org/jamwiki/utils/WikiCache.java
    wiki/branches/wrh2/jamwiki-core/src/main/java/org/jamwiki/utils/WikiUtil.java
    wiki/branches/wrh2/jamwiki-core/src/test/java/org/jamwiki/TestDataHandler.java
    wiki/branches/wrh2/jamwiki-core/src/test/java/org/jamwiki/model/NamespaceTest.java
    wiki/branches/wrh2/jamwiki-core/src/test/java/org/jamwiki/utils/LinkUtilTest.java
    wiki/branches/wrh2/jamwiki-core/src/test/java/org/jamwiki/utils/WikiUtilTest.java
    wiki/branches/wrh2/jamwiki-war/src/main/webapp/WEB-INF/jsp/admin-virtual-wiki.jsp
    wiki/branches/wrh2/jamwiki-web/src/main/java/org/jamwiki/db/AnsiDataHandler.java
    wiki/branches/wrh2/jamwiki-web/src/main/java/org/jamwiki/db/AnsiQueryHandler.java
    wiki/branches/wrh2/jamwiki-web/src/main/java/org/jamwiki/servlets/AdminVirtualWikiServlet.java
    wiki/branches/wrh2/jamwiki-web/src/main/java/org/jamwiki/servlets/CategoryServlet.java
    wiki/branches/wrh2/jamwiki-web/src/main/java/org/jamwiki/servlets/EditServlet.java
    wiki/branches/wrh2/jamwiki-web/src/main/java/org/jamwiki/servlets/ItemsServlet.java
    wiki/branches/wrh2/jamwiki-web/src/main/java/org/jamwiki/servlets/JAMWikiServlet.java
    wiki/branches/wrh2/jamwiki-web/src/main/java/org/jamwiki/servlets/ManageServlet.java
    wiki/branches/wrh2/jamwiki-web/src/main/java/org/jamwiki/servlets/MoveServlet.java
    wiki/branches/wrh2/jamwiki-web/src/main/java/org/jamwiki/servlets/ServletUtil.java
    wiki/branches/wrh2/jamwiki-web/src/main/java/org/jamwiki/servlets/TranslationServlet.java
    wiki/branches/wrh2/jamwiki-web/src/main/java/org/jamwiki/servlets/UploadServlet.java
    wiki/branches/wrh2/jamwiki-web/src/main/java/org/jamwiki/servlets/WatchlistServlet.java
    wiki/branches/wrh2/jamwiki-web/src/main/java/org/jamwiki/servlets/WikiPageInfo.java
    wiki/branches/wrh2/jamwiki-web/src/main/java/org/jamwiki/taglib/EditCommentTag.java
    wiki/branches/wrh2/jamwiki-web/src/main/java/org/jamwiki/taglib/LinkTag.java
    wiki/branches/wrh2/jamwiki-web/src/main/java/org/jamwiki/taglib/PaginationTag.java
    wiki/branches/wrh2/jamwiki-web/src/test/java/org/jamwiki/servlets/WikiPageInfoTest.java


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Jamwiki-commit] SF.net SVN: jamwiki:[2935] wiki/branches/wrh2

From: <wrh2@us...> - 2010-03-11 07:26

Revision: 2935
          http://jamwiki.svn.sourceforge.net/jamwiki/?rev=2935&view=rev
Author:   wrh2
Date:     2010-03-11 07:26:33 +0000 (Thu, 11 Mar 2010)

Log Message:
-----------
Namespaces:
  * Remove the now-obsolete support for namespace configuration via the
    jamwiki-configuration.xml file.

Modified Paths:
--------------
    wiki/branches/wrh2/jamwiki-core/src/main/java/org/jamwiki/WikiConfiguration.java
    wiki/branches/wrh2/jamwiki-core/src/test/resources/jamwiki-configuration.xml
    wiki/branches/wrh2/jamwiki-war/src/main/resources/jamwiki-configuration.dtd
    wiki/branches/wrh2/jamwiki-war/src/main/resources/jamwiki-configuration.xml
    wiki/branches/wrh2/jamwiki-war/src/main/webapp/CHANGELOG.txt
    wiki/branches/wrh2/jamwiki-war/src/main/webapp/UPGRADE.txt


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Jamwiki-commit] SF.net SVN: jamwiki:[2937] wiki/branches/wrh2

From: <wrh2@us...> - 2010-03-14 00:17

Revision: 2937
          http://jamwiki.svn.sourceforge.net/jamwiki/?rev=2937&view=rev
Author:   wrh2
Date:     2010-03-14 00:17:29 +0000 (Sun, 14 Mar 2010)

Log Message:
-----------
Namespaces:
  * Add the ability to create new default namespaces.
  * Clean up some error message handling on Special:VirtualWiki.

Modified Paths:
--------------
    wiki/branches/wrh2/jamwiki-core/src/main/java/org/jamwiki/DataHandler.java
    wiki/branches/wrh2/jamwiki-core/src/main/java/org/jamwiki/Environment.java
    wiki/branches/wrh2/jamwiki-core/src/main/java/org/jamwiki/utils/WikiUtil.java
    wiki/branches/wrh2/jamwiki-core/src/test/java/org/jamwiki/TestDataHandler.java
    wiki/branches/wrh2/jamwiki-core/src/test/java/org/jamwiki/utils/WikiUtilTest.java
    wiki/branches/wrh2/jamwiki-war/src/main/resources/ApplicationResources.properties
    wiki/branches/wrh2/jamwiki-war/src/main/webapp/WEB-INF/jsp/admin-virtual-wiki.jsp
    wiki/branches/wrh2/jamwiki-web/src/main/java/org/jamwiki/db/AnsiDataHandler.java
    wiki/branches/wrh2/jamwiki-web/src/main/java/org/jamwiki/db/AnsiQueryHandler.java
    wiki/branches/wrh2/jamwiki-web/src/main/java/org/jamwiki/db/QueryHandler.java
    wiki/branches/wrh2/jamwiki-web/src/main/java/org/jamwiki/db/WikiDatabase.java
    wiki/branches/wrh2/jamwiki-web/src/main/java/org/jamwiki/servlets/AdminVirtualWikiServlet.java


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Jamwiki-commit] SF.net SVN: jamwiki:[2938] wiki/branches/wrh2

From: <wrh2@us...> - 2010-03-14 00:41

Revision: 2938
          http://jamwiki.svn.sourceforge.net/jamwiki/?rev=2938&view=rev
Author:   wrh2
Date:     2010-03-14 00:41:27 +0000 (Sun, 14 Mar 2010)

Log Message:
-----------
Namespaces:
  * Disallow namespace translations for the "Special" namespace.
  * Fix some error handling for the Special:VirtualWiki page.

Modified Paths:
--------------
    wiki/branches/wrh2/jamwiki-war/src/main/webapp/WEB-INF/jsp/admin-virtual-wiki.jsp
    wiki/branches/wrh2/jamwiki-web/src/main/java/org/jamwiki/servlets/AdminVirtualWikiServlet.java


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Jamwiki-commit] SF.net SVN: jamwiki:[2940] wiki/branches/wrh2

From: <wrh2@us...> - 2010-03-14 01:24

Revision: 2940
          http://jamwiki.svn.sourceforge.net/jamwiki/?rev=2940&view=rev
Author:   wrh2
Date:     2010-03-14 01:24:22 +0000 (Sun, 14 Mar 2010)

Log Message:
-----------
Namespaces:
  * Process interwiki links only if the link does not contain a virtual wiki
    or namespace.  Thus if a wiki has a namespace of "Test" and an interwiki
    of "Test", the link "Test:Topic" will parse as an internal link rather than
    an interwiki link.

Modified Paths:
--------------
    wiki/branches/wrh2/jamwiki-core/src/main/java/org/jamwiki/utils/LinkUtil.java
    wiki/branches/wrh2/jamwiki-war/src/main/webapp/CHANGELOG.txt


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Jamwiki-commit] SF.net SVN: jamwiki:[2942] wiki/branches/wrh2

From: <wrh2@us...> - 2010-03-14 17:04

Revision: 2942
          http://jamwiki.svn.sourceforge.net/jamwiki/?rev=2942&view=rev
Author:   wrh2
Date:     2010-03-14 17:04:13 +0000 (Sun, 14 Mar 2010)

Log Message:
-----------
Namespaces:
  * Add getNamespace() to the Topic class, and add/update this value when
    adding/update the topic record.

Modified Paths:
--------------
    wiki/branches/wrh2/jamwiki-core/src/main/java/org/jamwiki/model/Topic.java
    wiki/branches/wrh2/jamwiki-war/src/main/resources/sql.ansi.properties
    wiki/branches/wrh2/jamwiki-web/src/main/java/org/jamwiki/db/AnsiQueryHandler.java


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Jamwiki-commit] SF.net SVN: jamwiki:[2944] wiki/branches/wrh2

From: <wrh2@us...> - 2010-03-14 19:37

Revision: 2944
          http://jamwiki.svn.sourceforge.net/jamwiki/?rev=2944&view=rev
Author:   wrh2
Date:     2010-03-14 19:37:39 +0000 (Sun, 14 Mar 2010)

Log Message:
-----------
Namespaces:
  * Remove the "name" member variable of "Topic".  Instead, there is now a
    pageName member variable and a Namespace member variable which are set
    from the constructor.
  * Update all callers.
  * Remove the unused WikiPageInfo.getPageName() method to avoid any confusion.

Modified Paths:
--------------
    wiki/branches/wrh2/jamwiki-core/src/main/java/org/jamwiki/migrate/MediaWikiXmlImporter.java
    wiki/branches/wrh2/jamwiki-core/src/main/java/org/jamwiki/model/Topic.java
    wiki/branches/wrh2/jamwiki-core/src/main/java/org/jamwiki/utils/ImageUtil.java
    wiki/branches/wrh2/jamwiki-core/src/main/java/org/jamwiki/utils/TiddlyWikiParser.java
    wiki/branches/wrh2/jamwiki-core/src/test/java/org/jamwiki/TestDataHandler.java
    wiki/branches/wrh2/jamwiki-core/src/test/java/org/jamwiki/utils/WikiUtilTest.java
    wiki/branches/wrh2/jamwiki-web/src/main/java/org/jamwiki/db/AnsiQueryHandler.java
    wiki/branches/wrh2/jamwiki-web/src/main/java/org/jamwiki/db/WikiDatabase.java
    wiki/branches/wrh2/jamwiki-web/src/main/java/org/jamwiki/servlets/EditServlet.java
    wiki/branches/wrh2/jamwiki-web/src/main/java/org/jamwiki/servlets/ServletUtil.java
    wiki/branches/wrh2/jamwiki-web/src/main/java/org/jamwiki/servlets/TranslationServlet.java
    wiki/branches/wrh2/jamwiki-web/src/main/java/org/jamwiki/servlets/WikiPageInfo.java
    wiki/branches/wrh2/jamwiki-web/src/test/java/org/jamwiki/servlets/WikiPageInfoTest.java


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Jamwiki-commit] SF.net SVN: jamwiki:[2945] wiki/branches/wrh2

From: <wrh2@us...> - 2010-03-15 05:43

Revision: 2945
          http://jamwiki.svn.sourceforge.net/jamwiki/?rev=2945&view=rev
Author:   wrh2
Date:     2010-03-15 05:43:34 +0000 (Mon, 15 Mar 2010)

Log Message:
-----------
Namespaces:
  * Add a utility method for updating all topics with a correct namespace_id
    based on the topic name.  This will be used for upgrades to 0.9.0 and as
    a utility in rare cases where namespaces change and data needs to be
    updated.
  * Add a TopicType enum to model topic types instead of hard-coded integers
    in the Topic class.

Modified Paths:
--------------
    wiki/branches/wrh2/jamwiki-core/src/main/java/org/jamwiki/DataHandler.java
    wiki/branches/wrh2/jamwiki-core/src/main/java/org/jamwiki/migrate/MigrationUtil.java
    wiki/branches/wrh2/jamwiki-core/src/main/java/org/jamwiki/model/Category.java
    wiki/branches/wrh2/jamwiki-core/src/main/java/org/jamwiki/model/Topic.java
    wiki/branches/wrh2/jamwiki-core/src/main/java/org/jamwiki/parser/jflex/TemplateTag.java
    wiki/branches/wrh2/jamwiki-core/src/main/java/org/jamwiki/utils/ImageUtil.java
    wiki/branches/wrh2/jamwiki-core/src/main/java/org/jamwiki/utils/LinkUtil.java
    wiki/branches/wrh2/jamwiki-core/src/main/java/org/jamwiki/utils/TiddlyWikiParser.java
    wiki/branches/wrh2/jamwiki-core/src/main/java/org/jamwiki/utils/WikiUtil.java
    wiki/branches/wrh2/jamwiki-core/src/test/java/org/jamwiki/TestDataHandler.java
    wiki/branches/wrh2/jamwiki-core/src/test/java/org/jamwiki/utils/WikiUtilTest.java
    wiki/branches/wrh2/jamwiki-war/src/main/resources/ApplicationResources.properties
    wiki/branches/wrh2/jamwiki-war/src/main/resources/sql.ansi.properties
    wiki/branches/wrh2/jamwiki-war/src/main/resources/sql.asa.properties
    wiki/branches/wrh2/jamwiki-war/src/main/resources/sql.db2.properties
    wiki/branches/wrh2/jamwiki-war/src/main/resources/sql.db2400.properties
    wiki/branches/wrh2/jamwiki-war/src/main/resources/sql.mssql.properties
    wiki/branches/wrh2/jamwiki-war/src/main/resources/sql.oracle.properties
    wiki/branches/wrh2/jamwiki-war/src/main/webapp/WEB-INF/jsp/admin-maintenance.jsp
    wiki/branches/wrh2/jamwiki-web/src/main/java/org/jamwiki/db/AnsiDataHandler.java
    wiki/branches/wrh2/jamwiki-web/src/main/java/org/jamwiki/db/AnsiQueryHandler.java
    wiki/branches/wrh2/jamwiki-web/src/main/java/org/jamwiki/db/DB2400QueryHandler.java
    wiki/branches/wrh2/jamwiki-web/src/main/java/org/jamwiki/db/DB2QueryHandler.java
    wiki/branches/wrh2/jamwiki-web/src/main/java/org/jamwiki/db/OracleQueryHandler.java
    wiki/branches/wrh2/jamwiki-web/src/main/java/org/jamwiki/db/QueryHandler.java
    wiki/branches/wrh2/jamwiki-web/src/main/java/org/jamwiki/db/WikiDatabase.java
    wiki/branches/wrh2/jamwiki-web/src/main/java/org/jamwiki/servlets/AdminServlet.java
    wiki/branches/wrh2/jamwiki-web/src/main/java/org/jamwiki/servlets/EditServlet.java
    wiki/branches/wrh2/jamwiki-web/src/main/java/org/jamwiki/servlets/ItemsServlet.java
    wiki/branches/wrh2/jamwiki-web/src/main/java/org/jamwiki/servlets/ServletUtil.java
    wiki/branches/wrh2/jamwiki-web/src/main/java/org/jamwiki/servlets/TranslationServlet.java

Added Paths:
-----------
    wiki/branches/wrh2/jamwiki-core/src/main/java/org/jamwiki/model/TopicType.java


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Jamwiki-commit] SF.net SVN: jamwiki:[2946] wiki/branches/wrh2

From: <wrh2@us...> - 2010-03-16 03:25

Revision: 2946
          http://jamwiki.svn.sourceforge.net/jamwiki/?rev=2946&view=rev
Author:   wrh2
Date:     2010-03-16 03:25:26 +0000 (Tue, 16 Mar 2010)

Log Message:
-----------
Namespaces:
  * Update help text, labels, and UI for the Special:VirtualWiki page.
  * Prevent updates to the JAMWiki namespace since they would break some
    functionality.
  * I may have broken the "admin.message.virtualwikiadded" for some languages,
    so if translators can verify this (once it's merged to trunk) I'd be
    grateful.

Modified Paths:
--------------
    wiki/branches/wrh2/jamwiki-core/src/test/resources/ApplicationResources.properties
    wiki/branches/wrh2/jamwiki-war/src/main/resources/ApplicationResources.properties
    wiki/branches/wrh2/jamwiki-war/src/main/resources/ApplicationResources_da.properties
    wiki/branches/wrh2/jamwiki-war/src/main/resources/ApplicationResources_de.properties
    wiki/branches/wrh2/jamwiki-war/src/main/resources/ApplicationResources_es.properties
    wiki/branches/wrh2/jamwiki-war/src/main/resources/ApplicationResources_fr.properties
    wiki/branches/wrh2/jamwiki-war/src/main/resources/ApplicationResources_gl.properties
    wiki/branches/wrh2/jamwiki-war/src/main/resources/ApplicationResources_hr.properties
    wiki/branches/wrh2/jamwiki-war/src/main/resources/ApplicationResources_hu.properties
    wiki/branches/wrh2/jamwiki-war/src/main/resources/ApplicationResources_it.properties
    wiki/branches/wrh2/jamwiki-war/src/main/resources/ApplicationResources_nl.properties
    wiki/branches/wrh2/jamwiki-war/src/main/resources/ApplicationResources_no.properties
    wiki/branches/wrh2/jamwiki-war/src/main/resources/ApplicationResources_pl.properties
    wiki/branches/wrh2/jamwiki-war/src/main/resources/ApplicationResources_pt.properties
    wiki/branches/wrh2/jamwiki-war/src/main/resources/ApplicationResources_pt_BR.properties
    wiki/branches/wrh2/jamwiki-war/src/main/resources/ApplicationResources_sk.properties
    wiki/branches/wrh2/jamwiki-war/src/main/resources/ApplicationResources_sv.properties
    wiki/branches/wrh2/jamwiki-war/src/main/resources/ApplicationResources_uk.properties
    wiki/branches/wrh2/jamwiki-war/src/main/webapp/WEB-INF/jsp/admin-virtual-wiki.jsp
    wiki/branches/wrh2/jamwiki-web/src/main/java/org/jamwiki/servlets/AdminVirtualWikiServlet.java


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Jamwiki-commit] SF.net SVN: jamwiki:[2948] wiki/branches/wrh2

From: <wrh2@us...> - 2010-03-16 05:09

Revision: 2948
          http://jamwiki.svn.sourceforge.net/jamwiki/?rev=2948&view=rev
Author:   wrh2
Date:     2010-03-16 05:09:46 +0000 (Tue, 16 Mar 2010)

Log Message:
-----------
Namespaces:
  * Fix an NPE in the Namespace code that triggers during setup.
  * Fix completely broken code for adding namespaces... it's mildly worrying
    that this made it through my initial testing.

Modified Paths:
--------------
    wiki/branches/wrh2/jamwiki-core/src/main/java/org/jamwiki/model/Namespace.java
    wiki/branches/wrh2/jamwiki-web/src/main/java/org/jamwiki/db/AnsiDataHandler.java


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Jamwiki-commit] SF.net SVN: jamwiki:[2949] wiki/branches/wrh2

From: <wrh2@us...> - 2010-03-16 05:11

Revision: 2949
          http://jamwiki.svn.sourceforge.net/jamwiki/?rev=2949&view=rev
Author:   wrh2
Date:     2010-03-16 05:11:46 +0000 (Tue, 16 Mar 2010)

Log Message:
-----------
Performance:
  * Add jam_topic.page_name and jam_topic.page_name_lower columns.  These will
    eventually be used in topic retrieval to improve performance.

Modified Paths:
--------------
    wiki/branches/wrh2/jamwiki-war/src/main/resources/sql.ansi.properties
    wiki/branches/wrh2/jamwiki-war/src/main/resources/sql.asa.properties
    wiki/branches/wrh2/jamwiki-war/src/main/resources/sql.hsql.properties
    wiki/branches/wrh2/jamwiki-war/src/main/resources/sql.mssql.properties
    wiki/branches/wrh2/jamwiki-war/src/main/resources/sql.mysql.properties
    wiki/branches/wrh2/jamwiki-war/src/main/resources/sql.oracle.properties
    wiki/branches/wrh2/jamwiki-war/src/main/resources/sql.postgres.properties
    wiki/branches/wrh2/jamwiki-war/src/main/webapp/UPGRADE.txt
    wiki/branches/wrh2/jamwiki-web/src/main/java/org/jamwiki/db/AnsiQueryHandler.java
    wiki/branches/wrh2/jamwiki-web/src/main/java/org/jamwiki/db/DatabaseUpgrades.java


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Jamwiki-commit] SF.net SVN: jamwiki:[2951] wiki/branches/wrh2

From: <wrh2@us...> - 2010-03-17 05:40

Revision: 2951
          http://jamwiki.svn.sourceforge.net/jamwiki/?rev=2951&view=rev
Author:   wrh2
Date:     2010-03-17 05:40:17 +0000 (Wed, 17 Mar 2010)

Log Message:
-----------
Performance:
  * Add indexes for the page_name and page_name_lower columns.
  * Utilize the page_name and page_name_lower columns to improve topic lookup
    performance.
  * Update a few SQL statements to work (hopefully) on additional databases.

Modified Paths:
--------------
    wiki/branches/wrh2/jamwiki-war/src/main/resources/sql.ansi.properties
    wiki/branches/wrh2/jamwiki-war/src/main/resources/sql.oracle.properties
    wiki/branches/wrh2/jamwiki-war/src/main/resources/sql.postgres.properties
    wiki/branches/wrh2/jamwiki-web/src/main/java/org/jamwiki/db/AnsiDataHandler.java
    wiki/branches/wrh2/jamwiki-web/src/main/java/org/jamwiki/db/AnsiQueryHandler.java
    wiki/branches/wrh2/jamwiki-web/src/main/java/org/jamwiki/db/DatabaseUpgrades.java
    wiki/branches/wrh2/jamwiki-web/src/main/java/org/jamwiki/db/QueryHandler.java


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Jamwiki-commit] SF.net SVN: jamwiki:[2954] wiki/branches/wrh2

From: <wrh2@us...> - 2010-03-19 01:21

Revision: 2954
          http://jamwiki.svn.sourceforge.net/jamwiki/?rev=2954&view=rev
Author:   wrh2
Date:     2010-03-19 01:20:55 +0000 (Fri, 19 Mar 2010)

Log Message:
-----------
Merge:
  * Merge latest changes from trunk.

Modified Paths:
--------------
    wiki/branches/wrh2/jamwiki-war/src/main/resources/ApplicationResources_de.properties
    wiki/branches/wrh2/jamwiki-war/src/main/webapp/CHANGELOG.txt
    wiki/branches/wrh2/jamwiki-web/src/main/java/org/jamwiki/servlets/EditServlet.java
    wiki/branches/wrh2/jamwiki-web/src/main/java/org/jamwiki/servlets/JAMWikiServlet.java
    wiki/branches/wrh2/jamwiki-web/src/main/java/org/jamwiki/servlets/ServletUtil.java
    wiki/branches/wrh2/jamwiki-web/src/main/java/org/jamwiki/servlets/UploadServlet.java

Property Changed:
----------------
    wiki/branches/wrh2/


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Jamwiki-commit] SF.net SVN: jamwiki:[3048] wiki/branches/wrh2

From: <wrh2@us...> - 2010-05-04 05:08

Revision: 3048
          http://jamwiki.svn.sourceforge.net/jamwiki/?rev=3048&view=rev
Author:   wrh2
Date:     2010-05-04 05:08:38 +0000 (Tue, 04 May 2010)

Log Message:
-----------
Merge:
  * Merge trunk changes into the wrh2 branch.

Modified Paths:
--------------
    wiki/branches/wrh2/addons/bliki-parser/pom.xml
    wiki/branches/wrh2/addons/bliki-parser/src/main/java/org/jamwiki/parser/bliki/JAMHTMLConverter.java
    wiki/branches/wrh2/addons/bliki-parser/src/main/java/org/jamwiki/parser/bliki/JAMWikiModel.java
    wiki/branches/wrh2/jamwiki-core/pom.xml
    wiki/branches/wrh2/jamwiki-core/src/main/java/org/jamwiki/DataHandler.java
    wiki/branches/wrh2/jamwiki-core/src/main/java/org/jamwiki/Environment.java
    wiki/branches/wrh2/jamwiki-core/src/main/java/org/jamwiki/WikiBase.java
    wiki/branches/wrh2/jamwiki-core/src/main/java/org/jamwiki/WikiMessage.java
    wiki/branches/wrh2/jamwiki-core/src/main/java/org/jamwiki/migrate/MediaWikiConstants.java
    wiki/branches/wrh2/jamwiki-core/src/main/java/org/jamwiki/migrate/MediaWikiXmlExporter.java
    wiki/branches/wrh2/jamwiki-core/src/main/java/org/jamwiki/migrate/MediaWikiXmlImporter.java
    wiki/branches/wrh2/jamwiki-core/src/main/java/org/jamwiki/migrate/MigrationUtil.java
    wiki/branches/wrh2/jamwiki-core/src/main/java/org/jamwiki/model/Namespace.java
    wiki/branches/wrh2/jamwiki-core/src/main/java/org/jamwiki/model/Role.java
    wiki/branches/wrh2/jamwiki-core/src/main/java/org/jamwiki/model/Topic.java
    wiki/branches/wrh2/jamwiki-core/src/main/java/org/jamwiki/model/VirtualWiki.java
    wiki/branches/wrh2/jamwiki-core/src/main/java/org/jamwiki/model/WikiReference.java
    wiki/branches/wrh2/jamwiki-core/src/main/java/org/jamwiki/parser/ParserInput.java
    wiki/branches/wrh2/jamwiki-core/src/main/java/org/jamwiki/parser/jflex/HtmlLinkTag.java
    wiki/branches/wrh2/jamwiki-core/src/main/java/org/jamwiki/parser/jflex/JFlexLexer.java
    wiki/branches/wrh2/jamwiki-core/src/main/java/org/jamwiki/parser/jflex/JFlexParser.java
    wiki/branches/wrh2/jamwiki-core/src/main/java/org/jamwiki/parser/jflex/JFlexParserUtil.java
    wiki/branches/wrh2/jamwiki-core/src/main/java/org/jamwiki/parser/jflex/JFlexTagItem.java
    wiki/branches/wrh2/jamwiki-core/src/main/java/org/jamwiki/parser/jflex/MagicWordUtil.java
    wiki/branches/wrh2/jamwiki-core/src/main/java/org/jamwiki/parser/jflex/ParserFunctionUtil.java
    wiki/branches/wrh2/jamwiki-core/src/main/java/org/jamwiki/parser/jflex/TemplateTag.java
    wiki/branches/wrh2/jamwiki-core/src/main/java/org/jamwiki/parser/jflex/WikiLinkTag.java
    wiki/branches/wrh2/jamwiki-core/src/main/java/org/jamwiki/parser/jflex/WikiReferenceTag.java
    wiki/branches/wrh2/jamwiki-core/src/main/java/org/jamwiki/parser/jflex/WikiReferencesTag.java
    wiki/branches/wrh2/jamwiki-core/src/main/java/org/jamwiki/parser/jflex/WikiSignatureTag.java
    wiki/branches/wrh2/jamwiki-core/src/main/java/org/jamwiki/utils/ImageUtil.java
    wiki/branches/wrh2/jamwiki-core/src/main/java/org/jamwiki/utils/InterWikiHandler.java
    wiki/branches/wrh2/jamwiki-core/src/main/java/org/jamwiki/utils/LinkUtil.java
    wiki/branches/wrh2/jamwiki-core/src/main/java/org/jamwiki/utils/Utilities.java
    wiki/branches/wrh2/jamwiki-core/src/main/java/org/jamwiki/utils/WikiLink.java
    wiki/branches/wrh2/jamwiki-core/src/main/java/org/jamwiki/utils/WikiUtil.java
    wiki/branches/wrh2/jamwiki-core/src/main/jflex/jamwiki-html-processor.jflex
    wiki/branches/wrh2/jamwiki-core/src/main/jflex/jamwiki-preprocessor.jflex
    wiki/branches/wrh2/jamwiki-core/src/main/jflex/jamwiki-processor.jflex
    wiki/branches/wrh2/jamwiki-core/src/test/java/org/jamwiki/TestFileUtil.java
    wiki/branches/wrh2/jamwiki-core/src/test/java/org/jamwiki/WikiMessageTest.java
    wiki/branches/wrh2/jamwiki-core/src/test/java/org/jamwiki/WikiVersionTest.java
    wiki/branches/wrh2/jamwiki-core/src/test/java/org/jamwiki/migrate/MigrationUtilTest.java
    wiki/branches/wrh2/jamwiki-core/src/test/java/org/jamwiki/model/NamespaceTest.java
    wiki/branches/wrh2/jamwiki-core/src/test/java/org/jamwiki/utils/DiffUtilTest.java
    wiki/branches/wrh2/jamwiki-core/src/test/java/org/jamwiki/utils/EncryptionTest.java
    wiki/branches/wrh2/jamwiki-core/src/test/java/org/jamwiki/utils/InterWikiHandlerTest.java
    wiki/branches/wrh2/jamwiki-core/src/test/java/org/jamwiki/utils/LinkUtilTest.java
    wiki/branches/wrh2/jamwiki-core/src/test/java/org/jamwiki/utils/PaginationTest.java
    wiki/branches/wrh2/jamwiki-core/src/test/java/org/jamwiki/utils/PseudoTopicHandlerTest.java
    wiki/branches/wrh2/jamwiki-core/src/test/java/org/jamwiki/utils/SortedPropertiesTest.java
    wiki/branches/wrh2/jamwiki-core/src/test/java/org/jamwiki/utils/TiddlyWiki2MediaWikiTranslatorTest.java
    wiki/branches/wrh2/jamwiki-core/src/test/java/org/jamwiki/utils/TiddlyWikiParserTest.java
    wiki/branches/wrh2/jamwiki-core/src/test/java/org/jamwiki/utils/UtilitiesTest.java
    wiki/branches/wrh2/jamwiki-core/src/test/java/org/jamwiki/utils/WikiCacheTest.java
    wiki/branches/wrh2/jamwiki-core/src/test/java/org/jamwiki/utils/WikiLinkTest.java
    wiki/branches/wrh2/jamwiki-core/src/test/java/org/jamwiki/utils/WikiLogFormatterTest.java
    wiki/branches/wrh2/jamwiki-core/src/test/java/org/jamwiki/utils/WikiLoggerTest.java
    wiki/branches/wrh2/jamwiki-core/src/test/java/org/jamwiki/utils/WikiUtilTest.java
    wiki/branches/wrh2/jamwiki-core/src/test/java/org/jamwiki/utils/XMLUtilTest.java
    wiki/branches/wrh2/jamwiki-core/src/test/resources/data/files/mediawiki-export-namespace-test.xml
    wiki/branches/wrh2/jamwiki-core/src/test/resources/data/results/HtmlBasicLinks1
    wiki/branches/wrh2/jamwiki-core/src/test/resources/data/results/HtmlBasicLinks2
    wiki/branches/wrh2/jamwiki-core/src/test/resources/data/results/HtmlMailtoLinks1
    wiki/branches/wrh2/jamwiki-core/src/test/resources/data/results/HtmlXSSLinks1
    wiki/branches/wrh2/jamwiki-core/src/test/resources/data/results/ImageLink1
    wiki/branches/wrh2/jamwiki-core/src/test/resources/data/results/Magic_Words2
    wiki/branches/wrh2/jamwiki-core/src/test/resources/data/results/ParserFunctions1
    wiki/branches/wrh2/jamwiki-core/src/test/resources/data/results/ParserFunctions2
    wiki/branches/wrh2/jamwiki-core/src/test/resources/data/results/ParserFunctions3
    wiki/branches/wrh2/jamwiki-core/src/test/resources/data/results/Template4
    wiki/branches/wrh2/jamwiki-core/src/test/resources/data/results/Template5
    wiki/branches/wrh2/jamwiki-core/src/test/resources/data/results/Template_-_Infinite
    wiki/branches/wrh2/jamwiki-core/src/test/resources/data/results/Template_-_Paramtest
    wiki/branches/wrh2/jamwiki-core/src/test/resources/data/results/WikiCategory
    wiki/branches/wrh2/jamwiki-core/src/test/resources/data/results/WikiLink1
    wiki/branches/wrh2/jamwiki-core/src/test/resources/data/topics/HtmlBasicLinks2
    wiki/branches/wrh2/jamwiki-core/src/test/resources/data/topics/ImageLink1
    wiki/branches/wrh2/jamwiki-core/src/test/resources/data/topics/ParserFunctions2
    wiki/branches/wrh2/jamwiki-core/src/test/resources/data/topics/ParserFunctions3
    wiki/branches/wrh2/jamwiki-core/src/test/resources/data/topics/Template4
    wiki/branches/wrh2/jamwiki-core/src/test/resources/data/topics/Template5
    wiki/branches/wrh2/jamwiki-core/src/test/resources/data/topics/Template_-_Paramtest
    wiki/branches/wrh2/jamwiki-core/src/test/resources/data/topics/WikiLink1
    wiki/branches/wrh2/jamwiki-core/src/test/resources/jamwiki.properties
    wiki/branches/wrh2/jamwiki-war/pom.xml
    wiki/branches/wrh2/jamwiki-war/src/main/resources/ApplicationResources.properties
    wiki/branches/wrh2/jamwiki-war/src/main/webapp/403.jsp
    wiki/branches/wrh2/jamwiki-war/src/main/webapp/CHANGELOG.txt
    wiki/branches/wrh2/jamwiki-war/src/main/webapp/UPGRADE.txt
    wiki/branches/wrh2/jamwiki-war/src/main/webapp/WEB-INF/jsp/admin-virtual-wiki.jsp
    wiki/branches/wrh2/jamwiki-war/src/main/webapp/WEB-INF/jsp/edit.jsp
    wiki/branches/wrh2/jamwiki-war/src/main/webapp/WEB-INF/jsp/error.jsp
    wiki/branches/wrh2/jamwiki-war/src/main/webapp/WEB-INF/jsp/history.jsp
    wiki/branches/wrh2/jamwiki-war/src/main/webapp/WEB-INF/jsp/items.jsp
    wiki/branches/wrh2/jamwiki-war/src/main/webapp/WEB-INF/jsp/log.jsp
    wiki/branches/wrh2/jamwiki-war/src/main/webapp/WEB-INF/jsp/recent-changes.jsp
    wiki/branches/wrh2/jamwiki-war/src/main/webapp/WEB-INF/jsp/view-topic-include.jsp
    wiki/branches/wrh2/jamwiki-war/src/main/webapp/WEB-INF/jsp/watchlist.jsp
    wiki/branches/wrh2/jamwiki-war/src/main/webapp/index.jsp
    wiki/branches/wrh2/jamwiki-war/src/main/webapp/js/jamwiki.js
    wiki/branches/wrh2/jamwiki-web/pom.xml
    wiki/branches/wrh2/jamwiki-web/src/main/java/org/jamwiki/authentication/JAMWikiAuthenticationConfiguration.java
    wiki/branches/wrh2/jamwiki-web/src/main/java/org/jamwiki/authentication/JAMWikiAuthenticationFailureHandler.java
    wiki/branches/wrh2/jamwiki-web/src/main/java/org/jamwiki/authentication/JAMWikiDaoImpl.java
    wiki/branches/wrh2/jamwiki-web/src/main/java/org/jamwiki/authentication/JAMWikiPostAuthenticationFilter.java
    wiki/branches/wrh2/jamwiki-web/src/main/java/org/jamwiki/authentication/RoleImpl.java
    wiki/branches/wrh2/jamwiki-web/src/main/java/org/jamwiki/servlets/AdminServlet.java
    wiki/branches/wrh2/jamwiki-web/src/main/java/org/jamwiki/servlets/AdminVirtualWikiServlet.java
    wiki/branches/wrh2/jamwiki-web/src/main/java/org/jamwiki/servlets/CategoryServlet.java
    wiki/branches/wrh2/jamwiki-web/src/main/java/org/jamwiki/servlets/EditServlet.java
    wiki/branches/wrh2/jamwiki-web/src/main/java/org/jamwiki/servlets/ImportTiddlyWikiServlet.java
    wiki/branches/wrh2/jamwiki-web/src/main/java/org/jamwiki/servlets/ItemsServlet.java
    wiki/branches/wrh2/jamwiki-web/src/main/java/org/jamwiki/servlets/JAMWikiFilter.java
    wiki/branches/wrh2/jamwiki-web/src/main/java/org/jamwiki/servlets/JAMWikiServlet.java
    wiki/branches/wrh2/jamwiki-web/src/main/java/org/jamwiki/servlets/MoveServlet.java
    wiki/branches/wrh2/jamwiki-web/src/main/java/org/jamwiki/servlets/RegisterServlet.java
    wiki/branches/wrh2/jamwiki-web/src/main/java/org/jamwiki/servlets/RolesServlet.java
    wiki/branches/wrh2/jamwiki-web/src/main/java/org/jamwiki/servlets/ServletUtil.java
    wiki/branches/wrh2/jamwiki-web/src/main/java/org/jamwiki/servlets/SetupServlet.java
    wiki/branches/wrh2/jamwiki-web/src/main/java/org/jamwiki/servlets/TopicServlet.java
    wiki/branches/wrh2/jamwiki-web/src/main/java/org/jamwiki/servlets/TranslationServlet.java
    wiki/branches/wrh2/jamwiki-web/src/main/java/org/jamwiki/servlets/UpgradeServlet.java
    wiki/branches/wrh2/jamwiki-web/src/main/java/org/jamwiki/servlets/UploadServlet.java
    wiki/branches/wrh2/jamwiki-web/src/main/java/org/jamwiki/servlets/WatchlistServlet.java
    wiki/branches/wrh2/jamwiki-web/src/main/java/org/jamwiki/servlets/WikiPageInfo.java
    wiki/branches/wrh2/jamwiki-web/src/main/java/org/jamwiki/taglib/ImageLinkTag.java
    wiki/branches/wrh2/jamwiki-web/src/test/java/org/jamwiki/servlets/ServletUtilTest.java
    wiki/branches/wrh2/jamwiki-web/src/test/java/org/jamwiki/servlets/WikiPageInfoTest.java
    wiki/branches/wrh2/javadiff/pom.xml
    wiki/branches/wrh2/pom.xml

Added Paths:
-----------
    wiki/branches/wrh2/jamwiki-core/src/main/java/org/jamwiki/db/
    wiki/branches/wrh2/jamwiki-core/src/main/java/org/jamwiki/db/AnsiDataHandler.java
    wiki/branches/wrh2/jamwiki-core/src/main/java/org/jamwiki/db/AnsiQueryHandler.java
    wiki/branches/wrh2/jamwiki-core/src/main/java/org/jamwiki/db/DB2400DataHandler.java
    wiki/branches/wrh2/jamwiki-core/src/main/java/org/jamwiki/db/DB2400QueryHandler.java
    wiki/branches/wrh2/jamwiki-core/src/main/java/org/jamwiki/db/DB2DataHandler.java
    wiki/branches/wrh2/jamwiki-core/src/main/java/org/jamwiki/db/DB2QueryHandler.java
    wiki/branches/wrh2/jamwiki-core/src/main/java/org/jamwiki/db/DatabaseConnection.java
    wiki/branches/wrh2/jamwiki-core/src/main/java/org/jamwiki/db/DatabaseUpgrades.java
    wiki/branches/wrh2/jamwiki-core/src/main/java/org/jamwiki/db/H2DataHandler.java
    wiki/branches/wrh2/jamwiki-core/src/main/java/org/jamwiki/db/H2QueryHandler.java
    wiki/branches/wrh2/jamwiki-core/src/main/java/org/jamwiki/db/HSqlDataHandler.java
    wiki/branches/wrh2/jamwiki-core/src/main/java/org/jamwiki/db/HSqlQueryHandler.java
    wiki/branches/wrh2/jamwiki-core/src/main/java/org/jamwiki/db/LocalDataSource.java
    wiki/branches/wrh2/jamwiki-core/src/main/java/org/jamwiki/db/MSSqlDataHandler.java
    wiki/branches/wrh2/jamwiki-core/src/main/java/org/jamwiki/db/MSSqlQueryHandler.java
    wiki/branches/wrh2/jamwiki-core/src/main/java/org/jamwiki/db/MySqlDataHandler.java
    wiki/branches/wrh2/jamwiki-core/src/main/java/org/jamwiki/db/MySqlQueryHandler.java
    wiki/branches/wrh2/jamwiki-core/src/main/java/org/jamwiki/db/OracleDataHandler.java
    wiki/branches/wrh2/jamwiki-core/src/main/java/org/jamwiki/db/OracleQueryHandler.java
    wiki/branches/wrh2/jamwiki-core/src/main/java/org/jamwiki/db/PostgresDataHandler.java
    wiki/branches/wrh2/jamwiki-core/src/main/java/org/jamwiki/db/PostgresQueryHandler.java
    wiki/branches/wrh2/jamwiki-core/src/main/java/org/jamwiki/db/QueryHandler.java
    wiki/branches/wrh2/jamwiki-core/src/main/java/org/jamwiki/db/SybaseASADataHandler.java
    wiki/branches/wrh2/jamwiki-core/src/main/java/org/jamwiki/db/SybaseASAQueryHandler.java
    wiki/branches/wrh2/jamwiki-core/src/main/java/org/jamwiki/db/WikiDatabase.java
    wiki/branches/wrh2/jamwiki-core/src/main/java/org/jamwiki/db/package.html
    wiki/branches/wrh2/jamwiki-core/src/main/java/org/jamwiki/model/WikiUserDetails.java
    wiki/branches/wrh2/jamwiki-core/src/main/java/org/jamwiki/parser/jflex/ImageLinkTag.java
    wiki/branches/wrh2/jamwiki-core/src/main/java/org/jamwiki/utils/ImageBorderEnum.java
    wiki/branches/wrh2/jamwiki-core/src/main/java/org/jamwiki/utils/ImageHorizontalAlignmentEnum.java
    wiki/branches/wrh2/jamwiki-core/src/main/java/org/jamwiki/utils/ImageMetadata.java
    wiki/branches/wrh2/jamwiki-core/src/main/java/org/jamwiki/utils/ImageVerticalAlignmentEnum.java
    wiki/branches/wrh2/jamwiki-core/src/main/resources/
    wiki/branches/wrh2/jamwiki-core/src/main/resources/pages/
    wiki/branches/wrh2/jamwiki-core/src/main/resources/pages/BottomArea.txt
    wiki/branches/wrh2/jamwiki-core/src/main/resources/pages/LeftMenu.txt
    wiki/branches/wrh2/jamwiki-core/src/main/resources/pages/StartingPoints.txt
    wiki/branches/wrh2/jamwiki-core/src/main/resources/pages/StyleSheet.txt
    wiki/branches/wrh2/jamwiki-core/src/main/resources/pages/de/
    wiki/branches/wrh2/jamwiki-core/src/main/resources/pages/de/BottomArea.txt
    wiki/branches/wrh2/jamwiki-core/src/main/resources/pages/de/LeftMenu.txt
    wiki/branches/wrh2/jamwiki-core/src/main/resources/pages/de/StartingPoints.txt
    wiki/branches/wrh2/jamwiki-core/src/main/resources/pages/es/
    wiki/branches/wrh2/jamwiki-core/src/main/resources/pages/es/BottomArea.txt
    wiki/branches/wrh2/jamwiki-core/src/main/resources/pages/es/LeftMenu.txt
    wiki/branches/wrh2/jamwiki-core/src/main/resources/pages/es/StartingPoints.txt
    wiki/branches/wrh2/jamwiki-core/src/main/resources/pages/gl/
    wiki/branches/wrh2/jamwiki-core/src/main/resources/pages/gl/BottomArea.txt
    wiki/branches/wrh2/jamwiki-core/src/main/resources/pages/gl/LeftMenu.txt
    wiki/branches/wrh2/jamwiki-core/src/main/resources/pages/gl/StartingPoints.txt
    wiki/branches/wrh2/jamwiki-core/src/main/resources/pages/hu/
    wiki/branches/wrh2/jamwiki-core/src/main/resources/pages/hu/LeftMenu.txt
    wiki/branches/wrh2/jamwiki-core/src/main/resources/pages/hu/StartingPoints.txt
    wiki/branches/wrh2/jamwiki-core/src/main/resources/pages/ja/
    wiki/branches/wrh2/jamwiki-core/src/main/resources/pages/ja/LeftMenu.txt
    wiki/branches/wrh2/jamwiki-core/src/main/resources/pages/ja/StartingPoints.txt
    wiki/branches/wrh2/jamwiki-core/src/main/resources/pages/ru/
    wiki/branches/wrh2/jamwiki-core/src/main/resources/pages/ru/LeftMenu.txt
    wiki/branches/wrh2/jamwiki-core/src/main/resources/pages/zh-TW/
    wiki/branches/wrh2/jamwiki-core/src/main/resources/pages/zh-TW/BottomArea.txt
    wiki/branches/wrh2/jamwiki-core/src/main/resources/pages/zh-TW/LeftMenu.txt
    wiki/branches/wrh2/jamwiki-core/src/main/resources/pages/zh-TW/StartingPoints.txt
    wiki/branches/wrh2/jamwiki-core/src/main/resources/sql.ansi.properties
    wiki/branches/wrh2/jamwiki-core/src/main/resources/sql.asa.properties
    wiki/branches/wrh2/jamwiki-core/src/main/resources/sql.db2.properties
    wiki/branches/wrh2/jamwiki-core/src/main/resources/sql.db2400.properties
    wiki/branches/wrh2/jamwiki-core/src/main/resources/sql.h2.properties
    wiki/branches/wrh2/jamwiki-core/src/main/resources/sql.hsql.properties
    wiki/branches/wrh2/jamwiki-core/src/main/resources/sql.mssql.properties
    wiki/branches/wrh2/jamwiki-core/src/main/resources/sql.mysql.properties
    wiki/branches/wrh2/jamwiki-core/src/main/resources/sql.oracle.properties
    wiki/branches/wrh2/jamwiki-core/src/main/resources/sql.postgres.properties
    wiki/branches/wrh2/jamwiki-core/src/test/java/org/jamwiki/JAMWikiUnitTest.java
    wiki/branches/wrh2/jamwiki-core/src/test/java/org/jamwiki/TestSearchEngine.java
    wiki/branches/wrh2/jamwiki-core/src/test/java/org/jamwiki/parser/
    wiki/branches/wrh2/jamwiki-core/src/test/java/org/jamwiki/parser/jflex/
    wiki/branches/wrh2/jamwiki-core/src/test/java/org/jamwiki/parser/jflex/ParserTest.java
    wiki/branches/wrh2/jamwiki-core/src/test/resources/data/files/test_image.jpg
    wiki/branches/wrh2/jamwiki-core/src/test/resources/data/results/DefinitionList4
    wiki/branches/wrh2/jamwiki-core/src/test/resources/data/results/Heading6
    wiki/branches/wrh2/jamwiki-core/src/test/resources/data/results/Inclusion~test
    wiki/branches/wrh2/jamwiki-core/src/test/resources/data/results/InterWiki1
    wiki/branches/wrh2/jamwiki-core/src/test/resources/data/results/ParserFunctions5
    wiki/branches/wrh2/jamwiki-core/src/test/resources/data/results/ParserFunctionsExpr
    wiki/branches/wrh2/jamwiki-core/src/test/resources/data/results/ParserFunctionsIf
    wiki/branches/wrh2/jamwiki-core/src/test/resources/data/results/ParserFunctionsIfeq
    wiki/branches/wrh2/jamwiki-core/src/test/resources/data/results/Preformatted5
    wiki/branches/wrh2/jamwiki-core/src/test/resources/data/results/References1
    wiki/branches/wrh2/jamwiki-core/src/test/resources/data/results/Subst
    wiki/branches/wrh2/jamwiki-core/src/test/resources/data/results/Table17
    wiki/branches/wrh2/jamwiki-core/src/test/resources/data/results/Table18
    wiki/branches/wrh2/jamwiki-core/src/test/resources/data/results/Table19
    wiki/branches/wrh2/jamwiki-core/src/test/resources/data/results/Table20
    wiki/branches/wrh2/jamwiki-core/src/test/resources/data/results/UnorderedList4
    wiki/branches/wrh2/jamwiki-core/src/test/resources/data/topics/DefinitionList4
    wiki/branches/wrh2/jamwiki-core/src/test/resources/data/topics/Heading6
    wiki/branches/wrh2/jamwiki-core/src/test/resources/data/topics/Help_-_Test
    wiki/branches/wrh2/jamwiki-core/src/test/resources/data/topics/Image_-_Test_Image.jpg
    wiki/branches/wrh2/jamwiki-core/src/test/resources/data/topics/Inclusion~test
    wiki/branches/wrh2/jamwiki-core/src/test/resources/data/topics/InterWiki1
    wiki/branches/wrh2/jamwiki-core/src/test/resources/data/topics/ParserFunctions5
    wiki/branches/wrh2/jamwiki-core/src/test/resources/data/topics/ParserFunctionsExpr
    wiki/branches/wrh2/jamwiki-core/src/test/resources/data/topics/ParserFunctionsIf
    wiki/branches/wrh2/jamwiki-core/src/test/resources/data/topics/ParserFunctionsIfeq
    wiki/branches/wrh2/jamwiki-core/src/test/resources/data/topics/Preformatted5
    wiki/branches/wrh2/jamwiki-core/src/test/resources/data/topics/References1
    wiki/branches/wrh2/jamwiki-core/src/test/resources/data/topics/Subst
    wiki/branches/wrh2/jamwiki-core/src/test/resources/data/topics/Table17
    wiki/branches/wrh2/jamwiki-core/src/test/resources/data/topics/Table18
    wiki/branches/wrh2/jamwiki-core/src/test/resources/data/topics/Table19
    wiki/branches/wrh2/jamwiki-core/src/test/resources/data/topics/Table20
    wiki/branches/wrh2/jamwiki-core/src/test/resources/data/topics/Template_-_Hl2
    wiki/branches/wrh2/jamwiki-core/src/test/resources/data/topics/Template_-_Prettytable
    wiki/branches/wrh2/jamwiki-core/src/test/resources/data/topics/UnorderedList4
    wiki/branches/wrh2/jamwiki-web/src/main/java/org/jamwiki/authentication/WikiUserDetailsImpl.java

Removed Paths:
-------------
    wiki/branches/wrh2/jamwiki-core/src/main/java/org/jamwiki/db/AnsiDataHandler.java
    wiki/branches/wrh2/jamwiki-core/src/main/java/org/jamwiki/db/AnsiQueryHandler.java
    wiki/branches/wrh2/jamwiki-core/src/main/java/org/jamwiki/db/DB2400DataHandler.java
    wiki/branches/wrh2/jamwiki-core/src/main/java/org/jamwiki/db/DB2400QueryHandler.java
    wiki/branches/wrh2/jamwiki-core/src/main/java/org/jamwiki/db/DB2DataHandler.java
    wiki/branches/wrh2/jamwiki-core/src/main/java/org/jamwiki/db/DB2QueryHandler.java
    wiki/branches/wrh2/jamwiki-core/src/main/java/org/jamwiki/db/DatabaseConnection.java
    wiki/branches/wrh2/jamwiki-core/src/main/java/org/jamwiki/db/DatabaseUpgrades.java
    wiki/branches/wrh2/jamwiki-core/src/main/java/org/jamwiki/db/H2DataHandler.java
    wiki/branches/wrh2/jamwiki-core/src/main/java/org/jamwiki/db/H2QueryHandler.java
    wiki/branches/wrh2/jamwiki-core/src/main/java/org/jamwiki/db/HSqlDataHandler.java
    wiki/branches/wrh2/jamwiki-core/src/main/java/org/jamwiki/db/HSqlQueryHandler.java
    wiki/branches/wrh2/jamwiki-core/src/main/java/org/jamwiki/db/LocalDataSource.java
    wiki/branches/wrh2/jamwiki-core/src/main/java/org/jamwiki/db/MSSqlDataHandler.java
    wiki/branches/wrh2/jamwiki-core/src/main/java/org/jamwiki/db/MSSqlQueryHandler.java
    wiki/branches/wrh2/jamwiki-core/src/main/java/org/jamwiki/db/MySqlDataHandler.java
    wiki/branches/wrh2/jamwiki-core/src/main/java/org/jamwiki/db/MySqlQueryHandler.java
    wiki/branches/wrh2/jamwiki-core/src/main/java/org/jamwiki/db/OracleDataHandler.java
    wiki/branches/wrh2/jamwiki-core/src/main/java/org/jamwiki/db/OracleQueryHandler.java
    wiki/branches/wrh2/jamwiki-core/src/main/java/org/jamwiki/db/PostgresDataHandler.java
    wiki/branches/wrh2/jamwiki-core/src/main/java/org/jamwiki/db/PostgresQueryHandler.java
    wiki/branches/wrh2/jamwiki-core/src/main/java/org/jamwiki/db/QueryHandler.java
    wiki/branches/wrh2/jamwiki-core/src/main/java/org/jamwiki/db/SybaseASADataHandler.java
    wiki/branches/wrh2/jamwiki-core/src/main/java/org/jamwiki/db/SybaseASAQueryHandler.java
    wiki/branches/wrh2/jamwiki-core/src/main/java/org/jamwiki/db/WikiDatabase.java
    wiki/branches/wrh2/jamwiki-core/src/main/java/org/jamwiki/db/package.html
    wiki/branches/wrh2/jamwiki-core/src/main/resources/pages/
    wiki/branches/wrh2/jamwiki-core/src/main/resources/pages/BottomArea.txt
    wiki/branches/wrh2/jamwiki-core/src/main/resources/pages/LeftMenu.txt
    wiki/branches/wrh2/jamwiki-core/src/main/resources/pages/StartingPoints.txt
    wiki/branches/wrh2/jamwiki-core/src/main/resources/pages/StyleSheet.txt
    wiki/branches/wrh2/jamwiki-core/src/main/resources/pages/de/
    wiki/branches/wrh2/jamwiki-core/src/main/resources/pages/de/BottomArea.txt
    wiki/branches/wrh2/jamwiki-core/src/main/resources/pages/de/LeftMenu.txt
    wiki/branches/wrh2/jamwiki-core/src/main/resources/pages/de/StartingPoints.txt
    wiki/branches/wrh2/jamwiki-core/src/main/resources/pages/es/
    wiki/branches/wrh2/jamwiki-core/src/main/resources/pages/es/BottomArea.txt
    wiki/branches/wrh2/jamwiki-core/src/main/resources/pages/es/LeftMenu.txt
    wiki/branches/wrh2/jamwiki-core/src/main/resources/pages/es/StartingPoints.txt
    wiki/branches/wrh2/jamwiki-core/src/main/resources/pages/gl/
    wiki/branches/wrh2/jamwiki-core/src/main/resources/pages/gl/BottomArea.txt
    wiki/branches/wrh2/jamwiki-core/src/main/resources/pages/gl/LeftMenu.txt
    wiki/branches/wrh2/jamwiki-core/src/main/resources/pages/gl/StartingPoints.txt
    wiki/branches/wrh2/jamwiki-core/src/main/resources/pages/hu/
    wiki/branches/wrh2/jamwiki-core/src/main/resources/pages/hu/LeftMenu.txt
    wiki/branches/wrh2/jamwiki-core/src/main/resources/pages/hu/StartingPoints.txt
    wiki/branches/wrh2/jamwiki-core/src/main/resources/pages/ja/
    wiki/branches/wrh2/jamwiki-core/src/main/resources/pages/ja/LeftMenu.txt
    wiki/branches/wrh2/jamwiki-core/src/main/resources/pages/ja/StartingPoints.txt
    wiki/branches/wrh2/jamwiki-core/src/main/resources/pages/ru/
    wiki/branches/wrh2/jamwiki-core/src/main/resources/pages/ru/LeftMenu.txt
    wiki/branches/wrh2/jamwiki-core/src/main/resources/pages/zh-TW/
    wiki/branches/wrh2/jamwiki-core/src/main/resources/pages/zh-TW/BottomArea.txt
    wiki/branches/wrh2/jamwiki-core/src/main/resources/pages/zh-TW/LeftMenu.txt
    wiki/branches/wrh2/jamwiki-core/src/main/resources/pages/zh-TW/StartingPoints.txt
    wiki/branches/wrh2/jamwiki-core/src/main/resources/sql.ansi.properties
    wiki/branches/wrh2/jamwiki-core/src/main/resources/sql.asa.properties
    wiki/branches/wrh2/jamwiki-core/src/main/resources/sql.db2.properties
    wiki/branches/wrh2/jamwiki-core/src/main/resources/sql.db2400.properties
    wiki/branches/wrh2/jamwiki-core/src/main/resources/sql.h2.properties
    wiki/branches/wrh2/jamwiki-core/src/main/resources/sql.hsql.properties
    wiki/branches/wrh2/jamwiki-core/src/main/resources/sql.mssql.properties
    wiki/branches/wrh2/jamwiki-core/src/main/resources/sql.mysql.properties
    wiki/branches/wrh2/jamwiki-core/src/main/resources/sql.oracle.properties
    wiki/branches/wrh2/jamwiki-core/src/main/resources/sql.postgres.properties
    wiki/branches/wrh2/jamwiki-core/src/test/java/org/jamwiki/TestDataHandler.java
    wiki/branches/wrh2/jamwiki-core/src/test/java/org/jamwiki/parser/
    wiki/branches/wrh2/jamwiki-core/src/test/java/org/jamwiki/parser/jflex/
    wiki/branches/wrh2/jamwiki-core/src/test/java/org/jamwiki/parser/jflex/ParserTest.java
    wiki/branches/wrh2/jamwiki-core/src/test/java/org/jamwiki/utils/ImageUtilTest.java
    wiki/branches/wrh2/jamwiki-core/src/test/resources/data/files/test_image.gif
    wiki/branches/wrh2/jamwiki-core/src/test/resources/data/results/ImageLink2
    wiki/branches/wrh2/jamwiki-core/src/test/resources/data/results/Template_-_Expr
    wiki/branches/wrh2/jamwiki-core/src/test/resources/data/results/Template_-_If
    wiki/branches/wrh2/jamwiki-core/src/test/resources/data/results/Template_-_Ifeq
    wiki/branches/wrh2/jamwiki-core/src/test/resources/data/results/Template_-_Subst
    wiki/branches/wrh2/jamwiki-core/src/test/resources/data/topics/ImageLink2
    wiki/branches/wrh2/jamwiki-core/src/test/resources/data/topics/Image_-_Test_Image.gif
    wiki/branches/wrh2/jamwiki-core/src/test/resources/data/topics/Template_-_Expr
    wiki/branches/wrh2/jamwiki-core/src/test/resources/data/topics/Template_-_If
    wiki/branches/wrh2/jamwiki-core/src/test/resources/data/topics/Template_-_Ifeq
    wiki/branches/wrh2/jamwiki-core/src/test/resources/data/topics/Template_-_Subst
    wiki/branches/wrh2/jamwiki-war/src/main/resources/pages/
    wiki/branches/wrh2/jamwiki-war/src/main/resources/sql.ansi.properties
    wiki/branches/wrh2/jamwiki-war/src/main/resources/sql.asa.properties
    wiki/branches/wrh2/jamwiki-war/src/main/resources/sql.db2.properties
    wiki/branches/wrh2/jamwiki-war/src/main/resources/sql.db2400.properties
    wiki/branches/wrh2/jamwiki-war/src/main/resources/sql.h2.properties
    wiki/branches/wrh2/jamwiki-war/src/main/resources/sql.hsql.properties
    wiki/branches/wrh2/jamwiki-war/src/main/resources/sql.mssql.properties
    wiki/branches/wrh2/jamwiki-war/src/main/resources/sql.mysql.properties
    wiki/branches/wrh2/jamwiki-war/src/main/resources/sql.oracle.properties
    wiki/branches/wrh2/jamwiki-war/src/main/resources/sql.postgres.properties
    wiki/branches/wrh2/jamwiki-web/src/main/java/org/jamwiki/authentication/WikiUserDetails.java
    wiki/branches/wrh2/jamwiki-web/src/main/java/org/jamwiki/db/
    wiki/branches/wrh2/webtest/

Property Changed:
----------------
    wiki/branches/wrh2/
    wiki/branches/wrh2/jamwiki-core/


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Jamwiki-commit] SF.net SVN: jamwiki:[3072] wiki/branches/wrh2

From: <wrh2@us...> - 2010-06-01 02:28

Revision: 3072
          http://jamwiki.svn.sourceforge.net/jamwiki/?rev=3072&view=rev
Author:   wrh2
Date:     2010-06-01 02:28:27 +0000 (Tue, 01 Jun 2010)

Log Message:
-----------
Merge:
  * Merge trunk changes into the wrh2 branch.

Modified Paths:
--------------
    wiki/branches/wrh2/jamwiki-core/pom.xml
    wiki/branches/wrh2/jamwiki-core/src/main/java/org/jamwiki/Environment.java
    wiki/branches/wrh2/jamwiki-core/src/main/java/org/jamwiki/db/AnsiDataHandler.java
    wiki/branches/wrh2/jamwiki-core/src/main/java/org/jamwiki/db/AnsiQueryHandler.java
    wiki/branches/wrh2/jamwiki-core/src/main/java/org/jamwiki/db/OracleQueryHandler.java
    wiki/branches/wrh2/jamwiki-core/src/main/java/org/jamwiki/db/WikiDatabase.java
    wiki/branches/wrh2/jamwiki-core/src/main/java/org/jamwiki/migrate/MediaWikiXmlImporter.java
    wiki/branches/wrh2/jamwiki-core/src/main/java/org/jamwiki/model/Namespace.java
    wiki/branches/wrh2/jamwiki-core/src/main/java/org/jamwiki/parser/jflex/HtmlLinkTag.java
    wiki/branches/wrh2/jamwiki-core/src/main/java/org/jamwiki/parser/jflex/JFlexParserUtil.java
    wiki/branches/wrh2/jamwiki-core/src/main/java/org/jamwiki/parser/jflex/WikiLinkTag.java
    wiki/branches/wrh2/jamwiki-core/src/main/java/org/jamwiki/utils/DiffUtil.java
    wiki/branches/wrh2/jamwiki-core/src/main/java/org/jamwiki/utils/ImageUtil.java
    wiki/branches/wrh2/jamwiki-core/src/main/java/org/jamwiki/utils/LinkUtil.java
    wiki/branches/wrh2/jamwiki-core/src/main/java/org/jamwiki/utils/WikiCache.java
    wiki/branches/wrh2/jamwiki-core/src/main/java/org/jamwiki/utils/WikiUtil.java
    wiki/branches/wrh2/jamwiki-core/src/main/jflex/jamwiki-processor.jflex
    wiki/branches/wrh2/jamwiki-core/src/main/resources/sql.mysql.properties
    wiki/branches/wrh2/jamwiki-core/src/test/java/org/jamwiki/JAMWikiUnitTest.java
    wiki/branches/wrh2/jamwiki-core/src/test/java/org/jamwiki/migrate/MigrationUtilTest.java
    wiki/branches/wrh2/jamwiki-core/src/test/java/org/jamwiki/parser/jflex/ParserTest.java
    wiki/branches/wrh2/jamwiki-core/src/test/resources/ApplicationResources.properties
    wiki/branches/wrh2/jamwiki-core/src/test/resources/data/results/WikiLink1
    wiki/branches/wrh2/jamwiki-core/src/test/resources/data/topics/WikiLink1
    wiki/branches/wrh2/jamwiki-war/src/main/resources/ApplicationResources.properties
    wiki/branches/wrh2/jamwiki-war/src/main/resources/ApplicationResources_da.properties
    wiki/branches/wrh2/jamwiki-war/src/main/resources/ApplicationResources_de.properties
    wiki/branches/wrh2/jamwiki-war/src/main/resources/ApplicationResources_es.properties
    wiki/branches/wrh2/jamwiki-war/src/main/resources/ApplicationResources_fr.properties
    wiki/branches/wrh2/jamwiki-war/src/main/resources/ApplicationResources_gl.properties
    wiki/branches/wrh2/jamwiki-war/src/main/resources/ApplicationResources_hr.properties
    wiki/branches/wrh2/jamwiki-war/src/main/resources/ApplicationResources_hu.properties
    wiki/branches/wrh2/jamwiki-war/src/main/resources/ApplicationResources_it.properties
    wiki/branches/wrh2/jamwiki-war/src/main/resources/ApplicationResources_ja.properties
    wiki/branches/wrh2/jamwiki-war/src/main/resources/ApplicationResources_nl.properties
    wiki/branches/wrh2/jamwiki-war/src/main/resources/ApplicationResources_no.properties
    wiki/branches/wrh2/jamwiki-war/src/main/resources/ApplicationResources_pl.properties
    wiki/branches/wrh2/jamwiki-war/src/main/resources/ApplicationResources_pt.properties
    wiki/branches/wrh2/jamwiki-war/src/main/resources/ApplicationResources_pt_BR.properties
    wiki/branches/wrh2/jamwiki-war/src/main/resources/ApplicationResources_ru.properties
    wiki/branches/wrh2/jamwiki-war/src/main/resources/ApplicationResources_sk.properties
    wiki/branches/wrh2/jamwiki-war/src/main/resources/ApplicationResources_sv.properties
    wiki/branches/wrh2/jamwiki-war/src/main/resources/ApplicationResources_uk.properties
    wiki/branches/wrh2/jamwiki-war/src/main/resources/ApplicationResources_zh_CN.properties
    wiki/branches/wrh2/jamwiki-war/src/main/resources/ApplicationResources_zh_TW.properties
    wiki/branches/wrh2/jamwiki-war/src/main/resources/jamwiki-configuration.xml
    wiki/branches/wrh2/jamwiki-war/src/main/webapp/CHANGELOG.txt
    wiki/branches/wrh2/jamwiki-war/src/main/webapp/CREDITS.txt
    wiki/branches/wrh2/jamwiki-war/src/main/webapp/WEB-INF/jsp/admin-maintenance.jsp
    wiki/branches/wrh2/jamwiki-war/src/main/webapp/WEB-INF/jsp/admin-virtual-wiki.jsp
    wiki/branches/wrh2/jamwiki-war/src/main/webapp/WEB-INF/jsp/admin.jsp
    wiki/branches/wrh2/jamwiki-war/src/main/webapp/WEB-INF/jsp/error.jsp
    wiki/branches/wrh2/jamwiki-web/pom.xml
    wiki/branches/wrh2/jamwiki-web/src/main/java/org/jamwiki/servlets/AdminServlet.java
    wiki/branches/wrh2/jamwiki-web/src/main/java/org/jamwiki/servlets/JAMWikiListener.java
    wiki/branches/wrh2/jamwiki-web/src/main/java/org/jamwiki/servlets/JAMWikiServlet.java
    wiki/branches/wrh2/jamwiki-web/src/main/java/org/jamwiki/servlets/ServletUtil.java
    wiki/branches/wrh2/jamwiki-web/src/main/java/org/jamwiki/servlets/WikiPageInfo.java
    wiki/branches/wrh2/pom.xml

Added Paths:
-----------
    wiki/branches/wrh2/jamwiki-core/src/test/resources/data/results/Heading7
    wiki/branches/wrh2/jamwiki-core/src/test/resources/data/topics/Heading7
    wiki/branches/wrh2/jamwiki-war/src/main/resources/ApplicationResources_si_LK.properties

Removed Paths:
-------------
    wiki/branches/wrh2/jamwiki-war/src/main/webapp/DATASOURCE_README.txt

Property Changed:
----------------
    wiki/branches/wrh2/


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Jamwiki-commit] SF.net SVN: jamwiki:[3081] wiki/branches/wrh2

From: <wrh2@us...> - 2010-06-08 04:44

Revision: 3081
          http://jamwiki.svn.sourceforge.net/jamwiki/?rev=3081&view=rev
Author:   wrh2
Date:     2010-06-08 04:44:24 +0000 (Tue, 08 Jun 2010)

Log Message:
-----------
Special:LinkTo:
  * Add a new jam_topic_links table to collect links for each topic.  Currently
    this information is stored in the search index, which is a poor place to
    keep it.

Modified Paths:
--------------
    wiki/branches/wrh2/jamwiki-core/src/main/java/org/jamwiki/DataHandler.java
    wiki/branches/wrh2/jamwiki-core/src/main/java/org/jamwiki/SearchEngine.java
    wiki/branches/wrh2/jamwiki-core/src/main/java/org/jamwiki/db/AnsiDataHandler.java
    wiki/branches/wrh2/jamwiki-core/src/main/java/org/jamwiki/db/AnsiQueryHandler.java
    wiki/branches/wrh2/jamwiki-core/src/main/java/org/jamwiki/db/DatabaseUpgrades.java
    wiki/branches/wrh2/jamwiki-core/src/main/java/org/jamwiki/db/QueryHandler.java
    wiki/branches/wrh2/jamwiki-core/src/main/resources/sql.ansi.properties
    wiki/branches/wrh2/jamwiki-core/src/main/resources/sql.hsql.properties
    wiki/branches/wrh2/jamwiki-core/src/test/java/org/jamwiki/TestSearchEngine.java
    wiki/branches/wrh2/jamwiki-war/src/main/webapp/CHANGELOG.txt
    wiki/branches/wrh2/jamwiki-war/src/main/webapp/WEB-INF/jsp/linkto.jsp
    wiki/branches/wrh2/jamwiki-web/src/main/java/org/jamwiki/search/LuceneSearchEngine.java
    wiki/branches/wrh2/jamwiki-web/src/main/java/org/jamwiki/servlets/ItemsServlet.java
    wiki/branches/wrh2/jamwiki-web/src/main/java/org/jamwiki/servlets/LinkToServlet.java
    wiki/branches/wrh2/jamwiki-web/src/main/java/org/jamwiki/servlets/UpgradeServlet.java


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Jamwiki-commit] SF.net SVN: jamwiki:[3082] wiki/branches/wrh2

From: <wrh2@us...> - 2010-06-09 02:00

Revision: 3082
          http://jamwiki.svn.sourceforge.net/jamwiki/?rev=3082&view=rev
Author:   wrh2
Date:     2010-06-09 02:00:33 +0000 (Wed, 09 Jun 2010)

Log Message:
-----------
Special:LinkTo:
  * Add a tool to Special:Maintenance to regenerate topic links.

Modified Paths:
--------------
    wiki/branches/wrh2/jamwiki-core/src/main/java/org/jamwiki/db/AnsiDataHandler.java
    wiki/branches/wrh2/jamwiki-core/src/main/java/org/jamwiki/db/DatabaseUpgrades.java
    wiki/branches/wrh2/jamwiki-core/src/main/java/org/jamwiki/db/WikiDatabase.java
    wiki/branches/wrh2/jamwiki-war/src/main/resources/ApplicationResources.properties
    wiki/branches/wrh2/jamwiki-war/src/main/resources/ApplicationResources_de.properties
    wiki/branches/wrh2/jamwiki-war/src/main/resources/ApplicationResources_pl.properties
    wiki/branches/wrh2/jamwiki-war/src/main/resources/ApplicationResources_ru.properties
    wiki/branches/wrh2/jamwiki-war/src/main/resources/ApplicationResources_si_LK.properties
    wiki/branches/wrh2/jamwiki-war/src/main/webapp/WEB-INF/jsp/admin-maintenance.jsp
    wiki/branches/wrh2/jamwiki-web/src/main/java/org/jamwiki/servlets/AdminServlet.java


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Jamwiki-commit] SF.net SVN: jamwiki:[3083] wiki/branches/wrh2

From: <wrh2@us...> - 2010-06-09 02:54

Revision: 3083
          http://jamwiki.svn.sourceforge.net/jamwiki/?rev=3083&view=rev
Author:   wrh2
Date:     2010-06-09 02:54:34 +0000 (Wed, 09 Jun 2010)

Log Message:
-----------
Merge:
  * Merge trunk changes into the wrh2 branch.

Modified Paths:
--------------
    wiki/branches/wrh2/jamwiki-core/src/main/java/org/jamwiki/DataHandler.java
    wiki/branches/wrh2/jamwiki-core/src/main/java/org/jamwiki/db/AnsiDataHandler.java
    wiki/branches/wrh2/jamwiki-core/src/main/java/org/jamwiki/db/AnsiQueryHandler.java
    wiki/branches/wrh2/jamwiki-core/src/main/java/org/jamwiki/db/DatabaseUpgrades.java
    wiki/branches/wrh2/jamwiki-core/src/main/java/org/jamwiki/db/QueryHandler.java
    wiki/branches/wrh2/jamwiki-core/src/main/java/org/jamwiki/db/WikiDatabase.java
    wiki/branches/wrh2/jamwiki-core/src/main/java/org/jamwiki/parser/ParserUtil.java
    wiki/branches/wrh2/jamwiki-core/src/main/java/org/jamwiki/parser/jflex/ImageLinkTag.java
    wiki/branches/wrh2/jamwiki-core/src/main/java/org/jamwiki/parser/jflex/JFlexParser.java
    wiki/branches/wrh2/jamwiki-core/src/main/java/org/jamwiki/utils/ImageUtil.java
    wiki/branches/wrh2/jamwiki-core/src/main/java/org/jamwiki/utils/LinkUtil.java
    wiki/branches/wrh2/jamwiki-core/src/main/resources/sql.ansi.properties
    wiki/branches/wrh2/jamwiki-core/src/test/resources/data/results/InterWiki1
    wiki/branches/wrh2/jamwiki-core/src/test/resources/data/topics/InterWiki1
    wiki/branches/wrh2/jamwiki-war/src/main/resources/jamwiki-configuration.xml
    wiki/branches/wrh2/jamwiki-war/src/main/webapp/WEB-INF/jsp/shared-db-javascript.jsp
    wiki/branches/wrh2/jamwiki-web/src/main/java/org/jamwiki/search/LuceneSearchEngine.java
    wiki/branches/wrh2/jamwiki-web/src/main/java/org/jamwiki/servlets/AdminServlet.java
    wiki/branches/wrh2/jamwiki-web/src/main/java/org/jamwiki/servlets/ItemsServlet.java
    wiki/branches/wrh2/jamwiki-web/src/main/java/org/jamwiki/servlets/JAMWikiServlet.java

Property Changed:
----------------
    wiki/branches/wrh2/


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Jamwiki-commit] SF.net SVN: jamwiki:[3086] wiki/branches/wrh2

From: <wrh2@us...> - 2010-06-09 05:47

Revision: 3086
          http://jamwiki.svn.sourceforge.net/jamwiki/?rev=3086&view=rev
Author:   wrh2
Date:     2010-06-09 05:46:58 +0000 (Wed, 09 Jun 2010)

Log Message:
-----------
Special:Upgrade:
  * Bump the version number to 0.8.0.
  * Populate the jam_topic_links field during the upgrade process.

Modified Paths:
--------------
    wiki/branches/wrh2/addons/bliki-parser/pom.xml
    wiki/branches/wrh2/addons/pom.xml
    wiki/branches/wrh2/jamwiki-core/pom.xml
    wiki/branches/wrh2/jamwiki-core/src/main/java/org/jamwiki/WikiVersion.java
    wiki/branches/wrh2/jamwiki-core/src/main/java/org/jamwiki/db/DatabaseUpgrades.java
    wiki/branches/wrh2/jamwiki-core/src/main/java/org/jamwiki/db/WikiDatabase.java
    wiki/branches/wrh2/jamwiki-core/src/test/resources/jamwiki.properties
    wiki/branches/wrh2/jamwiki-war/pom.xml
    wiki/branches/wrh2/jamwiki-war/src/main/webapp/UPGRADE.txt
    wiki/branches/wrh2/jamwiki-web/pom.xml
    wiki/branches/wrh2/jamwiki-web/src/main/java/org/jamwiki/servlets/AdminServlet.java
    wiki/branches/wrh2/javadiff/pom.xml
    wiki/branches/wrh2/pom.xml


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Jamwiki-commit] SF.net SVN: jamwiki:[3112] wiki/branches/wrh2

From: <wrh2@us...> - 2010-06-23 04:16

Revision: 3112
          http://jamwiki.svn.sourceforge.net/jamwiki/?rev=3112&view=rev
Author:   wrh2
Date:     2010-06-23 04:16:13 +0000 (Wed, 23 Jun 2010)

Log Message:
-----------
Merge:
  * Merge trunk changes to the wrh2 branch.

Modified Paths:
--------------
    wiki/branches/wrh2/jamwiki-core/pom.xml
    wiki/branches/wrh2/jamwiki-core/src/main/java/org/jamwiki/DataHandler.java
    wiki/branches/wrh2/jamwiki-core/src/main/java/org/jamwiki/db/AnsiDataHandler.java
    wiki/branches/wrh2/jamwiki-core/src/main/java/org/jamwiki/db/AnsiQueryHandler.java
    wiki/branches/wrh2/jamwiki-core/src/main/java/org/jamwiki/db/DatabaseUpgrades.java
    wiki/branches/wrh2/jamwiki-core/src/main/java/org/jamwiki/db/QueryHandler.java
    wiki/branches/wrh2/jamwiki-core/src/main/java/org/jamwiki/utils/ImageMetadata.java
    wiki/branches/wrh2/jamwiki-core/src/main/java/org/jamwiki/utils/ImageUtil.java
    wiki/branches/wrh2/jamwiki-core/src/main/java/org/jamwiki/utils/WikiCache.java
    wiki/branches/wrh2/jamwiki-core/src/main/jflex/jamwiki-preprocessor.jflex
    wiki/branches/wrh2/jamwiki-core/src/main/jflex/jamwiki-processor.jflex
    wiki/branches/wrh2/jamwiki-core/src/main/resources/pages/StyleSheet.txt
    wiki/branches/wrh2/jamwiki-core/src/main/resources/sql.ansi.properties
    wiki/branches/wrh2/jamwiki-core/src/main/resources/sql.mssql.properties
    wiki/branches/wrh2/jamwiki-core/src/main/resources/sql.mysql.properties
    wiki/branches/wrh2/jamwiki-core/src/main/resources/sql.oracle.properties
    wiki/branches/wrh2/jamwiki-core/src/main/resources/sql.postgres.properties
    wiki/branches/wrh2/jamwiki-core/src/test/resources/data/results/HtmlBasicLinks2
    wiki/branches/wrh2/jamwiki-core/src/test/resources/data/topics/HtmlBasicLinks2
    wiki/branches/wrh2/jamwiki-war/pom.xml
    wiki/branches/wrh2/jamwiki-war/src/main/resources/ApplicationResources.properties
    wiki/branches/wrh2/jamwiki-war/src/main/resources/ApplicationResources_hu.properties
    wiki/branches/wrh2/jamwiki-war/src/main/webapp/CHANGELOG.txt
    wiki/branches/wrh2/jamwiki-war/src/main/webapp/CREDITS.txt
    wiki/branches/wrh2/jamwiki-war/src/main/webapp/README.txt
    wiki/branches/wrh2/jamwiki-war/src/main/webapp/UPGRADE.txt
    wiki/branches/wrh2/jamwiki-war/src/main/webapp/WEB-INF/jamwiki.tld
    wiki/branches/wrh2/jamwiki-war/src/main/webapp/WEB-INF/jsp/category-include.jsp
    wiki/branches/wrh2/jamwiki-war/src/main/webapp/WEB-INF/jsp/edit.jsp
    wiki/branches/wrh2/jamwiki-war/src/main/webapp/WEB-INF/jsp/printable.jsp
    wiki/branches/wrh2/jamwiki-war/src/main/webapp/WEB-INF/jsp/top-menu.jsp
    wiki/branches/wrh2/jamwiki-war/src/main/webapp/WEB-INF/jsp/topic.jsp
    wiki/branches/wrh2/jamwiki-war/src/main/webapp/WEB-INF/jsp/view-topic-include.jsp
    wiki/branches/wrh2/jamwiki-war/src/main/webapp/WEB-INF/jsp/wiki.jsp
    wiki/branches/wrh2/jamwiki-web/src/main/java/org/jamwiki/servlets/ItemsServlet.java
    wiki/branches/wrh2/jamwiki-web/src/main/java/org/jamwiki/servlets/JAMWikiServlet.java
    wiki/branches/wrh2/jamwiki-web/src/main/java/org/jamwiki/servlets/UpgradeServlet.java
    wiki/branches/wrh2/jamwiki-web/src/main/java/org/jamwiki/servlets/WikiPageInfo.java
    wiki/branches/wrh2/jamwiki-web/src/main/java/org/jamwiki/taglib/ImageLinkTag.java
    wiki/branches/wrh2/pom.xml

Added Paths:
-----------
    wiki/branches/wrh2/jamwiki-war/src/main/webapp/WEB-INF/jsp/view-category-include.jsp

Property Changed:
----------------
    wiki/branches/wrh2/


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Jamwiki-commit] SF.net SVN: jamwiki:[3253] wiki/branches/wrh2

From: <wrh2@us...> - 2010-10-13 04:56

Revision: 3253
          http://jamwiki.svn.sourceforge.net/jamwiki/?rev=3253&view=rev
Author:   wrh2
Date:     2010-10-13 04:56:22 +0000 (Wed, 13 Oct 2010)

Log Message:
-----------
Merge:
  * Merge changes from trunk to the wrh2 branch.

Modified Paths:
--------------
    wiki/branches/wrh2/addons/bliki-parser/src/main/java/org/jamwiki/parser/bliki/JAMWikiModel.java
    wiki/branches/wrh2/jamwiki-core/pom.xml
    wiki/branches/wrh2/jamwiki-core/src/main/java/org/jamwiki/DataHandler.java
    wiki/branches/wrh2/jamwiki-core/src/main/java/org/jamwiki/Environment.java
    wiki/branches/wrh2/jamwiki-core/src/main/java/org/jamwiki/WikiBase.java
    wiki/branches/wrh2/jamwiki-core/src/main/java/org/jamwiki/WikiConfiguration.java
    wiki/branches/wrh2/jamwiki-core/src/main/java/org/jamwiki/WikiMessage.java
    wiki/branches/wrh2/jamwiki-core/src/main/java/org/jamwiki/db/AnsiDataHandler.java
    wiki/branches/wrh2/jamwiki-core/src/main/java/org/jamwiki/db/AnsiQueryHandler.java
    wiki/branches/wrh2/jamwiki-core/src/main/java/org/jamwiki/db/DB2400QueryHandler.java
    wiki/branches/wrh2/jamwiki-core/src/main/java/org/jamwiki/db/DatabaseConnection.java
    wiki/branches/wrh2/jamwiki-core/src/main/java/org/jamwiki/db/DatabaseUpgrades.java
    wiki/branches/wrh2/jamwiki-core/src/main/java/org/jamwiki/db/QueryHandler.java
    wiki/branches/wrh2/jamwiki-core/src/main/java/org/jamwiki/db/WikiDatabase.java
    wiki/branches/wrh2/jamwiki-core/src/main/java/org/jamwiki/migrate/MediaWikiXmlExporter.java
    wiki/branches/wrh2/jamwiki-core/src/main/java/org/jamwiki/migrate/MediaWikiXmlImporter.java
    wiki/branches/wrh2/jamwiki-core/src/main/java/org/jamwiki/migrate/MigrationUtil.java
    wiki/branches/wrh2/jamwiki-core/src/main/java/org/jamwiki/model/Namespace.java
    wiki/branches/wrh2/jamwiki-core/src/main/java/org/jamwiki/model/Topic.java
    wiki/branches/wrh2/jamwiki-core/src/main/java/org/jamwiki/model/VirtualWiki.java
    wiki/branches/wrh2/jamwiki-core/src/main/java/org/jamwiki/model/WikiFileVersion.java
    wiki/branches/wrh2/jamwiki-core/src/main/java/org/jamwiki/parser/ParserInput.java
    wiki/branches/wrh2/jamwiki-core/src/main/java/org/jamwiki/parser/ParserOutput.java
    wiki/branches/wrh2/jamwiki-core/src/main/java/org/jamwiki/parser/ParserUtil.java
    wiki/branches/wrh2/jamwiki-core/src/main/java/org/jamwiki/parser/TableOfContents.java
    wiki/branches/wrh2/jamwiki-core/src/main/java/org/jamwiki/parser/jflex/HtmlLinkTag.java
    wiki/branches/wrh2/jamwiki-core/src/main/java/org/jamwiki/parser/jflex/ImageLinkTag.java
    wiki/branches/wrh2/jamwiki-core/src/main/java/org/jamwiki/parser/jflex/IncludeOnlyTag.java
    wiki/branches/wrh2/jamwiki-core/src/main/java/org/jamwiki/parser/jflex/JFlexLexer.java
    wiki/branches/wrh2/jamwiki-core/src/main/java/org/jamwiki/parser/jflex/JFlexParser.java
    wiki/branches/wrh2/jamwiki-core/src/main/java/org/jamwiki/parser/jflex/JFlexParserUtil.java
    wiki/branches/wrh2/jamwiki-core/src/main/java/org/jamwiki/parser/jflex/JFlexTagItem.java
    wiki/branches/wrh2/jamwiki-core/src/main/java/org/jamwiki/parser/jflex/JavascriptTag.java
    wiki/branches/wrh2/jamwiki-core/src/main/java/org/jamwiki/parser/jflex/MagicWordUtil.java
    wiki/branches/wrh2/jamwiki-core/src/main/java/org/jamwiki/parser/jflex/NoIncludeTag.java
    wiki/branches/wrh2/jamwiki-core/src/main/java/org/jamwiki/parser/jflex/ParserFunctionUtil.java
    wiki/branches/wrh2/jamwiki-core/src/main/java/org/jamwiki/parser/jflex/TemplateTag.java
    wiki/branches/wrh2/jamwiki-core/src/main/java/org/jamwiki/parser/jflex/WikiBoldItalicTag.java
    wiki/branches/wrh2/jamwiki-core/src/main/java/org/jamwiki/parser/jflex/WikiHeadingTag.java
    wiki/branches/wrh2/jamwiki-core/src/main/java/org/jamwiki/parser/jflex/WikiLinkTag.java
    wiki/branches/wrh2/jamwiki-core/src/main/java/org/jamwiki/parser/jflex/WikiReferenceTag.java
    wiki/branches/wrh2/jamwiki-core/src/main/java/org/jamwiki/parser/jflex/WikiReferencesTag.java
    wiki/branches/wrh2/jamwiki-core/src/main/java/org/jamwiki/parser/jflex/WikiSignatureTag.java
    wiki/branches/wrh2/jamwiki-core/src/main/java/org/jamwiki/utils/DiffUtil.java
    wiki/branches/wrh2/jamwiki-core/src/main/java/org/jamwiki/utils/Encryption.java
    wiki/branches/wrh2/jamwiki-core/src/main/java/org/jamwiki/utils/ImageUtil.java
    wiki/branches/wrh2/jamwiki-core/src/main/java/org/jamwiki/utils/LinkUtil.java
    wiki/branches/wrh2/jamwiki-core/src/main/java/org/jamwiki/utils/SpamFilter.java
    wiki/branches/wrh2/jamwiki-core/src/main/java/org/jamwiki/utils/TiddlyWikiParser.java
    wiki/branches/wrh2/jamwiki-core/src/main/java/org/jamwiki/utils/Utilities.java
    wiki/branches/wrh2/jamwiki-core/src/main/java/org/jamwiki/utils/WikiCache.java
    wiki/branches/wrh2/jamwiki-core/src/main/java/org/jamwiki/utils/WikiLink.java
    wiki/branches/wrh2/jamwiki-core/src/main/java/org/jamwiki/utils/WikiLogger.java
    wiki/branches/wrh2/jamwiki-core/src/main/java/org/jamwiki/utils/WikiUtil.java
    wiki/branches/wrh2/jamwiki-core/src/main/jflex/jamwiki-html-processor.jflex
    wiki/branches/wrh2/jamwiki-core/src/main/jflex/jamwiki-postprocessor.jflex
    wiki/branches/wrh2/jamwiki-core/src/main/jflex/jamwiki-preprocessor.jflex
    wiki/branches/wrh2/jamwiki-core/src/main/jflex/jamwiki-processor.jflex
    wiki/branches/wrh2/jamwiki-core/src/main/jflex/jamwiki-spliceprocessor.jflex
    wiki/branches/wrh2/jamwiki-core/src/main/resources/pages/StyleSheet.txt
    wiki/branches/wrh2/jamwiki-core/src/main/resources/sql.ansi.properties
    wiki/branches/wrh2/jamwiki-core/src/main/resources/sql.asa.properties
    wiki/branches/wrh2/jamwiki-core/src/main/resources/sql.hsql.properties
    wiki/branches/wrh2/jamwiki-core/src/main/resources/sql.mssql.properties
    wiki/branches/wrh2/jamwiki-core/src/main/resources/sql.mysql.properties
    wiki/branches/wrh2/jamwiki-core/src/main/resources/sql.oracle.properties
    wiki/branches/wrh2/jamwiki-core/src/main/resources/sql.postgres.properties
    wiki/branches/wrh2/jamwiki-core/src/test/java/org/jamwiki/JAMWikiUnitTest.java
    wiki/branches/wrh2/jamwiki-core/src/test/java/org/jamwiki/migrate/MigrationUtilTest.java
    wiki/branches/wrh2/jamwiki-core/src/test/java/org/jamwiki/parser/jflex/ParserTest.java
    wiki/branches/wrh2/jamwiki-core/src/test/java/org/jamwiki/utils/LinkUtilTest.java
    wiki/branches/wrh2/jamwiki-core/src/test/java/org/jamwiki/utils/TiddlyWikiParserTest.java
    wiki/branches/wrh2/jamwiki-core/src/test/resources/ApplicationResources.properties
    wiki/branches/wrh2/jamwiki-core/src/test/resources/data/files/mediawiki-export-namespace-test.xml
    wiki/branches/wrh2/jamwiki-core/src/test/resources/data/results/Heading7
    wiki/branches/wrh2/jamwiki-core/src/test/resources/data/results/ImageLink1
    wiki/branches/wrh2/jamwiki-core/src/test/resources/data/results/InterWiki1
    wiki/branches/wrh2/jamwiki-core/src/test/resources/data/results/Magic_Words1
    wiki/branches/wrh2/jamwiki-core/src/test/resources/data/results/Magic_Words2
    wiki/branches/wrh2/jamwiki-core/src/test/resources/data/results/NestedTable2
    wiki/branches/wrh2/jamwiki-core/src/test/resources/data/results/ParserFunctions1
    wiki/branches/wrh2/jamwiki-core/src/test/resources/data/results/Template4
    wiki/branches/wrh2/jamwiki-core/src/test/resources/data/results/Template_-_Infinite
    wiki/branches/wrh2/jamwiki-core/src/test/resources/data/results/WikiCategory
    wiki/branches/wrh2/jamwiki-core/src/test/resources/data/results/WikiLink1
    wiki/branches/wrh2/jamwiki-core/src/test/resources/data/topics/ImageLink1
    wiki/branches/wrh2/jamwiki-core/src/test/resources/data/topics/InterWiki1
    wiki/branches/wrh2/jamwiki-core/src/test/resources/data/topics/Magic_Words1
    wiki/branches/wrh2/jamwiki-core/src/test/resources/data/topics/Magic_Words2
    wiki/branches/wrh2/jamwiki-core/src/test/resources/data/topics/NestedTable2
    wiki/branches/wrh2/jamwiki-core/src/test/resources/data/topics/ParserFunctions1
    wiki/branches/wrh2/jamwiki-core/src/test/resources/data/topics/WikiCategory
    wiki/branches/wrh2/jamwiki-core/src/test/resources/data/topics/WikiLink1
    wiki/branches/wrh2/jamwiki-core/src/test/resources/jamwiki.properties
    wiki/branches/wrh2/jamwiki-war/pom.xml
    wiki/branches/wrh2/jamwiki-war/src/main/resources/ApplicationResources.properties
    wiki/branches/wrh2/jamwiki-war/src/main/resources/ApplicationResources_da.properties
    wiki/branches/wrh2/jamwiki-war/src/main/resources/ApplicationResources_de.properties
    wiki/branches/wrh2/jamwiki-war/src/main/resources/ApplicationResources_es.properties
    wiki/branches/wrh2/jamwiki-war/src/main/resources/ApplicationResources_fr.properties
    wiki/branches/wrh2/jamwiki-war/src/main/resources/ApplicationResources_gl.properties
    wiki/branches/wrh2/jamwiki-war/src/main/resources/ApplicationResources_hr.properties
    wiki/branches/wrh2/jamwiki-war/src/main/resources/ApplicationResources_hu.properties
    wiki/branches/wrh2/jamwiki-war/src/main/resources/ApplicationResources_it.properties
    wiki/branches/wrh2/jamwiki-war/src/main/resources/ApplicationResources_ja.properties
    wiki/branches/wrh2/jamwiki-war/src/main/resources/ApplicationResources_nl.properties
    wiki/branches/wrh2/jamwiki-war/src/main/resources/ApplicationResources_no.properties
    wiki/branches/wrh2/jamwiki-war/src/main/resources/ApplicationResources_pl.properties
    wiki/branches/wrh2/jamwiki-war/src/main/resources/ApplicationResources_pt.properties
    wiki/branches/wrh2/jamwiki-war/src/main/resources/ApplicationResources_pt_BR.properties
    wiki/branches/wrh2/jamwiki-war/src/main/resources/ApplicationResources_ru.properties
    wiki/branches/wrh2/jamwiki-war/src/main/resources/ApplicationResources_si_LK.properties
    wiki/branches/wrh2/jamwiki-war/src/main/resources/ApplicationResources_sk.properties
    wiki/branches/wrh2/jamwiki-war/src/main/resources/ApplicationResources_sv.properties
    wiki/branches/wrh2/jamwiki-war/src/main/resources/ApplicationResources_uk.properties
    wiki/branches/wrh2/jamwiki-war/src/main/resources/ApplicationResources_zh_CN.properties
    wiki/branches/wrh2/jamwiki-war/src/main/resources/ApplicationResources_zh_TW.properties
    wiki/branches/wrh2/jamwiki-war/src/main/resources/jamwiki-configuration.xml
    wiki/branches/wrh2/jamwiki-war/src/main/webapp/403.jsp
    wiki/branches/wrh2/jamwiki-war/src/main/webapp/CHANGELOG.txt
    wiki/branches/wrh2/jamwiki-war/src/main/webapp/CREDITS.txt
    wiki/branches/wrh2/jamwiki-war/src/main/webapp/UPGRADE.txt
    wiki/branches/wrh2/jamwiki-war/src/main/webapp/WEB-INF/applicationContext-security.xml
    wiki/branches/wrh2/jamwiki-war/src/main/webapp/WEB-INF/jamwiki-servlet.xml
    wiki/branches/wrh2/jamwiki-war/src/main/webapp/WEB-INF/jamwiki.tld
    wiki/branches/wrh2/jamwiki-war/src/main/webapp/WEB-INF/jsp/admin-maintenance.jsp
    wiki/branches/wrh2/jamwiki-war/src/main/webapp/WEB-INF/jsp/admin-roles.jsp
    wiki/branches/wrh2/jamwiki-war/src/main/webapp/WEB-INF/jsp/admin-virtual-wiki.jsp
    wiki/branches/wrh2/jamwiki-war/src/main/webapp/WEB-INF/jsp/admin.jsp
    wiki/branches/wrh2/jamwiki-war/src/main/webapp/WEB-INF/jsp/diff-include.jsp
    wiki/branches/wrh2/jamwiki-war/src/main/webapp/WEB-INF/jsp/diff.jsp
    wiki/branches/wrh2/jamwiki-war/src/main/webapp/WEB-INF/jsp/editor-toolbar-include.jsp
    wiki/branches/wrh2/jamwiki-war/src/main/webapp/WEB-INF/jsp/error.jsp
    wiki/branches/wrh2/jamwiki-war/src/main/webapp/WEB-INF/jsp/history.jsp
    wiki/branches/wrh2/jamwiki-war/src/main/webapp/WEB-INF/jsp/items.jsp
    wiki/branches/wrh2/jamwiki-war/src/main/webapp/WEB-INF/jsp/log.jsp
    wiki/branches/wrh2/jamwiki-war/src/main/webapp/WEB-INF/jsp/page-init.jsp
    wiki/branches/wrh2/jamwiki-war/src/main/webapp/WEB-INF/jsp/recent-changes.jsp
    wiki/branches/wrh2/jamwiki-war/src/main/webapp/WEB-INF/jsp/top-menu.jsp
    wiki/branches/wrh2/jamwiki-war/src/main/webapp/WEB-INF/jsp/top.jsp
    wiki/branches/wrh2/jamwiki-war/src/main/webapp/WEB-INF/jsp/topic.jsp
    wiki/branches/wrh2/jamwiki-war/src/main/webapp/WEB-INF/jsp/view-topic-include.jsp
    wiki/branches/wrh2/jamwiki-war/src/main/webapp/WEB-INF/jsp/watchlist.jsp
    wiki/branches/wrh2/jamwiki-war/src/main/webapp/WEB-INF/jsp/wiki.jsp
    wiki/branches/wrh2/jamwiki-war/src/main/webapp/index.jsp
    wiki/branches/wrh2/jamwiki-war/src/main/webapp/js/jamwiki.js
    wiki/branches/wrh2/jamwiki-web/pom.xml
    wiki/branches/wrh2/jamwiki-web/src/main/java/org/jamwiki/authentication/JAMWikiAuthenticationConfiguration.java
    wiki/branches/wrh2/jamwiki-web/src/main/java/org/jamwiki/authentication/JAMWikiAuthenticationConstants.java
    wiki/branches/wrh2/jamwiki-web/src/main/java/org/jamwiki/authentication/JAMWikiAuthenticationFailureHandler.java
    wiki/branches/wrh2/jamwiki-web/src/main/java/org/jamwiki/authentication/JAMWikiPostAuthenticationFilter.java
    wiki/branches/wrh2/jamwiki-web/src/main/java/org/jamwiki/authentication/WikiUserDetailsImpl.java
    wiki/branches/wrh2/jamwiki-web/src/main/java/org/jamwiki/mail/WikiMail.java
    wiki/branches/wrh2/jamwiki-web/src/main/java/org/jamwiki/mail/WikiMailAuthenticator.java
    wiki/branches/wrh2/jamwiki-web/src/main/java/org/jamwiki/search/LuceneSearchEngine.java
    wiki/branches/wrh2/jamwiki-web/src/main/java/org/jamwiki/servlets/AdminServlet.java
    wiki/branches/wrh2/jamwiki-web/src/main/java/org/jamwiki/servlets/AdminVirtualWikiServlet.java
    wiki/branches/wrh2/jamwiki-web/src/main/java/org/jamwiki/servlets/DiffServlet.java
    wiki/branches/wrh2/jamwiki-web/src/main/java/org/jamwiki/servlets/EditServlet.java
    wiki/branches/wrh2/jamwiki-web/src/main/java/org/jamwiki/servlets/ExportServlet.java
    wiki/branches/wrh2/jamwiki-web/src/main/java/org/jamwiki/servlets/HistoryServlet.java
    wiki/branches/wrh2/jamwiki-web/src/main/java/org/jamwiki/servlets/ImportServlet.java
    wiki/branches/wrh2/jamwiki-web/src/main/java/org/jamwiki/servlets/ItemsServlet.java
    wiki/branches/wrh2/jamwiki-web/src/main/java/org/jamwiki/servlets/JAMWikiFilter.java
    wiki/branches/wrh2/jamwiki-web/src/main/java/org/jamwiki/servlets/JAMWikiServlet.java
    wiki/branches/wrh2/jamwiki-web/src/main/java/org/jamwiki/servlets/ManageServlet.java
    wiki/branches/wrh2/jamwiki-web/src/main/java/org/jamwiki/servlets/RecentChangesFeedServlet.java
    wiki/branches/wrh2/jamwiki-web/src/main/java/org/jamwiki/servlets/RegisterServlet.java
    wiki/branches/wrh2/jamwiki-web/src/main/java/org/jamwiki/servlets/RolesServlet.java
    wiki/branches/wrh2/jamwiki-web/src/main/java/org/jamwiki/servlets/SearchServlet.java
    wiki/branches/wrh2/jamwiki-web/src/main/java/org/jamwiki/servlets/ServletUtil.java
    wiki/branches/wrh2/jamwiki-web/src/main/java/org/jamwiki/servlets/SetupServlet.java
    wiki/branches/wrh2/jamwiki-web/src/main/java/org/jamwiki/servlets/TopicServlet.java
    wiki/branches/wrh2/jamwiki-web/src/main/java/org/jamwiki/servlets/UpgradeServlet.java
    wiki/branches/wrh2/jamwiki-web/src/main/java/org/jamwiki/servlets/UploadServlet.java
    wiki/branches/wrh2/jamwiki-web/src/main/java/org/jamwiki/servlets/WikiPageInfo.java
    wiki/branches/wrh2/jamwiki-web/src/main/java/org/jamwiki/taglib/AbstractButtonTag.java
    wiki/branches/wrh2/jamwiki-web/src/main/java/org/jamwiki/taglib/AuthMsgTag.java
    wiki/branches/wrh2/jamwiki-web/src/main/java/org/jamwiki/taglib/EditCommentTag.java
    wiki/branches/wrh2/jamwiki-web/src/main/java/org/jamwiki/taglib/EnabledTag.java
    wiki/branches/wrh2/jamwiki-web/src/main/java/org/jamwiki/taglib/ImageLinkTag.java
    wiki/branches/wrh2/jamwiki-web/src/main/java/org/jamwiki/taglib/LinkParamTag.java
    wiki/branches/wrh2/jamwiki-web/src/main/java/org/jamwiki/taglib/LinkTag.java
    wiki/branches/wrh2/jamwiki-web/src/main/java/org/jamwiki/taglib/PaginationTag.java
    wiki/branches/wrh2/jamwiki-web/src/main/java/org/jamwiki/taglib/TextTag.java
    wiki/branches/wrh2/jamwiki-web/src/main/java/org/jamwiki/taglib/WatchlistTag.java
    wiki/branches/wrh2/jamwiki-web/src/main/java/org/jamwiki/taglib/WikiVersionTag.java
    wiki/branches/wrh2/jamwiki-web/src/test/java/org/jamwiki/servlets/WikiPageInfoTest.java
    wiki/branches/wrh2/pom.xml

Added Paths:
-----------
    wiki/branches/wrh2/jamwiki-core/src/main/java/org/jamwiki/db/CacheDataHandler.java
    wiki/branches/wrh2/jamwiki-core/src/main/java/org/jamwiki/db/CacheQueryHandler.java
    wiki/branches/wrh2/jamwiki-core/src/main/java/org/jamwiki/model/Interwiki.java
    wiki/branches/wrh2/jamwiki-core/src/main/java/org/jamwiki/parser/jflex/AbstractHeadingTag.java
    wiki/branches/wrh2/jamwiki-core/src/main/java/org/jamwiki/parser/jflex/ExcessiveNestingException.java
    wiki/branches/wrh2/jamwiki-core/src/main/java/org/jamwiki/parser/jflex/HtmlHeadingTag.java
    wiki/branches/wrh2/jamwiki-core/src/main/java/org/jamwiki/utils/ImageProcessor.java
    wiki/branches/wrh2/jamwiki-core/src/main/jflex/jamwiki-template-processor.jflex
    wiki/branches/wrh2/jamwiki-core/src/main/resources/sql.cache.properties
    wiki/branches/wrh2/jamwiki-core/src/test/java/org/jamwiki/model/InterwikiTest.java
    wiki/branches/wrh2/jamwiki-core/src/test/resources/data/files/test_image2_shared.jpg
    wiki/branches/wrh2/jamwiki-core/src/test/resources/data/files/test_image_shared.jpg
    wiki/branches/wrh2/jamwiki-core/src/test/resources/data/results/Heading8
    wiki/branches/wrh2/jamwiki-core/src/test/resources/data/results/ImageShared1
    wiki/branches/wrh2/jamwiki-core/src/test/resources/data/results/ParserFunctionsIfexist
    wiki/branches/wrh2/jamwiki-core/src/test/resources/data/results/ParserFunctionsSwitch
    wiki/branches/wrh2/jamwiki-core/src/test/resources/data/results/Preformatted6
    wiki/branches/wrh2/jamwiki-core/src/test/resources/data/results/TemplateCategory1
    wiki/branches/wrh2/jamwiki-core/src/test/resources/data/results/TemplateCategory2
    wiki/branches/wrh2/jamwiki-core/src/test/resources/data/results/TemplateDepth
    wiki/branches/wrh2/jamwiki-core/src/test/resources/data/results/TemplateIncludeBracket
    wiki/branches/wrh2/jamwiki-core/src/test/resources/data/results/TemplateIncludeCategory
    wiki/branches/wrh2/jamwiki-core/src/test/resources/data/results/TemplateIncludePipe
    wiki/branches/wrh2/jamwiki-core/src/test/resources/data/results/TemplateInfinite2
    wiki/branches/wrh2/jamwiki-core/src/test/resources/data/results/TemplateNumberedParams
    wiki/branches/wrh2/jamwiki-core/src/test/resources/data/results/Transclusion1
    wiki/branches/wrh2/jamwiki-core/src/test/resources/data/results/VirtualWiki1
    wiki/branches/wrh2/jamwiki-core/src/test/resources/data/results/WikiList1
    wiki/branches/wrh2/jamwiki-core/src/test/resources/data/topics/Heading8
    wiki/branches/wrh2/jamwiki-core/src/test/resources/data/topics/ImageShared1
    wiki/branches/wrh2/jamwiki-core/src/test/resources/data/topics/Image_-_Test_Image2.jpg
    wiki/branches/wrh2/jamwiki-core/src/test/resources/data/topics/ParserFunctionsIfexist
    wiki/branches/wrh2/jamwiki-core/src/test/resources/data/topics/ParserFunctionsSwitch
    wiki/branches/wrh2/jamwiki-core/src/test/resources/data/topics/Preformatted6
    wiki/branches/wrh2/jamwiki-core/src/test/resources/data/topics/TemplateCategory1
    wiki/branches/wrh2/jamwiki-core/src/test/resources/data/topics/TemplateCategory2
    wiki/branches/wrh2/jamwiki-core/src/test/resources/data/topics/TemplateDepth
    wiki/branches/wrh2/jamwiki-core/src/test/resources/data/topics/TemplateIncludeBracket
    wiki/branches/wrh2/jamwiki-core/src/test/resources/data/topics/TemplateIncludeCategory
    wiki/branches/wrh2/jamwiki-core/src/test/resources/data/topics/TemplateIncludePipe
    wiki/branches/wrh2/jamwiki-core/src/test/resources/data/topics/TemplateInfinite2
    wiki/branches/wrh2/jamwiki-core/src/test/resources/data/topics/TemplateNumberedParams
    wiki/branches/wrh2/jamwiki-core/src/test/resources/data/topics/Template_-_Category
    wiki/branches/wrh2/jamwiki-core/src/test/resources/data/topics/Template_-_IncludeBracket
    wiki/branches/wrh2/jamwiki-core/src/test/resources/data/topics/Template_-_IncludeCategory
    wiki/branches/wrh2/jamwiki-core/src/test/resources/data/topics/Template_-_IncludePipe
    wiki/branches/wrh2/jamwiki-core/src/test/resources/data/topics/Template_-_Infinite2
    wiki/branches/wrh2/jamwiki-core/src/test/resources/data/topics/Template_-_NumberedParams
    wiki/branches/wrh2/jamwiki-core/src/test/resources/data/topics/Template_-_Pipe
    wiki/branches/wrh2/jamwiki-core/src/test/resources/data/topics/Template_-_Switch
    wiki/branches/wrh2/jamwiki-core/src/test/resources/data/topics/Template_-_SwitchInclude
    wiki/branches/wrh2/jamwiki-core/src/test/resources/data/topics/Transclusion1
    wiki/branches/wrh2/jamwiki-core/src/test/resources/data/topics/VirtualWiki1
    wiki/branches/wrh2/jamwiki-core/src/test/resources/data/topics/WikiList1
    wiki/branches/wrh2/jamwiki-war/src/main/resources/logback.xml
    wiki/branches/wrh2/jamwiki-war/src/main/webapp/WEB-INF/tags/
    wiki/branches/wrh2/jamwiki-war/src/main/webapp/WEB-INF/tags/userLinks.tag

Removed Paths:
-------------
    wiki/branches/wrh2/jamwiki-core/src/main/java/org/jamwiki/utils/ImageDimensions.java
    wiki/branches/wrh2/jamwiki-core/src/main/java/org/jamwiki/utils/InterWikiHandler.java
    wiki/branches/wrh2/jamwiki-core/src/main/java/org/jamwiki/utils/WikiLogFormatter.java
    wiki/branches/wrh2/jamwiki-core/src/test/java/org/jamwiki/utils/InterWikiHandlerTest.java
    wiki/branches/wrh2/jamwiki-core/src/test/java/org/jamwiki/utils/WikiLogFormatterTest.java
    wiki/branches/wrh2/jamwiki-core/src/test/java/org/jamwiki/utils/WikiLoggerTest.java
    wiki/branches/wrh2/jamwiki-core/src/test/resources/interwiki.properties
    wiki/branches/wrh2/jamwiki-war/src/main/resources/interwiki.properties
    wiki/branches/wrh2/jamwiki-war/src/main/resources/logging.properties
    wiki/branches/wrh2/jamwiki-war/src/main/webapp/WEB-INF/jsp/linkto.jsp
    wiki/branches/wrh2/jamwiki-war/src/main/webapp/WEB-INF/tags/userLinks.tag
    wiki/branches/wrh2/jamwiki-web/src/main/java/org/jamwiki/servlets/LinkToServlet.java
    wiki/branches/wrh2/jamwiki-web/src/main/java/org/jamwiki/taglib/AlternateTag.java

Property Changed:
----------------
    wiki/branches/wrh2/


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Jamwiki-commit] SF.net SVN: jamwiki:[3261] wiki/branches/wrh2

From: <wrh2@us...> - 2010-11-11 05:02

Revision: 3261
          http://jamwiki.svn.sourceforge.net/jamwiki/?rev=3261&view=rev
Author:   wrh2
Date:     2010-11-11 05:02:36 +0000 (Thu, 11 Nov 2010)

Log Message:
-----------
Merge:
  * Merge changes from trunk to the wrh2 branch.

Modified Paths:
--------------
    wiki/branches/wrh2/jamwiki-core/src/main/java/org/jamwiki/model/TopicType.java
    wiki/branches/wrh2/jamwiki-core/src/main/java/org/jamwiki/utils/SortedProperties.java
    wiki/branches/wrh2/jamwiki-core/src/main/java/org/jamwiki/utils/Utilities.java
    wiki/branches/wrh2/jamwiki-core/src/main/resources/pages/LeftMenu.txt
    wiki/branches/wrh2/jamwiki-core/src/main/resources/pages/StartingPoints.txt
    wiki/branches/wrh2/jamwiki-core/src/main/resources/pages/de/LeftMenu.txt
    wiki/branches/wrh2/jamwiki-core/src/main/resources/pages/de/StartingPoints.txt
    wiki/branches/wrh2/jamwiki-core/src/main/resources/pages/es/LeftMenu.txt
    wiki/branches/wrh2/jamwiki-core/src/main/resources/pages/es/StartingPoints.txt
    wiki/branches/wrh2/jamwiki-core/src/main/resources/pages/gl/LeftMenu.txt
    wiki/branches/wrh2/jamwiki-core/src/main/resources/pages/gl/StartingPoints.txt
    wiki/branches/wrh2/jamwiki-core/src/main/resources/pages/hu/LeftMenu.txt
    wiki/branches/wrh2/jamwiki-core/src/main/resources/pages/hu/StartingPoints.txt
    wiki/branches/wrh2/jamwiki-core/src/main/resources/pages/ja/LeftMenu.txt
    wiki/branches/wrh2/jamwiki-core/src/main/resources/pages/ja/StartingPoints.txt
    wiki/branches/wrh2/jamwiki-core/src/main/resources/pages/ru/LeftMenu.txt
    wiki/branches/wrh2/jamwiki-core/src/main/resources/pages/zh-TW/LeftMenu.txt
    wiki/branches/wrh2/jamwiki-core/src/main/resources/pages/zh-TW/StartingPoints.txt
    wiki/branches/wrh2/jamwiki-core/src/test/resources/jamwiki-configuration.xml
    wiki/branches/wrh2/jamwiki-war/src/main/resources/jamwiki-configuration.xml
    wiki/branches/wrh2/jamwiki-war/src/main/webapp/CHANGELOG.txt
    wiki/branches/wrh2/jamwiki-war/src/main/webapp/WEB-INF/jamwiki-servlet.xml
    wiki/branches/wrh2/jamwiki-war/src/main/webapp/WEB-INF/jsp/all-special-pages.jsp
    wiki/branches/wrh2/jamwiki-web/src/main/java/org/jamwiki/servlets/ItemsServlet.java
    wiki/branches/wrh2/jamwiki-web/src/main/java/org/jamwiki/servlets/JAMWikiServlet.java
    wiki/branches/wrh2/pom.xml

Property Changed:
----------------
    wiki/branches/wrh2/


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Jamwiki-commit] SF.net SVN: jamwiki:[3263] wiki/branches/wrh2

From: <wrh2@us...> - 2010-11-12 05:03

Revision: 3263
          http://jamwiki.svn.sourceforge.net/jamwiki/?rev=3263&view=rev
Author:   wrh2
Date:     2010-11-12 05:03:14 +0000 (Fri, 12 Nov 2010)

Log Message:
-----------
Merge:
  * Merge changes from trunk to the wrh2 branch.

Modified Paths:
--------------
    wiki/branches/wrh2/jamwiki-war/src/main/resources/jamwiki-configuration.xml

Property Changed:
----------------
    wiki/branches/wrh2/


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Jamwiki-commit] SF.net SVN: jamwiki:[3373] wiki/branches/wrh2

From: <wrh2@us...> - 2010-12-31 02:09

Revision: 3373
          http://jamwiki.svn.sourceforge.net/jamwiki/?rev=3373&view=rev
Author:   wrh2
Date:     2010-12-31 02:09:10 +0000 (Fri, 31 Dec 2010)

Log Message:
-----------
FCKEditor:
  * Commit local changes that have been pending for some time.  This code may
    never actually get committed due to issues with metadata and other content,
    but for now let's keep it in the repository.

Modified Paths:
--------------
    wiki/branches/wrh2/jamwiki-war/src/main/webapp/WEB-INF/jsp/edit.jsp
    wiki/branches/wrh2/jamwiki-war/src/main/webapp/js/fckeditor-jamwiki.js
    wiki/branches/wrh2/jamwiki-web/src/main/java/org/jamwiki/servlets/EditServlet.java


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Jamwiki-commit] SF.net SVN: jamwiki:[3374] wiki/branches/wrh2

From: <wrh2@us...> - 2010-12-31 02:26

Revision: 3374
          http://jamwiki.svn.sourceforge.net/jamwiki/?rev=3374&view=rev
Author:   wrh2
Date:     2010-12-31 02:26:41 +0000 (Fri, 31 Dec 2010)

Log Message:
-----------
Cleanup:
  * Move everything in the wrh2 branch to a fckeditor sub-folder since current
    changes are all related to integrating a WYSIWYG editor.

Added Paths:
-----------
    wiki/branches/wrh2/fckeditor/
    wiki/branches/wrh2/fckeditor/addons/
    wiki/branches/wrh2/fckeditor/jamwiki-core/
    wiki/branches/wrh2/fckeditor/jamwiki-war/
    wiki/branches/wrh2/fckeditor/jamwiki-web/
    wiki/branches/wrh2/fckeditor/javadiff/
    wiki/branches/wrh2/fckeditor/pmd.xml
    wiki/branches/wrh2/fckeditor/pom.xml
    wiki/branches/wrh2/fckeditor/repository/

Removed Paths:
-------------
    wiki/branches/wrh2/addons/
    wiki/branches/wrh2/jamwiki-core/
    wiki/branches/wrh2/jamwiki-war/
    wiki/branches/wrh2/jamwiki-web/
    wiki/branches/wrh2/javadiff/
    wiki/branches/wrh2/pmd.xml
    wiki/branches/wrh2/pom.xml
    wiki/branches/wrh2/repository/


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.