[Jamwiki-commit] SF.net SVN: jamwiki:[3365] wiki/branches/michael-o/pom_improvement

[<mic...@us...>]

Revision: 3365
          http://jamwiki.svn.sourceforge.net/jamwiki/?rev=3365&view=rev
Author:   michael-o
Date:     2010-12-30 14:25:30 +0000 (Thu, 30 Dec 2010)

Log Message:
-----------
Merged with trunk

Modified Paths:
--------------
    wiki/branches/michael-o/pom_improvement/jamwiki-core/src/main/java/org/jamwiki/Environment.java
    wiki/branches/michael-o/pom_improvement/jamwiki-core/src/main/java/org/jamwiki/parser/jflex/WikiSignatureTag.java
    wiki/branches/michael-o/pom_improvement/jamwiki-war/src/main/resources/ApplicationResources.properties
    wiki/branches/michael-o/pom_improvement/jamwiki-war/src/main/resources/jamwiki-configuration.dtd
    wiki/branches/michael-o/pom_improvement/jamwiki-war/src/main/webapp/WEB-INF/jsp/admin.jsp
    wiki/branches/michael-o/pom_improvement/jamwiki-war/src/main/webapp/WEB-INF/web.xml
    wiki/branches/michael-o/pom_improvement/jamwiki-web/src/main/java/org/jamwiki/servlets/AdminServlet.java
    wiki/branches/michael-o/pom_improvement/jamwiki-web/src/main/java/org/jamwiki/servlets/WikiPageInfo.java

Added Paths:
-----------
    wiki/branches/michael-o/pom_improvement/jamwiki-core/src/test/java/org/jamwiki/EnvironmentTest.java
    wiki/branches/michael-o/pom_improvement/jamwiki-web/src/main/resources/
    wiki/branches/michael-o/pom_improvement/jamwiki-web/src/main/resources/META-INF/
    wiki/branches/michael-o/pom_improvement/jamwiki-web/src/main/resources/META-INF/jamwiki.tld

Removed Paths:
-------------
    wiki/branches/michael-o/pom_improvement/jamwiki-war/src/main/webapp/WEB-INF/jamwiki.tld
    wiki/branches/michael-o/pom_improvement/jamwiki-war/src/main/webapp/WEB-INF/security.tld
    wiki/branches/michael-o/pom_improvement/jamwiki-web/src/main/resources/META-INF/
    wiki/branches/michael-o/pom_improvement/jamwiki-web/src/main/resources/META-INF/jamwiki.tld

Property Changed:
----------------
    wiki/branches/michael-o/pom_improvement/


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