[Jamwiki-commit] SF.net SVN: jamwiki:[4125] wiki/branches/cclavadetscher

[<ccl...@us...>]

Revision: 4125
          http://jamwiki.svn.sourceforge.net/jamwiki/?rev=4125&view=rev
Author:   cclavadetscher
Date:     2012-07-27 08:25:15 +0000 (Fri, 27 Jul 2012)
Log Message:
-----------
User Preferences Management.

* Commit after merging from trunk.
* Preparation for merge to trunk.

Modified Paths:
--------------
    wiki/branches/cclavadetscher/addons/bliki-parser/src/main/java/org/jamwiki/parser/bliki/JAMHTMLConverter.java
    wiki/branches/cclavadetscher/jamwiki-core/src/main/java/org/jamwiki/model/Namespace.java
    wiki/branches/cclavadetscher/jamwiki-core/src/main/java/org/jamwiki/parser/image/ImageUtil.java
    wiki/branches/cclavadetscher/jamwiki-core/src/main/java/org/jamwiki/parser/jflex/ImageLinkTag.java
    wiki/branches/cclavadetscher/jamwiki-core/src/main/java/org/jamwiki/parser/jflex/ParserFunctionUtil.java
    wiki/branches/cclavadetscher/jamwiki-core/src/main/java/org/jamwiki/utils/MathUtil.java
    wiki/branches/cclavadetscher/jamwiki-core/src/test/java/org/jamwiki/JAMWikiUnitTest.java
    wiki/branches/cclavadetscher/jamwiki-core/src/test/java/org/jamwiki/migrate/MigrationUtilTest.java
    wiki/branches/cclavadetscher/jamwiki-core/src/test/java/org/jamwiki/parser/image/ImageUtilTest.java
    wiki/branches/cclavadetscher/jamwiki-core/src/test/resources/data/files/edit-comment-inputs.txt
    wiki/branches/cclavadetscher/jamwiki-core/src/test/resources/data/files/edit-comment-outputs.txt
    wiki/branches/cclavadetscher/jamwiki-core/src/test/resources/data/results/Gallery1
    wiki/branches/cclavadetscher/jamwiki-core/src/test/resources/data/results/ImageLink1
    wiki/branches/cclavadetscher/jamwiki-core/src/test/resources/data/results/ImageShared1
    wiki/branches/cclavadetscher/jamwiki-core/src/test/resources/data/results/NestedTable1
    wiki/branches/cclavadetscher/jamwiki-core/src/test/resources/data/results/ParserFunctions5
    wiki/branches/cclavadetscher/jamwiki-core/src/test/resources/data/results/ParserFunctionsExpr
    wiki/branches/cclavadetscher/jamwiki-core/src/test/resources/data/topics/Gallery1
    wiki/branches/cclavadetscher/jamwiki-core/src/test/resources/data/topics/ImageLink1
    wiki/branches/cclavadetscher/jamwiki-core/src/test/resources/data/topics/ImageShared1
    wiki/branches/cclavadetscher/jamwiki-core/src/test/resources/data/topics/NestedTable1
    wiki/branches/cclavadetscher/jamwiki-core/src/test/resources/data/topics/ParserFunctions5
    wiki/branches/cclavadetscher/jamwiki-core/src/test/resources/data/topics/ParserFunctionsExpr
    wiki/branches/cclavadetscher/jamwiki-core/src/test/resources/data/topics/ParserFunctionsIfexist
    wiki/branches/cclavadetscher/jamwiki-war/src/main/resources/ApplicationResources.properties
    wiki/branches/cclavadetscher/jamwiki-war/src/main/resources/ApplicationResources_de.properties
    wiki/branches/cclavadetscher/jamwiki-war/src/main/webapp/CHANGELOG.txt
    wiki/branches/cclavadetscher/jamwiki-war/src/main/webapp/UPGRADE.txt
    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/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/UploadServlet.java
    wiki/branches/cclavadetscher/jamwiki-web/src/main/java/org/jamwiki/taglib/ImageLinkTag.java
    wiki/branches/cclavadetscher/jamwiki-web/src/main/resources/META-INF/jamwiki.tld
    wiki/branches/cclavadetscher/pom.xml

Added Paths:
-----------
    wiki/branches/cclavadetscher/jamwiki-core/src/test/resources/data/topics/File_-_Test_Image.jpg
    wiki/branches/cclavadetscher/jamwiki-core/src/test/resources/data/topics/File_-_Test_Image2.jpg
    wiki/branches/cclavadetscher/jamwiki-web/src/main/java/org/jamwiki/taglib/ImageUrlTag.java

Removed Paths:
-------------
    wiki/branches/cclavadetscher/jamwiki-core/src/test/resources/data/topics/Image_-_Test_Image.jpg
    wiki/branches/cclavadetscher/jamwiki-core/src/test/resources/data/topics/Image_-_Test_Image2.jpg

Property Changed:
----------------
    wiki/branches/cclavadetscher/

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.