Revision: 3373
http://jamwiki.svn.sourceforge.net/jamwiki/?rev=3373&view=rev
Author: wrh2
Date: 2010-12-31 02:09:10 +0000 (Fri, 31 Dec 2010)
Log Message:
-----------
FCKEditor:
* Commit local changes that have been pending for some time. This code may
never actually get committed due to issues with metadata and other content,
but for now let's keep it in the repository.
Modified Paths:
--------------
wiki/branches/wrh2/jamwiki-war/src/main/webapp/WEB-INF/jsp/edit.jsp
wiki/branches/wrh2/jamwiki-war/src/main/webapp/js/fckeditor-jamwiki.js
wiki/branches/wrh2/jamwiki-web/src/main/java/org/jamwiki/servlets/EditServlet.java
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 3369
http://jamwiki.svn.sourceforge.net/jamwiki/?rev=3369&view=rev
Author: wrh2
Date: 2010-12-31 01:10:34 +0000 (Fri, 31 Dec 2010)
Log Message:
-----------
Documentation:
* Update the CHANGELOG to improve readability and list items that are of
greater interest at the top.
Modified Paths:
--------------
wiki/trunk/jamwiki-war/src/main/webapp/CHANGELOG.txt
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 3367
http://jamwiki.svn.sourceforge.net/jamwiki/?rev=3367&view=rev
Author: wrh2
Date: 2010-12-30 17:12:25 +0000 (Thu, 30 Dec 2010)
Log Message:
-----------
Parser:
* Support the Mediawiki <onlyinclude> tag for template content.
* Note that this code is a bit hackish, but the onlyinclude tag is
problematic in that most tags only affect their own content, but
onlyinclude indicates the preceding and following content should be
ignored, requiring special handling.
Modified Paths:
--------------
wiki/trunk/jamwiki-core/src/main/java/org/jamwiki/parser/jflex/JFlexLexer.java
wiki/trunk/jamwiki-core/src/main/java/org/jamwiki/parser/jflex/TemplateTag.java
wiki/trunk/jamwiki-core/src/main/jflex/jamwiki-template-processor.jflex
wiki/trunk/jamwiki-war/src/main/webapp/CHANGELOG.txt
Added Paths:
-----------
wiki/trunk/jamwiki-core/src/main/java/org/jamwiki/parser/jflex/OnlyIncludeTag.java
wiki/trunk/jamwiki-core/src/test/resources/data/results/Onlyinclude
wiki/trunk/jamwiki-core/src/test/resources/data/topics/Onlyinclude
wiki/trunk/jamwiki-core/src/test/resources/data/topics/Template_-_Onlyinclude
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 3361
http://jamwiki.svn.sourceforge.net/jamwiki/?rev=3361&view=rev
Author: wrh2
Date: 2010-12-29 18:37:08 +0000 (Wed, 29 Dec 2010)
Log Message:
-----------
Taglibs:
* The security.tld file is included in the spring-security-taglibs.jar so
delete it from the jamwiki-war project. Since JSP 2.0 it is no longer
necessary to configure taglibs through the web.xml file as they will be
auto-discovered.
* Reported by Michael Osipov.
Modified Paths:
--------------
wiki/trunk/jamwiki-war/src/main/webapp/WEB-INF/web.xml
Removed Paths:
-------------
wiki/trunk/jamwiki-war/src/main/webapp/WEB-INF/security.tld
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 3360
http://jamwiki.svn.sourceforge.net/jamwiki/?rev=3360&view=rev
Author: wrh2
Date: 2010-12-29 18:18:14 +0000 (Wed, 29 Dec 2010)
Log Message:
-----------
Taglibs:
* Move the jamwiki.tld to the jamwiki-web project. Since JSP 2.0 it is no
longer necessary to configure taglibs through the web.xml file as they
will be auto-discovered in the META-INF directory of JAR files that
are in the /WEB-INF/lib folder.
* Reported by Michael Osipov.
Modified Paths:
--------------
wiki/trunk/jamwiki-war/src/main/webapp/WEB-INF/web.xml
Added Paths:
-----------
wiki/trunk/jamwiki-web/src/main/resources/
wiki/trunk/jamwiki-web/src/main/resources/META-INF/
wiki/trunk/jamwiki-web/src/main/resources/META-INF/jamwiki.tld
Removed Paths:
-------------
wiki/trunk/jamwiki-war/src/main/webapp/WEB-INF/jamwiki.tld
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.