[Jamwiki-commit] SF.net SVN: jamwiki:[2878] wiki/branches/wrh2
Brought to you by:
wrh2
From: <wr...@us...> - 2010-02-11 05:45:47
|
Revision: 2878 http://jamwiki.svn.sourceforge.net/jamwiki/?rev=2878&view=rev Author: wrh2 Date: 2010-02-11 05:45:39 +0000 (Thu, 11 Feb 2010) Log Message: ----------- Merge: * Merge trunk changes to wrh2 branch. Modified Paths: -------------- wiki/branches/wrh2/addons/bliki-parser/src/main/java/org/jamwiki/parser/bliki/BlikiParser.java wiki/branches/wrh2/addons/bliki-parser/src/main/java/org/jamwiki/parser/bliki/JAMWikiModel.java wiki/branches/wrh2/jamwiki-core/src/main/java/org/jamwiki/DataHandler.java wiki/branches/wrh2/jamwiki-core/src/main/java/org/jamwiki/Environment.java wiki/branches/wrh2/jamwiki-core/src/main/java/org/jamwiki/migrate/MigrationUtil.java wiki/branches/wrh2/jamwiki-core/src/main/java/org/jamwiki/model/RecentChange.java wiki/branches/wrh2/jamwiki-core/src/main/java/org/jamwiki/model/RoleMap.java wiki/branches/wrh2/jamwiki-core/src/main/java/org/jamwiki/parser/ParserException.java wiki/branches/wrh2/jamwiki-core/src/main/java/org/jamwiki/parser/TableOfContents.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/IncludeOnlyTag.java wiki/branches/wrh2/jamwiki-core/src/main/java/org/jamwiki/parser/jflex/JFlexLexer.java wiki/branches/wrh2/jamwiki-core/src/main/java/org/jamwiki/parser/jflex/JFlexParser.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/JFlexTagItem.java wiki/branches/wrh2/jamwiki-core/src/main/java/org/jamwiki/parser/jflex/NoIncludeTag.java wiki/branches/wrh2/jamwiki-core/src/main/java/org/jamwiki/parser/jflex/ParserFunctionUtil.java wiki/branches/wrh2/jamwiki-core/src/main/java/org/jamwiki/parser/jflex/TemplateTag.java wiki/branches/wrh2/jamwiki-core/src/main/java/org/jamwiki/parser/jflex/WikiHeadingTag.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/parser/jflex/WikiReferenceTag.java wiki/branches/wrh2/jamwiki-core/src/main/java/org/jamwiki/parser/jflex/WikiReferencesTag.java wiki/branches/wrh2/jamwiki-core/src/main/java/org/jamwiki/parser/jflex/WikiSignatureTag.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/Encryption.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/TiddlyWiki2MediaWikiTranslator.java wiki/branches/wrh2/jamwiki-core/src/main/java/org/jamwiki/utils/TiddlyWikiParser.java wiki/branches/wrh2/jamwiki-core/src/main/java/org/jamwiki/utils/Utilities.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/WikiLogFormatter.java wiki/branches/wrh2/jamwiki-core/src/main/java/org/jamwiki/utils/WikiLogger.java wiki/branches/wrh2/jamwiki-core/src/main/java/org/jamwiki/utils/XMLUtil.java wiki/branches/wrh2/jamwiki-core/src/main/jflex/jamwiki-postprocessor.jflex wiki/branches/wrh2/jamwiki-core/src/main/jflex/jamwiki-preprocessor.jflex wiki/branches/wrh2/jamwiki-core/src/main/jflex/jamwiki-processor.jflex wiki/branches/wrh2/jamwiki-core/src/main/jflex/jamwiki-spliceprocessor.jflex wiki/branches/wrh2/jamwiki-core/src/test/java/org/jamwiki/TestDataHandler.java wiki/branches/wrh2/jamwiki-core/src/test/java/org/jamwiki/TestFileUtil.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/ParserTest.java wiki/branches/wrh2/jamwiki-core/src/test/resources/data/results/HtmlNoAttributes1 wiki/branches/wrh2/jamwiki-core/src/test/resources/data/results/HtmlWithAttributes1 wiki/branches/wrh2/jamwiki-core/src/test/resources/data/results/HtmlXSS1 wiki/branches/wrh2/jamwiki-core/src/test/resources/data/results/Preformatted1 wiki/branches/wrh2/jamwiki-core/src/test/resources/data/results/Template5 wiki/branches/wrh2/jamwiki-core/src/test/resources/data/results/WikiLink1 wiki/branches/wrh2/jamwiki-core/src/test/resources/data/topics/HtmlNoAttributes1 wiki/branches/wrh2/jamwiki-core/src/test/resources/data/topics/HtmlWithAttributes1 wiki/branches/wrh2/jamwiki-core/src/test/resources/data/topics/HtmlXSS1 wiki/branches/wrh2/jamwiki-core/src/test/resources/data/topics/Preformatted1 wiki/branches/wrh2/jamwiki-core/src/test/resources/data/topics/Template5 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_de.properties wiki/branches/wrh2/jamwiki-war/src/main/resources/ApplicationResources_fr.properties wiki/branches/wrh2/jamwiki-war/src/main/resources/ApplicationResources_ru.properties wiki/branches/wrh2/jamwiki-war/src/main/resources/pages/StartingPoints.txt wiki/branches/wrh2/jamwiki-war/src/main/resources/spam-blacklist.txt wiki/branches/wrh2/jamwiki-war/src/main/resources/sql.ansi.properties wiki/branches/wrh2/jamwiki-war/src/main/resources/sql.asa.properties wiki/branches/wrh2/jamwiki-war/src/main/resources/sql.db2.properties wiki/branches/wrh2/jamwiki-war/src/main/resources/sql.db2400.properties wiki/branches/wrh2/jamwiki-war/src/main/resources/sql.mssql.properties wiki/branches/wrh2/jamwiki-war/src/main/resources/sql.mysql.properties wiki/branches/wrh2/jamwiki-war/src/main/resources/sql.oracle.properties wiki/branches/wrh2/jamwiki-war/src/main/resources/sql.postgres.properties wiki/branches/wrh2/jamwiki-war/src/main/webapp/CHANGELOG.txt wiki/branches/wrh2/jamwiki-war/src/main/webapp/UPGRADE.txt wiki/branches/wrh2/jamwiki-war/src/main/webapp/WEB-INF/jamwiki-servlet.xml 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.jsp wiki/branches/wrh2/jamwiki-web/src/main/java/org/jamwiki/db/AnsiDataHandler.java wiki/branches/wrh2/jamwiki-web/src/main/java/org/jamwiki/db/AnsiQueryHandler.java wiki/branches/wrh2/jamwiki-web/src/main/java/org/jamwiki/db/DB2400QueryHandler.java wiki/branches/wrh2/jamwiki-web/src/main/java/org/jamwiki/db/DB2QueryHandler.java wiki/branches/wrh2/jamwiki-web/src/main/java/org/jamwiki/db/DatabaseConnection.java wiki/branches/wrh2/jamwiki-web/src/main/java/org/jamwiki/db/DatabaseUpgrades.java wiki/branches/wrh2/jamwiki-web/src/main/java/org/jamwiki/db/OracleQueryHandler.java wiki/branches/wrh2/jamwiki-web/src/main/java/org/jamwiki/db/QueryHandler.java wiki/branches/wrh2/jamwiki-web/src/main/java/org/jamwiki/db/WikiDatabase.java wiki/branches/wrh2/jamwiki-web/src/main/java/org/jamwiki/search/LuceneSearchEngine.java wiki/branches/wrh2/jamwiki-web/src/main/java/org/jamwiki/servlets/AdminServlet.java wiki/branches/wrh2/jamwiki-web/src/main/java/org/jamwiki/servlets/ExportServlet.java wiki/branches/wrh2/jamwiki-web/src/main/java/org/jamwiki/servlets/ImportServlet.java wiki/branches/wrh2/jamwiki-web/src/main/java/org/jamwiki/servlets/ItemsServlet.java wiki/branches/wrh2/jamwiki-web/src/main/java/org/jamwiki/servlets/LoginServlet.java wiki/branches/wrh2/jamwiki-web/src/main/java/org/jamwiki/servlets/UpgradeServlet.java wiki/branches/wrh2/jamwiki-web/src/main/java/org/jamwiki/taglib/AbstractButtonTag.java wiki/branches/wrh2/jamwiki-web/src/main/java/org/jamwiki/taglib/AuthMsgTag.java wiki/branches/wrh2/jamwiki-web/src/main/java/org/jamwiki/taglib/EditCommentTag.java wiki/branches/wrh2/jamwiki-web/src/main/java/org/jamwiki/taglib/PaginationTag.java wiki/branches/wrh2/jamwiki-web/src/main/java/org/jamwiki/taglib/TextTag.java wiki/branches/wrh2/javadiff/src/main/java/org/incava/util/diff/Difference.java wiki/branches/wrh2/pom.xml Added Paths: ----------- wiki/branches/wrh2/jamwiki-core/src/main/java/org/jamwiki/migrate/MediaWikiConstants.java wiki/branches/wrh2/jamwiki-core/src/main/java/org/jamwiki/migrate/MediaWikiXmlExporter.java wiki/branches/wrh2/jamwiki-core/src/main/java/org/jamwiki/migrate/MediaWikiXmlImporter.java wiki/branches/wrh2/jamwiki-core/src/main/java/org/jamwiki/migrate/TopicExporter.java wiki/branches/wrh2/jamwiki-core/src/main/java/org/jamwiki/migrate/TopicImporter.java wiki/branches/wrh2/jamwiki-core/src/main/java/org/jamwiki/parser/jflex/HtmlTagItem.java wiki/branches/wrh2/jamwiki-core/src/main/java/org/jamwiki/parser/jflex/JFlexParserTag.java wiki/branches/wrh2/jamwiki-core/src/main/java/org/jamwiki/parser/jflex/JavascriptTag.java wiki/branches/wrh2/jamwiki-core/src/main/java/org/jamwiki/parser/jflex/WikiBoldItalicTag.java wiki/branches/wrh2/jamwiki-core/src/main/jflex/jamwiki-html-processor.jflex wiki/branches/wrh2/jamwiki-core/src/test/resources/data/javascript/ wiki/branches/wrh2/jamwiki-core/src/test/resources/data/javascript/Javascript wiki/branches/wrh2/jamwiki-core/src/test/resources/data/results/HtmlDivTags wiki/branches/wrh2/jamwiki-core/src/test/resources/data/results/HtmlList2 wiki/branches/wrh2/jamwiki-core/src/test/resources/data/results/Javascript wiki/branches/wrh2/jamwiki-core/src/test/resources/data/results/Paragraph16 wiki/branches/wrh2/jamwiki-core/src/test/resources/data/results/Table15 wiki/branches/wrh2/jamwiki-core/src/test/resources/data/results/Table16 wiki/branches/wrh2/jamwiki-core/src/test/resources/data/results/Template_-_Expr wiki/branches/wrh2/jamwiki-core/src/test/resources/data/topics/HtmlDivTags wiki/branches/wrh2/jamwiki-core/src/test/resources/data/topics/HtmlList2 wiki/branches/wrh2/jamwiki-core/src/test/resources/data/topics/Javascript wiki/branches/wrh2/jamwiki-core/src/test/resources/data/topics/Paragraph16 wiki/branches/wrh2/jamwiki-core/src/test/resources/data/topics/Table15 wiki/branches/wrh2/jamwiki-core/src/test/resources/data/topics/Table16 wiki/branches/wrh2/jamwiki-core/src/test/resources/data/topics/Template_-_Embed wiki/branches/wrh2/jamwiki-core/src/test/resources/data/topics/Template_-_Expr wiki/branches/wrh2/jamwiki-war/src/main/resources/ehcache-sample.xml wiki/branches/wrh2/jamwiki-war/src/main/resources/ehcache.xsd Removed Paths: ------------- wiki/branches/wrh2/jamwiki-core/src/main/java/org/jamwiki/migrate/MediaWikiXmlMigrator.java wiki/branches/wrh2/jamwiki-core/src/main/java/org/jamwiki/migrate/Migrator.java wiki/branches/wrh2/jamwiki-core/src/test/resources/data/javascript/Javascript wiki/branches/wrh2/jamwiki-core/src/test/resources/data/results/HtmlNoAttributes2 wiki/branches/wrh2/jamwiki-core/src/test/resources/data/results/HtmlNoAttributes3 wiki/branches/wrh2/jamwiki-core/src/test/resources/data/results/HtmlWithAttributes2 wiki/branches/wrh2/jamwiki-core/src/test/resources/data/results/HtmlWithAttributes3 wiki/branches/wrh2/jamwiki-core/src/test/resources/data/results/HtmlXSS2 wiki/branches/wrh2/jamwiki-core/src/test/resources/data/topics/HtmlNoAttributes2 wiki/branches/wrh2/jamwiki-core/src/test/resources/data/topics/HtmlNoAttributes3 wiki/branches/wrh2/jamwiki-core/src/test/resources/data/topics/HtmlWithAttributes2 wiki/branches/wrh2/jamwiki-core/src/test/resources/data/topics/HtmlWithAttributes3 wiki/branches/wrh2/jamwiki-core/src/test/resources/data/topics/HtmlXSS2 wiki/branches/wrh2/jamwiki-web/src/main/java/org/jamwiki/db/WikiPreparedStatement.java wiki/branches/wrh2/jamwiki-web/src/main/java/org/jamwiki/db/WikiResultSet.java Property Changed: ---------------- wiki/branches/wrh2/ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |