[Jamwiki-commit] SF.net SVN: jamwiki:[2311] wiki/branches/release-0.6.7

[<wr...@us...>]

Revision: 2311
          http://jamwiki.svn.sourceforge.net/jamwiki/?rev=2311&view=rev
Author:   wrh2
Date:     2008-09-18 04:38:50 +0000 (Thu, 18 Sep 2008)

Log Message:
-----------
Merge bugfixes from trunk to 0.6.7.

Modified Paths:
--------------
    wiki/branches/release-0.6.7/addons/bliki-parser/src/main/java/org/jamwiki/parser/bliki/BlikiParser.java
    wiki/branches/release-0.6.7/addons/bliki-parser/src/main/java/org/jamwiki/parser/bliki/JAMWikiModel.java
    wiki/branches/release-0.6.7/jamwiki-core/src/main/java/org/jamwiki/model/WikiReference.java
    wiki/branches/release-0.6.7/jamwiki-core/src/main/java/org/jamwiki/parser/TableOfContents.java
    wiki/branches/release-0.6.7/jamwiki-core/src/main/java/org/jamwiki/parser/jflex/JFlexLexer.java
    wiki/branches/release-0.6.7/jamwiki-core/src/main/java/org/jamwiki/parser/jflex/JFlexParser.java
    wiki/branches/release-0.6.7/jamwiki-core/src/main/java/org/jamwiki/parser/jflex/TemplateTag.java
    wiki/branches/release-0.6.7/jamwiki-core/src/main/java/org/jamwiki/parser/jflex/WikiHeadingTag.java
    wiki/branches/release-0.6.7/jamwiki-core/src/main/java/org/jamwiki/parser/jflex/WikiLinkTag.java
    wiki/branches/release-0.6.7/jamwiki-core/src/main/java/org/jamwiki/utils/Encryption.java
    wiki/branches/release-0.6.7/jamwiki-core/src/main/java/org/jamwiki/utils/InterWikiHandler.java
    wiki/branches/release-0.6.7/jamwiki-core/src/main/java/org/jamwiki/utils/LinkUtil.java
    wiki/branches/release-0.6.7/jamwiki-core/src/main/java/org/jamwiki/utils/Utilities.java
    wiki/branches/release-0.6.7/jamwiki-core/src/main/java/org/jamwiki/utils/WikiLogger.java
    wiki/branches/release-0.6.7/jamwiki-core/src/main/java/org/jamwiki/utils/WikiUtil.java
    wiki/branches/release-0.6.7/jamwiki-core/src/test/java/org/jamwiki/utils/EncryptionTest.java
    wiki/branches/release-0.6.7/jamwiki-core/src/test/java/org/jamwiki/utils/UtilitiesTest.java
    wiki/branches/release-0.6.7/jamwiki-core/src/test/java/org/jamwiki/utils/WikiUtilTest.java
    wiki/branches/release-0.6.7/jamwiki-core/src/test/resources/data/results/WikiLink1
    wiki/branches/release-0.6.7/jamwiki-core/src/test/resources/data/topics/WikiLink1
    wiki/branches/release-0.6.7/jamwiki-war/src/main/resources/ApplicationResources_ja.properties
    wiki/branches/release-0.6.7/jamwiki-war/src/main/resources/ApplicationResources_pl.properties
    wiki/branches/release-0.6.7/jamwiki-war/src/main/resources/ApplicationResources_sv.properties
    wiki/branches/release-0.6.7/jamwiki-war/src/main/resources/ApplicationResources_zh_CN.properties
    wiki/branches/release-0.6.7/jamwiki-war/src/main/resources/spam-blacklist.txt
    wiki/branches/release-0.6.7/jamwiki-war/src/main/webapp/CREDITS.txt
    wiki/branches/release-0.6.7/jamwiki-web/src/main/java/org/jamwiki/db/WikiDatabase.java
    wiki/branches/release-0.6.7/jamwiki-web/src/main/java/org/jamwiki/db/WikiResultSet.java
    wiki/branches/release-0.6.7/jamwiki-web/src/main/java/org/jamwiki/servlets/AdminServlet.java
    wiki/branches/release-0.6.7/jamwiki-web/src/main/java/org/jamwiki/servlets/EditServlet.java
    wiki/branches/release-0.6.7/jamwiki-web/src/main/java/org/jamwiki/servlets/ManageServlet.java
    wiki/branches/release-0.6.7/jamwiki-web/src/main/java/org/jamwiki/servlets/MoveServlet.java
    wiki/branches/release-0.6.7/jamwiki-web/src/main/java/org/jamwiki/servlets/RecentChangesFeedServlet.java
    wiki/branches/release-0.6.7/jamwiki-web/src/main/java/org/jamwiki/servlets/ServletUtil.java
    wiki/branches/release-0.6.7/jamwiki-web/src/main/java/org/jamwiki/servlets/TranslationServlet.java
    wiki/branches/release-0.6.7/jamwiki-web/src/main/java/org/jamwiki/servlets/UploadServlet.java
    wiki/branches/release-0.6.7/pom.xml

Added Paths:
-----------
    wiki/branches/release-0.6.7/jamwiki-core/src/test/resources/data/results/Preformatted3
    wiki/branches/release-0.6.7/jamwiki-core/src/test/resources/data/topics/Preformatted3
    wiki/branches/release-0.6.7/jamwiki-war/src/main/resources/ApplicationResources_sk.properties

Property Changed:
----------------
    wiki/branches/release-0.6.7/
    wiki/branches/release-0.6.7/addons/bliki-parser/src/main/java/org/jamwiki/parser/bliki/


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