You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jspwiki.apache.org by ja...@apache.org on 2009/01/30 00:23:38 UTC
svn commit: r739080 [1/2] - in /incubator/jspwiki/trunk: ./ .settings/ etc/
lib/ src/WebContent/ src/WebContent/WEB-INF/
src/WebContent/WEB-INF/classes/ src/WebContent/WEB-INF/lib/
src/WebContent/admin/ src/WebContent/applets/ src/WebContent/error/ src...
Author: jalkanen
Date: Thu Jan 29 23:23:31 2009
New Revision: 739080
URL: http://svn.apache.org/viewvc?rev=739080&view=rev
Log:
Massive restructuring to make JSPWiki a WTP project.
Added:
incubator/jspwiki/trunk/.settings/.jsdtscope
incubator/jspwiki/trunk/.settings/org.eclipse.jst.common.project.facet.core.prefs
incubator/jspwiki/trunk/.settings/org.eclipse.jst.j2ee.ejb.annotations.xdoclet.prefs
incubator/jspwiki/trunk/.settings/org.eclipse.jst.jsp.core.prefs
incubator/jspwiki/trunk/.settings/org.eclipse.wst.common.component
incubator/jspwiki/trunk/.settings/org.eclipse.wst.common.project.facet.core.xml
incubator/jspwiki/trunk/.settings/org.eclipse.wst.html.core.prefs
incubator/jspwiki/trunk/.settings/org.eclipse.wst.jsdt.ui.superType.container
incubator/jspwiki/trunk/.settings/org.eclipse.wst.jsdt.ui.superType.name
incubator/jspwiki/trunk/.settings/org.eclipse.wst.ws.service.policy.prefs
incubator/jspwiki/trunk/etc/jspwiki.properties.tmpl (contents, props changed)
- copied, changed from r738991, incubator/jspwiki/trunk/etc/jspwiki.properties.tmpl
incubator/jspwiki/trunk/src/WebContent/
incubator/jspwiki/trunk/src/WebContent/Captcha.jsp (props changed)
- copied unchanged from r738991, incubator/jspwiki/trunk/src/webdocs/Captcha.jsp
incubator/jspwiki/trunk/src/WebContent/Comment.jsp (props changed)
- copied unchanged from r738991, incubator/jspwiki/trunk/src/webdocs/Comment.jsp
incubator/jspwiki/trunk/src/WebContent/CookieError.jsp (props changed)
- copied unchanged from r738991, incubator/jspwiki/trunk/src/webdocs/CookieError.jsp
incubator/jspwiki/trunk/src/WebContent/CreateProfile.jsp (props changed)
- copied unchanged from r738991, incubator/jspwiki/trunk/src/webdocs/CreateProfile.jsp
incubator/jspwiki/trunk/src/WebContent/Delete.jsp (props changed)
- copied unchanged from r738991, incubator/jspwiki/trunk/src/webdocs/Delete.jsp
incubator/jspwiki/trunk/src/WebContent/DeleteGroup.jsp (props changed)
- copied unchanged from r738991, incubator/jspwiki/trunk/src/webdocs/DeleteGroup.jsp
incubator/jspwiki/trunk/src/WebContent/Diff.jsp (props changed)
- copied unchanged from r738991, incubator/jspwiki/trunk/src/webdocs/Diff.jsp
incubator/jspwiki/trunk/src/WebContent/Edit.jsp (props changed)
- copied unchanged from r738991, incubator/jspwiki/trunk/src/webdocs/Edit.jsp
incubator/jspwiki/trunk/src/WebContent/EditGroup.jsp (props changed)
- copied unchanged from r738991, incubator/jspwiki/trunk/src/webdocs/EditGroup.jsp
incubator/jspwiki/trunk/src/WebContent/Error.jsp (props changed)
- copied unchanged from r738991, incubator/jspwiki/trunk/src/webdocs/Error.jsp
incubator/jspwiki/trunk/src/WebContent/Group.jsp (props changed)
- copied unchanged from r738991, incubator/jspwiki/trunk/src/webdocs/Group.jsp
incubator/jspwiki/trunk/src/WebContent/Install.jsp (props changed)
- copied unchanged from r738991, incubator/jspwiki/trunk/src/webdocs/Install.jsp
incubator/jspwiki/trunk/src/WebContent/Login.jsp (props changed)
- copied unchanged from r738991, incubator/jspwiki/trunk/src/webdocs/Login.jsp
incubator/jspwiki/trunk/src/WebContent/LoginForm.jsp (props changed)
- copied unchanged from r738991, incubator/jspwiki/trunk/src/webdocs/LoginForm.jsp
incubator/jspwiki/trunk/src/WebContent/Logout.jsp (props changed)
- copied unchanged from r738991, incubator/jspwiki/trunk/src/webdocs/Logout.jsp
incubator/jspwiki/trunk/src/WebContent/LostPassword.jsp (props changed)
- copied unchanged from r738991, incubator/jspwiki/trunk/src/webdocs/LostPassword.jsp
incubator/jspwiki/trunk/src/WebContent/Message.jsp (props changed)
- copied unchanged from r738991, incubator/jspwiki/trunk/src/webdocs/Message.jsp
incubator/jspwiki/trunk/src/WebContent/NewBlogEntry.jsp (props changed)
- copied unchanged from r738991, incubator/jspwiki/trunk/src/webdocs/NewBlogEntry.jsp
incubator/jspwiki/trunk/src/WebContent/NewGroup.jsp (props changed)
- copied unchanged from r738991, incubator/jspwiki/trunk/src/webdocs/NewGroup.jsp
incubator/jspwiki/trunk/src/WebContent/PageInfo.jsp (props changed)
- copied unchanged from r738991, incubator/jspwiki/trunk/src/webdocs/PageInfo.jsp
incubator/jspwiki/trunk/src/WebContent/PageModified.jsp (props changed)
- copied unchanged from r738991, incubator/jspwiki/trunk/src/webdocs/PageModified.jsp
incubator/jspwiki/trunk/src/WebContent/Preview.jsp (props changed)
- copied unchanged from r738991, incubator/jspwiki/trunk/src/webdocs/Preview.jsp
incubator/jspwiki/trunk/src/WebContent/Rename.jsp (props changed)
- copied unchanged from r738991, incubator/jspwiki/trunk/src/webdocs/Rename.jsp
incubator/jspwiki/trunk/src/WebContent/Search.jsp (props changed)
- copied unchanged from r738991, incubator/jspwiki/trunk/src/webdocs/Search.jsp
incubator/jspwiki/trunk/src/WebContent/SisterSites.jsp (props changed)
- copied unchanged from r738991, incubator/jspwiki/trunk/src/webdocs/SisterSites.jsp
incubator/jspwiki/trunk/src/WebContent/Upload.jsp (props changed)
- copied unchanged from r738991, incubator/jspwiki/trunk/src/webdocs/Upload.jsp
incubator/jspwiki/trunk/src/WebContent/UserPreferences.jsp (props changed)
- copied unchanged from r738991, incubator/jspwiki/trunk/src/webdocs/UserPreferences.jsp
incubator/jspwiki/trunk/src/WebContent/WEB-INF/
incubator/jspwiki/trunk/src/WebContent/WEB-INF/classes/
incubator/jspwiki/trunk/src/WebContent/WEB-INF/classes/log4j.properties (props changed)
- copied unchanged from r738991, incubator/jspwiki/trunk/etc/log4j.properties
incubator/jspwiki/trunk/src/WebContent/WEB-INF/classes/oscache.properties (props changed)
- copied unchanged from r738991, incubator/jspwiki/trunk/etc/oscache.properties
incubator/jspwiki/trunk/src/WebContent/WEB-INF/geronimo-web.xml (props changed)
- copied unchanged from r738991, incubator/jspwiki/trunk/etc/geronimo-web.xml
incubator/jspwiki/trunk/src/WebContent/WEB-INF/groupdatabase.xml (props changed)
- copied unchanged from r738991, incubator/jspwiki/trunk/etc/groupdatabase.xml
incubator/jspwiki/trunk/src/WebContent/WEB-INF/jspwiki-container.policy (props changed)
- copied unchanged from r738991, incubator/jspwiki/trunk/etc/jspwiki-container.policy
incubator/jspwiki/trunk/src/WebContent/WEB-INF/jspwiki.policy (props changed)
- copied unchanged from r738991, incubator/jspwiki/trunk/etc/jspwiki.policy
incubator/jspwiki/trunk/src/WebContent/WEB-INF/jspwiki.tld (props changed)
- copied unchanged from r738991, incubator/jspwiki/trunk/etc/jspwiki.tld
incubator/jspwiki/trunk/src/WebContent/WEB-INF/lib/
incubator/jspwiki/trunk/src/WebContent/WEB-INF/lib/README (props changed)
- copied unchanged from r738991, incubator/jspwiki/trunk/lib/README
incubator/jspwiki/trunk/src/WebContent/WEB-INF/lib/activation.jar (props changed)
- copied unchanged from r738991, incubator/jspwiki/trunk/lib/activation.jar
incubator/jspwiki/trunk/src/WebContent/WEB-INF/lib/akismet-java-1.02.jar (props changed)
- copied unchanged from r738991, incubator/jspwiki/trunk/lib/akismet-java-1.02.jar
incubator/jspwiki/trunk/src/WebContent/WEB-INF/lib/commons-codec-1.3.jar (props changed)
- copied unchanged from r738991, incubator/jspwiki/trunk/lib/commons-codec-1.3.jar
incubator/jspwiki/trunk/src/WebContent/WEB-INF/lib/commons-fileupload-1.2.1.jar (props changed)
- copied unchanged from r738991, incubator/jspwiki/trunk/lib/commons-fileupload-1.2.1.jar
incubator/jspwiki/trunk/src/WebContent/WEB-INF/lib/commons-httpclient-3.0.1.jar (props changed)
- copied unchanged from r738991, incubator/jspwiki/trunk/lib/commons-httpclient-3.0.1.jar
incubator/jspwiki/trunk/src/WebContent/WEB-INF/lib/commons-io-1.4.jar (props changed)
- copied unchanged from r738991, incubator/jspwiki/trunk/lib/commons-io-1.4.jar
incubator/jspwiki/trunk/src/WebContent/WEB-INF/lib/commons-lang-2.3.jar (props changed)
- copied unchanged from r738991, incubator/jspwiki/trunk/lib/commons-lang-2.3.jar
incubator/jspwiki/trunk/src/WebContent/WEB-INF/lib/ecs.jar (props changed)
- copied unchanged from r738991, incubator/jspwiki/trunk/lib/ecs.jar
incubator/jspwiki/trunk/src/WebContent/WEB-INF/lib/freshcookies-security-0.60.jar (props changed)
- copied unchanged from r738991, incubator/jspwiki/trunk/lib/freshcookies-security-0.60.jar
incubator/jspwiki/trunk/src/WebContent/WEB-INF/lib/jabsorb-1.3.jar (props changed)
- copied unchanged from r738991, incubator/jspwiki/trunk/lib/jabsorb-1.3.jar
incubator/jspwiki/trunk/src/WebContent/WEB-INF/lib/jakarta-tablibs-standard-1.1.2.jar (props changed)
- copied unchanged from r738991, incubator/jspwiki/trunk/lib/jakarta-tablibs-standard-1.1.2.jar
incubator/jspwiki/trunk/src/WebContent/WEB-INF/lib/jakarta-taglibs-jstl-1.1.2.jar (props changed)
- copied unchanged from r738991, incubator/jspwiki/trunk/lib/jakarta-taglibs-jstl-1.1.2.jar
incubator/jspwiki/trunk/src/WebContent/WEB-INF/lib/jaxen.jar (props changed)
- copied unchanged from r738991, incubator/jspwiki/trunk/lib/jaxen.jar
incubator/jspwiki/trunk/src/WebContent/WEB-INF/lib/jcl-over-slf4j-1.5.6.jar (props changed)
- copied unchanged from r738991, incubator/jspwiki/trunk/lib/jcl-over-slf4j-1.5.6.jar
incubator/jspwiki/trunk/src/WebContent/WEB-INF/lib/jcr-1.0.jar (props changed)
- copied unchanged from r738991, incubator/jspwiki/trunk/lib/jcr-1.0.jar
incubator/jspwiki/trunk/src/WebContent/WEB-INF/lib/jdom.jar (props changed)
- copied unchanged from r738991, incubator/jspwiki/trunk/lib/jdom.jar
incubator/jspwiki/trunk/src/WebContent/WEB-INF/lib/jrcs-diff.jar (props changed)
- copied unchanged from r738991, incubator/jspwiki/trunk/lib/jrcs-diff.jar
incubator/jspwiki/trunk/src/WebContent/WEB-INF/lib/jsp-api.jar (props changed)
- copied unchanged from r738991, incubator/jspwiki/trunk/lib/jsp-api.jar
incubator/jspwiki/trunk/src/WebContent/WEB-INF/lib/jul-to-slf4j-1.5.6.jar (props changed)
- copied unchanged from r738991, incubator/jspwiki/trunk/lib/jul-to-slf4j-1.5.6.jar
incubator/jspwiki/trunk/src/WebContent/WEB-INF/lib/log4j-1.2.14.jar (props changed)
- copied unchanged from r738991, incubator/jspwiki/trunk/lib/log4j-1.2.14.jar
incubator/jspwiki/trunk/src/WebContent/WEB-INF/lib/lucene-highlighter.jar (props changed)
- copied unchanged from r738991, incubator/jspwiki/trunk/lib/lucene-highlighter.jar
incubator/jspwiki/trunk/src/WebContent/WEB-INF/lib/lucene.jar (props changed)
- copied unchanged from r738991, incubator/jspwiki/trunk/lib/lucene.jar
incubator/jspwiki/trunk/src/WebContent/WEB-INF/lib/mail.jar (props changed)
- copied unchanged from r738991, incubator/jspwiki/trunk/lib/mail.jar
incubator/jspwiki/trunk/src/WebContent/WEB-INF/lib/nekohtml.jar (props changed)
- copied unchanged from r738991, incubator/jspwiki/trunk/lib/nekohtml.jar
incubator/jspwiki/trunk/src/WebContent/WEB-INF/lib/oscache.jar (props changed)
- copied unchanged from r738991, incubator/jspwiki/trunk/lib/oscache.jar
incubator/jspwiki/trunk/src/WebContent/WEB-INF/lib/priha-0.1.12.jar (props changed)
- copied unchanged from r738991, incubator/jspwiki/trunk/lib/priha-0.1.12.jar
incubator/jspwiki/trunk/src/WebContent/WEB-INF/lib/priha-0.1.13.jar (with props)
incubator/jspwiki/trunk/src/WebContent/WEB-INF/lib/sandler.jar (props changed)
- copied unchanged from r738991, incubator/jspwiki/trunk/lib/sandler.jar
incubator/jspwiki/trunk/src/WebContent/WEB-INF/lib/servlet-api.jar (props changed)
- copied unchanged from r738991, incubator/jspwiki/trunk/lib/servlet-api.jar
incubator/jspwiki/trunk/src/WebContent/WEB-INF/lib/slf4j-api-1.5.6.jar (props changed)
- copied unchanged from r738991, incubator/jspwiki/trunk/lib/slf4j-api-1.5.6.jar
incubator/jspwiki/trunk/src/WebContent/WEB-INF/lib/slf4j-log4j12-1.5.6.jar (props changed)
- copied unchanged from r738991, incubator/jspwiki/trunk/lib/slf4j-log4j12-1.5.6.jar
incubator/jspwiki/trunk/src/WebContent/WEB-INF/lib/stripes-1.5.jar (props changed)
- copied unchanged from r738991, incubator/jspwiki/trunk/lib/stripes-1.5.jar
incubator/jspwiki/trunk/src/WebContent/WEB-INF/lib/xmlrpc.jar (props changed)
- copied unchanged from r738991, incubator/jspwiki/trunk/lib/xmlrpc.jar
incubator/jspwiki/trunk/src/WebContent/WEB-INF/userdatabase.xml (props changed)
- copied unchanged from r738991, incubator/jspwiki/trunk/etc/userdatabase.xml
incubator/jspwiki/trunk/src/WebContent/WEB-INF/web.xml
incubator/jspwiki/trunk/src/WebContent/Wiki.jsp (props changed)
- copied unchanged from r738991, incubator/jspwiki/trunk/src/webdocs/Wiki.jsp
incubator/jspwiki/trunk/src/WebContent/Workflow.jsp (props changed)
- copied unchanged from r738991, incubator/jspwiki/trunk/src/webdocs/Workflow.jsp
incubator/jspwiki/trunk/src/WebContent/admin/ (props changed)
- copied from r738991, incubator/jspwiki/trunk/src/webdocs/admin/
incubator/jspwiki/trunk/src/WebContent/applets/ (props changed)
- copied from r738991, incubator/jspwiki/trunk/src/webdocs/applets/
incubator/jspwiki/trunk/src/WebContent/atom.css (props changed)
- copied unchanged from r738991, incubator/jspwiki/trunk/src/webdocs/atom.css
incubator/jspwiki/trunk/src/WebContent/error/ (props changed)
- copied from r738991, incubator/jspwiki/trunk/src/webdocs/error/
incubator/jspwiki/trunk/src/WebContent/images/ (props changed)
- copied from r738991, incubator/jspwiki/trunk/src/webdocs/images/
incubator/jspwiki/trunk/src/WebContent/rss.jsp (props changed)
- copied unchanged from r738991, incubator/jspwiki/trunk/src/webdocs/rss.jsp
incubator/jspwiki/trunk/src/WebContent/scripts/ (props changed)
- copied from r738991, incubator/jspwiki/trunk/src/webdocs/scripts/
incubator/jspwiki/trunk/src/WebContent/templates/ (props changed)
- copied from r738991, incubator/jspwiki/trunk/src/webdocs/templates/
incubator/jspwiki/trunk/src/java/
incubator/jspwiki/trunk/src/java/com/ (props changed)
- copied from r738991, incubator/jspwiki/trunk/src/com/
incubator/jspwiki/trunk/src/java/org/ (props changed)
- copied from r738991, incubator/jspwiki/trunk/src/org/
incubator/jspwiki/trunk/tests/java/
incubator/jspwiki/trunk/tests/java/SamplePlugin2.java (props changed)
- copied unchanged from r738991, incubator/jspwiki/trunk/tests/SamplePlugin2.java
incubator/jspwiki/trunk/tests/java/TranslationsCheck.java (props changed)
- copied unchanged from r738991, incubator/jspwiki/trunk/tests/TranslationsCheck.java
incubator/jspwiki/trunk/tests/java/com/ (props changed)
- copied from r738991, incubator/jspwiki/trunk/tests/com/
incubator/jspwiki/trunk/tests/java/stress/ (props changed)
- copied from r738991, incubator/jspwiki/trunk/tests/stress/
Removed:
incubator/jspwiki/trunk/etc/geronimo-web.xml
incubator/jspwiki/trunk/etc/groupdatabase.xml
incubator/jspwiki/trunk/etc/jspwiki-container.policy
incubator/jspwiki/trunk/etc/jspwiki.policy
incubator/jspwiki/trunk/etc/jspwiki.tld
incubator/jspwiki/trunk/etc/log4j.properties
incubator/jspwiki/trunk/etc/oscache.properties
incubator/jspwiki/trunk/etc/userdatabase.xml
incubator/jspwiki/trunk/etc/web.xml
incubator/jspwiki/trunk/lib/README
incubator/jspwiki/trunk/lib/activation.jar
incubator/jspwiki/trunk/lib/akismet-java-1.02.jar
incubator/jspwiki/trunk/lib/commons-codec-1.3.jar
incubator/jspwiki/trunk/lib/commons-fileupload-1.2.1.jar
incubator/jspwiki/trunk/lib/commons-httpclient-3.0.1.jar
incubator/jspwiki/trunk/lib/commons-io-1.4.jar
incubator/jspwiki/trunk/lib/commons-lang-2.3.jar
incubator/jspwiki/trunk/lib/ecs.jar
incubator/jspwiki/trunk/lib/freshcookies-security-0.60.jar
incubator/jspwiki/trunk/lib/jabsorb-1.3.jar
incubator/jspwiki/trunk/lib/jakarta-tablibs-standard-1.1.2.jar
incubator/jspwiki/trunk/lib/jakarta-taglibs-jstl-1.1.2.jar
incubator/jspwiki/trunk/lib/jaxen.jar
incubator/jspwiki/trunk/lib/jcl-over-slf4j-1.5.6.jar
incubator/jspwiki/trunk/lib/jcr-1.0.jar
incubator/jspwiki/trunk/lib/jdom.jar
incubator/jspwiki/trunk/lib/jrcs-diff.jar
incubator/jspwiki/trunk/lib/jsp-api.jar
incubator/jspwiki/trunk/lib/jul-to-slf4j-1.5.6.jar
incubator/jspwiki/trunk/lib/log4j-1.2.14.jar
incubator/jspwiki/trunk/lib/lucene-highlighter.jar
incubator/jspwiki/trunk/lib/lucene.jar
incubator/jspwiki/trunk/lib/mail.jar
incubator/jspwiki/trunk/lib/nekohtml.jar
incubator/jspwiki/trunk/lib/oscache.jar
incubator/jspwiki/trunk/lib/priha-0.1.12.jar
incubator/jspwiki/trunk/lib/sandler.jar
incubator/jspwiki/trunk/lib/servlet-api.jar
incubator/jspwiki/trunk/lib/slf4j-api-1.5.6.jar
incubator/jspwiki/trunk/lib/slf4j-log4j12-1.5.6.jar
incubator/jspwiki/trunk/lib/stripes-1.5.jar
incubator/jspwiki/trunk/lib/xmlrpc.jar
incubator/jspwiki/trunk/src/com/
incubator/jspwiki/trunk/src/org/
incubator/jspwiki/trunk/src/webdocs/Captcha.jsp
incubator/jspwiki/trunk/src/webdocs/Comment.jsp
incubator/jspwiki/trunk/src/webdocs/CookieError.jsp
incubator/jspwiki/trunk/src/webdocs/CreateProfile.jsp
incubator/jspwiki/trunk/src/webdocs/Delete.jsp
incubator/jspwiki/trunk/src/webdocs/DeleteGroup.jsp
incubator/jspwiki/trunk/src/webdocs/Diff.jsp
incubator/jspwiki/trunk/src/webdocs/Edit.jsp
incubator/jspwiki/trunk/src/webdocs/EditGroup.jsp
incubator/jspwiki/trunk/src/webdocs/Error.jsp
incubator/jspwiki/trunk/src/webdocs/Group.jsp
incubator/jspwiki/trunk/src/webdocs/Install.jsp
incubator/jspwiki/trunk/src/webdocs/Login.jsp
incubator/jspwiki/trunk/src/webdocs/LoginForm.jsp
incubator/jspwiki/trunk/src/webdocs/Logout.jsp
incubator/jspwiki/trunk/src/webdocs/LostPassword.jsp
incubator/jspwiki/trunk/src/webdocs/Message.jsp
incubator/jspwiki/trunk/src/webdocs/NewBlogEntry.jsp
incubator/jspwiki/trunk/src/webdocs/NewGroup.jsp
incubator/jspwiki/trunk/src/webdocs/PageInfo.jsp
incubator/jspwiki/trunk/src/webdocs/PageModified.jsp
incubator/jspwiki/trunk/src/webdocs/Preview.jsp
incubator/jspwiki/trunk/src/webdocs/Rename.jsp
incubator/jspwiki/trunk/src/webdocs/Search.jsp
incubator/jspwiki/trunk/src/webdocs/SisterSites.jsp
incubator/jspwiki/trunk/src/webdocs/Upload.jsp
incubator/jspwiki/trunk/src/webdocs/UserPreferences.jsp
incubator/jspwiki/trunk/src/webdocs/Wiki.jsp
incubator/jspwiki/trunk/src/webdocs/Workflow.jsp
incubator/jspwiki/trunk/src/webdocs/admin/
incubator/jspwiki/trunk/src/webdocs/applets/
incubator/jspwiki/trunk/src/webdocs/atom.css
incubator/jspwiki/trunk/src/webdocs/error/
incubator/jspwiki/trunk/src/webdocs/images/
incubator/jspwiki/trunk/src/webdocs/rss.jsp
incubator/jspwiki/trunk/src/webdocs/scripts/
incubator/jspwiki/trunk/src/webdocs/templates/
incubator/jspwiki/trunk/tests/SamplePlugin2.java
incubator/jspwiki/trunk/tests/TranslationsCheck.java
incubator/jspwiki/trunk/tests/com/
incubator/jspwiki/trunk/tests/stress/
Modified:
incubator/jspwiki/trunk/.classpath
incubator/jspwiki/trunk/.fbprefs
incubator/jspwiki/trunk/.project
incubator/jspwiki/trunk/.settings/org.eclipse.jdt.core.prefs
incubator/jspwiki/trunk/.settings/org.eclipse.jdt.ui.prefs
incubator/jspwiki/trunk/ChangeLog
incubator/jspwiki/trunk/build.xml
incubator/jspwiki/trunk/src/java/com/ecyrd/jspwiki/Release.java
incubator/jspwiki/trunk/src/java/com/ecyrd/jspwiki/content/ContentManager.java
incubator/jspwiki/trunk/tests/java/com/ecyrd/jspwiki/content/ContentManagerTest.java
Modified: incubator/jspwiki/trunk/.classpath
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/.classpath?rev=739080&r1=739079&r2=739080&view=diff
==============================================================================
--- incubator/jspwiki/trunk/.classpath (original)
+++ incubator/jspwiki/trunk/.classpath Thu Jan 29 23:23:31 2009
@@ -1,48 +1,13 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
- <classpathentry excluding="**/package.html|images/|webdocs/|wikipages/" kind="src" output="build" path="src"/>
- <classpathentry excluding="etc/|build/|reports/|lib/" kind="src" output="tests/build" path="tests"/>
- <classpathentry kind="lib" path="lib/commons-lang-2.3.jar"/>
- <classpathentry kind="lib" path="lib/ecs.jar"/>
- <classpathentry kind="lib" path="lib/jdom.jar"/>
- <classpathentry kind="lib" path="lib/akismet-java-1.02.jar"/>
- <classpathentry kind="lib" path="lib/jabsorb-1.3.jar"/>
- <classpathentry kind="lib" path="lib/xmlrpc.jar"/>
- <classpathentry kind="lib" path="lib/jrcs-diff.jar"/>
- <classpathentry kind="lib" path="tests/lib/xercesImpl-2.6.2.jar"/>
- <classpathentry kind="lib" path="lib/sandler.jar"/>
- <classpathentry kind="lib" path="lib/oscache.jar"/>
- <classpathentry kind="lib" path="lib/nekohtml.jar"/>
- <classpathentry kind="lib" path="lib/lucene.jar"/>
- <classpathentry kind="lib" path="tests/lib/junit.jar"/>
- <classpathentry kind="lib" path="tests/etc"/>
- <classpathentry kind="lib" path="lib/jaxen.jar"/>
- <classpathentry kind="lib" path="tests/lib/xml-apis-1.0.b2.jar"/>
- <classpathentry kind="lib" path="lib/lucene-highlighter.jar"/>
- <classpathentry kind="lib" path="lib/mail.jar"/>
- <classpathentry kind="lib" path="lib/activation.jar"/>
- <classpathentry kind="lib" path="etc/i18n"/>
- <classpathentry kind="lib" path="lib/freshcookies-security-0.60.jar"/>
- <classpathentry kind="lib" path="lib/commons-httpclient-3.0.1.jar"/>
- <classpathentry kind="lib" path="lib/jakarta-taglibs-jstl-1.1.2.jar"/>
- <classpathentry kind="lib" path="lib/jakarta-tablibs-standard-1.1.2.jar"/>
- <classpathentry kind="lib" path="lib/commons-fileupload-1.2.1.jar"/>
- <classpathentry kind="lib" path="lib/commons-codec-1.3.jar"/>
- <classpathentry kind="lib" path="tests/lib/commons-el-1.0.jar"/>
- <classpathentry kind="lib" path="tests/lib/hsqldb.jar"/>
- <classpathentry kind="lib" path="tests/lib/jasper-compiler-5.5.25.jar"/>
- <classpathentry kind="lib" path="tests/lib/jasper-runtime-5.5.25.jar"/>
- <classpathentry kind="lib" path="tests/lib/jetty-jmx-5.1.14.jar"/>
+ <classpathentry kind="src" path="src/java"/>
+ <classpathentry kind="src" path="tests/java"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.launching.macosx.MacOSXType/JVM 1.5.0"/>
+ <classpathentry kind="con" path="org.eclipse.jst.server.core.container/org.eclipse.jst.server.tomcat.runtimeTarget/Apache Tomcat v5.5"/>
+ <classpathentry kind="con" path="org.eclipse.jst.j2ee.internal.web.container"/>
+ <classpathentry kind="con" path="org.eclipse.jst.j2ee.internal.module.container"/>
<classpathentry kind="lib" path="tests/lib/jetty-plus-5.1.14.jar"/>
- <classpathentry kind="lib" path="tests/lib/jetty-servlet-5.1.14.jar"/>
+ <classpathentry kind="lib" path="tests/lib/jetty-jmx-5.1.14.jar"/>
<classpathentry kind="lib" path="tests/lib/selenium-server-1.0-beta1.jar"/>
- <classpathentry kind="lib" path="lib/stripes-1.5.jar" sourcepath="/stripes-1.5/stripes/src"/>
- <classpathentry kind="lib" path="lib/slf4j-log4j12-1.5.6.jar"/>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
- <classpathentry kind="lib" path="lib/slf4j-api-1.5.6.jar"/>
- <classpathentry kind="lib" path="lib/jul-to-slf4j-1.5.6.jar"/>
- <classpathentry kind="lib" path="lib/log4j-1.2.14.jar"/>
- <classpathentry kind="lib" path="lib/jcr-1.0.jar"/>
- <classpathentry kind="lib" path="lib/priha-0.1.12.jar"/>
- <classpathentry kind="output" path="classes"/>
+ <classpathentry kind="output" path="build/classes"/>
</classpath>
Modified: incubator/jspwiki/trunk/.fbprefs
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/.fbprefs?rev=739080&r1=739079&r2=739080&view=diff
==============================================================================
--- incubator/jspwiki/trunk/.fbprefs (original)
+++ incubator/jspwiki/trunk/.fbprefs Thu Jan 29 23:23:31 2009
@@ -1,27 +1,35 @@
#FindBugs User Preferences
-#Fri May 18 22:52:30 EEST 2007
+#Fri Jan 30 00:36:41 EET 2009
+detectorAppendingToAnObjectOutputStream=AppendingToAnObjectOutputStream|true
detectorBCPMethodReturnCheck=BCPMethodReturnCheck|false
detectorBadAppletConstructor=BadAppletConstructor|false
detectorBadResultSetAccess=BadResultSetAccess|true
detectorBadSyntaxForRegularExpression=BadSyntaxForRegularExpression|true
detectorBadUseOfReturnValue=BadUseOfReturnValue|true
detectorBadlyOverriddenAdapter=BadlyOverriddenAdapter|true
+detectorBooleanReturnNull=BooleanReturnNull|true
+detectorCallToUnsupportedMethod=CallToUnsupportedMethod|true
detectorCalledMethods=CalledMethods|true
detectorCheckCalls=CheckCalls|false
detectorCheckImmutableAnnotation=CheckImmutableAnnotation|true
+detectorCheckTypeQualifiers=CheckTypeQualifiers|true
detectorCloneIdiom=CloneIdiom|true
detectorComparatorIdiom=ComparatorIdiom|false
detectorConfusedInheritance=ConfusedInheritance|true
detectorConfusionBetweenInheritedAndOuterMethod=ConfusionBetweenInheritedAndOuterMethod|true
+detectorCrossSiteScripting=CrossSiteScripting|true
detectorDoInsideDoPriviledged=DoInsideDoPriviledged|true
detectorDoInsideDoPrivileged=DoInsideDoPrivileged|true
detectorDontCatchIllegalMonitorStateException=DontCatchIllegalMonitorStateException|true
+detectorDontUseEnum=DontUseEnum|true
detectorDroppedException=DroppedException|true
detectorDumbMethodInvocations=DumbMethodInvocations|true
detectorDumbMethods=DumbMethods|true
detectorDuplicateBranches=DuplicateBranches|true
detectorEmptyZipFileEntry=EmptyZipFileEntry|true
detectorEqStringTest=EqStringTest|false
+detectorEqualsOperandShouldHaveClassCompatibleWithThis=EqualsOperandShouldHaveClassCompatibleWithThis|true
+detectorFinalizerNullsFields=FinalizerNullsFields|true
detectorFindBadCast=FindBadCast|false
detectorFindBadCast2=FindBadCast2|true
detectorFindBadEqualsImplementation=FindBadEqualsImplementation|false
@@ -46,6 +54,7 @@
detectorFindNonSerializableValuePassedToWriteObject=FindNonSerializableValuePassedToWriteObject|true
detectorFindNonShortCircuit=FindNonShortCircuit|true
detectorFindNullDeref=FindNullDeref|true
+detectorFindNullDerefsInvolvingNonShortCircuitEvaluation=FindNullDerefsInvolvingNonShortCircuitEvaluation|true
detectorFindOpenStream=FindOpenStream|true
detectorFindPuzzlers=FindPuzzlers|true
detectorFindRefComparison=FindRefComparison|true
@@ -65,9 +74,11 @@
detectorFindUnsatisfiedObligation=FindUnsatisfiedObligation|false
detectorFindUnsyncGet=FindUnsyncGet|true
detectorFindUselessControlFlow=FindUselessControlFlow|true
+detectorFormatStringChecker=FormatStringChecker|true
detectorHugeSharedStringConstants=HugeSharedStringConstants|true
detectorIDivResultCastToDouble=IDivResultCastToDouble|true
detectorIncompatMask=IncompatMask|true
+detectorInconsistentAnnotations=InconsistentAnnotations|true
detectorInefficientMemberAccess=InefficientMemberAccess|true
detectorInefficientToArray=InefficientToArray|true
detectorInfiniteLoop=InfiniteLoop|false
@@ -95,11 +106,13 @@
detectorNoteSuppressedWarnings=NoteSuppressedWarnings|true
detectorNoteUnconditionalParamDerefs=NoteUnconditionalParamDerefs|true
detectorNumberConstructor=NumberConstructor|true
+detectorOverridingEqualsNotSymmetrical=OverridingEqualsNotSymmetrical|true
detectorPreferZeroLengthArrays=PreferZeroLengthArrays|true
detectorPublicSemaphores=PublicSemaphores|true
detectorQuestionableBooleanAssignment=QuestionableBooleanAssignment|true
detectorReadReturnShouldBeChecked=ReadReturnShouldBeChecked|true
detectorRedundantInterfaces=RedundantInterfaces|true
+detectorRepeatedConditionals=RepeatedConditionals|true
detectorResolveAllReferences=ResolveAllReferences|false
detectorRuntimeExceptionCapture=RuntimeExceptionCapture|true
detectorSerializableIdiom=SerializableIdiom|false
@@ -109,6 +122,9 @@
detectorSuperfluousInstanceOf=SuperfluousInstanceOf|true
detectorSuspiciousThreadInterrupted=SuspiciousThreadInterrupted|true
detectorSwitchFallthrough=SwitchFallthrough|true
+detectorSynchronizeAndNullCheckField=SynchronizeAndNullCheckField|true
+detectorSynchronizeOnClassLiteralNotGetClass=SynchronizeOnClassLiteralNotGetClass|true
+detectorSynchronizingOnContentsOfFieldToProtectField=SynchronizingOnContentsOfFieldToProtectField|true
detectorTestingGround=TestingGround|false
detectorTrainFieldStoreTypes=TrainFieldStoreTypes|true
detectorTrainNonNullAnnotations=TrainNonNullAnnotations|true
@@ -125,5 +141,7 @@
detectorWrongMapIterator=WrongMapIterator|true
detectorXMLFactoryBypass=XMLFactoryBypass|true
detector_threshold=2
-filter_settings=Medium|PERFORMANCE,CORRECTNESS,I18N,MT_CORRECTNESS,BAD_PRACTICE,MALICIOUS_CODE,STYLE|false
+effort=default
+filter_settings=Medium|BAD_PRACTICE,CORRECTNESS,EXPERIMENTAL,I18N,MALICIOUS_CODE,MT_CORRECTNESS,PERFORMANCE,SECURITY,STYLE|false
filter_settings_neg=|
+run_at_full_build=true
Modified: incubator/jspwiki/trunk/.project
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/.project?rev=739080&r1=739079&r2=739080&view=diff
==============================================================================
--- incubator/jspwiki/trunk/.project (original)
+++ incubator/jspwiki/trunk/.project Thu Jan 29 23:23:31 2009
@@ -1,24 +1,42 @@
<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
- <name>JSPWiki-trunk</name>
+ <name>JSPWiki</name>
<comment></comment>
<projects>
</projects>
<buildSpec>
<buildCommand>
+ <name>org.eclipse.wst.jsdt.core.javascriptValidator</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ <buildCommand>
<name>org.eclipse.jdt.core.javabuilder</name>
<arguments>
</arguments>
</buildCommand>
<buildCommand>
+ <name>org.eclipse.wst.common.project.facet.core.builder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ <buildCommand>
+ <name>org.eclipse.wst.validation.validationbuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ <buildCommand>
<name>com.atlassw.tools.eclipse.checkstyle.CheckstyleBuilder</name>
<arguments>
</arguments>
</buildCommand>
</buildSpec>
<natures>
+ <nature>org.eclipse.wst.common.project.facet.core.nature</nature>
<nature>org.eclipse.jdt.core.javanature</nature>
+ <nature>org.eclipse.wst.common.modulecore.ModuleCoreNature</nature>
+ <nature>org.eclipse.jem.workbench.JavaEMFNature</nature>
+ <nature>org.eclipse.wst.jsdt.core.jsNature</nature>
<nature>com.atlassw.tools.eclipse.checkstyle.CheckstyleNature</nature>
- <nature>net.sourceforge.metrics.nature</nature>
</natures>
</projectDescription>
Added: incubator/jspwiki/trunk/.settings/.jsdtscope
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/.settings/.jsdtscope?rev=739080&view=auto
==============================================================================
--- incubator/jspwiki/trunk/.settings/.jsdtscope (added)
+++ incubator/jspwiki/trunk/.settings/.jsdtscope Thu Jan 29 23:23:31 2009
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+ <classpathentry kind="src" path=""/>
+ <classpathentry kind="con" path="org.eclipse.wst.jsdt.launching.JRE_CONTAINER"/>
+ <classpathentry kind="output" path=""/>
+</classpath>
Modified: incubator/jspwiki/trunk/.settings/org.eclipse.jdt.core.prefs
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/.settings/org.eclipse.jdt.core.prefs?rev=739080&r1=739079&r2=739080&view=diff
==============================================================================
--- incubator/jspwiki/trunk/.settings/org.eclipse.jdt.core.prefs (original)
+++ incubator/jspwiki/trunk/.settings/org.eclipse.jdt.core.prefs Thu Jan 29 23:23:31 2009
@@ -1,4 +1,4 @@
-#Wed Jun 11 23:34:20 EEST 2008
+#Fri Jan 30 00:36:44 EET 2009
eclipse.preferences.version=1
org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
@@ -7,74 +7,8 @@
org.eclipse.jdt.core.compiler.debug.lineNumber=generate
org.eclipse.jdt.core.compiler.debug.localVariable=generate
org.eclipse.jdt.core.compiler.debug.sourceFile=generate
-org.eclipse.jdt.core.compiler.doc.comment.support=enabled
-org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning
org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
-org.eclipse.jdt.core.compiler.problem.autoboxing=ignore
-org.eclipse.jdt.core.compiler.problem.deprecation=warning
-org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=enabled
-org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=enabled
-org.eclipse.jdt.core.compiler.problem.discouragedReference=warning
-org.eclipse.jdt.core.compiler.problem.emptyStatement=ignore
org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.problem.fallthroughCase=ignore
-org.eclipse.jdt.core.compiler.problem.fatalOptionalError=enabled
-org.eclipse.jdt.core.compiler.problem.fieldHiding=ignore
-org.eclipse.jdt.core.compiler.problem.finalParameterBound=warning
-org.eclipse.jdt.core.compiler.problem.finallyBlockNotCompletingNormally=warning
-org.eclipse.jdt.core.compiler.problem.forbiddenReference=error
-org.eclipse.jdt.core.compiler.problem.hiddenCatchBlock=warning
-org.eclipse.jdt.core.compiler.problem.incompatibleNonInheritedInterfaceMethod=warning
-org.eclipse.jdt.core.compiler.problem.incompleteEnumSwitch=ignore
-org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=ignore
-org.eclipse.jdt.core.compiler.problem.invalidJavadoc=warning
-org.eclipse.jdt.core.compiler.problem.invalidJavadocTags=disabled
-org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsDeprecatedRef=disabled
-org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsNotVisibleRef=disabled
-org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsVisibility=public
-org.eclipse.jdt.core.compiler.problem.localVariableHiding=ignore
-org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=warning
-org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation=ignore
-org.eclipse.jdt.core.compiler.problem.missingJavadocComments=ignore
-org.eclipse.jdt.core.compiler.problem.missingJavadocCommentsOverriding=disabled
-org.eclipse.jdt.core.compiler.problem.missingJavadocCommentsVisibility=public
-org.eclipse.jdt.core.compiler.problem.missingJavadocTags=ignore
-org.eclipse.jdt.core.compiler.problem.missingJavadocTagsOverriding=disabled
-org.eclipse.jdt.core.compiler.problem.missingJavadocTagsVisibility=public
-org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=ignore
-org.eclipse.jdt.core.compiler.problem.missingSerialVersion=warning
-org.eclipse.jdt.core.compiler.problem.noEffectAssignment=warning
-org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=warning
-org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=ignore
-org.eclipse.jdt.core.compiler.problem.nullReference=warning
-org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=warning
-org.eclipse.jdt.core.compiler.problem.parameterAssignment=ignore
-org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=ignore
-org.eclipse.jdt.core.compiler.problem.potentialNullReference=warning
-org.eclipse.jdt.core.compiler.problem.rawTypeReference=ignore
-org.eclipse.jdt.core.compiler.problem.redundantNullCheck=warning
-org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled
-org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=warning
-org.eclipse.jdt.core.compiler.problem.suppressWarnings=enabled
-org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=ignore
-org.eclipse.jdt.core.compiler.problem.typeParameterHiding=warning
-org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=warning
-org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=ignore
-org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=warning
-org.eclipse.jdt.core.compiler.problem.unnecessaryElse=warning
-org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=warning
-org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=ignore
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=disabled
-org.eclipse.jdt.core.compiler.problem.unusedImport=warning
-org.eclipse.jdt.core.compiler.problem.unusedLabel=warning
-org.eclipse.jdt.core.compiler.problem.unusedLocal=warning
-org.eclipse.jdt.core.compiler.problem.unusedParameter=ignore
-org.eclipse.jdt.core.compiler.problem.unusedParameterIncludeDocCommentReference=enabled
-org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=disabled
-org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disabled
-org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning
-org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
org.eclipse.jdt.core.compiler.source=1.5
org.eclipse.jdt.core.formatter.align_type_members_on_columns=false
org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=18
@@ -119,11 +53,9 @@
org.eclipse.jdt.core.formatter.brace_position_for_method_declaration=next_line
org.eclipse.jdt.core.formatter.brace_position_for_switch=next_line
org.eclipse.jdt.core.formatter.brace_position_for_type_declaration=next_line
-org.eclipse.jdt.core.formatter.comment.clear_blank_lines=true
org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_block_comment=true
org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_javadoc_comment=true
org.eclipse.jdt.core.formatter.comment.format_block_comments=true
-org.eclipse.jdt.core.formatter.comment.format_comments=true
org.eclipse.jdt.core.formatter.comment.format_header=false
org.eclipse.jdt.core.formatter.comment.format_html=true
org.eclipse.jdt.core.formatter.comment.format_javadoc_comments=true
@@ -149,7 +81,9 @@
org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_cases=true
org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_switch=true
org.eclipse.jdt.core.formatter.indentation.size=4
-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_local_variable=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_member=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_parameter=do not insert
org.eclipse.jdt.core.formatter.insert_new_line_after_opening_brace_in_array_initializer=do not insert
org.eclipse.jdt.core.formatter.insert_new_line_at_end_of_file_if_missing=insert
org.eclipse.jdt.core.formatter.insert_new_line_before_catch_in_try_statement=insert
Modified: incubator/jspwiki/trunk/.settings/org.eclipse.jdt.ui.prefs
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/.settings/org.eclipse.jdt.ui.prefs?rev=739080&r1=739079&r2=739080&view=diff
==============================================================================
--- incubator/jspwiki/trunk/.settings/org.eclipse.jdt.ui.prefs (original)
+++ incubator/jspwiki/trunk/.settings/org.eclipse.jdt.ui.prefs Thu Jan 29 23:23:31 2009
@@ -1,10 +1,11 @@
-#Sun Mar 30 17:18:27 EEST 2008
+#Fri Jan 30 00:36:41 EET 2009
eclipse.preferences.version=1
formatter_profile=_Janne's coding conventions
-formatter_settings_version=10
+formatter_settings_version=11
internal.default.compliance=default
org.eclipse.jdt.ui.ignorelowercasenames=true
org.eclipse.jdt.ui.importorder=java;javax;org;com;
+org.eclipse.jdt.ui.javadoc=false
org.eclipse.jdt.ui.ondemandthreshold=5
org.eclipse.jdt.ui.staticondemandthreshold=99
-org.eclipse.jdt.ui.text.custom_code_templates=<?xml version\="1.0" encoding\="UTF-8"?><templates><template autoinsert\="true" context\="gettercomment_context" deleted\="false" description\="Comment for getter method" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.gettercomment" name\="gettercomment">/**\n * @return the ${bare_field_name}\n */</template><template autoinsert\="true" context\="settercomment_context" deleted\="false" description\="Comment for setter method" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.settercomment" name\="settercomment">/**\n * @param ${param} the ${bare_field_name} to set\n */</template><template autoinsert\="true" context\="constructorcomment_context" deleted\="false" description\="Comment for created constructors" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorcomment" name\="constructorcomment">/**\n * ${tags}\n */</template><template autoinsert\="true" context\="filecomment_context" deleted\
="false" description\="Comment for created Java files" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.filecomment" name\="filecomment">/**\n * \n */</template><template autoinsert\="false" context\="typecomment_context" deleted\="false" description\="Comment for created types" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.typecomment" name\="typecomment">/**\n * ${tags}\n */</template><template autoinsert\="true" context\="fieldcomment_context" deleted\="false" description\="Comment for fields" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.fieldcomment" name\="fieldcomment">/**\n * \n */</template><template autoinsert\="true" context\="methodcomment_context" deleted\="false" description\="Comment for non-overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodcomment" name\="methodcomment">/**\n * ${tags}\n */</template><template autoinsert\="true" context\="overridecomment_context" deleted\="false" descripti
on\="Comment for overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.overridecomment" name\="overridecomment">/* (non-Javadoc)\n * ${see_to_overridden}\n */</template><template autoinsert\="true" context\="delegatecomment_context" deleted\="false" description\="Comment for delegate methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.delegatecomment" name\="delegatecomment">/**\n * ${tags}\n * ${see_to_target}\n */</template><template autoinsert\="true" context\="newtype_context" deleted\="false" description\="Newly created files" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.newtype" name\="newtype">${filecomment}\n${package_declaration}\n\n${typecomment}\n${type_declaration}</template><template autoinsert\="true" context\="classbody_context" deleted\="false" description\="Code in new class type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.classbody" name\="classbody">\n</template><template autoins
ert\="true" context\="interfacebody_context" deleted\="false" description\="Code in new interface type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.interfacebody" name\="interfacebody">\n</template><template autoinsert\="true" context\="enumbody_context" deleted\="false" description\="Code in new enum type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.enumbody" name\="enumbody">\n</template><template autoinsert\="true" context\="annotationbody_context" deleted\="false" description\="Code in new annotation type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.annotationbody" name\="annotationbody">\n</template><template autoinsert\="true" context\="catchblock_context" deleted\="false" description\="Code in new catch blocks" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.catchblock" name\="catchblock">// ${todo} Auto-generated catch block\n${exception_var}.printStackTrace();</template><template autoinsert
\="true" context\="methodbody_context" deleted\="false" description\="Code in created method stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodbody" name\="methodbody">// ${todo} Auto-generated method stub\n${body_statement}</template><template autoinsert\="true" context\="constructorbody_context" deleted\="false" description\="Code in created constructor stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorbody" name\="constructorbody">${body_statement}\n// ${todo} Auto-generated constructor stub</template><template autoinsert\="true" context\="getterbody_context" deleted\="false" description\="Code in created getters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.getterbody" name\="getterbody">return ${field};</template><template autoinsert\="true" context\="setterbody_context" deleted\="false" description\="Code in created setters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.setterbody" name\="sette
rbody">${field} \= ${param};</template></templates>
+org.eclipse.jdt.ui.text.custom_code_templates=<?xml version\="1.0" encoding\="UTF-8"?><templates><template autoinsert\="true" context\="gettercomment_context" deleted\="false" description\="Comment for getter method" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.gettercomment" name\="gettercomment">/**\n * @return the ${bare_field_name}\n */</template><template autoinsert\="true" context\="settercomment_context" deleted\="false" description\="Comment for setter method" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.settercomment" name\="settercomment">/**\n * @param ${param} the ${bare_field_name} to set\n */</template><template autoinsert\="true" context\="constructorcomment_context" deleted\="false" description\="Comment for created constructors" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorcomment" name\="constructorcomment">/**\n * ${tags}\n */</template><template autoinsert\="true" context\="filecomment_context" deleted\
="false" description\="Comment for created Java files" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.filecomment" name\="filecomment">/**\n * \n */</template><template autoinsert\="false" context\="typecomment_context" deleted\="false" description\="Comment for created types" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.typecomment" name\="typecomment">/**\n * ${tags}\n */</template><template autoinsert\="true" context\="fieldcomment_context" deleted\="false" description\="Comment for fields" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.fieldcomment" name\="fieldcomment">/**\n * \n */</template><template autoinsert\="true" context\="methodcomment_context" deleted\="false" description\="Comment for non-overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodcomment" name\="methodcomment">/**\n * ${tags}\n */</template><template autoinsert\="true" context\="overridecomment_context" deleted\="false" descripti
on\="Comment for overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.overridecomment" name\="overridecomment">/* (non-Javadoc)\n * ${see_to_overridden}\n */</template><template autoinsert\="true" context\="delegatecomment_context" deleted\="false" description\="Comment for delegate methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.delegatecomment" name\="delegatecomment">/**\n * ${tags}\n * ${see_to_target}\n */</template><template autoinsert\="true" context\="newtype_context" deleted\="false" description\="Newly created files" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.newtype" name\="newtype">${filecomment}\n${package_declaration}\n\n${typecomment}\n${type_declaration}</template><template autoinsert\="true" context\="classbody_context" deleted\="false" description\="Code in new class type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.classbody" name\="classbody">\n</template><template autoins
ert\="true" context\="interfacebody_context" deleted\="false" description\="Code in new interface type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.interfacebody" name\="interfacebody">\n</template><template autoinsert\="true" context\="enumbody_context" deleted\="false" description\="Code in new enum type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.enumbody" name\="enumbody">\n</template><template autoinsert\="true" context\="annotationbody_context" deleted\="false" description\="Code in new annotation type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.annotationbody" name\="annotationbody">\n</template><template autoinsert\="true" context\="catchblock_context" deleted\="false" description\="Code in new catch blocks" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.catchblock" name\="catchblock">// ${todo} Auto-generated catch block\n${exception_var}.printStackTrace();</template><template autoinsert
\="true" context\="methodbody_context" deleted\="false" description\="Code in created method stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodbody" name\="methodbody">// ${todo} Auto-generated method stub\n${body_statement}</template><template autoinsert\="true" context\="constructorbody_context" deleted\="false" description\="Code in created constructor stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorbody" name\="constructorbody">${body_statement}\n// ${todo} Auto-generated constructor stub</template><template autoinsert\="true" context\="getterbody_context" deleted\="false" description\="Code in created getters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.getterbody" name\="getterbody">return ${field};</template><template autoinsert\="true" context\="setterbody_context" deleted\="false" description\="Code in created setters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.setterbody" name\="sette
rbody">${field} \= ${param};</template><template autoinsert\="true" context\="gettercomment_context" deleted\="false" description\="Comment for getter function" enabled\="true" id\="org.eclipse.wst.jsdt.ui.text.codetemplates.gettercomment" name\="gettercomment">/**\n * @return the ${bare_field_name}\n */</template><template autoinsert\="true" context\="settercomment_context" deleted\="false" description\="Comment for setter function" enabled\="true" id\="org.eclipse.wst.jsdt.ui.text.codetemplates.settercomment" name\="settercomment">/**\n * @param ${param} the ${bare_field_name} to set\n */</template><template autoinsert\="true" context\="constructorcomment_context" deleted\="false" description\="Comment for created constructors" enabled\="true" id\="org.eclipse.wst.jsdt.ui.text.codetemplates.constructorcomment" name\="constructorcomment">/**\n * ${tags}\n */</template><template autoinsert\="true" context\="filecomment_context" deleted\="false" description\="Comment for crea
ted JavaScript files" enabled\="true" id\="org.eclipse.wst.jsdt.ui.text.codetemplates.filecomment" name\="filecomment">/**\n * \n */</template><template autoinsert\="true" context\="typecomment_context" deleted\="false" description\="Comment for created types" enabled\="true" id\="org.eclipse.wst.jsdt.ui.text.codetemplates.typecomment" name\="typecomment">/**\n * @author ${user}\n *\n * ${tags}\n */</template><template autoinsert\="true" context\="fieldcomment_context" deleted\="false" description\="Comment for vars" enabled\="true" id\="org.eclipse.wst.jsdt.ui.text.codetemplates.fieldcomment" name\="fieldcomment">/**\n * \n */</template><template autoinsert\="true" context\="methodcomment_context" deleted\="false" description\="Comment for non-overriding function" enabled\="true" id\="org.eclipse.wst.jsdt.ui.text.codetemplates.methodcomment" name\="methodcomment">/**\n * ${tags}\n */</template><template autoinsert\="true" context\="overridecomment_context" deleted\="false"
description\="Comment for overriding functions" enabled\="true" id\="org.eclipse.wst.jsdt.ui.text.codetemplates.overridecomment" name\="overridecomment">/* (non-Jsdoc)\n * ${see_to_overridden}\n */</template><template autoinsert\="true" context\="delegatecomment_context" deleted\="false" description\="Comment for delegate functions" enabled\="true" id\="org.eclipse.wst.jsdt.ui.text.codetemplates.delegatecomment" name\="delegatecomment">/**\n * ${tags}\n * ${see_to_target}\n */</template><template autoinsert\="true" context\="newtype_context" deleted\="false" description\="Newly created files" enabled\="true" id\="org.eclipse.wst.jsdt.ui.text.codetemplates.newtype" name\="newtype">${filecomment}\n${package_declaration}\n\n${typecomment}\n${type_declaration}</template><template autoinsert\="true" context\="classbody_context" deleted\="false" description\="Code in new class type bodies" enabled\="true" id\="org.eclipse.wst.jsdt.ui.text.codetemplates.classbody" name\="classbody"
>\n</template><template autoinsert\="true" context\="catchblock_context" deleted\="false" description\="Code in new catch blocks" enabled\="true" id\="org.eclipse.wst.jsdt.ui.text.codetemplates.catchblock" name\="catchblock">// ${todo} Auto-generated catch block\n${exception_var}.printStackTrace();</template><template autoinsert\="true" context\="methodbody_context" deleted\="false" description\="Code in created function stubs" enabled\="true" id\="org.eclipse.wst.jsdt.ui.text.codetemplates.methodbody" name\="methodbody">// ${todo} Auto-generated function stub\n${body_statement}</template><template autoinsert\="true" context\="constructorbody_context" deleted\="false" description\="Code in created constructor stubs" enabled\="true" id\="org.eclipse.wst.jsdt.ui.text.codetemplates.constructorbody" name\="constructorbody">${body_statement}\n// ${todo} Auto-generated constructor stub</template><template autoinsert\="true" context\="getterbody_context" deleted\="false" descriptio
n\="Code in created getters" enabled\="true" id\="org.eclipse.wst.jsdt.ui.text.codetemplates.getterbody" name\="getterbody">return ${field};</template><template autoinsert\="true" context\="setterbody_context" deleted\="false" description\="Code in created setters" enabled\="true" id\="org.eclipse.wst.jsdt.ui.text.codetemplates.setterbody" name\="setterbody">${field} \= ${param};</template></templates>
Added: incubator/jspwiki/trunk/.settings/org.eclipse.jst.common.project.facet.core.prefs
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/.settings/org.eclipse.jst.common.project.facet.core.prefs?rev=739080&view=auto
==============================================================================
--- incubator/jspwiki/trunk/.settings/org.eclipse.jst.common.project.facet.core.prefs (added)
+++ incubator/jspwiki/trunk/.settings/org.eclipse.jst.common.project.facet.core.prefs Thu Jan 29 23:23:31 2009
@@ -0,0 +1,4 @@
+#Thu Jan 29 22:48:37 EET 2009
+classpath.helper/org.eclipse.jdt.launching.JRE_CONTAINER\:\:org.eclipse.jdt.internal.launching.macosx.MacOSXType\:\:JVM\ 1.5.0/owners=jst.java\:5.0
+classpath.helper/org.eclipse.jst.server.core.container\:\:org.eclipse.jst.server.tomcat.runtimeTarget\:\:Apache\ Tomcat\ v5.5/owners=jst.web\:2.4
+eclipse.preferences.version=1
Added: incubator/jspwiki/trunk/.settings/org.eclipse.jst.j2ee.ejb.annotations.xdoclet.prefs
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/.settings/org.eclipse.jst.j2ee.ejb.annotations.xdoclet.prefs?rev=739080&view=auto
==============================================================================
--- incubator/jspwiki/trunk/.settings/org.eclipse.jst.j2ee.ejb.annotations.xdoclet.prefs (added)
+++ incubator/jspwiki/trunk/.settings/org.eclipse.jst.j2ee.ejb.annotations.xdoclet.prefs Thu Jan 29 23:23:31 2009
@@ -0,0 +1,6 @@
+#Fri Jan 30 00:19:10 EET 2009
+XDOCLETBUILDERACTIVE=true
+XDOCLETHOME=
+XDOCLETUSEGLOBAL=true
+XDOCLETVERSION=1.2.1
+eclipse.preferences.version=1
Added: incubator/jspwiki/trunk/.settings/org.eclipse.jst.jsp.core.prefs
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/.settings/org.eclipse.jst.jsp.core.prefs?rev=739080&view=auto
==============================================================================
--- incubator/jspwiki/trunk/.settings/org.eclipse.jst.jsp.core.prefs (added)
+++ incubator/jspwiki/trunk/.settings/org.eclipse.jst.jsp.core.prefs Thu Jan 29 23:23:31 2009
@@ -0,0 +1,28 @@
+#Fri Jan 30 00:36:41 EET 2009
+eclipse.preferences.version=1
+validateFragments=true
+validation.actions-missing-required-attribute=1
+validation.actions-non-empty-inline-tag=2
+validation.actions-unknown-attribute=2
+validation.directive-include-fragment-file-not-found=1
+validation.directive-include-fragment-file-not-specified=1
+validation.directive-taglib-duplicate-prefixes-different-uris=1
+validation.directive-taglib-duplicate-prefixes-same-uris=-1
+validation.directive-taglib-missing-prefix=1
+validation.directive-taglib-missing-uri-or-tagdir=1
+validation.directive-taglib-unresolvable-uri-or-tagdir=1
+validation.el-general-syntax=1
+validation.el-lexical-failure=-1
+validation.java-=-1
+validation.java-local-variable-is-never-used=-1
+validation.java-null-local-variable-reference=-1
+validation.java-potential-null-local-variable-reference=-1
+validation.java-unused-import=-1
+validation.translation-tag-class-not-found=2
+validation.translation-tei-class-not-found=2
+validation.translation-tei-class-not-instantiated=2
+validation.translation-tei-class-runtime-exception=2
+validation.translation-tei-message=1
+validation.translation-usebean-ambiguous-type-info=2
+validation.translation-usebean-invalid-id=1
+validation.translation-usebean-missing-type-info=1
Added: incubator/jspwiki/trunk/.settings/org.eclipse.wst.common.component
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/.settings/org.eclipse.wst.common.component?rev=739080&view=auto
==============================================================================
--- incubator/jspwiki/trunk/.settings/org.eclipse.wst.common.component (added)
+++ incubator/jspwiki/trunk/.settings/org.eclipse.wst.common.component Thu Jan 29 23:23:31 2009
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project-modules id="moduleCoreId" project-version="1.5.0">
+<wb-module deploy-name="JSPWiki">
+<wb-resource deploy-path="/" source-path="/src/WebContent"/>
+<wb-resource deploy-path="/WEB-INF/classes" source-path="/src/java"/>
+<wb-resource deploy-path="/WEB-INF/classes" source-path="/java"/>
+<wb-resource deploy-path="/WEB-INF/classes" source-path="/tests/java"/>
+<property name="java-output-path"/>
+<property name="context-root" value="JSPWiki"/>
+</wb-module>
+</project-modules>
Added: incubator/jspwiki/trunk/.settings/org.eclipse.wst.common.project.facet.core.xml
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/.settings/org.eclipse.wst.common.project.facet.core.xml?rev=739080&view=auto
==============================================================================
--- incubator/jspwiki/trunk/.settings/org.eclipse.wst.common.project.facet.core.xml (added)
+++ incubator/jspwiki/trunk/.settings/org.eclipse.wst.common.project.facet.core.xml Thu Jan 29 23:23:31 2009
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<faceted-project>
+ <runtime name="Apache Tomcat v5.5"/>
+ <fixed facet="jst.web"/>
+ <fixed facet="jst.java"/>
+ <installed facet="jst.java" version="5.0"/>
+ <installed facet="jst.web" version="2.4"/>
+ <installed facet="wst.jsdt.web" version="1.0"/>
+</faceted-project>
Added: incubator/jspwiki/trunk/.settings/org.eclipse.wst.html.core.prefs
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/.settings/org.eclipse.wst.html.core.prefs?rev=739080&view=auto
==============================================================================
--- incubator/jspwiki/trunk/.settings/org.eclipse.wst.html.core.prefs (added)
+++ incubator/jspwiki/trunk/.settings/org.eclipse.wst.html.core.prefs Thu Jan 29 23:23:31 2009
@@ -0,0 +1,36 @@
+#Fri Jan 30 00:36:41 EET 2009
+attrDuplicate=2
+attrInvalidName=2
+attrInvalidValue=2
+attrNameMismatch=2
+attrUndefName=2
+attrUndefValue=2
+attrValueMismatch=1
+attrValueUnclosed=2
+cdataInvalidContent=2
+cdataUnclosed=1
+commentInvalidContent=2
+commentUnclosed=1
+docDoctypeUnclosed=1
+docDuplicateTag=1
+docInvalidChar=2
+docInvalidContent=2
+eclipse.preferences.version=1
+elemCoexistence=2
+elemDuplicate=2
+elemEndInvalidCase=1
+elemInvalidContent=2
+elemInvalidDirective=1
+elemInvalidEmptyTag=2
+elemInvalidName=1
+elemMissingEnd=2
+elemMissingStart=1
+elemStartInvalidCase=2
+elemUnclosedEndTag=1
+elemUnclosedStartTag=1
+elemUnknownName=2
+elemUnnecessaryEnd=2
+piInvalidContent=2
+piUnclosed=1
+piUndefined=2
+refInvalidContent=2
Added: incubator/jspwiki/trunk/.settings/org.eclipse.wst.jsdt.ui.superType.container
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/.settings/org.eclipse.wst.jsdt.ui.superType.container?rev=739080&view=auto
==============================================================================
--- incubator/jspwiki/trunk/.settings/org.eclipse.wst.jsdt.ui.superType.container (added)
+++ incubator/jspwiki/trunk/.settings/org.eclipse.wst.jsdt.ui.superType.container Thu Jan 29 23:23:31 2009
@@ -0,0 +1 @@
+org.eclipse.wst.jsdt.launching.baseBrowserLibrary
\ No newline at end of file
Added: incubator/jspwiki/trunk/.settings/org.eclipse.wst.jsdt.ui.superType.name
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/.settings/org.eclipse.wst.jsdt.ui.superType.name?rev=739080&view=auto
==============================================================================
--- incubator/jspwiki/trunk/.settings/org.eclipse.wst.jsdt.ui.superType.name (added)
+++ incubator/jspwiki/trunk/.settings/org.eclipse.wst.jsdt.ui.superType.name Thu Jan 29 23:23:31 2009
@@ -0,0 +1 @@
+Window
\ No newline at end of file
Added: incubator/jspwiki/trunk/.settings/org.eclipse.wst.ws.service.policy.prefs
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/.settings/org.eclipse.wst.ws.service.policy.prefs?rev=739080&view=auto
==============================================================================
--- incubator/jspwiki/trunk/.settings/org.eclipse.wst.ws.service.policy.prefs (added)
+++ incubator/jspwiki/trunk/.settings/org.eclipse.wst.ws.service.policy.prefs Thu Jan 29 23:23:31 2009
@@ -0,0 +1,3 @@
+#Fri Jan 30 00:19:10 EET 2009
+eclipse.preferences.version=1
+org.eclipse.wst.ws.service.policy.projectEnabled=false
Modified: incubator/jspwiki/trunk/ChangeLog
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/ChangeLog?rev=739080&r1=739079&r2=739080&view=diff
==============================================================================
--- incubator/jspwiki/trunk/ChangeLog (original)
+++ incubator/jspwiki/trunk/ChangeLog Thu Jan 29 23:23:31 2009
@@ -1,3 +1,26 @@
+2009-01-30 Janne Jalkanen <ja...@apache.org>
+
+ * 3.0.0-svn-58
+
+ * Rather massive restructuring of the codebase; makes JSPWiki into
+ an Eclipse WTP project (tested on Ganymede; don't forget to run "ant init" first!)
+
+ Modifications are:
+ - src now contains all of the source code. Subdir "java" contains all
+ Java source code
+ - the old src/webdocs is now src/WebContent, and also contains the former
+ /lib and most of /etc/ - essentially everything that will be deployed
+ inside the webapp dir.
+ - tests also now live in tests/java/
+ - builds are done to build/classes
+
+ Build.xml has been modified for basic compile cycle + tests, but the more
+ exotic things like precompiled jsps were not changed yet due to sudden
+ exhaustion.
+
+ * Minor changes to ContentManager API; it is no longer dependent on
+ having a WikiContext.
+
2009-01-29 Harry Metske <me...@apache.org>
* 3.0.0-svn-57
Modified: incubator/jspwiki/trunk/build.xml
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/build.xml?rev=739080&r1=739079&r2=739080&view=diff
==============================================================================
--- incubator/jspwiki/trunk/build.xml (original)
+++ incubator/jspwiki/trunk/build.xml Thu Jan 29 23:23:31 2009
@@ -73,11 +73,14 @@
<property name="optimize" value="false" />
<!-- This denotes the directory where the source code lies. -->
- <property name="code.src" value="src" />
+ <property name="code.src" value="src/java" />
+ <!-- Denotes where all the stuff that goes into the webapp dir lives -->
+ <property name="code.web" value="src/WebContent" />
+
<!-- The class files are actually put in this directory. It is
a good habit to keep .class -files separate from the .java -files. -->
- <property name="code.build" value ="build" />
+ <property name="code.build" value ="build/classes" />
<!-- The internationalization strings for the core JSPWiki classes -->
<property name="code.i18n" value="etc/i18n" />
@@ -143,7 +146,7 @@
add all the jar files in the "lib" -directory. -->
<path id="path.base">
<pathelement path="${code.build}" />
- <fileset dir="lib">
+ <fileset dir="${code.web}/WEB-INF/lib">
<include name="*.jar" />
</fileset>
</path>
@@ -155,7 +158,7 @@
<pathelement location="${jarfile}" />
<pathelement location="${testjarfile}" />
<pathelement location="${java.home}/../lib/tools.jar" />
- <fileset dir="lib">
+ <fileset dir="${code.web}/WEB-INF/lib">
<include name="*.jar" />
</fileset>
<fileset dir="${tests.src}/lib">
@@ -183,11 +186,11 @@
<target name="mkpropertyfile"
description="Builds the correct propertyfile from the build.properties">
- <copy file="etc/jspwiki.properties.tmpl" tofile="etc/jspwiki.properties" />
+ <copy file="etc/jspwiki.properties.tmpl" tofile="${code.web}/WEB-INF/jspwiki.properties" />
<copy file="${tests.src}/etc/jspwiki.properties.tmpl" tofile="${tests.src}/etc/jspwiki.properties" />
<copy file="${tests.src}/etc/jspwiki_rcs.properties.tmpl" tofile="${tests.src}/etc/jspwiki_rcs.properties" />
<copy file="${tests.src}/etc/jspwiki_vers.properties.tmpl" tofile="${tests.src}/etc/jspwiki_vers.properties" />
- <replace file="etc/jspwiki.properties"
+ <replace file="src/WebContent/WEB-INF/jspwiki.properties"
replacefilterfile="${build.properties}" />
<replace file="${tests.src}/etc/jspwiki.properties"
replacefilterfile="${build.properties}" />
@@ -203,7 +206,7 @@
<delete dir="${tests.build}" />
<delete dir="${code.build}" />
<delete dir="${tests.reports}" />
- <delete file="etc/jspwiki.properties" />
+ <delete file="src/WebContent/WEB-INF/jspwiki.properties" />
<delete file="${tests.src}/etc/jspwiki.properties" />
<delete file="${tests.src}/etc/jspwiki_rcs.properties" />
<delete file="${tests.src}/etc/jspwiki_vers.properties" />
@@ -340,7 +343,7 @@
<fileset dir="${code.src}" includes="templates/**/*.properties" />
<fileset dir="${code.i18n}" />
<fileset dir="etc" includes="ini/*.xml ini/*.properties" />
- <metainf dir="etc" includes="jspwiki.tld" />
+ <metainf dir="${code.web}/WEB-INF" includes="jspwiki.tld" />
</jar>
</target>
@@ -376,7 +379,7 @@
<target name="war-init" depends="installinit">
<echo>Validating web.xml</echo>
- <schemavalidate file="etc/web.xml">
+ <schemavalidate file="${code.web}/WEB-INF/web.xml">
<schema namespace="http://java.sun.com/xml/ns/j2ee"
file="etc/schema/web-app_2_4.xsd" />
</schemavalidate>
@@ -384,7 +387,7 @@
<delete quiet="true">
<fileset dir="${code.build}" includes="JSPWiki-jsp.jar,jasper-runtime-*.jar,commons-el-*.jar"/>
</delete>
- <copy file="etc/web.xml" toFile="${code.build}/web.xml" overwrite="true" />
+ <!--<copy file="etc/web.xml" toFile="${code.build}/web.xml" overwrite="true" /> -->
</target>
<target name="war" depends="war-init,jar,jar-compiled-jsps,compressedjs"
@@ -395,16 +398,16 @@
<delete file="${warfile}" />
<war destfile="${warfile}"
- webxml="${code.build}/web.xml" >
- <lib dir="lib" includes="*.jar" excludes="servlet-api.jar jsp-api.jar"/>
+ webxml="${code.web}/WEB-INF/web.xml" >
+ <!-- <lib dir="lib" includes="*.jar" excludes="servlet-api.jar jsp-api.jar"/> -->
<lib file="${jarfile}" />
<lib file="${code.build}/JSPWiki-jsp.jar" />
<lib file="${code.build}/jasper-runtime-*.jar" />
<lib file="${code.build}/commons-el-*.jar" />
- <fileset dir="${code.src}/webdocs" includes="**" excludes="**/FCK/jsp" />
- <fileset dir="${tmpdir}/compress/webdocs/" includes="**/*.js" />
- <fileset dir="${tmpdir}/compress/webdocs/" includes="**/*.css" />
- <webinf dir="etc">
+ <fileset dir="${code.web}" includes="**" excludes="**/FCK/jsp" />
+ <fileset dir="${tmpdir}/compress/webdocs/" includes="**/*.js" />
+ <fileset dir="${tmpdir}/compress/webdocs/" includes="**/*.css" />
+ <webinf dir="${code.web}/WEB-INF">
<include name="geronimo-web.xml" />
<include name="dtd/**" />
<include name="jsp/**" />
@@ -413,10 +416,12 @@
<include name="userdatabase.xml" />
<include name="groupdatabase.xml" />
</webinf>
+ <!--
<classes dir="etc">
<include name="oscache.properties" />
<include name="log4j.properties" />
</classes>
+ -->
</war>
</target>
@@ -487,7 +492,7 @@
<java jar="${tests.src}/lib/yuicompressor-2.3.3.jar"
output="${tmpdir}/compress/@{src}"
fork="true">
- <arg line="'${code.src}/@{src}' @{args}" />
+ <arg line="'${code.web}/@{src}' @{args}" />
</java>
</sequential>
</macrodef>
@@ -539,35 +544,35 @@
<target name="compressedjs">
<mkdir dir="${tmpdir}/compress/webdocs/scripts"/>
- <compressjs src="webdocs/scripts/jspwiki-common.js"/>
- <compressjs src="webdocs/scripts/jspwiki-edit.js"/>
- <compressjs src="webdocs/scripts/jspwiki-prefs.js"/>
- <compressjs src="webdocs/scripts/jspwiki-commonstyles.js"/>
- <compressjs src="webdocs/scripts/prettify.js"/>
+ <compressjs src="/scripts/jspwiki-common.js"/>
+ <compressjs src="/scripts/jspwiki-edit.js"/>
+ <compressjs src="/scripts/jspwiki-prefs.js"/>
+ <compressjs src="/scripts/jspwiki-commonstyles.js"/>
+ <compressjs src="/scripts/prettify.js"/>
<mkdir dir="${tmpdir}/compress/webdocs/templates/default"/>
- <compressjs src="webdocs/templates/default/jspwiki.css"
- args="--line-break 0" />
+ <compressjs src="/templates/default/jspwiki.css"
+ args="--line-break 0" />
- <compressjs src="webdocs/templates/default/jspwiki_print.css"
- args="--line-break 0" />
+ <compressjs src="/templates/default/jspwiki_print.css"
+ args="--line-break 0" />
<mkdir dir="${tmpdir}/compress/webdocs/templates/default/skins/OrderedList"/>
- <compressjs src="webdocs/templates/default/skins/OrderedList/skin.css"
- args="--line-break 0" />
+ <compressjs src="/templates/default/skins/OrderedList/skin.css"
+ args="--line-break 0" />
<mkdir dir="${tmpdir}/compress/webdocs/templates/default/skins/PlainVanilla"/>
- <compressjs src="webdocs/templates/default/skins/PlainVanilla/skin.css"
- args="--line-break 0" />
+ <compressjs src="/templates/default/skins/PlainVanilla/skin.css"
+ args="--line-break 0" />
<mkdir dir="${tmpdir}/compress/webdocs/templates/default/skins/PlainVanilla 1024x768"/>
- <compressjs src="webdocs/templates/default/skins/PlainVanilla 1024x768/skin.css"
- args="--line-break 0" />
+ <compressjs src="/templates/default/skins/PlainVanilla 1024x768/skin.css"
+ args="--line-break 0" />
<mkdir dir="${tmpdir}/compress/webdocs/templates/default/skins/Smart"/>
- <compressjs src="webdocs/templates/default/skins/Smart/skin.css"
- args="--line-break 0" />
+ <compressjs src="/templates/default/skins/Smart/skin.css"
+ args="--line-break 0" />
</target>
<!--
@@ -676,7 +681,7 @@
<mkdir dir="${tests.src}/etc/WEB-INF" />
<!-- Create web.xml files for testing -->
- <copy file="${basedir}/etc/web.xml" tofile="${webtests.build}/web.xml.custom" overwrite="true" />
+ <copy file="${code.web}/WEB-INF/web.xml" tofile="${webtests.build}/web.xml.custom" overwrite="true" />
<!-- For web unit tests, turn off SSL (self-signed certs b0rk
the tests) and enable JDBC refs -->
@@ -702,7 +707,7 @@
<copy toDir="${tests.src}/etc/WEB-INF/dtd">
<fileset dir="${basedir}/etc/dtd/" />
</copy>
- <copy file="${basedir}/etc/jspwiki.properties"
+ <copy file="${code.web}/WEB-INF/jspwiki.properties"
tofile="${tests.src}/etc/WEB-INF/jspwiki.properties" overwrite="true" />
</target>
@@ -952,7 +957,7 @@
<!-- Copy the JSPs -->
<copy toDir="@{context.dir}/webapp">
- <fileset dir="${code.src}/webdocs" includes="**" />
+ <fileset dir="${code.web}" includes="**" />
</copy>
</sequential>
@@ -1116,7 +1121,7 @@
<!-- Here's a neat trick: import the JDBC runtime props from jspwiki.properties -->
<echo message="Getting JDBC runtime properties." />
- <loadproperties srcFile="etc/jspwiki.properties">
+ <loadproperties srcFile="${code.web}/WEB-INF/jspwiki.properties">
<filterchain>
<linecontainsregexp>
<regexp pattern="^[jspwiki.userdatabase|jspwiki.groupdatabase]"/>
Copied: incubator/jspwiki/trunk/etc/jspwiki.properties.tmpl (from r738991, incubator/jspwiki/trunk/etc/jspwiki.properties.tmpl)
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/etc/jspwiki.properties.tmpl?p2=incubator/jspwiki/trunk/etc/jspwiki.properties.tmpl&p1=incubator/jspwiki/trunk/etc/jspwiki.properties.tmpl&r1=738991&r2=739080&rev=739080&view=diff
==============================================================================
(empty)
Propchange: incubator/jspwiki/trunk/etc/jspwiki.properties.tmpl
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/jspwiki/trunk/etc/jspwiki.properties.tmpl
------------------------------------------------------------------------------
svn:mergeinfo =
Propchange: incubator/jspwiki/trunk/src/WebContent/Captcha.jsp
------------------------------------------------------------------------------
svn:mergeinfo =
Propchange: incubator/jspwiki/trunk/src/WebContent/Comment.jsp
------------------------------------------------------------------------------
svn:mergeinfo =
Propchange: incubator/jspwiki/trunk/src/WebContent/CookieError.jsp
------------------------------------------------------------------------------
svn:executable = *
Propchange: incubator/jspwiki/trunk/src/WebContent/CookieError.jsp
------------------------------------------------------------------------------
svn:mergeinfo =
Propchange: incubator/jspwiki/trunk/src/WebContent/CreateProfile.jsp
------------------------------------------------------------------------------
svn:mergeinfo =
Propchange: incubator/jspwiki/trunk/src/WebContent/Delete.jsp
------------------------------------------------------------------------------
svn:mergeinfo =
Propchange: incubator/jspwiki/trunk/src/WebContent/DeleteGroup.jsp
------------------------------------------------------------------------------
svn:mergeinfo =
Propchange: incubator/jspwiki/trunk/src/WebContent/Diff.jsp
------------------------------------------------------------------------------
svn:mergeinfo =
Propchange: incubator/jspwiki/trunk/src/WebContent/Edit.jsp
------------------------------------------------------------------------------
svn:mergeinfo =
Propchange: incubator/jspwiki/trunk/src/WebContent/EditGroup.jsp
------------------------------------------------------------------------------
svn:mergeinfo =
Propchange: incubator/jspwiki/trunk/src/WebContent/Error.jsp
------------------------------------------------------------------------------
svn:mergeinfo =
Propchange: incubator/jspwiki/trunk/src/WebContent/Group.jsp
------------------------------------------------------------------------------
svn:mergeinfo =
Propchange: incubator/jspwiki/trunk/src/WebContent/Install.jsp
------------------------------------------------------------------------------
svn:mergeinfo =
Propchange: incubator/jspwiki/trunk/src/WebContent/Login.jsp
------------------------------------------------------------------------------
svn:mergeinfo =
Propchange: incubator/jspwiki/trunk/src/WebContent/LoginForm.jsp
------------------------------------------------------------------------------
svn:mergeinfo =
Propchange: incubator/jspwiki/trunk/src/WebContent/Logout.jsp
------------------------------------------------------------------------------
svn:mergeinfo =
Propchange: incubator/jspwiki/trunk/src/WebContent/LostPassword.jsp
------------------------------------------------------------------------------
svn:mergeinfo =
Propchange: incubator/jspwiki/trunk/src/WebContent/Message.jsp
------------------------------------------------------------------------------
svn:executable = *
Propchange: incubator/jspwiki/trunk/src/WebContent/Message.jsp
------------------------------------------------------------------------------
svn:mergeinfo =
Propchange: incubator/jspwiki/trunk/src/WebContent/NewBlogEntry.jsp
------------------------------------------------------------------------------
svn:mergeinfo =
Propchange: incubator/jspwiki/trunk/src/WebContent/NewGroup.jsp
------------------------------------------------------------------------------
svn:mergeinfo =
Propchange: incubator/jspwiki/trunk/src/WebContent/PageInfo.jsp
------------------------------------------------------------------------------
svn:mergeinfo =
Propchange: incubator/jspwiki/trunk/src/WebContent/PageModified.jsp
------------------------------------------------------------------------------
svn:mergeinfo =
Propchange: incubator/jspwiki/trunk/src/WebContent/Preview.jsp
------------------------------------------------------------------------------
svn:mergeinfo =
Propchange: incubator/jspwiki/trunk/src/WebContent/Rename.jsp
------------------------------------------------------------------------------
svn:mergeinfo =
Propchange: incubator/jspwiki/trunk/src/WebContent/Search.jsp
------------------------------------------------------------------------------
svn:mergeinfo =
Propchange: incubator/jspwiki/trunk/src/WebContent/SisterSites.jsp
------------------------------------------------------------------------------
svn:mergeinfo =
Propchange: incubator/jspwiki/trunk/src/WebContent/Upload.jsp
------------------------------------------------------------------------------
svn:mergeinfo =
Propchange: incubator/jspwiki/trunk/src/WebContent/UserPreferences.jsp
------------------------------------------------------------------------------
svn:mergeinfo =
Propchange: incubator/jspwiki/trunk/src/WebContent/WEB-INF/classes/log4j.properties
------------------------------------------------------------------------------
svn:mergeinfo =
Propchange: incubator/jspwiki/trunk/src/WebContent/WEB-INF/classes/oscache.properties
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/jspwiki/trunk/src/WebContent/WEB-INF/classes/oscache.properties
------------------------------------------------------------------------------
svn:mergeinfo =
Propchange: incubator/jspwiki/trunk/src/WebContent/WEB-INF/geronimo-web.xml
------------------------------------------------------------------------------
svn:mergeinfo =
Propchange: incubator/jspwiki/trunk/src/WebContent/WEB-INF/groupdatabase.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/jspwiki/trunk/src/WebContent/WEB-INF/groupdatabase.xml
------------------------------------------------------------------------------
svn:mergeinfo =
Propchange: incubator/jspwiki/trunk/src/WebContent/WEB-INF/jspwiki-container.policy
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/jspwiki/trunk/src/WebContent/WEB-INF/jspwiki-container.policy
------------------------------------------------------------------------------
svn:mergeinfo =
Propchange: incubator/jspwiki/trunk/src/WebContent/WEB-INF/jspwiki.policy
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/jspwiki/trunk/src/WebContent/WEB-INF/jspwiki.policy
------------------------------------------------------------------------------
svn:mergeinfo =
Propchange: incubator/jspwiki/trunk/src/WebContent/WEB-INF/jspwiki.tld
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/jspwiki/trunk/src/WebContent/WEB-INF/jspwiki.tld
------------------------------------------------------------------------------
svn:mergeinfo =
Propchange: incubator/jspwiki/trunk/src/WebContent/WEB-INF/lib/README
------------------------------------------------------------------------------
svn:mergeinfo =
Propchange: incubator/jspwiki/trunk/src/WebContent/WEB-INF/lib/activation.jar
------------------------------------------------------------------------------
svn:mergeinfo =
Propchange: incubator/jspwiki/trunk/src/WebContent/WEB-INF/lib/activation.jar
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Propchange: incubator/jspwiki/trunk/src/WebContent/WEB-INF/lib/akismet-java-1.02.jar
------------------------------------------------------------------------------
svn:mergeinfo =
Propchange: incubator/jspwiki/trunk/src/WebContent/WEB-INF/lib/akismet-java-1.02.jar
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Propchange: incubator/jspwiki/trunk/src/WebContent/WEB-INF/lib/commons-codec-1.3.jar
------------------------------------------------------------------------------
svn:mergeinfo =
Propchange: incubator/jspwiki/trunk/src/WebContent/WEB-INF/lib/commons-codec-1.3.jar
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Propchange: incubator/jspwiki/trunk/src/WebContent/WEB-INF/lib/commons-fileupload-1.2.1.jar
------------------------------------------------------------------------------
svn:mergeinfo =
Propchange: incubator/jspwiki/trunk/src/WebContent/WEB-INF/lib/commons-fileupload-1.2.1.jar
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Propchange: incubator/jspwiki/trunk/src/WebContent/WEB-INF/lib/commons-httpclient-3.0.1.jar
------------------------------------------------------------------------------
svn:mergeinfo =
Propchange: incubator/jspwiki/trunk/src/WebContent/WEB-INF/lib/commons-httpclient-3.0.1.jar
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Propchange: incubator/jspwiki/trunk/src/WebContent/WEB-INF/lib/commons-io-1.4.jar
------------------------------------------------------------------------------
svn:mergeinfo =
Propchange: incubator/jspwiki/trunk/src/WebContent/WEB-INF/lib/commons-io-1.4.jar
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Propchange: incubator/jspwiki/trunk/src/WebContent/WEB-INF/lib/commons-lang-2.3.jar
------------------------------------------------------------------------------
svn:mergeinfo =
Propchange: incubator/jspwiki/trunk/src/WebContent/WEB-INF/lib/commons-lang-2.3.jar
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Propchange: incubator/jspwiki/trunk/src/WebContent/WEB-INF/lib/ecs.jar
------------------------------------------------------------------------------
svn:mergeinfo =
Propchange: incubator/jspwiki/trunk/src/WebContent/WEB-INF/lib/ecs.jar
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Propchange: incubator/jspwiki/trunk/src/WebContent/WEB-INF/lib/freshcookies-security-0.60.jar
------------------------------------------------------------------------------
svn:mergeinfo =
Propchange: incubator/jspwiki/trunk/src/WebContent/WEB-INF/lib/freshcookies-security-0.60.jar
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Propchange: incubator/jspwiki/trunk/src/WebContent/WEB-INF/lib/jabsorb-1.3.jar
------------------------------------------------------------------------------
svn:mergeinfo =
Propchange: incubator/jspwiki/trunk/src/WebContent/WEB-INF/lib/jabsorb-1.3.jar
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Propchange: incubator/jspwiki/trunk/src/WebContent/WEB-INF/lib/jakarta-tablibs-standard-1.1.2.jar
------------------------------------------------------------------------------
svn:mergeinfo =
Propchange: incubator/jspwiki/trunk/src/WebContent/WEB-INF/lib/jakarta-tablibs-standard-1.1.2.jar
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Propchange: incubator/jspwiki/trunk/src/WebContent/WEB-INF/lib/jakarta-taglibs-jstl-1.1.2.jar
------------------------------------------------------------------------------
svn:mergeinfo =
Propchange: incubator/jspwiki/trunk/src/WebContent/WEB-INF/lib/jakarta-taglibs-jstl-1.1.2.jar
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Propchange: incubator/jspwiki/trunk/src/WebContent/WEB-INF/lib/jaxen.jar
------------------------------------------------------------------------------
svn:mergeinfo =
Propchange: incubator/jspwiki/trunk/src/WebContent/WEB-INF/lib/jaxen.jar
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Propchange: incubator/jspwiki/trunk/src/WebContent/WEB-INF/lib/jcl-over-slf4j-1.5.6.jar
------------------------------------------------------------------------------
svn:mergeinfo =
Propchange: incubator/jspwiki/trunk/src/WebContent/WEB-INF/lib/jcl-over-slf4j-1.5.6.jar
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Propchange: incubator/jspwiki/trunk/src/WebContent/WEB-INF/lib/jcr-1.0.jar
------------------------------------------------------------------------------
svn:mergeinfo =
Propchange: incubator/jspwiki/trunk/src/WebContent/WEB-INF/lib/jcr-1.0.jar
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Propchange: incubator/jspwiki/trunk/src/WebContent/WEB-INF/lib/jdom.jar
------------------------------------------------------------------------------
svn:mergeinfo =
Propchange: incubator/jspwiki/trunk/src/WebContent/WEB-INF/lib/jdom.jar
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Propchange: incubator/jspwiki/trunk/src/WebContent/WEB-INF/lib/jrcs-diff.jar
------------------------------------------------------------------------------
svn:mergeinfo =
Propchange: incubator/jspwiki/trunk/src/WebContent/WEB-INF/lib/jrcs-diff.jar
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Propchange: incubator/jspwiki/trunk/src/WebContent/WEB-INF/lib/jsp-api.jar
------------------------------------------------------------------------------
svn:mergeinfo =
Propchange: incubator/jspwiki/trunk/src/WebContent/WEB-INF/lib/jsp-api.jar
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Propchange: incubator/jspwiki/trunk/src/WebContent/WEB-INF/lib/jul-to-slf4j-1.5.6.jar
------------------------------------------------------------------------------
svn:mergeinfo =
Propchange: incubator/jspwiki/trunk/src/WebContent/WEB-INF/lib/jul-to-slf4j-1.5.6.jar
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Propchange: incubator/jspwiki/trunk/src/WebContent/WEB-INF/lib/log4j-1.2.14.jar
------------------------------------------------------------------------------
svn:mergeinfo =
Propchange: incubator/jspwiki/trunk/src/WebContent/WEB-INF/lib/log4j-1.2.14.jar
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream