Revision: 4172
http://jamwiki.svn.sourceforge.net/jamwiki/?rev=4172&view=rev
Author: philtrimble
Date: 2012-09-12 04:29:48 +0000 (Wed, 12 Sep 2012)
Log Message:
-----------
Synchronizing branches/philtrimble with trunk
Modified Paths:
--------------
wiki/branches/philtrimble/addons/bliki-parser/src/main/java/org/jamwiki/parser/bliki/JAMHTMLConverter.java
wiki/branches/philtrimble/jamwiki-core/src/main/java/org/jamwiki/Environment.java
wiki/branches/philtrimble/jamwiki-core/src/main/java/org/jamwiki/WikiBase.java
wiki/branches/philtrimble/jamwiki-core/src/main/java/org/jamwiki/WikiConfiguration.java
wiki/branches/philtrimble/jamwiki-core/src/main/java/org/jamwiki/db/AnsiDataHandler.java
wiki/branches/philtrimble/jamwiki-core/src/main/java/org/jamwiki/db/AnsiQueryHandler.java
wiki/branches/philtrimble/jamwiki-core/src/main/java/org/jamwiki/db/CacheQueryHandler.java
wiki/branches/philtrimble/jamwiki-core/src/main/java/org/jamwiki/db/DB2400QueryHandler.java
wiki/branches/philtrimble/jamwiki-core/src/main/java/org/jamwiki/db/DB2QueryHandler.java
wiki/branches/philtrimble/jamwiki-core/src/main/java/org/jamwiki/db/DatabaseUpgrades.java
wiki/branches/philtrimble/jamwiki-core/src/main/java/org/jamwiki/db/H2QueryHandler.java
wiki/branches/philtrimble/jamwiki-core/src/main/java/org/jamwiki/db/HSqlQueryHandler.java
wiki/branches/philtrimble/jamwiki-core/src/main/java/org/jamwiki/db/LocalDataSource.java
wiki/branches/philtrimble/jamwiki-core/src/main/java/org/jamwiki/db/MSSqlQueryHandler.java
wiki/branches/philtrimble/jamwiki-core/src/main/java/org/jamwiki/db/MySqlQueryHandler.java
wiki/branches/philtrimble/jamwiki-core/src/main/java/org/jamwiki/db/OracleQueryHandler.java
wiki/branches/philtrimble/jamwiki-core/src/main/java/org/jamwiki/db/PostgresQueryHandler.java
wiki/branches/philtrimble/jamwiki-core/src/main/java/org/jamwiki/db/QueryHandler.java
wiki/branches/philtrimble/jamwiki-core/src/main/java/org/jamwiki/db/SybaseASAQueryHandler.java
wiki/branches/philtrimble/jamwiki-core/src/main/java/org/jamwiki/db/WikiDatabase.java
wiki/branches/philtrimble/jamwiki-core/src/main/java/org/jamwiki/db/package.html
wiki/branches/philtrimble/jamwiki-core/src/main/java/org/jamwiki/migrate/MediaWikiConstants.java
wiki/branches/philtrimble/jamwiki-core/src/main/java/org/jamwiki/migrate/MediaWikiXmlExporter.java
wiki/branches/philtrimble/jamwiki-core/src/main/java/org/jamwiki/migrate/MediaWikiXmlImporter.java
wiki/branches/philtrimble/jamwiki-core/src/main/java/org/jamwiki/model/GroupMap.java
wiki/branches/philtrimble/jamwiki-core/src/main/java/org/jamwiki/model/Namespace.java
wiki/branches/philtrimble/jamwiki-core/src/main/java/org/jamwiki/model/WikiUser.java
wiki/branches/philtrimble/jamwiki-core/src/main/java/org/jamwiki/parser/ParserOutput.java
wiki/branches/philtrimble/jamwiki-core/src/main/java/org/jamwiki/parser/ParserUtil.java
wiki/branches/philtrimble/jamwiki-core/src/main/java/org/jamwiki/parser/image/ImageUtil.java
wiki/branches/philtrimble/jamwiki-core/src/main/java/org/jamwiki/parser/jflex/AbstractHeadingTag.java
wiki/branches/philtrimble/jamwiki-core/src/main/java/org/jamwiki/parser/jflex/AbstractJAMWikiHtmlTagLexer.java
wiki/branches/philtrimble/jamwiki-core/src/main/java/org/jamwiki/parser/jflex/HtmlTagItem.java
wiki/branches/philtrimble/jamwiki-core/src/main/java/org/jamwiki/parser/jflex/ImageLinkTag.java
wiki/branches/philtrimble/jamwiki-core/src/main/java/org/jamwiki/parser/jflex/JFlexCustomTagItem.java
wiki/branches/philtrimble/jamwiki-core/src/main/java/org/jamwiki/parser/jflex/JFlexParser.java
wiki/branches/philtrimble/jamwiki-core/src/main/java/org/jamwiki/parser/jflex/ParserFunctionUtil.java
wiki/branches/philtrimble/jamwiki-core/src/main/java/org/jamwiki/parser/jflex/WikiSignatureTag.java
wiki/branches/philtrimble/jamwiki-core/src/main/java/org/jamwiki/parser/package.html
wiki/branches/philtrimble/jamwiki-core/src/main/java/org/jamwiki/utils/MathUtil.java
wiki/branches/philtrimble/jamwiki-core/src/main/java/org/jamwiki/utils/WikiUtil.java
wiki/branches/philtrimble/jamwiki-core/src/main/java/org/jamwiki/utils/XMLUtil.java
wiki/branches/philtrimble/jamwiki-core/src/main/jflex/jamwiki-html-processor.jflex
wiki/branches/philtrimble/jamwiki-core/src/main/resources/pages/JAMWiki%3ASystem.css.txt
wiki/branches/philtrimble/jamwiki-core/src/main/resources/sql/sql.ansi.properties
wiki/branches/philtrimble/jamwiki-core/src/test/java/org/jamwiki/JAMWikiUnitTest.java
wiki/branches/philtrimble/jamwiki-core/src/test/java/org/jamwiki/migrate/MigrationUtilTest.java
wiki/branches/philtrimble/jamwiki-core/src/test/java/org/jamwiki/parser/image/ImageUtilTest.java
wiki/branches/philtrimble/jamwiki-core/src/test/resources/data/files/edit-comment-inputs.txt
wiki/branches/philtrimble/jamwiki-core/src/test/resources/data/files/edit-comment-outputs.txt
wiki/branches/philtrimble/jamwiki-core/src/test/resources/data/files/mediawiki-export-namespace-test.xml
wiki/branches/philtrimble/jamwiki-core/src/test/resources/data/files/mediawiki-export-one-topic-with-unsorted-history.xml
wiki/branches/philtrimble/jamwiki-core/src/test/resources/data/files/mediawiki-export-topic-name-with-question-mark.xml
wiki/branches/philtrimble/jamwiki-core/src/test/resources/data/files/mediawiki-export-two-topics-with-history.xml
wiki/branches/philtrimble/jamwiki-core/src/test/resources/data/results/Gallery1
wiki/branches/philtrimble/jamwiki-core/src/test/resources/data/results/ImageLink1
wiki/branches/philtrimble/jamwiki-core/src/test/resources/data/results/ImageShared1
wiki/branches/philtrimble/jamwiki-core/src/test/resources/data/results/NestedTable1
wiki/branches/philtrimble/jamwiki-core/src/test/resources/data/results/ParserFunctions5
wiki/branches/philtrimble/jamwiki-core/src/test/resources/data/results/ParserFunctionsExpr
wiki/branches/philtrimble/jamwiki-core/src/test/resources/data/topics/Gallery1
wiki/branches/philtrimble/jamwiki-core/src/test/resources/data/topics/ImageLink1
wiki/branches/philtrimble/jamwiki-core/src/test/resources/data/topics/ImageShared1
wiki/branches/philtrimble/jamwiki-core/src/test/resources/data/topics/NestedTable1
wiki/branches/philtrimble/jamwiki-core/src/test/resources/data/topics/ParserFunctions5
wiki/branches/philtrimble/jamwiki-core/src/test/resources/data/topics/ParserFunctionsExpr
wiki/branches/philtrimble/jamwiki-core/src/test/resources/data/topics/ParserFunctionsIfexist
wiki/branches/philtrimble/jamwiki-war/src/main/resources/ApplicationResources.properties
wiki/branches/philtrimble/jamwiki-war/src/main/resources/ApplicationResources_de.properties
wiki/branches/philtrimble/jamwiki-war/src/main/resources/ApplicationResources_it.properties
wiki/branches/philtrimble/jamwiki-war/src/main/resources/ApplicationResources_ja.properties
wiki/branches/philtrimble/jamwiki-war/src/main/webapp/CHANGELOG.txt
wiki/branches/philtrimble/jamwiki-war/src/main/webapp/UPGRADE.txt
wiki/branches/philtrimble/jamwiki-war/src/main/webapp/WEB-INF/jsp/admin-maintenance.jsp
wiki/branches/philtrimble/jamwiki-war/src/main/webapp/WEB-INF/jsp/admin.jsp
wiki/branches/philtrimble/jamwiki-war/src/main/webapp/WEB-INF/jsp/register.jsp
wiki/branches/philtrimble/jamwiki-war/src/main/webapp/WEB-INF/jsp/setup.jsp
wiki/branches/philtrimble/jamwiki-war/src/main/webapp/WEB-INF/jsp/shared-db-javascript.jsp
wiki/branches/philtrimble/jamwiki-war/src/main/webapp/WEB-INF/jsp/view-topic-include.jsp
wiki/branches/philtrimble/jamwiki-web/src/main/java/org/jamwiki/servlets/AdminServlet.java
wiki/branches/philtrimble/jamwiki-web/src/main/java/org/jamwiki/servlets/EditServlet.java
wiki/branches/philtrimble/jamwiki-web/src/main/java/org/jamwiki/servlets/RegisterServlet.java
wiki/branches/philtrimble/jamwiki-web/src/main/java/org/jamwiki/servlets/ServletUtil.java
wiki/branches/philtrimble/jamwiki-web/src/main/java/org/jamwiki/servlets/SetupServlet.java
wiki/branches/philtrimble/jamwiki-web/src/main/java/org/jamwiki/servlets/UpgradeServlet.java
wiki/branches/philtrimble/jamwiki-web/src/main/java/org/jamwiki/servlets/UploadServlet.java
wiki/branches/philtrimble/jamwiki-web/src/main/java/org/jamwiki/taglib/ImageLinkTag.java
wiki/branches/philtrimble/jamwiki-web/src/main/java/org/jamwiki/validator/HoneypotValidator.java
wiki/branches/philtrimble/jamwiki-web/src/main/resources/META-INF/jamwiki.tld
wiki/branches/philtrimble/pom.xml
Added Paths:
-----------
wiki/branches/philtrimble/addons/jamwiki-jflex-parser-tags/src/test/resources/setup/jamwiki-configuration-1.3.xml
wiki/branches/philtrimble/jamwiki-core/src/main/java/org/jamwiki/db/AnsiDataValidator.java
wiki/branches/philtrimble/jamwiki-core/src/main/java/org/jamwiki/utils/DateUtil.java
wiki/branches/philtrimble/jamwiki-core/src/main/resources/setup/jamwiki-configuration-1.3.xml
wiki/branches/philtrimble/jamwiki-core/src/main/resources/setup/jamwiki-configuration-1.3.xsd
wiki/branches/philtrimble/jamwiki-core/src/test/resources/data/topics/File_-_Test_Image.jpg
wiki/branches/philtrimble/jamwiki-core/src/test/resources/data/topics/File_-_Test_Image2.jpg
wiki/branches/philtrimble/jamwiki-web/src/main/java/org/jamwiki/taglib/ImageUrlTag.java
wiki/branches/philtrimble/jamwiki-web/src/main/java/org/jamwiki/web/
wiki/branches/philtrimble/jamwiki-web/src/main/java/org/jamwiki/web/utils/
wiki/branches/philtrimble/jamwiki-web/src/main/java/org/jamwiki/web/utils/UserPreferencesUtil.java
wiki/branches/philtrimble/work/
wiki/branches/philtrimble/work/SESSIONS.ser
wiki/branches/philtrimble/work/org/
wiki/branches/philtrimble/work/org/apache/
wiki/branches/philtrimble/work/org/apache/jsp/
wiki/branches/philtrimble/work/org/apache/jsp/WEB_002dINF/
wiki/branches/philtrimble/work/org/apache/jsp/WEB_002dINF/jsp/
wiki/branches/philtrimble/work/org/apache/jsp/WEB_002dINF/jsp/recent_002dchanges_jsp.class
wiki/branches/philtrimble/work/org/apache/jsp/WEB_002dINF/jsp/recent_002dchanges_jsp.java
wiki/branches/philtrimble/work/org/apache/jsp/WEB_002dINF/jsp/setup_jsp.class
wiki/branches/philtrimble/work/org/apache/jsp/WEB_002dINF/jsp/setup_jsp.java
wiki/branches/philtrimble/work/org/apache/jsp/WEB_002dINF/jsp/topic_jsp.class
wiki/branches/philtrimble/work/org/apache/jsp/WEB_002dINF/jsp/topic_jsp.java
wiki/branches/philtrimble/work/org/apache/jsp/WEB_002dINF/jsp/wiki_jsp.class
wiki/branches/philtrimble/work/org/apache/jsp/WEB_002dINF/jsp/wiki_jsp.java
wiki/branches/philtrimble/work/org/apache/jsp/tag/
wiki/branches/philtrimble/work/org/apache/jsp/tag/web/
wiki/branches/philtrimble/work/org/apache/jsp/tag/web/userLinks_tag.class
wiki/branches/philtrimble/work/org/apache/jsp/tag/web/userLinks_tag.java
wiki/branches/philtrimble/work/org/apache/jsp/tag/web/wikiMessage_tag.class
wiki/branches/philtrimble/work/org/apache/jsp/tag/web/wikiMessage_tag.java
Removed Paths:
-------------
wiki/branches/philtrimble/addons/jamwiki-jflex-parser-tags/src/test/resources/setup/jamwiki-configuration.xml
wiki/branches/philtrimble/jamwiki-core/src/main/java/org/jamwiki/DataHandler.java
wiki/branches/philtrimble/jamwiki-core/src/main/java/org/jamwiki/db/CacheDataHandler.java
wiki/branches/philtrimble/jamwiki-core/src/main/java/org/jamwiki/db/DB2400DataHandler.java
wiki/branches/philtrimble/jamwiki-core/src/main/java/org/jamwiki/db/DB2DataHandler.java
wiki/branches/philtrimble/jamwiki-core/src/main/java/org/jamwiki/db/H2DataHandler.java
wiki/branches/philtrimble/jamwiki-core/src/main/java/org/jamwiki/db/HSqlDataHandler.java
wiki/branches/philtrimble/jamwiki-core/src/main/java/org/jamwiki/db/MSSqlDataHandler.java
wiki/branches/philtrimble/jamwiki-core/src/main/java/org/jamwiki/db/MySqlDataHandler.java
wiki/branches/philtrimble/jamwiki-core/src/main/java/org/jamwiki/db/OracleDataHandler.java
wiki/branches/philtrimble/jamwiki-core/src/main/java/org/jamwiki/db/PostgresDataHandler.java
wiki/branches/philtrimble/jamwiki-core/src/main/java/org/jamwiki/db/SybaseASADataHandler.java
wiki/branches/philtrimble/jamwiki-core/src/main/resources/setup/jamwiki-configuration-1.2.xsd
wiki/branches/philtrimble/jamwiki-core/src/main/resources/setup/jamwiki-configuration.xml
wiki/branches/philtrimble/jamwiki-core/src/test/resources/data/topics/Image_-_Test_Image.jpg
wiki/branches/philtrimble/jamwiki-core/src/test/resources/data/topics/Image_-_Test_Image2.jpg
wiki/branches/philtrimble/jamwiki-web/src/main/java/org/jamwiki/web/utils/
wiki/branches/philtrimble/jamwiki-web/src/main/java/org/jamwiki/web/utils/UserPreferencesUtil.java
Property Changed:
----------------
wiki/branches/philtrimble/
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|