Thread: [Jamwiki-commit] SF.net SVN: jamwiki:[3725] wiki/trunk (Page 24)
Brought to you by:
wrh2
Menu
▾
▴
jamwiki-commit
|
From: <wr...@us...> - 2011-09-08 03:22:21
|
Revision: 3725
http://jamwiki.svn.sourceforge.net/jamwiki/?rev=3725&view=rev
Author: wrh2
Date: 2011-09-08 03:22:15 +0000 (Thu, 08 Sep 2011)
Log Message:
-----------
Merge:
* Merge changes from the 1.0.x branch to trunk.
Modified Paths:
--------------
wiki/trunk/jamwiki-core/src/main/java/org/jamwiki/db/WikiDatabase.java
wiki/trunk/jamwiki-core/src/test/resources/ApplicationResources.properties
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_si_LK.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/webapp/CHANGELOG.txt
wiki/trunk/jamwiki-war/src/main/webapp/UPGRADE.txt
wiki/trunk/jamwiki-web/src/main/java/org/jamwiki/servlets/AdminServlet.java
wiki/trunk/jamwiki-web/src/main/java/org/jamwiki/servlets/UpgradeServlet.java
Property Changed:
----------------
wiki/trunk/
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <wr...@us...> - 2011-09-08 04:36:42
|
Revision: 3728
http://jamwiki.svn.sourceforge.net/jamwiki/?rev=3728&view=rev
Author: wrh2
Date: 2011-09-08 04:36:36 +0000 (Thu, 08 Sep 2011)
Log Message:
-----------
Merge:
* Merge changes from the 1.0.x branch to trunk.
Modified Paths:
--------------
wiki/trunk/jamwiki-war/src/main/webapp/CHANGELOG.txt
wiki/trunk/jamwiki-war/src/main/webapp/WEB-INF/jsp/search.jsp
Property Changed:
----------------
wiki/trunk/
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <wr...@us...> - 2011-09-09 04:59:18
|
Revision: 3731
http://jamwiki.svn.sourceforge.net/jamwiki/?rev=3731&view=rev
Author: wrh2
Date: 2011-09-09 04:59:12 +0000 (Fri, 09 Sep 2011)
Log Message:
-----------
Merge:
* Merge changes from the 1.1.x branch to trunk.
Modified Paths:
--------------
wiki/trunk/jamwiki-war/src/main/webapp/CHANGELOG.txt
wiki/trunk/jamwiki-web/src/main/java/org/jamwiki/servlets/LoginServlet.java
Property Changed:
----------------
wiki/trunk/
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <wr...@us...> - 2011-09-09 05:32:13
|
Revision: 3734
http://jamwiki.svn.sourceforge.net/jamwiki/?rev=3734&view=rev
Author: wrh2
Date: 2011-09-09 05:32:07 +0000 (Fri, 09 Sep 2011)
Log Message:
-----------
Merge:
* Merge changes from the 1.0.x branch to trunk.
Modified Paths:
--------------
wiki/trunk/jamwiki-war/src/main/webapp/CHANGELOG.txt
wiki/trunk/jamwiki-web/src/main/java/org/jamwiki/servlets/ServletUtil.java
Property Changed:
----------------
wiki/trunk/
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <wr...@us...> - 2011-09-14 03:41:19
|
Revision: 3742
http://jamwiki.svn.sourceforge.net/jamwiki/?rev=3742&view=rev
Author: wrh2
Date: 2011-09-14 03:41:13 +0000 (Wed, 14 Sep 2011)
Log Message:
-----------
Merge:
* Merge changes from the 1.1.x branch to trunk.
Modified Paths:
--------------
wiki/trunk/jamwiki-core/src/main/java/org/jamwiki/parser/jflex/WikiLinkTag.java
wiki/trunk/jamwiki-core/src/test/resources/data/results/WikiLink1
wiki/trunk/jamwiki-core/src/test/resources/data/topics/WikiLink1
wiki/trunk/jamwiki-war/src/main/webapp/CHANGELOG.txt
Property Changed:
----------------
wiki/trunk/
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <wr...@us...> - 2011-09-15 02:29:41
|
Revision: 3744
http://jamwiki.svn.sourceforge.net/jamwiki/?rev=3744&view=rev
Author: wrh2
Date: 2011-09-15 02:29:35 +0000 (Thu, 15 Sep 2011)
Log Message:
-----------
Merge:
* Merge changes from the 1.1.x branch to trunk.
Modified Paths:
--------------
wiki/trunk/jamwiki-war/src/main/webapp/CHANGELOG.txt
wiki/trunk/jamwiki-war/src/main/webapp/UPGRADE.txt
wiki/trunk/jamwiki-web/src/main/java/org/jamwiki/search/LuceneSearchEngine.java
wiki/trunk/pom.xml
Property Changed:
----------------
wiki/trunk/
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <wr...@us...> - 2011-09-16 04:48:30
|
Revision: 3746
http://jamwiki.svn.sourceforge.net/jamwiki/?rev=3746&view=rev
Author: wrh2
Date: 2011-09-16 04:48:24 +0000 (Fri, 16 Sep 2011)
Log Message:
-----------
Merge:
* Merge changes from the 1.1.x branch to trunk.
Modified Paths:
--------------
wiki/trunk/jamwiki-core/src/main/java/org/jamwiki/db/AnsiDataHandler.java
wiki/trunk/jamwiki-war/src/main/webapp/CHANGELOG.txt
Property Changed:
----------------
wiki/trunk/
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <wr...@us...> - 2011-09-16 05:57:23
|
Revision: 3747
http://jamwiki.svn.sourceforge.net/jamwiki/?rev=3747&view=rev
Author: wrh2
Date: 2011-09-16 05:57:17 +0000 (Fri, 16 Sep 2011)
Log Message:
-----------
JAMWIKI-41:
* Topic exports containing UTF-8 should not escape unicode characters.
Reported by cstenkes.
Modified Paths:
--------------
wiki/trunk/jamwiki-core/src/main/java/org/jamwiki/migrate/MediaWikiXmlExporter.java
wiki/trunk/jamwiki-core/src/test/java/org/jamwiki/migrate/MigrationUtilTest.java
wiki/trunk/jamwiki-war/src/main/webapp/CHANGELOG.txt
Added Paths:
-----------
wiki/trunk/jamwiki-core/src/test/resources/data/results/CharacterUtf8
wiki/trunk/jamwiki-core/src/test/resources/data/topics/CharacterUtf8
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <wr...@us...> - 2011-09-17 18:04:42
|
Revision: 3750
http://jamwiki.svn.sourceforge.net/jamwiki/?rev=3750&view=rev
Author: wrh2
Date: 2011-09-17 18:04:35 +0000 (Sat, 17 Sep 2011)
Log Message:
-----------
Merge:
* Merge changes from the 1.1.x branch to trunk.
Modified Paths:
--------------
wiki/trunk/jamwiki-core/src/main/java/org/jamwiki/parser/ParserInput.java
wiki/trunk/jamwiki-core/src/main/java/org/jamwiki/parser/TableOfContents.java
wiki/trunk/jamwiki-core/src/main/jflex/jamwiki-postprocessor.jflex
wiki/trunk/jamwiki-war/src/main/webapp/CHANGELOG.txt
wiki/trunk/jamwiki-web/src/main/java/org/jamwiki/servlets/ServletUtil.java
Property Changed:
----------------
wiki/trunk/
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <wr...@us...> - 2011-09-21 01:27:40
|
Revision: 3752
http://jamwiki.svn.sourceforge.net/jamwiki/?rev=3752&view=rev
Author: wrh2
Date: 2011-09-21 01:27:34 +0000 (Wed, 21 Sep 2011)
Log Message:
-----------
Cleanup:
* Split the resource utilities out of Utilities and into a new ResourceUtil
class.
Modified Paths:
--------------
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/db/DatabaseConnection.java
wiki/trunk/jamwiki-core/src/main/java/org/jamwiki/db/LocalDataSource.java
wiki/trunk/jamwiki-core/src/main/java/org/jamwiki/db/WikiDatabase.java
wiki/trunk/jamwiki-core/src/main/java/org/jamwiki/parser/jflex/AbstractJAMWikiCustomTagLexer.java
wiki/trunk/jamwiki-core/src/main/java/org/jamwiki/utils/SpamFilter.java
wiki/trunk/jamwiki-core/src/main/java/org/jamwiki/utils/Utilities.java
wiki/trunk/jamwiki-core/src/main/java/org/jamwiki/utils/WikiCache.java
wiki/trunk/jamwiki-core/src/main/java/org/jamwiki/utils/WikiUtil.java
wiki/trunk/jamwiki-core/src/test/java/org/jamwiki/TestFileUtil.java
wiki/trunk/jamwiki-core/src/test/java/org/jamwiki/utils/UtilitiesTest.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
Added Paths:
-----------
wiki/trunk/jamwiki-core/src/main/java/org/jamwiki/utils/ResourceUtil.java
wiki/trunk/jamwiki-core/src/test/java/org/jamwiki/utils/ResourceUtilTest.java
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <wr...@us...> - 2011-09-21 02:45:15
|
Revision: 3753
http://jamwiki.svn.sourceforge.net/jamwiki/?rev=3753&view=rev
Author: wrh2
Date: 2011-09-21 02:45:09 +0000 (Wed, 21 Sep 2011)
Log Message:
-----------
Cleanup:
* Use Spring's resource utilities and remove JAMWiki custom code.
* Note that this adds spring-core as an explicit dependency for
jamwiki-core, but it was already a dependency through the spring-jdbc
and spring-transaction dependencies.
Modified Paths:
--------------
wiki/trunk/jamwiki-core/pom.xml
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/utils/ResourceUtil.java
wiki/trunk/jamwiki-core/src/main/java/org/jamwiki/utils/WikiCache.java
wiki/trunk/jamwiki-core/src/test/java/org/jamwiki/TestFileUtil.java
wiki/trunk/jamwiki-web/src/main/java/org/jamwiki/servlets/ServletUtil.java
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <wr...@us...> - 2011-09-21 05:06:00
|
Revision: 3754
http://jamwiki.svn.sourceforge.net/jamwiki/?rev=3754&view=rev
Author: wrh2
Date: 2011-09-21 05:05:53 +0000 (Wed, 21 Sep 2011)
Log Message:
-----------
Cleanup:
* Move several classes that are used for parsing out of org.jamwiki.utils
and into the org.jamwiki.parser package.
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/db/AnsiDataHandler.java
wiki/trunk/jamwiki-core/src/main/java/org/jamwiki/migrate/MediaWikiXmlImporter.java
wiki/trunk/jamwiki-core/src/main/java/org/jamwiki/model/Topic.java
wiki/trunk/jamwiki-core/src/main/java/org/jamwiki/parser/TableOfContents.java
wiki/trunk/jamwiki-core/src/main/java/org/jamwiki/parser/jflex/AbstractHeadingTag.java
wiki/trunk/jamwiki-core/src/main/java/org/jamwiki/parser/jflex/EditSectionTag.java
wiki/trunk/jamwiki-core/src/main/java/org/jamwiki/parser/jflex/GalleryTag.java
wiki/trunk/jamwiki-core/src/main/java/org/jamwiki/parser/jflex/HtmlLinkTag.java
wiki/trunk/jamwiki-core/src/main/java/org/jamwiki/parser/jflex/ImageLinkTag.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/utils/WikiUtil.java
wiki/trunk/jamwiki-core/src/test/java/org/jamwiki/JAMWikiUnitTest.java
wiki/trunk/jamwiki-war/src/main/resources/ehcache-sample.xml
wiki/trunk/jamwiki-web/src/main/java/org/jamwiki/servlets/EditServlet.java
wiki/trunk/jamwiki-web/src/main/java/org/jamwiki/servlets/JAMWikiServlet.java
wiki/trunk/jamwiki-web/src/main/java/org/jamwiki/servlets/MoveServlet.java
wiki/trunk/jamwiki-web/src/main/java/org/jamwiki/servlets/SearchServlet.java
wiki/trunk/jamwiki-web/src/main/java/org/jamwiki/servlets/ServletUtil.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/WikiPageInfo.java
wiki/trunk/jamwiki-web/src/main/java/org/jamwiki/taglib/ImageLinkTag.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
Added Paths:
-----------
wiki/trunk/jamwiki-core/src/main/java/org/jamwiki/parser/LinkUtil.java
wiki/trunk/jamwiki-core/src/main/java/org/jamwiki/parser/image/
wiki/trunk/jamwiki-core/src/main/java/org/jamwiki/parser/image/ImageBorderEnum.java
wiki/trunk/jamwiki-core/src/main/java/org/jamwiki/parser/image/ImageHorizontalAlignmentEnum.java
wiki/trunk/jamwiki-core/src/main/java/org/jamwiki/parser/image/ImageMetadata.java
wiki/trunk/jamwiki-core/src/main/java/org/jamwiki/parser/image/ImageProcessor.java
wiki/trunk/jamwiki-core/src/main/java/org/jamwiki/parser/image/ImageUtil.java
wiki/trunk/jamwiki-core/src/main/java/org/jamwiki/parser/image/ImageVerticalAlignmentEnum.java
wiki/trunk/jamwiki-core/src/test/java/org/jamwiki/parser/LinkUtilTest.java
Removed Paths:
-------------
wiki/trunk/jamwiki-core/src/main/java/org/jamwiki/utils/ImageBorderEnum.java
wiki/trunk/jamwiki-core/src/main/java/org/jamwiki/utils/ImageHorizontalAlignmentEnum.java
wiki/trunk/jamwiki-core/src/main/java/org/jamwiki/utils/ImageMetadata.java
wiki/trunk/jamwiki-core/src/main/java/org/jamwiki/utils/ImageProcessor.java
wiki/trunk/jamwiki-core/src/main/java/org/jamwiki/utils/ImageUtil.java
wiki/trunk/jamwiki-core/src/main/java/org/jamwiki/utils/ImageVerticalAlignmentEnum.java
wiki/trunk/jamwiki-core/src/main/java/org/jamwiki/utils/LinkUtil.java
wiki/trunk/jamwiki-core/src/test/java/org/jamwiki/utils/LinkUtilTest.java
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <wr...@us...> - 2011-09-21 05:38:22
|
Revision: 3755
http://jamwiki.svn.sourceforge.net/jamwiki/?rev=3755&view=rev
Author: wrh2
Date: 2011-09-21 05:38:12 +0000 (Wed, 21 Sep 2011)
Log Message:
-----------
Cleanup:
* Remove the dependency between WikiUtil and LinkUtil so that there are
no cross-dependencies from the org.jamwiki.utils package to the
org.jamwiki.parser package.
Modified Paths:
--------------
wiki/trunk/jamwiki-core/src/main/java/org/jamwiki/db/AnsiDataHandler.java
wiki/trunk/jamwiki-core/src/main/java/org/jamwiki/migrate/MediaWikiXmlExporter.java
wiki/trunk/jamwiki-core/src/main/java/org/jamwiki/parser/LinkUtil.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/TemplateTag.java
wiki/trunk/jamwiki-core/src/main/java/org/jamwiki/parser/jflex/WikiLinkTag.java
wiki/trunk/jamwiki-core/src/main/java/org/jamwiki/utils/WikiUtil.java
wiki/trunk/jamwiki-core/src/test/java/org/jamwiki/parser/LinkUtilTest.java
wiki/trunk/jamwiki-core/src/test/java/org/jamwiki/utils/WikiUtilTest.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/WatchlistServlet.java
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <wr...@us...> - 2011-09-22 01:28:46
|
Revision: 3756
http://jamwiki.svn.sourceforge.net/jamwiki/?rev=3756&view=rev
Author: wrh2
Date: 2011-09-22 01:28:40 +0000 (Thu, 22 Sep 2011)
Log Message:
-----------
Cleanup:
* Move org.jamwiki.utils.WikiLink to org.jamwiki.parser.WikiLink. This
class is primarily used for parsing links.
* Move WikiUtil.validateTopicName() to LinkUtil.validateTopicName() to
avoid an interdependency between the org.jamwiki.utils package and the
org.jamwiki.parser package.
Modified Paths:
--------------
wiki/trunk/addons/bliki-parser/src/main/java/org/jamwiki/parser/bliki/JAMWikiModel.java
wiki/trunk/jamwiki-core/src/main/java/org/jamwiki/db/AnsiDataHandler.java
wiki/trunk/jamwiki-core/src/main/java/org/jamwiki/migrate/MediaWikiXmlImporter.java
wiki/trunk/jamwiki-core/src/main/java/org/jamwiki/model/Topic.java
wiki/trunk/jamwiki-core/src/main/java/org/jamwiki/parser/LinkUtil.java
wiki/trunk/jamwiki-core/src/main/java/org/jamwiki/parser/image/ImageUtil.java
wiki/trunk/jamwiki-core/src/main/java/org/jamwiki/parser/jflex/EditSectionTag.java
wiki/trunk/jamwiki-core/src/main/java/org/jamwiki/parser/jflex/GalleryTag.java
wiki/trunk/jamwiki-core/src/main/java/org/jamwiki/parser/jflex/ImageLinkTag.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/TemplateTag.java
wiki/trunk/jamwiki-core/src/main/java/org/jamwiki/parser/jflex/WikiLinkTag.java
wiki/trunk/jamwiki-core/src/main/java/org/jamwiki/utils/WikiUtil.java
wiki/trunk/jamwiki-core/src/test/java/org/jamwiki/parser/LinkUtilTest.java
wiki/trunk/jamwiki-core/src/test/java/org/jamwiki/utils/WikiUtilTest.java
wiki/trunk/jamwiki-web/src/main/java/org/jamwiki/servlets/EditServlet.java
wiki/trunk/jamwiki-web/src/main/java/org/jamwiki/servlets/JAMWikiServlet.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/UpgradeServlet.java
wiki/trunk/jamwiki-web/src/main/java/org/jamwiki/servlets/WikiPageInfo.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
Added Paths:
-----------
wiki/trunk/jamwiki-core/src/main/java/org/jamwiki/parser/WikiLink.java
wiki/trunk/jamwiki-core/src/test/java/org/jamwiki/parser/WikiLinkTest.java
Removed Paths:
-------------
wiki/trunk/jamwiki-core/src/main/java/org/jamwiki/utils/WikiLink.java
wiki/trunk/jamwiki-core/src/test/java/org/jamwiki/utils/WikiLinkTest.java
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <wr...@us...> - 2011-09-23 04:42:33
|
Revision: 3759
http://jamwiki.svn.sourceforge.net/jamwiki/?rev=3759&view=rev
Author: wrh2
Date: 2011-09-23 04:42:27 +0000 (Fri, 23 Sep 2011)
Log Message:
-----------
Parser:
* Add a WikiLink.toRelativeUrl() method and move that functionality out
of LinkUtil. The end goal is to simplify the LinkUtil class, which
has turned into a bit of mess over time.
Modified Paths:
--------------
wiki/trunk/jamwiki-core/src/main/java/org/jamwiki/parser/LinkUtil.java
wiki/trunk/jamwiki-core/src/main/java/org/jamwiki/parser/WikiLink.java
wiki/trunk/jamwiki-core/src/main/java/org/jamwiki/parser/jflex/JFlexParserUtil.java
wiki/trunk/jamwiki-core/src/test/java/org/jamwiki/parser/WikiLinkTest.java
wiki/trunk/jamwiki-web/src/main/java/org/jamwiki/servlets/UpgradeServlet.java
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <wr...@us...> - 2011-09-26 01:06:04
|
Revision: 3761
http://jamwiki.svn.sourceforge.net/jamwiki/?rev=3761&view=rev
Author: wrh2
Date: 2011-09-26 01:05:58 +0000 (Mon, 26 Sep 2011)
Log Message:
-----------
Parser:
* Enhance the #expr parser function to better match Mediawiki by supporting
the order of operations and functions such as "round" and "trunc".
* Parsing of mathematical expressions is now being handled by the
exp4j library (Apache license).
Modified Paths:
--------------
wiki/trunk/jamwiki-core/pom.xml
wiki/trunk/jamwiki-core/src/main/java/org/jamwiki/parser/jflex/ParserFunctionUtil.java
wiki/trunk/jamwiki-core/src/test/java/org/jamwiki/parser/jflex/ParserTest.java
wiki/trunk/jamwiki-core/src/test/resources/ApplicationResources.properties
wiki/trunk/jamwiki-core/src/test/resources/data/results/ParserFunctionsExpr
wiki/trunk/jamwiki-core/src/test/resources/data/topics/ParserFunctionsExpr
wiki/trunk/jamwiki-war/src/main/resources/ApplicationResources.properties
wiki/trunk/jamwiki-war/src/main/webapp/CHANGELOG.txt
wiki/trunk/jamwiki-war/src/main/webapp/CREDITS.txt
wiki/trunk/pom.xml
Added Paths:
-----------
wiki/trunk/jamwiki-core/src/main/java/org/jamwiki/utils/MathUtil.java
wiki/trunk/jamwiki-core/src/test/resources/data/results/ParserFunctionsBroken
wiki/trunk/jamwiki-core/src/test/resources/data/topics/ParserFunctionsBroken
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <wr...@us...> - 2011-09-29 04:30:45
|
Revision: 3769
http://jamwiki.svn.sourceforge.net/jamwiki/?rev=3769&view=rev
Author: wrh2
Date: 2011-09-29 04:30:39 +0000 (Thu, 29 Sep 2011)
Log Message:
-----------
Merge:
* Merge changes from the 1.1.x branch to trunk.
Modified Paths:
--------------
wiki/trunk/jamwiki-war/src/main/webapp/CHANGELOG.txt
wiki/trunk/jamwiki-war/src/main/webapp/UPGRADE.txt
Property Changed:
----------------
wiki/trunk/
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <wr...@us...> - 2011-10-01 02:11:52
|
Revision: 3770
http://jamwiki.svn.sourceforge.net/jamwiki/?rev=3770&view=rev
Author: wrh2
Date: 2011-10-01 02:11:46 +0000 (Sat, 01 Oct 2011)
Log Message:
-----------
Cleanup:
* Add virtual wiki as a member variable in WikiLink to simplify link
parsing code.
Modified Paths:
--------------
wiki/trunk/jamwiki-core/src/main/java/org/jamwiki/parser/LinkUtil.java
wiki/trunk/jamwiki-core/src/main/java/org/jamwiki/parser/WikiLink.java
wiki/trunk/jamwiki-core/src/main/java/org/jamwiki/parser/image/ImageUtil.java
wiki/trunk/jamwiki-core/src/main/java/org/jamwiki/parser/jflex/EditSectionTag.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/WikiLinkTag.java
wiki/trunk/jamwiki-core/src/test/java/org/jamwiki/parser/WikiLinkTest.java
wiki/trunk/jamwiki-core/src/test/resources/data/results/ImageLink1
wiki/trunk/jamwiki-core/src/test/resources/data/results/WikiLink1
wiki/trunk/jamwiki-core/src/test/resources/data/topics/ImageLink1
wiki/trunk/jamwiki-core/src/test/resources/data/topics/WikiLink1
wiki/trunk/jamwiki-web/src/main/java/org/jamwiki/servlets/ServletUtil.java
wiki/trunk/jamwiki-web/src/main/java/org/jamwiki/servlets/UpgradeServlet.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
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <wr...@us...> - 2011-10-01 02:39:44
|
Revision: 3771
http://jamwiki.svn.sourceforge.net/jamwiki/?rev=3771&view=rev
Author: wrh2
Date: 2011-10-01 02:39:37 +0000 (Sat, 01 Oct 2011)
Log Message:
-----------
Cleanup:
* Eliminate one of the LinkUtil.buildTopicUrl() methods since it added
little value.
Modified Paths:
--------------
wiki/trunk/jamwiki-core/src/main/java/org/jamwiki/migrate/MediaWikiXmlExporter.java
wiki/trunk/jamwiki-core/src/main/java/org/jamwiki/parser/LinkUtil.java
wiki/trunk/jamwiki-core/src/main/java/org/jamwiki/parser/image/ImageUtil.java
wiki/trunk/jamwiki-core/src/main/java/org/jamwiki/parser/jflex/ParserFunctionUtil.java
wiki/trunk/jamwiki-core/src/test/java/org/jamwiki/parser/LinkUtilTest.java
wiki/trunk/jamwiki-web/src/main/java/org/jamwiki/servlets/ServletUtil.java
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <wr...@us...> - 2011-10-01 04:44:22
|
Revision: 3773
http://jamwiki.svn.sourceforge.net/jamwiki/?rev=3773&view=rev
Author: wrh2
Date: 2011-10-01 04:44:15 +0000 (Sat, 01 Oct 2011)
Log Message:
-----------
Cleanup:
* Add context path as a member variable in WikiLink to simplify link
parsing code.
Modified Paths:
--------------
wiki/trunk/addons/bliki-parser/src/main/java/org/jamwiki/parser/bliki/JAMWikiModel.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/model/Topic.java
wiki/trunk/jamwiki-core/src/main/java/org/jamwiki/parser/LinkUtil.java
wiki/trunk/jamwiki-core/src/main/java/org/jamwiki/parser/WikiLink.java
wiki/trunk/jamwiki-core/src/main/java/org/jamwiki/parser/image/ImageUtil.java
wiki/trunk/jamwiki-core/src/main/java/org/jamwiki/parser/jflex/EditSectionTag.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/test/java/org/jamwiki/parser/LinkUtilTest.java
wiki/trunk/jamwiki-core/src/test/java/org/jamwiki/parser/WikiLinkTest.java
wiki/trunk/jamwiki-web/src/main/java/org/jamwiki/servlets/EditServlet.java
wiki/trunk/jamwiki-web/src/main/java/org/jamwiki/servlets/JAMWikiServlet.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/UpgradeServlet.java
wiki/trunk/jamwiki-web/src/main/java/org/jamwiki/servlets/WikiPageInfo.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
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <wr...@us...> - 2011-10-11 03:50:56
|
Revision: 3776
http://jamwiki.svn.sourceforge.net/jamwiki/?rev=3776&view=rev
Author: wrh2
Date: 2011-10-11 03:50:50 +0000 (Tue, 11 Oct 2011)
Log Message:
-----------
commons-io:
* Upgrade to commons-io-2.1.
Modified Paths:
--------------
wiki/trunk/jamwiki-war/src/main/webapp/CHANGELOG.txt
wiki/trunk/pom.xml
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <wr...@us...> - 2011-10-12 04:32:00
|
Revision: 3777
http://jamwiki.svn.sourceforge.net/jamwiki/?rev=3777&view=rev
Author: wrh2
Date: 2011-10-12 04:31:50 +0000 (Wed, 12 Oct 2011)
Log Message:
-----------
Cleanups:
* Remove unused imports.
* Remove unused local variables.
Modified Paths:
--------------
wiki/trunk/jamwiki-core/src/main/java/org/jamwiki/WikiConfiguration.java
wiki/trunk/jamwiki-core/src/main/java/org/jamwiki/db/CacheQueryHandler.java
wiki/trunk/jamwiki-core/src/main/java/org/jamwiki/db/DatabaseUpgrades.java
wiki/trunk/jamwiki-core/src/main/java/org/jamwiki/parser/jflex/AbstractHeadingTag.java
wiki/trunk/jamwiki-core/src/main/java/org/jamwiki/parser/jflex/AbstractJAMWikiCustomTagLexer.java
wiki/trunk/jamwiki-core/src/main/java/org/jamwiki/parser/jflex/EditSectionTag.java
wiki/trunk/jamwiki-core/src/main/java/org/jamwiki/parser/jflex/JFlexParser.java
wiki/trunk/jamwiki-core/src/main/java/org/jamwiki/utils/MathUtil.java
wiki/trunk/jamwiki-core/src/test/java/org/jamwiki/db/AnsiDataHandlerTest.java
wiki/trunk/jamwiki-web/src/main/java/org/jamwiki/authentication/ReCaptchaUtil.java
wiki/trunk/jamwiki-web/src/main/java/org/jamwiki/servlets/JAMWikiFilter.java
wiki/trunk/jamwiki-web/src/main/java/org/jamwiki/servlets/ViewSourceServlet.java
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <wr...@us...> - 2011-10-13 02:40:06
|
Revision: 3780
http://jamwiki.svn.sourceforge.net/jamwiki/?rev=3780&view=rev
Author: wrh2
Date: 2011-10-13 02:39:59 +0000 (Thu, 13 Oct 2011)
Log Message:
-----------
Cleanup:
* Move some of the logic from LinkUtil.parseWikiLink into
WikiLink.initialize(). This should offer a minimal performance
improvement but will also allow future cleanups to simplify LinkUtil.
Modified Paths:
--------------
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/model/Topic.java
wiki/trunk/jamwiki-core/src/main/java/org/jamwiki/parser/LinkUtil.java
wiki/trunk/jamwiki-core/src/main/java/org/jamwiki/parser/WikiLink.java
wiki/trunk/jamwiki-core/src/main/java/org/jamwiki/parser/image/ImageUtil.java
wiki/trunk/jamwiki-core/src/main/java/org/jamwiki/parser/jflex/EditSectionTag.java
wiki/trunk/jamwiki-core/src/main/java/org/jamwiki/parser/jflex/MagicWordUtil.java
wiki/trunk/jamwiki-web/src/main/java/org/jamwiki/servlets/EditServlet.java
wiki/trunk/jamwiki-web/src/main/java/org/jamwiki/servlets/JAMWikiServlet.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/WikiPageInfo.java
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <wr...@us...> - 2011-10-15 17:53:25
|
Revision: 3785
http://jamwiki.svn.sourceforge.net/jamwiki/?rev=3785&view=rev
Author: wrh2
Date: 2011-10-15 17:53:19 +0000 (Sat, 15 Oct 2011)
Log Message:
-----------
Cleanup:
* Convert several more uses of LinkUtil.parseWikiLink to just
new WikiLink() - the later is simpler and more appropriate for cases
where a link is being built but not parsed.
Modified Paths:
--------------
wiki/trunk/addons/bliki-parser/src/main/java/org/jamwiki/parser/bliki/JAMWikiModel.java
wiki/trunk/jamwiki-core/src/main/java/org/jamwiki/parser/LinkUtil.java
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <wr...@us...> - 2011-10-15 19:33:34
|
Revision: 3787
http://jamwiki.svn.sourceforge.net/jamwiki/?rev=3787&view=rev
Author: wrh2
Date: 2011-10-15 19:33:27 +0000 (Sat, 15 Oct 2011)
Log Message:
-----------
Merge:
* Merge changes from the 1.1.x branch to trunk.
Modified Paths:
--------------
wiki/trunk/jamwiki-war/src/main/resources/ApplicationResources_ja.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/webapp/CHANGELOG.txt
wiki/trunk/jamwiki-war/src/main/webapp/CREDITS.txt
Property Changed:
----------------
wiki/trunk/
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
×
Want the latest updates on software, tech news, and AI?
Get latest updates about software, tech news, and AI from SourceForge directly in your inbox once a month.
Thanks for helping keep SourceForge clean.
X