[Jamwiki-commit] SF.net SVN: jamwiki:[4183] wiki/branches/cclavadetscher
Brought to you by:
wrh2
From: <ccl...@us...> - 2012-09-24 09:20:43
|
Revision: 4183 http://jamwiki.svn.sourceforge.net/jamwiki/?rev=4183&view=rev Author: cclavadetscher Date: 2012-09-24 09:20:36 +0000 (Mon, 24 Sep 2012) Log Message: ----------- Synchronization: Merged trunk to branches/cclavadetscher. Modified Paths: -------------- wiki/branches/cclavadetscher/jamwiki-core/src/main/java/org/jamwiki/Environment.java wiki/branches/cclavadetscher/jamwiki-core/src/main/java/org/jamwiki/WikiBase.java wiki/branches/cclavadetscher/jamwiki-core/src/main/java/org/jamwiki/WikiConfiguration.java wiki/branches/cclavadetscher/jamwiki-core/src/main/java/org/jamwiki/db/AnsiDataHandler.java wiki/branches/cclavadetscher/jamwiki-core/src/main/java/org/jamwiki/db/AnsiQueryHandler.java wiki/branches/cclavadetscher/jamwiki-core/src/main/java/org/jamwiki/db/CacheQueryHandler.java wiki/branches/cclavadetscher/jamwiki-core/src/main/java/org/jamwiki/db/DB2400QueryHandler.java wiki/branches/cclavadetscher/jamwiki-core/src/main/java/org/jamwiki/db/DB2QueryHandler.java wiki/branches/cclavadetscher/jamwiki-core/src/main/java/org/jamwiki/db/DatabaseConnection.java wiki/branches/cclavadetscher/jamwiki-core/src/main/java/org/jamwiki/db/DatabaseUpgrades.java wiki/branches/cclavadetscher/jamwiki-core/src/main/java/org/jamwiki/db/H2QueryHandler.java wiki/branches/cclavadetscher/jamwiki-core/src/main/java/org/jamwiki/db/HSqlQueryHandler.java wiki/branches/cclavadetscher/jamwiki-core/src/main/java/org/jamwiki/db/LocalDataSource.java wiki/branches/cclavadetscher/jamwiki-core/src/main/java/org/jamwiki/db/MSSqlQueryHandler.java wiki/branches/cclavadetscher/jamwiki-core/src/main/java/org/jamwiki/db/MySqlQueryHandler.java wiki/branches/cclavadetscher/jamwiki-core/src/main/java/org/jamwiki/db/OracleQueryHandler.java wiki/branches/cclavadetscher/jamwiki-core/src/main/java/org/jamwiki/db/PostgresQueryHandler.java wiki/branches/cclavadetscher/jamwiki-core/src/main/java/org/jamwiki/db/QueryHandler.java wiki/branches/cclavadetscher/jamwiki-core/src/main/java/org/jamwiki/db/SybaseASAQueryHandler.java wiki/branches/cclavadetscher/jamwiki-core/src/main/java/org/jamwiki/db/WikiDatabase.java wiki/branches/cclavadetscher/jamwiki-core/src/main/java/org/jamwiki/db/package.html wiki/branches/cclavadetscher/jamwiki-core/src/main/java/org/jamwiki/model/GroupMap.java wiki/branches/cclavadetscher/jamwiki-core/src/main/java/org/jamwiki/model/Namespace.java wiki/branches/cclavadetscher/jamwiki-core/src/main/java/org/jamwiki/model/WikiUser.java wiki/branches/cclavadetscher/jamwiki-core/src/main/java/org/jamwiki/parser/ParserOutput.java wiki/branches/cclavadetscher/jamwiki-core/src/main/java/org/jamwiki/parser/ParserUtil.java wiki/branches/cclavadetscher/jamwiki-core/src/main/java/org/jamwiki/parser/jflex/AbstractHeadingTag.java wiki/branches/cclavadetscher/jamwiki-core/src/main/java/org/jamwiki/parser/jflex/AbstractJAMWikiHtmlTagLexer.java wiki/branches/cclavadetscher/jamwiki-core/src/main/java/org/jamwiki/parser/jflex/HtmlTagItem.java wiki/branches/cclavadetscher/jamwiki-core/src/main/java/org/jamwiki/parser/jflex/JFlexCustomTagItem.java wiki/branches/cclavadetscher/jamwiki-core/src/main/java/org/jamwiki/parser/jflex/JFlexParser.java wiki/branches/cclavadetscher/jamwiki-core/src/main/java/org/jamwiki/parser/jflex/WikiSignatureTag.java wiki/branches/cclavadetscher/jamwiki-core/src/main/java/org/jamwiki/parser/package.html wiki/branches/cclavadetscher/jamwiki-core/src/main/java/org/jamwiki/utils/WikiUtil.java wiki/branches/cclavadetscher/jamwiki-core/src/main/jflex/jamwiki-html-processor.jflex wiki/branches/cclavadetscher/jamwiki-core/src/main/resources/pages/JAMWiki%3ASystem.css.txt wiki/branches/cclavadetscher/jamwiki-core/src/main/resources/sql/sql.ansi.properties wiki/branches/cclavadetscher/jamwiki-core/src/main/resources/sql/sql.db2.properties wiki/branches/cclavadetscher/jamwiki-core/src/main/resources/sql/sql.db2400.properties wiki/branches/cclavadetscher/jamwiki-core/src/main/resources/sql/sql.postgres.properties wiki/branches/cclavadetscher/jamwiki-core/src/test/resources/ApplicationResources.properties wiki/branches/cclavadetscher/jamwiki-war/src/main/resources/ApplicationResources.properties wiki/branches/cclavadetscher/jamwiki-war/src/main/resources/ApplicationResources_da.properties wiki/branches/cclavadetscher/jamwiki-war/src/main/resources/ApplicationResources_de.properties wiki/branches/cclavadetscher/jamwiki-war/src/main/resources/ApplicationResources_es.properties wiki/branches/cclavadetscher/jamwiki-war/src/main/resources/ApplicationResources_fr.properties wiki/branches/cclavadetscher/jamwiki-war/src/main/resources/ApplicationResources_gl.properties wiki/branches/cclavadetscher/jamwiki-war/src/main/resources/ApplicationResources_hr.properties wiki/branches/cclavadetscher/jamwiki-war/src/main/resources/ApplicationResources_hu.properties wiki/branches/cclavadetscher/jamwiki-war/src/main/resources/ApplicationResources_it.properties wiki/branches/cclavadetscher/jamwiki-war/src/main/resources/ApplicationResources_ja.properties wiki/branches/cclavadetscher/jamwiki-war/src/main/resources/ApplicationResources_nl.properties wiki/branches/cclavadetscher/jamwiki-war/src/main/resources/ApplicationResources_no.properties wiki/branches/cclavadetscher/jamwiki-war/src/main/resources/ApplicationResources_pl.properties wiki/branches/cclavadetscher/jamwiki-war/src/main/resources/ApplicationResources_pt.properties wiki/branches/cclavadetscher/jamwiki-war/src/main/resources/ApplicationResources_pt_BR.properties wiki/branches/cclavadetscher/jamwiki-war/src/main/resources/ApplicationResources_ru.properties wiki/branches/cclavadetscher/jamwiki-war/src/main/resources/ApplicationResources_si_LK.properties wiki/branches/cclavadetscher/jamwiki-war/src/main/resources/ApplicationResources_sk.properties wiki/branches/cclavadetscher/jamwiki-war/src/main/resources/ApplicationResources_sv.properties wiki/branches/cclavadetscher/jamwiki-war/src/main/resources/ApplicationResources_uk.properties wiki/branches/cclavadetscher/jamwiki-war/src/main/resources/ApplicationResources_zh_CN.properties wiki/branches/cclavadetscher/jamwiki-war/src/main/resources/ApplicationResources_zh_TW.properties wiki/branches/cclavadetscher/jamwiki-war/src/main/webapp/CHANGELOG.txt wiki/branches/cclavadetscher/jamwiki-war/src/main/webapp/CREDITS.txt wiki/branches/cclavadetscher/jamwiki-war/src/main/webapp/UPGRADE.txt wiki/branches/cclavadetscher/jamwiki-war/src/main/webapp/WEB-INF/jsp/admin-maintenance.jsp wiki/branches/cclavadetscher/jamwiki-war/src/main/webapp/WEB-INF/jsp/admin.jsp wiki/branches/cclavadetscher/jamwiki-war/src/main/webapp/WEB-INF/jsp/setup.jsp wiki/branches/cclavadetscher/jamwiki-war/src/main/webapp/WEB-INF/jsp/shared-db-javascript.jsp wiki/branches/cclavadetscher/jamwiki-war/src/main/webapp/WEB-INF/jsp/view-topic-include.jsp wiki/branches/cclavadetscher/jamwiki-web/src/main/java/org/jamwiki/servlets/AdminServlet.java wiki/branches/cclavadetscher/jamwiki-web/src/main/java/org/jamwiki/servlets/RegisterServlet.java wiki/branches/cclavadetscher/jamwiki-web/src/main/java/org/jamwiki/servlets/ServletUtil.java wiki/branches/cclavadetscher/jamwiki-web/src/main/java/org/jamwiki/servlets/SetupServlet.java wiki/branches/cclavadetscher/jamwiki-web/src/main/java/org/jamwiki/servlets/UpgradeServlet.java wiki/branches/cclavadetscher/jamwiki-web/src/main/java/org/jamwiki/validator/HoneypotValidator.java wiki/branches/cclavadetscher/jamwiki-web/src/main/java/org/jamwiki/web/utils/UserPreferencesUtil.java wiki/branches/cclavadetscher/pom.xml Added Paths: ----------- wiki/branches/cclavadetscher/addons/jamwiki-jflex-parser-tags/src/test/resources/setup/jamwiki-configuration-1.3.xml wiki/branches/cclavadetscher/jamwiki-core/src/main/resources/setup/jamwiki-configuration-1.3.xml wiki/branches/cclavadetscher/jamwiki-core/src/main/resources/setup/jamwiki-configuration-1.3.xsd wiki/branches/cclavadetscher/jamwiki-war/src/main/resources/ApplicationResources_cs.properties Removed Paths: ------------- wiki/branches/cclavadetscher/addons/jamwiki-jflex-parser-tags/src/test/resources/setup/jamwiki-configuration.xml wiki/branches/cclavadetscher/jamwiki-core/src/main/java/org/jamwiki/DataHandler.java wiki/branches/cclavadetscher/jamwiki-core/src/main/java/org/jamwiki/db/CacheDataHandler.java wiki/branches/cclavadetscher/jamwiki-core/src/main/java/org/jamwiki/db/DB2400DataHandler.java wiki/branches/cclavadetscher/jamwiki-core/src/main/java/org/jamwiki/db/DB2DataHandler.java wiki/branches/cclavadetscher/jamwiki-core/src/main/java/org/jamwiki/db/H2DataHandler.java wiki/branches/cclavadetscher/jamwiki-core/src/main/java/org/jamwiki/db/HSqlDataHandler.java wiki/branches/cclavadetscher/jamwiki-core/src/main/java/org/jamwiki/db/MSSqlDataHandler.java wiki/branches/cclavadetscher/jamwiki-core/src/main/java/org/jamwiki/db/MySqlDataHandler.java wiki/branches/cclavadetscher/jamwiki-core/src/main/java/org/jamwiki/db/OracleDataHandler.java wiki/branches/cclavadetscher/jamwiki-core/src/main/java/org/jamwiki/db/PostgresDataHandler.java wiki/branches/cclavadetscher/jamwiki-core/src/main/java/org/jamwiki/db/SybaseASADataHandler.java wiki/branches/cclavadetscher/jamwiki-core/src/main/resources/setup/jamwiki-configuration-1.2.xsd wiki/branches/cclavadetscher/jamwiki-core/src/main/resources/setup/jamwiki-configuration.xml Property Changed: ---------------- wiki/branches/cclavadetscher/ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |