[Jamwiki-commit] SF.net SVN: jamwiki:[4307] wiki/trunk

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

Revision: 4307
          http://jamwiki.svn.sourceforge.net/jamwiki/?rev=4307&view=rev
Author:   wrh2
Date:     2013-03-08 05:03:01 +0000 (Fri, 08 Mar 2013)
Log Message:
-----------
Merge:
  * Merge changes from the pitpalme branch to trunk.  Changes from
    Peter Palmreuther (pitpalme)

Modified Paths:
--------------
    wiki/trunk/jamwiki-core/src/main/java/org/jamwiki/db/AnsiDataHandler.java
    wiki/trunk/jamwiki-core/src/main/java/org/jamwiki/db/AnsiQueryHandler.java
    wiki/trunk/jamwiki-core/src/main/java/org/jamwiki/db/DatabaseConnection.java
    wiki/trunk/jamwiki-core/src/main/java/org/jamwiki/parser/ParserInput.java
    wiki/trunk/jamwiki-core/src/main/java/org/jamwiki/utils/ResourceUtil.java
    wiki/trunk/jamwiki-core/src/test/java/org/jamwiki/utils/ResourceUtilTest.java
    wiki/trunk/jamwiki-core/src/test/resources/data/files/mediawiki-export-namespace-test.xml
    wiki/trunk/jamwiki-core/src/test/resources/data/files/mediawiki-export-one-topic-with-unsorted-history.xml
    wiki/trunk/jamwiki-core/src/test/resources/data/files/mediawiki-export-topic-name-with-question-mark.xml
    wiki/trunk/jamwiki-core/src/test/resources/data/files/mediawiki-export-two-topics-with-history.xml
    wiki/trunk/jamwiki-war/src/main/resources/ApplicationResources_de.properties

Added Paths:
-----------
    wiki/trunk/jamwiki-core/src/test/resources/StartingPoints.us-ascii.txt
    wiki/trunk/jamwiki-core/src/test/resources/StartingPoints.utf8-bom.txt
    wiki/trunk/jamwiki-core/src/test/resources/StartingPoints.utf8.txt

Property Changed:
----------------
    wiki/trunk/

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