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

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

Revision: 3089
          http://jamwiki.svn.sourceforge.net/jamwiki/?rev=3089&view=rev
Author:   wrh2
Date:     2010-06-10 04:25:13 +0000 (Thu, 10 Jun 2010)

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

Modified Paths:
--------------
    wiki/trunk/addons/bliki-parser/pom.xml
    wiki/trunk/addons/pom.xml
    wiki/trunk/jamwiki-core/pom.xml
    wiki/trunk/jamwiki-core/src/main/java/org/jamwiki/DataHandler.java
    wiki/trunk/jamwiki-core/src/main/java/org/jamwiki/SearchEngine.java
    wiki/trunk/jamwiki-core/src/main/java/org/jamwiki/WikiVersion.java
    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/DatabaseUpgrades.java
    wiki/trunk/jamwiki-core/src/main/java/org/jamwiki/db/QueryHandler.java
    wiki/trunk/jamwiki-core/src/main/java/org/jamwiki/db/WikiDatabase.java
    wiki/trunk/jamwiki-core/src/main/java/org/jamwiki/parser/ParserOutput.java
    wiki/trunk/jamwiki-core/src/main/java/org/jamwiki/parser/jflex/WikiLinkTag.java
    wiki/trunk/jamwiki-core/src/main/resources/sql.ansi.properties
    wiki/trunk/jamwiki-core/src/main/resources/sql.hsql.properties
    wiki/trunk/jamwiki-core/src/test/java/org/jamwiki/TestSearchEngine.java
    wiki/trunk/jamwiki-core/src/test/resources/jamwiki.properties
    wiki/trunk/jamwiki-war/pom.xml
    wiki/trunk/jamwiki-war/src/main/resources/ApplicationResources.properties
    wiki/trunk/jamwiki-war/src/main/resources/ApplicationResources_de.properties
    wiki/trunk/jamwiki-war/src/main/resources/ApplicationResources_pl.properties
    wiki/trunk/jamwiki-war/src/main/resources/ApplicationResources_ru.properties
    wiki/trunk/jamwiki-war/src/main/resources/ApplicationResources_si_LK.properties
    wiki/trunk/jamwiki-war/src/main/webapp/CHANGELOG.txt
    wiki/trunk/jamwiki-war/src/main/webapp/UPGRADE.txt
    wiki/trunk/jamwiki-war/src/main/webapp/WEB-INF/jsp/admin-maintenance.jsp
    wiki/trunk/jamwiki-war/src/main/webapp/WEB-INF/jsp/linkto.jsp
    wiki/trunk/jamwiki-web/pom.xml
    wiki/trunk/jamwiki-web/src/main/java/org/jamwiki/search/LuceneSearchEngine.java
    wiki/trunk/jamwiki-web/src/main/java/org/jamwiki/servlets/AdminServlet.java
    wiki/trunk/jamwiki-web/src/main/java/org/jamwiki/servlets/ItemsServlet.java
    wiki/trunk/jamwiki-web/src/main/java/org/jamwiki/servlets/LinkToServlet.java
    wiki/trunk/jamwiki-web/src/main/java/org/jamwiki/servlets/UpgradeServlet.java
    wiki/trunk/javadiff/pom.xml
    wiki/trunk/pom.xml

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


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