[Jamwiki-commit] SF.net SVN: jamwiki:[2792] wiki/branches/wrh2

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

Revision: 2792
          http://jamwiki.svn.sourceforge.net/jamwiki/?rev=2792&view=rev
Author:   wrh2
Date:     2009-12-16 05:12:19 +0000 (Wed, 16 Dec 2009)

Log Message:
-----------
Merge:
  * Reintegrate recent trunk changes.

Modified Paths:
--------------
    wiki/branches/wrh2/jamwiki-core/src/main/java/org/jamwiki/DataHandler.java
    wiki/branches/wrh2/jamwiki-core/src/main/java/org/jamwiki/SearchEngine.java
    wiki/branches/wrh2/jamwiki-core/src/main/java/org/jamwiki/utils/ImageUtil.java
    wiki/branches/wrh2/jamwiki-core/src/test/java/org/jamwiki/TestDataHandler.java
    wiki/branches/wrh2/jamwiki-war/src/main/resources/ApplicationResources_pl.properties
    wiki/branches/wrh2/jamwiki-war/src/main/resources/sql.ansi.properties
    wiki/branches/wrh2/jamwiki-war/src/main/resources/sql.mysql.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/applicationContext-security.xml
    wiki/branches/wrh2/jamwiki-war/src/main/webapp/WEB-INF/jamwiki-servlet.xml
    wiki/branches/wrh2/jamwiki-war/src/main/webapp/WEB-INF/web.xml
    wiki/branches/wrh2/jamwiki-web/pom.xml
    wiki/branches/wrh2/jamwiki-web/src/main/java/org/jamwiki/authentication/JAMWikiAuthenticationConfiguration.java
    wiki/branches/wrh2/jamwiki-web/src/main/java/org/jamwiki/authentication/JAMWikiAuthenticationConstants.java
    wiki/branches/wrh2/jamwiki-web/src/main/java/org/jamwiki/authentication/JAMWikiAuthenticationProcessingFilter.java
    wiki/branches/wrh2/jamwiki-web/src/main/java/org/jamwiki/authentication/JAMWikiAuthenticationProcessingFilterEntryPoint.java
    wiki/branches/wrh2/jamwiki-web/src/main/java/org/jamwiki/authentication/JAMWikiDaoImpl.java
    wiki/branches/wrh2/jamwiki-web/src/main/java/org/jamwiki/authentication/JAMWikiErrorMessageProvider.java
    wiki/branches/wrh2/jamwiki-web/src/main/java/org/jamwiki/authentication/JAMWikiPasswordEncoder.java
    wiki/branches/wrh2/jamwiki-web/src/main/java/org/jamwiki/authentication/JAMWikiPostAuthenticationFilter.java
    wiki/branches/wrh2/jamwiki-web/src/main/java/org/jamwiki/authentication/RoleImpl.java
    wiki/branches/wrh2/jamwiki-web/src/main/java/org/jamwiki/authentication/WikiUserDetails.java
    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/QueryHandler.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/JAMWikiLocaleInterceptor.java
    wiki/branches/wrh2/jamwiki-web/src/main/java/org/jamwiki/servlets/RegisterServlet.java
    wiki/branches/wrh2/jamwiki-web/src/main/java/org/jamwiki/servlets/ServletUtil.java
    wiki/branches/wrh2/jamwiki-web/src/main/java/org/jamwiki/servlets/SetupServlet.java
    wiki/branches/wrh2/jamwiki-web/src/main/java/org/jamwiki/servlets/UpgradeServlet.java
    wiki/branches/wrh2/jamwiki-web/src/main/java/org/jamwiki/servlets/UploadServlet.java
    wiki/branches/wrh2/pom.xml

Added Paths:
-----------
    wiki/branches/wrh2/jamwiki-web/src/main/java/org/jamwiki/authentication/JAMWikiAccessDeniedHandler.java
    wiki/branches/wrh2/jamwiki-web/src/main/java/org/jamwiki/authentication/JAMWikiAuthenticationFailureHandler.java

Removed Paths:
-------------
    wiki/branches/wrh2/jamwiki-web/src/main/java/org/jamwiki/authentication/JAMWikiExceptionTranslationFilter.java

Property Changed:
----------------
    wiki/branches/wrh2/


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