You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jspwiki.apache.org by aj...@apache.org on 2008/11/11 04:49:12 UTC
svn commit: r712929 [1/4] - in
/incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH: ./ .settings/ doc/
etc/ etc/i18n/ etc/i18n/plugin/ etc/i18n/templates/ etc/ini/ lib/
src/com/ecyrd/jspwiki/ src/com/ecyrd/jspwiki/attachment/
src/com/ecyrd/jspwiki/a...
Author: ajaquith
Date: Mon Nov 10 19:49:06 2008
New Revision: 712929
URL: http://svn.apache.org/viewvc?rev=712929&view=rev
Log:
Merged STRIPES_BRANCH with trunk revision 712830.
Added:
incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/doc/Translating.txt
- copied unchanged from r712925, incubator/jspwiki/trunk/doc/Translating.txt
incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/etc/i18n/CoreResources_fr.properties
- copied unchanged from r712925, incubator/jspwiki/trunk/etc/i18n/CoreResources_fr.properties
incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/etc/i18n/plugin/PluginResources_fr.properties
- copied unchanged from r712925, incubator/jspwiki/trunk/etc/i18n/plugin/PluginResources_fr.properties
incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/etc/i18n/templates/default_fr.properties
- copied unchanged from r712925, incubator/jspwiki/trunk/etc/i18n/templates/default_fr.properties
incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/lib/freshcookies-security-0.60.jar (props changed)
- copied unchanged from r712925, incubator/jspwiki/trunk/lib/freshcookies-security-0.60.jar
incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/lib/jabsorb-1.3.jar (props changed)
- copied unchanged from r712925, incubator/jspwiki/trunk/lib/jabsorb-1.3.jar
incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/lib/slf4j-api-1.5.5.jar (props changed)
- copied unchanged from r712925, incubator/jspwiki/trunk/lib/slf4j-api-1.5.5.jar
incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/lib/slf4j-log4j12-1.5.5.jar (props changed)
- copied unchanged from r712925, incubator/jspwiki/trunk/lib/slf4j-log4j12-1.5.5.jar
incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/org/apache/jspwiki/
- copied from r712925, incubator/jspwiki/trunk/src/org/apache/jspwiki/
incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/org/apache/jspwiki/api/
- copied from r712925, incubator/jspwiki/trunk/src/org/apache/jspwiki/api/
incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/org/apache/jspwiki/api/AbstractContext.java
- copied unchanged from r712925, incubator/jspwiki/trunk/src/org/apache/jspwiki/api/AbstractContext.java
incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/org/apache/jspwiki/api/FilterException.java
- copied unchanged from r712925, incubator/jspwiki/trunk/src/org/apache/jspwiki/api/FilterException.java
incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/org/apache/jspwiki/api/ModuleData.java
- copied unchanged from r712925, incubator/jspwiki/trunk/src/org/apache/jspwiki/api/ModuleData.java
incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/org/apache/jspwiki/api/PageFilter.java
- copied unchanged from r712925, incubator/jspwiki/trunk/src/org/apache/jspwiki/api/PageFilter.java
incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/org/apache/jspwiki/api/PluginException.java
- copied unchanged from r712925, incubator/jspwiki/trunk/src/org/apache/jspwiki/api/PluginException.java
incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/org/apache/jspwiki/api/Release.java
- copied unchanged from r712925, incubator/jspwiki/trunk/src/org/apache/jspwiki/api/Release.java
incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/org/apache/jspwiki/api/WikiContext.java
- copied unchanged from r712925, incubator/jspwiki/trunk/src/org/apache/jspwiki/api/WikiContext.java
incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/org/apache/jspwiki/api/WikiEngine.java
- copied unchanged from r712925, incubator/jspwiki/trunk/src/org/apache/jspwiki/api/WikiEngine.java
incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/org/apache/jspwiki/api/WikiException.java
- copied unchanged from r712925, incubator/jspwiki/trunk/src/org/apache/jspwiki/api/WikiException.java
incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/org/apache/jspwiki/api/WikiPage.java
- copied unchanged from r712925, incubator/jspwiki/trunk/src/org/apache/jspwiki/api/WikiPage.java
incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/org/apache/jspwiki/api/WikiPlugin.java
- copied unchanged from r712925, incubator/jspwiki/trunk/src/org/apache/jspwiki/api/WikiPlugin.java
incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/org/apache/jspwiki/api/WikiRenderer.java
- copied unchanged from r712925, incubator/jspwiki/trunk/src/org/apache/jspwiki/api/WikiRenderer.java
incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/org/apache/jspwiki/api/WikiSession.java
- copied unchanged from r712925, incubator/jspwiki/trunk/src/org/apache/jspwiki/api/WikiSession.java
incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/wikipages/fr/
- copied from r712925, incubator/jspwiki/trunk/src/wikipages/fr/
incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/wikipages/fr/About.txt
- copied unchanged from r712925, incubator/jspwiki/trunk/src/wikipages/fr/About.txt
incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/wikipages/fr/ApprovalRequiredForPageChanges.txt
- copied unchanged from r712925, incubator/jspwiki/trunk/src/wikipages/fr/ApprovalRequiredForPageChanges.txt
incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/wikipages/fr/ApprovalRequiredForUserProfiles.txt
- copied unchanged from r712925, incubator/jspwiki/trunk/src/wikipages/fr/ApprovalRequiredForUserProfiles.txt
incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/wikipages/fr/Community.txt
- copied unchanged from r712925, incubator/jspwiki/trunk/src/wikipages/fr/Community.txt
incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/wikipages/fr/CopyrightNotice.txt
- copied unchanged from r712925, incubator/jspwiki/trunk/src/wikipages/fr/CopyrightNotice.txt
incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/wikipages/fr/EditFindAndReplaceHelp.txt
- copied unchanged from r712925, incubator/jspwiki/trunk/src/wikipages/fr/EditFindAndReplaceHelp.txt
incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/wikipages/fr/EditPageHelp.txt
- copied unchanged from r712925, incubator/jspwiki/trunk/src/wikipages/fr/EditPageHelp.txt
incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/wikipages/fr/FullRecentChanges.txt
- copied unchanged from r712925, incubator/jspwiki/trunk/src/wikipages/fr/FullRecentChanges.txt
incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/wikipages/fr/FullTextFormattingRules.txt
- copied unchanged from r712925, incubator/jspwiki/trunk/src/wikipages/fr/FullTextFormattingRules.txt
incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/wikipages/fr/InstallationTips.txt
- copied unchanged from r712925, incubator/jspwiki/trunk/src/wikipages/fr/InstallationTips.txt
incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/wikipages/fr/LeftMenu.txt
- copied unchanged from r712925, incubator/jspwiki/trunk/src/wikipages/fr/LeftMenu.txt
incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/wikipages/fr/LeftMenuFooter.txt
- copied unchanged from r712925, incubator/jspwiki/trunk/src/wikipages/fr/LeftMenuFooter.txt
incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/wikipages/fr/LoginHelp.txt
- copied unchanged from r712925, incubator/jspwiki/trunk/src/wikipages/fr/LoginHelp.txt
incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/wikipages/fr/Main.txt
- copied unchanged from r712925, incubator/jspwiki/trunk/src/wikipages/fr/Main.txt
incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/wikipages/fr/MoreMenu.txt
- copied unchanged from r712925, incubator/jspwiki/trunk/src/wikipages/fr/MoreMenu.txt
incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/wikipages/fr/OneMinuteWiki.txt
- copied unchanged from r712925, incubator/jspwiki/trunk/src/wikipages/fr/OneMinuteWiki.txt
incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/wikipages/fr/PageAlias.txt
- copied unchanged from r712925, incubator/jspwiki/trunk/src/wikipages/fr/PageAlias.txt
incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/wikipages/fr/PageIndex.txt
- copied unchanged from r712925, incubator/jspwiki/trunk/src/wikipages/fr/PageIndex.txt
incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/wikipages/fr/RecentChanges.txt
- copied unchanged from r712925, incubator/jspwiki/trunk/src/wikipages/fr/RecentChanges.txt
incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/wikipages/fr/RejectedMessage.txt
- copied unchanged from r712925, incubator/jspwiki/trunk/src/wikipages/fr/RejectedMessage.txt
incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/wikipages/fr/SandBox.txt
- copied unchanged from r712925, incubator/jspwiki/trunk/src/wikipages/fr/SandBox.txt
incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/wikipages/fr/SearchPageHelp.txt
- copied unchanged from r712925, incubator/jspwiki/trunk/src/wikipages/fr/SearchPageHelp.txt
incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/wikipages/fr/SpecialPageIndex.txt
- copied unchanged from r712925, incubator/jspwiki/trunk/src/wikipages/fr/SpecialPageIndex.txt
incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/wikipages/fr/SystemInfo.txt
- copied unchanged from r712925, incubator/jspwiki/trunk/src/wikipages/fr/SystemInfo.txt
incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/wikipages/fr/TextFormattingRules.txt
- copied unchanged from r712925, incubator/jspwiki/trunk/src/wikipages/fr/TextFormattingRules.txt
incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/wikipages/fr/TitleBox.txt
- copied unchanged from r712925, incubator/jspwiki/trunk/src/wikipages/fr/TitleBox.txt
incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/wikipages/fr/UndefinedPages.txt
- copied unchanged from r712925, incubator/jspwiki/trunk/src/wikipages/fr/UndefinedPages.txt
incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/wikipages/fr/UnusedPages.txt
- copied unchanged from r712925, incubator/jspwiki/trunk/src/wikipages/fr/UnusedPages.txt
incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/wikipages/fr/WikiEtiquette.txt
- copied unchanged from r712925, incubator/jspwiki/trunk/src/wikipages/fr/WikiEtiquette.txt
incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/wikipages/zh_CN/ApprovalRequiredForPageChanges.txt (props changed)
- copied unchanged from r712925, incubator/jspwiki/trunk/src/wikipages/zh_CN/ApprovalRequiredForPageChanges.txt
incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/wikipages/zh_CN/ApprovalRequiredForUserProfiles.txt (props changed)
- copied unchanged from r712925, incubator/jspwiki/trunk/src/wikipages/zh_CN/ApprovalRequiredForUserProfiles.txt
incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/wikipages/zh_CN/SandBox.txt (props changed)
- copied unchanged from r712925, incubator/jspwiki/trunk/src/wikipages/zh_CN/SandBox.txt
incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/wikipages/zh_CN/WikiEtiquette.txt (props changed)
- copied unchanged from r712925, incubator/jspwiki/trunk/src/wikipages/zh_CN/WikiEtiquette.txt
incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/tests/etc/jspwiki-testUserPolicy.policy (props changed)
- copied unchanged from r712925, incubator/jspwiki/trunk/tests/etc/jspwiki-testUserPolicy.policy
Removed:
incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/doc/AAA_Release_Notes.txt
incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/lib/freshcookies-security-0.54.jar
incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/lib/jsonrpc-1.0.jar
incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/tests/lib/stripes-1.5.jar
Modified:
incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/.classpath
incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/.settings/org.eclipse.core.resources.prefs
incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/ChangeLog
incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/LICENSE
incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/NOTICE
incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/README
incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/build.xml
incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/etc/i18n/CoreResources.properties
incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/etc/i18n/CoreResources_de.properties
incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/etc/i18n/CoreResources_es.properties
incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/etc/i18n/CoreResources_fi.properties
incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/etc/i18n/CoreResources_nl.properties
incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/etc/i18n/plugin/PluginResources.properties
incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/etc/i18n/plugin/PluginResources_de.properties
incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/etc/i18n/plugin/PluginResources_es.properties
incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/etc/i18n/plugin/PluginResources_fi.properties
incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/etc/i18n/plugin/PluginResources_nl.properties
incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/etc/i18n/templates/default_es.properties
incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/etc/i18n/templates/default_fi.properties
incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/etc/ini/jspwiki_module.xml
incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/etc/web.xml
incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/Release.java
incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/VariableManager.java
incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/attachment/AttachmentManager.java
incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/attachment/AttachmentServlet.java
incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/auth/AuthorizationManager.java
incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/auth/authorize/XMLGroupDatabase.java
incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/auth/user/XMLUserDatabase.java
incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/content/PageRenamer.java
incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/filters/FilterManager.java
incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/filters/ProfanityFilter.java
incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/filters/SpamFilter.java
incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/modules/ModuleManager.java
incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/modules/WikiModuleInfo.java
incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/parser/JSPWikiMarkupParser.java
incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/plugin/IfPlugin.java
incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/plugin/Image.java
incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/plugin/InsertPage.java
incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/plugin/ListLocksPlugin.java
incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/plugin/PluginManager.java
incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/preferences/Preferences.java
incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/providers/CachingProvider.java
incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/rpc/json/JSONRPCManager.java
incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/search/LuceneSearchProvider.java
incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/ui/EditorManager.java
incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/ui/WikiJSPFilter.java
incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/ui/admin/beans/PluginBean.java
incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/url/ShortURLConstructor.java
incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/webdocs/admin/SecurityConfig.jsp
incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/webdocs/rss.jsp
incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/webdocs/scripts/jspwiki-edit.js
incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/webdocs/templates/default/GroupContent.jsp
incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/webdocs/templates/default/GroupTab.jsp
incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/webdocs/templates/default/editors/plain.jsp
incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/webdocs/templates/default/jspwiki.css
incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/wikipages/zh_CN/About.txt
incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/wikipages/zh_CN/Community.txt
incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/wikipages/zh_CN/CopyrightNotice.txt
incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/wikipages/zh_CN/EditFindAndReplaceHelp.txt
incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/wikipages/zh_CN/EditPageHelp.txt
incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/wikipages/zh_CN/FullRecentChanges.txt
incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/wikipages/zh_CN/InstallationTips.txt
incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/wikipages/zh_CN/LeftMenu.txt
incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/wikipages/zh_CN/LeftMenuFooter.txt
incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/wikipages/zh_CN/LoginHelp.txt
incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/wikipages/zh_CN/LoginPageHelp.txt
incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/wikipages/zh_CN/Main.txt
incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/wikipages/zh_CN/MoreMenu.txt
incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/wikipages/zh_CN/OneMinuteWiki.txt
incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/wikipages/zh_CN/PageAlias.txt
incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/wikipages/zh_CN/PageIndex.txt
incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/wikipages/zh_CN/RecentChanges.txt
incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/wikipages/zh_CN/RejectedMessage.txt
incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/wikipages/zh_CN/SearchPageHelp.txt
incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/wikipages/zh_CN/SystemInfo.txt
incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/wikipages/zh_CN/TextFormattingRules.txt
incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/wikipages/zh_CN/TitleBox.txt
incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/wikipages/zh_CN/UndefinedPages.txt
incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/wikipages/zh_CN/UnusedPages.txt
incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/wikipages/zh_CN/WikiName.txt
incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/wikipages/zh_CN/WikiVariables.txt
incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/wikipages/zh_CN/WikiWiki.txt
incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/tests/TranslationsCheck.java
incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/tests/com/ecyrd/jspwiki/ReleaseTest.java
incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/tests/com/ecyrd/jspwiki/auth/AuthorizationManagerTest.java
incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/tests/com/ecyrd/jspwiki/content/PageRenamerTest.java
incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/tests/com/ecyrd/jspwiki/parser/JSPWikiMarkupParserTest.java
incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/tests/com/ecyrd/jspwiki/plugin/InsertPageTest.java
incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/tests/com/ecyrd/jspwiki/plugin/PluginManagerTest.java
incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/tests/com/ecyrd/jspwiki/plugin/SamplePlugin.java
incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/tests/com/ecyrd/jspwiki/plugin/TableOfContentsTest.java
incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/tests/com/ecyrd/jspwiki/render/CreoleRendererTest.java
incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/tests/com/ecyrd/jspwiki/util/AllTests.java
incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/tests/etc/selenium/tests/all/RenameProfile.html
Modified: incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/.classpath
URL: http://svn.apache.org/viewvc/incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/.classpath?rev=712929&r1=712928&r2=712929&view=diff
==============================================================================
--- incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/.classpath (original)
+++ incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/.classpath Mon Nov 10 19:49:06 2008
@@ -8,12 +8,12 @@
<classpathentry kind="lib" path="lib/jdom.jar"/>
<classpathentry kind="lib" path="lib/log4j-1.2.14.jar"/>
<classpathentry kind="lib" path="lib/akismet-java-1.02.jar"/>
- <classpathentry kind="lib" path="lib/jsonrpc-1.0.jar" sourcepath="/Users/jalkanen/Java/json-rpc-java-1.0/src"/>
- <classpathentry kind="lib" path="lib/xmlrpc.jar" sourcepath="/Users/jalkanen/Java/xmlrpc-2.0.1/xmlrpc-2.0.1-sources.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" sourcepath="/Users/jalkanen/Java/oscache-2.2/src/java"/>
+ <classpathentry kind="lib" path="lib/oscache.jar"/>
<classpathentry kind="lib" path="lib/oro.jar"/>
<classpathentry kind="lib" path="lib/nekohtml.jar"/>
<classpathentry kind="lib" path="lib/lucene.jar"/>
@@ -25,7 +25,7 @@
<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.54.jar"/>
+ <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"/>
@@ -38,8 +38,8 @@
<classpathentry kind="lib" path="tests/lib/jetty-jmx-5.1.14.jar"/>
<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="lib/stripes-1.5.jar" sourcepath="/stripes-1.5/stripes/src"/>
<classpathentry kind="lib" path="tests/lib/selenium-server-1.0-beta1.jar"/>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.launching.macosx.MacOSXType/JVM 1.5.0"/>
+ <classpathentry kind="lib" path="lib/stripes-1.5.jar"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
<classpathentry kind="output" path="classes"/>
</classpath>
Modified: incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/.settings/org.eclipse.core.resources.prefs
URL: http://svn.apache.org/viewvc/incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/.settings/org.eclipse.core.resources.prefs?rev=712929&r1=712928&r2=712929&view=diff
==============================================================================
--- incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/.settings/org.eclipse.core.resources.prefs (original)
+++ incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/.settings/org.eclipse.core.resources.prefs Mon Nov 10 19:49:06 2008
@@ -1,4 +1,4 @@
-#Sun Jun 29 18:40:26 EEST 2008
+#Sat Nov 08 19:15:42 EET 2008
eclipse.preferences.version=1
encoding//etc/i18n/templates/default_de.properties=ISO-8859-1
encoding//src/wikipages/fi/ApprovalRequiredForPageChanges.txt=UTF-8
@@ -6,4 +6,8 @@
encoding//src/wikipages/fi/EditFindAndReplaceHelp.txt=UTF-8
encoding//src/wikipages/fi/MoreMenu.txt=UTF-8
encoding//src/wikipages/fi/TitleBox.txt=UTF-8
+encoding//src/wikipages/fr=UTF-8
+encoding//src/wikipages/fr/About.txt=UTF-8
+encoding//src/wikipages/zh_CN=UTF-8
+encoding//src/wikipages/zh_CN/About.txt=UTF-8
encoding/<project>=ISO-8859-1
Modified: incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/ChangeLog
URL: http://svn.apache.org/viewvc/incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/ChangeLog?rev=712929&r1=712928&r2=712929&view=diff
==============================================================================
--- incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/ChangeLog (original)
+++ incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/ChangeLog Mon Nov 10 19:49:06 2008
@@ -1,3 +1,114 @@
+2008-11-10 Janne Jalkanen <ja...@apache.org>
+
+ * 3.0.0-svn-5
+
+ * Stripes-1.5 resides now in lib instead of tests/lib. Yay!
+
+ * JSPWIKI-423: Plugins and filters now use annotations instead of
+ jspwiki_module.xml. Editors still do it the old way, though.
+ jspwiki_module.xml still is used to optionally locate the packages,
+ through "<module package="org.mycompany"/>". Please see PluginManager
+ for documentation.
+
+2008-11-10 Harry Metske <me...@apache.org>
+
+ * 3.0.0-svn-4
+
+ * JSPWIKI-276: jsonrpc replaced by jabsorb, reported by Jorge Ferrer.
+
+ Note that web.xml had changes, the package name com.metaparadigm.jsonrpc has been
+ changed to org.jabsorb.
+
+2008-11-09 Harry Metske <me...@apache.org>
+
+ * 3.0.0-svn-3
+
+ * JSPWIKI-415: Favorites not displayed properly when blank in userName, reported by Trevor Harrison
+ also i18n'ed the InsertPlugin as the fix for JSPWIKI-415 was there.
+ Added 2 JUnit tests for InsertPage plugin
+
+2008-11-08 Harry Metske <me...@apache.org>
+
+ * 3.0.0-svn-2
+
+ * JSPWIKI-407: applied de patch from FLorian
+
+2008-11-08 Janne Jalkanen <ja...@apache.org>
+
+ * 3.0.0-svn-1
+
+ * Merged from the 2.8 branch:
+
+ * JSPWIKI-345
+
+ * Added doc/Translating.txt as a guide for people who want to create
+ translations.
+
+ * Added ant "i18n-check" target as an interface
+ to TranslationsCheck (no need to get geeky running a Java class).
+
+2008-11-06 Janne Jalkanen <ja...@apache.org>
+
+ * Merged from 2.8: [JSPWIKI-416]: French translation and corepages from Olivier Descout
+
+2008-11-05 Juan Pablo Santos <ju...@gmail.com>
+
+ * [JSPWIKI-407]: updated es translation; fixed some HTML entities left behind.
+
+2008-11-04 Janne Jalkanen <ja...@apache.org>
+
+ * Merged in from 2.8: JSPWIKI-411 & JSPWIKI-381.
+
+2008-11-03 Janne Jalkanen <ja...@apache.org>
+
+ * Merged in changes from 2.8:
+
+ * JSPWIKI-408: Hide wide-content on left-menu and leftmenu-footer.
+
+ * JSPWIKI-403: Pagination links now show a pointer cursor at hover.
+
+2008-11-03 Janne Jalkanen <ja...@apache.org>
+
+ * Merged changes from 2.8: JSPWIKI-407.
+
+2008-11-02 Janne Jalkanen <ja...@apache.org>
+
+ * Merged changes from 2.8 branch: JSPWIKI-288, JSPWIKI-406,
+ JSPWIKI-348, JSPWIKI-389, JSPWIKI-138
+
+2008-10-26 Janne Jalkanen <ja...@apache.org>
+
+ * Added the 3.0 API definition interfaces from the SVN.
+
+2008-10-17 Janne Jalkanen <ja...@apache.org>
+
+ * Merged fixes from 2.8.0 branch
+
+ * JSPWIKI-400: Chinese core pages were corrupted.
+
+2008-10-14 Janne Jalkanen <ja...@apache.org>
+
+ * 2.8.0-beta-21
+
+ * [JSPWIKI-398] Pages with spaces in them caused erratic rename
+ behaviour by renaming all the links on the page.
+
+2008-10-14 Andrew Jaquith <ajaquith AT apache DOT org>
+
+ * 2.8.0-beta-20
+
+ * [JSPWIKI-313] ShortURLConstructor was not creating URLs for the LOGIN
+ context correctly. We now check for this context specifically.
+
+2008-10-13 Andrew Jaquith <ajaquith AT apache DOT org>
+
+ * 2.8.0-beta-19
+
+ * [JSPWiki-342] Resolved issue by removing outdated doc files.
+
+ * [JSPWIKI-345] Added unit tests for testing single user policies. Confirmed bug
+ and workaround but did not fix root cause (freshcookies-security bug).
+
2008-10-06 Dirk Frederickx <di...@gmail.com>
* 2.8.0-beta-18
@@ -71,7 +182,7 @@
* added Dutch corepages
-2008-09-24 Juan Pablo Santos <ju...@apache.org>
+2008-09-24 Juan Pablo Santos <ju...@gmail.com>
* 2.8.0-beta-10
Modified: incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/LICENSE
URL: http://svn.apache.org/viewvc/incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/LICENSE?rev=712929&r1=712928&r2=712929&view=diff
==============================================================================
--- incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/LICENSE (original)
+++ incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/LICENSE Mon Nov 10 19:49:06 2008
@@ -216,13 +216,13 @@
commons-lang-2.3.jar LICENSE
commons-logging-api.jar LICENSE
ecs.jar LICENSE
-freshcookies-security-0.54.jar LICENSE
+freshcookies-security-0.60.jar LICENSE
jakarta-taglibs-standard-1.1.2.jar LICENSE
jakarta-taglibs-jstl-1.1.2.jar LICENSE
jaxen.jar doc/LICENSE.jaxen
jdom.jar doc/LICENSE.jdom
jrcs-diff.jar LICENSE
-jsonrpc-1.0.jar LICENSE
+jabsorb-1.3.jar LICENSE
jsp-api.jar LICENSE
log4j-1.2.14.jar LICENSE
lucene-highlighter.jar LICENSE
@@ -234,6 +234,8 @@
sandler.jar doc/LICENSE.sandler
servlet-api.jar doc/LICENSE.cddl
xmlrpc.jar LICENSE
+slf4j-api-1.5.5.jar MIT-style license
+slf4j-log4j12-1.5.5.jar MIT-style license
TEST LIBRARY LICENSE FILE
===================================================================================
Modified: incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/NOTICE
URL: http://svn.apache.org/viewvc/incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/NOTICE?rev=712929&r1=712928&r2=712929&view=diff
==============================================================================
--- incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/NOTICE (original)
+++ incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/NOTICE Mon Nov 10 19:49:06 2008
@@ -50,3 +50,5 @@
Slimbox, adapted for JSPWiki, original by Christophe Bleys. (see http://www.digitalia.be/software/slimbox)
Servlet-api Copyright 1997-2008 Sun Microsystems, Inc. All rights reserved.
+
+search_highlight.js Copyright (c) 2002 Stuart Langridge
Modified: incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/README
URL: http://svn.apache.org/viewvc/incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/README?rev=712929&r1=712928&r2=712929&view=diff
==============================================================================
--- incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/README (original)
+++ incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/README Mon Nov 10 19:49:06 2008
@@ -133,15 +133,15 @@
recommend the VersioningFileProvider.
All JSPWiki documentation is in the web; please see
-http://doc.jspwiki.org/2.6/wiki/WindowsInstall
+http://doc.jspwiki.org/2.8/wiki/WindowsInstall
Upgrading from previous versions
--------------------------------
-Please read ReleaseNotes.
+Please read ReleaseNotes and the UPGRADING document.
All JSPWiki documentation is in the web; please see
-http://doc.jspwiki.org/2.6/
+http://doc.jspwiki.org/2.8/
Configuring JSPWiki
@@ -155,7 +155,7 @@
Also, there is a far more detailed documentation in the web:
-http://doc.jspwiki.org/2.6/
+http://doc.jspwiki.org/2.8/
Where to go next aka. where is the rest of the documentation?
@@ -163,19 +163,9 @@
The rest of the documentation is at
-http://doc.jspwiki.org/2.6/
+http://doc.jspwiki.org/2.8/
-Acknowledgements
-----------------
-
-This product includes software developed by the Apache Software Foundation
-(http://www.apache.org/). See doc/LICENCE.Apache for more information.
-
-This product includes software developed by the OpenSymphony Group
-(http://www.opensymphony.org/). See doc/LICENSE.OpenSymphony for more
-information.
-
Contact
-------
@@ -185,45 +175,3 @@
The mailing list should also be your primary place to ask support questions.
There are many wise and knowledgeable people on that list.
-
-
-LICENSES
-========
-
-The various Jakarta libraries are licensed under the Apache Public
-License. See http://www.apache.org/LICENSE.txt
-
-The search_highlight.js script is licensed under the X11 (MIT)
-License:
-
-COPYRIGHT AND PERMISSION NOTICE
-
-Copyright (c) 2002 Stuart Langridge
-
-All rights reserved.
-
-Permission is hereby granted, free of charge, to any person obtaining
-a copy of this software and associated documentation files (the
-"Software"), to deal in the Software without restriction, including
-without limitation the rights to use, copy, modify, merge, publish,
-distribute, and/or sell copies of the Software, and to permit persons
-to whom the Software is furnished to do so, provided that the above
-copyright notice(s) and this permission notice appear in all copies of
-the Software and that both the above copyright notice(s) and this
-permission notice appear in supporting documentation.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
-OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
-HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY
-SPECIAL INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER
-RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF
-CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
-CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-
-Except as contained in this notice, the name of a copyright holder
-shall not be used in advertising or otherwise to promote the sale, use
-or other dealings in this Software without prior written authorization
-of the copyright holder.
-
Modified: incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/build.xml
URL: http://svn.apache.org/viewvc/incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/build.xml?rev=712929&r1=712928&r2=712929&view=diff
==============================================================================
--- incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/build.xml (original)
+++ incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/build.xml Mon Nov 10 19:49:06 2008
@@ -564,6 +564,10 @@
basedir="src/wikipages/nl">
</zip>
+ <zip zipfile="${install.fulldir}/${ant.project.name}-corepages_fr.zip"
+ basedir="src/wikipages/fr">
+ </zip>
+
<!-- Add other languages here -->
</target>
@@ -1470,6 +1474,17 @@
<delete dir="${tmplt.i18n.dir}" />
</target>
+ <target name="i18n-check" depends="compile,compiletests"
+ description="Run this target to check whether a translation is up to date.">
+ <input message="Please give the language you want to check translation for (e.g. fi, es, de)"
+ addproperty="check.language"/>
+ <java classname="TranslationsCheck">
+ <classpath path="${tests.build}"/>
+ <classpath path="${code.build}"/>
+ <arg line="${check.language}"/>
+ </java>
+ </target>
+
<target name="api-diff" description="Compares API in JSPWiki.jar with previous version"
depends="jar">
<!-- Assumes that the dependencyfinder.dir property points to the
Modified: incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/etc/i18n/CoreResources.properties
URL: http://svn.apache.org/viewvc/incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/etc/i18n/CoreResources.properties?rev=712929&r1=712928&r2=712929&view=diff
==============================================================================
--- incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/etc/i18n/CoreResources.properties (original)
+++ incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/etc/i18n/CoreResources.properties Mon Nov 10 19:49:06 2008
@@ -196,3 +196,14 @@
# RSSImageLinkTag
rss.title=RSS feed for page {0}
+
+# AttachmentManager
+attach.unwanted.file=Unwanted file name.
+attach.empty.file=Empty file name given.
+attach.parent.not.exist=Parent page does not exist
+
+# VariableManager
+varmgr.not.logged.in=not logged in
+varmgr.authenticated=authenticated
+varmgr.asserted=asserted
+varmgr.anonymous=anonymous
Modified: incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/etc/i18n/CoreResources_de.properties
URL: http://svn.apache.org/viewvc/incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/etc/i18n/CoreResources_de.properties?rev=712929&r1=712928&r2=712929&view=diff
==============================================================================
--- incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/etc/i18n/CoreResources_de.properties (original)
+++ incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/etc/i18n/CoreResources_de.properties Mon Nov 10 19:49:06 2008
@@ -208,6 +208,17 @@
# RSSImageLinkTag
rss.title=RSS-Feed für die Seite {0}
+# AttachmentManager
+attach.unwanted.file=Unerlaubter Dateiname.
+attach.empty.file=Kein Dateiname vorhanden.
+attach.parent.not.exist=Die übergeordnete Seite existiert nicht.
+
+# VariableManager
+varmgr.not.logged.in=nicht angemeldet
+varmgr.authenticated=authentifiziert
+varmgr.asserted=angenommene Identität
+varmgr.anonymous=anonym
+
# Outdated or superfluous properties
# folgende Properties sind in der aktuellen 'default en' Datei nicht enthalten
Modified: incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/etc/i18n/CoreResources_es.properties
URL: http://svn.apache.org/viewvc/incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/etc/i18n/CoreResources_es.properties?rev=712929&r1=712928&r2=712929&view=diff
==============================================================================
--- incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/etc/i18n/CoreResources_es.properties (original)
+++ incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/etc/i18n/CoreResources_es.properties Mon Nov 10 19:49:06 2008
@@ -70,7 +70,7 @@
\n\nPuedes identificarte en {2}.\n\n-- {3}
lostpwd.newpassword.subject=Nueva contraseña para {0}
lostpwd.nouser=No se encontró usuario o e-mail para '{0}'.
-lostpwd.nomail=Error interno: ¡no se pudo enviar el correo electrónico! Por favor, contacte con el administrador del sitio.
+lostpwd.nomail=Error interno: ¡no se pudo enviar el correo electrónico! Por favor, contacte con el administrador del sitio.
lostpwd.emailed=Se ha enviado una contraseña nueva a la cuenta indicada.
lostpwd.reset.title=Resetear la contraseña
@@ -104,14 +104,14 @@
# JSPWikiMarkupParser
markupparser.error.invalidset = Encontrado SET no válido: {0}
-markupparser.error.nointerwikiref = ¡No está definida la referencia InterWiki en el fichero de propiedades para el Wiki "{0}"!
+markupparser.error.nointerwikiref = ¡No está definida la referencia InterWiki en el fichero de propiedades para el Wiki "{0}"!
markupparser.error.parserfailure = Fallo del parser: {0}
-markupparser.error.javascriptattempt = ¡Intento de producir código javascript!
+markupparser.error.javascriptattempt = ¡Intento de producir código javascript!
markupparser.link.create = Crear "{0}"
# Captcha.jsp
captcha.js.humancheckcomplete.alert=Por favor, identifica correctamente a los gatos.
-captcha.description=Creemos que eres o bien un robot o bien un spammer. ¿Podrías por favor seleccionar los gatitos del juego de \
+captcha.description=Creemos que eres o bien un robot o bien un spammer. ¿Podrías por favor seleccionar los gatitos del juego de \
imágenes inferior, de tal modo que sepamos que eres un ser humano normal?
captcha.asirra.please.select=Por favor, selecciona todas las fotografías de gatos:
captcha.asirra.adopt.me=Adóptame
@@ -122,7 +122,7 @@
# Install.jsp
install.jsp.title=Instalador de JSPWiki
install.jsp.intro.title=Instalador de JSPWiki
-install.jsp.intro.p1=¡Bienvenido! Esta pequeña JSP está aquí para ayudarte en la primera etapa de la \
+install.jsp.intro.p1=¡Bienvenido! Esta pequeña JSP está aquí para ayudarte en la primera etapa de la \
configuración de JSPWiki. Si puedes ver esta página, ya has instalado correctamente JSPWiki \
en tu contenedor de aplicaciones.
install.jsp.intro.p2=Hay algunas cosas que deberías configurar. Cuando submitas el formulario, el fichero \
@@ -146,7 +146,7 @@
install.jsp.basics.title=Fundamentales
install.jsp.basics.appname.label=Nombre de la Aplicación
-install.jsp.basics.appname.desc=¿Cómo debería llamarse tu wiki? Intenta hacer este nombre relativamente corto.
+install.jsp.basics.appname.desc=¿Cómo debería llamarse tu wiki? Intenta hacer este nombre relativamente corto.
install.jsp.basics.baseurl.label=URL base
install.jsp.basics.baseurl.desc=Dile a JSPWiki a través de dónde está accesible tu wiki.
install.jsp.basics.page.storage.label=Almacenamiento de páginas
@@ -170,7 +170,7 @@
del wiki-grupo <strong>Admin</strong>. Por defecto, la política de seguridad de JSPWiki \
concede a todos los miembros del grupo Admin el todopoderoso <code>AllPermission</code>.
install.jsp.security.admaccount.notenabled.desc=Este wiki no parece tener una cuenta de administrador. Cuando hagas click en \
- <em>¡Configura!</em>, JSPWiki creará uno para ti.
+ <em>¡Configura!</em>, JSPWiki creará uno para ti.
install.jsp.adv.settings.title=Configuración avanzada
install.jsp.adv.settings.logfile.label=Ficheros de log
@@ -186,7 +186,7 @@
# Installer.java
install.installer.unable.read.props=Incapaz de leer las propiedades: {0}
install.installer.default.appname=MiWiki
-install.installer.default.pagedir=¡Por favor configúrame!
+install.installer.default.pagedir=¡Por favor configúrame!
install.installer.props.saved=Tus nuevas propiedades han sido guardadas. Por favor, reinicia tu contenedor de aplicaciones \
(excepto si ha sido tu primera instalación). Navega hacia el final de la página para ver el \
contenido de tu fichero jspwiki.properties.
@@ -199,4 +199,15 @@
install.installer.validate.logdir=Tienes que definir un directorio de log.
# RSSImageLinkTag
-rss.title=Canal RSS de la página {0}
\ No newline at end of file
+rss.title=Canal RSS de la página {0}
+
+# AttachmentManager
+attach.unwanted.file=Nombre de fichero inválido.
+attach.empty.file=Nombre de fichero vacío.
+attach.parent.not.exist=La página padre no existe
+
+# VariableManager
+varmgr.not.logged.in=sin identificar
+varmgr.authenticated=autenticado
+varmgr.asserted=identificado (sin iniciar sesión)
+varmgr.anonymous=anónimo
\ No newline at end of file
Modified: incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/etc/i18n/CoreResources_fi.properties
URL: http://svn.apache.org/viewvc/incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/etc/i18n/CoreResources_fi.properties?rev=712929&r1=712928&r2=712929&view=diff
==============================================================================
--- incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/etc/i18n/CoreResources_fi.properties (original)
+++ incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/etc/i18n/CoreResources_fi.properties Mon Nov 10 19:49:06 2008
@@ -155,3 +155,15 @@
# RSSImageLinkTag
rss.title=Sivun "{0}" RSS-syöte
+
+# Attachments
+attach.empty.file = Tyhjä tiedostonnimi.
+attach.parent.not.exist = Yläsivua ei ole olemassa.
+attach.unwanted.file = Kielletty tiedostonimi.
+
+# Variables
+varmgr.anonymous = anonyymi
+varmgr.asserted = asetettu
+varmgr.authenticated = kirjautunut
+varmgr.not.logged.in = kirjautumaton
+
Modified: incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/etc/i18n/CoreResources_nl.properties
URL: http://svn.apache.org/viewvc/incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/etc/i18n/CoreResources_nl.properties?rev=712929&r1=712928&r2=712929&view=diff
==============================================================================
--- incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/etc/i18n/CoreResources_nl.properties (original)
+++ incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/etc/i18n/CoreResources_nl.properties Mon Nov 10 19:49:06 2008
@@ -195,4 +195,16 @@
install.installer.validate.logdir=Je moet de log directory opgeven.
# RSSImageLinkTag
-rss.title=RSS feed voor pagina {0}
\ No newline at end of file
+rss.title=RSS feed voor pagina {0}
+
+
+# AttachmentManager
+attach.unwanted.file=Ongewenste bestandsnaam
+attach.empty.file=Geen bestandsnaam opgegeven
+attach.parent.not.exist=De parent pagina bestaat niet
+
+# VariableManager
+varmgr.not.logged.in=niet ingelogd
+varmgr.authenticated=geauthenticeerd
+varmgr.asserted=aangenomen identiteit
+varmgr.anonymous=anoniem
Modified: incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/etc/i18n/plugin/PluginResources.properties
URL: http://svn.apache.org/viewvc/incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/etc/i18n/plugin/PluginResources.properties?rev=712929&r1=712928&r2=712929&view=diff
==============================================================================
--- incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/etc/i18n/plugin/PluginResources.properties (original)
+++ incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/etc/i18n/plugin/PluginResources.properties Mon Nov 10 19:49:06 2008
@@ -46,4 +46,20 @@
formoutput.missingargument = Argument '{0}' required for Form plugin
formselect.namemissing = Select element is missing parameter 'name'.
formtextarea.noneedtoshow = (no need to show textarea field now)
-formtextarea.namemissing = Textarea element is missing parameter 'name'.
\ No newline at end of file
+formtextarea.namemissing = Textarea element is missing parameter 'name'.
+
+# ListLocks plugin
+plugin.listlocks.page=Page
+plugin.listlocks.locked.by=Locked by
+plugin.listlocks.acquired=Acquired
+plugin.listlocks.expires=Expires
+plugin.listlocks.no.locks.exist=No locks exist currently.
+
+# InsertPage plugin
+plugin.insert.notfound=Page could not be found by the page provider.
+plugin.insert.recursion=Error: Circular reference - you can't include a page in itself!
+plugin.insert.nopermission=You do not have permission to view this included page.
+plugin.insert.nopage1=There is no page called
+plugin.insert.nopage2=Would you like to
+plugin.insert.nopage3=create it?
+plugin.insert.definepage=You have to define a page!
\ No newline at end of file
Modified: incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/etc/i18n/plugin/PluginResources_de.properties
URL: http://svn.apache.org/viewvc/incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/etc/i18n/plugin/PluginResources_de.properties?rev=712929&r1=712928&r2=712929&view=diff
==============================================================================
--- incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/etc/i18n/plugin/PluginResources_de.properties (original)
+++ incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/etc/i18n/plugin/PluginResources_de.properties Mon Nov 10 19:49:06 2008
@@ -66,3 +66,10 @@
formselect.namemissing=Das Element 'select' erwartet den Parameter 'name'.
formtextarea.noneedtoshow=(form textarea muss momentan nicht angezeigt werden)
formtextarea.namemissing=Das Element 'textarea' erwartet den Parameter 'name'.
+
+# ListLocks plugin
+plugin.listlocks.page=Seite
+plugin.listlocks.locked.by=gesperrt für
+plugin.listlocks.acquired=gesperrt ab
+plugin.listlocks.expires=gesperrt bis
+plugin.listlocks.no.locks.exist=Momentan existieren keine Sperren.
\ No newline at end of file
Modified: incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/etc/i18n/plugin/PluginResources_es.properties
URL: http://svn.apache.org/viewvc/incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/etc/i18n/plugin/PluginResources_es.properties?rev=712929&r1=712928&r2=712929&view=diff
==============================================================================
--- incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/etc/i18n/plugin/PluginResources_es.properties (original)
+++ incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/etc/i18n/plugin/PluginResources_es.properties Mon Nov 10 19:49:06 2008
@@ -48,3 +48,10 @@
formselect.namemissing = El elemento Select no tiene definido el parámetro 'name'.
formtextarea.noneedtoshow = (no es necesario mostrar el campo textarea ahora)
formtextarea.namemissing = El elemento Textarea no tiene definido el parámetro 'name'.
+
+# ListLocks plugin
+plugin.listlocks.page=Página
+plugin.listlocks.locked.by=Bloqueada por
+plugin.listlocks.acquired=Adquirida
+plugin.listlocks.expires=Expira
+plugin.listlocks.no.locks.exist=No existen bloqueos actualmente.
\ No newline at end of file
Modified: incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/etc/i18n/plugin/PluginResources_fi.properties
URL: http://svn.apache.org/viewvc/incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/etc/i18n/plugin/PluginResources_fi.properties?rev=712929&r1=712928&r2=712929&view=diff
==============================================================================
--- incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/etc/i18n/plugin/PluginResources_fi.properties (original)
+++ incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/etc/i18n/plugin/PluginResources_fi.properties Mon Nov 10 19:49:06 2008
@@ -48,3 +48,10 @@
plugin.error.notallowed = Ei lupaa käyttää laajennusta {0}
plugin.error.notawikiplugin = Luokka {0} ei ole wikilaajennus
plugin.error.parsingarguments = Gnöö: Ei voitu parsia parametreja {0}
+
+# ListLocks plugin
+plugin.listlocks.acquired = Lukko luotu
+plugin.listlocks.expires = Lukko umpeutuu
+plugin.listlocks.locked.by = Lukitsija
+plugin.listlocks.no.locks.exist = Ei lukkoja tällä hetkellä.
+plugin.listlocks.page = Sivu
Modified: incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/etc/i18n/plugin/PluginResources_nl.properties
URL: http://svn.apache.org/viewvc/incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/etc/i18n/plugin/PluginResources_nl.properties?rev=712929&r1=712928&r2=712929&view=diff
==============================================================================
--- incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/etc/i18n/plugin/PluginResources_nl.properties (original)
+++ incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/etc/i18n/plugin/PluginResources_nl.properties Mon Nov 10 19:49:06 2008
@@ -55,3 +55,19 @@
formselect.namemissing=Het element 'select' verwacht een parameter 'name'.
formtextarea.noneedtoshow=(form textarea is hier niet nodig)
formtextarea.namemissing=Het element 'textarea' verwacht de parameter 'name'.
+
+# ListLocks plugin
+plugin.listlocks.page=Pagina
+plugin.listlocks.locked.by=In gebruik door
+plugin.listlocks.acquired=Sinds
+plugin.listlocks.expires=Loopt af
+plugin.listlocks.no.locks.exist=Er zijn momenteel geen locks.
+
+# InsertPage plugin
+plugin.insert.notfound=Pagina niet gevonden door de Page Provider
+plugin.insert.recursion=Error: Recursie - Je kunt een pagina niet in zichzelf includen !
+plugin.insert.nopermission=Je hebt geen permissies om de include pagina te bekijken
+plugin.insert.nopage1=Er bestaat geen pagina met de naam
+plugin.insert.nopage2=Wil je 'm
+plugin.insert.nopage3=aanmaken ?
+plugin.insert.definepage=Je moet een pagina opgeven !
\ No newline at end of file
Modified: incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/etc/i18n/templates/default_es.properties
URL: http://svn.apache.org/viewvc/incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/etc/i18n/templates/default_es.properties?rev=712929&r1=712928&r2=712929&view=diff
==============================================================================
--- incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/etc/i18n/templates/default_es.properties (original)
+++ incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/etc/i18n/templates/default_es.properties Mon Nov 10 19:49:06 2008
@@ -41,7 +41,7 @@
# ConflictContent.jsp
conflict.oops.title=¡Ups!
-conflict.oops=<p><strong>¡Ups! ¡Alguien modificó la página mientras tú la editabas!</strong></p>\
+conflict.oops=<p><strong>¡Ups! ¡Alguien modificó la página mientras tú la editabas!</strong></p>\
<p>Dado que soy estúpido y no puedo distinguir las diferencias \
entre páginas, tendrás que hacer eso por mi. He impreso \
aquí el texto (en Wiki) de la nueva página, junto con las \
Modified: incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/etc/i18n/templates/default_fi.properties
URL: http://svn.apache.org/viewvc/incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/etc/i18n/templates/default_fi.properties?rev=712929&r1=712928&r2=712929&view=diff
==============================================================================
--- incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/etc/i18n/templates/default_fi.properties (original)
+++ incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/etc/i18n/templates/default_fi.properties Mon Nov 10 19:49:06 2008
@@ -127,9 +127,6 @@
# GroupContent.jsp
group.tab=Näytä ryhmä
-group.areyousure=Oletko varma, että haluat poistaa ryhmän "{0}"? \
- Käyttäjät eivät ehkä enää pääse sivuille, joiden pääsynvalvontalistoissa on tämä ryhmä. \\n\\n \
- Jos painat OK, ryhmä poistetaan välittömästi.
group.doesnotexist=Tätä ryhmää ei ole olemassa.
group.createsuggestion=Mikset {0}
group.createit=loisi sitä?
Modified: incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/etc/ini/jspwiki_module.xml
URL: http://svn.apache.org/viewvc/incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/etc/ini/jspwiki_module.xml?rev=712929&r1=712928&r2=712929&view=diff
==============================================================================
--- incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/etc/ini/jspwiki_module.xml (original)
+++ incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/etc/ini/jspwiki_module.xml Mon Nov 10 19:49:06 2008
@@ -15,7 +15,7 @@
<author>Janne Jalkanen</author>
<path>editors/plain.jsp</path>
<minVersion>2.4</minVersion>
- <maxVersion>2.8</maxVersion>
+ <maxVersion>3.0</maxVersion>
<adminBean>com.ecyrd.jspwiki.ui.admin.beans.PlainEditorAdminBean</adminBean>
</editor>
<!--
Modified: incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/etc/web.xml
URL: http://svn.apache.org/viewvc/incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/etc/web.xml?rev=712929&r1=712928&r2=712929&view=diff
==============================================================================
--- incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/etc/web.xml (original)
+++ incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/etc/web.xml Mon Nov 10 19:49:06 2008
@@ -207,8 +207,8 @@
<!-- JSON AJAX API -->
<servlet>
- <servlet-name>com.metaparadigm.jsonrpc.JSONRPCServlet</servlet-name>
- <servlet-class>com.metaparadigm.jsonrpc.JSONRPCServlet</servlet-class>
+ <servlet-name>org.jabsorb.JSONRPCServlet</servlet-name>
+ <servlet-class>org.jabsorb.JSONRPCServlet</servlet-class>
</servlet>
<!-- Atom Publishing Protocol -->
@@ -302,7 +302,7 @@
-->
<servlet-mapping>
- <servlet-name>com.metaparadigm.jsonrpc.JSONRPCServlet</servlet-name>
+ <servlet-name>org.jabsorb.JSONRPCServlet</servlet-name>
<url-pattern>/JSON-RPC</url-pattern>
</servlet-mapping>
Propchange: incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/lib/freshcookies-security-0.60.jar
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Propchange: incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/lib/jabsorb-1.3.jar
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Propchange: incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/lib/slf4j-api-1.5.5.jar
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Propchange: incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/lib/slf4j-log4j12-1.5.5.jar
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Modified: incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/Release.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/Release.java?rev=712929&r1=712928&r2=712929&view=diff
==============================================================================
--- incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/Release.java (original)
+++ incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/Release.java Mon Nov 10 19:49:06 2008
@@ -57,13 +57,13 @@
* <p>
* If the POSTFIX is empty, it is not added to the version string.
*/
- private static final String POSTFIX = "beta";
+ private static final String POSTFIX = "svn";
/** The JSPWiki major version. */
- public static final int VERSION = 2;
+ public static final int VERSION = 3;
/** The JSPWiki revision. */
- public static final int REVISION = 8;
+ public static final int REVISION = 0;
/** The minor revision. */
public static final int MINORREVISION = 0;
@@ -77,7 +77,7 @@
* <p>
* If the build identifier is empty, it is not added.
*/
- public static final String BUILD = "18";
+ public static final String BUILD = "5";
/**
* This is the generic version string you should use
Modified: incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/VariableManager.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/VariableManager.java?rev=712929&r1=712928&r2=712929&view=diff
==============================================================================
--- incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/VariableManager.java (original)
+++ incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/VariableManager.java Mon Nov 10 19:49:06 2008
@@ -22,10 +22,7 @@
import java.lang.reflect.Method;
import java.security.Principal;
-import java.util.Date;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Properties;
+import java.util.*;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpSession;
@@ -34,6 +31,7 @@
import com.ecyrd.jspwiki.action.WikiActionBean;
import com.ecyrd.jspwiki.filters.PageFilter;
+import com.ecyrd.jspwiki.i18n.InternationalizationManager;
import com.ecyrd.jspwiki.modules.InternalModule;
/**
@@ -484,14 +482,15 @@
public String getLoginstatus()
{
WikiSession session = m_context.getWikiSession();
- return session.getStatus();
+ return m_context.getBundle(InternationalizationManager.CORE_BUNDLE).getString( "varmgr." + session.getStatus());
}
public String getUsername()
{
Principal wup = m_context.getCurrentUser();
-
- return wup != null ? wup.getName() : "not logged in";
+
+ ResourceBundle rb = m_context.getBundle( InternationalizationManager.CORE_BUNDLE );
+ return wup != null ? wup.getName() : rb.getString( "varmgr.not.logged.in" );
}
public String getRequestcontext()
Modified: incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/attachment/AttachmentManager.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/attachment/AttachmentManager.java?rev=712929&r1=712928&r2=712929&view=diff
==============================================================================
--- incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/attachment/AttachmentManager.java (original)
+++ incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/attachment/AttachmentManager.java Mon Nov 10 19:49:06 2008
@@ -487,7 +487,8 @@
//
if( !m_engine.getPageManager().pageExists( att.getParentName() ) )
{
- throw new ProviderException("Parent page does not exist");
+ // the caller should catch the exception and use the exception text as an i18n key
+ throw new ProviderException( "attach.parent.not.exist" );
}
m_provider.putAttachmentData( att, in );
@@ -603,9 +604,10 @@
{
if( filename == null || filename.trim().length() == 0 )
{
- AttachmentServlet.log.error("Empty file name given.");
+ log.error("Empty file name given.");
- throw new WikiException("Empty file name given.");
+ // the caller should catch the exception and use the exception text as an i18n key
+ throw new WikiException( "attach.empty.file" );
}
//
@@ -618,8 +620,9 @@
{
log.info( "Attempt to upload a file with a .jsp/.jspf extension. In certain cases this" +
" can trigger unwanted security side effects, so we're preventing it." );
-
- throw new WikiException( "Unwanted file name." );
+ //
+ // the caller should catch the exception and use the exception text as an i18n key
+ throw new WikiException( "attach.unwanted.file" );
}
//
Modified: incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/attachment/AttachmentServlet.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/attachment/AttachmentServlet.java?rev=712929&r1=712928&r2=712929&view=diff
==============================================================================
--- incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/attachment/AttachmentServlet.java (original)
+++ incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/attachment/AttachmentServlet.java Mon Nov 10 19:49:06 2008
@@ -54,6 +54,7 @@
import com.ecyrd.jspwiki.dav.methods.DavMethod;
import com.ecyrd.jspwiki.dav.methods.PropFindMethod;
import com.ecyrd.jspwiki.filters.RedirectException;
+import com.ecyrd.jspwiki.i18n.InternationalizationManager;
import com.ecyrd.jspwiki.providers.ProviderException;
import com.ecyrd.jspwiki.ui.progress.ProgressItem;
import com.ecyrd.jspwiki.util.HttpUtil;
@@ -723,8 +724,9 @@
}
catch( WikiException e )
{
- log.error( "Illegal filename given: "+e.getMessage() );
- throw new RedirectException( e.getMessage(), errorPage );
+ // this is a kludge, the exception that is caught here contains the i18n key
+ // here we have the context available, so we can internationalize it properly :
+ throw new RedirectException(context.getBundle( InternationalizationManager.CORE_BUNDLE ).getString( e.getMessage() ), errorPage );
}
//
@@ -800,8 +802,14 @@
{
att.setAttribute( WikiPage.CHANGENOTE, changenote );
}
-
+
+ try {
m_engine.getAttachmentManager().storeAttachment( att, data );
+ } catch (ProviderException pe) {
+ // this is a kludge, the exception that is caught here contains the i18n key
+ // here we have the context available, so we can internationalize it properly :
+ throw new ProviderException( context.getBundle( InternationalizationManager.CORE_BUNDLE ).getString( pe.getMessage() ) );
+ }
log.info( "User " + user + " uploaded attachment to " + parentPage +
" called "+filename+", size " + att.getSize() );
Modified: incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/auth/AuthorizationManager.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/auth/AuthorizationManager.java?rev=712929&r1=712928&r2=712929&view=diff
==============================================================================
--- incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/auth/AuthorizationManager.java (original)
+++ incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/auth/AuthorizationManager.java Mon Nov 10 19:49:06 2008
@@ -92,6 +92,9 @@
*/
public static final String DEFAULT_AUTHORIZER = "com.ecyrd.jspwiki.auth.authorize.WebContainerAuthorizer";
+ /** Property that supplies the security policy file name, in WEB-INF. */
+ protected static final String POLICY = "jspwiki.policy.file";
+
/** Name of the default security policy file, in WEB-INF. */
protected static final String DEFAULT_POLICY = "jspwiki.policy";
@@ -403,7 +406,8 @@
// Initialize local security policy
try
{
- URL policyURL = AuthenticationManager.findConfigFile( engine, DEFAULT_POLICY );
+ String policyFileName = properties.getProperty( POLICY, DEFAULT_POLICY );
+ URL policyURL = AuthenticationManager.findConfigFile( engine, policyFileName );
if (policyURL != null)
{
Modified: incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/auth/authorize/XMLGroupDatabase.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/auth/authorize/XMLGroupDatabase.java?rev=712929&r1=712928&r2=712929&view=diff
==============================================================================
--- incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/auth/authorize/XMLGroupDatabase.java (original)
+++ incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/auth/authorize/XMLGroupDatabase.java Mon Nov 10 19:49:06 2008
@@ -199,7 +199,7 @@
String file = props.getProperty( PROP_DATABASE );
if ( file == null )
{
- log.error( "XML group database property " + PROP_DATABASE + " not found; trying " + defaultFile );
+ log.warn( "XML group database property " + PROP_DATABASE + " not found; trying " + defaultFile );
m_file = defaultFile;
}
else
Modified: incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/auth/user/XMLUserDatabase.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/auth/user/XMLUserDatabase.java?rev=712929&r1=712928&r2=712929&view=diff
==============================================================================
--- incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/auth/user/XMLUserDatabase.java (original)
+++ incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/auth/user/XMLUserDatabase.java Mon Nov 10 19:49:06 2008
@@ -277,7 +277,7 @@
String file = props.getProperty( PROP_USERDATABASE );
if( file == null )
{
- log.error( "XML user database property " + PROP_USERDATABASE + " not found; trying " + defaultFile );
+ log.warn( "XML user database property " + PROP_USERDATABASE + " not found; trying " + defaultFile );
c_file = defaultFile;
}
else
Modified: incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/content/PageRenamer.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/content/PageRenamer.java?rev=712929&r1=712928&r2=712929&view=diff
==============================================================================
--- incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/content/PageRenamer.java (original)
+++ incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/content/PageRenamer.java Mon Nov 10 19:49:06 2008
@@ -367,32 +367,34 @@
int hash = original.indexOf( '#' );
int slash = original.indexOf( '/' );
String reallink = original;
+ String oldStyleRealLink;
if( hash != -1 ) reallink = original.substring( 0, hash );
if( slash != -1 ) reallink = original.substring( 0,slash );
reallink = MarkupParser.cleanLink( reallink );
+ oldStyleRealLink = MarkupParser.wikifyLink( reallink );
- // WikiPage p = context.getEngine().getPage( reallink );
+ //WikiPage realPage = context.getEngine().getPage( reallink );
// WikiPage p2 = context.getEngine().getPage( from );
// System.out.println(" "+reallink+" :: "+ from);
// System.out.println(" "+p+" :: "+p2);
//
- // if the original contains blanks, then we should introduce a link, for example: [My Page] => [My Page|My Renamed Page]
- int blank = reallink.indexOf( " ");
-
- if( blank != -1 )
- {
- return reallink + "|" + newlink;
- }
-
- //
// Yes, these point to the same page.
//
- if( reallink.equals(from) )
+ if( reallink.equals(from) || original.equals(from) || oldStyleRealLink.equals(from) )
{
+ //
+ // if the original contains blanks, then we should introduce a link, for example: [My Page] => [My Page|My Renamed Page]
+ int blank = reallink.indexOf( " ");
+
+ if( blank != -1 )
+ {
+ return original + "|" + newlink;
+ }
+
return newlink + ((hash > 0) ? original.substring( hash ) : "") + ((slash > 0) ? original.substring( slash ) : "") ;
}
Modified: incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/filters/FilterManager.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/filters/FilterManager.java?rev=712929&r1=712928&r2=712929&view=diff
==============================================================================
--- incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/filters/FilterManager.java (original)
+++ incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/filters/FilterManager.java Mon Nov 10 19:49:06 2008
@@ -27,6 +27,8 @@
import java.net.URL;
import java.util.*;
+import net.sourceforge.stripes.util.ResolverUtil;
+
import org.apache.log4j.Logger;
import org.jdom.Document;
import org.jdom.Element;
@@ -41,6 +43,8 @@
import com.ecyrd.jspwiki.event.WikiPageEvent;
import com.ecyrd.jspwiki.modules.ModuleManager;
import com.ecyrd.jspwiki.modules.WikiModuleInfo;
+import com.ecyrd.jspwiki.plugin.WikiPlugin;
+import com.ecyrd.jspwiki.plugin.PluginManager.WikiPluginInfo;
import com.ecyrd.jspwiki.util.ClassUtil;
import com.ecyrd.jspwiki.util.PriorityList;
@@ -210,7 +214,7 @@
try
{
- registerFilters();
+ registerAllFilters();
if( m_engine.getServletContext() != null )
{
@@ -466,61 +470,29 @@
return modules;
}
- private void registerFilters()
+ private void registerAllFilters()
{
log.info( "Registering filters" );
- SAXBuilder builder = new SAXBuilder();
-
- try
+ List<String> searchPath = buildPluginSearchPath( m_engine.getWikiProperties() );
+
+ ResolverUtil<PageFilter> resolver = new ResolverUtil<PageFilter>();
+
+ String[] paths = searchPath.toArray( new String[0] );
+ resolver.findImplementations( PageFilter.class, paths );
+
+ Set<Class<? extends PageFilter>> resultSet = resolver.getClasses();
+
+ log.debug( "Found "+resultSet.size()+" pagefilters" );
+
+ for( Class<? extends PageFilter> clazz : resultSet )
{
- //
- // Register all filters which have created a resource containing its properties.
- //
- // Get all resources of all plugins.
- //
-
- Enumeration resources = getClass().getClassLoader().getResources( PLUGIN_RESOURCE_LOCATION );
+ PageFilterInfo pluginInfo = PageFilterInfo.newInstance( clazz );
- while( resources.hasMoreElements() )
+ if( pluginInfo != null )
{
- URL resource = (URL) resources.nextElement();
-
- try
- {
- log.debug( "Processing XML: " + resource );
-
- Document doc = builder.build( resource );
-
- List plugins = XPath.selectNodes( doc, "/modules/filter");
-
- for( Iterator i = plugins.iterator(); i.hasNext(); )
- {
- Element pluginEl = (Element) i.next();
-
- String className = pluginEl.getAttributeValue("class");
-
- PageFilterInfo pluginInfo = PageFilterInfo.newInstance( className, pluginEl );
-
- if( pluginInfo != null )
- {
- registerPlugin( pluginInfo );
- }
- }
- }
- catch( java.io.IOException e )
- {
- log.error( "Couldn't load " + PLUGIN_RESOURCE_LOCATION + " resources: " + resource, e );
- }
- catch( JDOMException e )
- {
- log.error( "Error parsing XML for filter: "+PLUGIN_RESOURCE_LOCATION );
- }
- }
- }
- catch( java.io.IOException e )
- {
- log.error( "Couldn't load all " + PLUGIN_RESOURCE_LOCATION + " resources", e );
+ registerPlugin( pluginInfo );
+ }
}
}
@@ -536,17 +508,16 @@
*/
private static final class PageFilterInfo extends WikiModuleInfo
{
- private PageFilterInfo( String name )
+ private PageFilterInfo( Class<? extends PageFilter> clazz )
{
- super(name);
+ super(clazz.getName());
+ initializeFromClass( clazz );
}
- protected static PageFilterInfo newInstance(String className, Element pluginEl)
+ protected static PageFilterInfo newInstance(Class<? extends PageFilter> clazz)
{
- if( className == null || className.length() == 0 ) return null;
- PageFilterInfo info = new PageFilterInfo( className );
+ PageFilterInfo info = new PageFilterInfo( clazz );
- info.initializeFromXML( pluginEl );
return info;
}
}
Modified: incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/filters/ProfanityFilter.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/filters/ProfanityFilter.java?rev=712929&r1=712928&r2=712929&view=diff
==============================================================================
--- incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/filters/ProfanityFilter.java (original)
+++ incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/filters/ProfanityFilter.java Mon Nov 10 19:49:06 2008
@@ -39,6 +39,7 @@
* is case unsensitive.
*
*/
+@Deprecated
public class ProfanityFilter extends BasicPageFilter
{
private static Logger log = Logger.getLogger(ProfanityFilter.class);
Modified: incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/filters/SpamFilter.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/filters/SpamFilter.java?rev=712929&r1=712928&r2=712929&view=diff
==============================================================================
--- incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/filters/SpamFilter.java (original)
+++ incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/filters/SpamFilter.java Mon Nov 10 19:49:06 2008
@@ -32,6 +32,7 @@
import org.apache.commons.jrcs.diff.*;
import org.apache.commons.jrcs.diff.myers.MyersDiff;
import org.apache.commons.lang.time.StopWatch;
+import org.apache.jspwiki.api.ModuleData;
import org.apache.log4j.Logger;
import org.apache.oro.text.regex.*;
@@ -70,6 +71,7 @@
*
* @since 2.1.112
*/
+@ModuleData( author = "JSPWiki development group" )
public class SpamFilter
extends BasicPageFilter
{
Modified: incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/modules/ModuleManager.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/modules/ModuleManager.java?rev=712929&r1=712928&r2=712929&view=diff
==============================================================================
--- incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/modules/ModuleManager.java (original)
+++ incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/modules/ModuleManager.java Mon Nov 10 19:49:06 2008
@@ -20,7 +20,15 @@
*/
package com.ecyrd.jspwiki.modules;
-import java.util.Collection;
+import java.net.URL;
+import java.util.*;
+
+import org.apache.log4j.Logger;
+import org.jdom.Attribute;
+import org.jdom.Document;
+import org.jdom.JDOMException;
+import org.jdom.input.SAXBuilder;
+import org.jdom.xpath.XPath;
import com.ecyrd.jspwiki.Release;
import com.ecyrd.jspwiki.WikiEngine;
@@ -32,13 +40,20 @@
{
/**
+ * The property name defining which packages will be searched for modules.
+ */
+ public static final String PROP_SEARCHPATH = "jspwiki.plugin.searchPath";
+
+ /**
* Location of the property-files of plugins.
* (Each plugin should include this property-file in its jar-file)
*/
- public static final String PLUGIN_RESOURCE_LOCATION = "ini/jspwiki_module.xml";
+ public static final String MODULE_RESOURCE_LOCATION = "ini/jspwiki_module.xml";
protected WikiEngine m_engine;
+ private static Logger log = Logger.getLogger( ModuleManager.class );
+
private boolean m_loadIncompatibleModules = false;
/**
@@ -78,4 +93,74 @@
* @return A Collection of WikiModuleInfo instances.
*/
public abstract Collection modules();
+
+ /**
+ * Builds a search path from three components:
+ * <ol>
+ * <li>The default packages.
+ * <li>The contents of {@value #PROP_SEARCHPATH}
+ * <li>Whatever can be located from the contents of the ini-files
+ * </ol>
+ *
+ * @param props
+ * @return A List of package names which should be scanned for modules.
+ */
+ protected List<String> buildPluginSearchPath( Properties props )
+ {
+ ArrayList<String> list = new ArrayList<String>();
+ list.add( "com.ecyrd.jspwiki" );
+ list.add( "org.apache.jspwiki" );
+
+ String packageNames = props.getProperty( PROP_SEARCHPATH );
+
+ if( packageNames != null )
+ {
+ StringTokenizer tok = new StringTokenizer( packageNames, "," );
+
+ while( tok.hasMoreTokens() )
+ {
+ list.add( tok.nextToken().trim() );
+ }
+ }
+
+ SAXBuilder builder = new SAXBuilder();
+
+ try
+ {
+ Enumeration resources = getClass().getClassLoader().getResources( MODULE_RESOURCE_LOCATION );
+
+ while( resources.hasMoreElements() )
+ {
+ URL resource = (URL) resources.nextElement();
+
+ try
+ {
+ Document doc = builder.build( resource );
+
+ List packages = XPath.selectNodes( doc, "/modules/@package");
+
+ for( Iterator i = packages.iterator(); i.hasNext(); )
+ {
+ Attribute a = (Attribute) i.next();
+
+ list.add( a.getValue().trim() );
+ }
+ }
+ catch( java.io.IOException e )
+ {
+ log.error( "Couldn't load " + MODULE_RESOURCE_LOCATION + " resources: " + resource, e );
+ }
+ catch( JDOMException e )
+ {
+ log.error( "Error parsing XML for plugin: "+MODULE_RESOURCE_LOCATION );
+ }
+ }
+ }
+ catch( java.io.IOException e )
+ {
+ log.error( "Couldn't load all " + MODULE_RESOURCE_LOCATION + " resources", e );
+ }
+
+ return list;
+ }
}
Modified: incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/modules/WikiModuleInfo.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/modules/WikiModuleInfo.java?rev=712929&r1=712928&r2=712929&view=diff
==============================================================================
--- incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/modules/WikiModuleInfo.java (original)
+++ incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/modules/WikiModuleInfo.java Mon Nov 10 19:49:06 2008
@@ -25,6 +25,7 @@
import java.io.IOException;
import java.net.URL;
+import org.apache.jspwiki.api.ModuleData;
import org.jdom.Element;
import com.ecyrd.jspwiki.FileUtil;
@@ -39,9 +40,9 @@
implements Comparable<WikiModuleInfo>
{
protected String m_name;
- protected String m_scriptLocation;
+ protected String[] m_scriptLocation;
protected String m_scriptText;
- protected String m_stylesheetLocation;
+ protected String[] m_stylesheetLocation;
protected String m_stylesheetText;
protected String m_author;
protected URL m_resource;
@@ -94,14 +95,29 @@
*/
protected void initializeFromXML( Element el )
{
- m_scriptLocation = el.getChildText("script");
- m_stylesheetLocation = el.getChildText("stylesheet");
+ m_scriptLocation = new String[] { el.getChildText("script") };
+ m_stylesheetLocation = new String[] { el.getChildText("stylesheet") };
m_author = el.getChildText("author");
m_minVersion = el.getChildText("minVersion");
m_maxVersion = el.getChildText("maxVersion");
m_adminBeanClass = el.getChildText("adminBean");
}
+ protected void initializeFromClass( Class<?> c )
+ {
+ ModuleData data = c.getAnnotation( ModuleData.class );
+
+ if( data != null )
+ {
+ m_author = data.author();
+ m_minVersion = data.minVersion();
+ m_maxVersion = data.maxVersion();
+ m_scriptLocation = data.scripts();
+ m_stylesheetLocation = data.stylesheets();
+ m_adminBeanClass = data.adminBeanClass();
+ }
+ }
+
/**
* Returns the AdminBean class which is supposed to manage this module.
*
@@ -131,7 +147,7 @@
*
* @return The path to the location.
*/
- public String getStylesheetLocation()
+ public String[] getStylesheetLocation()
{
return m_stylesheetLocation;
}
@@ -141,7 +157,7 @@
*
* @return The path to the location.
*/
- public String getScriptLocation()
+ public String[] getScriptLocation()
{
return m_scriptLocation;
}
@@ -202,7 +218,7 @@
// Replace the 'PLUGIN_RESOURCE_LOCATION' with the requested
// resourceLocation.
- int length = ModuleManager.PLUGIN_RESOURCE_LOCATION.length();
+ int length = ModuleManager.MODULE_RESOURCE_LOCATION.length();
spec = spec.substring(0, spec.length() - length) + resourceLocation;
URL url = new URL(spec);
Modified: incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/parser/JSPWikiMarkupParser.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/parser/JSPWikiMarkupParser.java?rev=712929&r1=712928&r2=712929&view=diff
==============================================================================
--- incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/parser/JSPWikiMarkupParser.java (original)
+++ incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/parser/JSPWikiMarkupParser.java Mon Nov 10 19:49:06 2008
@@ -174,7 +174,8 @@
private int m_rowNum = 1;
-
+ private Heading m_lastHeading = null;
+
/**
* The default inlining pattern. Currently "*.png"
*/
@@ -1215,6 +1216,7 @@
throw new InternalWikiException("Illegal heading type "+level);
}
+
return el;
}
@@ -1935,6 +1937,8 @@
callHeadingListenerChain( hd );
+ m_lastHeading = hd;
+
if( el != null ) pushElement(el);
return el;
@@ -2680,6 +2684,7 @@
}
}
+ closeHeadings();
popElement("domroot");
}
@@ -2741,10 +2746,10 @@
//
// FIXME: This is not really very fast
+
+ closeHeadings();
+
popElement("dl"); // Close definition lists.
- popElement("h2");
- popElement("h3");
- popElement("h4");
if( m_istable )
{
popElement("tr");
@@ -2886,6 +2891,19 @@
return el != null ? ELEMENT : CHARACTER;
}
+ private void closeHeadings()
+ {
+ if( m_lastHeading != null )
+ {
+ // Add the hash anchor element at the end of the heading
+ addElement( new Element("a").setAttribute( "class","hashlink" ).setAttribute( "href","#"+m_lastHeading.m_titleAnchor ).setText( "#" ) );
+ m_lastHeading = null;
+ }
+ popElement("h2");
+ popElement("h3");
+ popElement("h4");
+ }
+
/**
* Parses the entire document from the Reader given in the constructor or
* set by {@link #setInputReader(Reader)}.
Modified: incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/plugin/IfPlugin.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/plugin/IfPlugin.java?rev=712929&r1=712928&r2=712929&view=diff
==============================================================================
--- incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/plugin/IfPlugin.java (original)
+++ incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/plugin/IfPlugin.java Mon Nov 10 19:49:06 2008
@@ -25,6 +25,7 @@
import java.util.Map;
import org.apache.commons.lang.StringUtils;
+import org.apache.jspwiki.api.ModuleData;
import org.apache.oro.text.regex.*;
import com.ecyrd.jspwiki.TextUtil;
@@ -102,6 +103,7 @@
* @author Murray Altheim
* @since 2.6
*/
+@ModuleData( aliases = { "If" } )
public class IfPlugin implements WikiPlugin
{
/** The parameter name for setting the group to check. Value is <tt>{@value}</tt>. */