[Jamwiki-commit] SF.net SVN: jamwiki:[2955] wiki/trunk
Brought to you by:
wrh2
Menu
▾
▴
[Jamwiki-commit] SF.net SVN: jamwiki:[2955] wiki/trunk
|
From: <wr...@us...> - 2010-03-19 02:55:45
|
Revision: 2955
http://jamwiki.svn.sourceforge.net/jamwiki/?rev=2955&view=rev
Author: wrh2
Date: 2010-03-19 02:55:38 +0000 (Fri, 19 Mar 2010)
Log Message:
-----------
Merge:
* Merge namespace / virtual wiki / performance updates from the wrh2 branch.
* Use with caution. This works for me locally but still needs some polish.
Modified Paths:
--------------
wiki/trunk/addons/bliki-parser/src/main/java/org/jamwiki/parser/bliki/JAMHTMLConverter.java
wiki/trunk/addons/bliki-parser/src/main/java/org/jamwiki/parser/bliki/JAMWikiModel.java
wiki/trunk/jamwiki-core/src/main/java/org/jamwiki/DataAccessException.java
wiki/trunk/jamwiki-core/src/main/java/org/jamwiki/DataHandler.java
wiki/trunk/jamwiki-core/src/main/java/org/jamwiki/Environment.java
wiki/trunk/jamwiki-core/src/main/java/org/jamwiki/WikiConfiguration.java
wiki/trunk/jamwiki-core/src/main/java/org/jamwiki/migrate/MediaWikiConstants.java
wiki/trunk/jamwiki-core/src/main/java/org/jamwiki/migrate/MediaWikiXmlExporter.java
wiki/trunk/jamwiki-core/src/main/java/org/jamwiki/migrate/MediaWikiXmlImporter.java
wiki/trunk/jamwiki-core/src/main/java/org/jamwiki/migrate/MigrationUtil.java
wiki/trunk/jamwiki-core/src/main/java/org/jamwiki/model/Category.java
wiki/trunk/jamwiki-core/src/main/java/org/jamwiki/model/Topic.java
wiki/trunk/jamwiki-core/src/main/java/org/jamwiki/parser/jflex/JFlexParser.java
wiki/trunk/jamwiki-core/src/main/java/org/jamwiki/parser/jflex/JFlexParserUtil.java
wiki/trunk/jamwiki-core/src/main/java/org/jamwiki/parser/jflex/MagicWordUtil.java
wiki/trunk/jamwiki-core/src/main/java/org/jamwiki/parser/jflex/ParserFunctionUtil.java
wiki/trunk/jamwiki-core/src/main/java/org/jamwiki/parser/jflex/TemplateTag.java
wiki/trunk/jamwiki-core/src/main/java/org/jamwiki/parser/jflex/WikiLinkTag.java
wiki/trunk/jamwiki-core/src/main/java/org/jamwiki/parser/jflex/WikiSignatureTag.java
wiki/trunk/jamwiki-core/src/main/java/org/jamwiki/utils/ImageUtil.java
wiki/trunk/jamwiki-core/src/main/java/org/jamwiki/utils/InterWikiHandler.java
wiki/trunk/jamwiki-core/src/main/java/org/jamwiki/utils/LinkUtil.java
wiki/trunk/jamwiki-core/src/main/java/org/jamwiki/utils/TiddlyWikiParser.java
wiki/trunk/jamwiki-core/src/main/java/org/jamwiki/utils/WikiCache.java
wiki/trunk/jamwiki-core/src/main/java/org/jamwiki/utils/WikiLink.java
wiki/trunk/jamwiki-core/src/main/java/org/jamwiki/utils/WikiUtil.java
wiki/trunk/jamwiki-core/src/test/java/org/jamwiki/TestDataHandler.java
wiki/trunk/jamwiki-core/src/test/java/org/jamwiki/utils/LinkUtilTest.java
wiki/trunk/jamwiki-core/src/test/java/org/jamwiki/utils/WikiLinkTest.java
wiki/trunk/jamwiki-core/src/test/java/org/jamwiki/utils/WikiUtilTest.java
wiki/trunk/jamwiki-core/src/test/resources/ApplicationResources.properties
wiki/trunk/jamwiki-core/src/test/resources/jamwiki-configuration.xml
wiki/trunk/jamwiki-war/src/main/resources/ApplicationResources.properties
wiki/trunk/jamwiki-war/src/main/resources/ApplicationResources_da.properties
wiki/trunk/jamwiki-war/src/main/resources/ApplicationResources_de.properties
wiki/trunk/jamwiki-war/src/main/resources/ApplicationResources_es.properties
wiki/trunk/jamwiki-war/src/main/resources/ApplicationResources_fr.properties
wiki/trunk/jamwiki-war/src/main/resources/ApplicationResources_gl.properties
wiki/trunk/jamwiki-war/src/main/resources/ApplicationResources_hr.properties
wiki/trunk/jamwiki-war/src/main/resources/ApplicationResources_hu.properties
wiki/trunk/jamwiki-war/src/main/resources/ApplicationResources_it.properties
wiki/trunk/jamwiki-war/src/main/resources/ApplicationResources_ja.properties
wiki/trunk/jamwiki-war/src/main/resources/ApplicationResources_nl.properties
wiki/trunk/jamwiki-war/src/main/resources/ApplicationResources_no.properties
wiki/trunk/jamwiki-war/src/main/resources/ApplicationResources_pl.properties
wiki/trunk/jamwiki-war/src/main/resources/ApplicationResources_pt.properties
wiki/trunk/jamwiki-war/src/main/resources/ApplicationResources_pt_BR.properties
wiki/trunk/jamwiki-war/src/main/resources/ApplicationResources_ru.properties
wiki/trunk/jamwiki-war/src/main/resources/ApplicationResources_sk.properties
wiki/trunk/jamwiki-war/src/main/resources/ApplicationResources_sv.properties
wiki/trunk/jamwiki-war/src/main/resources/ApplicationResources_uk.properties
wiki/trunk/jamwiki-war/src/main/resources/ApplicationResources_zh_CN.properties
wiki/trunk/jamwiki-war/src/main/resources/ApplicationResources_zh_TW.properties
wiki/trunk/jamwiki-war/src/main/resources/jamwiki-configuration.dtd
wiki/trunk/jamwiki-war/src/main/resources/jamwiki-configuration.xml
wiki/trunk/jamwiki-war/src/main/resources/pages/StyleSheet.txt
wiki/trunk/jamwiki-war/src/main/resources/sql.ansi.properties
wiki/trunk/jamwiki-war/src/main/resources/sql.asa.properties
wiki/trunk/jamwiki-war/src/main/resources/sql.db2.properties
wiki/trunk/jamwiki-war/src/main/resources/sql.db2400.properties
wiki/trunk/jamwiki-war/src/main/resources/sql.hsql.properties
wiki/trunk/jamwiki-war/src/main/resources/sql.mssql.properties
wiki/trunk/jamwiki-war/src/main/resources/sql.mysql.properties
wiki/trunk/jamwiki-war/src/main/resources/sql.oracle.properties
wiki/trunk/jamwiki-war/src/main/resources/sql.postgres.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/applicationContext-security.xml
wiki/trunk/jamwiki-war/src/main/webapp/WEB-INF/jamwiki-servlet.xml
wiki/trunk/jamwiki-war/src/main/webapp/WEB-INF/jsp/admin-maintenance.jsp
wiki/trunk/jamwiki-war/src/main/webapp/WEB-INF/jsp/admin-roles.jsp
wiki/trunk/jamwiki-war/src/main/webapp/WEB-INF/jsp/admin.jsp
wiki/trunk/jamwiki-war/src/main/webapp/WEB-INF/jsp/all-special-pages.jsp
wiki/trunk/jamwiki-web/src/main/java/org/jamwiki/db/AnsiDataHandler.java
wiki/trunk/jamwiki-web/src/main/java/org/jamwiki/db/AnsiQueryHandler.java
wiki/trunk/jamwiki-web/src/main/java/org/jamwiki/db/DB2400QueryHandler.java
wiki/trunk/jamwiki-web/src/main/java/org/jamwiki/db/DB2QueryHandler.java
wiki/trunk/jamwiki-web/src/main/java/org/jamwiki/db/DatabaseUpgrades.java
wiki/trunk/jamwiki-web/src/main/java/org/jamwiki/db/OracleQueryHandler.java
wiki/trunk/jamwiki-web/src/main/java/org/jamwiki/db/QueryHandler.java
wiki/trunk/jamwiki-web/src/main/java/org/jamwiki/db/WikiDatabase.java
wiki/trunk/jamwiki-web/src/main/java/org/jamwiki/servlets/AdminServlet.java
wiki/trunk/jamwiki-web/src/main/java/org/jamwiki/servlets/CategoryServlet.java
wiki/trunk/jamwiki-web/src/main/java/org/jamwiki/servlets/EditServlet.java
wiki/trunk/jamwiki-web/src/main/java/org/jamwiki/servlets/ItemsServlet.java
wiki/trunk/jamwiki-web/src/main/java/org/jamwiki/servlets/JAMWikiServlet.java
wiki/trunk/jamwiki-web/src/main/java/org/jamwiki/servlets/ManageServlet.java
wiki/trunk/jamwiki-web/src/main/java/org/jamwiki/servlets/MoveServlet.java
wiki/trunk/jamwiki-web/src/main/java/org/jamwiki/servlets/ServletUtil.java
wiki/trunk/jamwiki-web/src/main/java/org/jamwiki/servlets/TranslationServlet.java
wiki/trunk/jamwiki-web/src/main/java/org/jamwiki/servlets/UpgradeServlet.java
wiki/trunk/jamwiki-web/src/main/java/org/jamwiki/servlets/UploadServlet.java
wiki/trunk/jamwiki-web/src/main/java/org/jamwiki/servlets/WatchlistServlet.java
wiki/trunk/jamwiki-web/src/main/java/org/jamwiki/servlets/WikiPageInfo.java
wiki/trunk/jamwiki-web/src/main/java/org/jamwiki/taglib/EditCommentTag.java
wiki/trunk/jamwiki-web/src/main/java/org/jamwiki/taglib/LinkTag.java
wiki/trunk/jamwiki-web/src/main/java/org/jamwiki/taglib/PaginationTag.java
wiki/trunk/jamwiki-web/src/test/java/org/jamwiki/servlets/WikiPageInfoTest.java
Added Paths:
-----------
wiki/trunk/jamwiki-core/src/main/java/org/jamwiki/model/Namespace.java
wiki/trunk/jamwiki-core/src/main/java/org/jamwiki/model/TopicType.java
wiki/trunk/jamwiki-core/src/test/java/org/jamwiki/model/
wiki/trunk/jamwiki-core/src/test/java/org/jamwiki/model/NamespaceTest.java
wiki/trunk/jamwiki-war/src/main/webapp/WEB-INF/jsp/admin-virtual-wiki.jsp
wiki/trunk/jamwiki-web/src/main/java/org/jamwiki/servlets/AdminVirtualWikiServlet.java
Removed Paths:
-------------
wiki/trunk/jamwiki-core/src/main/java/org/jamwiki/utils/NamespaceHandler.java
wiki/trunk/jamwiki-core/src/test/java/org/jamwiki/model/NamespaceTest.java
wiki/trunk/jamwiki-core/src/test/java/org/jamwiki/utils/NamespaceHandlerTest.java
Property Changed:
----------------
wiki/trunk/
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
