[Jamwiki-commit] SF.net SVN: jamwiki:[2552] wiki/branches/0.7.x

[<wr...@us...>]

Revision: 2552
          http://jamwiki.svn.sourceforge.net/jamwiki/?rev=2552&view=rev
Author:   wrh2
Date:     2009-04-04 03:48:55 +0000 (Sat, 04 Apr 2009)

Log Message:
-----------
Merge:
  * Merge changes from trunk that should be included in 0.7.1.  Mostly translations
    and minor bug fixes.

Modified Paths:
--------------
    wiki/branches/0.7.x/addons/bliki-parser/src/main/java/org/jamwiki/parser/bliki/JAMWikiModel.java
    wiki/branches/0.7.x/jamwiki-core/src/main/java/org/jamwiki/parser/jflex/WikiSignatureTag.java
    wiki/branches/0.7.x/jamwiki-war/src/main/resources/ApplicationResources.properties
    wiki/branches/0.7.x/jamwiki-war/src/main/resources/ApplicationResources_de.properties
    wiki/branches/0.7.x/jamwiki-war/src/main/resources/ApplicationResources_pt_BR.properties
    wiki/branches/0.7.x/jamwiki-war/src/main/webapp/CHANGELOG.txt
    wiki/branches/0.7.x/jamwiki-war/src/main/webapp/CREDITS.txt
    wiki/branches/0.7.x/jamwiki-war/src/main/webapp/WEB-INF/applicationContext-security.xml
    wiki/branches/0.7.x/jamwiki-war/src/main/webapp/WEB-INF/jamwiki-servlet.xml
    wiki/branches/0.7.x/pom.xml

Added Paths:
-----------
    wiki/branches/0.7.x/jamwiki-war/src/main/resources/ApplicationResources_ru.properties
    wiki/branches/0.7.x/jamwiki-war/src/main/resources/pages/ru/
    wiki/branches/0.7.x/jamwiki-war/src/main/resources/pages/ru/LeftMenu.txt
    wiki/branches/0.7.x/repository/bliki/bliki/3.0-SNAPSHOT/bliki-3.0-SNAPSHOT.jar.md5
    wiki/branches/0.7.x/repository/bliki/bliki/3.0-SNAPSHOT/bliki-3.0-SNAPSHOT.jar.sha1
    wiki/branches/0.7.x/repository/bliki/bliki/3.0-SNAPSHOT/maven-metadata-local.xml

Removed Paths:
-------------
    wiki/branches/0.7.x/jamwiki-war/src/main/resources/pages/ru/LeftMenu.txt

Property Changed:
----------------
    wiki/branches/0.7.x/
    wiki/branches/0.7.x/jamwiki-web/src/main/java/org/jamwiki/authentication/WikiUserDetails.java


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