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

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

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.