[jspwiki] branch master updated (8900f81 -> 6a23999)

[ju...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

juanpablo pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/jspwiki.git.


    from 8900f81  2.11.0-M1-git-04
     new 2ed0b0d  bring down configuration for java modules to parent pom
     new ef02cd9  properly require Maven >= 3.5
     new ea2abc6  remove markdown-support profile, module is on the main build now
     new 50ebbd7  fix aditionalConfig file locations on maven-eclipse-plugin
     new 2a183d7  dependencies sorted alphabetically by scope:groupId:artifactId; dependencies versions' as maven properties so it's easier to see which dependencies and versions ares used at a glance
     new f3a3452  plugins versions' as maven properties too
     new ccc61f7  move java code from war module to its own module; markdown module included in war by default
     new e4b44ed  organize imports
     new 35e544c  WikiPage very small refactors
     new cdef9c1  FilterManager and PluginManager return Collection< WikiModuleInfo > instead of Collection for modules(); remove unused imports on DefaultFilterManager
     new ce2648e  ReferenceManager#findReferrers returns Set< String > instead of Collection< String > (not backward compatible)
     new 4fbb768  make ModuleBean use WikiModuleInfo instead of <T extends WikiModuleInfo> to align with former change on FilterManager and PluginManager
     new a9a628a  remove unnecessary @SuppressWarnings
     new cbe5977  suppress unchecked warning
     new e0fe10e  move PropertiesUtils to util package (breaking backwards-compatible change)
     new 3776121  AttachmentManager#listAttachments now returns a List<Attachment> instead of a Collection  (breaking backwards-compatible change)
     new 6a23999  2.11.0-M1-git-05

The 17 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 ChangeLog                                          |   54 +-
 jspwiki-main/pom.xml                               |  249 ++++
 .../org/apache/wiki/InternalWikiException.java     |    0
 .../main/java/org/apache/wiki/LinkCollector.java   |    0
 .../src/main/java/org/apache/wiki/PageLock.java    |    0
 .../src/main/java/org/apache/wiki/PageManager.java |    0
 .../src/main/java/org/apache/wiki/PageSorter.java  |    0
 .../java/org/apache/wiki/ReferenceManager.java     |   79 +-
 .../src/main/java/org/apache/wiki/Release.java     |    2 +-
 .../java/org/apache/wiki/StringTransmutator.java   |    0
 .../java/org/apache/wiki/TranslationsCheck.java    |    0
 .../main/java/org/apache/wiki/VariableManager.java |    0
 .../src/main/java/org/apache/wiki/WatchDog.java    |    0
 .../src/main/java/org/apache/wiki/Watchable.java   |    0
 .../java/org/apache/wiki/WikiBackgroundThread.java |    0
 .../src/main/java/org/apache/wiki/WikiContext.java |    0
 .../src/main/java/org/apache/wiki/WikiEngine.java  |    6 +-
 .../src/main/java/org/apache/wiki/WikiPage.java    |   14 +-
 .../main/java/org/apache/wiki/WikiProvider.java    |    0
 .../src/main/java/org/apache/wiki/WikiServlet.java |    0
 .../src/main/java/org/apache/wiki/WikiSession.java |    0
 .../main/java/org/apache/wiki/ajax/AjaxUtil.java   |    0
 .../wiki/ajax/WikiAjaxDispatcherServlet.java       |    0
 .../java/org/apache/wiki/ajax/WikiAjaxServlet.java |    0
 .../apache/wiki/api/engine/AdminBeanManager.java   |  124 +-
 .../org/apache/wiki/api/engine/FilterManager.java  |  262 ++--
 .../org/apache/wiki/api/engine/PluginManager.java  |  358 +++---
 .../java/org/apache/wiki/api/engine/package.html   |    0
 .../wiki/api/exceptions/FilterException.java       |    0
 .../exceptions/NoRequiredPropertyException.java    |    0
 .../api/exceptions/NoSuchVariableException.java    |    0
 .../wiki/api/exceptions/PluginException.java       |    0
 .../wiki/api/exceptions/ProviderException.java     |    0
 .../wiki/api/exceptions/RedirectException.java     |    0
 .../apache/wiki/api/exceptions/WikiException.java  |    0
 .../wiki/api/exceptions/WikiI18nException.java     |    0
 .../org/apache/wiki/api/exceptions/package.html    |    0
 .../apache/wiki/api/filters/BasicPageFilter.java   |    0
 .../org/apache/wiki/api/filters/PageFilter.java    |    0
 .../java/org/apache/wiki/api/filters/package.html  |    0
 .../src/main/java/org/apache/wiki/api/package.html |    0
 .../wiki/api/plugin/InitializablePlugin.java       |    0
 .../apache/wiki/api/plugin/ParserStagePlugin.java  |    0
 .../org/apache/wiki/api/plugin/WikiPlugin.java     |    0
 .../java/org/apache/wiki/api/plugin/package.html   |    0
 .../org/apache/wiki/attachment/Attachment.java     |    0
 .../apache/wiki/attachment/AttachmentManager.java  |   20 +-
 .../apache/wiki/attachment/AttachmentServlet.java  |    0
 .../apache/wiki/attachment/DynamicAttachment.java  |    0
 .../wiki/attachment/DynamicAttachmentProvider.java |    0
 .../java/org/apache/wiki/attachment/package.html   |    0
 .../apache/wiki/auth/AuthenticationManager.java    |    0
 .../org/apache/wiki/auth/AuthorizationManager.java |    0
 .../main/java/org/apache/wiki/auth/Authorizer.java |    0
 .../java/org/apache/wiki/auth/GroupPrincipal.java  |    0
 .../apache/wiki/auth/NoSuchPrincipalException.java |    0
 .../org/apache/wiki/auth/PrincipalComparator.java  |    0
 .../org/apache/wiki/auth/SecurityVerifier.java     |    0
 .../java/org/apache/wiki/auth/SessionMonitor.java  |    0
 .../java/org/apache/wiki/auth/UserManager.java     |    0
 .../java/org/apache/wiki/auth/WikiPrincipal.java   |    0
 .../apache/wiki/auth/WikiSecurityException.java    |    0
 .../main/java/org/apache/wiki/auth/acl/Acl.java    |    0
 .../java/org/apache/wiki/auth/acl/AclEntry.java    |    0
 .../org/apache/wiki/auth/acl/AclEntryImpl.java     |    0
 .../java/org/apache/wiki/auth/acl/AclImpl.java     |    0
 .../java/org/apache/wiki/auth/acl/AclManager.java  |    0
 .../apache/wiki/auth/acl/DefaultAclManager.java    |    0
 .../apache/wiki/auth/acl/UnresolvedPrincipal.java  |    0
 .../java/org/apache/wiki/auth/acl/package.html     |    0
 .../java/org/apache/wiki/auth/authorize/Group.java |    0
 .../apache/wiki/auth/authorize/GroupDatabase.java  |    0
 .../apache/wiki/auth/authorize/GroupManager.java   |    0
 .../wiki/auth/authorize/JDBCGroupDatabase.java     |    0
 .../java/org/apache/wiki/auth/authorize/Role.java  |    0
 .../apache/wiki/auth/authorize/WebAuthorizer.java  |    0
 .../auth/authorize/WebContainerAuthorizer.java     |    0
 .../wiki/auth/authorize/XMLGroupDatabase.java      |    0
 .../org/apache/wiki/auth/authorize/package.html    |    0
 .../wiki/auth/login/AbstractLoginModule.java       |    0
 .../wiki/auth/login/AnonymousLoginModule.java      |    0
 .../apache/wiki/auth/login/AuthorizerCallback.java |    0
 .../auth/login/CookieAssertionLoginModule.java     |    0
 .../login/CookieAuthenticationLoginModule.java     |    0
 .../wiki/auth/login/HttpRequestCallback.java       |    0
 .../apache/wiki/auth/login/PrincipalWrapper.java   |    0
 .../wiki/auth/login/UserDatabaseCallback.java      |    0
 .../wiki/auth/login/UserDatabaseLoginModule.java   |    0
 .../auth/login/WebContainerCallbackHandler.java    |    0
 .../wiki/auth/login/WebContainerLoginModule.java   |    0
 .../wiki/auth/login/WikiCallbackHandler.java       |    0
 .../apache/wiki/auth/login/WikiEngineCallback.java |    0
 .../java/org/apache/wiki/auth/login/package.html   |    0
 .../main/java/org/apache/wiki/auth/package.html    |    0
 .../wiki/auth/permissions/AllPermission.java       |    0
 .../auth/permissions/AllPermissionCollection.java  |    0
 .../wiki/auth/permissions/GroupPermission.java     |    0
 .../wiki/auth/permissions/PagePermission.java      |    0
 .../wiki/auth/permissions/PermissionFactory.java   |    0
 .../wiki/auth/permissions/WikiPermission.java      |    0
 .../wiki/auth/user/AbstractUserDatabase.java       |    0
 .../apache/wiki/auth/user/DefaultUserProfile.java  |    0
 .../wiki/auth/user/DuplicateUserException.java     |    0
 .../apache/wiki/auth/user/JDBCUserDatabase.java    |    0
 .../org/apache/wiki/auth/user/UserDatabase.java    |    0
 .../org/apache/wiki/auth/user/UserProfile.java     |    0
 .../org/apache/wiki/auth/user/XMLUserDatabase.java |    0
 .../java/org/apache/wiki/content/PageRenamer.java  |    9 +-
 .../main/java/org/apache/wiki/content/package.html |    0
 .../apache/wiki/diff/ContextualDiffProvider.java   |    0
 .../java/org/apache/wiki/diff/DiffProvider.java    |    0
 .../org/apache/wiki/diff/DifferenceManager.java    |    0
 .../org/apache/wiki/diff/ExternalDiffProvider.java |    0
 .../apache/wiki/diff/TraditionalDiffProvider.java  |    0
 .../org/apache/wiki/event/PageEventFilter.java     |    0
 .../org/apache/wiki/event/WikiEngineEvent.java     |    0
 .../main/java/org/apache/wiki/event/WikiEvent.java |    0
 .../org/apache/wiki/event/WikiEventListener.java   |    0
 .../org/apache/wiki/event/WikiEventManager.java    |    0
 .../java/org/apache/wiki/event/WikiEventUtils.java |    0
 .../java/org/apache/wiki/event/WikiPageEvent.java  |    0
 .../org/apache/wiki/event/WikiPageRenameEvent.java |    0
 .../org/apache/wiki/event/WikiSecurityEvent.java   |    0
 .../java/org/apache/wiki/event/WorkflowEvent.java  |    0
 .../java/org/apache/wiki/filters/CreoleFilter.java |    0
 .../apache/wiki/filters/DefaultFilterManager.java  |    6 +-
 .../apache/wiki/filters/PingWeblogsComFilter.java  |    3 +-
 .../org/apache/wiki/filters/ProfanityFilter.java   |    0
 .../java/org/apache/wiki/filters/SpamFilter.java   |    0
 .../main/java/org/apache/wiki/filters/package.html |    0
 .../main/java/org/apache/wiki/forms/FormClose.java |    0
 .../java/org/apache/wiki/forms/FormElement.java    |    0
 .../java/org/apache/wiki/forms/FormHandler.java    |    0
 .../main/java/org/apache/wiki/forms/FormInfo.java  |    0
 .../main/java/org/apache/wiki/forms/FormInput.java |    0
 .../main/java/org/apache/wiki/forms/FormOpen.java  |    0
 .../java/org/apache/wiki/forms/FormOutput.java     |    0
 .../java/org/apache/wiki/forms/FormSelect.java     |    0
 .../main/java/org/apache/wiki/forms/FormSet.java   |    0
 .../java/org/apache/wiki/forms/FormTextarea.java   |    0
 .../main/java/org/apache/wiki/forms/package.html   |    0
 .../htmltowiki/ForgetNullValuesLinkedHashMap.java  |    0
 .../htmltowiki/HtmlStringToWikiTranslator.java     |    0
 .../wiki/htmltowiki/PersistentMapDecorator.java    |    0
 .../wiki/htmltowiki/WhitespaceTrimWriter.java      |    0
 .../htmltowiki/XHtmlElementToWikiTranslator.java   |    0
 .../apache/wiki/htmltowiki/XHtmlToWikiConfig.java  |    0
 .../wiki/i18n/InternationalizationManager.java     |    0
 .../org/apache/wiki/management/SimpleMBean.java    |    0
 .../org/apache/wiki/modules/InternalModule.java    |    0
 .../org/apache/wiki/modules/ModuleManager.java     |    0
 .../org/apache/wiki/modules/WikiModuleInfo.java    |    0
 .../src/main/java/org/apache/wiki/package.html     |    0
 .../wiki/parser/CreoleToJSPWikiTranslator.java     |    0
 .../main/java/org/apache/wiki/parser/Heading.java  |    0
 .../org/apache/wiki/parser/HeadingListener.java    |    0
 .../apache/wiki/parser/JSPWikiMarkupParser.java    |    0
 .../java/org/apache/wiki/parser/LinkParser.java    |    0
 .../apache/wiki/parser/LinkParsingOperations.java  |    0
 .../java/org/apache/wiki/parser/MarkupParser.java  |    0
 .../org/apache/wiki/parser/ParseException.java     |    0
 .../java/org/apache/wiki/parser/PluginContent.java |    0
 .../org/apache/wiki/parser/VariableContent.java    |    0
 .../java/org/apache/wiki/parser/WikiDocument.java  |    0
 .../apache/wiki/plugin/AbstractReferralPlugin.java |    0
 .../org/apache/wiki/plugin/BugReportHandler.java   |    0
 .../main/java/org/apache/wiki/plugin/Counter.java  |    0
 .../org/apache/wiki/plugin/CurrentTimePlugin.java  |    0
 .../apache/wiki/plugin/DefaultPluginManager.java   |    0
 .../main/java/org/apache/wiki/plugin/Denounce.java |    0
 .../main/java/org/apache/wiki/plugin/Groups.java   |    0
 .../main/java/org/apache/wiki/plugin/IfPlugin.java |    0
 .../main/java/org/apache/wiki/plugin/Image.java    |    0
 .../java/org/apache/wiki/plugin/IndexPlugin.java   |   19 +-
 .../java/org/apache/wiki/plugin/InsertPage.java    |    0
 .../org/apache/wiki/plugin/ListLocksPlugin.java    |    0
 .../src/main/java/org/apache/wiki/plugin/Note.java |    0
 .../org/apache/wiki/plugin/PageViewPlugin.java     |    0
 .../apache/wiki/plugin/RecentChangesPlugin.java    |    0
 .../apache/wiki/plugin/ReferredPagesPlugin.java    |    0
 .../apache/wiki/plugin/ReferringPagesPlugin.java   |    4 +-
 .../wiki/plugin/ReferringUndefinedPagesPlugin.java |    2 +-
 .../org/apache/wiki/plugin/SampleAjaxPlugin.java   |    0
 .../main/java/org/apache/wiki/plugin/Search.java   |    0
 .../org/apache/wiki/plugin/SessionsPlugin.java     |    0
 .../org/apache/wiki/plugin/TableOfContents.java    |    0
 .../apache/wiki/plugin/UndefinedPagesPlugin.java   |    0
 .../org/apache/wiki/plugin/UnusedPagesPlugin.java  |    0
 .../apache/wiki/plugin/WeblogArchivePlugin.java    |    0
 .../org/apache/wiki/plugin/WeblogEntryPlugin.java  |    0
 .../java/org/apache/wiki/plugin/WeblogPlugin.java  |    9 +-
 .../main/java/org/apache/wiki/plugin/package.html  |    0
 .../org/apache/wiki/preferences/Preferences.java   |    0
 .../java/org/apache/wiki/preferences/package.html  |    0
 .../wiki/providers/AbstractFileProvider.java       |    0
 .../wiki/providers/BasicAttachmentProvider.java    |    4 +-
 .../wiki/providers/CachingAttachmentProvider.java  |   17 +-
 .../org/apache/wiki/providers/CachingProvider.java |    0
 .../java/org/apache/wiki/providers/FastSearch.java |    0
 .../apache/wiki/providers/FileSystemProvider.java  |    0
 .../wiki/providers/NoSuchVersionException.java     |    0
 .../providers/RepositoryModifiedException.java     |    0
 .../wiki/providers/VersioningFileProvider.java     |    0
 .../apache/wiki/providers/VersioningProvider.java  |    0
 .../wiki/providers/WikiAttachmentProvider.java     |    2 +-
 .../apache/wiki/providers/WikiPageProvider.java    |    5 +-
 .../java/org/apache/wiki/providers/package.html    |    0
 .../org/apache/wiki/render/CleanTextRenderer.java  |    0
 .../org/apache/wiki/render/CreoleRenderer.java     |    0
 .../wiki/render/CustomXMLOutputProcessor.java      |    0
 .../org/apache/wiki/render/RenderingManager.java   |    0
 .../java/org/apache/wiki/render/WikiRenderer.java  |    0
 .../apache/wiki/render/WysiwygEditingRenderer.java |    0
 .../java/org/apache/wiki/render/XHTMLRenderer.java |    0
 .../org/apache/wiki/rpc/atom/AtomAPIServlet.java   |    0
 .../main/java/org/apache/wiki/rss/AtomFeed.java    |   15 +-
 .../src/main/java/org/apache/wiki/rss/Entry.java   |    0
 .../src/main/java/org/apache/wiki/rss/Feed.java    |    0
 .../main/java/org/apache/wiki/rss/RSS10Feed.java   |    0
 .../main/java/org/apache/wiki/rss/RSS20Feed.java   |    6 +-
 .../java/org/apache/wiki/rss/RSSGenerator.java     |    0
 .../main/java/org/apache/wiki/rss/RSSThread.java   |    0
 .../apache/wiki/search/BasicSearchProvider.java    |   10 +-
 .../apache/wiki/search/LuceneSearchProvider.java   |    7 +-
 .../java/org/apache/wiki/search/QueryItem.java     |    0
 .../java/org/apache/wiki/search/SearchManager.java |    6 +-
 .../java/org/apache/wiki/search/SearchMatcher.java |    0
 .../org/apache/wiki/search/SearchProvider.java     |    0
 .../java/org/apache/wiki/search/SearchResult.java  |    0
 .../apache/wiki/search/SearchResultComparator.java |    0
 .../main/java/org/apache/wiki/search/package.html  |    0
 .../apache/wiki/tags/AdminBeanIteratorInfo.java    |    0
 .../org/apache/wiki/tags/AdminBeanIteratorTag.java |    0
 .../apache/wiki/tags/AttachmentsIteratorInfo.java  |    0
 .../apache/wiki/tags/AttachmentsIteratorTag.java   |    8 +-
 .../main/java/org/apache/wiki/tags/AuthorTag.java  |    0
 .../main/java/org/apache/wiki/tags/BaseURLTag.java |    0
 .../java/org/apache/wiki/tags/BreadcrumbsTag.java  |    0
 .../java/org/apache/wiki/tags/CalendarTag.java     |    0
 .../java/org/apache/wiki/tags/CheckLockInfo.java   |    0
 .../java/org/apache/wiki/tags/CheckLockTag.java    |    0
 .../apache/wiki/tags/CheckRequestContextTag.java   |    0
 .../java/org/apache/wiki/tags/CheckVersionTag.java |    0
 .../java/org/apache/wiki/tags/CommentLinkTag.java  |    0
 .../org/apache/wiki/tags/ContentEncodingTag.java   |    0
 .../main/java/org/apache/wiki/tags/ContentTag.java |    0
 .../main/java/org/apache/wiki/tags/CookieTag.java  |    0
 .../java/org/apache/wiki/tags/DiffLinkTag.java     |    0
 .../java/org/apache/wiki/tags/EditLinkTag.java     |    0
 .../org/apache/wiki/tags/EditorIteratorInfo.java   |    0
 .../org/apache/wiki/tags/EditorIteratorTag.java    |    0
 .../main/java/org/apache/wiki/tags/EditorTag.java  |    0
 .../org/apache/wiki/tags/FeedDiscoveryTag.java     |    0
 .../org/apache/wiki/tags/HasAttachmentsTag.java    |    0
 .../org/apache/wiki/tags/HistoryIteratorInfo.java  |    0
 .../org/apache/wiki/tags/HistoryIteratorTag.java   |    0
 .../org/apache/wiki/tags/IfNoSearchResultsTag.java |    0
 .../org/apache/wiki/tags/IncludeResourcesTag.java  |    0
 .../main/java/org/apache/wiki/tags/IncludeTag.java |    0
 .../java/org/apache/wiki/tags/InsertDiffTag.java   |    0
 .../java/org/apache/wiki/tags/InsertPageTag.java   |    0
 .../java/org/apache/wiki/tags/IteratorTag.java     |    0
 .../main/java/org/apache/wiki/tags/LinkTag.java    |    0
 .../java/org/apache/wiki/tags/LinkToParentTag.java |    0
 .../main/java/org/apache/wiki/tags/LinkToTag.java  |    0
 .../java/org/apache/wiki/tags/MessagesTag.java     |    0
 .../java/org/apache/wiki/tags/NextVersionTag.java  |    0
 .../java/org/apache/wiki/tags/NoSuchPageTag.java   |    0
 .../java/org/apache/wiki/tags/PageDateTag.java     |    0
 .../java/org/apache/wiki/tags/PageExistsTag.java   |    0
 .../java/org/apache/wiki/tags/PageInfoLinkTag.java |    0
 .../java/org/apache/wiki/tags/PageNameTag.java     |    0
 .../java/org/apache/wiki/tags/PageSizeTag.java     |    0
 .../java/org/apache/wiki/tags/PageTypeTag.java     |    0
 .../java/org/apache/wiki/tags/PageVersionTag.java  |    0
 .../java/org/apache/wiki/tags/ParamHandler.java    |    0
 .../main/java/org/apache/wiki/tags/ParamTag.java   |    0
 .../org/apache/wiki/tags/ParentPageNameTag.java    |    0
 .../java/org/apache/wiki/tags/PermissionTag.java   |    0
 .../main/java/org/apache/wiki/tags/PluginTag.java  |    0
 .../org/apache/wiki/tags/PreviousVersionTag.java   |    0
 .../java/org/apache/wiki/tags/RSSImageLinkTag.java |    0
 .../org/apache/wiki/tags/RequestResourceTag.java   |    0
 .../apache/wiki/tags/SearchResultIteratorInfo.java |    0
 .../apache/wiki/tags/SearchResultIteratorTag.java  |    0
 .../org/apache/wiki/tags/SearchResultsSizeTag.java |    0
 .../org/apache/wiki/tags/SearchResultsTag.java     |    0
 .../org/apache/wiki/tags/SetPaginationTag.java     |    0
 .../src/main/java/org/apache/wiki/tags/TabTag.java |    0
 .../org/apache/wiki/tags/TabbedSectionTag.java     |    0
 .../java/org/apache/wiki/tags/TemplateDirTag.java  |    0
 .../java/org/apache/wiki/tags/TranslateTag.java    |    0
 .../java/org/apache/wiki/tags/UploadLinkTag.java   |    0
 .../java/org/apache/wiki/tags/UserCheckTag.java    |    0
 .../java/org/apache/wiki/tags/UserNameTag.java     |    0
 .../java/org/apache/wiki/tags/UserProfileTag.java  |    0
 .../java/org/apache/wiki/tags/VariableTag.java     |    0
 .../java/org/apache/wiki/tags/WikiBodyTag.java     |    0
 .../java/org/apache/wiki/tags/WikiLinkTag.java     |    0
 .../java/org/apache/wiki/tags/WikiTagBase.java     |    0
 .../main/java/org/apache/wiki/tags/package.html    |    0
 .../java/org/apache/wiki/ui/AbstractCommand.java   |    0
 .../src/main/java/org/apache/wiki/ui/Command.java  |    0
 .../java/org/apache/wiki/ui/CommandResolver.java   |    0
 .../src/main/java/org/apache/wiki/ui/Editor.java   |    0
 .../java/org/apache/wiki/ui/EditorManager.java     |    0
 .../org/apache/wiki/ui/GenericHTTPHandler.java     |    0
 .../main/java/org/apache/wiki/ui/GroupCommand.java |    0
 .../java/org/apache/wiki/ui/InputValidator.java    |    0
 .../main/java/org/apache/wiki/ui/Installer.java    |    0
 .../main/java/org/apache/wiki/ui/PageCommand.java  |    0
 .../java/org/apache/wiki/ui/RedirectCommand.java   |    0
 .../java/org/apache/wiki/ui/TemplateManager.java   |    0
 .../main/java/org/apache/wiki/ui/WikiCommand.java  |    0
 .../java/org/apache/wiki/ui/WikiJSPFilter.java     |    0
 .../org/apache/wiki/ui/WikiRequestWrapper.java     |    0
 .../java/org/apache/wiki/ui/WikiServletFilter.java |    0
 .../java/org/apache/wiki/ui/admin/AdminBean.java   |    0
 .../wiki/ui/admin/DefaultAdminBeanManager.java     |    0
 .../org/apache/wiki/ui/admin/SimpleAdminBean.java  |    0
 .../apache/wiki/ui/admin/WikiFormAdminBean.java    |    0
 .../org/apache/wiki/ui/admin/beans/CoreBean.java   |    0
 .../org/apache/wiki/ui/admin/beans/FilterBean.java |    2 +-
 .../org/apache/wiki/ui/admin/beans/ModuleBean.java |   12 +-
 .../wiki/ui/admin/beans/PlainEditorAdminBean.java  |    0
 .../org/apache/wiki/ui/admin/beans/PluginBean.java |    9 +-
 .../wiki/ui/admin/beans/SearchManagerBean.java     |    0
 .../org/apache/wiki/ui/admin/beans/UserBean.java   |    0
 .../java/org/apache/wiki/ui/admin/package.html     |    0
 .../src/main/java/org/apache/wiki/ui/package.html  |    0
 .../org/apache/wiki/ui/progress/ProgressItem.java  |    0
 .../apache/wiki/ui/progress/ProgressManager.java   |    0
 .../java/org/apache/wiki/ui/progress/package.html  |    0
 .../org/apache/wiki/url/DefaultURLConstructor.java |    0
 .../org/apache/wiki/url/ShortURLConstructor.java   |    0
 .../apache/wiki/url/ShortViewURLConstructor.java   |    0
 .../java/org/apache/wiki/url/URLConstructor.java   |    0
 .../src/main/java/org/apache/wiki/url/package.html |    0
 .../main/java/org/apache/wiki/util/ByteUtils.java  |  188 +--
 .../main/java/org/apache/wiki/util/ClassUtil.java  |    0
 .../org/apache/wiki/util/CommentedProperties.java  |    0
 .../main/java/org/apache/wiki/util/CryptoUtil.java |    0
 .../main/java/org/apache/wiki/util/FileUtil.java   |    0
 .../main/java/org/apache/wiki/util/FormUtil.java   |    0
 .../main/java/org/apache/wiki/util/HttpUtil.java   |    0
 .../main/java/org/apache/wiki/util/MailUtil.java   |    0
 .../java/org/apache/wiki/util/PriorityList.java    |    0
 .../org/apache/wiki/util}/PropertiesUtils.java     |   21 +-
 .../java/org/apache/wiki/util/PropertyReader.java  |    0
 .../main/java/org/apache/wiki/util/Serializer.java |    0
 .../main/java/org/apache/wiki/util/TextUtil.java   |    0
 .../org/apache/wiki/util/TimedCounterList.java     |    0
 .../src/main/java/org/apache/wiki/util/XHTML.java  |    0
 .../main/java/org/apache/wiki/util/XhtmlUtil.java  |  438 +++----
 .../main/java/org/apache/wiki/util/XmlUtil.java    |  230 ++--
 .../wiki/util/comparators/CollatorComparator.java  |    0
 .../wiki/util/comparators/HumanComparator.java     |    0
 .../util/comparators/JavaNaturalComparator.java    |    0
 .../wiki/util/comparators/LocaleComparator.java    |    0
 .../wiki/util/comparators/PageTimeComparator.java  |    0
 .../main/java/org/apache/wiki/util/package.html    |    0
 .../org/apache/wiki/workflow/AbstractStep.java     |    0
 .../java/org/apache/wiki/workflow/Decision.java    |    0
 .../org/apache/wiki/workflow/DecisionQueue.java    |    0
 .../wiki/workflow/DecisionRequiredException.java   |    0
 .../main/java/org/apache/wiki/workflow/Fact.java   |    0
 .../wiki/workflow/NoSuchOutcomeException.java      |    0
 .../java/org/apache/wiki/workflow/Outcome.java     |    0
 .../org/apache/wiki/workflow/SimpleDecision.java   |    0
 .../apache/wiki/workflow/SimpleNotification.java   |    0
 .../main/java/org/apache/wiki/workflow/Step.java   |    0
 .../org/apache/wiki/workflow/SystemPrincipal.java  |    0
 .../main/java/org/apache/wiki/workflow/Task.java   |    0
 .../java/org/apache/wiki/workflow/Workflow.java    |    0
 .../org/apache/wiki/workflow/WorkflowBuilder.java  |    0
 .../org/apache/wiki/workflow/WorkflowManager.java  |    0
 .../org/apache/wiki/xmlrpc/AbstractRPCHandler.java |    0
 .../org/apache/wiki/xmlrpc/MetaWeblogHandler.java  |    0
 .../java/org/apache/wiki/xmlrpc/RPCHandler.java    |    0
 .../org/apache/wiki/xmlrpc/RPCHandlerUTF8.java     |    0
 .../java/org/apache/wiki/xmlrpc/RPCServlet.java    |    0
 .../org/apache/wiki/xmlrpc/WikiRPCHandler.java     |    0
 .../src/main/resources/CoreResources.properties    |    0
 .../src/main/resources/CoreResources_de.properties |    0
 .../src/main/resources/CoreResources_es.properties |    0
 .../src/main/resources/CoreResources_fi.properties |    0
 .../src/main/resources/CoreResources_fr.properties |    0
 .../src/main/resources/CoreResources_it.properties |  460 +++----
 .../src/main/resources/CoreResources_nl.properties |    0
 .../main/resources/CoreResources_pt_BR.properties  |  458 +++----
 .../src/main/resources/CoreResources_ru.properties |    0
 .../main/resources/CoreResources_zh_CN.properties  |    0
 .../src/main/resources/ehcache.xml                 |    0
 .../src/main/resources/ini/classmappings.xml       |    0
 .../src/main/resources/ini/jspwiki.properties      |    0
 .../src/main/resources/ini/jspwiki_module.xml      |    0
 .../org/apache/wiki/filters/profanity.properties   |   52 +-
 .../org/apache/wiki/plugin/denounce.properties     |    0
 .../resources/plugin/PluginResources.properties    |    0
 .../resources/plugin/PluginResources_de.properties |    0
 .../resources/plugin/PluginResources_es.properties |    0
 .../resources/plugin/PluginResources_fi.properties |    0
 .../resources/plugin/PluginResources_fr.properties |    0
 .../resources/plugin/PluginResources_it.properties |  152 +--
 .../resources/plugin/PluginResources_nl.properties |    0
 .../plugin/PluginResources_pt_BR.properties        |  152 +--
 .../resources/plugin/PluginResources_ru.properties |    0
 .../plugin/PluginResources_zh_CN.properties        |    0
 .../main/resources/templates/default.properties    |    0
 .../main/resources/templates/default_de.properties |    0
 .../main/resources/templates/default_es.properties |    0
 .../main/resources/templates/default_fi.properties |    0
 .../main/resources/templates/default_fr.properties |    0
 .../main/resources/templates/default_it.properties | 1334 ++++++++++----------
 .../main/resources/templates/default_nl.properties |    0
 .../resources/templates/default_pt_BR.properties   |  902 ++++++-------
 .../main/resources/templates/default_ru.properties |    0
 .../resources/templates/default_zh_CN.properties   |    0
 .../src/test/config/hsql-userdb-setup.ddl          |    0
 .../src/test/config/hsql-userdb-teardown.ddl       |    0
 .../src/test/java/SamplePlugin2.java               |    0
 .../src/test/java/org/apache/wiki/HsqlDbUtils.java |    0
 .../test/java/org/apache/wiki/PageManagerTest.java |    0
 .../test/java/org/apache/wiki/PageSorterTest.java  |    0
 .../java/org/apache/wiki/PropertyReaderTest.java   |    0
 .../java/org/apache/wiki/ReferenceManagerTest.java |   34 +-
 .../src/test/java/org/apache/wiki/ReleaseTest.java |    0
 .../test/java/org/apache/wiki/TestAuthorizer.java  |    0
 .../src/test/java/org/apache/wiki/TestEngine.java  |    0
 .../java/org/apache/wiki/TestJDBCDataSource.java   |    0
 .../test/java/org/apache/wiki/TestJNDIContext.java |    0
 .../src/test/java/org/apache/wiki/Util.java        |    0
 .../java/org/apache/wiki/VariableManagerTest.java  |    0
 .../java/org/apache/wiki/WikiAjaxServletTest.java  |    0
 .../test/java/org/apache/wiki/WikiEngineTest.java  |   12 +-
 .../test/java/org/apache/wiki/WikiSessionTest.java |    0
 .../wiki/attachment/AttachmentManagerTest.java     |    4 +-
 .../wiki/auth/AuthenticationManagerTest.java       |    0
 .../apache/wiki/auth/AuthorizationManagerTest.java |    0
 .../org/apache/wiki/auth/GroupManagerTest.java     |    0
 .../org/apache/wiki/auth/SecurityEventTrap.java    |    0
 .../java/org/apache/wiki/auth/UserManagerTest.java |    0
 .../src/test/java/org/apache/wiki/auth/Users.java  |    0
 .../org/apache/wiki/auth/acl/AclEntryImplTest.java |    0
 .../java/org/apache/wiki/auth/acl/AclImplTest.java |    0
 .../wiki/auth/acl/DefaultAclManagerTest.java       |    0
 .../org/apache/wiki/auth/authorize/GroupTest.java  |    0
 .../wiki/auth/authorize/JDBCGroupDatabaseTest.java |    0
 .../auth/authorize/WebContainerAuthorizerTest.java |    0
 .../wiki/auth/authorize/XMLGroupDatabaseTest.java  |    0
 .../wiki/auth/login/AnonymousLoginModuleTest.java  |    0
 .../auth/login/CookieAssertionLoginModuleTest.java |    0
 .../auth/login/UserDatabaseLoginModuleTest.java    |    0
 .../auth/login/WebContainerLoginModuleTest.java    |    0
 .../permissions/AllPermissionCollectionTest.java   |    0
 .../wiki/auth/permissions/AllPermissionTest.java   |    0
 .../wiki/auth/permissions/GroupPermissionTest.java |    0
 .../wiki/auth/permissions/PagePermissionTest.java  |    0
 .../wiki/auth/permissions/WikiPermissionTest.java  |    0
 .../wiki/auth/user/JDBCUserDatabaseTest.java       |    0
 .../org/apache/wiki/auth/user/UserProfileTest.java |    0
 .../apache/wiki/auth/user/XMLUserDatabaseTest.java |    0
 .../org/apache/wiki/content/PageRenamerTest.java   |    0
 .../wiki/diff/ContextualDiffProviderTest.java      |    0
 .../wiki/filters/DefaultFilterManagerTest.java     |    0
 .../java/org/apache/wiki/filters/TestFilter.java   |    0
 .../htmltowiki/HtmlStringToWikiTranslatorTest.java |    0
 .../wiki/i18n/InternationalizationManagerTest.java |  122 +-
 .../wiki/parser/CreoleToJSPWikiTranslatorTest.java |    0
 .../wiki/parser/JSPWikiMarkupParserTest.java       |    0
 .../org/apache/wiki/parser/MarkupParserTest.java   |    0
 .../java/org/apache/wiki/parser/creole.properties  |    0
 .../org/apache/wiki/plugin/CounterPluginTest.java  |    0
 .../wiki/plugin/DefaultPluginManagerTest.java      |    0
 .../java/org/apache/wiki/plugin/GroupsTest.java    |    0
 .../java/org/apache/wiki/plugin/IfPluginTest.java  |    0
 .../org/apache/wiki/plugin/InsertPageTest.java     |    0
 .../org/apache/wiki/plugin/JavaScriptPlugin.java   |    0
 .../org/apache/wiki/plugin/PageViewPluginTest.java |    0
 .../wiki/plugin/RecentChangesPluginTest.java       |    0
 .../wiki/plugin/ReferringPagesPluginTest.java      |    0
 .../plugin/ReferringUndefinedPagesPluginTest.java  |    0
 .../java/org/apache/wiki/plugin/SamplePlugin.java  |    0
 .../java/org/apache/wiki/plugin/SamplePlugin3.java |    0
 .../apache/wiki/plugin/TableOfContentsTest.java    |    0
 .../wiki/plugin/UndefinedPagesPluginTest.java      |    0
 .../providers/BasicAttachmentProviderTest.java     |    0
 .../apache/wiki/providers/CachingProviderTest.java |    0
 .../org/apache/wiki/providers/CounterProvider.java |    0
 .../wiki/providers/FileSystemProviderTest.java     |    0
 .../wiki/providers/VersioningFileProviderTest.java |    0
 .../apache/wiki/providers/VerySimpleProvider.java  |    0
 .../org/apache/wiki/render/CreoleRendererTest.java |    0
 .../apache/wiki/render/RenderingManagerTest.java   |    0
 .../wiki/render/WysiwygEditingRendererTest.java    |    0
 .../java/org/apache/wiki/rss/RSSGeneratorTest.java |   17 +-
 .../org/apache/wiki/search/SearchManagerTest.java  |    0
 .../java/org/apache/wiki/stress/Benchmark.java     |    0
 .../apache/wiki/stress/MassiveRepositoryTest.java  |    0
 .../wiki/stress/StressTestVersioningProvider.java  |    0
 .../org/apache/wiki/ui/CommandResolverTest.java    |    0
 .../java/org/apache/wiki/ui/GroupCommandTest.java  |    0
 .../org/apache/wiki/ui/InputValidatorTest.java     |    0
 .../java/org/apache/wiki/ui/PageCommandTest.java   |    0
 .../org/apache/wiki/ui/RedirectCommandTest.java    |    0
 .../java/org/apache/wiki/ui/WikiCommandTest.java   |    0
 .../apache/wiki/ui/admin/beans/FilterBeanTest.java |  106 +-
 .../apache/wiki/ui/admin/beans/PluginBeanTest.java |  112 +-
 .../apache/wiki/url/DefaultURLConstructorTest.java |    0
 .../apache/wiki/url/ShortURLConstructorTest.java   |    0
 .../wiki/url/ShortViewURLConstructorTest.java      |    0
 .../java/org/apache/wiki/util/ByteUtilsTest.java   |    0
 .../java/org/apache/wiki/util/ClassUtilTest.java   |    0
 .../apache/wiki/util/CommentedPropertiesTest.java  |    0
 .../java/org/apache/wiki/util/CryptoUtilTest.java  |    0
 .../java/org/apache/wiki/util/FileUtilTest.java    |    0
 .../java/org/apache/wiki/util/MailUtilTest.java    |    0
 .../org/apache/wiki/util/PriorityListTest.java     |    0
 .../org/apache/wiki/util/PropertyReaderTest.java   |    0
 .../java/org/apache/wiki/util/SerializerTest.java  |    0
 .../java/org/apache/wiki/util/TextUtilTest.java    |    0
 .../org/apache/wiki/util/TimedCounterListTest.java |    0
 .../java/org/apache/wiki/util/XmlUtilTest.java     |  168 +--
 .../wiki/util/comparators/HumanComparatorTest.java |    0
 .../java/org/apache/wiki/web/StreamRedirector.java |    0
 .../java/org/apache/wiki/web/TestContainer.java    |    0
 .../apache/wiki/workflow/ApprovalWorkflowTest.java |    0
 .../apache/wiki/workflow/DecisionQueueTest.java    |    0
 .../java/org/apache/wiki/workflow/FactTest.java    |    0
 .../java/org/apache/wiki/workflow/OutcomeTest.java |    0
 .../apache/wiki/workflow/SimpleDecisionTest.java   |    0
 .../java/org/apache/wiki/workflow/TaskTest.java    |    0
 .../apache/wiki/workflow/WorkflowManagerTest.java  |    0
 .../org/apache/wiki/workflow/WorkflowTest.java     |    0
 .../org/apache/wiki/xmlrpc/RPCHandlerTest.java     |    0
 .../src/test/resources/TestPlugins.txt             |  366 +++---
 .../src/test/resources/TextFormattingRules.txt     |  286 ++---
 .../src/test/resources/WEB-INF/web.xml             |    0
 .../src/test/resources/filters.xml                 |    0
 .../src/test/resources/groupdatabase.xml           |    0
 .../src/test/resources/ini/jspwiki.properties      |    0
 .../src/test/resources/ini/jspwiki_module.xml      |    0
 .../src/test/resources/jspwiki-custom.properties   |    0
 .../test/resources/jspwiki-testUserPolicy.policy   |    0
 .../test/resources/jspwiki-vers-custom.properties  |    0
 .../src/test/resources/jspwiki.policy              |    0
 .../src/test/resources/test.properties             |    0
 .../src/test/resources/userdatabase.xml            |    0
 jspwiki-markdown/pom.xml                           |    5 +-
 jspwiki-war/pom.xml                                |  234 +---
 pom.xml                                            |  313 +++--
 551 files changed, 3770 insertions(+), 3719 deletions(-)
 create mode 100644 jspwiki-main/pom.xml
 rename {jspwiki-war => jspwiki-main}/src/main/java/org/apache/wiki/InternalWikiException.java (100%)
 rename {jspwiki-war => jspwiki-main}/src/main/java/org/apache/wiki/LinkCollector.java (100%)
 rename {jspwiki-war => jspwiki-main}/src/main/java/org/apache/wiki/PageLock.java (100%)
 rename {jspwiki-war => jspwiki-main}/src/main/java/org/apache/wiki/PageManager.java (100%)
 rename {jspwiki-war => jspwiki-main}/src/main/java/org/apache/wiki/PageSorter.java (100%)
 rename {jspwiki-war => jspwiki-main}/src/main/java/org/apache/wiki/ReferenceManager.java (93%)
 rename {jspwiki-war => jspwiki-main}/src/main/java/org/apache/wiki/Release.java (99%)
 rename {jspwiki-war => jspwiki-main}/src/main/java/org/apache/wiki/StringTransmutator.java (100%)
 rename {jspwiki-war => jspwiki-main}/src/main/java/org/apache/wiki/TranslationsCheck.java (100%)
 rename {jspwiki-war => jspwiki-main}/src/main/java/org/apache/wiki/VariableManager.java (100%)
 rename {jspwiki-war => jspwiki-main}/src/main/java/org/apache/wiki/WatchDog.java (100%)
 rename {jspwiki-war => jspwiki-main}/src/main/java/org/apache/wiki/Watchable.java (100%)
 rename {jspwiki-war => jspwiki-main}/src/main/java/org/apache/wiki/WikiBackgroundThread.java (100%)
 rename {jspwiki-war => jspwiki-main}/src/main/java/org/apache/wiki/WikiContext.java (100%)
 rename {jspwiki-war => jspwiki-main}/src/main/java/org/apache/wiki/WikiEngine.java (99%)
 rename {jspwiki-war => jspwiki-main}/src/main/java/org/apache/wiki/WikiPage.java (96%)
 rename {jspwiki-war => jspwiki-main}/src/main/java/org/apache/wiki/WikiProvider.java (100%)
 rename {jspwiki-war => jspwiki-main}/src/main/java/org/apache/wiki/WikiServlet.java (100%)
 rename {jspwiki-war => jspwiki-main}/src/main/java/org/apache/wiki/WikiSession.java (100%)
 rename {jspwiki-war => jspwiki-main}/src/main/java/org/apache/wiki/ajax/AjaxUtil.java (100%)
 rename {jspwiki-war => jspwiki-main}/src/main/java/org/apache/wiki/ajax/WikiAjaxDispatcherServlet.java (100%)
 rename {jspwiki-war => jspwiki-main}/src/main/java/org/apache/wiki/ajax/WikiAjaxServlet.java (100%)
 rename {jspwiki-war => jspwiki-main}/src/main/java/org/apache/wiki/api/engine/AdminBeanManager.java (96%)
 rename {jspwiki-war => jspwiki-main}/src/main/java/org/apache/wiki/api/engine/FilterManager.java (96%)
 rename {jspwiki-war => jspwiki-main}/src/main/java/org/apache/wiki/api/engine/PluginManager.java (96%)
 rename {jspwiki-war => jspwiki-main}/src/main/java/org/apache/wiki/api/engine/package.html (100%)
 rename {jspwiki-war => jspwiki-main}/src/main/java/org/apache/wiki/api/exceptions/FilterException.java (100%)
 rename {jspwiki-war => jspwiki-main}/src/main/java/org/apache/wiki/api/exceptions/NoRequiredPropertyException.java (100%)
 rename {jspwiki-war => jspwiki-main}/src/main/java/org/apache/wiki/api/exceptions/NoSuchVariableException.java (100%)
 rename {jspwiki-war => jspwiki-main}/src/main/java/org/apache/wiki/api/exceptions/PluginException.java (100%)
 rename {jspwiki-war => jspwiki-main}/src/main/java/org/apache/wiki/api/exceptions/ProviderException.java (100%)
 rename {jspwiki-war => jspwiki-main}/src/main/java/org/apache/wiki/api/exceptions/RedirectException.java (100%)
 rename {jspwiki-war => jspwiki-main}/src/main/java/org/apache/wiki/api/exceptions/WikiException.java (100%)
 rename {jspwiki-war => jspwiki-main}/src/main/java/org/apache/wiki/api/exceptions/WikiI18nException.java (100%)
 rename {jspwiki-war => jspwiki-main}/src/main/java/org/apache/wiki/api/exceptions/package.html (100%)
 rename {jspwiki-war => jspwiki-main}/src/main/java/org/apache/wiki/api/filters/BasicPageFilter.java (100%)
 rename {jspwiki-war => jspwiki-main}/src/main/java/org/apache/wiki/api/filters/PageFilter.java (100%)
 rename {jspwiki-war => jspwiki-main}/src/main/java/org/apache/wiki/api/filters/package.html (100%)
 rename {jspwiki-war => jspwiki-main}/src/main/java/org/apache/wiki/api/package.html (100%)
 rename {jspwiki-war => jspwiki-main}/src/main/java/org/apache/wiki/api/plugin/InitializablePlugin.java (100%)
 rename {jspwiki-war => jspwiki-main}/src/main/java/org/apache/wiki/api/plugin/ParserStagePlugin.java (100%)
 rename {jspwiki-war => jspwiki-main}/src/main/java/org/apache/wiki/api/plugin/WikiPlugin.java (100%)
 rename {jspwiki-war => jspwiki-main}/src/main/java/org/apache/wiki/api/plugin/package.html (100%)
 rename {jspwiki-war => jspwiki-main}/src/main/java/org/apache/wiki/attachment/Attachment.java (100%)
 rename {jspwiki-war => jspwiki-main}/src/main/java/org/apache/wiki/attachment/AttachmentManager.java (97%)
 rename {jspwiki-war => jspwiki-main}/src/main/java/org/apache/wiki/attachment/AttachmentServlet.java (100%)
 rename {jspwiki-war => jspwiki-main}/src/main/java/org/apache/wiki/attachment/DynamicAttachment.java (100%)
 rename {jspwiki-war => jspwiki-main}/src/main/java/org/apache/wiki/attachment/DynamicAttachmentProvider.java (100%)
 rename {jspwiki-war => jspwiki-main}/src/main/java/org/apache/wiki/attachment/package.html (100%)
 rename {jspwiki-war => jspwiki-main}/src/main/java/org/apache/wiki/auth/AuthenticationManager.java (100%)
 rename {jspwiki-war => jspwiki-main}/src/main/java/org/apache/wiki/auth/AuthorizationManager.java (100%)
 rename {jspwiki-war => jspwiki-main}/src/main/java/org/apache/wiki/auth/Authorizer.java (100%)
 rename {jspwiki-war => jspwiki-main}/src/main/java/org/apache/wiki/auth/GroupPrincipal.java (100%)
 rename {jspwiki-war => jspwiki-main}/src/main/java/org/apache/wiki/auth/NoSuchPrincipalException.java (100%)
 rename {jspwiki-war => jspwiki-main}/src/main/java/org/apache/wiki/auth/PrincipalComparator.java (100%)
 rename {jspwiki-war => jspwiki-main}/src/main/java/org/apache/wiki/auth/SecurityVerifier.java (100%)
 rename {jspwiki-war => jspwiki-main}/src/main/java/org/apache/wiki/auth/SessionMonitor.java (100%)
 rename {jspwiki-war => jspwiki-main}/src/main/java/org/apache/wiki/auth/UserManager.java (100%)
 rename {jspwiki-war => jspwiki-main}/src/main/java/org/apache/wiki/auth/WikiPrincipal.java (100%)
 rename {jspwiki-war => jspwiki-main}/src/main/java/org/apache/wiki/auth/WikiSecurityException.java (100%)
 rename {jspwiki-war => jspwiki-main}/src/main/java/org/apache/wiki/auth/acl/Acl.java (100%)
 rename {jspwiki-war => jspwiki-main}/src/main/java/org/apache/wiki/auth/acl/AclEntry.java (100%)
 rename {jspwiki-war => jspwiki-main}/src/main/java/org/apache/wiki/auth/acl/AclEntryImpl.java (100%)
 rename {jspwiki-war => jspwiki-main}/src/main/java/org/apache/wiki/auth/acl/AclImpl.java (100%)
 rename {jspwiki-war => jspwiki-main}/src/main/java/org/apache/wiki/auth/acl/AclManager.java (100%)
 rename {jspwiki-war => jspwiki-main}/src/main/java/org/apache/wiki/auth/acl/DefaultAclManager.java (100%)
 rename {jspwiki-war => jspwiki-main}/src/main/java/org/apache/wiki/auth/acl/UnresolvedPrincipal.java (100%)
 rename {jspwiki-war => jspwiki-main}/src/main/java/org/apache/wiki/auth/acl/package.html (100%)
 rename {jspwiki-war => jspwiki-main}/src/main/java/org/apache/wiki/auth/authorize/Group.java (100%)
 rename {jspwiki-war => jspwiki-main}/src/main/java/org/apache/wiki/auth/authorize/GroupDatabase.java (100%)
 rename {jspwiki-war => jspwiki-main}/src/main/java/org/apache/wiki/auth/authorize/GroupManager.java (100%)
 rename {jspwiki-war => jspwiki-main}/src/main/java/org/apache/wiki/auth/authorize/JDBCGroupDatabase.java (100%)
 rename {jspwiki-war => jspwiki-main}/src/main/java/org/apache/wiki/auth/authorize/Role.java (100%)
 rename {jspwiki-war => jspwiki-main}/src/main/java/org/apache/wiki/auth/authorize/WebAuthorizer.java (100%)
 rename {jspwiki-war => jspwiki-main}/src/main/java/org/apache/wiki/auth/authorize/WebContainerAuthorizer.java (100%)
 rename {jspwiki-war => jspwiki-main}/src/main/java/org/apache/wiki/auth/authorize/XMLGroupDatabase.java (100%)
 rename {jspwiki-war => jspwiki-main}/src/main/java/org/apache/wiki/auth/authorize/package.html (100%)
 rename {jspwiki-war => jspwiki-main}/src/main/java/org/apache/wiki/auth/login/AbstractLoginModule.java (100%)
 rename {jspwiki-war => jspwiki-main}/src/main/java/org/apache/wiki/auth/login/AnonymousLoginModule.java (100%)
 rename {jspwiki-war => jspwiki-main}/src/main/java/org/apache/wiki/auth/login/AuthorizerCallback.java (100%)
 rename {jspwiki-war => jspwiki-main}/src/main/java/org/apache/wiki/auth/login/CookieAssertionLoginModule.java (100%)
 rename {jspwiki-war => jspwiki-main}/src/main/java/org/apache/wiki/auth/login/CookieAuthenticationLoginModule.java (100%)
 rename {jspwiki-war => jspwiki-main}/src/main/java/org/apache/wiki/auth/login/HttpRequestCallback.java (100%)
 rename {jspwiki-war => jspwiki-main}/src/main/java/org/apache/wiki/auth/login/PrincipalWrapper.java (100%)
 rename {jspwiki-war => jspwiki-main}/src/main/java/org/apache/wiki/auth/login/UserDatabaseCallback.java (100%)
 rename {jspwiki-war => jspwiki-main}/src/main/java/org/apache/wiki/auth/login/UserDatabaseLoginModule.java (100%)
 rename {jspwiki-war => jspwiki-main}/src/main/java/org/apache/wiki/auth/login/WebContainerCallbackHandler.java (100%)
 rename {jspwiki-war => jspwiki-main}/src/main/java/org/apache/wiki/auth/login/WebContainerLoginModule.java (100%)
 rename {jspwiki-war => jspwiki-main}/src/main/java/org/apache/wiki/auth/login/WikiCallbackHandler.java (100%)
 rename {jspwiki-war => jspwiki-main}/src/main/java/org/apache/wiki/auth/login/WikiEngineCallback.java (100%)
 rename {jspwiki-war => jspwiki-main}/src/main/java/org/apache/wiki/auth/login/package.html (100%)
 rename {jspwiki-war => jspwiki-main}/src/main/java/org/apache/wiki/auth/package.html (100%)
 rename {jspwiki-war => jspwiki-main}/src/main/java/org/apache/wiki/auth/permissions/AllPermission.java (100%)
 rename {jspwiki-war => jspwiki-main}/src/main/java/org/apache/wiki/auth/permissions/AllPermissionCollection.java (100%)
 rename {jspwiki-war => jspwiki-main}/src/main/java/org/apache/wiki/auth/permissions/GroupPermission.java (100%)
 rename {jspwiki-war => jspwiki-main}/src/main/java/org/apache/wiki/auth/permissions/PagePermission.java (100%)
 rename {jspwiki-war => jspwiki-main}/src/main/java/org/apache/wiki/auth/permissions/PermissionFactory.java (100%)
 rename {jspwiki-war => jspwiki-main}/src/main/java/org/apache/wiki/auth/permissions/WikiPermission.java (100%)
 rename {jspwiki-war => jspwiki-main}/src/main/java/org/apache/wiki/auth/user/AbstractUserDatabase.java (100%)
 rename {jspwiki-war => jspwiki-main}/src/main/java/org/apache/wiki/auth/user/DefaultUserProfile.java (100%)
 rename {jspwiki-war => jspwiki-main}/src/main/java/org/apache/wiki/auth/user/DuplicateUserException.java (100%)
 rename {jspwiki-war => jspwiki-main}/src/main/java/org/apache/wiki/auth/user/JDBCUserDatabase.java (100%)
 rename {jspwiki-war => jspwiki-main}/src/main/java/org/apache/wiki/auth/user/UserDatabase.java (100%)
 rename {jspwiki-war => jspwiki-main}/src/main/java/org/apache/wiki/auth/user/UserProfile.java (100%)
 rename {jspwiki-war => jspwiki-main}/src/main/java/org/apache/wiki/auth/user/XMLUserDatabase.java (100%)
 rename {jspwiki-war => jspwiki-main}/src/main/java/org/apache/wiki/content/PageRenamer.java (97%)
 rename {jspwiki-war => jspwiki-main}/src/main/java/org/apache/wiki/content/package.html (100%)
 rename {jspwiki-war => jspwiki-main}/src/main/java/org/apache/wiki/diff/ContextualDiffProvider.java (100%)
 rename {jspwiki-war => jspwiki-main}/src/main/java/org/apache/wiki/diff/DiffProvider.java (100%)
 rename {jspwiki-war => jspwiki-main}/src/main/java/org/apache/wiki/diff/DifferenceManager.java (100%)
 rename {jspwiki-war => jspwiki-main}/src/main/java/org/apache/wiki/diff/ExternalDiffProvider.java (100%)
 rename {jspwiki-war => jspwiki-main}/src/main/java/org/apache/wiki/diff/TraditionalDiffProvider.java (100%)
 rename {jspwiki-war => jspwiki-main}/src/main/java/org/apache/wiki/event/PageEventFilter.java (100%)
 rename {jspwiki-war => jspwiki-main}/src/main/java/org/apache/wiki/event/WikiEngineEvent.java (100%)
 rename {jspwiki-war => jspwiki-main}/src/main/java/org/apache/wiki/event/WikiEvent.java (100%)
 rename {jspwiki-war => jspwiki-main}/src/main/java/org/apache/wiki/event/WikiEventListener.java (100%)
 rename {jspwiki-war => jspwiki-main}/src/main/java/org/apache/wiki/event/WikiEventManager.java (100%)
 rename {jspwiki-war => jspwiki-main}/src/main/java/org/apache/wiki/event/WikiEventUtils.java (100%)
 rename {jspwiki-war => jspwiki-main}/src/main/java/org/apache/wiki/event/WikiPageEvent.java (100%)
 rename {jspwiki-war => jspwiki-main}/src/main/java/org/apache/wiki/event/WikiPageRenameEvent.java (100%)
 rename {jspwiki-war => jspwiki-main}/src/main/java/org/apache/wiki/event/WikiSecurityEvent.java (100%)
 rename {jspwiki-war => jspwiki-main}/src/main/java/org/apache/wiki/event/WorkflowEvent.java (100%)
 rename {jspwiki-war => jspwiki-main}/src/main/java/org/apache/wiki/filters/CreoleFilter.java (100%)
 rename {jspwiki-war => jspwiki-main}/src/main/java/org/apache/wiki/filters/DefaultFilterManager.java (98%)
 rename {jspwiki-war => jspwiki-main}/src/main/java/org/apache/wiki/filters/PingWeblogsComFilter.java (96%)
 rename {jspwiki-war => jspwiki-main}/src/main/java/org/apache/wiki/filters/ProfanityFilter.java (100%)
 rename {jspwiki-war => jspwiki-main}/src/main/java/org/apache/wiki/filters/SpamFilter.java (100%)
 rename {jspwiki-war => jspwiki-main}/src/main/java/org/apache/wiki/filters/package.html (100%)
 rename {jspwiki-war => jspwiki-main}/src/main/java/org/apache/wiki/forms/FormClose.java (100%)
 rename {jspwiki-war => jspwiki-main}/src/main/java/org/apache/wiki/forms/FormElement.java (100%)
 rename {jspwiki-war => jspwiki-main}/src/main/java/org/apache/wiki/forms/FormHandler.java (100%)
 rename {jspwiki-war => jspwiki-main}/src/main/java/org/apache/wiki/forms/FormInfo.java (100%)
 rename {jspwiki-war => jspwiki-main}/src/main/java/org/apache/wiki/forms/FormInput.java (100%)
 rename {jspwiki-war => jspwiki-main}/src/main/java/org/apache/wiki/forms/FormOpen.java (100%)
 rename {jspwiki-war => jspwiki-main}/src/main/java/org/apache/wiki/forms/FormOutput.java (100%)
 rename {jspwiki-war => jspwiki-main}/src/main/java/org/apache/wiki/forms/FormSelect.java (100%)
 rename {jspwiki-war => jspwiki-main}/src/main/java/org/apache/wiki/forms/FormSet.java (100%)
 rename {jspwiki-war => jspwiki-main}/src/main/java/org/apache/wiki/forms/FormTextarea.java (100%)
 rename {jspwiki-war => jspwiki-main}/src/main/java/org/apache/wiki/forms/package.html (100%)
 rename {jspwiki-war => jspwiki-main}/src/main/java/org/apache/wiki/htmltowiki/ForgetNullValuesLinkedHashMap.java (100%)
 rename {jspwiki-war => jspwiki-main}/src/main/java/org/apache/wiki/htmltowiki/HtmlStringToWikiTranslator.java (100%)
 rename {jspwiki-war => jspwiki-main}/src/main/java/org/apache/wiki/htmltowiki/PersistentMapDecorator.java (100%)
 rename {jspwiki-war => jspwiki-main}/src/main/java/org/apache/wiki/htmltowiki/WhitespaceTrimWriter.java (100%)
 rename {jspwiki-war => jspwiki-main}/src/main/java/org/apache/wiki/htmltowiki/XHtmlElementToWikiTranslator.java (100%)
 rename {jspwiki-war => jspwiki-main}/src/main/java/org/apache/wiki/htmltowiki/XHtmlToWikiConfig.java (100%)
 rename {jspwiki-war => jspwiki-main}/src/main/java/org/apache/wiki/i18n/InternationalizationManager.java (100%)
 rename {jspwiki-war => jspwiki-main}/src/main/java/org/apache/wiki/management/SimpleMBean.java (100%)
 rename {jspwiki-war => jspwiki-main}/src/main/java/org/apache/wiki/modules/InternalModule.java (100%)
 rename {jspwiki-war => jspwiki-main}/src/main/java/org/apache/wiki/modules/ModuleManager.java (100%)
 rename {jspwiki-war => jspwiki-main}/src/main/java/org/apache/wiki/modules/WikiModuleInfo.java (100%)
 rename {jspwiki-war => jspwiki-main}/src/main/java/org/apache/wiki/package.html (100%)
 rename {jspwiki-war => jspwiki-main}/src/main/java/org/apache/wiki/parser/CreoleToJSPWikiTranslator.java (100%)
 rename {jspwiki-war => jspwiki-main}/src/main/java/org/apache/wiki/parser/Heading.java (100%)
 rename {jspwiki-war => jspwiki-main}/src/main/java/org/apache/wiki/parser/HeadingListener.java (100%)
 rename {jspwiki-war => jspwiki-main}/src/main/java/org/apache/wiki/parser/JSPWikiMarkupParser.java (100%)
 rename {jspwiki-war => jspwiki-main}/src/main/java/org/apache/wiki/parser/LinkParser.java (100%)
 rename {jspwiki-war => jspwiki-main}/src/main/java/org/apache/wiki/parser/LinkParsingOperations.java (100%)
 mode change 100755 => 100644
 rename {jspwiki-war => jspwiki-main}/src/main/java/org/apache/wiki/parser/MarkupParser.java (100%)
 rename {jspwiki-war => jspwiki-main}/src/main/java/org/apache/wiki/parser/ParseException.java (100%)
 rename {jspwiki-war => jspwiki-main}/src/main/java/org/apache/wiki/parser/PluginContent.java (100%)
 rename {jspwiki-war => jspwiki-main}/src/main/java/org/apache/wiki/parser/VariableContent.java (100%)
 rename {jspwiki-war => jspwiki-main}/src/main/java/org/apache/wiki/parser/WikiDocument.java (100%)
 rename {jspwiki-war => jspwiki-main}/src/main/java/org/apache/wiki/plugin/AbstractReferralPlugin.java (100%)
 rename {jspwiki-war => jspwiki-main}/src/main/java/org/apache/wiki/plugin/BugReportHandler.java (100%)
 rename {jspwiki-war => jspwiki-main}/src/main/java/org/apache/wiki/plugin/Counter.java (100%)
 rename {jspwiki-war => jspwiki-main}/src/main/java/org/apache/wiki/plugin/CurrentTimePlugin.java (100%)
 rename {jspwiki-war => jspwiki-main}/src/main/java/org/apache/wiki/plugin/DefaultPluginManager.java (100%)
 rename {jspwiki-war => jspwiki-main}/src/main/java/org/apache/wiki/plugin/Denounce.java (100%)
 rename {jspwiki-war => jspwiki-main}/src/main/java/org/apache/wiki/plugin/Groups.java (100%)
 rename {jspwiki-war => jspwiki-main}/src/main/java/org/apache/wiki/plugin/IfPlugin.java (100%)
 rename {jspwiki-war => jspwiki-main}/src/main/java/org/apache/wiki/plugin/Image.java (100%)
 rename {jspwiki-war => jspwiki-main}/src/main/java/org/apache/wiki/plugin/IndexPlugin.java (89%)
 rename {jspwiki-war => jspwiki-main}/src/main/java/org/apache/wiki/plugin/InsertPage.java (100%)
 rename {jspwiki-war => jspwiki-main}/src/main/java/org/apache/wiki/plugin/ListLocksPlugin.java (100%)
 rename {jspwiki-war => jspwiki-main}/src/main/java/org/apache/wiki/plugin/Note.java (100%)
 rename {jspwiki-war => jspwiki-main}/src/main/java/org/apache/wiki/plugin/PageViewPlugin.java (100%)
 rename {jspwiki-war => jspwiki-main}/src/main/java/org/apache/wiki/plugin/RecentChangesPlugin.java (100%)
 rename {jspwiki-war => jspwiki-main}/src/main/java/org/apache/wiki/plugin/ReferredPagesPlugin.java (100%)
 rename {jspwiki-war => jspwiki-main}/src/main/java/org/apache/wiki/plugin/ReferringPagesPlugin.java (97%)
 rename {jspwiki-war => jspwiki-main}/src/main/java/org/apache/wiki/plugin/ReferringUndefinedPagesPlugin.java (98%)
 rename {jspwiki-war => jspwiki-main}/src/main/java/org/apache/wiki/plugin/SampleAjaxPlugin.java (100%)
 rename {jspwiki-war => jspwiki-main}/src/main/java/org/apache/wiki/plugin/Search.java (100%)
 rename {jspwiki-war => jspwiki-main}/src/main/java/org/apache/wiki/plugin/SessionsPlugin.java (100%)
 rename {jspwiki-war => jspwiki-main}/src/main/java/org/apache/wiki/plugin/TableOfContents.java (100%)
 rename {jspwiki-war => jspwiki-main}/src/main/java/org/apache/wiki/plugin/UndefinedPagesPlugin.java (100%)
 rename {jspwiki-war => jspwiki-main}/src/main/java/org/apache/wiki/plugin/UnusedPagesPlugin.java (100%)
 rename {jspwiki-war => jspwiki-main}/src/main/java/org/apache/wiki/plugin/WeblogArchivePlugin.java (100%)
 rename {jspwiki-war => jspwiki-main}/src/main/java/org/apache/wiki/plugin/WeblogEntryPlugin.java (100%)
 rename {jspwiki-war => jspwiki-main}/src/main/java/org/apache/wiki/plugin/WeblogPlugin.java (98%)
 rename {jspwiki-war => jspwiki-main}/src/main/java/org/apache/wiki/plugin/package.html (100%)
 rename {jspwiki-war => jspwiki-main}/src/main/java/org/apache/wiki/preferences/Preferences.java (100%)
 rename {jspwiki-war => jspwiki-main}/src/main/java/org/apache/wiki/preferences/package.html (100%)
 rename {jspwiki-war => jspwiki-main}/src/main/java/org/apache/wiki/providers/AbstractFileProvider.java (100%)
 rename {jspwiki-war => jspwiki-main}/src/main/java/org/apache/wiki/providers/BasicAttachmentProvider.java (99%)
 rename {jspwiki-war => jspwiki-main}/src/main/java/org/apache/wiki/providers/CachingAttachmentProvider.java (95%)
 rename {jspwiki-war => jspwiki-main}/src/main/java/org/apache/wiki/providers/CachingProvider.java (100%)
 rename {jspwiki-war => jspwiki-main}/src/main/java/org/apache/wiki/providers/FastSearch.java (100%)
 rename {jspwiki-war => jspwiki-main}/src/main/java/org/apache/wiki/providers/FileSystemProvider.java (100%)
 rename {jspwiki-war => jspwiki-main}/src/main/java/org/apache/wiki/providers/NoSuchVersionException.java (100%)
 rename {jspwiki-war => jspwiki-main}/src/main/java/org/apache/wiki/providers/RepositoryModifiedException.java (100%)
 rename {jspwiki-war => jspwiki-main}/src/main/java/org/apache/wiki/providers/VersioningFileProvider.java (100%)
 rename {jspwiki-war => jspwiki-main}/src/main/java/org/apache/wiki/providers/VersioningProvider.java (100%)
 rename {jspwiki-war => jspwiki-main}/src/main/java/org/apache/wiki/providers/WikiAttachmentProvider.java (99%)
 rename {jspwiki-war => jspwiki-main}/src/main/java/org/apache/wiki/providers/WikiPageProvider.java (98%)
 rename {jspwiki-war => jspwiki-main}/src/main/java/org/apache/wiki/providers/package.html (100%)
 rename {jspwiki-war => jspwiki-main}/src/main/java/org/apache/wiki/render/CleanTextRenderer.java (100%)
 rename {jspwiki-war => jspwiki-main}/src/main/java/org/apache/wiki/render/CreoleRenderer.java (100%)
 rename {jspwiki-war => jspwiki-main}/src/main/java/org/apache/wiki/render/CustomXMLOutputProcessor.java (100%)
 rename {jspwiki-war => jspwiki-main}/src/main/java/org/apache/wiki/render/RenderingManager.java (100%)
 rename {jspwiki-war => jspwiki-main}/src/main/java/org/apache/wiki/render/WikiRenderer.java (100%)
 rename {jspwiki-war => jspwiki-main}/src/main/java/org/apache/wiki/render/WysiwygEditingRenderer.java (100%)
 rename {jspwiki-war => jspwiki-main}/src/main/java/org/apache/wiki/render/XHTMLRenderer.java (100%)
 rename {jspwiki-war => jspwiki-main}/src/main/java/org/apache/wiki/rpc/atom/AtomAPIServlet.java (100%)
 rename {jspwiki-war => jspwiki-main}/src/main/java/org/apache/wiki/rss/AtomFeed.java (96%)
 rename {jspwiki-war => jspwiki-main}/src/main/java/org/apache/wiki/rss/Entry.java (100%)
 rename {jspwiki-war => jspwiki-main}/src/main/java/org/apache/wiki/rss/Feed.java (100%)
 rename {jspwiki-war => jspwiki-main}/src/main/java/org/apache/wiki/rss/RSS10Feed.java (100%)
 rename {jspwiki-war => jspwiki-main}/src/main/java/org/apache/wiki/rss/RSS20Feed.java (96%)
 rename {jspwiki-war => jspwiki-main}/src/main/java/org/apache/wiki/rss/RSSGenerator.java (100%)
 rename {jspwiki-war => jspwiki-main}/src/main/java/org/apache/wiki/rss/RSSThread.java (100%)
 rename {jspwiki-war => jspwiki-main}/src/main/java/org/apache/wiki/search/BasicSearchProvider.java (96%)
 rename {jspwiki-war => jspwiki-main}/src/main/java/org/apache/wiki/search/LuceneSearchProvider.java (99%)
 rename {jspwiki-war => jspwiki-main}/src/main/java/org/apache/wiki/search/QueryItem.java (100%)
 rename {jspwiki-war => jspwiki-main}/src/main/java/org/apache/wiki/search/SearchManager.java (98%)
 rename {jspwiki-war => jspwiki-main}/src/main/java/org/apache/wiki/search/SearchMatcher.java (100%)
 rename {jspwiki-war => jspwiki-main}/src/main/java/org/apache/wiki/search/SearchProvider.java (100%)
 rename {jspwiki-war => jspwiki-main}/src/main/java/org/apache/wiki/search/SearchResult.java (100%)
 rename {jspwiki-war => jspwiki-main}/src/main/java/org/apache/wiki/search/SearchResultComparator.java (100%)
 rename {jspwiki-war => jspwiki-main}/src/main/java/org/apache/wiki/search/package.html (100%)
 rename {jspwiki-war => jspwiki-main}/src/main/java/org/apache/wiki/tags/AdminBeanIteratorInfo.java (100%)
 rename {jspwiki-war => jspwiki-main}/src/main/java/org/apache/wiki/tags/AdminBeanIteratorTag.java (100%)
 rename {jspwiki-war => jspwiki-main}/src/main/java/org/apache/wiki/tags/AttachmentsIteratorInfo.java (100%)
 rename {jspwiki-war => jspwiki-main}/src/main/java/org/apache/wiki/tags/AttachmentsIteratorTag.java (98%)
 rename {jspwiki-war => jspwiki-main}/src/main/java/org/apache/wiki/tags/AuthorTag.java (100%)
 rename {jspwiki-war => jspwiki-main}/src/main/java/org/apache/wiki/tags/BaseURLTag.java (100%)
 rename {jspwiki-war => jspwiki-main}/src/main/java/org/apache/wiki/tags/BreadcrumbsTag.java (100%)
 rename {jspwiki-war => jspwiki-main}/src/main/java/org/apache/wiki/tags/CalendarTag.java (100%)
 rename {jspwiki-war => jspwiki-main}/src/main/java/org/apache/wiki/tags/CheckLockInfo.java (100%)
 rename {jspwiki-war => jspwiki-main}/src/main/java/org/apache/wiki/tags/CheckLockTag.java (100%)
 rename {jspwiki-war => jspwiki-main}/src/main/java/org/apache/wiki/tags/CheckRequestContextTag.java (100%)
 rename {jspwiki-war => jspwiki-main}/src/main/java/org/apache/wiki/tags/CheckVersionTag.java (100%)
 rename {jspwiki-war => jspwiki-main}/src/main/java/org/apache/wiki/tags/CommentLinkTag.java (100%)
 rename {jspwiki-war => jspwiki-main}/src/main/java/org/apache/wiki/tags/ContentEncodingTag.java (100%)
 rename {jspwiki-war => jspwiki-main}/src/main/java/org/apache/wiki/tags/ContentTag.java (100%)
 rename {jspwiki-war => jspwiki-main}/src/main/java/org/apache/wiki/tags/CookieTag.java (100%)
 rename {jspwiki-war => jspwiki-main}/src/main/java/org/apache/wiki/tags/DiffLinkTag.java (100%)
 rename {jspwiki-war => jspwiki-main}/src/main/java/org/apache/wiki/tags/EditLinkTag.java (100%)
 rename {jspwiki-war => jspwiki-main}/src/main/java/org/apache/wiki/tags/EditorIteratorInfo.java (100%)
 rename {jspwiki-war => jspwiki-main}/src/main/java/org/apache/wiki/tags/EditorIteratorTag.java (100%)
 rename {jspwiki-war => jspwiki-main}/src/main/java/org/apache/wiki/tags/EditorTag.java (100%)
 rename {jspwiki-war => jspwiki-main}/src/main/java/org/apache/wiki/tags/FeedDiscoveryTag.java (100%)
 rename {jspwiki-war => jspwiki-main}/src/main/java/org/apache/wiki/tags/HasAttachmentsTag.java (100%)
 rename {jspwiki-war => jspwiki-main}/src/main/java/org/apache/wiki/tags/HistoryIteratorInfo.java (100%)
 rename {jspwiki-war => jspwiki-main}/src/main/java/org/apache/wiki/tags/HistoryIteratorTag.java (100%)
 rename {jspwiki-war => jspwiki-main}/src/main/java/org/apache/wiki/tags/IfNoSearchResultsTag.java (100%)
 rename {jspwiki-war => jspwiki-main}/src/main/java/org/apache/wiki/tags/IncludeResourcesTag.java (100%)
 rename {jspwiki-war => jspwiki-main}/src/main/java/org/apache/wiki/tags/IncludeTag.java (100%)
 rename {jspwiki-war => jspwiki-main}/src/main/java/org/apache/wiki/tags/InsertDiffTag.java (100%)
 rename {jspwiki-war => jspwiki-main}/src/main/java/org/apache/wiki/tags/InsertPageTag.java (100%)
 rename {jspwiki-war => jspwiki-main}/src/main/java/org/apache/wiki/tags/IteratorTag.java (100%)
 rename {jspwiki-war => jspwiki-main}/src/main/java/org/apache/wiki/tags/LinkTag.java (100%)
 rename {jspwiki-war => jspwiki-main}/src/main/java/org/apache/wiki/tags/LinkToParentTag.java (100%)
 rename {jspwiki-war => jspwiki-main}/src/main/java/org/apache/wiki/tags/LinkToTag.java (100%)
 rename {jspwiki-war => jspwiki-main}/src/main/java/org/apache/wiki/tags/MessagesTag.java (100%)
 rename {jspwiki-war => jspwiki-main}/src/main/java/org/apache/wiki/tags/NextVersionTag.java (100%)
 rename {jspwiki-war => jspwiki-main}/src/main/java/org/apache/wiki/tags/NoSuchPageTag.java (100%)
 rename {jspwiki-war => jspwiki-main}/src/main/java/org/apache/wiki/tags/PageDateTag.java (100%)
 rename {jspwiki-war => jspwiki-main}/src/main/java/org/apache/wiki/tags/PageExistsTag.java (100%)
 rename {jspwiki-war => jspwiki-main}/src/main/java/org/apache/wiki/tags/PageInfoLinkTag.java (100%)
 rename {jspwiki-war => jspwiki-main}/src/main/java/org/apache/wiki/tags/PageNameTag.java (100%)
 rename {jspwiki-war => jspwiki-main}/src/main/java/org/apache/wiki/tags/PageSizeTag.java (100%)
 rename {jspwiki-war => jspwiki-main}/src/main/java/org/apache/wiki/tags/PageTypeTag.java (100%)
 rename {jspwiki-war => jspwiki-main}/src/main/java/org/apache/wiki/tags/PageVersionTag.java (100%)
 rename {jspwiki-war => jspwiki-main}/src/main/java/org/apache/wiki/tags/ParamHandler.java (100%)
 rename {jspwiki-war => jspwiki-main}/src/main/java/org/apache/wiki/tags/ParamTag.java (100%)
 rename {jspwiki-war => jspwiki-main}/src/main/java/org/apache/wiki/tags/ParentPageNameTag.java (100%)
 rename {jspwiki-war => jspwiki-main}/src/main/java/org/apache/wiki/tags/PermissionTag.java (100%)
 rename {jspwiki-war => jspwiki-main}/src/main/java/org/apache/wiki/tags/PluginTag.java (100%)
 rename {jspwiki-war => jspwiki-main}/src/main/java/org/apache/wiki/tags/PreviousVersionTag.java (100%)
 rename {jspwiki-war => jspwiki-main}/src/main/java/org/apache/wiki/tags/RSSImageLinkTag.java (100%)
 rename {jspwiki-war => jspwiki-main}/src/main/java/org/apache/wiki/tags/RequestResourceTag.java (100%)
 rename {jspwiki-war => jspwiki-main}/src/main/java/org/apache/wiki/tags/SearchResultIteratorInfo.java (100%)
 rename {jspwiki-war => jspwiki-main}/src/main/java/org/apache/wiki/tags/SearchResultIteratorTag.java (100%)
 rename {jspwiki-war => jspwiki-main}/src/main/java/org/apache/wiki/tags/SearchResultsSizeTag.java (100%)
 rename {jspwiki-war => jspwiki-main}/src/main/java/org/apache/wiki/tags/SearchResultsTag.java (100%)
 rename {jspwiki-war => jspwiki-main}/src/main/java/org/apache/wiki/tags/SetPaginationTag.java (100%)
 rename {jspwiki-war => jspwiki-main}/src/main/java/org/apache/wiki/tags/TabTag.java (100%)
 rename {jspwiki-war => jspwiki-main}/src/main/java/org/apache/wiki/tags/TabbedSectionTag.java (100%)
 rename {jspwiki-war => jspwiki-main}/src/main/java/org/apache/wiki/tags/TemplateDirTag.java (100%)
 rename {jspwiki-war => jspwiki-main}/src/main/java/org/apache/wiki/tags/TranslateTag.java (100%)
 rename {jspwiki-war => jspwiki-main}/src/main/java/org/apache/wiki/tags/UploadLinkTag.java (100%)
 rename {jspwiki-war => jspwiki-main}/src/main/java/org/apache/wiki/tags/UserCheckTag.java (100%)
 rename {jspwiki-war => jspwiki-main}/src/main/java/org/apache/wiki/tags/UserNameTag.java (100%)
 rename {jspwiki-war => jspwiki-main}/src/main/java/org/apache/wiki/tags/UserProfileTag.java (100%)
 rename {jspwiki-war => jspwiki-main}/src/main/java/org/apache/wiki/tags/VariableTag.java (100%)
 rename {jspwiki-war => jspwiki-main}/src/main/java/org/apache/wiki/tags/WikiBodyTag.java (100%)
 rename {jspwiki-war => jspwiki-main}/src/main/java/org/apache/wiki/tags/WikiLinkTag.java (100%)
 rename {jspwiki-war => jspwiki-main}/src/main/java/org/apache/wiki/tags/WikiTagBase.java (100%)
 rename {jspwiki-war => jspwiki-main}/src/main/java/org/apache/wiki/tags/package.html (100%)
 rename {jspwiki-war => jspwiki-main}/src/main/java/org/apache/wiki/ui/AbstractCommand.java (100%)
 rename {jspwiki-war => jspwiki-main}/src/main/java/org/apache/wiki/ui/Command.java (100%)
 rename {jspwiki-war => jspwiki-main}/src/main/java/org/apache/wiki/ui/CommandResolver.java (100%)
 rename {jspwiki-war => jspwiki-main}/src/main/java/org/apache/wiki/ui/Editor.java (100%)
 rename {jspwiki-war => jspwiki-main}/src/main/java/org/apache/wiki/ui/EditorManager.java (100%)
 rename {jspwiki-war => jspwiki-main}/src/main/java/org/apache/wiki/ui/GenericHTTPHandler.java (100%)
 rename {jspwiki-war => jspwiki-main}/src/main/java/org/apache/wiki/ui/GroupCommand.java (100%)
 rename {jspwiki-war => jspwiki-main}/src/main/java/org/apache/wiki/ui/InputValidator.java (100%)
 rename {jspwiki-war => jspwiki-main}/src/main/java/org/apache/wiki/ui/Installer.java (100%)
 rename {jspwiki-war => jspwiki-main}/src/main/java/org/apache/wiki/ui/PageCommand.java (100%)
 rename {jspwiki-war => jspwiki-main}/src/main/java/org/apache/wiki/ui/RedirectCommand.java (100%)
 rename {jspwiki-war => jspwiki-main}/src/main/java/org/apache/wiki/ui/TemplateManager.java (100%)
 rename {jspwiki-war => jspwiki-main}/src/main/java/org/apache/wiki/ui/WikiCommand.java (100%)
 rename {jspwiki-war => jspwiki-main}/src/main/java/org/apache/wiki/ui/WikiJSPFilter.java (100%)
 rename {jspwiki-war => jspwiki-main}/src/main/java/org/apache/wiki/ui/WikiRequestWrapper.java (100%)
 rename {jspwiki-war => jspwiki-main}/src/main/java/org/apache/wiki/ui/WikiServletFilter.java (100%)
 rename {jspwiki-war => jspwiki-main}/src/main/java/org/apache/wiki/ui/admin/AdminBean.java (100%)
 rename {jspwiki-war => jspwiki-main}/src/main/java/org/apache/wiki/ui/admin/DefaultAdminBeanManager.java (100%)
 rename {jspwiki-war => jspwiki-main}/src/main/java/org/apache/wiki/ui/admin/SimpleAdminBean.java (100%)
 rename {jspwiki-war => jspwiki-main}/src/main/java/org/apache/wiki/ui/admin/WikiFormAdminBean.java (100%)
 rename {jspwiki-war => jspwiki-main}/src/main/java/org/apache/wiki/ui/admin/beans/CoreBean.java (100%)
 rename {jspwiki-war => jspwiki-main}/src/main/java/org/apache/wiki/ui/admin/beans/FilterBean.java (97%)
 mode change 100755 => 100644
 rename {jspwiki-war => jspwiki-main}/src/main/java/org/apache/wiki/ui/admin/beans/ModuleBean.java (90%)
 mode change 100755 => 100644
 rename {jspwiki-war => jspwiki-main}/src/main/java/org/apache/wiki/ui/admin/beans/PlainEditorAdminBean.java (100%)
 rename {jspwiki-war => jspwiki-main}/src/main/java/org/apache/wiki/ui/admin/beans/PluginBean.java (91%)
 rename {jspwiki-war => jspwiki-main}/src/main/java/org/apache/wiki/ui/admin/beans/SearchManagerBean.java (100%)
 rename {jspwiki-war => jspwiki-main}/src/main/java/org/apache/wiki/ui/admin/beans/UserBean.java (100%)
 rename {jspwiki-war => jspwiki-main}/src/main/java/org/apache/wiki/ui/admin/package.html (100%)
 rename {jspwiki-war => jspwiki-main}/src/main/java/org/apache/wiki/ui/package.html (100%)
 rename {jspwiki-war => jspwiki-main}/src/main/java/org/apache/wiki/ui/progress/ProgressItem.java (100%)
 rename {jspwiki-war => jspwiki-main}/src/main/java/org/apache/wiki/ui/progress/ProgressManager.java (100%)
 rename {jspwiki-war => jspwiki-main}/src/main/java/org/apache/wiki/ui/progress/package.html (100%)
 rename {jspwiki-war => jspwiki-main}/src/main/java/org/apache/wiki/url/DefaultURLConstructor.java (100%)
 rename {jspwiki-war => jspwiki-main}/src/main/java/org/apache/wiki/url/ShortURLConstructor.java (100%)
 rename {jspwiki-war => jspwiki-main}/src/main/java/org/apache/wiki/url/ShortViewURLConstructor.java (100%)
 rename {jspwiki-war => jspwiki-main}/src/main/java/org/apache/wiki/url/URLConstructor.java (100%)
 rename {jspwiki-war => jspwiki-main}/src/main/java/org/apache/wiki/url/package.html (100%)
 rename {jspwiki-war => jspwiki-main}/src/main/java/org/apache/wiki/util/ByteUtils.java (96%)
 rename {jspwiki-war => jspwiki-main}/src/main/java/org/apache/wiki/util/ClassUtil.java (100%)
 rename {jspwiki-war => jspwiki-main}/src/main/java/org/apache/wiki/util/CommentedProperties.java (100%)
 rename {jspwiki-war => jspwiki-main}/src/main/java/org/apache/wiki/util/CryptoUtil.java (100%)
 rename {jspwiki-war => jspwiki-main}/src/main/java/org/apache/wiki/util/FileUtil.java (100%)
 rename {jspwiki-war => jspwiki-main}/src/main/java/org/apache/wiki/util/FormUtil.java (100%)
 rename {jspwiki-war => jspwiki-main}/src/main/java/org/apache/wiki/util/HttpUtil.java (100%)
 rename {jspwiki-war => jspwiki-main}/src/main/java/org/apache/wiki/util/MailUtil.java (100%)
 rename {jspwiki-war => jspwiki-main}/src/main/java/org/apache/wiki/util/PriorityList.java (100%)
 rename {jspwiki-war/src/main/java/org/apache/wiki/htmltowiki => jspwiki-main/src/main/java/org/apache/wiki/util}/PropertiesUtils.java (91%)
 rename {jspwiki-war => jspwiki-main}/src/main/java/org/apache/wiki/util/PropertyReader.java (100%)
 rename {jspwiki-war => jspwiki-main}/src/main/java/org/apache/wiki/util/Serializer.java (100%)
 rename {jspwiki-war => jspwiki-main}/src/main/java/org/apache/wiki/util/TextUtil.java (100%)
 rename {jspwiki-war => jspwiki-main}/src/main/java/org/apache/wiki/util/TimedCounterList.java (100%)
 rename {jspwiki-war => jspwiki-main}/src/main/java/org/apache/wiki/util/XHTML.java (100%)
 rename {jspwiki-war => jspwiki-main}/src/main/java/org/apache/wiki/util/XhtmlUtil.java (97%)
 rename {jspwiki-war => jspwiki-main}/src/main/java/org/apache/wiki/util/XmlUtil.java (97%)
 rename {jspwiki-war => jspwiki-main}/src/main/java/org/apache/wiki/util/comparators/CollatorComparator.java (100%)
 rename {jspwiki-war => jspwiki-main}/src/main/java/org/apache/wiki/util/comparators/HumanComparator.java (100%)
 rename {jspwiki-war => jspwiki-main}/src/main/java/org/apache/wiki/util/comparators/JavaNaturalComparator.java (100%)
 rename {jspwiki-war => jspwiki-main}/src/main/java/org/apache/wiki/util/comparators/LocaleComparator.java (100%)
 rename {jspwiki-war => jspwiki-main}/src/main/java/org/apache/wiki/util/comparators/PageTimeComparator.java (100%)
 rename {jspwiki-war => jspwiki-main}/src/main/java/org/apache/wiki/util/package.html (100%)
 rename {jspwiki-war => jspwiki-main}/src/main/java/org/apache/wiki/workflow/AbstractStep.java (100%)
 rename {jspwiki-war => jspwiki-main}/src/main/java/org/apache/wiki/workflow/Decision.java (100%)
 rename {jspwiki-war => jspwiki-main}/src/main/java/org/apache/wiki/workflow/DecisionQueue.java (100%)
 rename {jspwiki-war => jspwiki-main}/src/main/java/org/apache/wiki/workflow/DecisionRequiredException.java (100%)
 rename {jspwiki-war => jspwiki-main}/src/main/java/org/apache/wiki/workflow/Fact.java (100%)
 rename {jspwiki-war => jspwiki-main}/src/main/java/org/apache/wiki/workflow/NoSuchOutcomeException.java (100%)
 rename {jspwiki-war => jspwiki-main}/src/main/java/org/apache/wiki/workflow/Outcome.java (100%)
 rename {jspwiki-war => jspwiki-main}/src/main/java/org/apache/wiki/workflow/SimpleDecision.java (100%)
 rename {jspwiki-war => jspwiki-main}/src/main/java/org/apache/wiki/workflow/SimpleNotification.java (100%)
 rename {jspwiki-war => jspwiki-main}/src/main/java/org/apache/wiki/workflow/Step.java (100%)
 rename {jspwiki-war => jspwiki-main}/src/main/java/org/apache/wiki/workflow/SystemPrincipal.java (100%)
 rename {jspwiki-war => jspwiki-main}/src/main/java/org/apache/wiki/workflow/Task.java (100%)
 rename {jspwiki-war => jspwiki-main}/src/main/java/org/apache/wiki/workflow/Workflow.java (100%)
 rename {jspwiki-war => jspwiki-main}/src/main/java/org/apache/wiki/workflow/WorkflowBuilder.java (100%)
 rename {jspwiki-war => jspwiki-main}/src/main/java/org/apache/wiki/workflow/WorkflowManager.java (100%)
 rename {jspwiki-war => jspwiki-main}/src/main/java/org/apache/wiki/xmlrpc/AbstractRPCHandler.java (100%)
 rename {jspwiki-war => jspwiki-main}/src/main/java/org/apache/wiki/xmlrpc/MetaWeblogHandler.java (100%)
 rename {jspwiki-war => jspwiki-main}/src/main/java/org/apache/wiki/xmlrpc/RPCHandler.java (100%)
 rename {jspwiki-war => jspwiki-main}/src/main/java/org/apache/wiki/xmlrpc/RPCHandlerUTF8.java (100%)
 rename {jspwiki-war => jspwiki-main}/src/main/java/org/apache/wiki/xmlrpc/RPCServlet.java (100%)
 rename {jspwiki-war => jspwiki-main}/src/main/java/org/apache/wiki/xmlrpc/WikiRPCHandler.java (100%)
 rename {jspwiki-war => jspwiki-main}/src/main/resources/CoreResources.properties (100%)
 rename {jspwiki-war => jspwiki-main}/src/main/resources/CoreResources_de.properties (100%)
 rename {jspwiki-war => jspwiki-main}/src/main/resources/CoreResources_es.properties (100%)
 rename {jspwiki-war => jspwiki-main}/src/main/resources/CoreResources_fi.properties (100%)
 rename {jspwiki-war => jspwiki-main}/src/main/resources/CoreResources_fr.properties (100%)
 rename {jspwiki-war => jspwiki-main}/src/main/resources/CoreResources_it.properties (98%)
 rename {jspwiki-war => jspwiki-main}/src/main/resources/CoreResources_nl.properties (100%)
 rename {jspwiki-war => jspwiki-main}/src/main/resources/CoreResources_pt_BR.properties (98%)
 rename {jspwiki-war => jspwiki-main}/src/main/resources/CoreResources_ru.properties (100%)
 rename {jspwiki-war => jspwiki-main}/src/main/resources/CoreResources_zh_CN.properties (100%)
 rename {jspwiki-war => jspwiki-main}/src/main/resources/ehcache.xml (100%)
 mode change 100755 => 100644
 rename {jspwiki-war => jspwiki-main}/src/main/resources/ini/classmappings.xml (100%)
 rename {jspwiki-war => jspwiki-main}/src/main/resources/ini/jspwiki.properties (100%)
 rename {jspwiki-war => jspwiki-main}/src/main/resources/ini/jspwiki_module.xml (100%)
 rename {jspwiki-war => jspwiki-main}/src/main/resources/org/apache/wiki/filters/profanity.properties (97%)
 rename {jspwiki-war => jspwiki-main}/src/main/resources/org/apache/wiki/plugin/denounce.properties (100%)
 rename {jspwiki-war => jspwiki-main}/src/main/resources/plugin/PluginResources.properties (100%)
 rename {jspwiki-war => jspwiki-main}/src/main/resources/plugin/PluginResources_de.properties (100%)
 rename {jspwiki-war => jspwiki-main}/src/main/resources/plugin/PluginResources_es.properties (100%)
 rename {jspwiki-war => jspwiki-main}/src/main/resources/plugin/PluginResources_fi.properties (100%)
 rename {jspwiki-war => jspwiki-main}/src/main/resources/plugin/PluginResources_fr.properties (100%)
 rename {jspwiki-war => jspwiki-main}/src/main/resources/plugin/PluginResources_it.properties (97%)
 rename {jspwiki-war => jspwiki-main}/src/main/resources/plugin/PluginResources_nl.properties (100%)
 rename {jspwiki-war => jspwiki-main}/src/main/resources/plugin/PluginResources_pt_BR.properties (97%)
 rename {jspwiki-war => jspwiki-main}/src/main/resources/plugin/PluginResources_ru.properties (100%)
 rename {jspwiki-war => jspwiki-main}/src/main/resources/plugin/PluginResources_zh_CN.properties (100%)
 rename {jspwiki-war => jspwiki-main}/src/main/resources/templates/default.properties (100%)
 rename {jspwiki-war => jspwiki-main}/src/main/resources/templates/default_de.properties (100%)
 rename {jspwiki-war => jspwiki-main}/src/main/resources/templates/default_es.properties (100%)
 rename {jspwiki-war => jspwiki-main}/src/main/resources/templates/default_fi.properties (100%)
 rename {jspwiki-war => jspwiki-main}/src/main/resources/templates/default_fr.properties (100%)
 rename {jspwiki-war => jspwiki-main}/src/main/resources/templates/default_it.properties (97%)
 rename {jspwiki-war => jspwiki-main}/src/main/resources/templates/default_nl.properties (100%)
 rename {jspwiki-war => jspwiki-main}/src/main/resources/templates/default_pt_BR.properties (97%)
 rename {jspwiki-war => jspwiki-main}/src/main/resources/templates/default_ru.properties (100%)
 rename {jspwiki-war => jspwiki-main}/src/main/resources/templates/default_zh_CN.properties (100%)
 rename {jspwiki-war => jspwiki-main}/src/test/config/hsql-userdb-setup.ddl (100%)
 rename {jspwiki-war => jspwiki-main}/src/test/config/hsql-userdb-teardown.ddl (100%)
 rename {jspwiki-war => jspwiki-main}/src/test/java/SamplePlugin2.java (100%)
 rename {jspwiki-war => jspwiki-main}/src/test/java/org/apache/wiki/HsqlDbUtils.java (100%)
 rename {jspwiki-war => jspwiki-main}/src/test/java/org/apache/wiki/PageManagerTest.java (100%)
 rename {jspwiki-war => jspwiki-main}/src/test/java/org/apache/wiki/PageSorterTest.java (100%)
 rename {jspwiki-war => jspwiki-main}/src/test/java/org/apache/wiki/PropertyReaderTest.java (100%)
 rename {jspwiki-war => jspwiki-main}/src/test/java/org/apache/wiki/ReferenceManagerTest.java (95%)
 rename {jspwiki-war => jspwiki-main}/src/test/java/org/apache/wiki/ReleaseTest.java (100%)
 rename {jspwiki-war => jspwiki-main}/src/test/java/org/apache/wiki/TestAuthorizer.java (100%)
 rename {jspwiki-war => jspwiki-main}/src/test/java/org/apache/wiki/TestEngine.java (100%)
 rename {jspwiki-war => jspwiki-main}/src/test/java/org/apache/wiki/TestJDBCDataSource.java (100%)
 rename {jspwiki-war => jspwiki-main}/src/test/java/org/apache/wiki/TestJNDIContext.java (100%)
 rename {jspwiki-war => jspwiki-main}/src/test/java/org/apache/wiki/Util.java (100%)
 rename {jspwiki-war => jspwiki-main}/src/test/java/org/apache/wiki/VariableManagerTest.java (100%)
 rename {jspwiki-war => jspwiki-main}/src/test/java/org/apache/wiki/WikiAjaxServletTest.java (100%)
 rename {jspwiki-war => jspwiki-main}/src/test/java/org/apache/wiki/WikiEngineTest.java (98%)
 rename {jspwiki-war => jspwiki-main}/src/test/java/org/apache/wiki/WikiSessionTest.java (100%)
 rename {jspwiki-war => jspwiki-main}/src/test/java/org/apache/wiki/attachment/AttachmentManagerTest.java (99%)
 rename {jspwiki-war => jspwiki-main}/src/test/java/org/apache/wiki/auth/AuthenticationManagerTest.java (100%)
 rename {jspwiki-war => jspwiki-main}/src/test/java/org/apache/wiki/auth/AuthorizationManagerTest.java (100%)
 rename {jspwiki-war => jspwiki-main}/src/test/java/org/apache/wiki/auth/GroupManagerTest.java (100%)
 rename {jspwiki-war => jspwiki-main}/src/test/java/org/apache/wiki/auth/SecurityEventTrap.java (100%)
 rename {jspwiki-war => jspwiki-main}/src/test/java/org/apache/wiki/auth/UserManagerTest.java (100%)
 mode change 100755 => 100644
 rename {jspwiki-war => jspwiki-main}/src/test/java/org/apache/wiki/auth/Users.java (100%)
 rename {jspwiki-war => jspwiki-main}/src/test/java/org/apache/wiki/auth/acl/AclEntryImplTest.java (100%)
 rename {jspwiki-war => jspwiki-main}/src/test/java/org/apache/wiki/auth/acl/AclImplTest.java (100%)
 rename {jspwiki-war => jspwiki-main}/src/test/java/org/apache/wiki/auth/acl/DefaultAclManagerTest.java (100%)
 rename {jspwiki-war => jspwiki-main}/src/test/java/org/apache/wiki/auth/authorize/GroupTest.java (100%)
 rename {jspwiki-war => jspwiki-main}/src/test/java/org/apache/wiki/auth/authorize/JDBCGroupDatabaseTest.java (100%)
 rename {jspwiki-war => jspwiki-main}/src/test/java/org/apache/wiki/auth/authorize/WebContainerAuthorizerTest.java (100%)
 rename {jspwiki-war => jspwiki-main}/src/test/java/org/apache/wiki/auth/authorize/XMLGroupDatabaseTest.java (100%)
 rename {jspwiki-war => jspwiki-main}/src/test/java/org/apache/wiki/auth/login/AnonymousLoginModuleTest.java (100%)
 rename {jspwiki-war => jspwiki-main}/src/test/java/org/apache/wiki/auth/login/CookieAssertionLoginModuleTest.java (100%)
 rename {jspwiki-war => jspwiki-main}/src/test/java/org/apache/wiki/auth/login/UserDatabaseLoginModuleTest.java (100%)
 rename {jspwiki-war => jspwiki-main}/src/test/java/org/apache/wiki/auth/login/WebContainerLoginModuleTest.java (100%)
 rename {jspwiki-war => jspwiki-main}/src/test/java/org/apache/wiki/auth/permissions/AllPermissionCollectionTest.java (100%)
 rename {jspwiki-war => jspwiki-main}/src/test/java/org/apache/wiki/auth/permissions/AllPermissionTest.java (100%)
 rename {jspwiki-war => jspwiki-main}/src/test/java/org/apache/wiki/auth/permissions/GroupPermissionTest.java (100%)
 rename {jspwiki-war => jspwiki-main}/src/test/java/org/apache/wiki/auth/permissions/PagePermissionTest.java (100%)
 rename {jspwiki-war => jspwiki-main}/src/test/java/org/apache/wiki/auth/permissions/WikiPermissionTest.java (100%)
 rename {jspwiki-war => jspwiki-main}/src/test/java/org/apache/wiki/auth/user/JDBCUserDatabaseTest.java (100%)
 rename {jspwiki-war => jspwiki-main}/src/test/java/org/apache/wiki/auth/user/UserProfileTest.java (100%)
 rename {jspwiki-war => jspwiki-main}/src/test/java/org/apache/wiki/auth/user/XMLUserDatabaseTest.java (100%)
 rename {jspwiki-war => jspwiki-main}/src/test/java/org/apache/wiki/content/PageRenamerTest.java (100%)
 rename {jspwiki-war => jspwiki-main}/src/test/java/org/apache/wiki/diff/ContextualDiffProviderTest.java (100%)
 rename {jspwiki-war => jspwiki-main}/src/test/java/org/apache/wiki/filters/DefaultFilterManagerTest.java (100%)
 rename {jspwiki-war => jspwiki-main}/src/test/java/org/apache/wiki/filters/TestFilter.java (100%)
 rename {jspwiki-war => jspwiki-main}/src/test/java/org/apache/wiki/htmltowiki/HtmlStringToWikiTranslatorTest.java (100%)
 rename {jspwiki-war => jspwiki-main}/src/test/java/org/apache/wiki/i18n/InternationalizationManagerTest.java (97%)
 rename {jspwiki-war => jspwiki-main}/src/test/java/org/apache/wiki/parser/CreoleToJSPWikiTranslatorTest.java (100%)
 rename {jspwiki-war => jspwiki-main}/src/test/java/org/apache/wiki/parser/JSPWikiMarkupParserTest.java (100%)
 rename {jspwiki-war => jspwiki-main}/src/test/java/org/apache/wiki/parser/MarkupParserTest.java (100%)
 rename {jspwiki-war => jspwiki-main}/src/test/java/org/apache/wiki/parser/creole.properties (100%)
 rename {jspwiki-war => jspwiki-main}/src/test/java/org/apache/wiki/plugin/CounterPluginTest.java (100%)
 rename {jspwiki-war => jspwiki-main}/src/test/java/org/apache/wiki/plugin/DefaultPluginManagerTest.java (100%)
 rename {jspwiki-war => jspwiki-main}/src/test/java/org/apache/wiki/plugin/GroupsTest.java (100%)
 rename {jspwiki-war => jspwiki-main}/src/test/java/org/apache/wiki/plugin/IfPluginTest.java (100%)
 rename {jspwiki-war => jspwiki-main}/src/test/java/org/apache/wiki/plugin/InsertPageTest.java (100%)
 rename {jspwiki-war => jspwiki-main}/src/test/java/org/apache/wiki/plugin/JavaScriptPlugin.java (100%)
 rename {jspwiki-war => jspwiki-main}/src/test/java/org/apache/wiki/plugin/PageViewPluginTest.java (100%)
 rename {jspwiki-war => jspwiki-main}/src/test/java/org/apache/wiki/plugin/RecentChangesPluginTest.java (100%)
 rename {jspwiki-war => jspwiki-main}/src/test/java/org/apache/wiki/plugin/ReferringPagesPluginTest.java (100%)
 rename {jspwiki-war => jspwiki-main}/src/test/java/org/apache/wiki/plugin/ReferringUndefinedPagesPluginTest.java (100%)
 rename {jspwiki-war => jspwiki-main}/src/test/java/org/apache/wiki/plugin/SamplePlugin.java (100%)
 rename {jspwiki-war => jspwiki-main}/src/test/java/org/apache/wiki/plugin/SamplePlugin3.java (100%)
 rename {jspwiki-war => jspwiki-main}/src/test/java/org/apache/wiki/plugin/TableOfContentsTest.java (100%)
 rename {jspwiki-war => jspwiki-main}/src/test/java/org/apache/wiki/plugin/UndefinedPagesPluginTest.java (100%)
 rename {jspwiki-war => jspwiki-main}/src/test/java/org/apache/wiki/providers/BasicAttachmentProviderTest.java (100%)
 rename {jspwiki-war => jspwiki-main}/src/test/java/org/apache/wiki/providers/CachingProviderTest.java (100%)
 rename {jspwiki-war => jspwiki-main}/src/test/java/org/apache/wiki/providers/CounterProvider.java (100%)
 rename {jspwiki-war => jspwiki-main}/src/test/java/org/apache/wiki/providers/FileSystemProviderTest.java (100%)
 rename {jspwiki-war => jspwiki-main}/src/test/java/org/apache/wiki/providers/VersioningFileProviderTest.java (100%)
 rename {jspwiki-war => jspwiki-main}/src/test/java/org/apache/wiki/providers/VerySimpleProvider.java (100%)
 rename {jspwiki-war => jspwiki-main}/src/test/java/org/apache/wiki/render/CreoleRendererTest.java (100%)
 rename {jspwiki-war => jspwiki-main}/src/test/java/org/apache/wiki/render/RenderingManagerTest.java (100%)
 rename {jspwiki-war => jspwiki-main}/src/test/java/org/apache/wiki/render/WysiwygEditingRendererTest.java (100%)
 rename {jspwiki-war => jspwiki-main}/src/test/java/org/apache/wiki/rss/RSSGeneratorTest.java (85%)
 rename {jspwiki-war => jspwiki-main}/src/test/java/org/apache/wiki/search/SearchManagerTest.java (100%)
 rename {jspwiki-war => jspwiki-main}/src/test/java/org/apache/wiki/stress/Benchmark.java (100%)
 rename {jspwiki-war => jspwiki-main}/src/test/java/org/apache/wiki/stress/MassiveRepositoryTest.java (100%)
 rename {jspwiki-war => jspwiki-main}/src/test/java/org/apache/wiki/stress/StressTestVersioningProvider.java (100%)
 rename {jspwiki-war => jspwiki-main}/src/test/java/org/apache/wiki/ui/CommandResolverTest.java (100%)
 rename {jspwiki-war => jspwiki-main}/src/test/java/org/apache/wiki/ui/GroupCommandTest.java (100%)
 rename {jspwiki-war => jspwiki-main}/src/test/java/org/apache/wiki/ui/InputValidatorTest.java (100%)
 rename {jspwiki-war => jspwiki-main}/src/test/java/org/apache/wiki/ui/PageCommandTest.java (100%)
 rename {jspwiki-war => jspwiki-main}/src/test/java/org/apache/wiki/ui/RedirectCommandTest.java (100%)
 rename {jspwiki-war => jspwiki-main}/src/test/java/org/apache/wiki/ui/WikiCommandTest.java (100%)
 rename {jspwiki-war => jspwiki-main}/src/test/java/org/apache/wiki/ui/admin/beans/FilterBeanTest.java (97%)
 mode change 100755 => 100644
 rename {jspwiki-war => jspwiki-main}/src/test/java/org/apache/wiki/ui/admin/beans/PluginBeanTest.java (97%)
 rename {jspwiki-war => jspwiki-main}/src/test/java/org/apache/wiki/url/DefaultURLConstructorTest.java (100%)
 rename {jspwiki-war => jspwiki-main}/src/test/java/org/apache/wiki/url/ShortURLConstructorTest.java (100%)
 rename {jspwiki-war => jspwiki-main}/src/test/java/org/apache/wiki/url/ShortViewURLConstructorTest.java (100%)
 rename {jspwiki-war => jspwiki-main}/src/test/java/org/apache/wiki/util/ByteUtilsTest.java (100%)
 rename {jspwiki-war => jspwiki-main}/src/test/java/org/apache/wiki/util/ClassUtilTest.java (100%)
 rename {jspwiki-war => jspwiki-main}/src/test/java/org/apache/wiki/util/CommentedPropertiesTest.java (100%)
 rename {jspwiki-war => jspwiki-main}/src/test/java/org/apache/wiki/util/CryptoUtilTest.java (100%)
 rename {jspwiki-war => jspwiki-main}/src/test/java/org/apache/wiki/util/FileUtilTest.java (100%)
 rename {jspwiki-war => jspwiki-main}/src/test/java/org/apache/wiki/util/MailUtilTest.java (100%)
 rename {jspwiki-war => jspwiki-main}/src/test/java/org/apache/wiki/util/PriorityListTest.java (100%)
 rename {jspwiki-war => jspwiki-main}/src/test/java/org/apache/wiki/util/PropertyReaderTest.java (100%)
 rename {jspwiki-war => jspwiki-main}/src/test/java/org/apache/wiki/util/SerializerTest.java (100%)
 rename {jspwiki-war => jspwiki-main}/src/test/java/org/apache/wiki/util/TextUtilTest.java (100%)
 rename {jspwiki-war => jspwiki-main}/src/test/java/org/apache/wiki/util/TimedCounterListTest.java (100%)
 rename {jspwiki-war => jspwiki-main}/src/test/java/org/apache/wiki/util/XmlUtilTest.java (97%)
 rename {jspwiki-war => jspwiki-main}/src/test/java/org/apache/wiki/util/comparators/HumanComparatorTest.java (100%)
 rename {jspwiki-war => jspwiki-main}/src/test/java/org/apache/wiki/web/StreamRedirector.java (100%)
 rename {jspwiki-war => jspwiki-main}/src/test/java/org/apache/wiki/web/TestContainer.java (100%)
 mode change 100755 => 100644
 rename {jspwiki-war => jspwiki-main}/src/test/java/org/apache/wiki/workflow/ApprovalWorkflowTest.java (100%)
 rename {jspwiki-war => jspwiki-main}/src/test/java/org/apache/wiki/workflow/DecisionQueueTest.java (100%)
 rename {jspwiki-war => jspwiki-main}/src/test/java/org/apache/wiki/workflow/FactTest.java (100%)
 rename {jspwiki-war => jspwiki-main}/src/test/java/org/apache/wiki/workflow/OutcomeTest.java (100%)
 rename {jspwiki-war => jspwiki-main}/src/test/java/org/apache/wiki/workflow/SimpleDecisionTest.java (100%)
 rename {jspwiki-war => jspwiki-main}/src/test/java/org/apache/wiki/workflow/TaskTest.java (100%)
 rename {jspwiki-war => jspwiki-main}/src/test/java/org/apache/wiki/workflow/WorkflowManagerTest.java (100%)
 rename {jspwiki-war => jspwiki-main}/src/test/java/org/apache/wiki/workflow/WorkflowTest.java (100%)
 rename {jspwiki-war => jspwiki-main}/src/test/java/org/apache/wiki/xmlrpc/RPCHandlerTest.java (100%)
 rename {jspwiki-war => jspwiki-main}/src/test/resources/TestPlugins.txt (97%)
 rename {jspwiki-war => jspwiki-main}/src/test/resources/TextFormattingRules.txt (97%)
 rename {jspwiki-war => jspwiki-main}/src/test/resources/WEB-INF/web.xml (100%)
 rename {jspwiki-war => jspwiki-main}/src/test/resources/filters.xml (100%)
 rename {jspwiki-war => jspwiki-main}/src/test/resources/groupdatabase.xml (100%)
 rename {jspwiki-war => jspwiki-main}/src/test/resources/ini/jspwiki.properties (100%)
 rename {jspwiki-war => jspwiki-main}/src/test/resources/ini/jspwiki_module.xml (100%)
 rename {jspwiki-war => jspwiki-main}/src/test/resources/jspwiki-custom.properties (100%)
 rename {jspwiki-war => jspwiki-main}/src/test/resources/jspwiki-testUserPolicy.policy (100%)
 mode change 100755 => 100644
 rename {jspwiki-war => jspwiki-main}/src/test/resources/jspwiki-vers-custom.properties (100%)
 rename {jspwiki-war => jspwiki-main}/src/test/resources/jspwiki.policy (100%)
 rename {jspwiki-war => jspwiki-main}/src/test/resources/test.properties (100%)
 rename {jspwiki-war => jspwiki-main}/src/test/resources/userdatabase.xml (100%)

[jspwiki] 10/17: FilterManager and PluginManager return Collection< WikiModuleInfo > instead of Collection for modules(); remove unused imports on DefaultFilterManager

[ju...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

juanpablo pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/jspwiki.git

commit cdef9c1f9736450b68edacee42e6d45aa9f9e063
Author: juanpablo <ju...@apache.org>
AuthorDate: Sun Oct 28 21:15:26 2018 +0100

    FilterManager and PluginManager return Collection< WikiModuleInfo > instead of Collection for modules(); remove unused imports on DefaultFilterManager
---
 .../src/main/java/org/apache/wiki/api/engine/FilterManager.java     | 2 +-
 .../src/main/java/org/apache/wiki/api/engine/PluginManager.java     | 2 +-
 .../src/main/java/org/apache/wiki/filters/DefaultFilterManager.java | 6 +-----
 3 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/jspwiki-main/src/main/java/org/apache/wiki/api/engine/FilterManager.java b/jspwiki-main/src/main/java/org/apache/wiki/api/engine/FilterManager.java
index 894fcb1..a9a825e 100644
--- a/jspwiki-main/src/main/java/org/apache/wiki/api/engine/FilterManager.java
+++ b/jspwiki-main/src/main/java/org/apache/wiki/api/engine/FilterManager.java
@@ -120,7 +120,7 @@ public interface FilterManager
      * 
      * @return A Collection of {@link WikiModuleInfo} instances.
      */
-    Collection modules();
+    Collection< WikiModuleInfo > modules();
     
     /**
      * Returns the {@link WikiModuleInfo} information about the provided filterName.
diff --git a/jspwiki-main/src/main/java/org/apache/wiki/api/engine/PluginManager.java b/jspwiki-main/src/main/java/org/apache/wiki/api/engine/PluginManager.java
index cbc0f9f..7ed71ff 100644
--- a/jspwiki-main/src/main/java/org/apache/wiki/api/engine/PluginManager.java
+++ b/jspwiki-main/src/main/java/org/apache/wiki/api/engine/PluginManager.java
@@ -157,7 +157,7 @@ public interface PluginManager {
      * 
      * @return A Collection of {@link WikiModuleInfo} instances.
      */
-    Collection modules();
+    Collection< WikiModuleInfo > modules();
 
     /**
      * Returns the {@link WikiPluginInfo} information about the provided pluginName.
diff --git a/jspwiki-main/src/main/java/org/apache/wiki/filters/DefaultFilterManager.java b/jspwiki-main/src/main/java/org/apache/wiki/filters/DefaultFilterManager.java
index b3da1d2..8b72442 100644
--- a/jspwiki-main/src/main/java/org/apache/wiki/filters/DefaultFilterManager.java
+++ b/jspwiki-main/src/main/java/org/apache/wiki/filters/DefaultFilterManager.java
@@ -22,15 +22,12 @@ import java.io.File;
 import java.io.FileInputStream;
 import java.io.IOException;
 import java.io.InputStream;
-import java.util.ArrayList;
 import java.util.Collection;
 import java.util.HashMap;
 import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
 import java.util.Properties;
-import java.util.Set;
-import java.util.TreeSet;
 
 import org.apache.commons.io.IOUtils;
 import org.apache.log4j.Logger;
@@ -44,7 +41,6 @@ import org.apache.wiki.event.WikiEventManager;
 import org.apache.wiki.event.WikiPageEvent;
 import org.apache.wiki.modules.ModuleManager;
 import org.apache.wiki.modules.WikiModuleInfo;
-import org.apache.wiki.plugin.DefaultPluginManager.WikiPluginInfo;
 import org.apache.wiki.util.ClassUtil;
 import org.apache.wiki.util.PriorityList;
 import org.apache.wiki.util.XmlUtil;
@@ -407,7 +403,7 @@ public class DefaultFilterManager extends ModuleManager implements FilterManager
      *  {@inheritDoc}
      */
     @Override
-    public Collection modules() {
+    public Collection< WikiModuleInfo > modules() {
         return modules( m_filterClassMap.values().iterator() );
     }
 

[jspwiki] 07/17: move java code from war module to its own module; markdown module included in war by default

[ju...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

juanpablo pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/jspwiki.git

commit ccc61f7ede31a8f9a234ff872f83584695d35fcd
Author: juanpablo <ju...@apache.org>
AuthorDate: Sun Oct 28 21:01:20 2018 +0100

    move java code from war module to its own module; markdown module included in war by default
---
 jspwiki-main/pom.xml                               |  249 ++++
 .../org/apache/wiki/InternalWikiException.java     |    0
 .../main/java/org/apache/wiki/LinkCollector.java   |    0
 .../src/main/java/org/apache/wiki/PageLock.java    |    0
 .../src/main/java/org/apache/wiki/PageManager.java |    0
 .../src/main/java/org/apache/wiki/PageSorter.java  |    0
 .../java/org/apache/wiki/ReferenceManager.java     |    0
 .../src/main/java/org/apache/wiki/Release.java     |    0
 .../java/org/apache/wiki/StringTransmutator.java   |    0
 .../java/org/apache/wiki/TranslationsCheck.java    |    0
 .../main/java/org/apache/wiki/VariableManager.java |    0
 .../src/main/java/org/apache/wiki/WatchDog.java    |    0
 .../src/main/java/org/apache/wiki/Watchable.java   |    0
 .../java/org/apache/wiki/WikiBackgroundThread.java |    0
 .../src/main/java/org/apache/wiki/WikiContext.java |    0
 .../src/main/java/org/apache/wiki/WikiEngine.java  |    0
 .../src/main/java/org/apache/wiki/WikiPage.java    |    0
 .../main/java/org/apache/wiki/WikiProvider.java    |    0
 .../src/main/java/org/apache/wiki/WikiServlet.java |    0
 .../src/main/java/org/apache/wiki/WikiSession.java |    0
 .../main/java/org/apache/wiki/ajax/AjaxUtil.java   |    0
 .../wiki/ajax/WikiAjaxDispatcherServlet.java       |    0
 .../java/org/apache/wiki/ajax/WikiAjaxServlet.java |    0
 .../apache/wiki/api/engine/AdminBeanManager.java   |  124 +-
 .../org/apache/wiki/api/engine/FilterManager.java  |  262 ++--
 .../org/apache/wiki/api/engine/PluginManager.java  |  358 +++---
 .../java/org/apache/wiki/api/engine/package.html   |    0
 .../wiki/api/exceptions/FilterException.java       |    0
 .../exceptions/NoRequiredPropertyException.java    |    0
 .../api/exceptions/NoSuchVariableException.java    |    0
 .../wiki/api/exceptions/PluginException.java       |    0
 .../wiki/api/exceptions/ProviderException.java     |    0
 .../wiki/api/exceptions/RedirectException.java     |    0
 .../apache/wiki/api/exceptions/WikiException.java  |    0
 .../wiki/api/exceptions/WikiI18nException.java     |    0
 .../org/apache/wiki/api/exceptions/package.html    |    0
 .../apache/wiki/api/filters/BasicPageFilter.java   |    0
 .../org/apache/wiki/api/filters/PageFilter.java    |    0
 .../java/org/apache/wiki/api/filters/package.html  |    0
 .../src/main/java/org/apache/wiki/api/package.html |    0
 .../wiki/api/plugin/InitializablePlugin.java       |    0
 .../apache/wiki/api/plugin/ParserStagePlugin.java  |    0
 .../org/apache/wiki/api/plugin/WikiPlugin.java     |    0
 .../java/org/apache/wiki/api/plugin/package.html   |    0
 .../org/apache/wiki/attachment/Attachment.java     |    0
 .../apache/wiki/attachment/AttachmentManager.java  |    0
 .../apache/wiki/attachment/AttachmentServlet.java  |    0
 .../apache/wiki/attachment/DynamicAttachment.java  |    0
 .../wiki/attachment/DynamicAttachmentProvider.java |    0
 .../java/org/apache/wiki/attachment/package.html   |    0
 .../apache/wiki/auth/AuthenticationManager.java    |    0
 .../org/apache/wiki/auth/AuthorizationManager.java |    0
 .../main/java/org/apache/wiki/auth/Authorizer.java |    0
 .../java/org/apache/wiki/auth/GroupPrincipal.java  |    0
 .../apache/wiki/auth/NoSuchPrincipalException.java |    0
 .../org/apache/wiki/auth/PrincipalComparator.java  |    0
 .../org/apache/wiki/auth/SecurityVerifier.java     |    0
 .../java/org/apache/wiki/auth/SessionMonitor.java  |    0
 .../java/org/apache/wiki/auth/UserManager.java     |    0
 .../java/org/apache/wiki/auth/WikiPrincipal.java   |    0
 .../apache/wiki/auth/WikiSecurityException.java    |    0
 .../main/java/org/apache/wiki/auth/acl/Acl.java    |    0
 .../java/org/apache/wiki/auth/acl/AclEntry.java    |    0
 .../org/apache/wiki/auth/acl/AclEntryImpl.java     |    0
 .../java/org/apache/wiki/auth/acl/AclImpl.java     |    0
 .../java/org/apache/wiki/auth/acl/AclManager.java  |    0
 .../apache/wiki/auth/acl/DefaultAclManager.java    |    0
 .../apache/wiki/auth/acl/UnresolvedPrincipal.java  |    0
 .../java/org/apache/wiki/auth/acl/package.html     |    0
 .../java/org/apache/wiki/auth/authorize/Group.java |    0
 .../apache/wiki/auth/authorize/GroupDatabase.java  |    0
 .../apache/wiki/auth/authorize/GroupManager.java   |    0
 .../wiki/auth/authorize/JDBCGroupDatabase.java     |    0
 .../java/org/apache/wiki/auth/authorize/Role.java  |    0
 .../apache/wiki/auth/authorize/WebAuthorizer.java  |    0
 .../auth/authorize/WebContainerAuthorizer.java     |    0
 .../wiki/auth/authorize/XMLGroupDatabase.java      |    0
 .../org/apache/wiki/auth/authorize/package.html    |    0
 .../wiki/auth/login/AbstractLoginModule.java       |    0
 .../wiki/auth/login/AnonymousLoginModule.java      |    0
 .../apache/wiki/auth/login/AuthorizerCallback.java |    0
 .../auth/login/CookieAssertionLoginModule.java     |    0
 .../login/CookieAuthenticationLoginModule.java     |    0
 .../wiki/auth/login/HttpRequestCallback.java       |    0
 .../apache/wiki/auth/login/PrincipalWrapper.java   |    0
 .../wiki/auth/login/UserDatabaseCallback.java      |    0
 .../wiki/auth/login/UserDatabaseLoginModule.java   |    0
 .../auth/login/WebContainerCallbackHandler.java    |    0
 .../wiki/auth/login/WebContainerLoginModule.java   |    0
 .../wiki/auth/login/WikiCallbackHandler.java       |    0
 .../apache/wiki/auth/login/WikiEngineCallback.java |    0
 .../java/org/apache/wiki/auth/login/package.html   |    0
 .../main/java/org/apache/wiki/auth/package.html    |    0
 .../wiki/auth/permissions/AllPermission.java       |    0
 .../auth/permissions/AllPermissionCollection.java  |    0
 .../wiki/auth/permissions/GroupPermission.java     |    0
 .../wiki/auth/permissions/PagePermission.java      |    0
 .../wiki/auth/permissions/PermissionFactory.java   |    0
 .../wiki/auth/permissions/WikiPermission.java      |    0
 .../wiki/auth/user/AbstractUserDatabase.java       |    0
 .../apache/wiki/auth/user/DefaultUserProfile.java  |    0
 .../wiki/auth/user/DuplicateUserException.java     |    0
 .../apache/wiki/auth/user/JDBCUserDatabase.java    |    0
 .../org/apache/wiki/auth/user/UserDatabase.java    |    0
 .../org/apache/wiki/auth/user/UserProfile.java     |    0
 .../org/apache/wiki/auth/user/XMLUserDatabase.java |    0
 .../java/org/apache/wiki/content/PageRenamer.java  |    0
 .../main/java/org/apache/wiki/content/package.html |    0
 .../apache/wiki/diff/ContextualDiffProvider.java   |    0
 .../java/org/apache/wiki/diff/DiffProvider.java    |    0
 .../org/apache/wiki/diff/DifferenceManager.java    |    0
 .../org/apache/wiki/diff/ExternalDiffProvider.java |    0
 .../apache/wiki/diff/TraditionalDiffProvider.java  |    0
 .../org/apache/wiki/event/PageEventFilter.java     |    0
 .../org/apache/wiki/event/WikiEngineEvent.java     |    0
 .../main/java/org/apache/wiki/event/WikiEvent.java |    0
 .../org/apache/wiki/event/WikiEventListener.java   |    0
 .../org/apache/wiki/event/WikiEventManager.java    |    0
 .../java/org/apache/wiki/event/WikiEventUtils.java |    0
 .../java/org/apache/wiki/event/WikiPageEvent.java  |    0
 .../org/apache/wiki/event/WikiPageRenameEvent.java |    0
 .../org/apache/wiki/event/WikiSecurityEvent.java   |    0
 .../java/org/apache/wiki/event/WorkflowEvent.java  |    0
 .../java/org/apache/wiki/filters/CreoleFilter.java |    0
 .../apache/wiki/filters/DefaultFilterManager.java  |    0
 .../apache/wiki/filters/PingWeblogsComFilter.java  |    0
 .../org/apache/wiki/filters/ProfanityFilter.java   |    0
 .../java/org/apache/wiki/filters/SpamFilter.java   |    0
 .../main/java/org/apache/wiki/filters/package.html |    0
 .../main/java/org/apache/wiki/forms/FormClose.java |    0
 .../java/org/apache/wiki/forms/FormElement.java    |    0
 .../java/org/apache/wiki/forms/FormHandler.java    |    0
 .../main/java/org/apache/wiki/forms/FormInfo.java  |    0
 .../main/java/org/apache/wiki/forms/FormInput.java |    0
 .../main/java/org/apache/wiki/forms/FormOpen.java  |    0
 .../java/org/apache/wiki/forms/FormOutput.java     |    0
 .../java/org/apache/wiki/forms/FormSelect.java     |    0
 .../main/java/org/apache/wiki/forms/FormSet.java   |    0
 .../java/org/apache/wiki/forms/FormTextarea.java   |    0
 .../main/java/org/apache/wiki/forms/package.html   |    0
 .../htmltowiki/ForgetNullValuesLinkedHashMap.java  |    0
 .../htmltowiki/HtmlStringToWikiTranslator.java     |    0
 .../wiki/htmltowiki/PersistentMapDecorator.java    |    0
 .../apache/wiki/htmltowiki/PropertiesUtils.java    |    0
 .../wiki/htmltowiki/WhitespaceTrimWriter.java      |    0
 .../htmltowiki/XHtmlElementToWikiTranslator.java   |    0
 .../apache/wiki/htmltowiki/XHtmlToWikiConfig.java  |    0
 .../wiki/i18n/InternationalizationManager.java     |    0
 .../org/apache/wiki/management/SimpleMBean.java    |    0
 .../org/apache/wiki/modules/InternalModule.java    |    0
 .../org/apache/wiki/modules/ModuleManager.java     |    0
 .../org/apache/wiki/modules/WikiModuleInfo.java    |    0
 .../src/main/java/org/apache/wiki/package.html     |    0
 .../wiki/parser/CreoleToJSPWikiTranslator.java     |    0
 .../main/java/org/apache/wiki/parser/Heading.java  |    0
 .../org/apache/wiki/parser/HeadingListener.java    |    0
 .../apache/wiki/parser/JSPWikiMarkupParser.java    |    0
 .../java/org/apache/wiki/parser/LinkParser.java    |    0
 .../apache/wiki/parser/LinkParsingOperations.java  |    0
 .../java/org/apache/wiki/parser/MarkupParser.java  |    0
 .../org/apache/wiki/parser/ParseException.java     |    0
 .../java/org/apache/wiki/parser/PluginContent.java |    0
 .../org/apache/wiki/parser/VariableContent.java    |    0
 .../java/org/apache/wiki/parser/WikiDocument.java  |    0
 .../apache/wiki/plugin/AbstractReferralPlugin.java |    0
 .../org/apache/wiki/plugin/BugReportHandler.java   |    0
 .../main/java/org/apache/wiki/plugin/Counter.java  |    0
 .../org/apache/wiki/plugin/CurrentTimePlugin.java  |    0
 .../apache/wiki/plugin/DefaultPluginManager.java   |    0
 .../main/java/org/apache/wiki/plugin/Denounce.java |    0
 .../main/java/org/apache/wiki/plugin/Groups.java   |    0
 .../main/java/org/apache/wiki/plugin/IfPlugin.java |    0
 .../main/java/org/apache/wiki/plugin/Image.java    |    0
 .../java/org/apache/wiki/plugin/IndexPlugin.java   |    0
 .../java/org/apache/wiki/plugin/InsertPage.java    |    0
 .../org/apache/wiki/plugin/ListLocksPlugin.java    |    0
 .../src/main/java/org/apache/wiki/plugin/Note.java |    0
 .../org/apache/wiki/plugin/PageViewPlugin.java     |    0
 .../apache/wiki/plugin/RecentChangesPlugin.java    |    0
 .../apache/wiki/plugin/ReferredPagesPlugin.java    |    0
 .../apache/wiki/plugin/ReferringPagesPlugin.java   |    0
 .../wiki/plugin/ReferringUndefinedPagesPlugin.java |    0
 .../org/apache/wiki/plugin/SampleAjaxPlugin.java   |    0
 .../main/java/org/apache/wiki/plugin/Search.java   |    0
 .../org/apache/wiki/plugin/SessionsPlugin.java     |    0
 .../org/apache/wiki/plugin/TableOfContents.java    |    0
 .../apache/wiki/plugin/UndefinedPagesPlugin.java   |    0
 .../org/apache/wiki/plugin/UnusedPagesPlugin.java  |    0
 .../apache/wiki/plugin/WeblogArchivePlugin.java    |    0
 .../org/apache/wiki/plugin/WeblogEntryPlugin.java  |    0
 .../java/org/apache/wiki/plugin/WeblogPlugin.java  |    0
 .../main/java/org/apache/wiki/plugin/package.html  |    0
 .../org/apache/wiki/preferences/Preferences.java   |    0
 .../java/org/apache/wiki/preferences/package.html  |    0
 .../wiki/providers/AbstractFileProvider.java       |    0
 .../wiki/providers/BasicAttachmentProvider.java    |    0
 .../wiki/providers/CachingAttachmentProvider.java  |    0
 .../org/apache/wiki/providers/CachingProvider.java |    0
 .../java/org/apache/wiki/providers/FastSearch.java |    0
 .../apache/wiki/providers/FileSystemProvider.java  |    0
 .../wiki/providers/NoSuchVersionException.java     |    0
 .../providers/RepositoryModifiedException.java     |    0
 .../wiki/providers/VersioningFileProvider.java     |    0
 .../apache/wiki/providers/VersioningProvider.java  |    0
 .../wiki/providers/WikiAttachmentProvider.java     |    0
 .../apache/wiki/providers/WikiPageProvider.java    |    0
 .../java/org/apache/wiki/providers/package.html    |    0
 .../org/apache/wiki/render/CleanTextRenderer.java  |    0
 .../org/apache/wiki/render/CreoleRenderer.java     |    0
 .../wiki/render/CustomXMLOutputProcessor.java      |    0
 .../org/apache/wiki/render/RenderingManager.java   |    0
 .../java/org/apache/wiki/render/WikiRenderer.java  |    0
 .../apache/wiki/render/WysiwygEditingRenderer.java |    0
 .../java/org/apache/wiki/render/XHTMLRenderer.java |    0
 .../org/apache/wiki/rpc/atom/AtomAPIServlet.java   |    0
 .../main/java/org/apache/wiki/rss/AtomFeed.java    |    0
 .../src/main/java/org/apache/wiki/rss/Entry.java   |    0
 .../src/main/java/org/apache/wiki/rss/Feed.java    |    0
 .../main/java/org/apache/wiki/rss/RSS10Feed.java   |    0
 .../main/java/org/apache/wiki/rss/RSS20Feed.java   |    0
 .../java/org/apache/wiki/rss/RSSGenerator.java     |    0
 .../main/java/org/apache/wiki/rss/RSSThread.java   |    0
 .../apache/wiki/search/BasicSearchProvider.java    |    0
 .../apache/wiki/search/LuceneSearchProvider.java   |    0
 .../java/org/apache/wiki/search/QueryItem.java     |    0
 .../java/org/apache/wiki/search/SearchManager.java |    0
 .../java/org/apache/wiki/search/SearchMatcher.java |    0
 .../org/apache/wiki/search/SearchProvider.java     |    0
 .../java/org/apache/wiki/search/SearchResult.java  |    0
 .../apache/wiki/search/SearchResultComparator.java |    0
 .../main/java/org/apache/wiki/search/package.html  |    0
 .../apache/wiki/tags/AdminBeanIteratorInfo.java    |    0
 .../org/apache/wiki/tags/AdminBeanIteratorTag.java |    0
 .../apache/wiki/tags/AttachmentsIteratorInfo.java  |    0
 .../apache/wiki/tags/AttachmentsIteratorTag.java   |    0
 .../main/java/org/apache/wiki/tags/AuthorTag.java  |    0
 .../main/java/org/apache/wiki/tags/BaseURLTag.java |    0
 .../java/org/apache/wiki/tags/BreadcrumbsTag.java  |    0
 .../java/org/apache/wiki/tags/CalendarTag.java     |    0
 .../java/org/apache/wiki/tags/CheckLockInfo.java   |    0
 .../java/org/apache/wiki/tags/CheckLockTag.java    |    0
 .../apache/wiki/tags/CheckRequestContextTag.java   |    0
 .../java/org/apache/wiki/tags/CheckVersionTag.java |    0
 .../java/org/apache/wiki/tags/CommentLinkTag.java  |    0
 .../org/apache/wiki/tags/ContentEncodingTag.java   |    0
 .../main/java/org/apache/wiki/tags/ContentTag.java |    0
 .../main/java/org/apache/wiki/tags/CookieTag.java  |    0
 .../java/org/apache/wiki/tags/DiffLinkTag.java     |    0
 .../java/org/apache/wiki/tags/EditLinkTag.java     |    0
 .../org/apache/wiki/tags/EditorIteratorInfo.java   |    0
 .../org/apache/wiki/tags/EditorIteratorTag.java    |    0
 .../main/java/org/apache/wiki/tags/EditorTag.java  |    0
 .../org/apache/wiki/tags/FeedDiscoveryTag.java     |    0
 .../org/apache/wiki/tags/HasAttachmentsTag.java    |    0
 .../org/apache/wiki/tags/HistoryIteratorInfo.java  |    0
 .../org/apache/wiki/tags/HistoryIteratorTag.java   |    0
 .../org/apache/wiki/tags/IfNoSearchResultsTag.java |    0
 .../org/apache/wiki/tags/IncludeResourcesTag.java  |    0
 .../main/java/org/apache/wiki/tags/IncludeTag.java |    0
 .../java/org/apache/wiki/tags/InsertDiffTag.java   |    0
 .../java/org/apache/wiki/tags/InsertPageTag.java   |    0
 .../java/org/apache/wiki/tags/IteratorTag.java     |    0
 .../main/java/org/apache/wiki/tags/LinkTag.java    |    0
 .../java/org/apache/wiki/tags/LinkToParentTag.java |    0
 .../main/java/org/apache/wiki/tags/LinkToTag.java  |    0
 .../java/org/apache/wiki/tags/MessagesTag.java     |    0
 .../java/org/apache/wiki/tags/NextVersionTag.java  |    0
 .../java/org/apache/wiki/tags/NoSuchPageTag.java   |    0
 .../java/org/apache/wiki/tags/PageDateTag.java     |    0
 .../java/org/apache/wiki/tags/PageExistsTag.java   |    0
 .../java/org/apache/wiki/tags/PageInfoLinkTag.java |    0
 .../java/org/apache/wiki/tags/PageNameTag.java     |    0
 .../java/org/apache/wiki/tags/PageSizeTag.java     |    0
 .../java/org/apache/wiki/tags/PageTypeTag.java     |    0
 .../java/org/apache/wiki/tags/PageVersionTag.java  |    0
 .../java/org/apache/wiki/tags/ParamHandler.java    |    0
 .../main/java/org/apache/wiki/tags/ParamTag.java   |    0
 .../org/apache/wiki/tags/ParentPageNameTag.java    |    0
 .../java/org/apache/wiki/tags/PermissionTag.java   |    0
 .../main/java/org/apache/wiki/tags/PluginTag.java  |    0
 .../org/apache/wiki/tags/PreviousVersionTag.java   |    0
 .../java/org/apache/wiki/tags/RSSImageLinkTag.java |    0
 .../org/apache/wiki/tags/RequestResourceTag.java   |    0
 .../apache/wiki/tags/SearchResultIteratorInfo.java |    0
 .../apache/wiki/tags/SearchResultIteratorTag.java  |    0
 .../org/apache/wiki/tags/SearchResultsSizeTag.java |    0
 .../org/apache/wiki/tags/SearchResultsTag.java     |    0
 .../org/apache/wiki/tags/SetPaginationTag.java     |    0
 .../src/main/java/org/apache/wiki/tags/TabTag.java |    0
 .../org/apache/wiki/tags/TabbedSectionTag.java     |    0
 .../java/org/apache/wiki/tags/TemplateDirTag.java  |    0
 .../java/org/apache/wiki/tags/TranslateTag.java    |    0
 .../java/org/apache/wiki/tags/UploadLinkTag.java   |    0
 .../java/org/apache/wiki/tags/UserCheckTag.java    |    0
 .../java/org/apache/wiki/tags/UserNameTag.java     |    0
 .../java/org/apache/wiki/tags/UserProfileTag.java  |    0
 .../java/org/apache/wiki/tags/VariableTag.java     |    0
 .../java/org/apache/wiki/tags/WikiBodyTag.java     |    0
 .../java/org/apache/wiki/tags/WikiLinkTag.java     |    0
 .../java/org/apache/wiki/tags/WikiTagBase.java     |    0
 .../main/java/org/apache/wiki/tags/package.html    |    0
 .../java/org/apache/wiki/ui/AbstractCommand.java   |    0
 .../src/main/java/org/apache/wiki/ui/Command.java  |    0
 .../java/org/apache/wiki/ui/CommandResolver.java   |    0
 .../src/main/java/org/apache/wiki/ui/Editor.java   |    0
 .../java/org/apache/wiki/ui/EditorManager.java     |    0
 .../org/apache/wiki/ui/GenericHTTPHandler.java     |    0
 .../main/java/org/apache/wiki/ui/GroupCommand.java |    0
 .../java/org/apache/wiki/ui/InputValidator.java    |    0
 .../main/java/org/apache/wiki/ui/Installer.java    |    0
 .../main/java/org/apache/wiki/ui/PageCommand.java  |    0
 .../java/org/apache/wiki/ui/RedirectCommand.java   |    0
 .../java/org/apache/wiki/ui/TemplateManager.java   |    0
 .../main/java/org/apache/wiki/ui/WikiCommand.java  |    0
 .../java/org/apache/wiki/ui/WikiJSPFilter.java     |    0
 .../org/apache/wiki/ui/WikiRequestWrapper.java     |    0
 .../java/org/apache/wiki/ui/WikiServletFilter.java |    0
 .../java/org/apache/wiki/ui/admin/AdminBean.java   |    0
 .../wiki/ui/admin/DefaultAdminBeanManager.java     |    0
 .../org/apache/wiki/ui/admin/SimpleAdminBean.java  |    0
 .../apache/wiki/ui/admin/WikiFormAdminBean.java    |    0
 .../org/apache/wiki/ui/admin/beans/CoreBean.java   |    0
 .../org/apache/wiki/ui/admin/beans/FilterBean.java |    0
 .../org/apache/wiki/ui/admin/beans/ModuleBean.java |    0
 .../wiki/ui/admin/beans/PlainEditorAdminBean.java  |    0
 .../org/apache/wiki/ui/admin/beans/PluginBean.java |    0
 .../wiki/ui/admin/beans/SearchManagerBean.java     |    0
 .../org/apache/wiki/ui/admin/beans/UserBean.java   |    0
 .../java/org/apache/wiki/ui/admin/package.html     |    0
 .../src/main/java/org/apache/wiki/ui/package.html  |    0
 .../org/apache/wiki/ui/progress/ProgressItem.java  |    0
 .../apache/wiki/ui/progress/ProgressManager.java   |    0
 .../java/org/apache/wiki/ui/progress/package.html  |    0
 .../org/apache/wiki/url/DefaultURLConstructor.java |    0
 .../org/apache/wiki/url/ShortURLConstructor.java   |    0
 .../apache/wiki/url/ShortViewURLConstructor.java   |    0
 .../java/org/apache/wiki/url/URLConstructor.java   |    0
 .../src/main/java/org/apache/wiki/url/package.html |    0
 .../main/java/org/apache/wiki/util/ByteUtils.java  |  188 +--
 .../main/java/org/apache/wiki/util/ClassUtil.java  |    0
 .../org/apache/wiki/util/CommentedProperties.java  |    0
 .../main/java/org/apache/wiki/util/CryptoUtil.java |    0
 .../main/java/org/apache/wiki/util/FileUtil.java   |    0
 .../main/java/org/apache/wiki/util/FormUtil.java   |    0
 .../main/java/org/apache/wiki/util/HttpUtil.java   |    0
 .../main/java/org/apache/wiki/util/MailUtil.java   |    0
 .../java/org/apache/wiki/util/PriorityList.java    |    0
 .../java/org/apache/wiki/util/PropertyReader.java  |    0
 .../main/java/org/apache/wiki/util/Serializer.java |    0
 .../main/java/org/apache/wiki/util/TextUtil.java   |    0
 .../org/apache/wiki/util/TimedCounterList.java     |    0
 .../src/main/java/org/apache/wiki/util/XHTML.java  |    0
 .../main/java/org/apache/wiki/util/XhtmlUtil.java  |  438 +++----
 .../main/java/org/apache/wiki/util/XmlUtil.java    |  230 ++--
 .../wiki/util/comparators/CollatorComparator.java  |    0
 .../wiki/util/comparators/HumanComparator.java     |    0
 .../util/comparators/JavaNaturalComparator.java    |    0
 .../wiki/util/comparators/LocaleComparator.java    |    0
 .../wiki/util/comparators/PageTimeComparator.java  |    0
 .../main/java/org/apache/wiki/util/package.html    |    0
 .../org/apache/wiki/workflow/AbstractStep.java     |    0
 .../java/org/apache/wiki/workflow/Decision.java    |    0
 .../org/apache/wiki/workflow/DecisionQueue.java    |    0
 .../wiki/workflow/DecisionRequiredException.java   |    0
 .../main/java/org/apache/wiki/workflow/Fact.java   |    0
 .../wiki/workflow/NoSuchOutcomeException.java      |    0
 .../java/org/apache/wiki/workflow/Outcome.java     |    0
 .../org/apache/wiki/workflow/SimpleDecision.java   |    0
 .../apache/wiki/workflow/SimpleNotification.java   |    0
 .../main/java/org/apache/wiki/workflow/Step.java   |    0
 .../org/apache/wiki/workflow/SystemPrincipal.java  |    0
 .../main/java/org/apache/wiki/workflow/Task.java   |    0
 .../java/org/apache/wiki/workflow/Workflow.java    |    0
 .../org/apache/wiki/workflow/WorkflowBuilder.java  |    0
 .../org/apache/wiki/workflow/WorkflowManager.java  |    0
 .../org/apache/wiki/xmlrpc/AbstractRPCHandler.java |    0
 .../org/apache/wiki/xmlrpc/MetaWeblogHandler.java  |    0
 .../java/org/apache/wiki/xmlrpc/RPCHandler.java    |    0
 .../org/apache/wiki/xmlrpc/RPCHandlerUTF8.java     |    0
 .../java/org/apache/wiki/xmlrpc/RPCServlet.java    |    0
 .../org/apache/wiki/xmlrpc/WikiRPCHandler.java     |    0
 .../src/main/resources/CoreResources.properties    |    0
 .../src/main/resources/CoreResources_de.properties |    0
 .../src/main/resources/CoreResources_es.properties |    0
 .../src/main/resources/CoreResources_fi.properties |    0
 .../src/main/resources/CoreResources_fr.properties |    0
 .../src/main/resources/CoreResources_it.properties |  460 +++----
 .../src/main/resources/CoreResources_nl.properties |    0
 .../main/resources/CoreResources_pt_BR.properties  |  458 +++----
 .../src/main/resources/CoreResources_ru.properties |    0
 .../main/resources/CoreResources_zh_CN.properties  |    0
 .../src/main/resources/ehcache.xml                 |    0
 .../src/main/resources/ini/classmappings.xml       |    0
 .../src/main/resources/ini/jspwiki.properties      |    0
 .../src/main/resources/ini/jspwiki_module.xml      |    0
 .../org/apache/wiki/filters/profanity.properties   |   52 +-
 .../org/apache/wiki/plugin/denounce.properties     |    0
 .../resources/plugin/PluginResources.properties    |    0
 .../resources/plugin/PluginResources_de.properties |    0
 .../resources/plugin/PluginResources_es.properties |    0
 .../resources/plugin/PluginResources_fi.properties |    0
 .../resources/plugin/PluginResources_fr.properties |    0
 .../resources/plugin/PluginResources_it.properties |  152 +--
 .../resources/plugin/PluginResources_nl.properties |    0
 .../plugin/PluginResources_pt_BR.properties        |  152 +--
 .../resources/plugin/PluginResources_ru.properties |    0
 .../plugin/PluginResources_zh_CN.properties        |    0
 .../main/resources/templates/default.properties    |    0
 .../main/resources/templates/default_de.properties |    0
 .../main/resources/templates/default_es.properties |    0
 .../main/resources/templates/default_fi.properties |    0
 .../main/resources/templates/default_fr.properties |    0
 .../main/resources/templates/default_it.properties | 1334 ++++++++++----------
 .../main/resources/templates/default_nl.properties |    0
 .../resources/templates/default_pt_BR.properties   |  902 ++++++-------
 .../main/resources/templates/default_ru.properties |    0
 .../resources/templates/default_zh_CN.properties   |    0
 .../src/test/config/hsql-userdb-setup.ddl          |    0
 .../src/test/config/hsql-userdb-teardown.ddl       |    0
 .../src/test/java/SamplePlugin2.java               |    0
 .../src/test/java/org/apache/wiki/HsqlDbUtils.java |    0
 .../test/java/org/apache/wiki/PageManagerTest.java |    0
 .../test/java/org/apache/wiki/PageSorterTest.java  |    0
 .../java/org/apache/wiki/PropertyReaderTest.java   |    0
 .../java/org/apache/wiki/ReferenceManagerTest.java |    0
 .../src/test/java/org/apache/wiki/ReleaseTest.java |    0
 .../test/java/org/apache/wiki/TestAuthorizer.java  |    0
 .../src/test/java/org/apache/wiki/TestEngine.java  |    0
 .../java/org/apache/wiki/TestJDBCDataSource.java   |    0
 .../test/java/org/apache/wiki/TestJNDIContext.java |    0
 .../src/test/java/org/apache/wiki/Util.java        |    0
 .../java/org/apache/wiki/VariableManagerTest.java  |    0
 .../java/org/apache/wiki/WikiAjaxServletTest.java  |    0
 .../test/java/org/apache/wiki/WikiEngineTest.java  |    0
 .../test/java/org/apache/wiki/WikiSessionTest.java |    0
 .../wiki/attachment/AttachmentManagerTest.java     |    0
 .../wiki/auth/AuthenticationManagerTest.java       |    0
 .../apache/wiki/auth/AuthorizationManagerTest.java |    0
 .../org/apache/wiki/auth/GroupManagerTest.java     |    0
 .../org/apache/wiki/auth/SecurityEventTrap.java    |    0
 .../java/org/apache/wiki/auth/UserManagerTest.java |    0
 .../src/test/java/org/apache/wiki/auth/Users.java  |    0
 .../org/apache/wiki/auth/acl/AclEntryImplTest.java |    0
 .../java/org/apache/wiki/auth/acl/AclImplTest.java |    0
 .../wiki/auth/acl/DefaultAclManagerTest.java       |    0
 .../org/apache/wiki/auth/authorize/GroupTest.java  |    0
 .../wiki/auth/authorize/JDBCGroupDatabaseTest.java |    0
 .../auth/authorize/WebContainerAuthorizerTest.java |    0
 .../wiki/auth/authorize/XMLGroupDatabaseTest.java  |    0
 .../wiki/auth/login/AnonymousLoginModuleTest.java  |    0
 .../auth/login/CookieAssertionLoginModuleTest.java |    0
 .../auth/login/UserDatabaseLoginModuleTest.java    |    0
 .../auth/login/WebContainerLoginModuleTest.java    |    0
 .../permissions/AllPermissionCollectionTest.java   |    0
 .../wiki/auth/permissions/AllPermissionTest.java   |    0
 .../wiki/auth/permissions/GroupPermissionTest.java |    0
 .../wiki/auth/permissions/PagePermissionTest.java  |    0
 .../wiki/auth/permissions/WikiPermissionTest.java  |    0
 .../wiki/auth/user/JDBCUserDatabaseTest.java       |    0
 .../org/apache/wiki/auth/user/UserProfileTest.java |    0
 .../apache/wiki/auth/user/XMLUserDatabaseTest.java |    0
 .../org/apache/wiki/content/PageRenamerTest.java   |    0
 .../wiki/diff/ContextualDiffProviderTest.java      |    0
 .../wiki/filters/DefaultFilterManagerTest.java     |    0
 .../java/org/apache/wiki/filters/TestFilter.java   |    0
 .../htmltowiki/HtmlStringToWikiTranslatorTest.java |    0
 .../wiki/i18n/InternationalizationManagerTest.java |  122 +-
 .../wiki/parser/CreoleToJSPWikiTranslatorTest.java |    0
 .../wiki/parser/JSPWikiMarkupParserTest.java       |    0
 .../org/apache/wiki/parser/MarkupParserTest.java   |    0
 .../java/org/apache/wiki/parser/creole.properties  |    0
 .../org/apache/wiki/plugin/CounterPluginTest.java  |    0
 .../wiki/plugin/DefaultPluginManagerTest.java      |    0
 .../java/org/apache/wiki/plugin/GroupsTest.java    |    0
 .../java/org/apache/wiki/plugin/IfPluginTest.java  |    0
 .../org/apache/wiki/plugin/InsertPageTest.java     |    0
 .../org/apache/wiki/plugin/JavaScriptPlugin.java   |    0
 .../org/apache/wiki/plugin/PageViewPluginTest.java |    0
 .../wiki/plugin/RecentChangesPluginTest.java       |    0
 .../wiki/plugin/ReferringPagesPluginTest.java      |    0
 .../plugin/ReferringUndefinedPagesPluginTest.java  |    0
 .../java/org/apache/wiki/plugin/SamplePlugin.java  |    0
 .../java/org/apache/wiki/plugin/SamplePlugin3.java |    0
 .../apache/wiki/plugin/TableOfContentsTest.java    |    0
 .../wiki/plugin/UndefinedPagesPluginTest.java      |    0
 .../providers/BasicAttachmentProviderTest.java     |    0
 .../apache/wiki/providers/CachingProviderTest.java |    0
 .../org/apache/wiki/providers/CounterProvider.java |    0
 .../wiki/providers/FileSystemProviderTest.java     |    0
 .../wiki/providers/VersioningFileProviderTest.java |    0
 .../apache/wiki/providers/VerySimpleProvider.java  |    0
 .../org/apache/wiki/render/CreoleRendererTest.java |    0
 .../apache/wiki/render/RenderingManagerTest.java   |    0
 .../wiki/render/WysiwygEditingRendererTest.java    |    0
 .../java/org/apache/wiki/rss/RSSGeneratorTest.java |    0
 .../org/apache/wiki/search/SearchManagerTest.java  |    0
 .../java/org/apache/wiki/stress/Benchmark.java     |    0
 .../apache/wiki/stress/MassiveRepositoryTest.java  |    0
 .../wiki/stress/StressTestVersioningProvider.java  |    0
 .../org/apache/wiki/ui/CommandResolverTest.java    |    0
 .../java/org/apache/wiki/ui/GroupCommandTest.java  |    0
 .../org/apache/wiki/ui/InputValidatorTest.java     |    0
 .../java/org/apache/wiki/ui/PageCommandTest.java   |    0
 .../org/apache/wiki/ui/RedirectCommandTest.java    |    0
 .../java/org/apache/wiki/ui/WikiCommandTest.java   |    0
 .../apache/wiki/ui/admin/beans/FilterBeanTest.java |  106 +-
 .../apache/wiki/ui/admin/beans/PluginBeanTest.java |  112 +-
 .../apache/wiki/url/DefaultURLConstructorTest.java |    0
 .../apache/wiki/url/ShortURLConstructorTest.java   |    0
 .../wiki/url/ShortViewURLConstructorTest.java      |    0
 .../java/org/apache/wiki/util/ByteUtilsTest.java   |    0
 .../java/org/apache/wiki/util/ClassUtilTest.java   |    0
 .../apache/wiki/util/CommentedPropertiesTest.java  |    0
 .../java/org/apache/wiki/util/CryptoUtilTest.java  |    0
 .../java/org/apache/wiki/util/FileUtilTest.java    |    0
 .../java/org/apache/wiki/util/MailUtilTest.java    |    0
 .../org/apache/wiki/util/PriorityListTest.java     |    0
 .../org/apache/wiki/util/PropertyReaderTest.java   |    0
 .../java/org/apache/wiki/util/SerializerTest.java  |    0
 .../java/org/apache/wiki/util/TextUtilTest.java    |    0
 .../org/apache/wiki/util/TimedCounterListTest.java |    0
 .../java/org/apache/wiki/util/XmlUtilTest.java     |  168 +--
 .../wiki/util/comparators/HumanComparatorTest.java |    0
 .../java/org/apache/wiki/web/StreamRedirector.java |    0
 .../java/org/apache/wiki/web/TestContainer.java    |    0
 .../apache/wiki/workflow/ApprovalWorkflowTest.java |    0
 .../apache/wiki/workflow/DecisionQueueTest.java    |    0
 .../java/org/apache/wiki/workflow/FactTest.java    |    0
 .../java/org/apache/wiki/workflow/OutcomeTest.java |    0
 .../apache/wiki/workflow/SimpleDecisionTest.java   |    0
 .../java/org/apache/wiki/workflow/TaskTest.java    |    0
 .../apache/wiki/workflow/WorkflowManagerTest.java  |    0
 .../org/apache/wiki/workflow/WorkflowTest.java     |    0
 .../org/apache/wiki/xmlrpc/RPCHandlerTest.java     |    0
 .../src/test/resources/TestPlugins.txt             |  366 +++---
 .../src/test/resources/TextFormattingRules.txt     |  286 ++---
 .../src/test/resources/WEB-INF/web.xml             |    0
 .../src/test/resources/filters.xml                 |    0
 .../src/test/resources/groupdatabase.xml           |    0
 .../src/test/resources/ini/jspwiki.properties      |    0
 .../src/test/resources/ini/jspwiki_module.xml      |    0
 .../src/test/resources/jspwiki-custom.properties   |    0
 .../test/resources/jspwiki-testUserPolicy.policy   |    0
 .../test/resources/jspwiki-vers-custom.properties  |    0
 .../src/test/resources/jspwiki.policy              |    0
 .../src/test/resources/test.properties             |    0
 .../src/test/resources/userdatabase.xml            |    0
 jspwiki-markdown/pom.xml                           |    5 +-
 jspwiki-war/pom.xml                                |  234 +---
 pom.xml                                            |    3 +-
 550 files changed, 3394 insertions(+), 3367 deletions(-)

diff --git a/jspwiki-main/pom.xml b/jspwiki-main/pom.xml
new file mode 100644
index 0000000..05df908
--- /dev/null
+++ b/jspwiki-main/pom.xml
@@ -0,0 +1,249 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  Licensed to the Apache Software Foundation (ASF) under one
+  or more contributor license agreements.  See the NOTICE file
+  distributed with this work for additional information
+  regarding copyright ownership.  The ASF licenses this file
+  to you under the Apache License, Version 2.0 (the
+  "License"); you may not use this file except in compliance
+  with the License.  You may obtain a copy of the License at
+
+     http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing,
+  software distributed under the License is distributed on an
+  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+  KIND, either express or implied.  See the License for the
+  specific language governing permissions and limitations
+  under the License.
+-->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+
+  <parent>
+    <groupId>org.apache.jspwiki</groupId>
+    <artifactId>jspwiki-builder</artifactId>
+    <version>2.11.0.M1-SNAPSHOT</version>
+  </parent>
+
+  <modelVersion>4.0.0</modelVersion>
+  <artifactId>jspwiki-main</artifactId>
+  <name>Apache JSPWiki Main Jar</name>
+
+  <dependencies>
+    <dependency>
+      <groupId>xmlrpc</groupId>
+      <artifactId>xmlrpc</artifactId>
+    </dependency>
+
+    <dependency>
+      <groupId>org.apache.lucene</groupId>
+      <artifactId>lucene-queryparser</artifactId>
+    </dependency>
+
+    <dependency>
+      <groupId>org.apache.lucene</groupId>
+      <artifactId>lucene-highlighter</artifactId>
+    </dependency>
+
+    <dependency>
+      <groupId>org.apache.lucene</groupId>
+      <artifactId>lucene-analyzers-common</artifactId>
+    </dependency>
+
+    <dependency>
+      <groupId>javax.servlet</groupId>
+      <artifactId>javax.servlet-api</artifactId>
+      <scope>provided</scope>
+    </dependency>
+
+    <dependency>
+      <groupId>javax.servlet.jsp</groupId>
+      <artifactId>javax.servlet.jsp-api</artifactId>
+      <scope>provided</scope>
+    </dependency>
+
+    <dependency>
+      <groupId>net.sourceforge</groupId>
+      <artifactId>sandler</artifactId>
+    </dependency>
+
+    <dependency>
+      <groupId>net.sf.ehcache</groupId>
+      <artifactId>ehcache</artifactId>
+    </dependency>
+    
+    <dependency>
+      <groupId>oro</groupId>
+      <artifactId>oro</artifactId>
+    </dependency>
+
+    <dependency>
+      <groupId>javax.mail</groupId>
+      <artifactId>mail</artifactId>
+    </dependency>
+
+    <dependency>
+      <groupId>log4j</groupId>
+      <artifactId>log4j</artifactId>
+    </dependency>
+
+    <dependency>
+      <groupId>org.slf4j</groupId>
+      <artifactId>slf4j-log4j12</artifactId>
+    </dependency>
+
+    <dependency>
+      <groupId>com.google.code.gson</groupId>
+      <artifactId>gson</artifactId>
+    </dependency>
+
+    <dependency>
+      <groupId>org.jvnet.hudson</groupId>
+      <artifactId>org.suigeneris.jrcs.diff</artifactId>
+    </dependency>
+
+    <dependency>
+      <groupId>org.jdom</groupId>
+      <artifactId>jdom2</artifactId>
+    </dependency>
+
+    <dependency>
+      <groupId>jaxen</groupId>
+      <artifactId>jaxen</artifactId>
+    </dependency>
+
+    <dependency>
+      <groupId>javax.servlet</groupId>
+      <artifactId>jstl</artifactId>
+    </dependency>
+
+    <dependency>
+      <groupId>org.freshcookies</groupId>
+      <artifactId>freshcookies-security</artifactId>
+    </dependency>
+
+    <dependency>
+      <groupId>commons-lang</groupId>
+      <artifactId>commons-lang</artifactId>
+    </dependency>
+
+    <dependency>
+      <groupId>commons-fileupload</groupId>
+      <artifactId>commons-fileupload</artifactId>
+    </dependency>
+
+    <dependency>
+      <groupId>net.sourceforge</groupId>
+      <artifactId>akismet-java</artifactId>
+    </dependency>
+
+    <dependency>
+      <groupId>commons-httpclient</groupId>
+      <artifactId>commons-httpclient</artifactId>
+    </dependency>
+
+    <dependency>
+      <groupId>commons-io</groupId>
+      <artifactId>commons-io</artifactId>
+    </dependency>
+
+    <dependency>
+      <groupId>net.sourceforge.nekohtml</groupId>
+      <artifactId>nekohtml</artifactId>
+      <scope>runtime</scope>
+    </dependency>
+
+    <dependency>
+      <groupId>net.sourceforge.stripes</groupId>
+      <artifactId>stripes</artifactId>
+      <scope>test</scope>
+    </dependency>
+
+    <dependency>
+      <groupId>org.hsqldb</groupId>
+      <artifactId>hsqldb</artifactId>
+      <scope>test</scope>
+    </dependency>
+
+    <dependency>
+      <groupId>org.hsqldb</groupId>
+      <artifactId>sqltool</artifactId>
+      <scope>test</scope>
+    </dependency>
+
+    <dependency>
+      <groupId>org.eclipse.jetty.aggregate</groupId>
+      <artifactId>jetty-all</artifactId>
+      <scope>test</scope>
+    </dependency>
+
+    <dependency>
+      <groupId>org.junit.jupiter</groupId>
+      <artifactId>junit-jupiter-api</artifactId>
+      <scope>test</scope>
+    </dependency>
+
+    <dependency>
+      <groupId>org.junit.jupiter</groupId>
+      <artifactId>junit-jupiter-params</artifactId>
+      <scope>test</scope>
+    </dependency>
+
+    <dependency>
+      <groupId>org.junit.jupiter</groupId>
+      <artifactId>junit-jupiter-engine</artifactId>
+      <scope>test</scope>
+    </dependency>
+  </dependencies>
+
+  <build>
+    <plugins>
+      <plugin>
+        <artifactId>maven-jar-plugin</artifactId>
+        <executions>
+          <execution>
+            <goals>
+              <goal>test-jar</goal>
+            </goals>
+            <phase>package</phase>
+            <configuration>
+              <excludes>
+                <exclude>**/test*/**</exclude>
+                <exclude>**/*Test.class</exclude>
+                <exclude>**/*Test$*.class</exclude>
+                <exclude>**/*Tests.class</exclude>
+              </excludes>
+              <skipIfEmpty>true</skipIfEmpty>
+            </configuration>
+          </execution>
+        </executions>
+      </plugin>
+
+      <!-- Surefire plugin (running unit tests):
+         http://maven.apache.org/surefire/maven-surefire-plugin/
+
+         Individual tests can be run command line via:
+         mvn clean test -Dtest=WikiEngineTest,AclImplTest,...
+
+         All tests can be skipped via -Dmaven.test.skip
+       -->
+      <plugin>
+        <artifactId>maven-surefire-plugin</artifactId>
+        <configuration>
+          <systemPropertyVariables>
+              <java.io.tmpdir>${project.build.directory}</java.io.tmpdir>
+          </systemPropertyVariables>          
+          <excludes>
+            <!-- time-consuming tests excluded by default -->
+            <exclude>**/StressTestVersioningProvider.java</exclude>
+            <exclude>**/StressTestSpeed.java</exclude>
+            <exclude>**/MassiveRepositoryTest.java</exclude>
+          </excludes>
+          <includes>
+            <include>**/*Test.java</include>
+          </includes>
+        </configuration>
+      </plugin>
+    </plugins>
+  </build>
+</project>
diff --git a/jspwiki-war/src/main/java/org/apache/wiki/InternalWikiException.java b/jspwiki-main/src/main/java/org/apache/wiki/InternalWikiException.java
similarity index 100%
rename from jspwiki-war/src/main/java/org/apache/wiki/InternalWikiException.java
rename to jspwiki-main/src/main/java/org/apache/wiki/InternalWikiException.java
diff --git a/jspwiki-war/src/main/java/org/apache/wiki/LinkCollector.java b/jspwiki-main/src/main/java/org/apache/wiki/LinkCollector.java
similarity index 100%
rename from jspwiki-war/src/main/java/org/apache/wiki/LinkCollector.java
rename to jspwiki-main/src/main/java/org/apache/wiki/LinkCollector.java
diff --git a/jspwiki-war/src/main/java/org/apache/wiki/PageLock.java b/jspwiki-main/src/main/java/org/apache/wiki/PageLock.java
similarity index 100%
rename from jspwiki-war/src/main/java/org/apache/wiki/PageLock.java
rename to jspwiki-main/src/main/java/org/apache/wiki/PageLock.java
diff --git a/jspwiki-war/src/main/java/org/apache/wiki/PageManager.java b/jspwiki-main/src/main/java/org/apache/wiki/PageManager.java
similarity index 100%
rename from jspwiki-war/src/main/java/org/apache/wiki/PageManager.java
rename to jspwiki-main/src/main/java/org/apache/wiki/PageManager.java
diff --git a/jspwiki-war/src/main/java/org/apache/wiki/PageSorter.java b/jspwiki-main/src/main/java/org/apache/wiki/PageSorter.java
similarity index 100%
rename from jspwiki-war/src/main/java/org/apache/wiki/PageSorter.java
rename to jspwiki-main/src/main/java/org/apache/wiki/PageSorter.java
diff --git a/jspwiki-war/src/main/java/org/apache/wiki/ReferenceManager.java b/jspwiki-main/src/main/java/org/apache/wiki/ReferenceManager.java
similarity index 100%
rename from jspwiki-war/src/main/java/org/apache/wiki/ReferenceManager.java
rename to jspwiki-main/src/main/java/org/apache/wiki/ReferenceManager.java
diff --git a/jspwiki-war/src/main/java/org/apache/wiki/Release.java b/jspwiki-main/src/main/java/org/apache/wiki/Release.java
similarity index 100%
rename from jspwiki-war/src/main/java/org/apache/wiki/Release.java
rename to jspwiki-main/src/main/java/org/apache/wiki/Release.java
diff --git a/jspwiki-war/src/main/java/org/apache/wiki/StringTransmutator.java b/jspwiki-main/src/main/java/org/apache/wiki/StringTransmutator.java
similarity index 100%
rename from jspwiki-war/src/main/java/org/apache/wiki/StringTransmutator.java
rename to jspwiki-main/src/main/java/org/apache/wiki/StringTransmutator.java
diff --git a/jspwiki-war/src/main/java/org/apache/wiki/TranslationsCheck.java b/jspwiki-main/src/main/java/org/apache/wiki/TranslationsCheck.java
similarity index 100%
rename from jspwiki-war/src/main/java/org/apache/wiki/TranslationsCheck.java
rename to jspwiki-main/src/main/java/org/apache/wiki/TranslationsCheck.java
diff --git a/jspwiki-war/src/main/java/org/apache/wiki/VariableManager.java b/jspwiki-main/src/main/java/org/apache/wiki/VariableManager.java
similarity index 100%
rename from jspwiki-war/src/main/java/org/apache/wiki/VariableManager.java
rename to jspwiki-main/src/main/java/org/apache/wiki/VariableManager.java
diff --git a/jspwiki-war/src/main/java/org/apache/wiki/WatchDog.java b/jspwiki-main/src/main/java/org/apache/wiki/WatchDog.java
similarity index 100%
rename from jspwiki-war/src/main/java/org/apache/wiki/WatchDog.java
rename to jspwiki-main/src/main/java/org/apache/wiki/WatchDog.java
diff --git a/jspwiki-war/src/main/java/org/apache/wiki/Watchable.java b/jspwiki-main/src/main/java/org/apache/wiki/Watchable.java
similarity index 100%
rename from jspwiki-war/src/main/java/org/apache/wiki/Watchable.java
rename to jspwiki-main/src/main/java/org/apache/wiki/Watchable.java
diff --git a/jspwiki-war/src/main/java/org/apache/wiki/WikiBackgroundThread.java b/jspwiki-main/src/main/java/org/apache/wiki/WikiBackgroundThread.java
similarity index 100%
rename from jspwiki-war/src/main/java/org/apache/wiki/WikiBackgroundThread.java
rename to jspwiki-main/src/main/java/org/apache/wiki/WikiBackgroundThread.java
diff --git a/jspwiki-war/src/main/java/org/apache/wiki/WikiContext.java b/jspwiki-main/src/main/java/org/apache/wiki/WikiContext.java
similarity index 100%
rename from jspwiki-war/src/main/java/org/apache/wiki/WikiContext.java
rename to jspwiki-main/src/main/java/org/apache/wiki/WikiContext.java
diff --git a/jspwiki-war/src/main/java/org/apache/wiki/WikiEngine.java b/jspwiki-main/src/main/java/org/apache/wiki/WikiEngine.java
similarity index 100%
rename from jspwiki-war/src/main/java/org/apache/wiki/WikiEngine.java
rename to jspwiki-main/src/main/java/org/apache/wiki/WikiEngine.java
diff --git a/jspwiki-war/src/main/java/org/apache/wiki/WikiPage.java b/jspwiki-main/src/main/java/org/apache/wiki/WikiPage.java
similarity index 100%
rename from jspwiki-war/src/main/java/org/apache/wiki/WikiPage.java
rename to jspwiki-main/src/main/java/org/apache/wiki/WikiPage.java
diff --git a/jspwiki-war/src/main/java/org/apache/wiki/WikiProvider.java b/jspwiki-main/src/main/java/org/apache/wiki/WikiProvider.java
similarity index 100%
rename from jspwiki-war/src/main/java/org/apache/wiki/WikiProvider.java
rename to jspwiki-main/src/main/java/org/apache/wiki/WikiProvider.java
diff --git a/jspwiki-war/src/main/java/org/apache/wiki/WikiServlet.java b/jspwiki-main/src/main/java/org/apache/wiki/WikiServlet.java
similarity index 100%
rename from jspwiki-war/src/main/java/org/apache/wiki/WikiServlet.java
rename to jspwiki-main/src/main/java/org/apache/wiki/WikiServlet.java
diff --git a/jspwiki-war/src/main/java/org/apache/wiki/WikiSession.java b/jspwiki-main/src/main/java/org/apache/wiki/WikiSession.java
similarity index 100%
rename from jspwiki-war/src/main/java/org/apache/wiki/WikiSession.java
rename to jspwiki-main/src/main/java/org/apache/wiki/WikiSession.java
diff --git a/jspwiki-war/src/main/java/org/apache/wiki/ajax/AjaxUtil.java b/jspwiki-main/src/main/java/org/apache/wiki/ajax/AjaxUtil.java
similarity index 100%
rename from jspwiki-war/src/main/java/org/apache/wiki/ajax/AjaxUtil.java
rename to jspwiki-main/src/main/java/org/apache/wiki/ajax/AjaxUtil.java
diff --git a/jspwiki-war/src/main/java/org/apache/wiki/ajax/WikiAjaxDispatcherServlet.java b/jspwiki-main/src/main/java/org/apache/wiki/ajax/WikiAjaxDispatcherServlet.java
similarity index 100%
rename from jspwiki-war/src/main/java/org/apache/wiki/ajax/WikiAjaxDispatcherServlet.java
rename to jspwiki-main/src/main/java/org/apache/wiki/ajax/WikiAjaxDispatcherServlet.java
diff --git a/jspwiki-war/src/main/java/org/apache/wiki/ajax/WikiAjaxServlet.java b/jspwiki-main/src/main/java/org/apache/wiki/ajax/WikiAjaxServlet.java
similarity index 100%
rename from jspwiki-war/src/main/java/org/apache/wiki/ajax/WikiAjaxServlet.java
rename to jspwiki-main/src/main/java/org/apache/wiki/ajax/WikiAjaxServlet.java
diff --git a/jspwiki-war/src/main/java/org/apache/wiki/api/engine/AdminBeanManager.java b/jspwiki-main/src/main/java/org/apache/wiki/api/engine/AdminBeanManager.java
similarity index 96%
rename from jspwiki-war/src/main/java/org/apache/wiki/api/engine/AdminBeanManager.java
rename to jspwiki-main/src/main/java/org/apache/wiki/api/engine/AdminBeanManager.java
index e76c4c9..3855337 100644
--- a/jspwiki-war/src/main/java/org/apache/wiki/api/engine/AdminBeanManager.java
+++ b/jspwiki-main/src/main/java/org/apache/wiki/api/engine/AdminBeanManager.java
@@ -1,63 +1,63 @@
-/* 
-    Licensed to the Apache Software Foundation (ASF) under one
-    or more contributor license agreements.  See the NOTICE file
-    distributed with this work for additional information
-    regarding copyright ownership.  The ASF licenses this file
-    to you under the Apache License, Version 2.0 (the
-    "License"); you may not use this file except in compliance
-    with the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-    Unless required by applicable law or agreed to in writing,
-    software distributed under the License is distributed on an
-    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-    KIND, either express or implied.  See the License for the
-    specific language governing permissions and limitations
-    under the License.  
- */
-
-package org.apache.wiki.api.engine;
-
-import java.util.List;
-
-import org.apache.wiki.event.WikiEvent;
-import org.apache.wiki.ui.admin.AdminBean;
-
-public interface AdminBeanManager {
-
-	void initialize();
-
-	/**
-	 *  Lists all administration beans which are currently known
-	 *  and instantiated.
-	 *
-	 *  @return all AdminBeans known to the manager
-	 */
-	List<AdminBean> getAllBeans();
-
-	/**
-	 *  Locates a bean based on the AdminBean.getId() out of all
-	 *  the registered beans.
-	 *
-	 *  @param id ID
-	 *  @return An AdminBean, or null, if no such bean is found.
-	 */
-	AdminBean findBean(String id);
-
-	/**
-	 *  Unregisters AdminBeans upon SHUTDOWN event.
-	 *
-	 *  @param event the WikiEvent
-	 */
-	void actionPerformed(WikiEvent event);
-	
-	/**
-     *  Returns the type identifier for a string type.
-     *
-     *  @param type A type string.
-     *  @return A type value.
-     */
-    int getTypeFromString( String type );
-
+/* 
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.  
+ */
+
+package org.apache.wiki.api.engine;
+
+import java.util.List;
+
+import org.apache.wiki.event.WikiEvent;
+import org.apache.wiki.ui.admin.AdminBean;
+
+public interface AdminBeanManager {
+
+	void initialize();
+
+	/**
+	 *  Lists all administration beans which are currently known
+	 *  and instantiated.
+	 *
+	 *  @return all AdminBeans known to the manager
+	 */
+	List<AdminBean> getAllBeans();
+
+	/**
+	 *  Locates a bean based on the AdminBean.getId() out of all
+	 *  the registered beans.
+	 *
+	 *  @param id ID
+	 *  @return An AdminBean, or null, if no such bean is found.
+	 */
+	AdminBean findBean(String id);
+
+	/**
+	 *  Unregisters AdminBeans upon SHUTDOWN event.
+	 *
+	 *  @param event the WikiEvent
+	 */
+	void actionPerformed(WikiEvent event);
+	
+	/**
+     *  Returns the type identifier for a string type.
+     *
+     *  @param type A type string.
+     *  @return A type value.
+     */
+    int getTypeFromString( String type );
+
 }
\ No newline at end of file
diff --git a/jspwiki-war/src/main/java/org/apache/wiki/api/engine/FilterManager.java b/jspwiki-main/src/main/java/org/apache/wiki/api/engine/FilterManager.java
similarity index 97%
rename from jspwiki-war/src/main/java/org/apache/wiki/api/engine/FilterManager.java
rename to jspwiki-main/src/main/java/org/apache/wiki/api/engine/FilterManager.java
index dd3c5cf..894fcb1 100644
--- a/jspwiki-war/src/main/java/org/apache/wiki/api/engine/FilterManager.java
+++ b/jspwiki-main/src/main/java/org/apache/wiki/api/engine/FilterManager.java
@@ -1,131 +1,131 @@
-/*
-    Licensed to the Apache Software Foundation (ASF) under one
-    or more contributor license agreements.  See the NOTICE file
-    distributed with this work for additional information
-    regarding copyright ownership.  The ASF licenses this file
-    to you under the Apache License, Version 2.0 (the
-    "License"); you may not use this file except in compliance
-    with the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-    Unless required by applicable law or agreed to in writing,
-    software distributed under the License is distributed on an
-    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-    KIND, either express or implied.  See the License for the
-    specific language governing permissions and limitations
-    under the License.    
- */
-package org.apache.wiki.api.engine;
-
-import java.util.Collection;
-import java.util.List;
-
-import org.apache.wiki.WikiContext;
-import org.apache.wiki.api.exceptions.FilterException;
-import org.apache.wiki.api.filters.PageFilter;
-import org.apache.wiki.modules.WikiModuleInfo;
-
-public interface FilterManager
-{
-    /** Property name for setting the filter XML property file.  Value is <tt>{@value}</tt>. */
-    String PROP_FILTERXML = "jspwiki.filterConfig";
-    
-    /** Default location for the filter XML property file.  Value is <tt>{@value}</tt>. */
-    String DEFAULT_XMLFILE = "/WEB-INF/filters.xml";
-
-    /** JSPWiki system filters are all below this value. */
-    int SYSTEM_FILTER_PRIORITY = -1000;
-    
-    /** The standard user level filtering. */
-    int USER_FILTER_PRIORITY   = 0;
-    
-    /**
-     *  Adds a page filter to the queue.  The priority defines in which
-     *  order the page filters are run, the highest priority filters go
-     *  in the queue first.
-     *  <p>
-     *  In case two filters have the same priority, their execution order
-     *  is the insertion order.
-     *
-     *  @since 2.1.44.
-     *  @param f PageFilter to add
-     *  @param priority The priority in which position to add it in.
-     *  @throws IllegalArgumentException If the PageFilter is null or invalid.
-     */
-    void addPageFilter( PageFilter f, int priority ) throws IllegalArgumentException;
-    
-    /**
-     *  Does the filtering before a translation.
-     *  
-     *  @param context The WikiContext
-     *  @param pageData WikiMarkup data to be passed through the preTranslate chain.
-     *  @throws FilterException If any of the filters throws a FilterException
-     *  @return The modified WikiMarkup
-     *  
-     *  @see PageFilter#preTranslate(WikiContext, String)
-     */
-    String doPreTranslateFiltering( WikiContext context, String pageData ) throws FilterException;
-    
-    /**
-     *  Does the filtering after HTML translation.
-     *  
-     *  @param context The WikiContext
-     *  @param htmlData HTML data to be passed through the postTranslate
-     *  @throws FilterException If any of the filters throws a FilterException
-     *  @return The modified HTML
-     *  @see PageFilter#postTranslate(WikiContext, String)
-     */
-    String doPostTranslateFiltering( WikiContext context, String htmlData ) throws FilterException;
-    
-    /**
-     *  Does the filtering before a save to the page repository.
-     *  
-     *  @param context The WikiContext
-     *  @param pageData WikiMarkup data to be passed through the preSave chain.
-     *  @throws FilterException If any of the filters throws a FilterException
-     *  @return The modified WikiMarkup
-     *  @see PageFilter#preSave(WikiContext, String)
-     */
-    String doPreSaveFiltering( WikiContext context, String pageData ) throws FilterException;
-    
-    /**
-     *  Does the page filtering after the page has been saved.
-     * 
-     *  @param context The WikiContext
-     *  @param pageData WikiMarkup data to be passed through the postSave chain.
-     *  @throws FilterException If any of the filters throws a FilterException
-     * 
-     *  @see PageFilter#postSave(WikiContext, String)
-     */
-    void doPostSaveFiltering( WikiContext context, String pageData ) throws FilterException;
-    
-    /**
-     *  Returns the list of filters currently installed.  Note that this is not
-     *  a copy, but the actual list.  So be careful with it.
-     *  
-     *  @return A List of PageFilter objects
-     */
-    List< PageFilter > getFilterList();
-    
-    /**
-     * Notifies PageFilters to clean up their ressources.
-     */
-    void destroy();
-    
-    /**
-     * Returns a collection of modules currently managed by this ModuleManager.  Each
-     * entry is an instance of the {@link WikiModuleInfo} class.  This method should return something
-     * which is safe to iterate over, even if the underlying collection changes.
-     * 
-     * @return A Collection of {@link WikiModuleInfo} instances.
-     */
-    Collection modules();
-    
-    /**
-     * Returns the {@link WikiModuleInfo} information about the provided filterName.
-     * @param filterName
-     * @return The WikiModuleInfo
-     */
-    WikiModuleInfo getModuleInfo(String filterName);
-}
+/*
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.    
+ */
+package org.apache.wiki.api.engine;
+
+import java.util.Collection;
+import java.util.List;
+
+import org.apache.wiki.WikiContext;
+import org.apache.wiki.api.exceptions.FilterException;
+import org.apache.wiki.api.filters.PageFilter;
+import org.apache.wiki.modules.WikiModuleInfo;
+
+public interface FilterManager
+{
+    /** Property name for setting the filter XML property file.  Value is <tt>{@value}</tt>. */
+    String PROP_FILTERXML = "jspwiki.filterConfig";
+    
+    /** Default location for the filter XML property file.  Value is <tt>{@value}</tt>. */
+    String DEFAULT_XMLFILE = "/WEB-INF/filters.xml";
+
+    /** JSPWiki system filters are all below this value. */
+    int SYSTEM_FILTER_PRIORITY = -1000;
+    
+    /** The standard user level filtering. */
+    int USER_FILTER_PRIORITY   = 0;
+    
+    /**
+     *  Adds a page filter to the queue.  The priority defines in which
+     *  order the page filters are run, the highest priority filters go
+     *  in the queue first.
+     *  <p>
+     *  In case two filters have the same priority, their execution order
+     *  is the insertion order.
+     *
+     *  @since 2.1.44.
+     *  @param f PageFilter to add
+     *  @param priority The priority in which position to add it in.
+     *  @throws IllegalArgumentException If the PageFilter is null or invalid.
+     */
+    void addPageFilter( PageFilter f, int priority ) throws IllegalArgumentException;
+    
+    /**
+     *  Does the filtering before a translation.
+     *  
+     *  @param context The WikiContext
+     *  @param pageData WikiMarkup data to be passed through the preTranslate chain.
+     *  @throws FilterException If any of the filters throws a FilterException
+     *  @return The modified WikiMarkup
+     *  
+     *  @see PageFilter#preTranslate(WikiContext, String)
+     */
+    String doPreTranslateFiltering( WikiContext context, String pageData ) throws FilterException;
+    
+    /**
+     *  Does the filtering after HTML translation.
+     *  
+     *  @param context The WikiContext
+     *  @param htmlData HTML data to be passed through the postTranslate
+     *  @throws FilterException If any of the filters throws a FilterException
+     *  @return The modified HTML
+     *  @see PageFilter#postTranslate(WikiContext, String)
+     */
+    String doPostTranslateFiltering( WikiContext context, String htmlData ) throws FilterException;
+    
+    /**
+     *  Does the filtering before a save to the page repository.
+     *  
+     *  @param context The WikiContext
+     *  @param pageData WikiMarkup data to be passed through the preSave chain.
+     *  @throws FilterException If any of the filters throws a FilterException
+     *  @return The modified WikiMarkup
+     *  @see PageFilter#preSave(WikiContext, String)
+     */
+    String doPreSaveFiltering( WikiContext context, String pageData ) throws FilterException;
+    
+    /**
+     *  Does the page filtering after the page has been saved.
+     * 
+     *  @param context The WikiContext
+     *  @param pageData WikiMarkup data to be passed through the postSave chain.
+     *  @throws FilterException If any of the filters throws a FilterException
+     * 
+     *  @see PageFilter#postSave(WikiContext, String)
+     */
+    void doPostSaveFiltering( WikiContext context, String pageData ) throws FilterException;
+    
+    /**
+     *  Returns the list of filters currently installed.  Note that this is not
+     *  a copy, but the actual list.  So be careful with it.
+     *  
+     *  @return A List of PageFilter objects
+     */
+    List< PageFilter > getFilterList();
+    
+    /**
+     * Notifies PageFilters to clean up their ressources.
+     */
+    void destroy();
+    
+    /**
+     * Returns a collection of modules currently managed by this ModuleManager.  Each
+     * entry is an instance of the {@link WikiModuleInfo} class.  This method should return something
+     * which is safe to iterate over, even if the underlying collection changes.
+     * 
+     * @return A Collection of {@link WikiModuleInfo} instances.
+     */
+    Collection modules();
+    
+    /**
+     * Returns the {@link WikiModuleInfo} information about the provided filterName.
+     * @param filterName
+     * @return The WikiModuleInfo
+     */
+    WikiModuleInfo getModuleInfo(String filterName);
+}
diff --git a/jspwiki-war/src/main/java/org/apache/wiki/api/engine/PluginManager.java b/jspwiki-main/src/main/java/org/apache/wiki/api/engine/PluginManager.java
similarity index 97%
rename from jspwiki-war/src/main/java/org/apache/wiki/api/engine/PluginManager.java
rename to jspwiki-main/src/main/java/org/apache/wiki/api/engine/PluginManager.java
index 86d7e6b..cbc0f9f 100644
--- a/jspwiki-war/src/main/java/org/apache/wiki/api/engine/PluginManager.java
+++ b/jspwiki-main/src/main/java/org/apache/wiki/api/engine/PluginManager.java
@@ -1,179 +1,179 @@
-/*
-    Licensed to the Apache Software Foundation (ASF) under one
-    or more contributor license agreements.  See the NOTICE file
-    distributed with this work for additional information
-    regarding copyright ownership.  The ASF licenses this file
-    to you under the Apache License, Version 2.0 (the
-    "License"); you may not use this file except in compliance
-    with the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-    Unless required by applicable law or agreed to in writing,
-    software distributed under the License is distributed on an
-    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-    KIND, either express or implied.  See the License for the
-    specific language governing permissions and limitations
-    under the License.    
- */
-package org.apache.wiki.api.engine;
-
-import java.io.IOException;
-import java.util.Collection;
-import java.util.Map;
-import java.util.ResourceBundle;
-
-import org.apache.oro.text.regex.Pattern;
-import org.apache.wiki.WikiContext;
-import org.apache.wiki.api.exceptions.PluginException;
-import org.apache.wiki.api.plugin.WikiPlugin;
-import org.apache.wiki.modules.WikiModuleInfo;
-import org.apache.wiki.plugin.DefaultPluginManager.WikiPluginInfo;
-
-
-public interface PluginManager {
-
-    /** The property name defining which packages will be searched for plugin classes. */
-    String PROP_SEARCHPATH = "jspwiki.plugin.searchPath";
-
-    /** The property name defining which external jars will be added to the classpath when searching for plugin classes. */
-    String PROP_EXTERNALJARS = "jspwiki.plugin.externalJars";
-
-    /** This is the default package to try in case the instantiation fails. */
-    String DEFAULT_PACKAGE = "org.apache.wiki.plugin";
-
-    /**
-     *  The name of the body content.  Current value is "_body".
-     */
-    String PARAM_BODY      = "_body";
-
-    /** The name of the command line content parameter. The value is "_cmdline". */
-    String PARAM_CMDLINE   = "_cmdline";
-
-    /**
-     *  The name of the parameter containing the start and end positions in the
-     *  read stream of the plugin text (stored as a two-element int[], start
-     *  and end resp.).
-     */
-    String PARAM_BOUNDS    = "_bounds";
-
-    /** A special name to be used in case you want to see debug output */
-    String PARAM_DEBUG     = "debug";
-
-    /**
-     * Enables or disables plugin execution.
-     * 
-     * @param enabled True, if plugins should be globally enabled; false, if disabled.
-     */
-    void enablePlugins( boolean enabled );
-
-    /**
-     * Returns plugin execution status. If false, plugins are not
-     * executed when they are encountered on a WikiPage, and an
-     * empty string is returned in their place.
-     * 
-     * @return True, if plugins are enabled; false otherwise.
-     */
-    boolean pluginsEnabled();
-    
-    /**
-     * Returns plugin insert pattern.
-     * 
-     * @return plugin insert pattern.
-     */
-    Pattern getPluginPattern();
-    
-    /**
-     * Returns plugins' search path.
-     * 
-     * @return plugins' search path.
-     */
-    String getPluginSearchPath();
-
-    /**
-     *  Executes a plugin class in the given context.
-     *  <P>Used to be private, but is public since 1.9.21.
-     *
-     *  @param context The current WikiContext.
-     *  @param classname The name of the class.  Can also be a
-     *  shortened version without the package name, since the class name is searched from the
-     *  package search path.
-     *
-     *  @param params A parsed map of key-value pairs.
-     *
-     *  @return Whatever the plugin returns.
-     *
-     *  @throws PluginException If the plugin execution failed for
-     *  some reason.
-     *
-     *  @since 2.0
-     */
-    String execute( WikiContext context, String classname, Map< String, String > params ) throws PluginException;
-
-    /**
-     *  Parses plugin arguments.  Handles quotes and all other kewl stuff.
-     *
-     *  <h3>Special parameters</h3>
-     *  The plugin body is put into a special parameter defined by {@link #PARAM_BODY};
-     *  the plugin's command line into a parameter defined by {@link #PARAM_CMDLINE};
-     *  and the bounds of the plugin within the wiki page text by a parameter defined
-     *  by {@link #PARAM_BOUNDS}, whose value is stored as a two-element int[] array,
-     *  i.e., <tt>[start,end]</tt>.
-     *
-     * @param argstring The argument string to the plugin.  This is
-     *  typically a list of key-value pairs, using "'" to escape
-     *  spaces in strings, followed by an empty line and then the
-     *  plugin body.  In case the parameter is null, will return an
-     *  empty parameter list.
-     *
-     * @return A parsed list of parameters.
-     *
-     * @throws IOException If the parsing fails.
-     */
-    Map< String, String > parseArgs( String argstring ) throws IOException;
-
-    /**
-     *  Parses a plugin.  Plugin commands are of the form:
-     *  [{INSERT myplugin WHERE param1=value1, param2=value2}]
-     *  myplugin may either be a class name or a plugin alias.
-     *  <P>
-     *  This is the main entry point that is used.
-     *
-     *  @param context The current WikiContext.
-     *  @param commandline The full command line, including plugin
-     *  name, parameters and body.
-     *
-     *  @return HTML as returned by the plugin, or possibly an error
-     *  message.
-     *  
-     *  @throws PluginException From the plugin itself, it propagates, waah!
-     */
-    String execute( WikiContext context, String commandline ) throws PluginException;
-
-    /**
-     * Returns a collection of modules currently managed by this ModuleManager.  Each
-     * entry is an instance of the {@link WikiModuleInfo} class.  This method should return something
-     * which is safe to iterate over, even if the underlying collection changes.
-     * 
-     * @return A Collection of {@link WikiModuleInfo} instances.
-     */
-    Collection modules();
-
-    /**
-     * Returns the {@link WikiPluginInfo} information about the provided pluginName.
-     * @param pluginName
-     * @return The wikiPluginInfo
-     */
-    WikiPluginInfo getModuleInfo(String pluginName);
-    
-    /**
-     * Creates a {@link WikiPlugin}.
-     * 
-     * @param pluginName plugin's classname
-     * @param rb {@link ResourceBundle} with i18ned text for exceptions.
-     * @return a {@link WikiPlugin}.
-     * @throws PluginException if there is a problem building the {@link WikiPlugin}.
-     */
-    WikiPlugin newWikiPlugin( String pluginName, ResourceBundle rb ) throws PluginException;
-    
-}
+/*
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.    
+ */
+package org.apache.wiki.api.engine;
+
+import java.io.IOException;
+import java.util.Collection;
+import java.util.Map;
+import java.util.ResourceBundle;
+
+import org.apache.oro.text.regex.Pattern;
+import org.apache.wiki.WikiContext;
+import org.apache.wiki.api.exceptions.PluginException;
+import org.apache.wiki.api.plugin.WikiPlugin;
+import org.apache.wiki.modules.WikiModuleInfo;
+import org.apache.wiki.plugin.DefaultPluginManager.WikiPluginInfo;
+
+
+public interface PluginManager {
+
+    /** The property name defining which packages will be searched for plugin classes. */
+    String PROP_SEARCHPATH = "jspwiki.plugin.searchPath";
+
+    /** The property name defining which external jars will be added to the classpath when searching for plugin classes. */
+    String PROP_EXTERNALJARS = "jspwiki.plugin.externalJars";
+
+    /** This is the default package to try in case the instantiation fails. */
+    String DEFAULT_PACKAGE = "org.apache.wiki.plugin";
+
+    /**
+     *  The name of the body content.  Current value is "_body".
+     */
+    String PARAM_BODY      = "_body";
+
+    /** The name of the command line content parameter. The value is "_cmdline". */
+    String PARAM_CMDLINE   = "_cmdline";
+
+    /**
+     *  The name of the parameter containing the start and end positions in the
+     *  read stream of the plugin text (stored as a two-element int[], start
+     *  and end resp.).
+     */
+    String PARAM_BOUNDS    = "_bounds";
+
+    /** A special name to be used in case you want to see debug output */
+    String PARAM_DEBUG     = "debug";
+
+    /**
+     * Enables or disables plugin execution.
+     * 
+     * @param enabled True, if plugins should be globally enabled; false, if disabled.
+     */
+    void enablePlugins( boolean enabled );
+
+    /**
+     * Returns plugin execution status. If false, plugins are not
+     * executed when they are encountered on a WikiPage, and an
+     * empty string is returned in their place.
+     * 
+     * @return True, if plugins are enabled; false otherwise.
+     */
+    boolean pluginsEnabled();
+    
+    /**
+     * Returns plugin insert pattern.
+     * 
+     * @return plugin insert pattern.
+     */
+    Pattern getPluginPattern();
+    
+    /**
+     * Returns plugins' search path.
+     * 
+     * @return plugins' search path.
+     */
+    String getPluginSearchPath();
+
+    /**
+     *  Executes a plugin class in the given context.
+     *  <P>Used to be private, but is public since 1.9.21.
+     *
+     *  @param context The current WikiContext.
+     *  @param classname The name of the class.  Can also be a
+     *  shortened version without the package name, since the class name is searched from the
+     *  package search path.
+     *
+     *  @param params A parsed map of key-value pairs.
+     *
+     *  @return Whatever the plugin returns.
+     *
+     *  @throws PluginException If the plugin execution failed for
+     *  some reason.
+     *
+     *  @since 2.0
+     */
+    String execute( WikiContext context, String classname, Map< String, String > params ) throws PluginException;
+
+    /**
+     *  Parses plugin arguments.  Handles quotes and all other kewl stuff.
+     *
+     *  <h3>Special parameters</h3>
+     *  The plugin body is put into a special parameter defined by {@link #PARAM_BODY};
+     *  the plugin's command line into a parameter defined by {@link #PARAM_CMDLINE};
+     *  and the bounds of the plugin within the wiki page text by a parameter defined
+     *  by {@link #PARAM_BOUNDS}, whose value is stored as a two-element int[] array,
+     *  i.e., <tt>[start,end]</tt>.
+     *
+     * @param argstring The argument string to the plugin.  This is
+     *  typically a list of key-value pairs, using "'" to escape
+     *  spaces in strings, followed by an empty line and then the
+     *  plugin body.  In case the parameter is null, will return an
+     *  empty parameter list.
+     *
+     * @return A parsed list of parameters.
+     *
+     * @throws IOException If the parsing fails.
+     */
+    Map< String, String > parseArgs( String argstring ) throws IOException;
+
+    /**
+     *  Parses a plugin.  Plugin commands are of the form:
+     *  [{INSERT myplugin WHERE param1=value1, param2=value2}]
+     *  myplugin may either be a class name or a plugin alias.
+     *  <P>
+     *  This is the main entry point that is used.
+     *
+     *  @param context The current WikiContext.
+     *  @param commandline The full command line, including plugin
+     *  name, parameters and body.
+     *
+     *  @return HTML as returned by the plugin, or possibly an error
+     *  message.
+     *  
+     *  @throws PluginException From the plugin itself, it propagates, waah!
+     */
+    String execute( WikiContext context, String commandline ) throws PluginException;
+
+    /**
+     * Returns a collection of modules currently managed by this ModuleManager.  Each
+     * entry is an instance of the {@link WikiModuleInfo} class.  This method should return something
+     * which is safe to iterate over, even if the underlying collection changes.
+     * 
+     * @return A Collection of {@link WikiModuleInfo} instances.
+     */
+    Collection modules();
+
+    /**
+     * Returns the {@link WikiPluginInfo} information about the provided pluginName.
+     * @param pluginName
+     * @return The wikiPluginInfo
+     */
+    WikiPluginInfo getModuleInfo(String pluginName);
+    
+    /**
+     * Creates a {@link WikiPlugin}.
+     * 
+     * @param pluginName plugin's classname
+     * @param rb {@link ResourceBundle} with i18ned text for exceptions.
+     * @return a {@link WikiPlugin}.
+     * @throws PluginException if there is a problem building the {@link WikiPlugin}.
+     */
+    WikiPlugin newWikiPlugin( String pluginName, ResourceBundle rb ) throws PluginException;
+    
+}
diff --git a/jspwiki-war/src/main/java/org/apache/wiki/api/engine/package.html b/jspwiki-main/src/main/java/org/apache/wiki/api/engine/package.html
similarity index 100%
rename from jspwiki-war/src/main/java/org/apache/wiki/api/engine/package.html
rename to jspwiki-main/src/main/java/org/apache/wiki/api/engine/package.html
diff --git a/jspwiki-war/src/main/java/org/apache/wiki/api/exceptions/FilterException.java b/jspwiki-main/src/main/java/org/apache/wiki/api/exceptions/FilterException.java
similarity index 100%
rename from jspwiki-war/src/main/java/org/apache/wiki/api/exceptions/FilterException.java
rename to jspwiki-main/src/main/java/org/apache/wiki/api/exceptions/FilterException.java
diff --git a/jspwiki-war/src/main/java/org/apache/wiki/api/exceptions/NoRequiredPropertyException.java b/jspwiki-main/src/main/java/org/apache/wiki/api/exceptions/NoRequiredPropertyException.java
similarity index 100%
rename from jspwiki-war/src/main/java/org/apache/wiki/api/exceptions/NoRequiredPropertyException.java
rename to jspwiki-main/src/main/java/org/apache/wiki/api/exceptions/NoRequiredPropertyException.java
diff --git a/jspwiki-war/src/main/java/org/apache/wiki/api/exceptions/NoSuchVariableException.java b/jspwiki-main/src/main/java/org/apache/wiki/api/exceptions/NoSuchVariableException.java
similarity index 100%
rename from jspwiki-war/src/main/java/org/apache/wiki/api/exceptions/NoSuchVariableException.java
rename to jspwiki-main/src/main/java/org/apache/wiki/api/exceptions/NoSuchVariableException.java
diff --git a/jspwiki-war/src/main/java/org/apache/wiki/api/exceptions/PluginException.java b/jspwiki-main/src/main/java/org/apache/wiki/api/exceptions/PluginException.java
similarity index 100%
rename from jspwiki-war/src/main/java/org/apache/wiki/api/exceptions/PluginException.java
rename to jspwiki-main/src/main/java/org/apache/wiki/api/exceptions/PluginException.java
diff --git a/jspwiki-war/src/main/java/org/apache/wiki/api/exceptions/ProviderException.java b/jspwiki-main/src/main/java/org/apache/wiki/api/exceptions/ProviderException.java
similarity index 100%
rename from jspwiki-war/src/main/java/org/apache/wiki/api/exceptions/ProviderException.java
rename to jspwiki-main/src/main/java/org/apache/wiki/api/exceptions/ProviderException.java
diff --git a/jspwiki-war/src/main/java/org/apache/wiki/api/exceptions/RedirectException.java b/jspwiki-main/src/main/java/org/apache/wiki/api/exceptions/RedirectException.java
similarity index 100%
rename from jspwiki-war/src/main/java/org/apache/wiki/api/exceptions/RedirectException.java
rename to jspwiki-main/src/main/java/org/apache/wiki/api/exceptions/RedirectException.java
diff --git a/jspwiki-war/src/main/java/org/apache/wiki/api/exceptions/WikiException.java b/jspwiki-main/src/main/java/org/apache/wiki/api/exceptions/WikiException.java
similarity index 100%
rename from jspwiki-war/src/main/java/org/apache/wiki/api/exceptions/WikiException.java
rename to jspwiki-main/src/main/java/org/apache/wiki/api/exceptions/WikiException.java
diff --git a/jspwiki-war/src/main/java/org/apache/wiki/api/exceptions/WikiI18nException.java b/jspwiki-main/src/main/java/org/apache/wiki/api/exceptions/WikiI18nException.java
similarity index 100%
rename from jspwiki-war/src/main/java/org/apache/wiki/api/exceptions/WikiI18nException.java
rename to jspwiki-main/src/main/java/org/apache/wiki/api/exceptions/WikiI18nException.java
diff --git a/jspwiki-war/src/main/java/org/apache/wiki/api/exceptions/package.html b/jspwiki-main/src/main/java/org/apache/wiki/api/exceptions/package.html
similarity index 100%
rename from jspwiki-war/src/main/java/org/apache/wiki/api/exceptions/package.html
rename to jspwiki-main/src/main/java/org/apache/wiki/api/exceptions/package.html
diff --git a/jspwiki-war/src/main/java/org/apache/wiki/api/filters/BasicPageFilter.java b/jspwiki-main/src/main/java/org/apache/wiki/api/filters/BasicPageFilter.java
similarity index 100%
rename from jspwiki-war/src/main/java/org/apache/wiki/api/filters/BasicPageFilter.java
rename to jspwiki-main/src/main/java/org/apache/wiki/api/filters/BasicPageFilter.java
diff --git a/jspwiki-war/src/main/java/org/apache/wiki/api/filters/PageFilter.java b/jspwiki-main/src/main/java/org/apache/wiki/api/filters/PageFilter.java
similarity index 100%
rename from jspwiki-war/src/main/java/org/apache/wiki/api/filters/PageFilter.java
rename to jspwiki-main/src/main/java/org/apache/wiki/api/filters/PageFilter.java
diff --git a/jspwiki-war/src/main/java/org/apache/wiki/api/filters/package.html b/jspwiki-main/src/main/java/org/apache/wiki/api/filters/package.html
similarity index 100%
rename from jspwiki-war/src/main/java/org/apache/wiki/api/filters/package.html
rename to jspwiki-main/src/main/java/org/apache/wiki/api/filters/package.html
diff --git a/jspwiki-war/src/main/java/org/apache/wiki/api/package.html b/jspwiki-main/src/main/java/org/apache/wiki/api/package.html
similarity index 100%
rename from jspwiki-war/src/main/java/org/apache/wiki/api/package.html
rename to jspwiki-main/src/main/java/org/apache/wiki/api/package.html
diff --git a/jspwiki-war/src/main/java/org/apache/wiki/api/plugin/InitializablePlugin.java b/jspwiki-main/src/main/java/org/apache/wiki/api/plugin/InitializablePlugin.java
similarity index 100%
rename from jspwiki-war/src/main/java/org/apache/wiki/api/plugin/InitializablePlugin.java
rename to jspwiki-main/src/main/java/org/apache/wiki/api/plugin/InitializablePlugin.java
diff --git a/jspwiki-war/src/main/java/org/apache/wiki/api/plugin/ParserStagePlugin.java b/jspwiki-main/src/main/java/org/apache/wiki/api/plugin/ParserStagePlugin.java
similarity index 100%
rename from jspwiki-war/src/main/java/org/apache/wiki/api/plugin/ParserStagePlugin.java
rename to jspwiki-main/src/main/java/org/apache/wiki/api/plugin/ParserStagePlugin.java
diff --git a/jspwiki-war/src/main/java/org/apache/wiki/api/plugin/WikiPlugin.java b/jspwiki-main/src/main/java/org/apache/wiki/api/plugin/WikiPlugin.java
similarity index 100%
rename from jspwiki-war/src/main/java/org/apache/wiki/api/plugin/WikiPlugin.java
rename to jspwiki-main/src/main/java/org/apache/wiki/api/plugin/WikiPlugin.java
diff --git a/jspwiki-war/src/main/java/org/apache/wiki/api/plugin/package.html b/jspwiki-main/src/main/java/org/apache/wiki/api/plugin/package.html
similarity index 100%
rename from jspwiki-war/src/main/java/org/apache/wiki/api/plugin/package.html
rename to jspwiki-main/src/main/java/org/apache/wiki/api/plugin/package.html
diff --git a/jspwiki-war/src/main/java/org/apache/wiki/attachment/Attachment.java b/jspwiki-main/src/main/java/org/apache/wiki/attachment/Attachment.java
similarity index 100%
rename from jspwiki-war/src/main/java/org/apache/wiki/attachment/Attachment.java
rename to jspwiki-main/src/main/java/org/apache/wiki/attachment/Attachment.java
diff --git a/jspwiki-war/src/main/java/org/apache/wiki/attachment/AttachmentManager.java b/jspwiki-main/src/main/java/org/apache/wiki/attachment/AttachmentManager.java
similarity index 100%
rename from jspwiki-war/src/main/java/org/apache/wiki/attachment/AttachmentManager.java
rename to jspwiki-main/src/main/java/org/apache/wiki/attachment/AttachmentManager.java
diff --git a/jspwiki-war/src/main/java/org/apache/wiki/attachment/AttachmentServlet.java b/jspwiki-main/src/main/java/org/apache/wiki/attachment/AttachmentServlet.java
similarity index 100%
rename from jspwiki-war/src/main/java/org/apache/wiki/attachment/AttachmentServlet.java
rename to jspwiki-main/src/main/java/org/apache/wiki/attachment/AttachmentServlet.java
diff --git a/jspwiki-war/src/main/java/org/apache/wiki/attachment/DynamicAttachment.java b/jspwiki-main/src/main/java/org/apache/wiki/attachment/DynamicAttachment.java
similarity index 100%
rename from jspwiki-war/src/main/java/org/apache/wiki/attachment/DynamicAttachment.java
rename to jspwiki-main/src/main/java/org/apache/wiki/attachment/DynamicAttachment.java
diff --git a/jspwiki-war/src/main/java/org/apache/wiki/attachment/DynamicAttachmentProvider.java b/jspwiki-main/src/main/java/org/apache/wiki/attachment/DynamicAttachmentProvider.java
similarity index 100%
rename from jspwiki-war/src/main/java/org/apache/wiki/attachment/DynamicAttachmentProvider.java
rename to jspwiki-main/src/main/java/org/apache/wiki/attachment/DynamicAttachmentProvider.java
diff --git a/jspwiki-war/src/main/java/org/apache/wiki/attachment/package.html b/jspwiki-main/src/main/java/org/apache/wiki/attachment/package.html
similarity index 100%
rename from jspwiki-war/src/main/java/org/apache/wiki/attachment/package.html
rename to jspwiki-main/src/main/java/org/apache/wiki/attachment/package.html
diff --git a/jspwiki-war/src/main/java/org/apache/wiki/auth/AuthenticationManager.java b/jspwiki-main/src/main/java/org/apache/wiki/auth/AuthenticationManager.java
similarity index 100%
rename from jspwiki-war/src/main/java/org/apache/wiki/auth/AuthenticationManager.java
rename to jspwiki-main/src/main/java/org/apache/wiki/auth/AuthenticationManager.java
diff --git a/jspwiki-war/src/main/java/org/apache/wiki/auth/AuthorizationManager.java b/jspwiki-main/src/main/java/org/apache/wiki/auth/AuthorizationManager.java
similarity index 100%
rename from jspwiki-war/src/main/java/org/apache/wiki/auth/AuthorizationManager.java
rename to jspwiki-main/src/main/java/org/apache/wiki/auth/AuthorizationManager.java
diff --git a/jspwiki-war/src/main/java/org/apache/wiki/auth/Authorizer.java b/jspwiki-main/src/main/java/org/apache/wiki/auth/Authorizer.java
similarity index 100%
rename from jspwiki-war/src/main/java/org/apache/wiki/auth/Authorizer.java
rename to jspwiki-main/src/main/java/org/apache/wiki/auth/Authorizer.java
diff --git a/jspwiki-war/src/main/java/org/apache/wiki/auth/GroupPrincipal.java b/jspwiki-main/src/main/java/org/apache/wiki/auth/GroupPrincipal.java
similarity index 100%
rename from jspwiki-war/src/main/java/org/apache/wiki/auth/GroupPrincipal.java
rename to jspwiki-main/src/main/java/org/apache/wiki/auth/GroupPrincipal.java
diff --git a/jspwiki-war/src/main/java/org/apache/wiki/auth/NoSuchPrincipalException.java b/jspwiki-main/src/main/java/org/apache/wiki/auth/NoSuchPrincipalException.java
similarity index 100%
rename from jspwiki-war/src/main/java/org/apache/wiki/auth/NoSuchPrincipalException.java
rename to jspwiki-main/src/main/java/org/apache/wiki/auth/NoSuchPrincipalException.java
diff --git a/jspwiki-war/src/main/java/org/apache/wiki/auth/PrincipalComparator.java b/jspwiki-main/src/main/java/org/apache/wiki/auth/PrincipalComparator.java
similarity index 100%
rename from jspwiki-war/src/main/java/org/apache/wiki/auth/PrincipalComparator.java
rename to jspwiki-main/src/main/java/org/apache/wiki/auth/PrincipalComparator.java
diff --git a/jspwiki-war/src/main/java/org/apache/wiki/auth/SecurityVerifier.java b/jspwiki-main/src/main/java/org/apache/wiki/auth/SecurityVerifier.java
similarity index 100%
rename from jspwiki-war/src/main/java/org/apache/wiki/auth/SecurityVerifier.java
rename to jspwiki-main/src/main/java/org/apache/wiki/auth/SecurityVerifier.java
diff --git a/jspwiki-war/src/main/java/org/apache/wiki/auth/SessionMonitor.java b/jspwiki-main/src/main/java/org/apache/wiki/auth/SessionMonitor.java
similarity index 100%
rename from jspwiki-war/src/main/java/org/apache/wiki/auth/SessionMonitor.java
rename to jspwiki-main/src/main/java/org/apache/wiki/auth/SessionMonitor.java
diff --git a/jspwiki-war/src/main/java/org/apache/wiki/auth/UserManager.java b/jspwiki-main/src/main/java/org/apache/wiki/auth/UserManager.java
similarity index 100%
rename from jspwiki-war/src/main/java/org/apache/wiki/auth/UserManager.java
rename to jspwiki-main/src/main/java/org/apache/wiki/auth/UserManager.java
diff --git a/jspwiki-war/src/main/java/org/apache/wiki/auth/WikiPrincipal.java b/jspwiki-main/src/main/java/org/apache/wiki/auth/WikiPrincipal.java
similarity index 100%
rename from jspwiki-war/src/main/java/org/apache/wiki/auth/WikiPrincipal.java
rename to jspwiki-main/src/main/java/org/apache/wiki/auth/WikiPrincipal.java
diff --git a/jspwiki-war/src/main/java/org/apache/wiki/auth/WikiSecurityException.java b/jspwiki-main/src/main/java/org/apache/wiki/auth/WikiSecurityException.java
similarity index 100%
rename from jspwiki-war/src/main/java/org/apache/wiki/auth/WikiSecurityException.java
rename to jspwiki-main/src/main/java/org/apache/wiki/auth/WikiSecurityException.java
diff --git a/jspwiki-war/src/main/java/org/apache/wiki/auth/acl/Acl.java b/jspwiki-main/src/main/java/org/apache/wiki/auth/acl/Acl.java
similarity index 100%
rename from jspwiki-war/src/main/java/org/apache/wiki/auth/acl/Acl.java
rename to jspwiki-main/src/main/java/org/apache/wiki/auth/acl/Acl.java
diff --git a/jspwiki-war/src/main/java/org/apache/wiki/auth/acl/AclEntry.java b/jspwiki-main/src/main/java/org/apache/wiki/auth/acl/AclEntry.java
similarity index 100%
rename from jspwiki-war/src/main/java/org/apache/wiki/auth/acl/AclEntry.java
rename to jspwiki-main/src/main/java/org/apache/wiki/auth/acl/AclEntry.java
diff --git a/jspwiki-war/src/main/java/org/apache/wiki/auth/acl/AclEntryImpl.java b/jspwiki-main/src/main/java/org/apache/wiki/auth/acl/AclEntryImpl.java
similarity index 100%
rename from jspwiki-war/src/main/java/org/apache/wiki/auth/acl/AclEntryImpl.java
rename to jspwiki-main/src/main/java/org/apache/wiki/auth/acl/AclEntryImpl.java
diff --git a/jspwiki-war/src/main/java/org/apache/wiki/auth/acl/AclImpl.java b/jspwiki-main/src/main/java/org/apache/wiki/auth/acl/AclImpl.java
similarity index 100%
rename from jspwiki-war/src/main/java/org/apache/wiki/auth/acl/AclImpl.java
rename to jspwiki-main/src/main/java/org/apache/wiki/auth/acl/AclImpl.java
diff --git a/jspwiki-war/src/main/java/org/apache/wiki/auth/acl/AclManager.java b/jspwiki-main/src/main/java/org/apache/wiki/auth/acl/AclManager.java
similarity index 100%
rename from jspwiki-war/src/main/java/org/apache/wiki/auth/acl/AclManager.java
rename to jspwiki-main/src/main/java/org/apache/wiki/auth/acl/AclManager.java
diff --git a/jspwiki-war/src/main/java/org/apache/wiki/auth/acl/DefaultAclManager.java b/jspwiki-main/src/main/java/org/apache/wiki/auth/acl/DefaultAclManager.java
similarity index 100%
rename from jspwiki-war/src/main/java/org/apache/wiki/auth/acl/DefaultAclManager.java
rename to jspwiki-main/src/main/java/org/apache/wiki/auth/acl/DefaultAclManager.java
diff --git a/jspwiki-war/src/main/java/org/apache/wiki/auth/acl/UnresolvedPrincipal.java b/jspwiki-main/src/main/java/org/apache/wiki/auth/acl/UnresolvedPrincipal.java
similarity index 100%
rename from jspwiki-war/src/main/java/org/apache/wiki/auth/acl/UnresolvedPrincipal.java
rename to jspwiki-main/src/main/java/org/apache/wiki/auth/acl/UnresolvedPrincipal.java
diff --git a/jspwiki-war/src/main/java/org/apache/wiki/auth/acl/package.html b/jspwiki-main/src/main/java/org/apache/wiki/auth/acl/package.html
similarity index 100%
rename from jspwiki-war/src/main/java/org/apache/wiki/auth/acl/package.html
rename to jspwiki-main/src/main/java/org/apache/wiki/auth/acl/package.html
diff --git a/jspwiki-war/src/main/java/org/apache/wiki/auth/authorize/Group.java b/jspwiki-main/src/main/java/org/apache/wiki/auth/authorize/Group.java
similarity index 100%
rename from jspwiki-war/src/main/java/org/apache/wiki/auth/authorize/Group.java
rename to jspwiki-main/src/main/java/org/apache/wiki/auth/authorize/Group.java
diff --git a/jspwiki-war/src/main/java/org/apache/wiki/auth/authorize/GroupDatabase.java b/jspwiki-main/src/main/java/org/apache/wiki/auth/authorize/GroupDatabase.java
similarity index 100%
rename from jspwiki-war/src/main/java/org/apache/wiki/auth/authorize/GroupDatabase.java
rename to jspwiki-main/src/main/java/org/apache/wiki/auth/authorize/GroupDatabase.java
diff --git a/jspwiki-war/src/main/java/org/apache/wiki/auth/authorize/GroupManager.java b/jspwiki-main/src/main/java/org/apache/wiki/auth/authorize/GroupManager.java
similarity index 100%
rename from jspwiki-war/src/main/java/org/apache/wiki/auth/authorize/GroupManager.java
rename to jspwiki-main/src/main/java/org/apache/wiki/auth/authorize/GroupManager.java
diff --git a/jspwiki-war/src/main/java/org/apache/wiki/auth/authorize/JDBCGroupDatabase.java b/jspwiki-main/src/main/java/org/apache/wiki/auth/authorize/JDBCGroupDatabase.java
similarity index 100%
rename from jspwiki-war/src/main/java/org/apache/wiki/auth/authorize/JDBCGroupDatabase.java
rename to jspwiki-main/src/main/java/org/apache/wiki/auth/authorize/JDBCGroupDatabase.java
diff --git a/jspwiki-war/src/main/java/org/apache/wiki/auth/authorize/Role.java b/jspwiki-main/src/main/java/org/apache/wiki/auth/authorize/Role.java
similarity index 100%
rename from jspwiki-war/src/main/java/org/apache/wiki/auth/authorize/Role.java
rename to jspwiki-main/src/main/java/org/apache/wiki/auth/authorize/Role.java
diff --git a/jspwiki-war/src/main/java/org/apache/wiki/auth/authorize/WebAuthorizer.java b/jspwiki-main/src/main/java/org/apache/wiki/auth/authorize/WebAuthorizer.java
similarity index 100%
rename from jspwiki-war/src/main/java/org/apache/wiki/auth/authorize/WebAuthorizer.java
rename to jspwiki-main/src/main/java/org/apache/wiki/auth/authorize/WebAuthorizer.java
diff --git a/jspwiki-war/src/main/java/org/apache/wiki/auth/authorize/WebContainerAuthorizer.java b/jspwiki-main/src/main/java/org/apache/wiki/auth/authorize/WebContainerAuthorizer.java
similarity index 100%
rename from jspwiki-war/src/main/java/org/apache/wiki/auth/authorize/WebContainerAuthorizer.java
rename to jspwiki-main/src/main/java/org/apache/wiki/auth/authorize/WebContainerAuthorizer.java
diff --git a/jspwiki-war/src/main/java/org/apache/wiki/auth/authorize/XMLGroupDatabase.java b/jspwiki-main/src/main/java/org/apache/wiki/auth/authorize/XMLGroupDatabase.java
similarity index 100%
rename from jspwiki-war/src/main/java/org/apache/wiki/auth/authorize/XMLGroupDatabase.java
rename to jspwiki-main/src/main/java/org/apache/wiki/auth/authorize/XMLGroupDatabase.java
diff --git a/jspwiki-war/src/main/java/org/apache/wiki/auth/authorize/package.html b/jspwiki-main/src/main/java/org/apache/wiki/auth/authorize/package.html
similarity index 100%
rename from jspwiki-war/src/main/java/org/apache/wiki/auth/authorize/package.html
rename to jspwiki-main/src/main/java/org/apache/wiki/auth/authorize/package.html
diff --git a/jspwiki-war/src/main/java/org/apache/wiki/auth/login/AbstractLoginModule.java b/jspwiki-main/src/main/java/org/apache/wiki/auth/login/AbstractLoginModule.java
similarity index 100%
rename from jspwiki-war/src/main/java/org/apache/wiki/auth/login/AbstractLoginModule.java
rename to jspwiki-main/src/main/java/org/apache/wiki/auth/login/AbstractLoginModule.java
diff --git a/jspwiki-war/src/main/java/org/apache/wiki/auth/login/AnonymousLoginModule.java b/jspwiki-main/src/main/java/org/apache/wiki/auth/login/AnonymousLoginModule.java
similarity index 100%
rename from jspwiki-war/src/main/java/org/apache/wiki/auth/login/AnonymousLoginModule.java
rename to jspwiki-main/src/main/java/org/apache/wiki/auth/login/AnonymousLoginModule.java
diff --git a/jspwiki-war/src/main/java/org/apache/wiki/auth/login/AuthorizerCallback.java b/jspwiki-main/src/main/java/org/apache/wiki/auth/login/AuthorizerCallback.java
similarity index 100%
rename from jspwiki-war/src/main/java/org/apache/wiki/auth/login/AuthorizerCallback.java
rename to jspwiki-main/src/main/java/org/apache/wiki/auth/login/AuthorizerCallback.java
diff --git a/jspwiki-war/src/main/java/org/apache/wiki/auth/login/CookieAssertionLoginModule.java b/jspwiki-main/src/main/java/org/apache/wiki/auth/login/CookieAssertionLoginModule.java
similarity index 100%
rename from jspwiki-war/src/main/java/org/apache/wiki/auth/login/CookieAssertionLoginModule.java
rename to jspwiki-main/src/main/java/org/apache/wiki/auth/login/CookieAssertionLoginModule.java
diff --git a/jspwiki-war/src/main/java/org/apache/wiki/auth/login/CookieAuthenticationLoginModule.java b/jspwiki-main/src/main/java/org/apache/wiki/auth/login/CookieAuthenticationLoginModule.java
similarity index 100%
rename from jspwiki-war/src/main/java/org/apache/wiki/auth/login/CookieAuthenticationLoginModule.java
rename to jspwiki-main/src/main/java/org/apache/wiki/auth/login/CookieAuthenticationLoginModule.java
diff --git a/jspwiki-war/src/main/java/org/apache/wiki/auth/login/HttpRequestCallback.java b/jspwiki-main/src/main/java/org/apache/wiki/auth/login/HttpRequestCallback.java
similarity index 100%
rename from jspwiki-war/src/main/java/org/apache/wiki/auth/login/HttpRequestCallback.java
rename to jspwiki-main/src/main/java/org/apache/wiki/auth/login/HttpRequestCallback.java
diff --git a/jspwiki-war/src/main/java/org/apache/wiki/auth/login/PrincipalWrapper.java b/jspwiki-main/src/main/java/org/apache/wiki/auth/login/PrincipalWrapper.java
similarity index 100%
rename from jspwiki-war/src/main/java/org/apache/wiki/auth/login/PrincipalWrapper.java
rename to jspwiki-main/src/main/java/org/apache/wiki/auth/login/PrincipalWrapper.java
diff --git a/jspwiki-war/src/main/java/org/apache/wiki/auth/login/UserDatabaseCallback.java b/jspwiki-main/src/main/java/org/apache/wiki/auth/login/UserDatabaseCallback.java
similarity index 100%
rename from jspwiki-war/src/main/java/org/apache/wiki/auth/login/UserDatabaseCallback.java
rename to jspwiki-main/src/main/java/org/apache/wiki/auth/login/UserDatabaseCallback.java
diff --git a/jspwiki-war/src/main/java/org/apache/wiki/auth/login/UserDatabaseLoginModule.java b/jspwiki-main/src/main/java/org/apache/wiki/auth/login/UserDatabaseLoginModule.java
similarity index 100%
rename from jspwiki-war/src/main/java/org/apache/wiki/auth/login/UserDatabaseLoginModule.java
rename to jspwiki-main/src/main/java/org/apache/wiki/auth/login/UserDatabaseLoginModule.java
diff --git a/jspwiki-war/src/main/java/org/apache/wiki/auth/login/WebContainerCallbackHandler.java b/jspwiki-main/src/main/java/org/apache/wiki/auth/login/WebContainerCallbackHandler.java
similarity index 100%
rename from jspwiki-war/src/main/java/org/apache/wiki/auth/login/WebContainerCallbackHandler.java
rename to jspwiki-main/src/main/java/org/apache/wiki/auth/login/WebContainerCallbackHandler.java
diff --git a/jspwiki-war/src/main/java/org/apache/wiki/auth/login/WebContainerLoginModule.java b/jspwiki-main/src/main/java/org/apache/wiki/auth/login/WebContainerLoginModule.java
similarity index 100%
rename from jspwiki-war/src/main/java/org/apache/wiki/auth/login/WebContainerLoginModule.java
rename to jspwiki-main/src/main/java/org/apache/wiki/auth/login/WebContainerLoginModule.java
diff --git a/jspwiki-war/src/main/java/org/apache/wiki/auth/login/WikiCallbackHandler.java b/jspwiki-main/src/main/java/org/apache/wiki/auth/login/WikiCallbackHandler.java
similarity index 100%
rename from jspwiki-war/src/main/java/org/apache/wiki/auth/login/WikiCallbackHandler.java
rename to jspwiki-main/src/main/java/org/apache/wiki/auth/login/WikiCallbackHandler.java
diff --git a/jspwiki-war/src/main/java/org/apache/wiki/auth/login/WikiEngineCallback.java b/jspwiki-main/src/main/java/org/apache/wiki/auth/login/WikiEngineCallback.java
similarity index 100%
rename from jspwiki-war/src/main/java/org/apache/wiki/auth/login/WikiEngineCallback.java
rename to jspwiki-main/src/main/java/org/apache/wiki/auth/login/WikiEngineCallback.java
diff --git a/jspwiki-war/src/main/java/org/apache/wiki/auth/login/package.html b/jspwiki-main/src/main/java/org/apache/wiki/auth/login/package.html
similarity index 100%
rename from jspwiki-war/src/main/java/org/apache/wiki/auth/login/package.html
rename to jspwiki-main/src/main/java/org/apache/wiki/auth/login/package.html
diff --git a/jspwiki-war/src/main/java/org/apache/wiki/auth/package.html b/jspwiki-main/src/main/java/org/apache/wiki/auth/package.html
similarity index 100%
rename from jspwiki-war/src/main/java/org/apache/wiki/auth/package.html
rename to jspwiki-main/src/main/java/org/apache/wiki/auth/package.html
diff --git a/jspwiki-war/src/main/java/org/apache/wiki/auth/permissions/AllPermission.java b/jspwiki-main/src/main/java/org/apache/wiki/auth/permissions/AllPermission.java
similarity index 100%
rename from jspwiki-war/src/main/java/org/apache/wiki/auth/permissions/AllPermission.java
rename to jspwiki-main/src/main/java/org/apache/wiki/auth/permissions/AllPermission.java
diff --git a/jspwiki-war/src/main/java/org/apache/wiki/auth/permissions/AllPermissionCollection.java b/jspwiki-main/src/main/java/org/apache/wiki/auth/permissions/AllPermissionCollection.java
similarity index 100%
rename from jspwiki-war/src/main/java/org/apache/wiki/auth/permissions/AllPermissionCollection.java
rename to jspwiki-main/src/main/java/org/apache/wiki/auth/permissions/AllPermissionCollection.java
diff --git a/jspwiki-war/src/main/java/org/apache/wiki/auth/permissions/GroupPermission.java b/jspwiki-main/src/main/java/org/apache/wiki/auth/permissions/GroupPermission.java
similarity index 100%
rename from jspwiki-war/src/main/java/org/apache/wiki/auth/permissions/GroupPermission.java
rename to jspwiki-main/src/main/java/org/apache/wiki/auth/permissions/GroupPermission.java
diff --git a/jspwiki-war/src/main/java/org/apache/wiki/auth/permissions/PagePermission.java b/jspwiki-main/src/main/java/org/apache/wiki/auth/permissions/PagePermission.java
similarity index 100%
rename from jspwiki-war/src/main/java/org/apache/wiki/auth/permissions/PagePermission.java
rename to jspwiki-main/src/main/java/org/apache/wiki/auth/permissions/PagePermission.java
diff --git a/jspwiki-war/src/main/java/org/apache/wiki/auth/permissions/PermissionFactory.java b/jspwiki-main/src/main/java/org/apache/wiki/auth/permissions/PermissionFactory.java
similarity index 100%
rename from jspwiki-war/src/main/java/org/apache/wiki/auth/permissions/PermissionFactory.java
rename to jspwiki-main/src/main/java/org/apache/wiki/auth/permissions/PermissionFactory.java
diff --git a/jspwiki-war/src/main/java/org/apache/wiki/auth/permissions/WikiPermission.java b/jspwiki-main/src/main/java/org/apache/wiki/auth/permissions/WikiPermission.java
similarity index 100%
rename from jspwiki-war/src/main/java/org/apache/wiki/auth/permissions/WikiPermission.java
rename to jspwiki-main/src/main/java/org/apache/wiki/auth/permissions/WikiPermission.java
diff --git a/jspwiki-war/src/main/java/org/apache/wiki/auth/user/AbstractUserDatabase.java b/jspwiki-main/src/main/java/org/apache/wiki/auth/user/AbstractUserDatabase.java
similarity index 100%
rename from jspwiki-war/src/main/java/org/apache/wiki/auth/user/AbstractUserDatabase.java
rename to jspwiki-main/src/main/java/org/apache/wiki/auth/user/AbstractUserDatabase.java
diff --git a/jspwiki-war/src/main/java/org/apache/wiki/auth/user/DefaultUserProfile.java b/jspwiki-main/src/main/java/org/apache/wiki/auth/user/DefaultUserProfile.java
similarity index 100%
rename from jspwiki-war/src/main/java/org/apache/wiki/auth/user/DefaultUserProfile.java
rename to jspwiki-main/src/main/java/org/apache/wiki/auth/user/DefaultUserProfile.java
diff --git a/jspwiki-war/src/main/java/org/apache/wiki/auth/user/DuplicateUserException.java b/jspwiki-main/src/main/java/org/apache/wiki/auth/user/DuplicateUserException.java
similarity index 100%
rename from jspwiki-war/src/main/java/org/apache/wiki/auth/user/DuplicateUserException.java
rename to jspwiki-main/src/main/java/org/apache/wiki/auth/user/DuplicateUserException.java
diff --git a/jspwiki-war/src/main/java/org/apache/wiki/auth/user/JDBCUserDatabase.java b/jspwiki-main/src/main/java/org/apache/wiki/auth/user/JDBCUserDatabase.java
similarity index 100%
rename from jspwiki-war/src/main/java/org/apache/wiki/auth/user/JDBCUserDatabase.java
rename to jspwiki-main/src/main/java/org/apache/wiki/auth/user/JDBCUserDatabase.java
diff --git a/jspwiki-war/src/main/java/org/apache/wiki/auth/user/UserDatabase.java b/jspwiki-main/src/main/java/org/apache/wiki/auth/user/UserDatabase.java
similarity index 100%
rename from jspwiki-war/src/main/java/org/apache/wiki/auth/user/UserDatabase.java
rename to jspwiki-main/src/main/java/org/apache/wiki/auth/user/UserDatabase.java
diff --git a/jspwiki-war/src/main/java/org/apache/wiki/auth/user/UserProfile.java b/jspwiki-main/src/main/java/org/apache/wiki/auth/user/UserProfile.java
similarity index 100%
rename from jspwiki-war/src/main/java/org/apache/wiki/auth/user/UserProfile.java
rename to jspwiki-main/src/main/java/org/apache/wiki/auth/user/UserProfile.java
diff --git a/jspwiki-war/src/main/java/org/apache/wiki/auth/user/XMLUserDatabase.java b/jspwiki-main/src/main/java/org/apache/wiki/auth/user/XMLUserDatabase.java
similarity index 100%
rename from jspwiki-war/src/main/java/org/apache/wiki/auth/user/XMLUserDatabase.java
rename to jspwiki-main/src/main/java/org/apache/wiki/auth/user/XMLUserDatabase.java
diff --git a/jspwiki-war/src/main/java/org/apache/wiki/content/PageRenamer.java b/jspwiki-main/src/main/java/org/apache/wiki/content/PageRenamer.java
similarity index 100%
rename from jspwiki-war/src/main/java/org/apache/wiki/content/PageRenamer.java
rename to jspwiki-main/src/main/java/org/apache/wiki/content/PageRenamer.java
diff --git a/jspwiki-war/src/main/java/org/apache/wiki/content/package.html b/jspwiki-main/src/main/java/org/apache/wiki/content/package.html
similarity index 100%
rename from jspwiki-war/src/main/java/org/apache/wiki/content/package.html
rename to jspwiki-main/src/main/java/org/apache/wiki/content/package.html
diff --git a/jspwiki-war/src/main/java/org/apache/wiki/diff/ContextualDiffProvider.java b/jspwiki-main/src/main/java/org/apache/wiki/diff/ContextualDiffProvider.java
similarity index 100%
rename from jspwiki-war/src/main/java/org/apache/wiki/diff/ContextualDiffProvider.java
rename to jspwiki-main/src/main/java/org/apache/wiki/diff/ContextualDiffProvider.java
diff --git a/jspwiki-war/src/main/java/org/apache/wiki/diff/DiffProvider.java b/jspwiki-main/src/main/java/org/apache/wiki/diff/DiffProvider.java
similarity index 100%
rename from jspwiki-war/src/main/java/org/apache/wiki/diff/DiffProvider.java
rename to jspwiki-main/src/main/java/org/apache/wiki/diff/DiffProvider.java
diff --git a/jspwiki-war/src/main/java/org/apache/wiki/diff/DifferenceManager.java b/jspwiki-main/src/main/java/org/apache/wiki/diff/DifferenceManager.java
similarity index 100%
rename from jspwiki-war/src/main/java/org/apache/wiki/diff/DifferenceManager.java
rename to jspwiki-main/src/main/java/org/apache/wiki/diff/DifferenceManager.java
diff --git a/jspwiki-war/src/main/java/org/apache/wiki/diff/ExternalDiffProvider.java b/jspwiki-main/src/main/java/org/apache/wiki/diff/ExternalDiffProvider.java
similarity index 100%
rename from jspwiki-war/src/main/java/org/apache/wiki/diff/ExternalDiffProvider.java
rename to jspwiki-main/src/main/java/org/apache/wiki/diff/ExternalDiffProvider.java
diff --git a/jspwiki-war/src/main/java/org/apache/wiki/diff/TraditionalDiffProvider.java b/jspwiki-main/src/main/java/org/apache/wiki/diff/TraditionalDiffProvider.java
similarity index 100%
rename from jspwiki-war/src/main/java/org/apache/wiki/diff/TraditionalDiffProvider.java
rename to jspwiki-main/src/main/java/org/apache/wiki/diff/TraditionalDiffProvider.java
diff --git a/jspwiki-war/src/main/java/org/apache/wiki/event/PageEventFilter.java b/jspwiki-main/src/main/java/org/apache/wiki/event/PageEventFilter.java
similarity index 100%
rename from jspwiki-war/src/main/java/org/apache/wiki/event/PageEventFilter.java
rename to jspwiki-main/src/main/java/org/apache/wiki/event/PageEventFilter.java
diff --git a/jspwiki-war/src/main/java/org/apache/wiki/event/WikiEngineEvent.java b/jspwiki-main/src/main/java/org/apache/wiki/event/WikiEngineEvent.java
similarity index 100%
rename from jspwiki-war/src/main/java/org/apache/wiki/event/WikiEngineEvent.java
rename to jspwiki-main/src/main/java/org/apache/wiki/event/WikiEngineEvent.java
diff --git a/jspwiki-war/src/main/java/org/apache/wiki/event/WikiEvent.java b/jspwiki-main/src/main/java/org/apache/wiki/event/WikiEvent.java
similarity index 100%
rename from jspwiki-war/src/main/java/org/apache/wiki/event/WikiEvent.java
rename to jspwiki-main/src/main/java/org/apache/wiki/event/WikiEvent.java
diff --git a/jspwiki-war/src/main/java/org/apache/wiki/event/WikiEventListener.java b/jspwiki-main/src/main/java/org/apache/wiki/event/WikiEventListener.java
similarity index 100%
rename from jspwiki-war/src/main/java/org/apache/wiki/event/WikiEventListener.java
rename to jspwiki-main/src/main/java/org/apache/wiki/event/WikiEventListener.java
diff --git a/jspwiki-war/src/main/java/org/apache/wiki/event/WikiEventManager.java b/jspwiki-main/src/main/java/org/apache/wiki/event/WikiEventManager.java
similarity index 100%
rename from jspwiki-war/src/main/java/org/apache/wiki/event/WikiEventManager.java
rename to jspwiki-main/src/main/java/org/apache/wiki/event/WikiEventManager.java
diff --git a/jspwiki-war/src/main/java/org/apache/wiki/event/WikiEventUtils.java b/jspwiki-main/src/main/java/org/apache/wiki/event/WikiEventUtils.java
similarity index 100%
rename from jspwiki-war/src/main/java/org/apache/wiki/event/WikiEventUtils.java
rename to jspwiki-main/src/main/java/org/apache/wiki/event/WikiEventUtils.java
diff --git a/jspwiki-war/src/main/java/org/apache/wiki/event/WikiPageEvent.java b/jspwiki-main/src/main/java/org/apache/wiki/event/WikiPageEvent.java
similarity index 100%
rename from jspwiki-war/src/main/java/org/apache/wiki/event/WikiPageEvent.java
rename to jspwiki-main/src/main/java/org/apache/wiki/event/WikiPageEvent.java
diff --git a/jspwiki-war/src/main/java/org/apache/wiki/event/WikiPageRenameEvent.java b/jspwiki-main/src/main/java/org/apache/wiki/event/WikiPageRenameEvent.java
similarity index 100%
rename from jspwiki-war/src/main/java/org/apache/wiki/event/WikiPageRenameEvent.java
rename to jspwiki-main/src/main/java/org/apache/wiki/event/WikiPageRenameEvent.java
diff --git a/jspwiki-war/src/main/java/org/apache/wiki/event/WikiSecurityEvent.java b/jspwiki-main/src/main/java/org/apache/wiki/event/WikiSecurityEvent.java
similarity index 100%
rename from jspwiki-war/src/main/java/org/apache/wiki/event/WikiSecurityEvent.java
rename to jspwiki-main/src/main/java/org/apache/wiki/event/WikiSecurityEvent.java
diff --git a/jspwiki-war/src/main/java/org/apache/wiki/event/WorkflowEvent.java b/jspwiki-main/src/main/java/org/apache/wiki/event/WorkflowEvent.java
similarity index 100%
rename from jspwiki-war/src/main/java/org/apache/wiki/event/WorkflowEvent.java
rename to jspwiki-main/src/main/java/org/apache/wiki/event/WorkflowEvent.java
diff --git a/jspwiki-war/src/main/java/org/apache/wiki/filters/CreoleFilter.java b/jspwiki-main/src/main/java/org/apache/wiki/filters/CreoleFilter.java
similarity index 100%
rename from jspwiki-war/src/main/java/org/apache/wiki/filters/CreoleFilter.java
rename to jspwiki-main/src/main/java/org/apache/wiki/filters/CreoleFilter.java
diff --git a/jspwiki-war/src/main/java/org/apache/wiki/filters/DefaultFilterManager.java b/jspwiki-main/src/main/java/org/apache/wiki/filters/DefaultFilterManager.java
similarity index 100%
rename from jspwiki-war/src/main/java/org/apache/wiki/filters/DefaultFilterManager.java
rename to jspwiki-main/src/main/java/org/apache/wiki/filters/DefaultFilterManager.java
diff --git a/jspwiki-war/src/main/java/org/apache/wiki/filters/PingWeblogsComFilter.java b/jspwiki-main/src/main/java/org/apache/wiki/filters/PingWeblogsComFilter.java
similarity index 100%
rename from jspwiki-war/src/main/java/org/apache/wiki/filters/PingWeblogsComFilter.java
rename to jspwiki-main/src/main/java/org/apache/wiki/filters/PingWeblogsComFilter.java
diff --git a/jspwiki-war/src/main/java/org/apache/wiki/filters/ProfanityFilter.java b/jspwiki-main/src/main/java/org/apache/wiki/filters/ProfanityFilter.java
similarity index 100%
rename from jspwiki-war/src/main/java/org/apache/wiki/filters/ProfanityFilter.java
rename to jspwiki-main/src/main/java/org/apache/wiki/filters/ProfanityFilter.java
diff --git a/jspwiki-war/src/main/java/org/apache/wiki/filters/SpamFilter.java b/jspwiki-main/src/main/java/org/apache/wiki/filters/SpamFilter.java
similarity index 100%
rename from jspwiki-war/src/main/java/org/apache/wiki/filters/SpamFilter.java
rename to jspwiki-main/src/main/java/org/apache/wiki/filters/SpamFilter.java
diff --git a/jspwiki-war/src/main/java/org/apache/wiki/filters/package.html b/jspwiki-main/src/main/java/org/apache/wiki/filters/package.html
similarity index 100%
rename from jspwiki-war/src/main/java/org/apache/wiki/filters/package.html
rename to jspwiki-main/src/main/java/org/apache/wiki/filters/package.html
diff --git a/jspwiki-war/src/main/java/org/apache/wiki/forms/FormClose.java b/jspwiki-main/src/main/java/org/apache/wiki/forms/FormClose.java
similarity index 100%
rename from jspwiki-war/src/main/java/org/apache/wiki/forms/FormClose.java
rename to jspwiki-main/src/main/java/org/apache/wiki/forms/FormClose.java
diff --git a/jspwiki-war/src/main/java/org/apache/wiki/forms/FormElement.java b/jspwiki-main/src/main/java/org/apache/wiki/forms/FormElement.java
similarity index 100%
rename from jspwiki-war/src/main/java/org/apache/wiki/forms/FormElement.java
rename to jspwiki-main/src/main/java/org/apache/wiki/forms/FormElement.java
diff --git a/jspwiki-war/src/main/java/org/apache/wiki/forms/FormHandler.java b/jspwiki-main/src/main/java/org/apache/wiki/forms/FormHandler.java
similarity index 100%
rename from jspwiki-war/src/main/java/org/apache/wiki/forms/FormHandler.java
rename to jspwiki-main/src/main/java/org/apache/wiki/forms/FormHandler.java
diff --git a/jspwiki-war/src/main/java/org/apache/wiki/forms/FormInfo.java b/jspwiki-main/src/main/java/org/apache/wiki/forms/FormInfo.java
similarity index 100%
rename from jspwiki-war/src/main/java/org/apache/wiki/forms/FormInfo.java
rename to jspwiki-main/src/main/java/org/apache/wiki/forms/FormInfo.java
diff --git a/jspwiki-war/src/main/java/org/apache/wiki/forms/FormInput.java b/jspwiki-main/src/main/java/org/apache/wiki/forms/FormInput.java
similarity index 100%
rename from jspwiki-war/src/main/java/org/apache/wiki/forms/FormInput.java
rename to jspwiki-main/src/main/java/org/apache/wiki/forms/FormInput.java
diff --git a/jspwiki-war/src/main/java/org/apache/wiki/forms/FormOpen.java b/jspwiki-main/src/main/java/org/apache/wiki/forms/FormOpen.java
similarity index 100%
rename from jspwiki-war/src/main/java/org/apache/wiki/forms/FormOpen.java
rename to jspwiki-main/src/main/java/org/apache/wiki/forms/FormOpen.java
diff --git a/jspwiki-war/src/main/java/org/apache/wiki/forms/FormOutput.java b/jspwiki-main/src/main/java/org/apache/wiki/forms/FormOutput.java
similarity index 100%
rename from jspwiki-war/src/main/java/org/apache/wiki/forms/FormOutput.java
rename to jspwiki-main/src/main/java/org/apache/wiki/forms/FormOutput.java
diff --git a/jspwiki-war/src/main/java/org/apache/wiki/forms/FormSelect.java b/jspwiki-main/src/main/java/org/apache/wiki/forms/FormSelect.java
similarity index 100%
rename from jspwiki-war/src/main/java/org/apache/wiki/forms/FormSelect.java
rename to jspwiki-main/src/main/java/org/apache/wiki/forms/FormSelect.java
diff --git a/jspwiki-war/src/main/java/org/apache/wiki/forms/FormSet.java b/jspwiki-main/src/main/java/org/apache/wiki/forms/FormSet.java
similarity index 100%
rename from jspwiki-war/src/main/java/org/apache/wiki/forms/FormSet.java
rename to jspwiki-main/src/main/java/org/apache/wiki/forms/FormSet.java
diff --git a/jspwiki-war/src/main/java/org/apache/wiki/forms/FormTextarea.java b/jspwiki-main/src/main/java/org/apache/wiki/forms/FormTextarea.java
similarity index 100%
rename from jspwiki-war/src/main/java/org/apache/wiki/forms/FormTextarea.java
rename to jspwiki-main/src/main/java/org/apache/wiki/forms/FormTextarea.java
diff --git a/jspwiki-war/src/main/java/org/apache/wiki/forms/package.html b/jspwiki-main/src/main/java/org/apache/wiki/forms/package.html
similarity index 100%
rename from jspwiki-war/src/main/java/org/apache/wiki/forms/package.html
rename to jspwiki-main/src/main/java/org/apache/wiki/forms/package.html
diff --git a/jspwiki-war/src/main/java/org/apache/wiki/htmltowiki/ForgetNullValuesLinkedHashMap.java b/jspwiki-main/src/main/java/org/apache/wiki/htmltowiki/ForgetNullValuesLinkedHashMap.java
similarity index 100%
rename from jspwiki-war/src/main/java/org/apache/wiki/htmltowiki/ForgetNullValuesLinkedHashMap.java
rename to jspwiki-main/src/main/java/org/apache/wiki/htmltowiki/ForgetNullValuesLinkedHashMap.java
diff --git a/jspwiki-war/src/main/java/org/apache/wiki/htmltowiki/HtmlStringToWikiTranslator.java b/jspwiki-main/src/main/java/org/apache/wiki/htmltowiki/HtmlStringToWikiTranslator.java
similarity index 100%
rename from jspwiki-war/src/main/java/org/apache/wiki/htmltowiki/HtmlStringToWikiTranslator.java
rename to jspwiki-main/src/main/java/org/apache/wiki/htmltowiki/HtmlStringToWikiTranslator.java
diff --git a/jspwiki-war/src/main/java/org/apache/wiki/htmltowiki/PersistentMapDecorator.java b/jspwiki-main/src/main/java/org/apache/wiki/htmltowiki/PersistentMapDecorator.java
similarity index 100%
rename from jspwiki-war/src/main/java/org/apache/wiki/htmltowiki/PersistentMapDecorator.java
rename to jspwiki-main/src/main/java/org/apache/wiki/htmltowiki/PersistentMapDecorator.java
diff --git a/jspwiki-war/src/main/java/org/apache/wiki/htmltowiki/PropertiesUtils.java b/jspwiki-main/src/main/java/org/apache/wiki/htmltowiki/PropertiesUtils.java
similarity index 100%
rename from jspwiki-war/src/main/java/org/apache/wiki/htmltowiki/PropertiesUtils.java
rename to jspwiki-main/src/main/java/org/apache/wiki/htmltowiki/PropertiesUtils.java
diff --git a/jspwiki-war/src/main/java/org/apache/wiki/htmltowiki/WhitespaceTrimWriter.java b/jspwiki-main/src/main/java/org/apache/wiki/htmltowiki/WhitespaceTrimWriter.java
similarity index 100%
rename from jspwiki-war/src/main/java/org/apache/wiki/htmltowiki/WhitespaceTrimWriter.java
rename to jspwiki-main/src/main/java/org/apache/wiki/htmltowiki/WhitespaceTrimWriter.java
diff --git a/jspwiki-war/src/main/java/org/apache/wiki/htmltowiki/XHtmlElementToWikiTranslator.java b/jspwiki-main/src/main/java/org/apache/wiki/htmltowiki/XHtmlElementToWikiTranslator.java
similarity index 100%
rename from jspwiki-war/src/main/java/org/apache/wiki/htmltowiki/XHtmlElementToWikiTranslator.java
rename to jspwiki-main/src/main/java/org/apache/wiki/htmltowiki/XHtmlElementToWikiTranslator.java
diff --git a/jspwiki-war/src/main/java/org/apache/wiki/htmltowiki/XHtmlToWikiConfig.java b/jspwiki-main/src/main/java/org/apache/wiki/htmltowiki/XHtmlToWikiConfig.java
similarity index 100%
rename from jspwiki-war/src/main/java/org/apache/wiki/htmltowiki/XHtmlToWikiConfig.java
rename to jspwiki-main/src/main/java/org/apache/wiki/htmltowiki/XHtmlToWikiConfig.java
diff --git a/jspwiki-war/src/main/java/org/apache/wiki/i18n/InternationalizationManager.java b/jspwiki-main/src/main/java/org/apache/wiki/i18n/InternationalizationManager.java
similarity index 100%
rename from jspwiki-war/src/main/java/org/apache/wiki/i18n/InternationalizationManager.java
rename to jspwiki-main/src/main/java/org/apache/wiki/i18n/InternationalizationManager.java
diff --git a/jspwiki-war/src/main/java/org/apache/wiki/management/SimpleMBean.java b/jspwiki-main/src/main/java/org/apache/wiki/management/SimpleMBean.java
similarity index 100%
rename from jspwiki-war/src/main/java/org/apache/wiki/management/SimpleMBean.java
rename to jspwiki-main/src/main/java/org/apache/wiki/management/SimpleMBean.java
diff --git a/jspwiki-war/src/main/java/org/apache/wiki/modules/InternalModule.java b/jspwiki-main/src/main/java/org/apache/wiki/modules/InternalModule.java
similarity index 100%
rename from jspwiki-war/src/main/java/org/apache/wiki/modules/InternalModule.java
rename to jspwiki-main/src/main/java/org/apache/wiki/modules/InternalModule.java
diff --git a/jspwiki-war/src/main/java/org/apache/wiki/modules/ModuleManager.java b/jspwiki-main/src/main/java/org/apache/wiki/modules/ModuleManager.java
similarity index 100%
rename from jspwiki-war/src/main/java/org/apache/wiki/modules/ModuleManager.java
rename to jspwiki-main/src/main/java/org/apache/wiki/modules/ModuleManager.java
diff --git a/jspwiki-war/src/main/java/org/apache/wiki/modules/WikiModuleInfo.java b/jspwiki-main/src/main/java/org/apache/wiki/modules/WikiModuleInfo.java
similarity index 100%
rename from jspwiki-war/src/main/java/org/apache/wiki/modules/WikiModuleInfo.java
rename to jspwiki-main/src/main/java/org/apache/wiki/modules/WikiModuleInfo.java
diff --git a/jspwiki-war/src/main/java/org/apache/wiki/package.html b/jspwiki-main/src/main/java/org/apache/wiki/package.html
similarity index 100%
rename from jspwiki-war/src/main/java/org/apache/wiki/package.html
rename to jspwiki-main/src/main/java/org/apache/wiki/package.html
diff --git a/jspwiki-war/src/main/java/org/apache/wiki/parser/CreoleToJSPWikiTranslator.java b/jspwiki-main/src/main/java/org/apache/wiki/parser/CreoleToJSPWikiTranslator.java
similarity index 100%
rename from jspwiki-war/src/main/java/org/apache/wiki/parser/CreoleToJSPWikiTranslator.java
rename to jspwiki-main/src/main/java/org/apache/wiki/parser/CreoleToJSPWikiTranslator.java
diff --git a/jspwiki-war/src/main/java/org/apache/wiki/parser/Heading.java b/jspwiki-main/src/main/java/org/apache/wiki/parser/Heading.java
similarity index 100%
rename from jspwiki-war/src/main/java/org/apache/wiki/parser/Heading.java
rename to jspwiki-main/src/main/java/org/apache/wiki/parser/Heading.java
diff --git a/jspwiki-war/src/main/java/org/apache/wiki/parser/HeadingListener.java b/jspwiki-main/src/main/java/org/apache/wiki/parser/HeadingListener.java
similarity index 100%
rename from jspwiki-war/src/main/java/org/apache/wiki/parser/HeadingListener.java
rename to jspwiki-main/src/main/java/org/apache/wiki/parser/HeadingListener.java
diff --git a/jspwiki-war/src/main/java/org/apache/wiki/parser/JSPWikiMarkupParser.java b/jspwiki-main/src/main/java/org/apache/wiki/parser/JSPWikiMarkupParser.java
similarity index 100%
rename from jspwiki-war/src/main/java/org/apache/wiki/parser/JSPWikiMarkupParser.java
rename to jspwiki-main/src/main/java/org/apache/wiki/parser/JSPWikiMarkupParser.java
diff --git a/jspwiki-war/src/main/java/org/apache/wiki/parser/LinkParser.java b/jspwiki-main/src/main/java/org/apache/wiki/parser/LinkParser.java
similarity index 100%
rename from jspwiki-war/src/main/java/org/apache/wiki/parser/LinkParser.java
rename to jspwiki-main/src/main/java/org/apache/wiki/parser/LinkParser.java
diff --git a/jspwiki-war/src/main/java/org/apache/wiki/parser/LinkParsingOperations.java b/jspwiki-main/src/main/java/org/apache/wiki/parser/LinkParsingOperations.java
old mode 100755
new mode 100644
similarity index 100%
rename from jspwiki-war/src/main/java/org/apache/wiki/parser/LinkParsingOperations.java
rename to jspwiki-main/src/main/java/org/apache/wiki/parser/LinkParsingOperations.java
diff --git a/jspwiki-war/src/main/java/org/apache/wiki/parser/MarkupParser.java b/jspwiki-main/src/main/java/org/apache/wiki/parser/MarkupParser.java
similarity index 100%
rename from jspwiki-war/src/main/java/org/apache/wiki/parser/MarkupParser.java
rename to jspwiki-main/src/main/java/org/apache/wiki/parser/MarkupParser.java
diff --git a/jspwiki-war/src/main/java/org/apache/wiki/parser/ParseException.java b/jspwiki-main/src/main/java/org/apache/wiki/parser/ParseException.java
similarity index 100%
rename from jspwiki-war/src/main/java/org/apache/wiki/parser/ParseException.java
rename to jspwiki-main/src/main/java/org/apache/wiki/parser/ParseException.java
diff --git a/jspwiki-war/src/main/java/org/apache/wiki/parser/PluginContent.java b/jspwiki-main/src/main/java/org/apache/wiki/parser/PluginContent.java
similarity index 100%
rename from jspwiki-war/src/main/java/org/apache/wiki/parser/PluginContent.java
rename to jspwiki-main/src/main/java/org/apache/wiki/parser/PluginContent.java
diff --git a/jspwiki-war/src/main/java/org/apache/wiki/parser/VariableContent.java b/jspwiki-main/src/main/java/org/apache/wiki/parser/VariableContent.java
similarity index 100%
rename from jspwiki-war/src/main/java/org/apache/wiki/parser/VariableContent.java
rename to jspwiki-main/src/main/java/org/apache/wiki/parser/VariableContent.java
diff --git a/jspwiki-war/src/main/java/org/apache/wiki/parser/WikiDocument.java b/jspwiki-main/src/main/java/org/apache/wiki/parser/WikiDocument.java
similarity index 100%
rename from jspwiki-war/src/main/java/org/apache/wiki/parser/WikiDocument.java
rename to jspwiki-main/src/main/java/org/apache/wiki/parser/WikiDocument.java
diff --git a/jspwiki-war/src/main/java/org/apache/wiki/plugin/AbstractReferralPlugin.java b/jspwiki-main/src/main/java/org/apache/wiki/plugin/AbstractReferralPlugin.java
similarity index 100%
rename from jspwiki-war/src/main/java/org/apache/wiki/plugin/AbstractReferralPlugin.java
rename to jspwiki-main/src/main/java/org/apache/wiki/plugin/AbstractReferralPlugin.java
diff --git a/jspwiki-war/src/main/java/org/apache/wiki/plugin/BugReportHandler.java b/jspwiki-main/src/main/java/org/apache/wiki/plugin/BugReportHandler.java
similarity index 100%
rename from jspwiki-war/src/main/java/org/apache/wiki/plugin/BugReportHandler.java
rename to jspwiki-main/src/main/java/org/apache/wiki/plugin/BugReportHandler.java
diff --git a/jspwiki-war/src/main/java/org/apache/wiki/plugin/Counter.java b/jspwiki-main/src/main/java/org/apache/wiki/plugin/Counter.java
similarity index 100%
rename from jspwiki-war/src/main/java/org/apache/wiki/plugin/Counter.java
rename to jspwiki-main/src/main/java/org/apache/wiki/plugin/Counter.java
diff --git a/jspwiki-war/src/main/java/org/apache/wiki/plugin/CurrentTimePlugin.java b/jspwiki-main/src/main/java/org/apache/wiki/plugin/CurrentTimePlugin.java
similarity index 100%
rename from jspwiki-war/src/main/java/org/apache/wiki/plugin/CurrentTimePlugin.java
rename to jspwiki-main/src/main/java/org/apache/wiki/plugin/CurrentTimePlugin.java
diff --git a/jspwiki-war/src/main/java/org/apache/wiki/plugin/DefaultPluginManager.java b/jspwiki-main/src/main/java/org/apache/wiki/plugin/DefaultPluginManager.java
similarity index 100%
rename from jspwiki-war/src/main/java/org/apache/wiki/plugin/DefaultPluginManager.java
rename to jspwiki-main/src/main/java/org/apache/wiki/plugin/DefaultPluginManager.java
diff --git a/jspwiki-war/src/main/java/org/apache/wiki/plugin/Denounce.java b/jspwiki-main/src/main/java/org/apache/wiki/plugin/Denounce.java
similarity index 100%
rename from jspwiki-war/src/main/java/org/apache/wiki/plugin/Denounce.java
rename to jspwiki-main/src/main/java/org/apache/wiki/plugin/Denounce.java
diff --git a/jspwiki-war/src/main/java/org/apache/wiki/plugin/Groups.java b/jspwiki-main/src/main/java/org/apache/wiki/plugin/Groups.java
similarity index 100%
rename from jspwiki-war/src/main/java/org/apache/wiki/plugin/Groups.java
rename to jspwiki-main/src/main/java/org/apache/wiki/plugin/Groups.java
diff --git a/jspwiki-war/src/main/java/org/apache/wiki/plugin/IfPlugin.java b/jspwiki-main/src/main/java/org/apache/wiki/plugin/IfPlugin.java
similarity index 100%
rename from jspwiki-war/src/main/java/org/apache/wiki/plugin/IfPlugin.java
rename to jspwiki-main/src/main/java/org/apache/wiki/plugin/IfPlugin.java
diff --git a/jspwiki-war/src/main/java/org/apache/wiki/plugin/Image.java b/jspwiki-main/src/main/java/org/apache/wiki/plugin/Image.java
similarity index 100%
rename from jspwiki-war/src/main/java/org/apache/wiki/plugin/Image.java
rename to jspwiki-main/src/main/java/org/apache/wiki/plugin/Image.java
diff --git a/jspwiki-war/src/main/java/org/apache/wiki/plugin/IndexPlugin.java b/jspwiki-main/src/main/java/org/apache/wiki/plugin/IndexPlugin.java
similarity index 100%
rename from jspwiki-war/src/main/java/org/apache/wiki/plugin/IndexPlugin.java
rename to jspwiki-main/src/main/java/org/apache/wiki/plugin/IndexPlugin.java
diff --git a/jspwiki-war/src/main/java/org/apache/wiki/plugin/InsertPage.java b/jspwiki-main/src/main/java/org/apache/wiki/plugin/InsertPage.java
similarity index 100%
rename from jspwiki-war/src/main/java/org/apache/wiki/plugin/InsertPage.java
rename to jspwiki-main/src/main/java/org/apache/wiki/plugin/InsertPage.java
diff --git a/jspwiki-war/src/main/java/org/apache/wiki/plugin/ListLocksPlugin.java b/jspwiki-main/src/main/java/org/apache/wiki/plugin/ListLocksPlugin.java
similarity index 100%
rename from jspwiki-war/src/main/java/org/apache/wiki/plugin/ListLocksPlugin.java
rename to jspwiki-main/src/main/java/org/apache/wiki/plugin/ListLocksPlugin.java
diff --git a/jspwiki-war/src/main/java/org/apache/wiki/plugin/Note.java b/jspwiki-main/src/main/java/org/apache/wiki/plugin/Note.java
similarity index 100%
rename from jspwiki-war/src/main/java/org/apache/wiki/plugin/Note.java
rename to jspwiki-main/src/main/java/org/apache/wiki/plugin/Note.java
diff --git a/jspwiki-war/src/main/java/org/apache/wiki/plugin/PageViewPlugin.java b/jspwiki-main/src/main/java/org/apache/wiki/plugin/PageViewPlugin.java
similarity index 100%
rename from jspwiki-war/src/main/java/org/apache/wiki/plugin/PageViewPlugin.java
rename to jspwiki-main/src/main/java/org/apache/wiki/plugin/PageViewPlugin.java
diff --git a/jspwiki-war/src/main/java/org/apache/wiki/plugin/RecentChangesPlugin.java b/jspwiki-main/src/main/java/org/apache/wiki/plugin/RecentChangesPlugin.java
similarity index 100%
rename from jspwiki-war/src/main/java/org/apache/wiki/plugin/RecentChangesPlugin.java
rename to jspwiki-main/src/main/java/org/apache/wiki/plugin/RecentChangesPlugin.java
diff --git a/jspwiki-war/src/main/java/org/apache/wiki/plugin/ReferredPagesPlugin.java b/jspwiki-main/src/main/java/org/apache/wiki/plugin/ReferredPagesPlugin.java
similarity index 100%
rename from jspwiki-war/src/main/java/org/apache/wiki/plugin/ReferredPagesPlugin.java
rename to jspwiki-main/src/main/java/org/apache/wiki/plugin/ReferredPagesPlugin.java
diff --git a/jspwiki-war/src/main/java/org/apache/wiki/plugin/ReferringPagesPlugin.java b/jspwiki-main/src/main/java/org/apache/wiki/plugin/ReferringPagesPlugin.java
similarity index 100%
rename from jspwiki-war/src/main/java/org/apache/wiki/plugin/ReferringPagesPlugin.java
rename to jspwiki-main/src/main/java/org/apache/wiki/plugin/ReferringPagesPlugin.java
diff --git a/jspwiki-war/src/main/java/org/apache/wiki/plugin/ReferringUndefinedPagesPlugin.java b/jspwiki-main/src/main/java/org/apache/wiki/plugin/ReferringUndefinedPagesPlugin.java
similarity index 100%
rename from jspwiki-war/src/main/java/org/apache/wiki/plugin/ReferringUndefinedPagesPlugin.java
rename to jspwiki-main/src/main/java/org/apache/wiki/plugin/ReferringUndefinedPagesPlugin.java
diff --git a/jspwiki-war/src/main/java/org/apache/wiki/plugin/SampleAjaxPlugin.java b/jspwiki-main/src/main/java/org/apache/wiki/plugin/SampleAjaxPlugin.java
similarity index 100%
rename from jspwiki-war/src/main/java/org/apache/wiki/plugin/SampleAjaxPlugin.java
rename to jspwiki-main/src/main/java/org/apache/wiki/plugin/SampleAjaxPlugin.java
diff --git a/jspwiki-war/src/main/java/org/apache/wiki/plugin/Search.java b/jspwiki-main/src/main/java/org/apache/wiki/plugin/Search.java
similarity index 100%
rename from jspwiki-war/src/main/java/org/apache/wiki/plugin/Search.java
rename to jspwiki-main/src/main/java/org/apache/wiki/plugin/Search.java
diff --git a/jspwiki-war/src/main/java/org/apache/wiki/plugin/SessionsPlugin.java b/jspwiki-main/src/main/java/org/apache/wiki/plugin/SessionsPlugin.java
similarity index 100%
rename from jspwiki-war/src/main/java/org/apache/wiki/plugin/SessionsPlugin.java
rename to jspwiki-main/src/main/java/org/apache/wiki/plugin/SessionsPlugin.java
diff --git a/jspwiki-war/src/main/java/org/apache/wiki/plugin/TableOfContents.java b/jspwiki-main/src/main/java/org/apache/wiki/plugin/TableOfContents.java
similarity index 100%
rename from jspwiki-war/src/main/java/org/apache/wiki/plugin/TableOfContents.java
rename to jspwiki-main/src/main/java/org/apache/wiki/plugin/TableOfContents.java
diff --git a/jspwiki-war/src/main/java/org/apache/wiki/plugin/UndefinedPagesPlugin.java b/jspwiki-main/src/main/java/org/apache/wiki/plugin/UndefinedPagesPlugin.java
similarity index 100%
rename from jspwiki-war/src/main/java/org/apache/wiki/plugin/UndefinedPagesPlugin.java
rename to jspwiki-main/src/main/java/org/apache/wiki/plugin/UndefinedPagesPlugin.java
diff --git a/jspwiki-war/src/main/java/org/apache/wiki/plugin/UnusedPagesPlugin.java b/jspwiki-main/src/main/java/org/apache/wiki/plugin/UnusedPagesPlugin.java
similarity index 100%
rename from jspwiki-war/src/main/java/org/apache/wiki/plugin/UnusedPagesPlugin.java
rename to jspwiki-main/src/main/java/org/apache/wiki/plugin/UnusedPagesPlugin.java
diff --git a/jspwiki-war/src/main/java/org/apache/wiki/plugin/WeblogArchivePlugin.java b/jspwiki-main/src/main/java/org/apache/wiki/plugin/WeblogArchivePlugin.java
similarity index 100%
rename from jspwiki-war/src/main/java/org/apache/wiki/plugin/WeblogArchivePlugin.java
rename to jspwiki-main/src/main/java/org/apache/wiki/plugin/WeblogArchivePlugin.java
diff --git a/jspwiki-war/src/main/java/org/apache/wiki/plugin/WeblogEntryPlugin.java b/jspwiki-main/src/main/java/org/apache/wiki/plugin/WeblogEntryPlugin.java
similarity index 100%
rename from jspwiki-war/src/main/java/org/apache/wiki/plugin/WeblogEntryPlugin.java
rename to jspwiki-main/src/main/java/org/apache/wiki/plugin/WeblogEntryPlugin.java
diff --git a/jspwiki-war/src/main/java/org/apache/wiki/plugin/WeblogPlugin.java b/jspwiki-main/src/main/java/org/apache/wiki/plugin/WeblogPlugin.java
similarity index 100%
rename from jspwiki-war/src/main/java/org/apache/wiki/plugin/WeblogPlugin.java
rename to jspwiki-main/src/main/java/org/apache/wiki/plugin/WeblogPlugin.java
diff --git a/jspwiki-war/src/main/java/org/apache/wiki/plugin/package.html b/jspwiki-main/src/main/java/org/apache/wiki/plugin/package.html
similarity index 100%
rename from jspwiki-war/src/main/java/org/apache/wiki/plugin/package.html
rename to jspwiki-main/src/main/java/org/apache/wiki/plugin/package.html
diff --git a/jspwiki-war/src/main/java/org/apache/wiki/preferences/Preferences.java b/jspwiki-main/src/main/java/org/apache/wiki/preferences/Preferences.java
similarity index 100%
rename from jspwiki-war/src/main/java/org/apache/wiki/preferences/Preferences.java
rename to jspwiki-main/src/main/java/org/apache/wiki/preferences/Preferences.java
diff --git a/jspwiki-war/src/main/java/org/apache/wiki/preferences/package.html b/jspwiki-main/src/main/java/org/apache/wiki/preferences/package.html
similarity index 100%
rename from jspwiki-war/src/main/java/org/apache/wiki/preferences/package.html
rename to jspwiki-main/src/main/java/org/apache/wiki/preferences/package.html
diff --git a/jspwiki-war/src/main/java/org/apache/wiki/providers/AbstractFileProvider.java b/jspwiki-main/src/main/java/org/apache/wiki/providers/AbstractFileProvider.java
similarity index 100%
rename from jspwiki-war/src/main/java/org/apache/wiki/providers/AbstractFileProvider.java
rename to jspwiki-main/src/main/java/org/apache/wiki/providers/AbstractFileProvider.java
diff --git a/jspwiki-war/src/main/java/org/apache/wiki/providers/BasicAttachmentProvider.java b/jspwiki-main/src/main/java/org/apache/wiki/providers/BasicAttachmentProvider.java
similarity index 100%
rename from jspwiki-war/src/main/java/org/apache/wiki/providers/BasicAttachmentProvider.java
rename to jspwiki-main/src/main/java/org/apache/wiki/providers/BasicAttachmentProvider.java
diff --git a/jspwiki-war/src/main/java/org/apache/wiki/providers/CachingAttachmentProvider.java b/jspwiki-main/src/main/java/org/apache/wiki/providers/CachingAttachmentProvider.java
similarity index 100%
rename from jspwiki-war/src/main/java/org/apache/wiki/providers/CachingAttachmentProvider.java
rename to jspwiki-main/src/main/java/org/apache/wiki/providers/CachingAttachmentProvider.java
diff --git a/jspwiki-war/src/main/java/org/apache/wiki/providers/CachingProvider.java b/jspwiki-main/src/main/java/org/apache/wiki/providers/CachingProvider.java
similarity index 100%
rename from jspwiki-war/src/main/java/org/apache/wiki/providers/CachingProvider.java
rename to jspwiki-main/src/main/java/org/apache/wiki/providers/CachingProvider.java
diff --git a/jspwiki-war/src/main/java/org/apache/wiki/providers/FastSearch.java b/jspwiki-main/src/main/java/org/apache/wiki/providers/FastSearch.java
similarity index 100%
rename from jspwiki-war/src/main/java/org/apache/wiki/providers/FastSearch.java
rename to jspwiki-main/src/main/java/org/apache/wiki/providers/FastSearch.java
diff --git a/jspwiki-war/src/main/java/org/apache/wiki/providers/FileSystemProvider.java b/jspwiki-main/src/main/java/org/apache/wiki/providers/FileSystemProvider.java
similarity index 100%
rename from jspwiki-war/src/main/java/org/apache/wiki/providers/FileSystemProvider.java
rename to jspwiki-main/src/main/java/org/apache/wiki/providers/FileSystemProvider.java
diff --git a/jspwiki-war/src/main/java/org/apache/wiki/providers/NoSuchVersionException.java b/jspwiki-main/src/main/java/org/apache/wiki/providers/NoSuchVersionException.java
similarity index 100%
rename from jspwiki-war/src/main/java/org/apache/wiki/providers/NoSuchVersionException.java
rename to jspwiki-main/src/main/java/org/apache/wiki/providers/NoSuchVersionException.java
diff --git a/jspwiki-war/src/main/java/org/apache/wiki/providers/RepositoryModifiedException.java b/jspwiki-main/src/main/java/org/apache/wiki/providers/RepositoryModifiedException.java
similarity index 100%
rename from jspwiki-war/src/main/java/org/apache/wiki/providers/RepositoryModifiedException.java
rename to jspwiki-main/src/main/java/org/apache/wiki/providers/RepositoryModifiedException.java
diff --git a/jspwiki-war/src/main/java/org/apache/wiki/providers/VersioningFileProvider.java b/jspwiki-main/src/main/java/org/apache/wiki/providers/VersioningFileProvider.java
similarity index 100%
rename from jspwiki-war/src/main/java/org/apache/wiki/providers/VersioningFileProvider.java
rename to jspwiki-main/src/main/java/org/apache/wiki/providers/VersioningFileProvider.java
diff --git a/jspwiki-war/src/main/java/org/apache/wiki/providers/VersioningProvider.java b/jspwiki-main/src/main/java/org/apache/wiki/providers/VersioningProvider.java
similarity index 100%
rename from jspwiki-war/src/main/java/org/apache/wiki/providers/VersioningProvider.java
rename to jspwiki-main/src/main/java/org/apache/wiki/providers/VersioningProvider.java
diff --git a/jspwiki-war/src/main/java/org/apache/wiki/providers/WikiAttachmentProvider.java b/jspwiki-main/src/main/java/org/apache/wiki/providers/WikiAttachmentProvider.java
similarity index 100%
rename from jspwiki-war/src/main/java/org/apache/wiki/providers/WikiAttachmentProvider.java
rename to jspwiki-main/src/main/java/org/apache/wiki/providers/WikiAttachmentProvider.java
diff --git a/jspwiki-war/src/main/java/org/apache/wiki/providers/WikiPageProvider.java b/jspwiki-main/src/main/java/org/apache/wiki/providers/WikiPageProvider.java
similarity index 100%
rename from jspwiki-war/src/main/java/org/apache/wiki/providers/WikiPageProvider.java
rename to jspwiki-main/src/main/java/org/apache/wiki/providers/WikiPageProvider.java
diff --git a/jspwiki-war/src/main/java/org/apache/wiki/providers/package.html b/jspwiki-main/src/main/java/org/apache/wiki/providers/package.html
similarity index 100%
rename from jspwiki-war/src/main/java/org/apache/wiki/providers/package.html
rename to jspwiki-main/src/main/java/org/apache/wiki/providers/package.html
diff --git a/jspwiki-war/src/main/java/org/apache/wiki/render/CleanTextRenderer.java b/jspwiki-main/src/main/java/org/apache/wiki/render/CleanTextRenderer.java
similarity index 100%
rename from jspwiki-war/src/main/java/org/apache/wiki/render/CleanTextRenderer.java
rename to jspwiki-main/src/main/java/org/apache/wiki/render/CleanTextRenderer.java
diff --git a/jspwiki-war/src/main/java/org/apache/wiki/render/CreoleRenderer.java b/jspwiki-main/src/main/java/org/apache/wiki/render/CreoleRenderer.java
similarity index 100%
rename from jspwiki-war/src/main/java/org/apache/wiki/render/CreoleRenderer.java
rename to jspwiki-main/src/main/java/org/apache/wiki/render/CreoleRenderer.java
diff --git a/jspwiki-war/src/main/java/org/apache/wiki/render/CustomXMLOutputProcessor.java b/jspwiki-main/src/main/java/org/apache/wiki/render/CustomXMLOutputProcessor.java
similarity index 100%
rename from jspwiki-war/src/main/java/org/apache/wiki/render/CustomXMLOutputProcessor.java
rename to jspwiki-main/src/main/java/org/apache/wiki/render/CustomXMLOutputProcessor.java
diff --git a/jspwiki-war/src/main/java/org/apache/wiki/render/RenderingManager.java b/jspwiki-main/src/main/java/org/apache/wiki/render/RenderingManager.java
similarity index 100%
rename from jspwiki-war/src/main/java/org/apache/wiki/render/RenderingManager.java
rename to jspwiki-main/src/main/java/org/apache/wiki/render/RenderingManager.java
diff --git a/jspwiki-war/src/main/java/org/apache/wiki/render/WikiRenderer.java b/jspwiki-main/src/main/java/org/apache/wiki/render/WikiRenderer.java
similarity index 100%
rename from jspwiki-war/src/main/java/org/apache/wiki/render/WikiRenderer.java
rename to jspwiki-main/src/main/java/org/apache/wiki/render/WikiRenderer.java
diff --git a/jspwiki-war/src/main/java/org/apache/wiki/render/WysiwygEditingRenderer.java b/jspwiki-main/src/main/java/org/apache/wiki/render/WysiwygEditingRenderer.java
similarity index 100%
rename from jspwiki-war/src/main/java/org/apache/wiki/render/WysiwygEditingRenderer.java
rename to jspwiki-main/src/main/java/org/apache/wiki/render/WysiwygEditingRenderer.java
diff --git a/jspwiki-war/src/main/java/org/apache/wiki/render/XHTMLRenderer.java b/jspwiki-main/src/main/java/org/apache/wiki/render/XHTMLRenderer.java
similarity index 100%
rename from jspwiki-war/src/main/java/org/apache/wiki/render/XHTMLRenderer.java
rename to jspwiki-main/src/main/java/org/apache/wiki/render/XHTMLRenderer.java
diff --git a/jspwiki-war/src/main/java/org/apache/wiki/rpc/atom/AtomAPIServlet.java b/jspwiki-main/src/main/java/org/apache/wiki/rpc/atom/AtomAPIServlet.java
similarity index 100%
rename from jspwiki-war/src/main/java/org/apache/wiki/rpc/atom/AtomAPIServlet.java
rename to jspwiki-main/src/main/java/org/apache/wiki/rpc/atom/AtomAPIServlet.java
diff --git a/jspwiki-war/src/main/java/org/apache/wiki/rss/AtomFeed.java b/jspwiki-main/src/main/java/org/apache/wiki/rss/AtomFeed.java
similarity index 100%
rename from jspwiki-war/src/main/java/org/apache/wiki/rss/AtomFeed.java
rename to jspwiki-main/src/main/java/org/apache/wiki/rss/AtomFeed.java
diff --git a/jspwiki-war/src/main/java/org/apache/wiki/rss/Entry.java b/jspwiki-main/src/main/java/org/apache/wiki/rss/Entry.java
similarity index 100%
rename from jspwiki-war/src/main/java/org/apache/wiki/rss/Entry.java
rename to jspwiki-main/src/main/java/org/apache/wiki/rss/Entry.java
diff --git a/jspwiki-war/src/main/java/org/apache/wiki/rss/Feed.java b/jspwiki-main/src/main/java/org/apache/wiki/rss/Feed.java
similarity index 100%
rename from jspwiki-war/src/main/java/org/apache/wiki/rss/Feed.java
rename to jspwiki-main/src/main/java/org/apache/wiki/rss/Feed.java
diff --git a/jspwiki-war/src/main/java/org/apache/wiki/rss/RSS10Feed.java b/jspwiki-main/src/main/java/org/apache/wiki/rss/RSS10Feed.java
similarity index 100%
rename from jspwiki-war/src/main/java/org/apache/wiki/rss/RSS10Feed.java
rename to jspwiki-main/src/main/java/org/apache/wiki/rss/RSS10Feed.java
diff --git a/jspwiki-war/src/main/java/org/apache/wiki/rss/RSS20Feed.java b/jspwiki-main/src/main/java/org/apache/wiki/rss/RSS20Feed.java
similarity index 100%
rename from jspwiki-war/src/main/java/org/apache/wiki/rss/RSS20Feed.java
rename to jspwiki-main/src/main/java/org/apache/wiki/rss/RSS20Feed.java
diff --git a/jspwiki-war/src/main/java/org/apache/wiki/rss/RSSGenerator.java b/jspwiki-main/src/main/java/org/apache/wiki/rss/RSSGenerator.java
similarity index 100%
rename from jspwiki-war/src/main/java/org/apache/wiki/rss/RSSGenerator.java
rename to jspwiki-main/src/main/java/org/apache/wiki/rss/RSSGenerator.java
diff --git a/jspwiki-war/src/main/java/org/apache/wiki/rss/RSSThread.java b/jspwiki-main/src/main/java/org/apache/wiki/rss/RSSThread.java
similarity index 100%
rename from jspwiki-war/src/main/java/org/apache/wiki/rss/RSSThread.java
rename to jspwiki-main/src/main/java/org/apache/wiki/rss/RSSThread.java
diff --git a/jspwiki-war/src/main/java/org/apache/wiki/search/BasicSearchProvider.java b/jspwiki-main/src/main/java/org/apache/wiki/search/BasicSearchProvider.java
similarity index 100%
rename from jspwiki-war/src/main/java/org/apache/wiki/search/BasicSearchProvider.java
rename to jspwiki-main/src/main/java/org/apache/wiki/search/BasicSearchProvider.java
diff --git a/jspwiki-war/src/main/java/org/apache/wiki/search/LuceneSearchProvider.java b/jspwiki-main/src/main/java/org/apache/wiki/search/LuceneSearchProvider.java
similarity index 100%
rename from jspwiki-war/src/main/java/org/apache/wiki/search/LuceneSearchProvider.java
rename to jspwiki-main/src/main/java/org/apache/wiki/search/LuceneSearchProvider.java
diff --git a/jspwiki-war/src/main/java/org/apache/wiki/search/QueryItem.java b/jspwiki-main/src/main/java/org/apache/wiki/search/QueryItem.java
similarity index 100%
rename from jspwiki-war/src/main/java/org/apache/wiki/search/QueryItem.java
rename to jspwiki-main/src/main/java/org/apache/wiki/search/QueryItem.java
diff --git a/jspwiki-war/src/main/java/org/apache/wiki/search/SearchManager.java b/jspwiki-main/src/main/java/org/apache/wiki/search/SearchManager.java
similarity index 100%
rename from jspwiki-war/src/main/java/org/apache/wiki/search/SearchManager.java
rename to jspwiki-main/src/main/java/org/apache/wiki/search/SearchManager.java
diff --git a/jspwiki-war/src/main/java/org/apache/wiki/search/SearchMatcher.java b/jspwiki-main/src/main/java/org/apache/wiki/search/SearchMatcher.java
similarity index 100%
rename from jspwiki-war/src/main/java/org/apache/wiki/search/SearchMatcher.java
rename to jspwiki-main/src/main/java/org/apache/wiki/search/SearchMatcher.java
diff --git a/jspwiki-war/src/main/java/org/apache/wiki/search/SearchProvider.java b/jspwiki-main/src/main/java/org/apache/wiki/search/SearchProvider.java
similarity index 100%
rename from jspwiki-war/src/main/java/org/apache/wiki/search/SearchProvider.java
rename to jspwiki-main/src/main/java/org/apache/wiki/search/SearchProvider.java
diff --git a/jspwiki-war/src/main/java/org/apache/wiki/search/SearchResult.java b/jspwiki-main/src/main/java/org/apache/wiki/search/SearchResult.java
similarity index 100%
rename from jspwiki-war/src/main/java/org/apache/wiki/search/SearchResult.java
rename to jspwiki-main/src/main/java/org/apache/wiki/search/SearchResult.java
diff --git a/jspwiki-war/src/main/java/org/apache/wiki/search/SearchResultComparator.java b/jspwiki-main/src/main/java/org/apache/wiki/search/SearchResultComparator.java
similarity index 100%
rename from jspwiki-war/src/main/java/org/apache/wiki/search/SearchResultComparator.java
rename to jspwiki-main/src/main/java/org/apache/wiki/search/SearchResultComparator.java
diff --git a/jspwiki-war/src/main/java/org/apache/wiki/search/package.html b/jspwiki-main/src/main/java/org/apache/wiki/search/package.html
similarity index 100%
rename from jspwiki-war/src/main/java/org/apache/wiki/search/package.html
rename to jspwiki-main/src/main/java/org/apache/wiki/search/package.html
diff --git a/jspwiki-war/src/main/java/org/apache/wiki/tags/AdminBeanIteratorInfo.java b/jspwiki-main/src/main/java/org/apache/wiki/tags/AdminBeanIteratorInfo.java
similarity index 100%
rename from jspwiki-war/src/main/java/org/apache/wiki/tags/AdminBeanIteratorInfo.java
rename to jspwiki-main/src/main/java/org/apache/wiki/tags/AdminBeanIteratorInfo.java
diff --git a/jspwiki-war/src/main/java/org/apache/wiki/tags/AdminBeanIteratorTag.java b/jspwiki-main/src/main/java/org/apache/wiki/tags/AdminBeanIteratorTag.java
similarity index 100%
rename from jspwiki-war/src/main/java/org/apache/wiki/tags/AdminBeanIteratorTag.java
rename to jspwiki-main/src/main/java/org/apache/wiki/tags/AdminBeanIteratorTag.java
diff --git a/jspwiki-war/src/main/java/org/apache/wiki/tags/AttachmentsIteratorInfo.java b/jspwiki-main/src/main/java/org/apache/wiki/tags/AttachmentsIteratorInfo.java
similarity index 100%
rename from jspwiki-war/src/main/java/org/apache/wiki/tags/AttachmentsIteratorInfo.java
rename to jspwiki-main/src/main/java/org/apache/wiki/tags/AttachmentsIteratorInfo.java
diff --git a/jspwiki-war/src/main/java/org/apache/wiki/tags/AttachmentsIteratorTag.java b/jspwiki-main/src/main/java/org/apache/wiki/tags/AttachmentsIteratorTag.java
similarity index 100%
rename from jspwiki-war/src/main/java/org/apache/wiki/tags/AttachmentsIteratorTag.java
rename to jspwiki-main/src/main/java/org/apache/wiki/tags/AttachmentsIteratorTag.java
diff --git a/jspwiki-war/src/main/java/org/apache/wiki/tags/AuthorTag.java b/jspwiki-main/src/main/java/org/apache/wiki/tags/AuthorTag.java
similarity index 100%
rename from jspwiki-war/src/main/java/org/apache/wiki/tags/AuthorTag.java
rename to jspwiki-main/src/main/java/org/apache/wiki/tags/AuthorTag.java
diff --git a/jspwiki-war/src/main/java/org/apache/wiki/tags/BaseURLTag.java b/jspwiki-main/src/main/java/org/apache/wiki/tags/BaseURLTag.java
similarity index 100%
rename from jspwiki-war/src/main/java/org/apache/wiki/tags/BaseURLTag.java
rename to jspwiki-main/src/main/java/org/apache/wiki/tags/BaseURLTag.java
diff --git a/jspwiki-war/src/main/java/org/apache/wiki/tags/BreadcrumbsTag.java b/jspwiki-main/src/main/java/org/apache/wiki/tags/BreadcrumbsTag.java
similarity index 100%
rename from jspwiki-war/src/main/java/org/apache/wiki/tags/BreadcrumbsTag.java
rename to jspwiki-main/src/main/java/org/apache/wiki/tags/BreadcrumbsTag.java
diff --git a/jspwiki-war/src/main/java/org/apache/wiki/tags/CalendarTag.java b/jspwiki-main/src/main/java/org/apache/wiki/tags/CalendarTag.java
similarity index 100%
rename from jspwiki-war/src/main/java/org/apache/wiki/tags/CalendarTag.java
rename to jspwiki-main/src/main/java/org/apache/wiki/tags/CalendarTag.java
diff --git a/jspwiki-war/src/main/java/org/apache/wiki/tags/CheckLockInfo.java b/jspwiki-main/src/main/java/org/apache/wiki/tags/CheckLockInfo.java
similarity index 100%
rename from jspwiki-war/src/main/java/org/apache/wiki/tags/CheckLockInfo.java
rename to jspwiki-main/src/main/java/org/apache/wiki/tags/CheckLockInfo.java
diff --git a/jspwiki-war/src/main/java/org/apache/wiki/tags/CheckLockTag.java b/jspwiki-main/src/main/java/org/apache/wiki/tags/CheckLockTag.java
similarity index 100%
rename from jspwiki-war/src/main/java/org/apache/wiki/tags/CheckLockTag.java
rename to jspwiki-main/src/main/java/org/apache/wiki/tags/CheckLockTag.java
diff --git a/jspwiki-war/src/main/java/org/apache/wiki/tags/CheckRequestContextTag.java b/jspwiki-main/src/main/java/org/apache/wiki/tags/CheckRequestContextTag.java
similarity index 100%
rename from jspwiki-war/src/main/java/org/apache/wiki/tags/CheckRequestContextTag.java
rename to jspwiki-main/src/main/java/org/apache/wiki/tags/CheckRequestContextTag.java
diff --git a/jspwiki-war/src/main/java/org/apache/wiki/tags/CheckVersionTag.java b/jspwiki-main/src/main/java/org/apache/wiki/tags/CheckVersionTag.java
similarity index 100%
rename from jspwiki-war/src/main/java/org/apache/wiki/tags/CheckVersionTag.java
rename to jspwiki-main/src/main/java/org/apache/wiki/tags/CheckVersionTag.java
diff --git a/jspwiki-war/src/main/java/org/apache/wiki/tags/CommentLinkTag.java b/jspwiki-main/src/main/java/org/apache/wiki/tags/CommentLinkTag.java
similarity index 100%
rename from jspwiki-war/src/main/java/org/apache/wiki/tags/CommentLinkTag.java
rename to jspwiki-main/src/main/java/org/apache/wiki/tags/CommentLinkTag.java
diff --git a/jspwiki-war/src/main/java/org/apache/wiki/tags/ContentEncodingTag.java b/jspwiki-main/src/main/java/org/apache/wiki/tags/ContentEncodingTag.java
similarity index 100%
rename from jspwiki-war/src/main/java/org/apache/wiki/tags/ContentEncodingTag.java
rename to jspwiki-main/src/main/java/org/apache/wiki/tags/ContentEncodingTag.java
diff --git a/jspwiki-war/src/main/java/org/apache/wiki/tags/ContentTag.java b/jspwiki-main/src/main/java/org/apache/wiki/tags/ContentTag.java
similarity index 100%
rename from jspwiki-war/src/main/java/org/apache/wiki/tags/ContentTag.java
rename to jspwiki-main/src/main/java/org/apache/wiki/tags/ContentTag.java
diff --git a/jspwiki-war/src/main/java/org/apache/wiki/tags/CookieTag.java b/jspwiki-main/src/main/java/org/apache/wiki/tags/CookieTag.java
similarity index 100%
rename from jspwiki-war/src/main/java/org/apache/wiki/tags/CookieTag.java
rename to jspwiki-main/src/main/java/org/apache/wiki/tags/CookieTag.java
diff --git a/jspwiki-war/src/main/java/org/apache/wiki/tags/DiffLinkTag.java b/jspwiki-main/src/main/java/org/apache/wiki/tags/DiffLinkTag.java
similarity index 100%
rename from jspwiki-war/src/main/java/org/apache/wiki/tags/DiffLinkTag.java
rename to jspwiki-main/src/main/java/org/apache/wiki/tags/DiffLinkTag.java
diff --git a/jspwiki-war/src/main/java/org/apache/wiki/tags/EditLinkTag.java b/jspwiki-main/src/main/java/org/apache/wiki/tags/EditLinkTag.java
similarity index 100%
rename from jspwiki-war/src/main/java/org/apache/wiki/tags/EditLinkTag.java
rename to jspwiki-main/src/main/java/org/apache/wiki/tags/EditLinkTag.java
diff --git a/jspwiki-war/src/main/java/org/apache/wiki/tags/EditorIteratorInfo.java b/jspwiki-main/src/main/java/org/apache/wiki/tags/EditorIteratorInfo.java
similarity index 100%
rename from jspwiki-war/src/main/java/org/apache/wiki/tags/EditorIteratorInfo.java
rename to jspwiki-main/src/main/java/org/apache/wiki/tags/EditorIteratorInfo.java
diff --git a/jspwiki-war/src/main/java/org/apache/wiki/tags/EditorIteratorTag.java b/jspwiki-main/src/main/java/org/apache/wiki/tags/EditorIteratorTag.java
similarity index 100%
rename from jspwiki-war/src/main/java/org/apache/wiki/tags/EditorIteratorTag.java
rename to jspwiki-main/src/main/java/org/apache/wiki/tags/EditorIteratorTag.java
diff --git a/jspwiki-war/src/main/java/org/apache/wiki/tags/EditorTag.java b/jspwiki-main/src/main/java/org/apache/wiki/tags/EditorTag.java
similarity index 100%
rename from jspwiki-war/src/main/java/org/apache/wiki/tags/EditorTag.java
rename to jspwiki-main/src/main/java/org/apache/wiki/tags/EditorTag.java
diff --git a/jspwiki-war/src/main/java/org/apache/wiki/tags/FeedDiscoveryTag.java b/jspwiki-main/src/main/java/org/apache/wiki/tags/FeedDiscoveryTag.java
similarity index 100%
rename from jspwiki-war/src/main/java/org/apache/wiki/tags/FeedDiscoveryTag.java
rename to jspwiki-main/src/main/java/org/apache/wiki/tags/FeedDiscoveryTag.java
diff --git a/jspwiki-war/src/main/java/org/apache/wiki/tags/HasAttachmentsTag.java b/jspwiki-main/src/main/java/org/apache/wiki/tags/HasAttachmentsTag.java
similarity index 100%
rename from jspwiki-war/src/main/java/org/apache/wiki/tags/HasAttachmentsTag.java
rename to jspwiki-main/src/main/java/org/apache/wiki/tags/HasAttachmentsTag.java
diff --git a/jspwiki-war/src/main/java/org/apache/wiki/tags/HistoryIteratorInfo.java b/jspwiki-main/src/main/java/org/apache/wiki/tags/HistoryIteratorInfo.java
similarity index 100%
rename from jspwiki-war/src/main/java/org/apache/wiki/tags/HistoryIteratorInfo.java
rename to jspwiki-main/src/main/java/org/apache/wiki/tags/HistoryIteratorInfo.java
diff --git a/jspwiki-war/src/main/java/org/apache/wiki/tags/HistoryIteratorTag.java b/jspwiki-main/src/main/java/org/apache/wiki/tags/HistoryIteratorTag.java
similarity index 100%
rename from jspwiki-war/src/main/java/org/apache/wiki/tags/HistoryIteratorTag.java
rename to jspwiki-main/src/main/java/org/apache/wiki/tags/HistoryIteratorTag.java
diff --git a/jspwiki-war/src/main/java/org/apache/wiki/tags/IfNoSearchResultsTag.java b/jspwiki-main/src/main/java/org/apache/wiki/tags/IfNoSearchResultsTag.java
similarity index 100%
rename from jspwiki-war/src/main/java/org/apache/wiki/tags/IfNoSearchResultsTag.java
rename to jspwiki-main/src/main/java/org/apache/wiki/tags/IfNoSearchResultsTag.java
diff --git a/jspwiki-war/src/main/java/org/apache/wiki/tags/IncludeResourcesTag.java b/jspwiki-main/src/main/java/org/apache/wiki/tags/IncludeResourcesTag.java
similarity index 100%
rename from jspwiki-war/src/main/java/org/apache/wiki/tags/IncludeResourcesTag.java
rename to jspwiki-main/src/main/java/org/apache/wiki/tags/IncludeResourcesTag.java
diff --git a/jspwiki-war/src/main/java/org/apache/wiki/tags/IncludeTag.java b/jspwiki-main/src/main/java/org/apache/wiki/tags/IncludeTag.java
similarity index 100%
rename from jspwiki-war/src/main/java/org/apache/wiki/tags/IncludeTag.java
rename to jspwiki-main/src/main/java/org/apache/wiki/tags/IncludeTag.java
diff --git a/jspwiki-war/src/main/java/org/apache/wiki/tags/InsertDiffTag.java b/jspwiki-main/src/main/java/org/apache/wiki/tags/InsertDiffTag.java
similarity index 100%
rename from jspwiki-war/src/main/java/org/apache/wiki/tags/InsertDiffTag.java
rename to jspwiki-main/src/main/java/org/apache/wiki/tags/InsertDiffTag.java
diff --git a/jspwiki-war/src/main/java/org/apache/wiki/tags/InsertPageTag.java b/jspwiki-main/src/main/java/org/apache/wiki/tags/InsertPageTag.java
similarity index 100%
rename from jspwiki-war/src/main/java/org/apache/wiki/tags/InsertPageTag.java
rename to jspwiki-main/src/main/java/org/apache/wiki/tags/InsertPageTag.java
diff --git a/jspwiki-war/src/main/java/org/apache/wiki/tags/IteratorTag.java b/jspwiki-main/src/main/java/org/apache/wiki/tags/IteratorTag.java
similarity index 100%
rename from jspwiki-war/src/main/java/org/apache/wiki/tags/IteratorTag.java
rename to jspwiki-main/src/main/java/org/apache/wiki/tags/IteratorTag.java
diff --git a/jspwiki-war/src/main/java/org/apache/wiki/tags/LinkTag.java b/jspwiki-main/src/main/java/org/apache/wiki/tags/LinkTag.java
similarity index 100%
rename from jspwiki-war/src/main/java/org/apache/wiki/tags/LinkTag.java
rename to jspwiki-main/src/main/java/org/apache/wiki/tags/LinkTag.java
diff --git a/jspwiki-war/src/main/java/org/apache/wiki/tags/LinkToParentTag.java b/jspwiki-main/src/main/java/org/apache/wiki/tags/LinkToParentTag.java
similarity index 100%
rename from jspwiki-war/src/main/java/org/apache/wiki/tags/LinkToParentTag.java
rename to jspwiki-main/src/main/java/org/apache/wiki/tags/LinkToParentTag.java
diff --git a/jspwiki-war/src/main/java/org/apache/wiki/tags/LinkToTag.java b/jspwiki-main/src/main/java/org/apache/wiki/tags/LinkToTag.java
similarity index 100%
rename from jspwiki-war/src/main/java/org/apache/wiki/tags/LinkToTag.java
rename to jspwiki-main/src/main/java/org/apache/wiki/tags/LinkToTag.java
diff --git a/jspwiki-war/src/main/java/org/apache/wiki/tags/MessagesTag.java b/jspwiki-main/src/main/java/org/apache/wiki/tags/MessagesTag.java
similarity index 100%
rename from jspwiki-war/src/main/java/org/apache/wiki/tags/MessagesTag.java
rename to jspwiki-main/src/main/java/org/apache/wiki/tags/MessagesTag.java
diff --git a/jspwiki-war/src/main/java/org/apache/wiki/tags/NextVersionTag.java b/jspwiki-main/src/main/java/org/apache/wiki/tags/NextVersionTag.java
similarity index 100%
rename from jspwiki-war/src/main/java/org/apache/wiki/tags/NextVersionTag.java
rename to jspwiki-main/src/main/java/org/apache/wiki/tags/NextVersionTag.java
diff --git a/jspwiki-war/src/main/java/org/apache/wiki/tags/NoSuchPageTag.java b/jspwiki-main/src/main/java/org/apache/wiki/tags/NoSuchPageTag.java
similarity index 100%
rename from jspwiki-war/src/main/java/org/apache/wiki/tags/NoSuchPageTag.java
rename to jspwiki-main/src/main/java/org/apache/wiki/tags/NoSuchPageTag.java
diff --git a/jspwiki-war/src/main/java/org/apache/wiki/tags/PageDateTag.java b/jspwiki-main/src/main/java/org/apache/wiki/tags/PageDateTag.java
similarity index 100%
rename from jspwiki-war/src/main/java/org/apache/wiki/tags/PageDateTag.java
rename to jspwiki-main/src/main/java/org/apache/wiki/tags/PageDateTag.java
diff --git a/jspwiki-war/src/main/java/org/apache/wiki/tags/PageExistsTag.java b/jspwiki-main/src/main/java/org/apache/wiki/tags/PageExistsTag.java
similarity index 100%
rename from jspwiki-war/src/main/java/org/apache/wiki/tags/PageExistsTag.java
rename to jspwiki-main/src/main/java/org/apache/wiki/tags/PageExistsTag.java
diff --git a/jspwiki-war/src/main/java/org/apache/wiki/tags/PageInfoLinkTag.java b/jspwiki-main/src/main/java/org/apache/wiki/tags/PageInfoLinkTag.java
similarity index 100%
rename from jspwiki-war/src/main/java/org/apache/wiki/tags/PageInfoLinkTag.java
rename to jspwiki-main/src/main/java/org/apache/wiki/tags/PageInfoLinkTag.java
diff --git a/jspwiki-war/src/main/java/org/apache/wiki/tags/PageNameTag.java b/jspwiki-main/src/main/java/org/apache/wiki/tags/PageNameTag.java
similarity index 100%
rename from jspwiki-war/src/main/java/org/apache/wiki/tags/PageNameTag.java
rename to jspwiki-main/src/main/java/org/apache/wiki/tags/PageNameTag.java
diff --git a/jspwiki-war/src/main/java/org/apache/wiki/tags/PageSizeTag.java b/jspwiki-main/src/main/java/org/apache/wiki/tags/PageSizeTag.java
similarity index 100%
rename from jspwiki-war/src/main/java/org/apache/wiki/tags/PageSizeTag.java
rename to jspwiki-main/src/main/java/org/apache/wiki/tags/PageSizeTag.java
diff --git a/jspwiki-war/src/main/java/org/apache/wiki/tags/PageTypeTag.java b/jspwiki-main/src/main/java/org/apache/wiki/tags/PageTypeTag.java
similarity index 100%
rename from jspwiki-war/src/main/java/org/apache/wiki/tags/PageTypeTag.java
rename to jspwiki-main/src/main/java/org/apache/wiki/tags/PageTypeTag.java
diff --git a/jspwiki-war/src/main/java/org/apache/wiki/tags/PageVersionTag.java b/jspwiki-main/src/main/java/org/apache/wiki/tags/PageVersionTag.java
similarity index 100%
rename from jspwiki-war/src/main/java/org/apache/wiki/tags/PageVersionTag.java
rename to jspwiki-main/src/main/java/org/apache/wiki/tags/PageVersionTag.java
diff --git a/jspwiki-war/src/main/java/org/apache/wiki/tags/ParamHandler.java b/jspwiki-main/src/main/java/org/apache/wiki/tags/ParamHandler.java
similarity index 100%
rename from jspwiki-war/src/main/java/org/apache/wiki/tags/ParamHandler.java
rename to jspwiki-main/src/main/java/org/apache/wiki/tags/ParamHandler.java
diff --git a/jspwiki-war/src/main/java/org/apache/wiki/tags/ParamTag.java b/jspwiki-main/src/main/java/org/apache/wiki/tags/ParamTag.java
similarity index 100%
rename from jspwiki-war/src/main/java/org/apache/wiki/tags/ParamTag.java
rename to jspwiki-main/src/main/java/org/apache/wiki/tags/ParamTag.java
diff --git a/jspwiki-war/src/main/java/org/apache/wiki/tags/ParentPageNameTag.java b/jspwiki-main/src/main/java/org/apache/wiki/tags/ParentPageNameTag.java
similarity index 100%
rename from jspwiki-war/src/main/java/org/apache/wiki/tags/ParentPageNameTag.java
rename to jspwiki-main/src/main/java/org/apache/wiki/tags/ParentPageNameTag.java
diff --git a/jspwiki-war/src/main/java/org/apache/wiki/tags/PermissionTag.java b/jspwiki-main/src/main/java/org/apache/wiki/tags/PermissionTag.java
similarity index 100%
rename from jspwiki-war/src/main/java/org/apache/wiki/tags/PermissionTag.java
rename to jspwiki-main/src/main/java/org/apache/wiki/tags/PermissionTag.java
diff --git a/jspwiki-war/src/main/java/org/apache/wiki/tags/PluginTag.java b/jspwiki-main/src/main/java/org/apache/wiki/tags/PluginTag.java
similarity index 100%
rename from jspwiki-war/src/main/java/org/apache/wiki/tags/PluginTag.java
rename to jspwiki-main/src/main/java/org/apache/wiki/tags/PluginTag.java
diff --git a/jspwiki-war/src/main/java/org/apache/wiki/tags/PreviousVersionTag.java b/jspwiki-main/src/main/java/org/apache/wiki/tags/PreviousVersionTag.java
similarity index 100%
rename from jspwiki-war/src/main/java/org/apache/wiki/tags/PreviousVersionTag.java
rename to jspwiki-main/src/main/java/org/apache/wiki/tags/PreviousVersionTag.java
diff --git a/jspwiki-war/src/main/java/org/apache/wiki/tags/RSSImageLinkTag.java b/jspwiki-main/src/main/java/org/apache/wiki/tags/RSSImageLinkTag.java
similarity index 100%
rename from jspwiki-war/src/main/java/org/apache/wiki/tags/RSSImageLinkTag.java
rename to jspwiki-main/src/main/java/org/apache/wiki/tags/RSSImageLinkTag.java
diff --git a/jspwiki-war/src/main/java/org/apache/wiki/tags/RequestResourceTag.java b/jspwiki-main/src/main/java/org/apache/wiki/tags/RequestResourceTag.java
similarity index 100%
rename from jspwiki-war/src/main/java/org/apache/wiki/tags/RequestResourceTag.java
rename to jspwiki-main/src/main/java/org/apache/wiki/tags/RequestResourceTag.java
diff --git a/jspwiki-war/src/main/java/org/apache/wiki/tags/SearchResultIteratorInfo.java b/jspwiki-main/src/main/java/org/apache/wiki/tags/SearchResultIteratorInfo.java
similarity index 100%
rename from jspwiki-war/src/main/java/org/apache/wiki/tags/SearchResultIteratorInfo.java
rename to jspwiki-main/src/main/java/org/apache/wiki/tags/SearchResultIteratorInfo.java
diff --git a/jspwiki-war/src/main/java/org/apache/wiki/tags/SearchResultIteratorTag.java b/jspwiki-main/src/main/java/org/apache/wiki/tags/SearchResultIteratorTag.java
similarity index 100%
rename from jspwiki-war/src/main/java/org/apache/wiki/tags/SearchResultIteratorTag.java
rename to jspwiki-main/src/main/java/org/apache/wiki/tags/SearchResultIteratorTag.java
diff --git a/jspwiki-war/src/main/java/org/apache/wiki/tags/SearchResultsSizeTag.java b/jspwiki-main/src/main/java/org/apache/wiki/tags/SearchResultsSizeTag.java
similarity index 100%
rename from jspwiki-war/src/main/java/org/apache/wiki/tags/SearchResultsSizeTag.java
rename to jspwiki-main/src/main/java/org/apache/wiki/tags/SearchResultsSizeTag.java
diff --git a/jspwiki-war/src/main/java/org/apache/wiki/tags/SearchResultsTag.java b/jspwiki-main/src/main/java/org/apache/wiki/tags/SearchResultsTag.java
similarity index 100%
rename from jspwiki-war/src/main/java/org/apache/wiki/tags/SearchResultsTag.java
rename to jspwiki-main/src/main/java/org/apache/wiki/tags/SearchResultsTag.java
diff --git a/jspwiki-war/src/main/java/org/apache/wiki/tags/SetPaginationTag.java b/jspwiki-main/src/main/java/org/apache/wiki/tags/SetPaginationTag.java
similarity index 100%
rename from jspwiki-war/src/main/java/org/apache/wiki/tags/SetPaginationTag.java
rename to jspwiki-main/src/main/java/org/apache/wiki/tags/SetPaginationTag.java
diff --git a/jspwiki-war/src/main/java/org/apache/wiki/tags/TabTag.java b/jspwiki-main/src/main/java/org/apache/wiki/tags/TabTag.java
similarity index 100%
rename from jspwiki-war/src/main/java/org/apache/wiki/tags/TabTag.java
rename to jspwiki-main/src/main/java/org/apache/wiki/tags/TabTag.java
diff --git a/jspwiki-war/src/main/java/org/apache/wiki/tags/TabbedSectionTag.java b/jspwiki-main/src/main/java/org/apache/wiki/tags/TabbedSectionTag.java
similarity index 100%
rename from jspwiki-war/src/main/java/org/apache/wiki/tags/TabbedSectionTag.java
rename to jspwiki-main/src/main/java/org/apache/wiki/tags/TabbedSectionTag.java
diff --git a/jspwiki-war/src/main/java/org/apache/wiki/tags/TemplateDirTag.java b/jspwiki-main/src/main/java/org/apache/wiki/tags/TemplateDirTag.java
similarity index 100%
rename from jspwiki-war/src/main/java/org/apache/wiki/tags/TemplateDirTag.java
rename to jspwiki-main/src/main/java/org/apache/wiki/tags/TemplateDirTag.java
diff --git a/jspwiki-war/src/main/java/org/apache/wiki/tags/TranslateTag.java b/jspwiki-main/src/main/java/org/apache/wiki/tags/TranslateTag.java
similarity index 100%
rename from jspwiki-war/src/main/java/org/apache/wiki/tags/TranslateTag.java
rename to jspwiki-main/src/main/java/org/apache/wiki/tags/TranslateTag.java
diff --git a/jspwiki-war/src/main/java/org/apache/wiki/tags/UploadLinkTag.java b/jspwiki-main/src/main/java/org/apache/wiki/tags/UploadLinkTag.java
similarity index 100%
rename from jspwiki-war/src/main/java/org/apache/wiki/tags/UploadLinkTag.java
rename to jspwiki-main/src/main/java/org/apache/wiki/tags/UploadLinkTag.java
diff --git a/jspwiki-war/src/main/java/org/apache/wiki/tags/UserCheckTag.java b/jspwiki-main/src/main/java/org/apache/wiki/tags/UserCheckTag.java
similarity index 100%
rename from jspwiki-war/src/main/java/org/apache/wiki/tags/UserCheckTag.java
rename to jspwiki-main/src/main/java/org/apache/wiki/tags/UserCheckTag.java
diff --git a/jspwiki-war/src/main/java/org/apache/wiki/tags/UserNameTag.java b/jspwiki-main/src/main/java/org/apache/wiki/tags/UserNameTag.java
similarity index 100%
rename from jspwiki-war/src/main/java/org/apache/wiki/tags/UserNameTag.java
rename to jspwiki-main/src/main/java/org/apache/wiki/tags/UserNameTag.java
diff --git a/jspwiki-war/src/main/java/org/apache/wiki/tags/UserProfileTag.java b/jspwiki-main/src/main/java/org/apache/wiki/tags/UserProfileTag.java
similarity index 100%
rename from jspwiki-war/src/main/java/org/apache/wiki/tags/UserProfileTag.java
rename to jspwiki-main/src/main/java/org/apache/wiki/tags/UserProfileTag.java
diff --git a/jspwiki-war/src/main/java/org/apache/wiki/tags/VariableTag.java b/jspwiki-main/src/main/java/org/apache/wiki/tags/VariableTag.java
similarity index 100%
rename from jspwiki-war/src/main/java/org/apache/wiki/tags/VariableTag.java
rename to jspwiki-main/src/main/java/org/apache/wiki/tags/VariableTag.java
diff --git a/jspwiki-war/src/main/java/org/apache/wiki/tags/WikiBodyTag.java b/jspwiki-main/src/main/java/org/apache/wiki/tags/WikiBodyTag.java
similarity index 100%
rename from jspwiki-war/src/main/java/org/apache/wiki/tags/WikiBodyTag.java
rename to jspwiki-main/src/main/java/org/apache/wiki/tags/WikiBodyTag.java
diff --git a/jspwiki-war/src/main/java/org/apache/wiki/tags/WikiLinkTag.java b/jspwiki-main/src/main/java/org/apache/wiki/tags/WikiLinkTag.java
similarity index 100%
rename from jspwiki-war/src/main/java/org/apache/wiki/tags/WikiLinkTag.java
rename to jspwiki-main/src/main/java/org/apache/wiki/tags/WikiLinkTag.java
diff --git a/jspwiki-war/src/main/java/org/apache/wiki/tags/WikiTagBase.java b/jspwiki-main/src/main/java/org/apache/wiki/tags/WikiTagBase.java
similarity index 100%
rename from jspwiki-war/src/main/java/org/apache/wiki/tags/WikiTagBase.java
rename to jspwiki-main/src/main/java/org/apache/wiki/tags/WikiTagBase.java
diff --git a/jspwiki-war/src/main/java/org/apache/wiki/tags/package.html b/jspwiki-main/src/main/java/org/apache/wiki/tags/package.html
similarity index 100%
rename from jspwiki-war/src/main/java/org/apache/wiki/tags/package.html
rename to jspwiki-main/src/main/java/org/apache/wiki/tags/package.html
diff --git a/jspwiki-war/src/main/java/org/apache/wiki/ui/AbstractCommand.java b/jspwiki-main/src/main/java/org/apache/wiki/ui/AbstractCommand.java
similarity index 100%
rename from jspwiki-war/src/main/java/org/apache/wiki/ui/AbstractCommand.java
rename to jspwiki-main/src/main/java/org/apache/wiki/ui/AbstractCommand.java
diff --git a/jspwiki-war/src/main/java/org/apache/wiki/ui/Command.java b/jspwiki-main/src/main/java/org/apache/wiki/ui/Command.java
similarity index 100%
rename from jspwiki-war/src/main/java/org/apache/wiki/ui/Command.java
rename to jspwiki-main/src/main/java/org/apache/wiki/ui/Command.java
diff --git a/jspwiki-war/src/main/java/org/apache/wiki/ui/CommandResolver.java b/jspwiki-main/src/main/java/org/apache/wiki/ui/CommandResolver.java
similarity index 100%
rename from jspwiki-war/src/main/java/org/apache/wiki/ui/CommandResolver.java
rename to jspwiki-main/src/main/java/org/apache/wiki/ui/CommandResolver.java
diff --git a/jspwiki-war/src/main/java/org/apache/wiki/ui/Editor.java b/jspwiki-main/src/main/java/org/apache/wiki/ui/Editor.java
similarity index 100%
rename from jspwiki-war/src/main/java/org/apache/wiki/ui/Editor.java
rename to jspwiki-main/src/main/java/org/apache/wiki/ui/Editor.java
diff --git a/jspwiki-war/src/main/java/org/apache/wiki/ui/EditorManager.java b/jspwiki-main/src/main/java/org/apache/wiki/ui/EditorManager.java
similarity index 100%
rename from jspwiki-war/src/main/java/org/apache/wiki/ui/EditorManager.java
rename to jspwiki-main/src/main/java/org/apache/wiki/ui/EditorManager.java
diff --git a/jspwiki-war/src/main/java/org/apache/wiki/ui/GenericHTTPHandler.java b/jspwiki-main/src/main/java/org/apache/wiki/ui/GenericHTTPHandler.java
similarity index 100%
rename from jspwiki-war/src/main/java/org/apache/wiki/ui/GenericHTTPHandler.java
rename to jspwiki-main/src/main/java/org/apache/wiki/ui/GenericHTTPHandler.java
diff --git a/jspwiki-war/src/main/java/org/apache/wiki/ui/GroupCommand.java b/jspwiki-main/src/main/java/org/apache/wiki/ui/GroupCommand.java
similarity index 100%
rename from jspwiki-war/src/main/java/org/apache/wiki/ui/GroupCommand.java
rename to jspwiki-main/src/main/java/org/apache/wiki/ui/GroupCommand.java
diff --git a/jspwiki-war/src/main/java/org/apache/wiki/ui/InputValidator.java b/jspwiki-main/src/main/java/org/apache/wiki/ui/InputValidator.java
similarity index 100%
rename from jspwiki-war/src/main/java/org/apache/wiki/ui/InputValidator.java
rename to jspwiki-main/src/main/java/org/apache/wiki/ui/InputValidator.java
diff --git a/jspwiki-war/src/main/java/org/apache/wiki/ui/Installer.java b/jspwiki-main/src/main/java/org/apache/wiki/ui/Installer.java
similarity index 100%
rename from jspwiki-war/src/main/java/org/apache/wiki/ui/Installer.java
rename to jspwiki-main/src/main/java/org/apache/wiki/ui/Installer.java
diff --git a/jspwiki-war/src/main/java/org/apache/wiki/ui/PageCommand.java b/jspwiki-main/src/main/java/org/apache/wiki/ui/PageCommand.java
similarity index 100%
rename from jspwiki-war/src/main/java/org/apache/wiki/ui/PageCommand.java
rename to jspwiki-main/src/main/java/org/apache/wiki/ui/PageCommand.java
diff --git a/jspwiki-war/src/main/java/org/apache/wiki/ui/RedirectCommand.java b/jspwiki-main/src/main/java/org/apache/wiki/ui/RedirectCommand.java
similarity index 100%
rename from jspwiki-war/src/main/java/org/apache/wiki/ui/RedirectCommand.java
rename to jspwiki-main/src/main/java/org/apache/wiki/ui/RedirectCommand.java
diff --git a/jspwiki-war/src/main/java/org/apache/wiki/ui/TemplateManager.java b/jspwiki-main/src/main/java/org/apache/wiki/ui/TemplateManager.java
similarity index 100%
rename from jspwiki-war/src/main/java/org/apache/wiki/ui/TemplateManager.java
rename to jspwiki-main/src/main/java/org/apache/wiki/ui/TemplateManager.java
diff --git a/jspwiki-war/src/main/java/org/apache/wiki/ui/WikiCommand.java b/jspwiki-main/src/main/java/org/apache/wiki/ui/WikiCommand.java
similarity index 100%
rename from jspwiki-war/src/main/java/org/apache/wiki/ui/WikiCommand.java
rename to jspwiki-main/src/main/java/org/apache/wiki/ui/WikiCommand.java
diff --git a/jspwiki-war/src/main/java/org/apache/wiki/ui/WikiJSPFilter.java b/jspwiki-main/src/main/java/org/apache/wiki/ui/WikiJSPFilter.java
similarity index 100%
rename from jspwiki-war/src/main/java/org/apache/wiki/ui/WikiJSPFilter.java
rename to jspwiki-main/src/main/java/org/apache/wiki/ui/WikiJSPFilter.java
diff --git a/jspwiki-war/src/main/java/org/apache/wiki/ui/WikiRequestWrapper.java b/jspwiki-main/src/main/java/org/apache/wiki/ui/WikiRequestWrapper.java
similarity index 100%
rename from jspwiki-war/src/main/java/org/apache/wiki/ui/WikiRequestWrapper.java
rename to jspwiki-main/src/main/java/org/apache/wiki/ui/WikiRequestWrapper.java
diff --git a/jspwiki-war/src/main/java/org/apache/wiki/ui/WikiServletFilter.java b/jspwiki-main/src/main/java/org/apache/wiki/ui/WikiServletFilter.java
similarity index 100%
rename from jspwiki-war/src/main/java/org/apache/wiki/ui/WikiServletFilter.java
rename to jspwiki-main/src/main/java/org/apache/wiki/ui/WikiServletFilter.java
diff --git a/jspwiki-war/src/main/java/org/apache/wiki/ui/admin/AdminBean.java b/jspwiki-main/src/main/java/org/apache/wiki/ui/admin/AdminBean.java
similarity index 100%
rename from jspwiki-war/src/main/java/org/apache/wiki/ui/admin/AdminBean.java
rename to jspwiki-main/src/main/java/org/apache/wiki/ui/admin/AdminBean.java
diff --git a/jspwiki-war/src/main/java/org/apache/wiki/ui/admin/DefaultAdminBeanManager.java b/jspwiki-main/src/main/java/org/apache/wiki/ui/admin/DefaultAdminBeanManager.java
similarity index 100%
rename from jspwiki-war/src/main/java/org/apache/wiki/ui/admin/DefaultAdminBeanManager.java
rename to jspwiki-main/src/main/java/org/apache/wiki/ui/admin/DefaultAdminBeanManager.java
diff --git a/jspwiki-war/src/main/java/org/apache/wiki/ui/admin/SimpleAdminBean.java b/jspwiki-main/src/main/java/org/apache/wiki/ui/admin/SimpleAdminBean.java
similarity index 100%
rename from jspwiki-war/src/main/java/org/apache/wiki/ui/admin/SimpleAdminBean.java
rename to jspwiki-main/src/main/java/org/apache/wiki/ui/admin/SimpleAdminBean.java
diff --git a/jspwiki-war/src/main/java/org/apache/wiki/ui/admin/WikiFormAdminBean.java b/jspwiki-main/src/main/java/org/apache/wiki/ui/admin/WikiFormAdminBean.java
similarity index 100%
rename from jspwiki-war/src/main/java/org/apache/wiki/ui/admin/WikiFormAdminBean.java
rename to jspwiki-main/src/main/java/org/apache/wiki/ui/admin/WikiFormAdminBean.java
diff --git a/jspwiki-war/src/main/java/org/apache/wiki/ui/admin/beans/CoreBean.java b/jspwiki-main/src/main/java/org/apache/wiki/ui/admin/beans/CoreBean.java
similarity index 100%
rename from jspwiki-war/src/main/java/org/apache/wiki/ui/admin/beans/CoreBean.java
rename to jspwiki-main/src/main/java/org/apache/wiki/ui/admin/beans/CoreBean.java
diff --git a/jspwiki-war/src/main/java/org/apache/wiki/ui/admin/beans/FilterBean.java b/jspwiki-main/src/main/java/org/apache/wiki/ui/admin/beans/FilterBean.java
old mode 100755
new mode 100644
similarity index 100%
rename from jspwiki-war/src/main/java/org/apache/wiki/ui/admin/beans/FilterBean.java
rename to jspwiki-main/src/main/java/org/apache/wiki/ui/admin/beans/FilterBean.java
diff --git a/jspwiki-war/src/main/java/org/apache/wiki/ui/admin/beans/ModuleBean.java b/jspwiki-main/src/main/java/org/apache/wiki/ui/admin/beans/ModuleBean.java
old mode 100755
new mode 100644
similarity index 100%
rename from jspwiki-war/src/main/java/org/apache/wiki/ui/admin/beans/ModuleBean.java
rename to jspwiki-main/src/main/java/org/apache/wiki/ui/admin/beans/ModuleBean.java
diff --git a/jspwiki-war/src/main/java/org/apache/wiki/ui/admin/beans/PlainEditorAdminBean.java b/jspwiki-main/src/main/java/org/apache/wiki/ui/admin/beans/PlainEditorAdminBean.java
similarity index 100%
rename from jspwiki-war/src/main/java/org/apache/wiki/ui/admin/beans/PlainEditorAdminBean.java
rename to jspwiki-main/src/main/java/org/apache/wiki/ui/admin/beans/PlainEditorAdminBean.java
diff --git a/jspwiki-war/src/main/java/org/apache/wiki/ui/admin/beans/PluginBean.java b/jspwiki-main/src/main/java/org/apache/wiki/ui/admin/beans/PluginBean.java
similarity index 100%
rename from jspwiki-war/src/main/java/org/apache/wiki/ui/admin/beans/PluginBean.java
rename to jspwiki-main/src/main/java/org/apache/wiki/ui/admin/beans/PluginBean.java
diff --git a/jspwiki-war/src/main/java/org/apache/wiki/ui/admin/beans/SearchManagerBean.java b/jspwiki-main/src/main/java/org/apache/wiki/ui/admin/beans/SearchManagerBean.java
similarity index 100%
rename from jspwiki-war/src/main/java/org/apache/wiki/ui/admin/beans/SearchManagerBean.java
rename to jspwiki-main/src/main/java/org/apache/wiki/ui/admin/beans/SearchManagerBean.java
diff --git a/jspwiki-war/src/main/java/org/apache/wiki/ui/admin/beans/UserBean.java b/jspwiki-main/src/main/java/org/apache/wiki/ui/admin/beans/UserBean.java
similarity index 100%
rename from jspwiki-war/src/main/java/org/apache/wiki/ui/admin/beans/UserBean.java
rename to jspwiki-main/src/main/java/org/apache/wiki/ui/admin/beans/UserBean.java
diff --git a/jspwiki-war/src/main/java/org/apache/wiki/ui/admin/package.html b/jspwiki-main/src/main/java/org/apache/wiki/ui/admin/package.html
similarity index 100%
rename from jspwiki-war/src/main/java/org/apache/wiki/ui/admin/package.html
rename to jspwiki-main/src/main/java/org/apache/wiki/ui/admin/package.html
diff --git a/jspwiki-war/src/main/java/org/apache/wiki/ui/package.html b/jspwiki-main/src/main/java/org/apache/wiki/ui/package.html
similarity index 100%
rename from jspwiki-war/src/main/java/org/apache/wiki/ui/package.html
rename to jspwiki-main/src/main/java/org/apache/wiki/ui/package.html
diff --git a/jspwiki-war/src/main/java/org/apache/wiki/ui/progress/ProgressItem.java b/jspwiki-main/src/main/java/org/apache/wiki/ui/progress/ProgressItem.java
similarity index 100%
rename from jspwiki-war/src/main/java/org/apache/wiki/ui/progress/ProgressItem.java
rename to jspwiki-main/src/main/java/org/apache/wiki/ui/progress/ProgressItem.java
diff --git a/jspwiki-war/src/main/java/org/apache/wiki/ui/progress/ProgressManager.java b/jspwiki-main/src/main/java/org/apache/wiki/ui/progress/ProgressManager.java
similarity index 100%
rename from jspwiki-war/src/main/java/org/apache/wiki/ui/progress/ProgressManager.java
rename to jspwiki-main/src/main/java/org/apache/wiki/ui/progress/ProgressManager.java
diff --git a/jspwiki-war/src/main/java/org/apache/wiki/ui/progress/package.html b/jspwiki-main/src/main/java/org/apache/wiki/ui/progress/package.html
similarity index 100%
rename from jspwiki-war/src/main/java/org/apache/wiki/ui/progress/package.html
rename to jspwiki-main/src/main/java/org/apache/wiki/ui/progress/package.html
diff --git a/jspwiki-war/src/main/java/org/apache/wiki/url/DefaultURLConstructor.java b/jspwiki-main/src/main/java/org/apache/wiki/url/DefaultURLConstructor.java
similarity index 100%
rename from jspwiki-war/src/main/java/org/apache/wiki/url/DefaultURLConstructor.java
rename to jspwiki-main/src/main/java/org/apache/wiki/url/DefaultURLConstructor.java
diff --git a/jspwiki-war/src/main/java/org/apache/wiki/url/ShortURLConstructor.java b/jspwiki-main/src/main/java/org/apache/wiki/url/ShortURLConstructor.java
similarity index 100%
rename from jspwiki-war/src/main/java/org/apache/wiki/url/ShortURLConstructor.java
rename to jspwiki-main/src/main/java/org/apache/wiki/url/ShortURLConstructor.java
diff --git a/jspwiki-war/src/main/java/org/apache/wiki/url/ShortViewURLConstructor.java b/jspwiki-main/src/main/java/org/apache/wiki/url/ShortViewURLConstructor.java
similarity index 100%
rename from jspwiki-war/src/main/java/org/apache/wiki/url/ShortViewURLConstructor.java
rename to jspwiki-main/src/main/java/org/apache/wiki/url/ShortViewURLConstructor.java
diff --git a/jspwiki-war/src/main/java/org/apache/wiki/url/URLConstructor.java b/jspwiki-main/src/main/java/org/apache/wiki/url/URLConstructor.java
similarity index 100%
rename from jspwiki-war/src/main/java/org/apache/wiki/url/URLConstructor.java
rename to jspwiki-main/src/main/java/org/apache/wiki/url/URLConstructor.java
diff --git a/jspwiki-war/src/main/java/org/apache/wiki/url/package.html b/jspwiki-main/src/main/java/org/apache/wiki/url/package.html
similarity index 100%
rename from jspwiki-war/src/main/java/org/apache/wiki/url/package.html
rename to jspwiki-main/src/main/java/org/apache/wiki/url/package.html
diff --git a/jspwiki-war/src/main/java/org/apache/wiki/util/ByteUtils.java b/jspwiki-main/src/main/java/org/apache/wiki/util/ByteUtils.java
similarity index 96%
rename from jspwiki-war/src/main/java/org/apache/wiki/util/ByteUtils.java
rename to jspwiki-main/src/main/java/org/apache/wiki/util/ByteUtils.java
index 3f1ec09..6ae318e 100644
--- a/jspwiki-war/src/main/java/org/apache/wiki/util/ByteUtils.java
+++ b/jspwiki-main/src/main/java/org/apache/wiki/util/ByteUtils.java
@@ -1,94 +1,94 @@
-/* 
-    Licensed to the Apache Software Foundation (ASF) under one
-    or more contributor license agreements.  See the NOTICE file
-    distributed with this work for additional information
-    regarding copyright ownership.  The ASF licenses this file
-    to you under the Apache License, Version 2.0 (the
-    "License"); you may not use this file except in compliance
-    with the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-    Unless required by applicable law or agreed to in writing,
-    software distributed under the License is distributed on an
-    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-    KIND, either express or implied.  See the License for the
-    specific language governing permissions and limitations
-    under the License.  
- */
-
-package org.apache.wiki.util;
-
-/**
- *  A collection of static byte utility methods.
- *  
- * @author Ichiro Furusato
- */
-public class ByteUtils
-{
-    private static final char[] hexArray = "0123456789abcdef".toCharArray();
-    
-    
-    /**
-     *  byte[] array to hex conversion. Note that this provides
-     *  no delimiters; the bytes are simply concatenated.
-     */
-    public static String bytes2hex( byte[] bytes )
-    {
-        char[] ca = new char[bytes.length * 2];
-        for ( int i = 0; i < bytes.length; i++ ) {
-            int v = bytes[i] & 0xff;
-            ca[i * 2] = hexArray[v >>> 4];
-            ca[i * 2 + 1] = hexArray[v & 0x0f];
-        }
-        return new String(ca);
-    }
-    
-    
-    /**
-     *  byte to hex conversion.
-     */
-    public static String byte2hex( byte b )
-    {
-        return Integer.toHexString(b & 0xff);
-    }
-
-    
-    /**
-     *  Parses a hexadecimal string into its corresponding bytes.
-     */
-    public static byte[] parseHexBinary( String hex )
-    {
-        final int len = hex.length();
-        // e.g., "111" is not a valid hex encoding.
-        if( len%2 != 0 ) {
-            throw new IllegalArgumentException("hexBinary needs to be even-length: "+hex);
-        }
-        byte[] out = new byte[len/2];
-        for( int i = 0; i < len; i+=2 ) {
-            int h = hexToBin(hex.charAt(i));
-            int l = hexToBin(hex.charAt(i+1));
-            if ( h==-1 || l==-1 ) {
-                throw new IllegalArgumentException("contains illegal character for hexBinary: "+hex);
-            }
-            out[i/2] = (byte)(h*16+l);
-        }
-        return out;
-    }
-    
-    
-    /**
-     *  Converts a single hex character into its integer equivalent.
-     */
-    public static int hexToBin( char c )
-    {
-        if ( '0'<=c && c<='9' ) return c-'0';
-        if ( 'A'<=c && c<='F' ) return c-'A'+10;
-        if ( 'a'<=c && c<='f' ) return c-'a'+10;
-        return -1;
-    }
-
-    
-    private ByteUtils() {}
-
-}
+/* 
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.  
+ */
+
+package org.apache.wiki.util;
+
+/**
+ *  A collection of static byte utility methods.
+ *  
+ * @author Ichiro Furusato
+ */
+public class ByteUtils
+{
+    private static final char[] hexArray = "0123456789abcdef".toCharArray();
+    
+    
+    /**
+     *  byte[] array to hex conversion. Note that this provides
+     *  no delimiters; the bytes are simply concatenated.
+     */
+    public static String bytes2hex( byte[] bytes )
+    {
+        char[] ca = new char[bytes.length * 2];
+        for ( int i = 0; i < bytes.length; i++ ) {
+            int v = bytes[i] & 0xff;
+            ca[i * 2] = hexArray[v >>> 4];
+            ca[i * 2 + 1] = hexArray[v & 0x0f];
+        }
+        return new String(ca);
+    }
+    
+    
+    /**
+     *  byte to hex conversion.
+     */
+    public static String byte2hex( byte b )
+    {
+        return Integer.toHexString(b & 0xff);
+    }
+
+    
+    /**
+     *  Parses a hexadecimal string into its corresponding bytes.
+     */
+    public static byte[] parseHexBinary( String hex )
+    {
+        final int len = hex.length();
+        // e.g., "111" is not a valid hex encoding.
+        if( len%2 != 0 ) {
+            throw new IllegalArgumentException("hexBinary needs to be even-length: "+hex);
+        }
+        byte[] out = new byte[len/2];
+        for( int i = 0; i < len; i+=2 ) {
+            int h = hexToBin(hex.charAt(i));
+            int l = hexToBin(hex.charAt(i+1));
+            if ( h==-1 || l==-1 ) {
+                throw new IllegalArgumentException("contains illegal character for hexBinary: "+hex);
+            }
+            out[i/2] = (byte)(h*16+l);
+        }
+        return out;
+    }
+    
+    
+    /**
+     *  Converts a single hex character into its integer equivalent.
+     */
+    public static int hexToBin( char c )
+    {
+        if ( '0'<=c && c<='9' ) return c-'0';
+        if ( 'A'<=c && c<='F' ) return c-'A'+10;
+        if ( 'a'<=c && c<='f' ) return c-'a'+10;
+        return -1;
+    }
+
+    
+    private ByteUtils() {}
+
+}
diff --git a/jspwiki-war/src/main/java/org/apache/wiki/util/ClassUtil.java b/jspwiki-main/src/main/java/org/apache/wiki/util/ClassUtil.java
similarity index 100%
rename from jspwiki-war/src/main/java/org/apache/wiki/util/ClassUtil.java
rename to jspwiki-main/src/main/java/org/apache/wiki/util/ClassUtil.java
diff --git a/jspwiki-war/src/main/java/org/apache/wiki/util/CommentedProperties.java b/jspwiki-main/src/main/java/org/apache/wiki/util/CommentedProperties.java
similarity index 100%
rename from jspwiki-war/src/main/java/org/apache/wiki/util/CommentedProperties.java
rename to jspwiki-main/src/main/java/org/apache/wiki/util/CommentedProperties.java
diff --git a/jspwiki-war/src/main/java/org/apache/wiki/util/CryptoUtil.java b/jspwiki-main/src/main/java/org/apache/wiki/util/CryptoUtil.java
similarity index 100%
rename from jspwiki-war/src/main/java/org/apache/wiki/util/CryptoUtil.java
rename to jspwiki-main/src/main/java/org/apache/wiki/util/CryptoUtil.java
diff --git a/jspwiki-war/src/main/java/org/apache/wiki/util/FileUtil.java b/jspwiki-main/src/main/java/org/apache/wiki/util/FileUtil.java
similarity index 100%
rename from jspwiki-war/src/main/java/org/apache/wiki/util/FileUtil.java
rename to jspwiki-main/src/main/java/org/apache/wiki/util/FileUtil.java
diff --git a/jspwiki-war/src/main/java/org/apache/wiki/util/FormUtil.java b/jspwiki-main/src/main/java/org/apache/wiki/util/FormUtil.java
similarity index 100%
rename from jspwiki-war/src/main/java/org/apache/wiki/util/FormUtil.java
rename to jspwiki-main/src/main/java/org/apache/wiki/util/FormUtil.java
diff --git a/jspwiki-war/src/main/java/org/apache/wiki/util/HttpUtil.java b/jspwiki-main/src/main/java/org/apache/wiki/util/HttpUtil.java
similarity index 100%
rename from jspwiki-war/src/main/java/org/apache/wiki/util/HttpUtil.java
rename to jspwiki-main/src/main/java/org/apache/wiki/util/HttpUtil.java
diff --git a/jspwiki-war/src/main/java/org/apache/wiki/util/MailUtil.java b/jspwiki-main/src/main/java/org/apache/wiki/util/MailUtil.java
similarity index 100%
rename from jspwiki-war/src/main/java/org/apache/wiki/util/MailUtil.java
rename to jspwiki-main/src/main/java/org/apache/wiki/util/MailUtil.java
diff --git a/jspwiki-war/src/main/java/org/apache/wiki/util/PriorityList.java b/jspwiki-main/src/main/java/org/apache/wiki/util/PriorityList.java
similarity index 100%
rename from jspwiki-war/src/main/java/org/apache/wiki/util/PriorityList.java
rename to jspwiki-main/src/main/java/org/apache/wiki/util/PriorityList.java
diff --git a/jspwiki-war/src/main/java/org/apache/wiki/util/PropertyReader.java b/jspwiki-main/src/main/java/org/apache/wiki/util/PropertyReader.java
similarity index 100%
rename from jspwiki-war/src/main/java/org/apache/wiki/util/PropertyReader.java
rename to jspwiki-main/src/main/java/org/apache/wiki/util/PropertyReader.java
diff --git a/jspwiki-war/src/main/java/org/apache/wiki/util/Serializer.java b/jspwiki-main/src/main/java/org/apache/wiki/util/Serializer.java
similarity index 100%
rename from jspwiki-war/src/main/java/org/apache/wiki/util/Serializer.java
rename to jspwiki-main/src/main/java/org/apache/wiki/util/Serializer.java
diff --git a/jspwiki-war/src/main/java/org/apache/wiki/util/TextUtil.java b/jspwiki-main/src/main/java/org/apache/wiki/util/TextUtil.java
similarity index 100%
rename from jspwiki-war/src/main/java/org/apache/wiki/util/TextUtil.java
rename to jspwiki-main/src/main/java/org/apache/wiki/util/TextUtil.java
diff --git a/jspwiki-war/src/main/java/org/apache/wiki/util/TimedCounterList.java b/jspwiki-main/src/main/java/org/apache/wiki/util/TimedCounterList.java
similarity index 100%
rename from jspwiki-war/src/main/java/org/apache/wiki/util/TimedCounterList.java
rename to jspwiki-main/src/main/java/org/apache/wiki/util/TimedCounterList.java
diff --git a/jspwiki-war/src/main/java/org/apache/wiki/util/XHTML.java b/jspwiki-main/src/main/java/org/apache/wiki/util/XHTML.java
similarity index 100%
rename from jspwiki-war/src/main/java/org/apache/wiki/util/XHTML.java
rename to jspwiki-main/src/main/java/org/apache/wiki/util/XHTML.java
diff --git a/jspwiki-war/src/main/java/org/apache/wiki/util/XhtmlUtil.java b/jspwiki-main/src/main/java/org/apache/wiki/util/XhtmlUtil.java
similarity index 97%
rename from jspwiki-war/src/main/java/org/apache/wiki/util/XhtmlUtil.java
rename to jspwiki-main/src/main/java/org/apache/wiki/util/XhtmlUtil.java
index d8e96cf..ff93ccf 100644
--- a/jspwiki-war/src/main/java/org/apache/wiki/util/XhtmlUtil.java
+++ b/jspwiki-main/src/main/java/org/apache/wiki/util/XhtmlUtil.java
@@ -1,220 +1,220 @@
-/*
-    Licensed to the Apache Software Foundation (ASF) under one
-    or more contributor license agreements.  See the NOTICE file
-    distributed with this work for additional information
-    regarding copyright ownership.  The ASF licenses this file
-    to you under the Apache License, Version 2.0 (the
-    "License"); you may not use this file except in compliance
-    with the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-    Unless required by applicable law or agreed to in writing,
-    software distributed under the License is distributed on an
-    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-    KIND, either express or implied.  See the License for the
-    specific language governing permissions and limitations
-    under the License.
- */
-
-package org.apache.wiki.util;
-
-import org.jdom2.Element;
-import org.jdom2.output.Format;
-import org.jdom2.output.XMLOutputter;
-
-/**
- *  A utility class to generate XHTML objects and ultimately, serialised markup.
- *  This class is incomplete but serves as a basic utility for JSPWiki, to be
- *  expanded upon as needed.
- *  <p>
- *  This uses JDOM2 as its backing implementation.
- *  </p>
- *
- *  <h3>Example</h3>
- *  <p>
- *  To generate a single element, an Element with PCDATA content, and then
- *  embed the latter in the former:
- *  </p>
- *  <pre>
- *    Element div = XhtmlUtil.element(XHTML.div);
- *    Element p   = XhtmlUtil.element(XHTML.p,"Some content");
- *    div.addContent(p);
- *  </pre>
- *  <p>
- *  There is also a convenient link and link target constructor methods:
- *  </p>
- *  <pre>
- *    Element link   = XhtmlUtil.link("hrefValue","linkText");
- *    Element target = XhtmlUtil.target("targetIdValue","linkText");
- *  </pre>
- *
- * @since 2.10
- */
-public final class XhtmlUtil {
-
-    private XhtmlUtil() {}
-
-    /** to print <td></td> instead of <td /> */
-    public static final Format EXPAND_EMPTY_NODES = Format.getCompactFormat().setExpandEmptyElements( true );
-
-    /**
-     *  Serializes the Element to a String using a compact serialization format.
-     *
-     * @param element  the element to serialize.
-     * @return the serialized Element.
-     */
-    public static String serialize( Element element ) {
-        return serialize( element, false );
-    }
-
-    /**
-     *  Serializes the Element to a String. If <tt>pretty</tt> is true,
-     *  uses a pretty whitespace format, otherwise a compact format.
-     *
-     * @param element  the element to serialize.
-     * @param pretty   if true, use a pretty whitespace format.
-     * @return the serialized Element.
-     */
-    public static String serialize( Element element, boolean pretty ) {
-        return serialize( element,pretty ? Format.getPrettyFormat() : Format.getCompactFormat() );
-    }
-
-    /**
-     *  Serializes the Element to a String. Allows to use a custom <tt>format</tt>.
-     *
-     * @param element  the element to serialize.
-     * @param format   custom <tt>format</tt> used to serialize the Element.
-     * @return the serialized Element.
-     */
-    public static String serialize( Element element, Format format ) {
-        XMLOutputter out = new XMLOutputter( format );
-        return out.outputString( element );
-    }
-
-    /**
-     *  Return an Element with an element type name matching the parameter.
-     *
-     * @param element  the XHTML element type.
-     * @return a JDOM2 Element.
-     */
-    public static Element element( XHTML element ) {
-        return element( element, null );
-    }
-
-    /**
-     *  Return an Element with an element type name matching the parameter,
-     *  and optional PCDATA (parsed character data, a String) content.
-     *
-     * @param element  the XHTML element type.
-     * @param content  the optional PCDATA content.
-     * @return a JDOM2 Element.
-     */
-    public static Element element( XHTML element, String content ) {
-        Element elt = new Element( element.name() );
-        if( content != null ) {
-            elt.addContent( content );
-        }
-        return elt;
-    }
-
-    /**
-     *  Return an XHTML link with a required 'href' attribute value and optional link (PCDATA) content.
-     *
-     * @param href     the required 'href' value.
-     * @param content  the optional link (PCDATA) content.
-     * @return a JDOM2 Element.
-     */
-    public static Element link( String href, String content ) {
-        if( href == null ) {
-            throw new IllegalArgumentException("missing 'href' attribute value.");
-        }
-        return fLink(href,content,null);
-    }
-
-    /**
-     *  Return an XHTML link target with a required 'id' attribute value.
-     *
-     * @param id    the required 'id' link target value.
-     * @return a JDOM2 Element.
-     */
-    public static Element target( String id, String content ) {
-        if( id == null ) {
-            throw new IllegalArgumentException( "missing 'id' attribute value." );
-        }
-        return fLink( null, content, id );
-    }
-
-    /**
-     *  Return an XHTML link with an optional 'href' attribute, optional
-     *  link content, and optional 'id' link target value.
-     *
-     * @param href     the optional 'href' value.
-     * @param content  the optional link (PCDATA) content.
-     * @param id       the optional 'id' link target value.
-     * @return a JDOM2 Element.
-     */
-    private static Element fLink( String href, String content, String id ) {
-        Element a = element( XHTML.a );
-        if( href != null ) {
-            a.setAttribute( XHTML.ATTR_href, href );
-        }
-        if( content != null ) {
-            a.addContent( content );
-        }
-        if( id != null ) {
-            a.setAttribute( XHTML.ATTR_id, id );
-        }
-        return a;
-    }
-
-    /**
-     *  Return an XHTML <tt>img</tt> element with an required 'src' attribute
-     *  and optional 'alt' alternative text value.
-     *
-     * @param src      the required 'src' value.
-     * @param alt      the optional 'alt' alternative text value.
-     * @return a JDOM2 Element.
-     */
-    public static Element img( String src, String alt ) {
-        Element img = element( XHTML.img );
-        if( src == null ) {
-            throw new IllegalArgumentException( "missing 'src' attribute value." );
-        }
-        img.setAttribute( XHTML.ATTR_src, src );
-        if( alt != null ) {
-            img.setAttribute( XHTML.ATTR_alt, alt );
-        }
-        return img;
-    }
-
-    /**
-     *  Return an XHTML form <tt>input</tt> element with optional 'type', 'name' and 'value' attributes.
-     *
-     * @param type   the optional 'type' value.
-     * @param name   the optional 'name' value.
-     * @param value  the optional 'value' value.
-     * @return a JDOM2 Element.
-     */
-    public static Element input( String type, String name, String value ) {
-        Element input = element( XHTML.input );
-        if( type != null ) {
-            input.setAttribute( XHTML.ATTR_type, type );
-        }
-        if( name != null ) {
-            input.setAttribute( XHTML.ATTR_name, name );
-        }
-        if( value != null ) {
-            input.setAttribute( XHTML.ATTR_value, value );
-        }
-        return input;
-    }
-
-    public static void setClass( Element element, String classValue ) {
-        if( classValue == null ) {
-            throw new IllegalArgumentException( "missing 'class' attribute value." );
-        }
-        element.setAttribute( XHTML.ATTR_class, classValue );
-    }
-
+/*
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
+ */
+
+package org.apache.wiki.util;
+
+import org.jdom2.Element;
+import org.jdom2.output.Format;
+import org.jdom2.output.XMLOutputter;
+
+/**
+ *  A utility class to generate XHTML objects and ultimately, serialised markup.
+ *  This class is incomplete but serves as a basic utility for JSPWiki, to be
+ *  expanded upon as needed.
+ *  <p>
+ *  This uses JDOM2 as its backing implementation.
+ *  </p>
+ *
+ *  <h3>Example</h3>
+ *  <p>
+ *  To generate a single element, an Element with PCDATA content, and then
+ *  embed the latter in the former:
+ *  </p>
+ *  <pre>
+ *    Element div = XhtmlUtil.element(XHTML.div);
+ *    Element p   = XhtmlUtil.element(XHTML.p,"Some content");
+ *    div.addContent(p);
+ *  </pre>
+ *  <p>
+ *  There is also a convenient link and link target constructor methods:
+ *  </p>
+ *  <pre>
+ *    Element link   = XhtmlUtil.link("hrefValue","linkText");
+ *    Element target = XhtmlUtil.target("targetIdValue","linkText");
+ *  </pre>
+ *
+ * @since 2.10
+ */
+public final class XhtmlUtil {
+
+    private XhtmlUtil() {}
+
+    /** to print <td></td> instead of <td /> */
+    public static final Format EXPAND_EMPTY_NODES = Format.getCompactFormat().setExpandEmptyElements( true );
+
+    /**
+     *  Serializes the Element to a String using a compact serialization format.
+     *
+     * @param element  the element to serialize.
+     * @return the serialized Element.
+     */
+    public static String serialize( Element element ) {
+        return serialize( element, false );
+    }
+
+    /**
+     *  Serializes the Element to a String. If <tt>pretty</tt> is true,
+     *  uses a pretty whitespace format, otherwise a compact format.
+     *
+     * @param element  the element to serialize.
+     * @param pretty   if true, use a pretty whitespace format.
+     * @return the serialized Element.
+     */
+    public static String serialize( Element element, boolean pretty ) {
+        return serialize( element,pretty ? Format.getPrettyFormat() : Format.getCompactFormat() );
+    }
+
+    /**
+     *  Serializes the Element to a String. Allows to use a custom <tt>format</tt>.
+     *
+     * @param element  the element to serialize.
+     * @param format   custom <tt>format</tt> used to serialize the Element.
+     * @return the serialized Element.
+     */
+    public static String serialize( Element element, Format format ) {
+        XMLOutputter out = new XMLOutputter( format );
+        return out.outputString( element );
+    }
+
+    /**
+     *  Return an Element with an element type name matching the parameter.
+     *
+     * @param element  the XHTML element type.
+     * @return a JDOM2 Element.
+     */
+    public static Element element( XHTML element ) {
+        return element( element, null );
+    }
+
+    /**
+     *  Return an Element with an element type name matching the parameter,
+     *  and optional PCDATA (parsed character data, a String) content.
+     *
+     * @param element  the XHTML element type.
+     * @param content  the optional PCDATA content.
+     * @return a JDOM2 Element.
+     */
+    public static Element element( XHTML element, String content ) {
+        Element elt = new Element( element.name() );
+        if( content != null ) {
+            elt.addContent( content );
+        }
+        return elt;
+    }
+
+    /**
+     *  Return an XHTML link with a required 'href' attribute value and optional link (PCDATA) content.
+     *
+     * @param href     the required 'href' value.
+     * @param content  the optional link (PCDATA) content.
+     * @return a JDOM2 Element.
+     */
+    public static Element link( String href, String content ) {
+        if( href == null ) {
+            throw new IllegalArgumentException("missing 'href' attribute value.");
+        }
+        return fLink(href,content,null);
+    }
+
+    /**
+     *  Return an XHTML link target with a required 'id' attribute value.
+     *
+     * @param id    the required 'id' link target value.
+     * @return a JDOM2 Element.
+     */
+    public static Element target( String id, String content ) {
+        if( id == null ) {
+            throw new IllegalArgumentException( "missing 'id' attribute value." );
+        }
+        return fLink( null, content, id );
+    }
+
+    /**
+     *  Return an XHTML link with an optional 'href' attribute, optional
+     *  link content, and optional 'id' link target value.
+     *
+     * @param href     the optional 'href' value.
+     * @param content  the optional link (PCDATA) content.
+     * @param id       the optional 'id' link target value.
+     * @return a JDOM2 Element.
+     */
+    private static Element fLink( String href, String content, String id ) {
+        Element a = element( XHTML.a );
+        if( href != null ) {
+            a.setAttribute( XHTML.ATTR_href, href );
+        }
+        if( content != null ) {
+            a.addContent( content );
+        }
+        if( id != null ) {
+            a.setAttribute( XHTML.ATTR_id, id );
+        }
+        return a;
+    }
+
+    /**
+     *  Return an XHTML <tt>img</tt> element with an required 'src' attribute
+     *  and optional 'alt' alternative text value.
+     *
+     * @param src      the required 'src' value.
+     * @param alt      the optional 'alt' alternative text value.
+     * @return a JDOM2 Element.
+     */
+    public static Element img( String src, String alt ) {
+        Element img = element( XHTML.img );
+        if( src == null ) {
+            throw new IllegalArgumentException( "missing 'src' attribute value." );
+        }
+        img.setAttribute( XHTML.ATTR_src, src );
+        if( alt != null ) {
+            img.setAttribute( XHTML.ATTR_alt, alt );
+        }
+        return img;
+    }
+
+    /**
+     *  Return an XHTML form <tt>input</tt> element with optional 'type', 'name' and 'value' attributes.
+     *
+     * @param type   the optional 'type' value.
+     * @param name   the optional 'name' value.
+     * @param value  the optional 'value' value.
+     * @return a JDOM2 Element.
+     */
+    public static Element input( String type, String name, String value ) {
+        Element input = element( XHTML.input );
+        if( type != null ) {
+            input.setAttribute( XHTML.ATTR_type, type );
+        }
+        if( name != null ) {
+            input.setAttribute( XHTML.ATTR_name, name );
+        }
+        if( value != null ) {
+            input.setAttribute( XHTML.ATTR_value, value );
+        }
+        return input;
+    }
+
+    public static void setClass( Element element, String classValue ) {
+        if( classValue == null ) {
+            throw new IllegalArgumentException( "missing 'class' attribute value." );
+        }
+        element.setAttribute( XHTML.ATTR_class, classValue );
+    }
+
 }
\ No newline at end of file
diff --git a/jspwiki-war/src/main/java/org/apache/wiki/util/XmlUtil.java b/jspwiki-main/src/main/java/org/apache/wiki/util/XmlUtil.java
similarity index 97%
rename from jspwiki-war/src/main/java/org/apache/wiki/util/XmlUtil.java
rename to jspwiki-main/src/main/java/org/apache/wiki/util/XmlUtil.java
index 77043f1..8d54a16 100644
--- a/jspwiki-war/src/main/java/org/apache/wiki/util/XmlUtil.java
+++ b/jspwiki-main/src/main/java/org/apache/wiki/util/XmlUtil.java
@@ -1,116 +1,116 @@
-/* 
-    Licensed to the Apache Software Foundation (ASF) under one
-    or more contributor license agreements.  See the NOTICE file
-    distributed with this work for additional information
-    regarding copyright ownership.  The ASF licenses this file
-    to you under the Apache License, Version 2.0 (the
-    "License"); you may not use this file except in compliance
-    with the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-    Unless required by applicable law or agreed to in writing,
-    software distributed under the License is distributed on an
-    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-    KIND, either express or implied.  See the License for the
-    specific language governing permissions and limitations
-    under the License.  
- */
-
-package org.apache.wiki.util;
-
-import org.apache.commons.lang.StringUtils;
-import org.apache.log4j.Logger;
-import org.jdom2.Document;
-import org.jdom2.Element;
-import org.jdom2.JDOMException;
-import org.jdom2.filter.Filters;
-import org.jdom2.input.SAXBuilder;
-import org.jdom2.xpath.XPathExpression;
-import org.jdom2.xpath.XPathFactory;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.net.URL;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.Enumeration;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Set;
-
-/**
- *  Utility class to parse XML files.
- *  <p>
- *  This uses JDOM2 as its backing implementation.
- *  </p>
- *  
- * @since 2.10
- */
-public final class XmlUtil
-{	
-	private static final Logger log = Logger.getLogger( XmlUtil.class );
-	
-	private XmlUtil() {}
-	
-	/**
-	 * Parses the given XML file and returns the requested nodes. If there's an error accessing or parsing the file, an
-	 * empty list is returned.
-	 * 
-	 * @param xml file to parse; matches all resources from classpath, filters repeated items.
-	 * @param requestedNodes requestd nodes on the xml file
-	 * @return the requested nodes of the XML file.
-	 */
-	public static List<Element> parse( String xml, String requestedNodes )
-	{
-		if( StringUtils.isNotEmpty( xml ) && StringUtils.isNotEmpty( requestedNodes ) ) {
-			Set<Element> readed = new HashSet<Element>();
-			SAXBuilder builder = new SAXBuilder();
-			try {
-				Enumeration< URL > resources = XmlUtil.class.getClassLoader().getResources( xml );
-				while( resources.hasMoreElements() ) {
-	                URL resource = resources.nextElement();
-	                log.debug( "reading " + resource.toString() );
-	                Document doc = builder.build( resource );
-	                XPathFactory xpfac = XPathFactory.instance();
-	                XPathExpression<Element> xp = xpfac.compile( requestedNodes, Filters.element() );
-	                readed.addAll( xp.evaluate( doc ) ); // filter out repeated items
-	            }
-				return new ArrayList<Element>( readed );
-			} catch ( IOException ioe ) {
-				log.error( "Couldn't load all " + xml + " resources", ioe );
-			} catch ( JDOMException jdome ) {
-				log.error( "error parsing " + xml + " resources", jdome );
-			}
-		}
-		return Collections.<Element>emptyList();
-	}
-	
-	
-	/**
-	 * Parses the given stream and returns the requested nodes. If there's an error accessing or parsing the stream, an
-	 * empty list is returned.
-	 * 
-	 * @param xmlStream stream to parse.
-	 * @param requestedNodes requestd nodes on the xml stream.
-	 * @return the requested nodes of the XML stream.
-	 */
-	public static List<Element> parse( InputStream xmlStream, String requestedNodes )
-	{
-		if( xmlStream != null && StringUtils.isNotEmpty( requestedNodes ) ) {
-			SAXBuilder builder = new SAXBuilder();
-			try {
-                Document doc = builder.build(xmlStream);
-                XPathFactory xpfac = XPathFactory.instance();
-                XPathExpression< Element > xp = xpfac.compile(requestedNodes,Filters.element());
-				return xp.evaluate( doc );
-			} catch ( IOException ioe ) {
-				log.error( "Couldn't load all " + xmlStream + " resources", ioe );
-			} catch ( JDOMException jdome ) {
-				log.error( "error parsing " + xmlStream + " resources", jdome );
-			}
-		}		
-		return Collections.<Element>emptyList();
-	}
-
+/* 
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.  
+ */
+
+package org.apache.wiki.util;
+
+import org.apache.commons.lang.StringUtils;
+import org.apache.log4j.Logger;
+import org.jdom2.Document;
+import org.jdom2.Element;
+import org.jdom2.JDOMException;
+import org.jdom2.filter.Filters;
+import org.jdom2.input.SAXBuilder;
+import org.jdom2.xpath.XPathExpression;
+import org.jdom2.xpath.XPathFactory;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.net.URL;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Enumeration;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
+
+/**
+ *  Utility class to parse XML files.
+ *  <p>
+ *  This uses JDOM2 as its backing implementation.
+ *  </p>
+ *  
+ * @since 2.10
+ */
+public final class XmlUtil
+{	
+	private static final Logger log = Logger.getLogger( XmlUtil.class );
+	
+	private XmlUtil() {}
+	
+	/**
+	 * Parses the given XML file and returns the requested nodes. If there's an error accessing or parsing the file, an
+	 * empty list is returned.
+	 * 
+	 * @param xml file to parse; matches all resources from classpath, filters repeated items.
+	 * @param requestedNodes requestd nodes on the xml file
+	 * @return the requested nodes of the XML file.
+	 */
+	public static List<Element> parse( String xml, String requestedNodes )
+	{
+		if( StringUtils.isNotEmpty( xml ) && StringUtils.isNotEmpty( requestedNodes ) ) {
+			Set<Element> readed = new HashSet<Element>();
+			SAXBuilder builder = new SAXBuilder();
+			try {
+				Enumeration< URL > resources = XmlUtil.class.getClassLoader().getResources( xml );
+				while( resources.hasMoreElements() ) {
+	                URL resource = resources.nextElement();
+	                log.debug( "reading " + resource.toString() );
+	                Document doc = builder.build( resource );
+	                XPathFactory xpfac = XPathFactory.instance();
+	                XPathExpression<Element> xp = xpfac.compile( requestedNodes, Filters.element() );
+	                readed.addAll( xp.evaluate( doc ) ); // filter out repeated items
+	            }
+				return new ArrayList<Element>( readed );
+			} catch ( IOException ioe ) {
+				log.error( "Couldn't load all " + xml + " resources", ioe );
+			} catch ( JDOMException jdome ) {
+				log.error( "error parsing " + xml + " resources", jdome );
+			}
+		}
+		return Collections.<Element>emptyList();
+	}
+	
+	
+	/**
+	 * Parses the given stream and returns the requested nodes. If there's an error accessing or parsing the stream, an
+	 * empty list is returned.
+	 * 
+	 * @param xmlStream stream to parse.
+	 * @param requestedNodes requestd nodes on the xml stream.
+	 * @return the requested nodes of the XML stream.
+	 */
+	public static List<Element> parse( InputStream xmlStream, String requestedNodes )
+	{
+		if( xmlStream != null && StringUtils.isNotEmpty( requestedNodes ) ) {
+			SAXBuilder builder = new SAXBuilder();
+			try {
+                Document doc = builder.build(xmlStream);
+                XPathFactory xpfac = XPathFactory.instance();
+                XPathExpression< Element > xp = xpfac.compile(requestedNodes,Filters.element());
+				return xp.evaluate( doc );
+			} catch ( IOException ioe ) {
+				log.error( "Couldn't load all " + xmlStream + " resources", ioe );
+			} catch ( JDOMException jdome ) {
+				log.error( "error parsing " + xmlStream + " resources", jdome );
+			}
+		}		
+		return Collections.<Element>emptyList();
+	}
+
 }
\ No newline at end of file
diff --git a/jspwiki-war/src/main/java/org/apache/wiki/util/comparators/CollatorComparator.java b/jspwiki-main/src/main/java/org/apache/wiki/util/comparators/CollatorComparator.java
similarity index 100%
rename from jspwiki-war/src/main/java/org/apache/wiki/util/comparators/CollatorComparator.java
rename to jspwiki-main/src/main/java/org/apache/wiki/util/comparators/CollatorComparator.java
diff --git a/jspwiki-war/src/main/java/org/apache/wiki/util/comparators/HumanComparator.java b/jspwiki-main/src/main/java/org/apache/wiki/util/comparators/HumanComparator.java
similarity index 100%
rename from jspwiki-war/src/main/java/org/apache/wiki/util/comparators/HumanComparator.java
rename to jspwiki-main/src/main/java/org/apache/wiki/util/comparators/HumanComparator.java
diff --git a/jspwiki-war/src/main/java/org/apache/wiki/util/comparators/JavaNaturalComparator.java b/jspwiki-main/src/main/java/org/apache/wiki/util/comparators/JavaNaturalComparator.java
similarity index 100%
rename from jspwiki-war/src/main/java/org/apache/wiki/util/comparators/JavaNaturalComparator.java
rename to jspwiki-main/src/main/java/org/apache/wiki/util/comparators/JavaNaturalComparator.java
diff --git a/jspwiki-war/src/main/java/org/apache/wiki/util/comparators/LocaleComparator.java b/jspwiki-main/src/main/java/org/apache/wiki/util/comparators/LocaleComparator.java
similarity index 100%
rename from jspwiki-war/src/main/java/org/apache/wiki/util/comparators/LocaleComparator.java
rename to jspwiki-main/src/main/java/org/apache/wiki/util/comparators/LocaleComparator.java
diff --git a/jspwiki-war/src/main/java/org/apache/wiki/util/comparators/PageTimeComparator.java b/jspwiki-main/src/main/java/org/apache/wiki/util/comparators/PageTimeComparator.java
similarity index 100%
rename from jspwiki-war/src/main/java/org/apache/wiki/util/comparators/PageTimeComparator.java
rename to jspwiki-main/src/main/java/org/apache/wiki/util/comparators/PageTimeComparator.java
diff --git a/jspwiki-war/src/main/java/org/apache/wiki/util/package.html b/jspwiki-main/src/main/java/org/apache/wiki/util/package.html
similarity index 100%
rename from jspwiki-war/src/main/java/org/apache/wiki/util/package.html
rename to jspwiki-main/src/main/java/org/apache/wiki/util/package.html
diff --git a/jspwiki-war/src/main/java/org/apache/wiki/workflow/AbstractStep.java b/jspwiki-main/src/main/java/org/apache/wiki/workflow/AbstractStep.java
similarity index 100%
rename from jspwiki-war/src/main/java/org/apache/wiki/workflow/AbstractStep.java
rename to jspwiki-main/src/main/java/org/apache/wiki/workflow/AbstractStep.java
diff --git a/jspwiki-war/src/main/java/org/apache/wiki/workflow/Decision.java b/jspwiki-main/src/main/java/org/apache/wiki/workflow/Decision.java
similarity index 100%
rename from jspwiki-war/src/main/java/org/apache/wiki/workflow/Decision.java
rename to jspwiki-main/src/main/java/org/apache/wiki/workflow/Decision.java
diff --git a/jspwiki-war/src/main/java/org/apache/wiki/workflow/DecisionQueue.java b/jspwiki-main/src/main/java/org/apache/wiki/workflow/DecisionQueue.java
similarity index 100%
rename from jspwiki-war/src/main/java/org/apache/wiki/workflow/DecisionQueue.java
rename to jspwiki-main/src/main/java/org/apache/wiki/workflow/DecisionQueue.java
diff --git a/jspwiki-war/src/main/java/org/apache/wiki/workflow/DecisionRequiredException.java b/jspwiki-main/src/main/java/org/apache/wiki/workflow/DecisionRequiredException.java
similarity index 100%
rename from jspwiki-war/src/main/java/org/apache/wiki/workflow/DecisionRequiredException.java
rename to jspwiki-main/src/main/java/org/apache/wiki/workflow/DecisionRequiredException.java
diff --git a/jspwiki-war/src/main/java/org/apache/wiki/workflow/Fact.java b/jspwiki-main/src/main/java/org/apache/wiki/workflow/Fact.java
similarity index 100%
rename from jspwiki-war/src/main/java/org/apache/wiki/workflow/Fact.java
rename to jspwiki-main/src/main/java/org/apache/wiki/workflow/Fact.java
diff --git a/jspwiki-war/src/main/java/org/apache/wiki/workflow/NoSuchOutcomeException.java b/jspwiki-main/src/main/java/org/apache/wiki/workflow/NoSuchOutcomeException.java
similarity index 100%
rename from jspwiki-war/src/main/java/org/apache/wiki/workflow/NoSuchOutcomeException.java
rename to jspwiki-main/src/main/java/org/apache/wiki/workflow/NoSuchOutcomeException.java
diff --git a/jspwiki-war/src/main/java/org/apache/wiki/workflow/Outcome.java b/jspwiki-main/src/main/java/org/apache/wiki/workflow/Outcome.java
similarity index 100%
rename from jspwiki-war/src/main/java/org/apache/wiki/workflow/Outcome.java
rename to jspwiki-main/src/main/java/org/apache/wiki/workflow/Outcome.java
diff --git a/jspwiki-war/src/main/java/org/apache/wiki/workflow/SimpleDecision.java b/jspwiki-main/src/main/java/org/apache/wiki/workflow/SimpleDecision.java
similarity index 100%
rename from jspwiki-war/src/main/java/org/apache/wiki/workflow/SimpleDecision.java
rename to jspwiki-main/src/main/java/org/apache/wiki/workflow/SimpleDecision.java
diff --git a/jspwiki-war/src/main/java/org/apache/wiki/workflow/SimpleNotification.java b/jspwiki-main/src/main/java/org/apache/wiki/workflow/SimpleNotification.java
similarity index 100%
rename from jspwiki-war/src/main/java/org/apache/wiki/workflow/SimpleNotification.java
rename to jspwiki-main/src/main/java/org/apache/wiki/workflow/SimpleNotification.java
diff --git a/jspwiki-war/src/main/java/org/apache/wiki/workflow/Step.java b/jspwiki-main/src/main/java/org/apache/wiki/workflow/Step.java
similarity index 100%
rename from jspwiki-war/src/main/java/org/apache/wiki/workflow/Step.java
rename to jspwiki-main/src/main/java/org/apache/wiki/workflow/Step.java
diff --git a/jspwiki-war/src/main/java/org/apache/wiki/workflow/SystemPrincipal.java b/jspwiki-main/src/main/java/org/apache/wiki/workflow/SystemPrincipal.java
similarity index 100%
rename from jspwiki-war/src/main/java/org/apache/wiki/workflow/SystemPrincipal.java
rename to jspwiki-main/src/main/java/org/apache/wiki/workflow/SystemPrincipal.java
diff --git a/jspwiki-war/src/main/java/org/apache/wiki/workflow/Task.java b/jspwiki-main/src/main/java/org/apache/wiki/workflow/Task.java
similarity index 100%
rename from jspwiki-war/src/main/java/org/apache/wiki/workflow/Task.java
rename to jspwiki-main/src/main/java/org/apache/wiki/workflow/Task.java
diff --git a/jspwiki-war/src/main/java/org/apache/wiki/workflow/Workflow.java b/jspwiki-main/src/main/java/org/apache/wiki/workflow/Workflow.java
similarity index 100%
rename from jspwiki-war/src/main/java/org/apache/wiki/workflow/Workflow.java
rename to jspwiki-main/src/main/java/org/apache/wiki/workflow/Workflow.java
diff --git a/jspwiki-war/src/main/java/org/apache/wiki/workflow/WorkflowBuilder.java b/jspwiki-main/src/main/java/org/apache/wiki/workflow/WorkflowBuilder.java
similarity index 100%
rename from jspwiki-war/src/main/java/org/apache/wiki/workflow/WorkflowBuilder.java
rename to jspwiki-main/src/main/java/org/apache/wiki/workflow/WorkflowBuilder.java
diff --git a/jspwiki-war/src/main/java/org/apache/wiki/workflow/WorkflowManager.java b/jspwiki-main/src/main/java/org/apache/wiki/workflow/WorkflowManager.java
similarity index 100%
rename from jspwiki-war/src/main/java/org/apache/wiki/workflow/WorkflowManager.java
rename to jspwiki-main/src/main/java/org/apache/wiki/workflow/WorkflowManager.java
diff --git a/jspwiki-war/src/main/java/org/apache/wiki/xmlrpc/AbstractRPCHandler.java b/jspwiki-main/src/main/java/org/apache/wiki/xmlrpc/AbstractRPCHandler.java
similarity index 100%
rename from jspwiki-war/src/main/java/org/apache/wiki/xmlrpc/AbstractRPCHandler.java
rename to jspwiki-main/src/main/java/org/apache/wiki/xmlrpc/AbstractRPCHandler.java
diff --git a/jspwiki-war/src/main/java/org/apache/wiki/xmlrpc/MetaWeblogHandler.java b/jspwiki-main/src/main/java/org/apache/wiki/xmlrpc/MetaWeblogHandler.java
similarity index 100%
rename from jspwiki-war/src/main/java/org/apache/wiki/xmlrpc/MetaWeblogHandler.java
rename to jspwiki-main/src/main/java/org/apache/wiki/xmlrpc/MetaWeblogHandler.java
diff --git a/jspwiki-war/src/main/java/org/apache/wiki/xmlrpc/RPCHandler.java b/jspwiki-main/src/main/java/org/apache/wiki/xmlrpc/RPCHandler.java
similarity index 100%
rename from jspwiki-war/src/main/java/org/apache/wiki/xmlrpc/RPCHandler.java
rename to jspwiki-main/src/main/java/org/apache/wiki/xmlrpc/RPCHandler.java
diff --git a/jspwiki-war/src/main/java/org/apache/wiki/xmlrpc/RPCHandlerUTF8.java b/jspwiki-main/src/main/java/org/apache/wiki/xmlrpc/RPCHandlerUTF8.java
similarity index 100%
rename from jspwiki-war/src/main/java/org/apache/wiki/xmlrpc/RPCHandlerUTF8.java
rename to jspwiki-main/src/main/java/org/apache/wiki/xmlrpc/RPCHandlerUTF8.java
diff --git a/jspwiki-war/src/main/java/org/apache/wiki/xmlrpc/RPCServlet.java b/jspwiki-main/src/main/java/org/apache/wiki/xmlrpc/RPCServlet.java
similarity index 100%
rename from jspwiki-war/src/main/java/org/apache/wiki/xmlrpc/RPCServlet.java
rename to jspwiki-main/src/main/java/org/apache/wiki/xmlrpc/RPCServlet.java
diff --git a/jspwiki-war/src/main/java/org/apache/wiki/xmlrpc/WikiRPCHandler.java b/jspwiki-main/src/main/java/org/apache/wiki/xmlrpc/WikiRPCHandler.java
similarity index 100%
rename from jspwiki-war/src/main/java/org/apache/wiki/xmlrpc/WikiRPCHandler.java
rename to jspwiki-main/src/main/java/org/apache/wiki/xmlrpc/WikiRPCHandler.java
diff --git a/jspwiki-war/src/main/resources/CoreResources.properties b/jspwiki-main/src/main/resources/CoreResources.properties
similarity index 100%
rename from jspwiki-war/src/main/resources/CoreResources.properties
rename to jspwiki-main/src/main/resources/CoreResources.properties
diff --git a/jspwiki-war/src/main/resources/CoreResources_de.properties b/jspwiki-main/src/main/resources/CoreResources_de.properties
similarity index 100%
rename from jspwiki-war/src/main/resources/CoreResources_de.properties
rename to jspwiki-main/src/main/resources/CoreResources_de.properties
diff --git a/jspwiki-war/src/main/resources/CoreResources_es.properties b/jspwiki-main/src/main/resources/CoreResources_es.properties
similarity index 100%
rename from jspwiki-war/src/main/resources/CoreResources_es.properties
rename to jspwiki-main/src/main/resources/CoreResources_es.properties
diff --git a/jspwiki-war/src/main/resources/CoreResources_fi.properties b/jspwiki-main/src/main/resources/CoreResources_fi.properties
similarity index 100%
rename from jspwiki-war/src/main/resources/CoreResources_fi.properties
rename to jspwiki-main/src/main/resources/CoreResources_fi.properties
diff --git a/jspwiki-war/src/main/resources/CoreResources_fr.properties b/jspwiki-main/src/main/resources/CoreResources_fr.properties
similarity index 100%
rename from jspwiki-war/src/main/resources/CoreResources_fr.properties
rename to jspwiki-main/src/main/resources/CoreResources_fr.properties
diff --git a/jspwiki-war/src/main/resources/CoreResources_it.properties b/jspwiki-main/src/main/resources/CoreResources_it.properties
similarity index 98%
rename from jspwiki-war/src/main/resources/CoreResources_it.properties
rename to jspwiki-main/src/main/resources/CoreResources_it.properties
index e4d7b35..7bf0bdf 100644
--- a/jspwiki-war/src/main/resources/CoreResources_it.properties
+++ b/jspwiki-main/src/main/resources/CoreResources_it.properties
@@ -1,230 +1,230 @@
-#  Licensed to the Apache Software Foundation (ASF) under one
-#  or more contributor license agreements.  See the NOTICE file
-#  distributed with this work for additional information
-#  regarding copyright ownership.  The ASF licenses this file
-#  to you under the Apache License, Version 2.0 (the
-#  "License"); you may not use this file except in compliance
-#  with the License.  You may obtain a copy of the License at
-#
-#    http://www.apache.org/licenses/LICENSE-2.0
-#
-#  Unless required by applicable law or agreed to in writing,
-#  software distributed under the License is distributed on an
-#  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-#  KIND, either express or implied.  See the License for the
-#  specific language governing permissions and limitations
-#  under the License.
-
-#
-#  This is the main i18n resource file for JSPWiki internal
-#  code, the so-called core code.
-#
-# Please, do not forget to use proper HTML entities, so
-#   " = &quot;
-#   ' = &#39;  Note that &apos; is NOT HTML, and does not necessarily work in all browsers.
-# 
-# Provided by L. Gilardoni, Quinary - Feb 2008.
-#
-#  Time/date formatting.  Some plugins might be using some specific formats,
-#  but you are free to use these times and dates.
-#
-
-# Timedate format used when a full time/date is used
-common.datetimeformat = HH:mm:ss dd-MMM-yyyy zzz
-
-# Time stamp format when a simple time stamp is needed (without date)
-common.timeformat = HH:mm:ss
-
-# Date stamp format when showing just the date.
-common.dateformat = EEEE, MMMM d, yyyy
-
-# "Unknown author"
-
-common.unknownauthor = AutoreSconosciuto
-
-# Decisions: {0}=task owner; {1}=requester; {2-9}=additional message arguments for workflow
-decision.editWikiApproval=Modifica la pagina {2}
-
-# Security
-
-security.error.noaccess.logged=Non hai accesso a &#39;{0}&#39;. Vuoi autenticarti con un altra utenza?.
-security.error.noaccess=Non hai accesso a &#39;{0}&#39;. Per favore, autenticati.
-security.error.wrongip=Tentativo di inviare dati da un indirizzo IP diverso da quello da cui la pagina &egrave; stata inizialmente caricata.
-
-security.error.createprofilebeforelogin=Devi autenticarti prima di creare un profilo.
-security.error.blankpassword=La password non pu&ograve; essere vuota
-security.error.passwordnomatch=Le password non corrispondono
-
-security.error.illegalfullname=Il nome completo &quot;{0}&quot; non &grave; ammesso
-security.error.illegalloginname=L'identificativo &quot;{0}&quot; non &grave; ammesso
-
-security.error.cannot.rename = Impossibile rinominare: il nome utente ''{0}'' � gi� utilizzato.
-security.error.fullname.taken = Qualcuno con il nome ''{0}'' � gi� registrato.
-security.error.login.taken = Il nome utente ''{0}'' � gi� utilizzato.
-security.user.fullname.invalid = Nome utente non valido.
-
-
-# These should roughly match whatever is used in default.properties for UserProfile.jsp
-security.user.loginname=Identificativo
-security.user.fullname=Nome completo
-security.user.email=Indirizzo Email
-
-# Renaming
-
-rename.empty=Il nome della nuova pagina &egrave; vuoto. Seleziona "back" sul browser e inserisci un nome.
-rename.error.title=Impossibile rinominare la pagina
-rename.error.reason=Causa:
-rename.identical=Nomi delle pagine identici.  Seleziona "back" sul browser e cambia il nome.
-rename.exists=La pagina "{0}" esiste gi&agrave;. Seleziona "back" sul browser e cambia il nuovo nome o cancella prima la pagina "{0}".
-rename.unknownerror=Errore sconosciuto: ({0})
-
-# Login.jsp  
-#login.error.capslock=Invalid login (please check your Caps Lock key) #obsolete
-login.error.password=L'identificativo non &egrave; valido.
-login.error.noaccess=Spiacente, sembra che la risorsa non sia accessibile.
-
-# Lostpassword.jsp
-
-# 0 = login name, 1 = password, 2 = URL, 3 = Application name (as signature)
-# This is text, not HTML.
-lostpwd.newpassword.email=Come richiesto, la nuova password per l'autenticazione di "{0}" &egrave; "{1}" \
-                    \n\nPuoi collegarti a: {2}.\n\n-- {3}
-lostpwd.newpassword.subject=Nuova password per {0}
-lostpwd.nouser=Nessun utente o email &#39;{0}&#39; trovato.
-lostpwd.nomail=Errore Interno: impossibile inviare la mail!  Vi preghiamo di contattare l'amministratore del sito.
-lostpwd.emailed=Una nuova password &egrave; stata inviata via email all'account registrato.
-
-lostpwd.reset.title=Reset della Password
-lostpwd.reset.unable=Impossibile resettare la password. Tentate di nuovo.
-
-lostpwd.reset.blurb=Password persa o dimenticata?  Inserite qui il vostro identificativo o la vostra email:
-lostpwd.reset.submit=Cambia la password!
-
-# TraditionalDiffProvider
-
-diff.traditional.added=Linea {0} aggiunta {1}
-diff.traditional.changed=Linea {0} cambiata {1}
-diff.traditional.removed=Linea {0} eliminata {1}
-diff.traditional.oneline=una linea
-diff.traditional.lines={2} linee
-
-# InputValidator
-
-validate.unsafechars={0} non pu&ograve; contenere questi caratteri: {1}
-validate.invalidemail={0} non valida
-validate.cantbenull={0} non pu&ograve; essere vuota
-
-# UserProfileTag
-
-userprofile.nogroups=(nessuno)
-userprofile.noroles=(nessuno)
-
-# NewGroup.jsp
-newgroup.exists=Il grouppo {0} esiste gi&agrave;. Prova con un altro nome.
-
-# JSPWikiMarkupParser 
-
-markupparser.error.invalidset = Trovato SET non valido: {0}
-markupparser.error.nointerwikiref = Nessun riferimento InterWiki definito nelle propriet� Wiki chiamato "{0}"!
-markupparser.error.parserfailure = Fallimento del Parser: {0}
-markupparser.error.javascriptattempt = Tentativo di scrivere javascript!
-markupparser.link.create = Creato "{0}"
-
-# Captcha.jsp
-captcha.js.humancheckcomplete.alert=Per favore, identifica i gatti.
-captcha.description=Occorre che capiamo se sei uno spammer o un robot o un essere umano.  Per favore, seleziona i gatti \
-                    nelle immagini, in modo da dimostrarci di essere un umano?
-captcha.asirra.please.select=Per favore, seleziona tutte le foto dei gatti:
-captcha.asirra.adopt.me=Adottami
-captcha.asirra.a.get.challenge=Richiedi una nuova immagine.
-captcha.asirra.a.whatsthis=Cos'&egrave; questo?
-captcha.submit=Submit
-
-# Install.jsp
-install.jsp.title=JSPWiki Installer
-install.jsp.intro.title=JSPWiki Installer
-install.jsp.intro.p1=Benvenuti! Questa semplice pagina JSP serve ad aiutare a completare il primo passo dell'istallazione. \
-                     Se potete vedere questa pagina, avete istallato correttamente JSPWiki nel container web.
-install.jsp.intro.p2=Ora ci sono alcune cose che occorre configurare. Quando premerete il bottone invia, il file \
-                     <code>jspwiki.properties</code> contenuto nella distribuzione standard ver&agrave; modificato, o, se non potesse\
-                     essere trovato, ne verr&agrave; creato uno nuovo.
-install.jsp.intro.p3=Questo sistema di setup &egrave; pensato per chi vuole avere un sistema funzionante velocemente. \
-                     Se volete integrare JSPWiki in un sistema esistente, vi raccomandiamo di modificare il file\
-                     <code>jspwiki.properties</code> direttamente.  Potete trovare una configurazione di esempio sotto:\
-                     <code>yourwiki/WEB-INF/</code>.
-install.jsp.install.info=Buone notizie: 
-install.jsp.install.warning=Attenzione: 
-install.jsp.install.error=Impossibile salvare la configurazione: 
-install.jsp.install.msg.rnd.pwd=Siccome non esiste ancora un account di amministrazione, JSPWiki ne ha creato uno, con\
-                                password casuale. Potete cambiare questa password pi&ugrave; tardi. L'identificativo di questo account &grave;\
-                                {0} e la password &egrave;{1}. Per favore, annotate questa informazione e tenetela in un posto \
-                                sicuro. JSPWiki ha anche creato un gruppo wiki chiamato {2} che contiene questo utente.
-install.jsp.install.msg.admin.notexists=E' la prima volta che avete eseguito questo installer? Se si, dovete sapere che\
-                                        dopo che JSPWiki ha validato e salvato la vostra configurazione la prima volta, avrete\
-                                        bisogno dei privilegi di amministratore per accedere ancora a questa pagina. Lo facciamo per evitare \
-                                        che persone non autorizzate possano compiere atti non voluti sul vostro wiki.   
-
-install.jsp.basics.title=Elementi base
-install.jsp.basics.appname.label=Nome dell' Applicazione
-install.jsp.basics.appname.desc=Come deve chiamarsi il vostro wiki? Vi conviene dare un nome relativamente corto.
-install.jsp.basics.baseurl.label=Base URL
-install.jsp.basics.baseurl.desc=Per favore, segnalate a JSPWiki dove &egrave; istallato il vostro wiki.
-install.jsp.basics.page.storage.label=Memorizzazione delle pagine
-install.jsp.basics.page.storage.desc=Per default, JSPWiki user&agrave; un VersioningFileProvider che mantiene i file in una specifica \
-                                     directory sul vostro disco. Se specificate una directory che non esiste, JSPWiki la\
-                                     creer&agrave; automaticamente. Tutti gli allegati verranno messi nella stessa directory.
-
-install.jsp.security.title=Sicurezza
-install.jsp.security.sec.conf.label=Configurazione della Sicurezza
-install.jsp.security.sec.conf.opt1=Sicurezza basata su JAAS e sul container (default)
-install.jsp.security.sec.conf.opt2=Sicurezza basata solo sul Container 
-install.jsp.security.sec.conf.desc=Per default, JSPWiki gestisce gli accessi alle risorse usando un sistema di sicurezza basato su JAAS. \
-                                   Verranno rispettati anche eventuali vincoli di sicurezza impostati sul Container, \
-                                   se sono stati abilitati nel file <code>web.xml</code>. Se disabilitate la sicurezza JAAS, \
-                                   JSPWiki potrebbe non funzionare come ci si aspetta. Ma in qualche caso questo potrebbe essere voluto, soprattutto se \
-                                   state tentando di diagnosticare eventuali problemi.
-install.jsp.security.admaccount.label=Account di Amministratore 
-install.jsp.security.admaccount.enabled=Abilitato
-install.jsp.security.admaccount.notenabled=Non abilitato
-install.jsp.security.admaccount.enabled.desc=Questo wiki ha un account di amministratore con identificativo <strong>admin</strong> che f&agrave; parte \
-                                             del gruppo wiki <strong>Admin</strong>. Per default, JSPWiki assegna a tutti i membri \
-                                             del gruppo Admin group il permesso <code>AllPermission</code> che permette di fare qualsiasi cosa.
-install.jsp.security.admaccount.notenabled.desc=Questo wiki non sembra avere un account di administratore. Se selezionate<em>Configura!</em>,\
-                                                JSPWiki ne creer&agrave; uno.
-
-install.jsp.adv.settings.title=Opzioni avanzate
-install.jsp.adv.settings.logfile.label=File di Log
-install.jsp.adv.settings.logfile.desc=JSPWiki usa Apache Log4j per il logging.  Per favore, definite dove devono essere salvati i file di log.
-install.jsp.adv.settings.workdir.label=Directory di lavoro
-install.jsp.adv.settings.workdir.desc=Questo &egrave; il posto dove vengono mantenute le caches e altro materiale runtime.
-install.jsp.instr.desc=Dopo che avrete selezionato <em>Configura!</em>, l' installer scriver&agrave; i setting ottenuti in: <code>{0}</code>. \
-                       Verr&agrave; anche creato un account di Amministratore con una password casuale e un corrispondente gruppo Admin. 
-install.jsp.instr.submit=Configura!
-install.jsp.validated.new.props=Ecco il vostro nuovo file  jspwiki.properties
-
-# Installer.java
-install.installer.unable.read.props=Impossiblie leggere le propriet&agrave: {0}
-install.installer.default.appname=MyWiki
-install.installer.default.pagedir=Per favore, configurami !
-install.installer.props.saved=Le vostre nuove propriet&agrave sono state salvate.  Per favore, fate ripartire il Container (a meno che questa non fosse la vostra prima\
-                              istallazione).  Scrollate per vedere il vostro nuovo jspwiki.properties.
-install.installer.props.notsaved=Impossibile scrivere le propriet&agrave;: {0}. Per favore copiate il file sottostante come il vostro nuovo jspwiki.properties:\n{1}
-install.installer.validate.baseurl=Occorre definire il base URL per questo wiki.
-install.installer.validate.pagedir=Occorre definire il posto dove salvare i file.
-install.installer.validate.appname=Occorre definire il nome dell'applicazione.
-install.installer.validate.workdir=Occorre definire la work directory.
-install.installer.validate.logfile=Occorre definire la log directory.
-
-# RSSImageLinkTag
-rss.title=RSS per la pagina {0}
-
-# AttachmentManager
-attach.unwanted.file=File con estensione non permessa.
-attach.empty.file=Nome del file vuoto.
-attach.parent.not.exist=La pagina padre non esiste
-
-# VariableManager
-varmgr.not.logged.in=non collegato
-varmgr.authenticated=autenticato
-varmgr.asserted=asserito
-varmgr.anonymous=anonimo
+#  Licensed to the Apache Software Foundation (ASF) under one
+#  or more contributor license agreements.  See the NOTICE file
+#  distributed with this work for additional information
+#  regarding copyright ownership.  The ASF licenses this file
+#  to you under the Apache License, Version 2.0 (the
+#  "License"); you may not use this file except in compliance
+#  with the License.  You may obtain a copy of the License at
+#
+#    http://www.apache.org/licenses/LICENSE-2.0
+#
+#  Unless required by applicable law or agreed to in writing,
+#  software distributed under the License is distributed on an
+#  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+#  KIND, either express or implied.  See the License for the
+#  specific language governing permissions and limitations
+#  under the License.
+
+#
+#  This is the main i18n resource file for JSPWiki internal
+#  code, the so-called core code.
+#
+# Please, do not forget to use proper HTML entities, so
+#   " = &quot;
+#   ' = &#39;  Note that &apos; is NOT HTML, and does not necessarily work in all browsers.
+# 
+# Provided by L. Gilardoni, Quinary - Feb 2008.
+#
+#  Time/date formatting.  Some plugins might be using some specific formats,
+#  but you are free to use these times and dates.
+#
+
+# Timedate format used when a full time/date is used
+common.datetimeformat = HH:mm:ss dd-MMM-yyyy zzz
+
+# Time stamp format when a simple time stamp is needed (without date)
+common.timeformat = HH:mm:ss
+
+# Date stamp format when showing just the date.
+common.dateformat = EEEE, MMMM d, yyyy
+
+# "Unknown author"
+
+common.unknownauthor = AutoreSconosciuto
+
+# Decisions: {0}=task owner; {1}=requester; {2-9}=additional message arguments for workflow
+decision.editWikiApproval=Modifica la pagina {2}
+
+# Security
+
+security.error.noaccess.logged=Non hai accesso a &#39;{0}&#39;. Vuoi autenticarti con un altra utenza?.
+security.error.noaccess=Non hai accesso a &#39;{0}&#39;. Per favore, autenticati.
+security.error.wrongip=Tentativo di inviare dati da un indirizzo IP diverso da quello da cui la pagina &egrave; stata inizialmente caricata.
+
+security.error.createprofilebeforelogin=Devi autenticarti prima di creare un profilo.
+security.error.blankpassword=La password non pu&ograve; essere vuota
+security.error.passwordnomatch=Le password non corrispondono
+
+security.error.illegalfullname=Il nome completo &quot;{0}&quot; non &grave; ammesso
+security.error.illegalloginname=L'identificativo &quot;{0}&quot; non &grave; ammesso
+
+security.error.cannot.rename = Impossibile rinominare: il nome utente ''{0}'' � gi� utilizzato.
+security.error.fullname.taken = Qualcuno con il nome ''{0}'' � gi� registrato.
+security.error.login.taken = Il nome utente ''{0}'' � gi� utilizzato.
+security.user.fullname.invalid = Nome utente non valido.
+
+
+# These should roughly match whatever is used in default.properties for UserProfile.jsp
+security.user.loginname=Identificativo
+security.user.fullname=Nome completo
+security.user.email=Indirizzo Email
+
+# Renaming
+
+rename.empty=Il nome della nuova pagina &egrave; vuoto. Seleziona "back" sul browser e inserisci un nome.
+rename.error.title=Impossibile rinominare la pagina
+rename.error.reason=Causa:
+rename.identical=Nomi delle pagine identici.  Seleziona "back" sul browser e cambia il nome.
+rename.exists=La pagina "{0}" esiste gi&agrave;. Seleziona "back" sul browser e cambia il nuovo nome o cancella prima la pagina "{0}".
+rename.unknownerror=Errore sconosciuto: ({0})
+
+# Login.jsp  
+#login.error.capslock=Invalid login (please check your Caps Lock key) #obsolete
+login.error.password=L'identificativo non &egrave; valido.
+login.error.noaccess=Spiacente, sembra che la risorsa non sia accessibile.
+
+# Lostpassword.jsp
+
+# 0 = login name, 1 = password, 2 = URL, 3 = Application name (as signature)
+# This is text, not HTML.
+lostpwd.newpassword.email=Come richiesto, la nuova password per l'autenticazione di "{0}" &egrave; "{1}" \
+                    \n\nPuoi collegarti a: {2}.\n\n-- {3}
+lostpwd.newpassword.subject=Nuova password per {0}
+lostpwd.nouser=Nessun utente o email &#39;{0}&#39; trovato.
+lostpwd.nomail=Errore Interno: impossibile inviare la mail!  Vi preghiamo di contattare l'amministratore del sito.
+lostpwd.emailed=Una nuova password &egrave; stata inviata via email all'account registrato.
+
+lostpwd.reset.title=Reset della Password
+lostpwd.reset.unable=Impossibile resettare la password. Tentate di nuovo.
+
+lostpwd.reset.blurb=Password persa o dimenticata?  Inserite qui il vostro identificativo o la vostra email:
+lostpwd.reset.submit=Cambia la password!
+
+# TraditionalDiffProvider
+
+diff.traditional.added=Linea {0} aggiunta {1}
+diff.traditional.changed=Linea {0} cambiata {1}
+diff.traditional.removed=Linea {0} eliminata {1}
+diff.traditional.oneline=una linea
+diff.traditional.lines={2} linee
+
+# InputValidator
+
+validate.unsafechars={0} non pu&ograve; contenere questi caratteri: {1}
+validate.invalidemail={0} non valida
+validate.cantbenull={0} non pu&ograve; essere vuota
+
+# UserProfileTag
+
+userprofile.nogroups=(nessuno)
+userprofile.noroles=(nessuno)
+
+# NewGroup.jsp
+newgroup.exists=Il grouppo {0} esiste gi&agrave;. Prova con un altro nome.
+
+# JSPWikiMarkupParser 
+
+markupparser.error.invalidset = Trovato SET non valido: {0}
+markupparser.error.nointerwikiref = Nessun riferimento InterWiki definito nelle propriet� Wiki chiamato "{0}"!
+markupparser.error.parserfailure = Fallimento del Parser: {0}
+markupparser.error.javascriptattempt = Tentativo di scrivere javascript!
+markupparser.link.create = Creato "{0}"
+
+# Captcha.jsp
+captcha.js.humancheckcomplete.alert=Per favore, identifica i gatti.
+captcha.description=Occorre che capiamo se sei uno spammer o un robot o un essere umano.  Per favore, seleziona i gatti \
+                    nelle immagini, in modo da dimostrarci di essere un umano?
+captcha.asirra.please.select=Per favore, seleziona tutte le foto dei gatti:
+captcha.asirra.adopt.me=Adottami
+captcha.asirra.a.get.challenge=Richiedi una nuova immagine.
+captcha.asirra.a.whatsthis=Cos'&egrave; questo?
+captcha.submit=Submit
+
+# Install.jsp
+install.jsp.title=JSPWiki Installer
+install.jsp.intro.title=JSPWiki Installer
+install.jsp.intro.p1=Benvenuti! Questa semplice pagina JSP serve ad aiutare a completare il primo passo dell'istallazione. \
+                     Se potete vedere questa pagina, avete istallato correttamente JSPWiki nel container web.
+install.jsp.intro.p2=Ora ci sono alcune cose che occorre configurare. Quando premerete il bottone invia, il file \
+                     <code>jspwiki.properties</code> contenuto nella distribuzione standard ver&agrave; modificato, o, se non potesse\
+                     essere trovato, ne verr&agrave; creato uno nuovo.
+install.jsp.intro.p3=Questo sistema di setup &egrave; pensato per chi vuole avere un sistema funzionante velocemente. \
+                     Se volete integrare JSPWiki in un sistema esistente, vi raccomandiamo di modificare il file\
+                     <code>jspwiki.properties</code> direttamente.  Potete trovare una configurazione di esempio sotto:\
+                     <code>yourwiki/WEB-INF/</code>.
+install.jsp.install.info=Buone notizie: 
+install.jsp.install.warning=Attenzione: 
+install.jsp.install.error=Impossibile salvare la configurazione: 
+install.jsp.install.msg.rnd.pwd=Siccome non esiste ancora un account di amministrazione, JSPWiki ne ha creato uno, con\
+                                password casuale. Potete cambiare questa password pi&ugrave; tardi. L'identificativo di questo account &grave;\
+                                {0} e la password &egrave;{1}. Per favore, annotate questa informazione e tenetela in un posto \
+                                sicuro. JSPWiki ha anche creato un gruppo wiki chiamato {2} che contiene questo utente.
+install.jsp.install.msg.admin.notexists=E' la prima volta che avete eseguito questo installer? Se si, dovete sapere che\
+                                        dopo che JSPWiki ha validato e salvato la vostra configurazione la prima volta, avrete\
+                                        bisogno dei privilegi di amministratore per accedere ancora a questa pagina. Lo facciamo per evitare \
+                                        che persone non autorizzate possano compiere atti non voluti sul vostro wiki.   
+
+install.jsp.basics.title=Elementi base
+install.jsp.basics.appname.label=Nome dell' Applicazione
+install.jsp.basics.appname.desc=Come deve chiamarsi il vostro wiki? Vi conviene dare un nome relativamente corto.
+install.jsp.basics.baseurl.label=Base URL
+install.jsp.basics.baseurl.desc=Per favore, segnalate a JSPWiki dove &egrave; istallato il vostro wiki.
+install.jsp.basics.page.storage.label=Memorizzazione delle pagine
+install.jsp.basics.page.storage.desc=Per default, JSPWiki user&agrave; un VersioningFileProvider che mantiene i file in una specifica \
+                                     directory sul vostro disco. Se specificate una directory che non esiste, JSPWiki la\
+                                     creer&agrave; automaticamente. Tutti gli allegati verranno messi nella stessa directory.
+
+install.jsp.security.title=Sicurezza
+install.jsp.security.sec.conf.label=Configurazione della Sicurezza
+install.jsp.security.sec.conf.opt1=Sicurezza basata su JAAS e sul container (default)
+install.jsp.security.sec.conf.opt2=Sicurezza basata solo sul Container 
+install.jsp.security.sec.conf.desc=Per default, JSPWiki gestisce gli accessi alle risorse usando un sistema di sicurezza basato su JAAS. \
+                                   Verranno rispettati anche eventuali vincoli di sicurezza impostati sul Container, \
+                                   se sono stati abilitati nel file <code>web.xml</code>. Se disabilitate la sicurezza JAAS, \
+                                   JSPWiki potrebbe non funzionare come ci si aspetta. Ma in qualche caso questo potrebbe essere voluto, soprattutto se \
+                                   state tentando di diagnosticare eventuali problemi.
+install.jsp.security.admaccount.label=Account di Amministratore 
+install.jsp.security.admaccount.enabled=Abilitato
+install.jsp.security.admaccount.notenabled=Non abilitato
+install.jsp.security.admaccount.enabled.desc=Questo wiki ha un account di amministratore con identificativo <strong>admin</strong> che f&agrave; parte \
+                                             del gruppo wiki <strong>Admin</strong>. Per default, JSPWiki assegna a tutti i membri \
+                                             del gruppo Admin group il permesso <code>AllPermission</code> che permette di fare qualsiasi cosa.
+install.jsp.security.admaccount.notenabled.desc=Questo wiki non sembra avere un account di administratore. Se selezionate<em>Configura!</em>,\
+                                                JSPWiki ne creer&agrave; uno.
+
+install.jsp.adv.settings.title=Opzioni avanzate
+install.jsp.adv.settings.logfile.label=File di Log
+install.jsp.adv.settings.logfile.desc=JSPWiki usa Apache Log4j per il logging.  Per favore, definite dove devono essere salvati i file di log.
+install.jsp.adv.settings.workdir.label=Directory di lavoro
+install.jsp.adv.settings.workdir.desc=Questo &egrave; il posto dove vengono mantenute le caches e altro materiale runtime.
+install.jsp.instr.desc=Dopo che avrete selezionato <em>Configura!</em>, l' installer scriver&agrave; i setting ottenuti in: <code>{0}</code>. \
+                       Verr&agrave; anche creato un account di Amministratore con una password casuale e un corrispondente gruppo Admin. 
+install.jsp.instr.submit=Configura!
+install.jsp.validated.new.props=Ecco il vostro nuovo file  jspwiki.properties
+
+# Installer.java
+install.installer.unable.read.props=Impossiblie leggere le propriet&agrave: {0}
+install.installer.default.appname=MyWiki
+install.installer.default.pagedir=Per favore, configurami !
+install.installer.props.saved=Le vostre nuove propriet&agrave sono state salvate.  Per favore, fate ripartire il Container (a meno che questa non fosse la vostra prima\
+                              istallazione).  Scrollate per vedere il vostro nuovo jspwiki.properties.
+install.installer.props.notsaved=Impossibile scrivere le propriet&agrave;: {0}. Per favore copiate il file sottostante come il vostro nuovo jspwiki.properties:\n{1}
+install.installer.validate.baseurl=Occorre definire il base URL per questo wiki.
+install.installer.validate.pagedir=Occorre definire il posto dove salvare i file.
+install.installer.validate.appname=Occorre definire il nome dell'applicazione.
+install.installer.validate.workdir=Occorre definire la work directory.
+install.installer.validate.logfile=Occorre definire la log directory.
+
+# RSSImageLinkTag
+rss.title=RSS per la pagina {0}
+
+# AttachmentManager
+attach.unwanted.file=File con estensione non permessa.
+attach.empty.file=Nome del file vuoto.
+attach.parent.not.exist=La pagina padre non esiste
+
+# VariableManager
+varmgr.not.logged.in=non collegato
+varmgr.authenticated=autenticato
+varmgr.asserted=asserito
+varmgr.anonymous=anonimo
diff --git a/jspwiki-war/src/main/resources/CoreResources_nl.properties b/jspwiki-main/src/main/resources/CoreResources_nl.properties
similarity index 100%
rename from jspwiki-war/src/main/resources/CoreResources_nl.properties
rename to jspwiki-main/src/main/resources/CoreResources_nl.properties
diff --git a/jspwiki-war/src/main/resources/CoreResources_pt_BR.properties b/jspwiki-main/src/main/resources/CoreResources_pt_BR.properties
similarity index 98%
rename from jspwiki-war/src/main/resources/CoreResources_pt_BR.properties
rename to jspwiki-main/src/main/resources/CoreResources_pt_BR.properties
index 0d300c6..37115a8 100644
--- a/jspwiki-war/src/main/resources/CoreResources_pt_BR.properties
+++ b/jspwiki-main/src/main/resources/CoreResources_pt_BR.properties
@@ -1,229 +1,229 @@
-#  Licensed to the Apache Software Foundation (ASF) under one
-#  or more contributor license agreements.  See the NOTICE file
-#  distributed with this work for additional information
-#  regarding copyright ownership.  The ASF licenses this file
-#  to you under the Apache License, Version 2.0 (the
-#  "License"); you may not use this file except in compliance
-#  with the License.  You may obtain a copy of the License at
-#
-#    http://www.apache.org/licenses/LICENSE-2.0
-#
-#  Unless required by applicable law or agreed to in writing,
-#  software distributed under the License is distributed on an
-#  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-#  KIND, either express or implied.  See the License for the
-#  specific language governing permissions and limitations
-#  under the License.
-
-#
-#  This is the main i18n resource file for JSPWiki internal
-#  code, the so-called core code.
-#
-# Please, do not forget to use proper HTML entities, so
-#   " = &quot;
-#   ' = &#39;  Note that &apos; is NOT HTML, and does not necessarily work in all browsers.
-
-
-
-#
-#  Time/date formatting.  Some plugins might be using some specific formats,
-#  but you are free to use these times and dates.
-#
-
-# Timedate format used when a full time/date is used
-common.datetimeformat = HH:mm:ss dd-MMM-yyyy zzz
-
-# Time stamp format when a simple time stamp is needed (without date)
-common.timeformat = HH:mm:ss
-
-# Date stamp format when showing just the date.
-common.dateformat = EEEE, d MMMM, yyyy
-
-# "Unknown author"
-
-common.unknownauthor = AutorDesconhecido
-
-# Decisions: {0}=task owner; {1}=requester; {2-9}=additional message arguments for workflow
-decision.editWikiApproval=Editar p�gina {2}
-
-# Security
-
-security.error.noaccess.logged=Voc� n�o tem acesso � &#39;{0}&#39;. Voc� deseja entrar como outro usu�rio?.
-security.error.noaccess=Voc� n�o tem acesso � &#39;{0}&#39;. Por favor se autentique primeiro.
-security.error.wrongip=Tentativa de publicar vinda de um endere�o IP diferente ao do qual a p�gina foi originalente buscada.
-
-security.error.createprofilebeforelogin=Voc� deve se autenticar antes de criar um perfil.
-security.error.blankpassword=A senha n�o pode ser vazia
-security.error.passwordnomatch=As senhas n�o s�o id�nticas
-
-security.error.illegalfullname=Nome completo &quot;{0}&quot; inv�lido
-security.error.illegalloginname=Login &quot;{0}&quot; inv�lido
-
-security.error.cannot.rename = N�o � poss�vel renomear: o login ''{0}'' est� sendo usado.
-security.error.fullname.taken = Algu�m com o nome ''{0}'' j� est� registrado
-security.error.login.taken = O login ''{0}'' est� sendo usado.
-
-# These should roughly match whatever is used in default.properties for UserProfile.jsp
-security.user.loginname=Login
-security.user.fullname=Nome completo
-security.user.email=Endere�o de email
-security.user.fullname.invalid=Nome inv�lido
-
-# Renaming
-
-rename.empty=Nome de nova p�gina vazio. 
-rename.error.title=N�o foi poss�vel renomear a p�gina
-rename.error.reason=Raz�o:
-rename.identical=Nomes de p�gina id�nticos. 
-rename.exists=P�gina "{0}" existente. Por favor altere o novo nome ou remova a p�gina "{0}" primeiro.
-rename.unknownerror=An unknown error occurred ({0})
-
-# Login.jsp  
-#login.error.capslock=Invalid login (please check your Caps Lock key) #obsolete
-login.error.password=Login inv�lido.
-login.error.noaccess=Voc� n�o possui acesso � isto. Me desculpe.
-
-# Lostpassword.jsp
-
-# 0 = login name, 1 = password, 2 = URL, 3 = Application name (as signature)
-# This is text, not HTML.
-lostpwd.newpassword.email=Como pedido, sua nova senha para login "{0}" � "{1}" \
-                    \n\nVoc� pode se autenticar em {2}.\n\n-- {3}
-lostpwd.newpassword.subject=Nova senha para {0}
-lostpwd.nouser=Nenhum usu�rio ou email "{0}" foi encontrado.
-lostpwd.nomail=Erro interno: o email n�o pode ser enviado!  Por favor entre em contato com o admnistrador.
-lostpwd.emailed=Uma nova senha foi enviada por email para a conta requisitante.
-
-lostpwd.reset.title=Resetar senha
-lostpwd.reset.unable=N�o foi poss�vel resetar a senha.  Por favor tente novamente.
-
-lostpwd.reset.blurb=Perdeu ou esqueceu a sua senha?  Insira o nome da sua conta ou seu email aqui:
-lostpwd.reset.submit=Resetar senha!
-
-# TraditionalDiffProvider
-
-diff.traditional.added=Na linha {0} adicionado {1}
-diff.traditional.changed=Na linha {0} alterado {1}
-diff.traditional.removed=Na linha {0} removido {1}
-diff.traditional.oneline=ouma linha
-diff.traditional.lines={2} linhas
-
-# InputValidator
-
-validate.unsafechars={0} n�o pode conter estes caracteres: {1}
-validate.invalidemail={0} n�o � v�lido
-validate.cantbenull={0} n�o pode ser vazio
-
-# UserProfileTag
-
-userprofile.nogroups=(nenhum)
-userprofile.noroles=(nenhum)
-
-# NewGroup.jsp
-newgroup.exists=Grupo {0} existente. Tente outro nome.
-
-# JSPWikiMarkupParser 
-
-markupparser.error.invalidset = Encontrado SET inv�lido: {0}
-markupparser.error.nointerwikiref = Nenhuma refer�ncia InterWiki definida em propriedades para a Wiki chamada "{0}"!
-markupparser.error.parserfailure = Erro de parser: {0}
-markupparser.error.javascriptattempt = Tentativa de gera��o de javascript!
-markupparser.link.create = Criar "{0}"
-
-# Captcha.jsp
-captcha.js.humancheckcomplete.alert=Por favor identifique corretamente os gatinhos.
-captcha.description=N�s acreditamos que voc� possa vir a ser um rob� ou um spammer.  Voc� pode por favor escolher os gatinhos \
-                    do conjunto abaixo de imagens, para que n�s saibamos que voc� � um ser humano?
-captcha.asirra.please.select=Por favor selecione todas as imagens de gatos:
-captcha.asirra.adopt.me=Me adote
-captcha.asirra.a.get.challenge=Pedir imagens diferentes.
-captcha.asirra.a.whatsthis=O que � isso?
-captcha.submit=Enviar
-
-# Install.jsp
-install.jsp.title=Instalador JSPWiki
-install.jsp.intro.title=Instalador JSPWiki
-install.jsp.intro.p1=Bem vindo!  Esta pequena p�gina JSP est� aqui para lhe ajudar no primeiro passo da instala��o da JSPWiki. \
-					 Se voc� est� vendo essa p�gina, voc� instalou corretamente a JSPWiki no seu container.
-install.jsp.intro.p2=Agora h� algumas coisas que voc� deve configurar. Quando voc� apertar Configurar, o arquivo \
-					 <code>jspwiki.properties</code> ser� modificado, ou se ele n�o for encontrado, um novo ser� criado.
-install.jsp.intro.p3=Esta op��o de instala��o � para pessoas que desejam a JSPWiki funcionando rapidamente. Se voc� deseja \
-					 integrar a JSPWiki com um sistema existente eu recomendo que voc� edite o arquivo <code>jspwiki.properties</code> \
-					 diretamente. Voc� pode encontrar um exemplo do arquivo de configura��o em <code>suawiki/WEB-INF/</code>.
-install.jsp.install.info=Boas not�cias: 
-install.jsp.install.warning=Aviso: 
-install.jsp.install.error=A configura��o n�o pode ser salva: 
-install.jsp.install.msg.rnd.pwd=Como uma conta de administrador ainda n�o existe, a JSPWiki criou uma para voc� com uma senha aleat�ria. \
-								Voc� pode alterar a senha mais tarde. O id da conta � {0} e a senha � {1}. Por favor anote esta informa��o \
-								e a mantenha em local seguro. A JSPWiki tamb�m criou um grupo wiki chamado {2} que cont�m esta conta.
-install.jsp.install.msg.admin.notexists=Esta � a primeira vez que voc� executa o Instalador? Se for, voc� deve saber que ap�s a JSPWiki \
-										validar e salvar suas configura��es pela primeira vez, voc� precisar� de privil�gios administrativos \
-										para acessar esta p�gina novamente. N�s fazemos isso para previnir que pessoas mal intencionadas \
-										fa�am altera��es na sua wiki.
-
-install.jsp.basics.title=O b�sico
-install.jsp.basics.appname.label=Nome da aplica��o
-install.jsp.basics.appname.desc=Como a sua wiki deve ser chamada?  Tente utilizar um nome pequeno e simples.
-install.jsp.basics.baseurl.label=URL Base
-install.jsp.basics.baseurl.desc=Por favor dia � JSPWiki o local onde est� armazenada a sua wiki.
-install.jsp.basics.page.storage.label=Armazenamento de p�gina
-install.jsp.basics.page.storage.desc=Por padr�o, a JSPWiki usar� o VersioningFileProvider que armazena arquivos em um espec�fico diret�rio \
-									 no seu disco r�digo. Se voc� especificar um diret�rio inexistente, a JSPWiki ir� criar um para voc�. \
-									 Todos os anexos tamb�m ser�o armazenados no mesmo diret�rio.
-
-install.jsp.security.title=Seguran�a
-install.jsp.security.sec.conf.label=Configura��es de seguran�a
-install.jsp.security.sec.conf.opt1=JAAS mais um container de seguran�a (padr�o)
-install.jsp.security.sec.conf.opt2=Container de seguran�a apenas
-install.jsp.security.sec.conf.desc=Por padr�o, a JSPWiki gerencia o acesso � recursos usando um sistema de seguran�a baseado em JAAS. \
-								   Ela tamb�m respeitar� quaisquer restri��es que o seu container de saguran�a possa ter, se voc� \
-								   as ativou no arquivo <code>web.xml</code>. Se voc� desativar a seguran�a por JAAS, a JSPWiki \
-								   pode n�o funcionar como o esperado. Mas em algumas ocasi�es voc� pode querer fazer isso, por exemplo \
-								   se estiver tentando consertar erros.
-install.jsp.security.admaccount.label=Conta de administrador
-install.jsp.security.admaccount.enabled=Ativada
-install.jsp.security.admaccount.notenabled=Desativada
-install.jsp.security.admaccount.enabled.desc=Esta wiki possui uma conta de administrador chamada <strong>admin</strong> que pertence ao \
-                                             grupo wiki <strong>Admin</strong>. Por padr�o, a pol�tica de seguran�a da JSPWiki garante \
-                                             � todos os membros do grupo Admin as poderosas permiss�es <code>AllPermission</code>.
-install.jsp.security.admaccount.notenabled.desc=Esta wiki n�o aparenta ter uma conta de administrador. Quando voc� clicar em \
-												<em>Configurar!</em> a JSPWiki criar� uma para voc�.
-
-install.jsp.adv.settings.title=Configura��es avan�adas
-install.jsp.adv.settings.logfile.label=Arquivos de log
-install.jsp.adv.settings.logfile.desc=A JSPWiki utiliza o Apache Log4j para os logs. Por favor diga � JSPWiki odne os arquivos de log \
-									  devem ir.
-install.jsp.adv.settings.workdir.label=Diret�rio de trabalho
-install.jsp.adv.settings.workdir.desc=Esta � o lugar onde o cache e todas as coisas de runtime s�o armazenadas.
-install.jsp.instr.desc=Ap�s voc� clicar em <em>Configurar!</em>, o instalador escrever� suas prefer�ncias em <code>{0}</code>. \
-					   Tamb�m criar� uma conta de Administrador com uma senha aleat�ria e um grupo Admin correspondente.			    
-install.jsp.instr.submit=Configurar!
-install.jsp.validated.new.props=Aqui est� o seu novo arquivo jspwiki.properties
-
-# Installer.java
-install.installer.unable.read.props=N�o foi poss�vel ler as propriedades: {0}
-install.installer.default.appname=MinhaWiki
-install.installer.default.pagedir=Por favor me configure!
-install.installer.props.saved=Suas novas propriedades foram salvas.  Por favor reinicie o seu container (a n�o ser que esta seja \
-							  sua primeira instala��o).  Des�a um pouco para ver o seu novo arquivo jspwiki.properties.
-install.installer.props.notsaved=N�o foi poss�vel escrever as propriedades: {0}. Por favor copie o arquivo abaixo como o seu \
-								 jspwiki.properties:\n{1}
-install.installer.validate.baseurl=Voc� deve definir a URL base para esta wiki.
-install.installer.validate.pagedir=Voc� deve definir o local onde os arquivos ser�o armazenados.
-install.installer.validate.appname=Voc� deve definir o nome da aplica��o.
-install.installer.validate.workdir=Voc� deve definir um diret�rio de trabalho.
-install.installer.validate.logfile=Voc� deve definir um diret�rio para logs.
-
-# RSSImageLinkTag
-rss.title=RSS feed para p�gina {0}
-
-# AttachmentManager
-attach.unwanted.file=Nome de arquivo inv�lido.
-attach.empty.file=Nome de arquivo dado em branco.
-attach.parent.not.exist=P�gina pai n�o existe
-
-# VariableManager
-varmgr.not.logged.in=n�o autenticado
-varmgr.authenticated=autenticado
-varmgr.asserted=identificado
-varmgr.anonymous=an�nimo
+#  Licensed to the Apache Software Foundation (ASF) under one
+#  or more contributor license agreements.  See the NOTICE file
+#  distributed with this work for additional information
+#  regarding copyright ownership.  The ASF licenses this file
+#  to you under the Apache License, Version 2.0 (the
+#  "License"); you may not use this file except in compliance
+#  with the License.  You may obtain a copy of the License at
+#
+#    http://www.apache.org/licenses/LICENSE-2.0
+#
+#  Unless required by applicable law or agreed to in writing,
+#  software distributed under the License is distributed on an
+#  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+#  KIND, either express or implied.  See the License for the
+#  specific language governing permissions and limitations
+#  under the License.
+
+#
+#  This is the main i18n resource file for JSPWiki internal
+#  code, the so-called core code.
+#
+# Please, do not forget to use proper HTML entities, so
+#   " = &quot;
+#   ' = &#39;  Note that &apos; is NOT HTML, and does not necessarily work in all browsers.
+
+
+
+#
+#  Time/date formatting.  Some plugins might be using some specific formats,
+#  but you are free to use these times and dates.
+#
+
+# Timedate format used when a full time/date is used
+common.datetimeformat = HH:mm:ss dd-MMM-yyyy zzz
+
+# Time stamp format when a simple time stamp is needed (without date)
+common.timeformat = HH:mm:ss
+
+# Date stamp format when showing just the date.
+common.dateformat = EEEE, d MMMM, yyyy
+
+# "Unknown author"
+
+common.unknownauthor = AutorDesconhecido
+
+# Decisions: {0}=task owner; {1}=requester; {2-9}=additional message arguments for workflow
+decision.editWikiApproval=Editar p�gina {2}
+
+# Security
+
+security.error.noaccess.logged=Voc� n�o tem acesso � &#39;{0}&#39;. Voc� deseja entrar como outro usu�rio?.
+security.error.noaccess=Voc� n�o tem acesso � &#39;{0}&#39;. Por favor se autentique primeiro.
+security.error.wrongip=Tentativa de publicar vinda de um endere�o IP diferente ao do qual a p�gina foi originalente buscada.
+
+security.error.createprofilebeforelogin=Voc� deve se autenticar antes de criar um perfil.
+security.error.blankpassword=A senha n�o pode ser vazia
+security.error.passwordnomatch=As senhas n�o s�o id�nticas
+
+security.error.illegalfullname=Nome completo &quot;{0}&quot; inv�lido
+security.error.illegalloginname=Login &quot;{0}&quot; inv�lido
+
+security.error.cannot.rename = N�o � poss�vel renomear: o login ''{0}'' est� sendo usado.
+security.error.fullname.taken = Algu�m com o nome ''{0}'' j� est� registrado
+security.error.login.taken = O login ''{0}'' est� sendo usado.
+
+# These should roughly match whatever is used in default.properties for UserProfile.jsp
+security.user.loginname=Login
+security.user.fullname=Nome completo
+security.user.email=Endere�o de email
+security.user.fullname.invalid=Nome inv�lido
+
+# Renaming
+
+rename.empty=Nome de nova p�gina vazio. 
+rename.error.title=N�o foi poss�vel renomear a p�gina
+rename.error.reason=Raz�o:
+rename.identical=Nomes de p�gina id�nticos. 
+rename.exists=P�gina "{0}" existente. Por favor altere o novo nome ou remova a p�gina "{0}" primeiro.
+rename.unknownerror=An unknown error occurred ({0})
+
+# Login.jsp  
+#login.error.capslock=Invalid login (please check your Caps Lock key) #obsolete
+login.error.password=Login inv�lido.
+login.error.noaccess=Voc� n�o possui acesso � isto. Me desculpe.
+
+# Lostpassword.jsp
+
+# 0 = login name, 1 = password, 2 = URL, 3 = Application name (as signature)
+# This is text, not HTML.
+lostpwd.newpassword.email=Como pedido, sua nova senha para login "{0}" � "{1}" \
+                    \n\nVoc� pode se autenticar em {2}.\n\n-- {3}
+lostpwd.newpassword.subject=Nova senha para {0}
+lostpwd.nouser=Nenhum usu�rio ou email "{0}" foi encontrado.
+lostpwd.nomail=Erro interno: o email n�o pode ser enviado!  Por favor entre em contato com o admnistrador.
+lostpwd.emailed=Uma nova senha foi enviada por email para a conta requisitante.
+
+lostpwd.reset.title=Resetar senha
+lostpwd.reset.unable=N�o foi poss�vel resetar a senha.  Por favor tente novamente.
+
+lostpwd.reset.blurb=Perdeu ou esqueceu a sua senha?  Insira o nome da sua conta ou seu email aqui:
+lostpwd.reset.submit=Resetar senha!
+
+# TraditionalDiffProvider
+
+diff.traditional.added=Na linha {0} adicionado {1}
+diff.traditional.changed=Na linha {0} alterado {1}
+diff.traditional.removed=Na linha {0} removido {1}
+diff.traditional.oneline=ouma linha
+diff.traditional.lines={2} linhas
+
+# InputValidator
+
+validate.unsafechars={0} n�o pode conter estes caracteres: {1}
+validate.invalidemail={0} n�o � v�lido
+validate.cantbenull={0} n�o pode ser vazio
+
+# UserProfileTag
+
+userprofile.nogroups=(nenhum)
+userprofile.noroles=(nenhum)
+
+# NewGroup.jsp
+newgroup.exists=Grupo {0} existente. Tente outro nome.
+
+# JSPWikiMarkupParser 
+
+markupparser.error.invalidset = Encontrado SET inv�lido: {0}
+markupparser.error.nointerwikiref = Nenhuma refer�ncia InterWiki definida em propriedades para a Wiki chamada "{0}"!
+markupparser.error.parserfailure = Erro de parser: {0}
+markupparser.error.javascriptattempt = Tentativa de gera��o de javascript!
+markupparser.link.create = Criar "{0}"
+
+# Captcha.jsp
+captcha.js.humancheckcomplete.alert=Por favor identifique corretamente os gatinhos.
+captcha.description=N�s acreditamos que voc� possa vir a ser um rob� ou um spammer.  Voc� pode por favor escolher os gatinhos \
+                    do conjunto abaixo de imagens, para que n�s saibamos que voc� � um ser humano?
+captcha.asirra.please.select=Por favor selecione todas as imagens de gatos:
+captcha.asirra.adopt.me=Me adote
+captcha.asirra.a.get.challenge=Pedir imagens diferentes.
+captcha.asirra.a.whatsthis=O que � isso?
+captcha.submit=Enviar
+
+# Install.jsp
+install.jsp.title=Instalador JSPWiki
+install.jsp.intro.title=Instalador JSPWiki
+install.jsp.intro.p1=Bem vindo!  Esta pequena p�gina JSP est� aqui para lhe ajudar no primeiro passo da instala��o da JSPWiki. \
+					 Se voc� est� vendo essa p�gina, voc� instalou corretamente a JSPWiki no seu container.
+install.jsp.intro.p2=Agora h� algumas coisas que voc� deve configurar. Quando voc� apertar Configurar, o arquivo \
+					 <code>jspwiki.properties</code> ser� modificado, ou se ele n�o for encontrado, um novo ser� criado.
+install.jsp.intro.p3=Esta op��o de instala��o � para pessoas que desejam a JSPWiki funcionando rapidamente. Se voc� deseja \
+					 integrar a JSPWiki com um sistema existente eu recomendo que voc� edite o arquivo <code>jspwiki.properties</code> \
+					 diretamente. Voc� pode encontrar um exemplo do arquivo de configura��o em <code>suawiki/WEB-INF/</code>.
+install.jsp.install.info=Boas not�cias: 
+install.jsp.install.warning=Aviso: 
+install.jsp.install.error=A configura��o n�o pode ser salva: 
+install.jsp.install.msg.rnd.pwd=Como uma conta de administrador ainda n�o existe, a JSPWiki criou uma para voc� com uma senha aleat�ria. \
+								Voc� pode alterar a senha mais tarde. O id da conta � {0} e a senha � {1}. Por favor anote esta informa��o \
+								e a mantenha em local seguro. A JSPWiki tamb�m criou um grupo wiki chamado {2} que cont�m esta conta.
+install.jsp.install.msg.admin.notexists=Esta � a primeira vez que voc� executa o Instalador? Se for, voc� deve saber que ap�s a JSPWiki \
+										validar e salvar suas configura��es pela primeira vez, voc� precisar� de privil�gios administrativos \
+										para acessar esta p�gina novamente. N�s fazemos isso para previnir que pessoas mal intencionadas \
+										fa�am altera��es na sua wiki.
+
+install.jsp.basics.title=O b�sico
+install.jsp.basics.appname.label=Nome da aplica��o
+install.jsp.basics.appname.desc=Como a sua wiki deve ser chamada?  Tente utilizar um nome pequeno e simples.
+install.jsp.basics.baseurl.label=URL Base
+install.jsp.basics.baseurl.desc=Por favor dia � JSPWiki o local onde est� armazenada a sua wiki.
+install.jsp.basics.page.storage.label=Armazenamento de p�gina
+install.jsp.basics.page.storage.desc=Por padr�o, a JSPWiki usar� o VersioningFileProvider que armazena arquivos em um espec�fico diret�rio \
+									 no seu disco r�digo. Se voc� especificar um diret�rio inexistente, a JSPWiki ir� criar um para voc�. \
+									 Todos os anexos tamb�m ser�o armazenados no mesmo diret�rio.
+
+install.jsp.security.title=Seguran�a
+install.jsp.security.sec.conf.label=Configura��es de seguran�a
+install.jsp.security.sec.conf.opt1=JAAS mais um container de seguran�a (padr�o)
+install.jsp.security.sec.conf.opt2=Container de seguran�a apenas
+install.jsp.security.sec.conf.desc=Por padr�o, a JSPWiki gerencia o acesso � recursos usando um sistema de seguran�a baseado em JAAS. \
+								   Ela tamb�m respeitar� quaisquer restri��es que o seu container de saguran�a possa ter, se voc� \
+								   as ativou no arquivo <code>web.xml</code>. Se voc� desativar a seguran�a por JAAS, a JSPWiki \
+								   pode n�o funcionar como o esperado. Mas em algumas ocasi�es voc� pode querer fazer isso, por exemplo \
+								   se estiver tentando consertar erros.
+install.jsp.security.admaccount.label=Conta de administrador
+install.jsp.security.admaccount.enabled=Ativada
+install.jsp.security.admaccount.notenabled=Desativada
+install.jsp.security.admaccount.enabled.desc=Esta wiki possui uma conta de administrador chamada <strong>admin</strong> que pertence ao \
+                                             grupo wiki <strong>Admin</strong>. Por padr�o, a pol�tica de seguran�a da JSPWiki garante \
+                                             � todos os membros do grupo Admin as poderosas permiss�es <code>AllPermission</code>.
+install.jsp.security.admaccount.notenabled.desc=Esta wiki n�o aparenta ter uma conta de administrador. Quando voc� clicar em \
+												<em>Configurar!</em> a JSPWiki criar� uma para voc�.
+
+install.jsp.adv.settings.title=Configura��es avan�adas
+install.jsp.adv.settings.logfile.label=Arquivos de log
+install.jsp.adv.settings.logfile.desc=A JSPWiki utiliza o Apache Log4j para os logs. Por favor diga � JSPWiki odne os arquivos de log \
+									  devem ir.
+install.jsp.adv.settings.workdir.label=Diret�rio de trabalho
+install.jsp.adv.settings.workdir.desc=Esta � o lugar onde o cache e todas as coisas de runtime s�o armazenadas.
+install.jsp.instr.desc=Ap�s voc� clicar em <em>Configurar!</em>, o instalador escrever� suas prefer�ncias em <code>{0}</code>. \
+					   Tamb�m criar� uma conta de Administrador com uma senha aleat�ria e um grupo Admin correspondente.			    
+install.jsp.instr.submit=Configurar!
+install.jsp.validated.new.props=Aqui est� o seu novo arquivo jspwiki.properties
+
+# Installer.java
+install.installer.unable.read.props=N�o foi poss�vel ler as propriedades: {0}
+install.installer.default.appname=MinhaWiki
+install.installer.default.pagedir=Por favor me configure!
+install.installer.props.saved=Suas novas propriedades foram salvas.  Por favor reinicie o seu container (a n�o ser que esta seja \
+							  sua primeira instala��o).  Des�a um pouco para ver o seu novo arquivo jspwiki.properties.
+install.installer.props.notsaved=N�o foi poss�vel escrever as propriedades: {0}. Por favor copie o arquivo abaixo como o seu \
+								 jspwiki.properties:\n{1}
+install.installer.validate.baseurl=Voc� deve definir a URL base para esta wiki.
+install.installer.validate.pagedir=Voc� deve definir o local onde os arquivos ser�o armazenados.
+install.installer.validate.appname=Voc� deve definir o nome da aplica��o.
+install.installer.validate.workdir=Voc� deve definir um diret�rio de trabalho.
+install.installer.validate.logfile=Voc� deve definir um diret�rio para logs.
+
+# RSSImageLinkTag
+rss.title=RSS feed para p�gina {0}
+
+# AttachmentManager
+attach.unwanted.file=Nome de arquivo inv�lido.
+attach.empty.file=Nome de arquivo dado em branco.
+attach.parent.not.exist=P�gina pai n�o existe
+
+# VariableManager
+varmgr.not.logged.in=n�o autenticado
+varmgr.authenticated=autenticado
+varmgr.asserted=identificado
+varmgr.anonymous=an�nimo
diff --git a/jspwiki-war/src/main/resources/CoreResources_ru.properties b/jspwiki-main/src/main/resources/CoreResources_ru.properties
similarity index 100%
rename from jspwiki-war/src/main/resources/CoreResources_ru.properties
rename to jspwiki-main/src/main/resources/CoreResources_ru.properties
diff --git a/jspwiki-war/src/main/resources/CoreResources_zh_CN.properties b/jspwiki-main/src/main/resources/CoreResources_zh_CN.properties
similarity index 100%
rename from jspwiki-war/src/main/resources/CoreResources_zh_CN.properties
rename to jspwiki-main/src/main/resources/CoreResources_zh_CN.properties
diff --git a/jspwiki-war/src/main/resources/ehcache.xml b/jspwiki-main/src/main/resources/ehcache.xml
old mode 100755
new mode 100644
similarity index 100%
rename from jspwiki-war/src/main/resources/ehcache.xml
rename to jspwiki-main/src/main/resources/ehcache.xml
diff --git a/jspwiki-war/src/main/resources/ini/classmappings.xml b/jspwiki-main/src/main/resources/ini/classmappings.xml
similarity index 100%
rename from jspwiki-war/src/main/resources/ini/classmappings.xml
rename to jspwiki-main/src/main/resources/ini/classmappings.xml
diff --git a/jspwiki-war/src/main/resources/ini/jspwiki.properties b/jspwiki-main/src/main/resources/ini/jspwiki.properties
similarity index 100%
rename from jspwiki-war/src/main/resources/ini/jspwiki.properties
rename to jspwiki-main/src/main/resources/ini/jspwiki.properties
diff --git a/jspwiki-war/src/main/resources/ini/jspwiki_module.xml b/jspwiki-main/src/main/resources/ini/jspwiki_module.xml
similarity index 100%
rename from jspwiki-war/src/main/resources/ini/jspwiki_module.xml
rename to jspwiki-main/src/main/resources/ini/jspwiki_module.xml
diff --git a/jspwiki-war/src/main/resources/org/apache/wiki/filters/profanity.properties b/jspwiki-main/src/main/resources/org/apache/wiki/filters/profanity.properties
similarity index 97%
rename from jspwiki-war/src/main/resources/org/apache/wiki/filters/profanity.properties
rename to jspwiki-main/src/main/resources/org/apache/wiki/filters/profanity.properties
index d00d175..fbc31fa 100644
--- a/jspwiki-war/src/main/resources/org/apache/wiki/filters/profanity.properties
+++ b/jspwiki-main/src/main/resources/org/apache/wiki/filters/profanity.properties
@@ -1,26 +1,26 @@
-#
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements.  See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership.  The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License.  You may obtain a copy of the License at
-#
-#   http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied.  See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-#
-
-# Feel free to fill this file with your preferred profanities, at the rate of one
-# profanity per line. The match performed against this file is case-unsensitive
-
-fuck
-shit
+#
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
+#
+
+# Feel free to fill this file with your preferred profanities, at the rate of one
+# profanity per line. The match performed against this file is case-unsensitive
+
+fuck
+shit
diff --git a/jspwiki-war/src/main/resources/org/apache/wiki/plugin/denounce.properties b/jspwiki-main/src/main/resources/org/apache/wiki/plugin/denounce.properties
similarity index 100%
rename from jspwiki-war/src/main/resources/org/apache/wiki/plugin/denounce.properties
rename to jspwiki-main/src/main/resources/org/apache/wiki/plugin/denounce.properties
diff --git a/jspwiki-war/src/main/resources/plugin/PluginResources.properties b/jspwiki-main/src/main/resources/plugin/PluginResources.properties
similarity index 100%
rename from jspwiki-war/src/main/resources/plugin/PluginResources.properties
rename to jspwiki-main/src/main/resources/plugin/PluginResources.properties
diff --git a/jspwiki-war/src/main/resources/plugin/PluginResources_de.properties b/jspwiki-main/src/main/resources/plugin/PluginResources_de.properties
similarity index 100%
rename from jspwiki-war/src/main/resources/plugin/PluginResources_de.properties
rename to jspwiki-main/src/main/resources/plugin/PluginResources_de.properties
diff --git a/jspwiki-war/src/main/resources/plugin/PluginResources_es.properties b/jspwiki-main/src/main/resources/plugin/PluginResources_es.properties
similarity index 100%
rename from jspwiki-war/src/main/resources/plugin/PluginResources_es.properties
rename to jspwiki-main/src/main/resources/plugin/PluginResources_es.properties
diff --git a/jspwiki-war/src/main/resources/plugin/PluginResources_fi.properties b/jspwiki-main/src/main/resources/plugin/PluginResources_fi.properties
similarity index 100%
rename from jspwiki-war/src/main/resources/plugin/PluginResources_fi.properties
rename to jspwiki-main/src/main/resources/plugin/PluginResources_fi.properties
diff --git a/jspwiki-war/src/main/resources/plugin/PluginResources_fr.properties b/jspwiki-main/src/main/resources/plugin/PluginResources_fr.properties
similarity index 100%
rename from jspwiki-war/src/main/resources/plugin/PluginResources_fr.properties
rename to jspwiki-main/src/main/resources/plugin/PluginResources_fr.properties
diff --git a/jspwiki-war/src/main/resources/plugin/PluginResources_it.properties b/jspwiki-main/src/main/resources/plugin/PluginResources_it.properties
similarity index 97%
rename from jspwiki-war/src/main/resources/plugin/PluginResources_it.properties
rename to jspwiki-main/src/main/resources/plugin/PluginResources_it.properties
index f0d26e6..a9c136e 100644
--- a/jspwiki-war/src/main/resources/plugin/PluginResources_it.properties
+++ b/jspwiki-main/src/main/resources/plugin/PluginResources_it.properties
@@ -1,76 +1,76 @@
-#  Licensed to the Apache Software Foundation (ASF) under one
-#  or more contributor license agreements.  See the NOTICE file
-#  distributed with this work for additional information
-#  regarding copyright ownership.  The ASF licenses this file
-#  to you under the Apache License, Version 2.0 (the
-#  "License"); you may not use this file except in compliance
-#  with the License.  You may obtain a copy of the License at
-#
-#    http://www.apache.org/licenses/LICENSE-2.0
-#
-#  Unless required by applicable law or agreed to in writing,
-#  software distributed under the License is distributed on an
-#  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-#  KIND, either express or implied.  See the License for the
-#  specific language governing permissions and limitations
-#  under the License.
-
-# This is the Italian language bundle for JSPWiki core plugins
-# Don&#39;t add your own plugins to this file; create your own bundle, please.
-
-# Errors rendering plugins
-
-plugin.error.insertionfailed = {0} : {1} - Caricamento del Plugin fallito: {2}
-plugin.error.cannotinstantiate = Non posso instanziare il plugin {0} 
-plugin.error.notallowed = Non &grave; possibile accedere al plugin {0}
-plugin.error.instantationfailed = Instanziazione del plugin {0} fallita.
-plugin.error.failed = Plugin fallito
-plugin.error.couldnotfind = Non posso trovare il plugin {0}
-plugin.error.notawikiplugin = La classe {0} non &grave; un plugin Wiki.
-plugin.error.missingparameter = Parametro mancante nella definzione del plugin: {0}
-plugin.error.parsingarguments = Zyrf.  Problema nel parsing degli argomenti: {0}
-
-# TableOfContents
-tableofcontents.title = Indice
-
-# BugReportHandler
-
-bugreporthandler.new = E' stata creata una nuova pagina: {0}
-bugreporthandler.unable = Impossibile creare una nuova pagina!
-bugreporthandler.titlerequired = Titolo obbligatorio!
-
-# CurrentTimePlugin
-
-currenttimeplugin.badformat = Formato scorretto
-
-# WeblogEntryPlugin
-
-weblogentryplugin.newentry = Nuova voce
-
-# ReferringPagesPlugin
-
-# {0} is where you put in the number how many links are still there
-referringpagesplugin.more = ... e {0} altri
-referringpagesplugin.nobody = ...nessuno
-
-# Forms plugins
-formclose.noneedtoshow = (non occorre mostrare il close)
-forminput.namemissing = Manca un &#39;nome&#39; di parametro sull'elemento Input.
-forminput.noneedtoshow = (non occorre mostrare il campo di input)
-formopen.missingparam = Manca il parametro &#39;{0}&#39; sull'elemento FormOpen.
-formopen.postorgetonly = Il metodo deve essere&#39;post&#39; o &#39;get&#39;
-formopen.noneedtoshow = (non occorre mostrare la form open ora)
-formoutput.missingargument = Argomento &#39;{0}&#39; richiesto dal Form plugin
-formselect.namemissing = Parametro &#39;name&#39; mancante sull'elemento Select.
-formtextarea.noneedtoshow = (non occorre mostrare il campo textarea)
-formtextarea.namemissing = Parametro &#39;name&#39; mancante sull'elemento Textarea.
-
-# ListLocks plugin
-plugin.listlocks.page=Pagina
-plugin.listlocks.locked.by=Bloccata da
-plugin.listlocks.acquired=Aquisiti
-plugin.listlocks.expires=Scade il
-plugin.listlocks.no.locks.exist=In questo momento non esitono blocchi.
-
-# ReferringUndefinedPagesPlugin
-referringundefinedpagesplugin.more = ... e {0} altri
+#  Licensed to the Apache Software Foundation (ASF) under one
+#  or more contributor license agreements.  See the NOTICE file
+#  distributed with this work for additional information
+#  regarding copyright ownership.  The ASF licenses this file
+#  to you under the Apache License, Version 2.0 (the
+#  "License"); you may not use this file except in compliance
+#  with the License.  You may obtain a copy of the License at
+#
+#    http://www.apache.org/licenses/LICENSE-2.0
+#
+#  Unless required by applicable law or agreed to in writing,
+#  software distributed under the License is distributed on an
+#  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+#  KIND, either express or implied.  See the License for the
+#  specific language governing permissions and limitations
+#  under the License.
+
+# This is the Italian language bundle for JSPWiki core plugins
+# Don&#39;t add your own plugins to this file; create your own bundle, please.
+
+# Errors rendering plugins
+
+plugin.error.insertionfailed = {0} : {1} - Caricamento del Plugin fallito: {2}
+plugin.error.cannotinstantiate = Non posso instanziare il plugin {0} 
+plugin.error.notallowed = Non &grave; possibile accedere al plugin {0}
+plugin.error.instantationfailed = Instanziazione del plugin {0} fallita.
+plugin.error.failed = Plugin fallito
+plugin.error.couldnotfind = Non posso trovare il plugin {0}
+plugin.error.notawikiplugin = La classe {0} non &grave; un plugin Wiki.
+plugin.error.missingparameter = Parametro mancante nella definzione del plugin: {0}
+plugin.error.parsingarguments = Zyrf.  Problema nel parsing degli argomenti: {0}
+
+# TableOfContents
+tableofcontents.title = Indice
+
+# BugReportHandler
+
+bugreporthandler.new = E' stata creata una nuova pagina: {0}
+bugreporthandler.unable = Impossibile creare una nuova pagina!
+bugreporthandler.titlerequired = Titolo obbligatorio!
+
+# CurrentTimePlugin
+
+currenttimeplugin.badformat = Formato scorretto
+
+# WeblogEntryPlugin
+
+weblogentryplugin.newentry = Nuova voce
+
+# ReferringPagesPlugin
+
+# {0} is where you put in the number how many links are still there
+referringpagesplugin.more = ... e {0} altri
+referringpagesplugin.nobody = ...nessuno
+
+# Forms plugins
+formclose.noneedtoshow = (non occorre mostrare il close)
+forminput.namemissing = Manca un &#39;nome&#39; di parametro sull'elemento Input.
+forminput.noneedtoshow = (non occorre mostrare il campo di input)
+formopen.missingparam = Manca il parametro &#39;{0}&#39; sull'elemento FormOpen.
+formopen.postorgetonly = Il metodo deve essere&#39;post&#39; o &#39;get&#39;
+formopen.noneedtoshow = (non occorre mostrare la form open ora)
+formoutput.missingargument = Argomento &#39;{0}&#39; richiesto dal Form plugin
+formselect.namemissing = Parametro &#39;name&#39; mancante sull'elemento Select.
+formtextarea.noneedtoshow = (non occorre mostrare il campo textarea)
+formtextarea.namemissing = Parametro &#39;name&#39; mancante sull'elemento Textarea.
+
+# ListLocks plugin
+plugin.listlocks.page=Pagina
+plugin.listlocks.locked.by=Bloccata da
+plugin.listlocks.acquired=Aquisiti
+plugin.listlocks.expires=Scade il
+plugin.listlocks.no.locks.exist=In questo momento non esitono blocchi.
+
+# ReferringUndefinedPagesPlugin
+referringundefinedpagesplugin.more = ... e {0} altri
diff --git a/jspwiki-war/src/main/resources/plugin/PluginResources_nl.properties b/jspwiki-main/src/main/resources/plugin/PluginResources_nl.properties
similarity index 100%
rename from jspwiki-war/src/main/resources/plugin/PluginResources_nl.properties
rename to jspwiki-main/src/main/resources/plugin/PluginResources_nl.properties
diff --git a/jspwiki-war/src/main/resources/plugin/PluginResources_pt_BR.properties b/jspwiki-main/src/main/resources/plugin/PluginResources_pt_BR.properties
similarity index 97%
rename from jspwiki-war/src/main/resources/plugin/PluginResources_pt_BR.properties
rename to jspwiki-main/src/main/resources/plugin/PluginResources_pt_BR.properties
index ca7bb6b..4823183 100644
--- a/jspwiki-war/src/main/resources/plugin/PluginResources_pt_BR.properties
+++ b/jspwiki-main/src/main/resources/plugin/PluginResources_pt_BR.properties
@@ -1,76 +1,76 @@
-#  Licensed to the Apache Software Foundation (ASF) under one
-#  or more contributor license agreements.  See the NOTICE file
-#  distributed with this work for additional information
-#  regarding copyright ownership.  The ASF licenses this file
-#  to you under the Apache License, Version 2.0 (the
-#  "License"); you may not use this file except in compliance
-#  with the License.  You may obtain a copy of the License at
-#
-#    http://www.apache.org/licenses/LICENSE-2.0
-#
-#  Unless required by applicable law or agreed to in writing,
-#  software distributed under the License is distributed on an
-#  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-#  KIND, either express or implied.  See the License for the
-#  specific language governing permissions and limitations
-#  under the License.
-
-# This is the Brazilian Portuguese language bundle for JSPWiki core plugins
-# Don&#39;t add your own plugins to this file; create your own bundle, please.
-
-# Errors rendering plugins
-
-plugin.error.insertionfailed = {0} : {1} - Inser��o de plugin falhou: {2}
-plugin.error.cannotinstantiate = N�o foi poss�vel instanciar o plugin {0} 
-plugin.error.notallowed = N�o foi permitido acessar o plugin {0}
-plugin.error.instantationfailed = Instancia��o do plugin {0} falhou.
-plugin.error.failed = Plugin falhou
-plugin.error.couldnotfind = N�o foi poss�vel encontrar o plugin {0}
-plugin.error.notawikiplugin = Classe {0} n�o � um plugin Wiki.
-plugin.error.missingparameter = Falta de par�metros em defini��o do plugin: {0}
-plugin.error.parsingarguments = Zyrf.  Problemas ao parsear os argumentos: {0}
-
-# TableOfContents
-tableofcontents.title = Tabela de Conte�do
-
-# BugReportHandler
-
-bugreporthandler.new = Uma nova p�gina foi criada: {0}
-bugreporthandler.unable = N�o foi poss�vel criar uma nova p�gina!
-bugreporthandler.titlerequired = O t�tulo � necess�rio!
-
-# CurrentTimePlugin
-
-currenttimeplugin.badformat = Voc� especificou um formato inv�lido
-
-# WeblogEntryPlugin
-
-weblogentryplugin.newentry = Nova entrada
-
-# ReferringPagesPlugin
-
-# {0} is where you put in the number how many links are still there
-referringpagesplugin.more = ...e {0} mais
-referringpagesplugin.nobody = ...ningu�m
-
-# Forms plugins
-formclose.noneedtoshow = (sem necessidade de mostrar 'close' agora)
-forminput.namemissing = Falta do par�metro &#39;name&#39; no elementro de entrada.
-forminput.noneedtoshow = (sem necessidade de mostrar 'Input field' agora)
-formopen.missingparam = Falta do par�metro &#39;{0}&#39; no elemento FormOpen.
-formopen.postorgetonly = O m�todo deve ser &#39;post&#39; ou &#39;get&#39;
-formopen.noneedtoshow = (sem necessidade de mostrar 'form open' agora)
-formoutput.missingargument = O argumento &#39;{0}&#39;� necess�rio para o plugin Form
-formselect.namemissing = Falta do par�metro &#39;name&#39; no elementro 'Select'.
-formtextarea.noneedtoshow = (sem necessidade de mostrar 'textfield area' agora)
-formtextarea.namemissing = Falta do par�metro &#39;name&#39; no elemento 'Textarea'.
-
-# ListLocks plugin
-plugin.listlocks.page=P�gina
-plugin.listlocks.locked.by=Bloquada por
-plugin.listlocks.acquired=Adquirida
-plugin.listlocks.expires=Expira
-plugin.listlocks.no.locks.exist=N�o existe bloqueio atualmente.
-
-# ReferringUndefinedPagesPlugin
-referringundefinedpagesplugin.more = ...e {0} mais
+#  Licensed to the Apache Software Foundation (ASF) under one
+#  or more contributor license agreements.  See the NOTICE file
+#  distributed with this work for additional information
+#  regarding copyright ownership.  The ASF licenses this file
+#  to you under the Apache License, Version 2.0 (the
+#  "License"); you may not use this file except in compliance
+#  with the License.  You may obtain a copy of the License at
+#
+#    http://www.apache.org/licenses/LICENSE-2.0
+#
+#  Unless required by applicable law or agreed to in writing,
+#  software distributed under the License is distributed on an
+#  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+#  KIND, either express or implied.  See the License for the
+#  specific language governing permissions and limitations
+#  under the License.
+
+# This is the Brazilian Portuguese language bundle for JSPWiki core plugins
+# Don&#39;t add your own plugins to this file; create your own bundle, please.
+
+# Errors rendering plugins
+
+plugin.error.insertionfailed = {0} : {1} - Inser��o de plugin falhou: {2}
+plugin.error.cannotinstantiate = N�o foi poss�vel instanciar o plugin {0} 
+plugin.error.notallowed = N�o foi permitido acessar o plugin {0}
+plugin.error.instantationfailed = Instancia��o do plugin {0} falhou.
+plugin.error.failed = Plugin falhou
+plugin.error.couldnotfind = N�o foi poss�vel encontrar o plugin {0}
+plugin.error.notawikiplugin = Classe {0} n�o � um plugin Wiki.
+plugin.error.missingparameter = Falta de par�metros em defini��o do plugin: {0}
+plugin.error.parsingarguments = Zyrf.  Problemas ao parsear os argumentos: {0}
+
+# TableOfContents
+tableofcontents.title = Tabela de Conte�do
+
+# BugReportHandler
+
+bugreporthandler.new = Uma nova p�gina foi criada: {0}
+bugreporthandler.unable = N�o foi poss�vel criar uma nova p�gina!
+bugreporthandler.titlerequired = O t�tulo � necess�rio!
+
+# CurrentTimePlugin
+
+currenttimeplugin.badformat = Voc� especificou um formato inv�lido
+
+# WeblogEntryPlugin
+
+weblogentryplugin.newentry = Nova entrada
+
+# ReferringPagesPlugin
+
+# {0} is where you put in the number how many links are still there
+referringpagesplugin.more = ...e {0} mais
+referringpagesplugin.nobody = ...ningu�m
+
+# Forms plugins
+formclose.noneedtoshow = (sem necessidade de mostrar 'close' agora)
+forminput.namemissing = Falta do par�metro &#39;name&#39; no elementro de entrada.
+forminput.noneedtoshow = (sem necessidade de mostrar 'Input field' agora)
+formopen.missingparam = Falta do par�metro &#39;{0}&#39; no elemento FormOpen.
+formopen.postorgetonly = O m�todo deve ser &#39;post&#39; ou &#39;get&#39;
+formopen.noneedtoshow = (sem necessidade de mostrar 'form open' agora)
+formoutput.missingargument = O argumento &#39;{0}&#39;� necess�rio para o plugin Form
+formselect.namemissing = Falta do par�metro &#39;name&#39; no elementro 'Select'.
+formtextarea.noneedtoshow = (sem necessidade de mostrar 'textfield area' agora)
+formtextarea.namemissing = Falta do par�metro &#39;name&#39; no elemento 'Textarea'.
+
+# ListLocks plugin
+plugin.listlocks.page=P�gina
+plugin.listlocks.locked.by=Bloquada por
+plugin.listlocks.acquired=Adquirida
+plugin.listlocks.expires=Expira
+plugin.listlocks.no.locks.exist=N�o existe bloqueio atualmente.
+
+# ReferringUndefinedPagesPlugin
+referringundefinedpagesplugin.more = ...e {0} mais
diff --git a/jspwiki-war/src/main/resources/plugin/PluginResources_ru.properties b/jspwiki-main/src/main/resources/plugin/PluginResources_ru.properties
similarity index 100%
rename from jspwiki-war/src/main/resources/plugin/PluginResources_ru.properties
rename to jspwiki-main/src/main/resources/plugin/PluginResources_ru.properties
diff --git a/jspwiki-war/src/main/resources/plugin/PluginResources_zh_CN.properties b/jspwiki-main/src/main/resources/plugin/PluginResources_zh_CN.properties
similarity index 100%
rename from jspwiki-war/src/main/resources/plugin/PluginResources_zh_CN.properties
rename to jspwiki-main/src/main/resources/plugin/PluginResources_zh_CN.properties
diff --git a/jspwiki-war/src/main/resources/templates/default.properties b/jspwiki-main/src/main/resources/templates/default.properties
similarity index 100%
rename from jspwiki-war/src/main/resources/templates/default.properties
rename to jspwiki-main/src/main/resources/templates/default.properties
diff --git a/jspwiki-war/src/main/resources/templates/default_de.properties b/jspwiki-main/src/main/resources/templates/default_de.properties
similarity index 100%
rename from jspwiki-war/src/main/resources/templates/default_de.properties
rename to jspwiki-main/src/main/resources/templates/default_de.properties
diff --git a/jspwiki-war/src/main/resources/templates/default_es.properties b/jspwiki-main/src/main/resources/templates/default_es.properties
similarity index 100%
rename from jspwiki-war/src/main/resources/templates/default_es.properties
rename to jspwiki-main/src/main/resources/templates/default_es.properties
diff --git a/jspwiki-war/src/main/resources/templates/default_fi.properties b/jspwiki-main/src/main/resources/templates/default_fi.properties
similarity index 100%
rename from jspwiki-war/src/main/resources/templates/default_fi.properties
rename to jspwiki-main/src/main/resources/templates/default_fi.properties
diff --git a/jspwiki-war/src/main/resources/templates/default_fr.properties b/jspwiki-main/src/main/resources/templates/default_fr.properties
similarity index 100%
rename from jspwiki-war/src/main/resources/templates/default_fr.properties
rename to jspwiki-main/src/main/resources/templates/default_fr.properties
diff --git a/jspwiki-war/src/main/resources/templates/default_it.properties b/jspwiki-main/src/main/resources/templates/default_it.properties
similarity index 97%
rename from jspwiki-war/src/main/resources/templates/default_it.properties
rename to jspwiki-main/src/main/resources/templates/default_it.properties
index 2aec7e2..24fe803 100644
--- a/jspwiki-war/src/main/resources/templates/default_it.properties
+++ b/jspwiki-main/src/main/resources/templates/default_it.properties
@@ -1,667 +1,667 @@
-#  Licensed to the Apache Software Foundation (ASF) under one
-#  or more contributor license agreements.  See the NOTICE file
-#  distributed with this work for additional information
-#  regarding copyright ownership.  The ASF licenses this file
-#  to you under the Apache License, Version 2.0 (the
-#  "License"); you may not use this file except in compliance
-#  with the License.  You may obtain a copy of the License at
-#
-#    http://www.apache.org/licenses/LICENSE-2.0
-#
-#  Unless required by applicable law or agreed to in writing,
-#  software distributed under the License is distributed on an
-#  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-#  KIND, either express or implied.  See the License for the
-#  specific language governing permissions and limitations
-#  under the License.
-
-#
-#  This file contains the localized resource definitions for
-#  the "default" template.  Any other template i18n file should
-#  be renamed in a similar way, e.g. "mytemplate.properties" under i18n/templates
-#
-# Provided by L. Gilardoni, Quinary, et. al. - Feb 2008.
-#
-# Common things
-
-common.nopage=Questa pagina non esiste ancora. Perch&egrave; non la {0}?
-common.createit=crei
-common.more=Segue...
-
-
-# AttachmentTab.jsp
-
-attach.tab=Allegati
-attach.list=Lista allegati
-attach.add=Aggiungi un nuovo allegato
-attach.add.info=Per caricare un nuovo allegato su questa pagina, \
-    usa il campo sottostante per trovare il file e poi seleziona&#8220;Carica&#8221;.
-attach.add.permission=Solo gli utenti autorizzati possono caricare nuovi allegati.
-attach.bytes=bytes
-attach.add.selectfile=Seleziona un file:
-attach.add.changenote=Nota alla modifica:
-attach.add.submit=Carica
-attach.preview=Anteprima immagine
-attach.deleteconfirm=Conferma che vuoi eliminare questo allegato permanentemente!
-attach.delete=Elimina
-attach.moreinfo.title=Informazioni sugli allegati e storia delle versioni
-
-# CommentContent.jsp
-
-comment.title.comment={0}: Commento: {1}
-comment.tab.discussionpage=Pagina di discussione
-comment.tab.addcomment=Aggiungi un commento
-comment.edithelpmissing=La pagina {0} sembra non esistere.  \
-    Probabilmente l&#8217;istallazione non &egrave; stata fatta correttamente ...\
-    <br /><br />\
-    Puoi comunque copiare il testo dalla pagina di help \
-    <a href="http://jspwiki-wiki.apache.org/Wiki.jsp?page=EditPageHelp"> \
-    su jspwiki-wiki.apache.org</a>.
-
-# ConflictContent.jsp
-
-conflict.oops.title=Oops!
-conflict.oops=<p><b>Oops!  La pagina &egrave; stata modificata da altri mentre la stavi editando!</b></p>\
-    <p>Poich&egrave; il sistema non &egrave; in grado di determinare le differenze, dovete farlo manualmente. \
-    Il testo riportato qu&igrave; &egrave; quello della nuova pagina, con le modifiche fatte da te. \
-    Devi ora copiare il testo in un qualsiasi editor e modificare nuovamente la pagina.</p> \
-    <p>Attenzione: quando tornate in editing, qualcun&#8217;altro potrebbe aver modificato ancora la pagina .... \
-	agisci velocemente.</p>
-conflict.goedit=<p>Modifica {0}</p>
-conflict.modified=Modificata da altri
-conflict.yourtext=Il vostro testo
-
-# DiffContent.jsp
-
-#diff.tab=Version changes
-diff.difference=Differenze tra la versione {0} e {1}
-diff.gotofirst.title=Vai alla prima modifica di questo documento
-diff.gotofirst=Visualizza la prima modifica
-diff.goback=Indietro a {0}, o {1}
-diff.versionhistory={0} info della pagina
-diff.nodiff=Nessuna differenza trovata.
-
-# EditContent.jsp
-
-edit.locked=L&#8217;utente &#8220;{0}&#8221; ha iniziato a modificare questa pagina, ma non l&#8217;ha ancora salvata. \
-    Puoi continuare a modificare, ma attenzione, l&#8217;altra persona potrebbe non esserne molto contenta ... \
-    Sarebbe estremamente cortese attendere cha abbia finito - o attendere almeno che scada il lock, tra {1} minuti.
-edit.restoring=Stai per ripristinare la versione {0}. \
-    Click su &#8220;Salva&#8221; per ripristinare.  Puoi anche modificare la pagina prima di ripristinarla.
-edit.chooseeditor=Editor
-edit.tab.attachments=Allegati
-edit.tab.help=Aiuto
-edit.tab.edit=Edit
-edit.tab.findreplacehelp=Aiuto cerca e sostituisci
-
-# EditTemplate.jsp
-# 0 : Application name
-# 1 : Page name
-edit.title.edit={0}: Modifica: {1}
-edit.sections=Sezioni
-
-# EditGroup.jsp
-editgroup.tab=Modifica il gruppo
-editgroup.heading.edit=Modifica il gruppo {0}
-editgroup.instructions=Questa pagina vi permette di aggiungere o modificare i membri del gruppo wiki chiamato \
-    <strong>{0}</strong>. Normalmente, solo i membri del gruppo possono editare la \
-    lista dei membri. Per default, la persona che crea un gruppo ne &egrave; membro.
-editgroup.saveerror=Non &egrave; possibile salvare il gruppo:&nbsp;
-editgroup.memberlist=I membri di questo gruppo. Inserite ogni nome utente o nome wiki \
-    separati da ritorni a capo.
-editgroup.savehelp=Se selezionate &#8220;Salva il grouppo,&#8221; questo gruppo ver&agrave; salvato come gruppo \
-    chiamato <strong>{0}</strong>. Potete poi usare questo \
-    nome nelle liste di controllo degli accessi (ACLs).
-editgroup.submit.save=Salva il gruppo
-
-# Favorites.jsp
-
-fav.myfavorites=I miei preferiti
-fav.nomenu=Per favore, crea un {0}
-fav.greet.anonymous=Utente anonimo
-fav.greet.asserted=Utente {0} (not autenticato)
-fav.greet.authenticated=Utente {0} (autenticato)
-fav.aggregatewiki.title=Aggrega il feed RSS sull&#8217;intero wiki
-
-# FindContent.jsp
-
-find.tab=Cerca nel Wiki
-find.tab.help=Help
-find.input=Inserisci qui la stringa di ricerca:
-find.heading.results=Risultati della ricerca di &#8220;{0}&#8221;
-find.resultsstart=Trovati {0} risultati, seguono i risultati da {1} a {2}.
-find.results.page=Pagina
-find.results.score=Score
-find.noresults=Nessun risultato
-find.getprevious=I precedenti {0} risultati
-find.getnext=I successivi {0} risultati
-find.externalsearch=Prova questa stessa ricerca su :
-find.submit.find=Cerca!
-find.submit.go=Vai!
-find.details=Mostra dettagli
-find.scope.all=Cerca ovunque
-find.scope.authors=Autori
-find.scope.pagename=Nomi delle pagine
-find.scope.content=Contenuto della pagina
-find.scope.attach=Allegati
-
-# GroupContent.jsp
-
-group.tab=Vedi il Gruppo
-#replaced by grp.deletegroup.confirm
-#group.areyousure=Sei sicuro di voler eliminare permanentemente il gruppo "{0}"? \
-#    Altri utenti potrebbero non poter pi&ugrave; accedere alle pagine i cui permessi referenziano questo gruppo. \\n\\n \
-#    Se selezioni OK, il gruppo verr&agrave; eliminato immediatamente.
-group.doesnotexist=Questo gruppo non esiste.
-group.createsuggestion=Perch&egrave; non {0}
-group.createit=lo crei?
-group.errorprefix=Errore&nbsp;
-group.groupintro=Questo &egrave; il gruppo wiki group chiamato {0}. Solo i membri del gruppo possono modificarlo.
-
-group.name=Nome del gruppo
-group.members=Membri del gruppo
-group.membership=La membership del gruppo.
-group.modifier={0} ha salvato questo gruppo il {1}
-group.creator={0} lo ha creato il {1}.
-
-# GroupTab.jsp
-grp.createdon=Creato il {0} da {1}
-grp.lastmodified=<br />Ultima modifica il {0} effettuata da {1}
-grp.groupnames.title=Click per modificare questo gruppo
-grp.newgroupname=(nome del nuovo gruppo)
-grp.savegroup=Salva il gruppo
-grp.savenewgroup=Salva come nuovo gruppo
-grp.cancel=Annulla
-grp.deletegroup=Cancella il gruppo
-grp.deletegroup.confirm=Conferma di voler eliminare permanentemente il gruppo!
-grp.formhelp=I membri di questo gruppo. Solo i membri del gruppo possono modificarlo. \
-	<br />Inserite i nomi wiki o i nomi completi degli utenti, separati da carriage returns.
-grp.allgroups=Tutti i gruppi
-
-# Header.jsp
-header.yourtrail=Il tuo percorso:&nbsp;
-header.homepage.title=Home page di questo wiki
-
-# InfoContent.jsp
-info.pagename=Nome della pagina
-info.parent=Pagina superiore
-info.lastmodified=Questa pagina (revision-{0}) &egrave; stata cambiata il {1} da {2}
-info.createdon=Questa pagina &egrave; stata creata il {0} da {1}
-info.current=Versione della pagina corrente
-info.feed=Feed RSS della pagina
-
-info.pagediff.title=Mostra le modifiche dell&#8217; ultimo aggiornamento
-
-info.rename.submit=Rinomina la pagina
-info.updatereferrers=Aggiorna i riferimenti?
-info.rename.permission=Solo gli utenti autorizzati possono rinominare una pagina.
-
-
-info.delete.submit=Elimina l&#8217;intera pagina
-#info.delete.attachmentwarning=<i>Cancella prima tutti gli allegati di questa pagina</i>
-info.confirmdelete=Per favore, conferma che vuoi eliminare questi contenuti permanentemente!
-info.delete.permission=Solo gli utenti autorizzati possono eliminare una pagina.
-
-info.moreinfo=Ulteriori informazioni ...
-info.backtomainpage=Torna a {0}
-info.backtoparentpage=Torna a {0} (pagina superiore)
-
-info.history=Storia delle revisioni
-info.noversions=Questa pagina ha una sola versione
-info.showrevisions=Mostra tutte le revisioni da {0} fino a {1}
-info.showfrom=Mostra {0} le revisioni da {1} a {2}
-
-info.pagination=Paginazione:
-info.pagination.first=<span class="first">Prima</span>
-info.pagination.last=<span class="last">Ultima</span>
-info.pagination.previous=<span class="prev">Precedente</span>
-info.pagination.next=<span class="next">Successiva</span>
-info.pagination.all=<span class="all">tutte</span>
-info.pagination.total=&nbsp;(Totale: {0} )
-info.pagination.show.title=Mostra tutti gli elementi da {0} a {1}
-info.pagination.showall.title=Mostra tutti gli elementi
-
-info.version=Versione
-info.date=Data di Modifica
-info.size=Dimensione
-info.author=Autore
-info.changes=Cambiamenti ...
-info.changenote=Nota di cambiamento
-info.actions=Azioni
-info.difftoprev=al precedente
-info.difftolast=all&#8217; ultimo
-
-info.tab=Informazioni
-info.attachment.tab=Info Allegato
-info.tab.links=Links
-info.tab.outgoing=Links uscenti
-info.tab.incoming=Links entranti
-info.tab.attachments=Allegati
-
-info.uploadnew=Caruca una nuova versione
-#info.uploadnew.submit=Carica un nuovo attachment
-info.uploadnew.filename=Seleziona un file:
-info.uploadnew.changenote=Nota alla modifica:
-info.uploadnew.help=Per caricare un nuovo allegato su questa pagina, \
-    usa il campo sottostante per trovare il file e poi seleziona&#8220;Carica&#8221;.
-info.uploadnew.nopermission=Solo gli utenti autorizzati possono caricare nuove versioni degli allegati.
-
-info.deleteattachment=Elimina l&#8217;allegato
-info.deleteattachment.submit=Elimina l&#8217;allegato
-
-info.attachment.history=Storia delle modifiche degli allegati
-info.attachment.type=Tipo
-info.attachment.name=Nome dell&#8217;allegato
-
-info.kilobytes=kB
-
-# LoginContent.jsp
-
-login.tab=Login
-login.title=Login
-login.heading.login=Effettua il login a {0}
-
-login.help=Autenticati con il tuo identificativo e password.
-login.errorprefix=Errore:&nbsp;
-login.login=Login
-login.password=Password
-login.remember=Ricordati di me?
-
-login.submit.login=Login
-login.invite=Vuoi autenticarti?
-login.nopassword=Non hai un account ?
-login.registernow=Registrati a {0} ora!
-login.registernow.title=Registra un nuovo account!
-
-login.lostpw=Password dimenticata?
-login.lostpw.tab=Password dimenticata
-login.lostpw.title=Password dimenticata?
-login.lostpw.getnew=Ottienine una nuova!
-login.lostpw.heading=Cambia la Password
-login.lostpw.help=Password dimenticata?  Inserisci l&#8217;indirizzo email che hai usato per registrarti.
-login.lostpw.name=Account email
-login.lostpw.submit=Cambia la password !
-login.lostpw.reset.clickhere=Clicca qu&igrave;
-login.lostpw.reset.login={0} per collegarti una volta che hai ottenuto una nuova password.
-
-login.register.tab=Registra un nuovo utente
-
-login.tab.help=Aiuto
-login.loginhelpmissing=La pagina {0} non esiste.  \
-    Qualcuno deve aver commesso degli errori nell&#8217;installazione...\
-    <br /><br />\
-    Puoi copiare il testo dalla pagina \
-    <a href="http://jspwiki-wiki.apache.org/Wiki.jsp?page=LoginHelp">LoginHelp \
-    su jspwiki-wiki.apache.org</a>.
-
-# NewGroupContent.jsp
-newgroup.heading.create=Crea un nuovo gruppo
-newgroup.errorprefix=Errore:&nbsp;
-newgroup.instructions.start=Questa pagina t permette di creare un nuovo gruppo wiki.
-newgroup.name=Nome
-newgroup.name.description=Il nome del nuovo gruppo.
-newgroup.members.description=I membri di questo gruppo. \
-    Inserite l&#8217;identificativo utente o il nome wiki di ogni utente separati da carriage returns.
-newgroup.instructions.end=Quando selezioni &#8220;Salva il gruppo,&#8221; \
-    questo gruppo verr&agrave; salvato. Puoi specificare il nome del gruppo \
-    nelle liste di controllo degli accessi (ACL) delle diverse pagine.
-newgroup.creategroup=Crea il gruppo
-newgroup.defaultgroupname=MyGroup
-
-
-# PageActions.jsp
-
-actions.gototop=Vai all&#8217;inizio
-actions.gotobottom=Vai alla fine
-actions.view=Vedi
-actions.view.title=Vedi la pagina corrente [ v ]
-actions.viewparent.title=Vedi la pagina principale [ v ]
-actions.home=Home
-actions.home.title=Vai alla home page {0}
-actions.edit=<span class='accesskey'>M</span>odifica
-actions.edit.title=Modifica la pagina [ m ]
-actions.editparent=<span class='accesskey'>M</span>odifica la pagina principale
-actions.editparent.title=Modifica la pagina principale [ m ]
-actions.index=Indice alfabetico
-actions.index.title=Indice alfabetico di tutte le pagina
-actions.recentchanges=Ultime modifiche
-actions.recentchanges.title=Pagine ordinate per data di modifica
-
-actions.more=Altro...
-actions.separator= - - - - - -
-actions.comment=Aggiungi un commento
-actions.comment.title=Aggiungi un commento
-actions.addcommenttoparent=Aggiungi un commento alla pagina superiore
-actions.upload=Allegati
-actions.info=Info
-actions.info.title=Ulterior informazioni di pagina e storia delle versioni [ i ]
-actions.prefs=<span class='accesskey'>P</span>referenze
-actions.prefs.title=Le tue preferenze [ p ]
-actions.editgroup=Modifica il gruppo
-actions.deletegroup=Elimina il gruppo
-actions.viewgroup=Vedi il gruppo
-actions.creategroup=Crea il gruppo
-actions.creategroup.title=Crea un nuovo gruppo autorizzativo
-actions.login=Autenticati
-actions.login.title=Autenticati o Registrati come nuovo utente
-actions.logout=Log out
-actions.logout.title=Log out
-actions.publishedon=Questa specifica versione &egrave; stata publicata il {0} da {1}.
-actions.notcreated=Pagina non ancora creata.
-actions.workflow=Workflow
-actions.workflow.title=Workflow
-actions.systeminfo=JSPWiki System Info
-actions.systeminfo.title=Mostra la configurazione di sistema di questo JSPWiki 
-actions.rawpage=Mostra il sorgente della pagina
-actions.rawpage.title=Mostra il sorgente della pagina
-
-# PageContent.jsp
-
-view.oldversion=Questa &egrave; la versione {0}. Non &egrave; la versione corrente, quindi non pu&ograve; essere modificata.
-view.backtocurrent=[Vai alla versione corrente]
-view.restore=[Ripristina questa versione]
-view.heading.attachments=Allegati
-
-# PageTab.jsp
-view.tab=Vedi
-
-# PreferencesContent.jsp
-
-# 0: applicationname
-prefs.heading=Preferenze
-prefs.clear.heading=Ripulisci le preferenze
-prefs.tab.prefs=Preferenze
-prefs.tab.profile=Profilo
-
-prefs.cookies=Le tue preferenze sono salvate nel browser via cookie.
-
-prefs.user.skin=Skin
-prefs.user.orientation=Stile dei preferiti
-prefs.user.orientation.left=Sinistra
-prefs.user.orientation.right=Destra
-#prefs.user.editorareaheight=Altezza dell&#8217;aerea di editing
-prefs.user.timeformat=Formato della data
-prefs.user.timezone=Seleziona la Time Zone
-prefs.user.timezone.server=[SERVER]
-prefs.user.language=Seleziona il linguaggio
-prefs.user.language.default=[DEFAULT]
-
-prefs.instructions=Inserisci qui le tue preferenze. Le tue preferenze sono salvate nel browser via cookie.
-prefs.assertedname=Nome
-prefs.assertedname.description=Il tuo nome. \
-    Se non hai ancora creato un profilo, puoi dire {0} \
-    chi sei &#8216;asserendo&#8217; un identit&agrave; (senza dire bugie ...).  \
-    <br /> \
-    Attenzione, asserire il tuo nome in questo modo non &egrave; un vero modo di autenticarti \
-    perch&egrave; lascia solo un valore in un cookie senza richiedere una password. \
-    A seconda delle politiche di sicurezza impostate su questo wiki, potresti avere associati \
-    privilegi limitati. {0} se preferisci essere identificato tramite identificativo utente e password.
-prefs.assertedname.create=Crea un nuovo profilo utente
-prefs.submit.setname=Nome utente
-prefs.save.prefs.submit=Salva le preferenze
-prefs.clear.submit=Ripulisci le preferenze
-prefs.clear.description=\
-    In qualche caso, potresti aver bisogno di rimuovere le tue credenziali da questo computer. \
-    Seleziona il bottone &#8216;Ripulisci le preferenze&#8217; per farlo. \
-    <br /> \
-    Attenzione per&ograve;, questa azione rimuove le preferenze permanentemente, e dovrai reimpostarle se necessario.
-
-prefs.newprofile=Crea un nuovo profilo utente
-prefs.oldprofile=Aggiorna il tuo profilo.
-
-prefs.errorprefix.prefs=Non &egrave; possibile salvare le preferenze:&nbsp;
-prefs.errorprefix.profile=Non &egrave; possibile salvare il profilo:&nbsp;
-
-prefs.loginname=Login name *
-prefs.loginname.description=Questo &egrave; il tuo identificativo utente.
-prefs.loginname.cannotset.new=Non potete modificare il vostro login name perch&egrave non siete ancora \
-  autenticati. Occorre che vi autentichiate, usando le credenziali fornitevi dal  \
-  vostro amministratore.
-prefs.loginname.cannotset.exists=Non puoi definire il tuo identificativo perch&egrave;\
-  le tue credenziali sono gestite dal the web container, non dal wiki.
-
-prefs.password=Password *
-prefs.password.description=La password del tuo account. Non pu&ograve; essere vuota.
-prefs.password2=Verifica Password *
-prefs.password2.description=Riscrivi la tua password per verifica.
-
-prefs.fullname=Nome *
-prefs.fullname.description=Usa questo nome nelle liste di controllo di accesso (ACL) o nei gruppi Wiki.
-
-prefs.email=Indirizzo E-mail 
-prefs.email.description= (opzionale). Se perdi la tua password, \
-    puoi richiederne una nuova - verr&agrave; inviata a questo indirizzo.
-
-prefs.cookie.info=Questo wiki si ricorda di te usando i cookies, \
-    senza richiedere autenticazioni addizionali. Per usare questa \
-    possibilit&agrave;, il tuo browser deve essere configurato in modo da accettare \
-    cookies da questo indirizzo web. Quando selezioni &#8220;salva il profilo,&#8221; un cookie \
-    verr&agrave; salvato dal tuo browser.
-prefs.acl.info=Le liste di controllo di accesso (ACL) o i gruppi Wiki legati alla tua identit&agrave; \
-    devono specificare il tuo identificativo o nome wiki. Tu sei anche un membro \
-    dei Ruoli e Gruppi menzionati sopra.
-
-prefs.lastmodified=Hai crato il tuo profilo su {0}, e l&#8217;hai salvato il {1}
-prefs.save.description=Seleziona &#8220;Salva il profilo&#8221; per salvare il tuo profilo.
-
-prefs.save.submit=Salva il profilo
-prefs.create.submit=Crea un nuovo profilo utente
-
-prefs.roles=Ruoli
-prefs.groups=Gruppi
-prefs.creationdate=Data creazione
-prefs.profile.lastmodified=Ultima modifica
-
-# Workflow generic messages
-workflow.tab=Workflow
-workflow.heading=I tuoi elementi dei Workflow 
-workflow.decisions.heading=Inbox
-workflow.workflows.heading=Outbox
-workflow.instructions=Questa pagina contiene informazioni \
-    sui workflows cha hai attivato, o su cui ti &egrave; stato richiesto di operare.
-workflow.noinstructions=Non hai nessun elemento di workflow.
-workflow.actor.instructions=Devi operare sui seguenti workflows:
-workflow.owner.instructions=HAi attivato i seguenti workflows:
-workflow.id=ID
-workflow.requester=Richiedente
-workflow.item=Elemento
-workflow.startTime=Ricevuto
-workflow.actions=Azioni
-workflow.actor=Soggetto
-workflow.submit=Esegui
-outcome.step.abort=Annulla
-outcome.step.complete=Completato
-outcome.step.continue=Continua
-outcome.decision.acknowledge=OK
-outcome.decision.approve=Approva
-outcome.decision.deny=Deny
-outcome.decision.hold=Blocca
-outcome.decision.reassign=Riassegna
-
-workflow.details.title=Mostra o nascondi i dettagli 
-workflow.details=dettagli ...
-
-# Specific workflow/decision messages
-workflow.saveWikiPage=Salva la pagina wiki <strong>{2}</strong>
-decision.saveWikiPage=Approva la pagina <strong>{2}</strong>
-notification.saveWikiPage.reject=La tua richiesta di salvare la pagina <strong>{2}</strong> &egrave; stata rigettata.
-fact.pageName=Nome della pagina
-fact.diffText=Differenze tra la versione proposta e quella corrente
-fact.proposedText=Proposta
-fact.currentText=Corrente
-fact.isAuthenticated=Autenticato?
-
-select.one=(selezionane uno)
-decision.createUserProfile=Nuovo profilo utente <strong>{2}</strong>
-notification.createUserProfile.accept.subject=Benvenuto in {0}\!
-notification.createUserProfile.accept.content=Congratulazioni\! Il tuo nuovo profilo su {0} è stato creato. I dettagli del profilo sono\: \n\nNome utente \: {1} \nIl tuo nome\: {2} \nE-mail      \: {3} \n\nSe hai dimenticato la password la puoi resettare qui: {4}.
-notification.createUserProfile.reject=La tua richiesta di creazione di profilo utente &egrave; stata rigettata.
-fact.submitter=Submitter
-
-#  PreviewContent.jsp
-preview.tab=Anteprima
-preview.info=Questa &egrave; un <strong>anteprima</strong>!  \
-    Seleziona &#8220;Continua a modificare&#8221; per ritornare all&#8217; editor, \
-    o seleziona &#8220;Salva&#8221; se v&agrave; gi&agrave; bene.
-
-#  SearchBox.jsp
-sbox.search.submit=Navigazione veloce
-sbox.view=mostra
-sbox.view.title=Mostra la pagina selezionata
-sbox.edit=modifica
-sbox.edit.title=Modifica la pagina selezionata
-sbox.clone=duplica
-sbox.clone.title=Duplica la pagina selezionata
-sbox.find=trova
-sbox.find.title=Ricerca avanzata
-sbox.search.result=Ricerca veloce
-sbox.search.target=(inserisci)
-sbox.clearrecent=(svuota)
-sbox.recentsearches=Ultime modifiche
-
-# UploadTemplate.jsp
-# move all to attach.
-upload.title={0}: Aggiungi un allegato
-upload.heading.upload=CArica un nuovo allegato a {0}
-upload.attachments=Allegati correnti
-upload.info=Per caricare un nuovo allegato, usa \
-    il campo seguente per specificare il file e poi seleziona &#8220;Carica&#8221;.
-upload.submit=Carica
-upload.done=Se hai completato il caricamento, puoi tornare a {0}
-
-
-# ViewTemplate.jsp
-# 0 : Application Name
-# 1 : Page name
-view.title.view={0}: {1}
-
-
-# The built-in editors also have their localized strings in this file.
-
-editor.plain.name=Il tuo <span class='accesskey'>n</span>ome
-editor.plain.remember=Ricorda?
-editor.plain.email=Homepage o e<span class='accesskey'>m</span>ail
-editor.plain.save.submit=Salva
-editor.plain.save.title=Salva [ s ]
-editor.plain.preview.submit=Anteprima
-editor.plain.preview.title=Anteprima [ v ]
-editor.plain.cancel.submit=Annulla
-editor.plain.cancel.title=Annulla. Le modifiche saranno perdute. [ q ]
-
-editor.plain.changenote=Nota alla revisione
-editor.commentsignature=Firma il commento
-editor.plain.toolbar=Toolbar
-editor.plain.find=Cerca
-editor.plain.replace=Sostituisci
-editor.plain.matchcase=Controlla maiuscole
-editor.plain.regexp=RegExp
-editor.plain.global=Sostituisci tutto
-editor.plain.find.submit=Sostituisci
-editor.plain.redo.submit=Redo
-editor.plain.undo.submit=Undo
-editor.plain.redo.title=Redo l'ultimo Undo
-editor.plain.undo.title=Undo l'ultima sostituzione [ z ]
-
-#new since v2.5.100
-editor.plain.posteditor=Inserisci Keyword+Tab:
-editor.plain.posteditor.title=shift+enter per il campo successivo
-
-editor.plain.smartpairs= Controllo automatico delle chiusure
-editor.plain.smartpairs.title= Controllo automatico delle chiusure di () [] {} &lt;&gt; &quot;&quot; &#39;&#39;
-editor.plain.tabcompletion=Completamento Tab (keyword+Tab)
-editor.plain.tabcompletion.title=Espansione automatica delle keyword in Wiki Markup
-
-#editor.plain.editassist=Assistente
-#editor.plain.editassist.title=Cambia i bottoni dell'assistente
-editor.plain.sneakpreview=Anteprima
-editor.plain.sneakpreview.title=Anteprima. \
-    Cliccate fuori dall&quot;area di testo per rinfrescare la area di anteprima.
-editor.plain.tbLink.title=link - Inserisci un link wiki 
-editor.plain.tbH1.title=h1 - Inserisci heading1
-editor.plain.tbH2.title=h2 - Inserisci heading2
-editor.plain.tbH3.title=h3 - Inserisci heading3
-editor.plain.tbHR.title=hr - Inserisci un ruler orizzontale
-editor.plain.tbBR.title=br - Inserisci un a capo
-editor.plain.tbPRE.title=pre - Inserisci un blocco preformattato
-editor.plain.tbDL.title=dl - Inserisci una lista di  definizioni
-editor.plain.tbB.title=grassetto
-editor.plain.tbI.title=corsivo
-editor.plain.tbMONO.title=mono - monospace
-editor.plain.tbSUP.title=sup - superscript
-editor.plain.tbSUB.title=sub - subscript
-editor.plain.tbSTRIKE.title=strike - sovrascritto
-editor.plain.tbTOC.title=toc - Inserisci un indice
-editor.plain.tbTAB.title=tab - Inserisci una sezione a linguette
-editor.plain.tbTABLE.title=table - Inserisci una tabella
-editor.plain.tbIMG.title=img - Inserisci un immagine
-editor.plain.tbCODE.title=code - Inserisci un blocco di codice
-editor.plain.tbQUOTE.title=quote - Inserisci un blocco quotato
-editor.plain.tbSIGN.title=sign - Inserisci la firma
-
-editor.preview.edit.submit=Continua a modificare
-editor.preview.edit.title=Continua a modificare la pagina corrente [ e ]
-editor.preview.save.submit=Salva
-editor.preview.save.title=Salva la pagina corrente [ s ]
-editor.preview.cancel.submit=Annulla
-editor.preview.cancel.title=Annulla le modifiche. Le modifiche verranno perse. [ q ]
-
-editor.fck.noscript=Devi abilitare il Javascript nel tuo browser per poter usare l&#8217;editor FCK 
-editor.wikiwizard.noscript=Devi abilitare il Javascript nel tuo browser per poter usare l&#8217;editor WikiWizard 
-editor.wikiwizard.noapplet=Applets non supportati o non abilitati nel tuo browser. \
-    Prego <a href="http://www.java.com/">scaricate una vesrione di Java</a>per poter utilizzare l&#8217;editor WikiWizard.
-
-#blog texts in various JSPs
-blog.commenttitle=commenti
-blog.backtomain=Torna alla pagina principale del blog
-blog.addcomments=Aggiungi nuovi commenti
-
-
-#
-#  The Javascript stuff
-#
-javascript.sbox.clone.suffix=-New
-
-javascript.edit.allsections=( Tutte )
-javascript.edit.startOfPage=( inizio della pagina )
-javascript.edit.findandreplace.nomatch=Nessun risultato!
-javascript.edit.toolbar.makeSelection=Seleziona qualcosa prima.
-javascript.edit.resize=Drag per ridimensionare la text area
-javascript.edit.areyousure=Se non hai prima selezionato il bottone Salva, perderai ogni modifica. \
-    Sei sicuro di voler uscire?
-
-javascript.favs.show=Click per vedere i Favorites
-javascript.favs.hide=Click per nascondere i Favorites
-javascript.quick.edit=Modifica questa sezione
-
-javascript.quick.edit.title=Modifica la sezione {0}...
-
-javascript.collapse=Click per chiudere
-javascript.expand=Click per espandere
-
-javascript.sort.click=Click per ordinare
-javascript.sort.ascending=Ordine ascendente. Click per invertire la direzione di ordinamento
-javascript.sort.descending=Ordine discendent. Click per invertire la direzione di ordinamento
-javascript.filter.all=( Tutti )
-
-javascript.group.validName=Fornisci un nome valido per il nuovo gruppo
-
-javascript.category.title=Click per mostrare la categoria [{0}] ...
-
-javascript.slimbox.info=Immagine {0} di {1}
-javascript.slimbox.error=<h2>Errore</h2>C&#8217;&egrave; stato un problema sulla richiesta.<br />Prego, riprovare
-javascript.slimbox.directLink=Link diretto al target
-javascript.slimbox.remoteRequest=Richiesta Remota {0} di {1}
-javascript.slimbox.previous=&laquo;Precedente
-javascript.slimbox.next=Successivo&raquo;
-javascript.slimbox.close=Chiudi &#215;
-javascript.slimbox.close.title=Chiudi [Esc]
-
-javascript.tip.default.title=Altro...
-
-javascript.prefs.areyousure=Senza cliccare il bottone Save User Preferences, \
-	i tuoi cambiamenti verranno persi. Sei sicuro di voler abbandonare questa pagina?
-	
-javascript.sectionediting.label = Riassunto della Sezione
-prefs.errorprefix.rename = Impossibile rinominare la pagina:&nbsp;
-prefs.user.sectionediting = Editing Sezioni
-prefs.user.sectionediting.text = Abilita l'editing delle sezioni con il collegamento<span class="editsection"><a href="#">[modifica]</a></span>
+#  Licensed to the Apache Software Foundation (ASF) under one
+#  or more contributor license agreements.  See the NOTICE file
+#  distributed with this work for additional information
+#  regarding copyright ownership.  The ASF licenses this file
+#  to you under the Apache License, Version 2.0 (the
+#  "License"); you may not use this file except in compliance
+#  with the License.  You may obtain a copy of the License at
+#
+#    http://www.apache.org/licenses/LICENSE-2.0
+#
+#  Unless required by applicable law or agreed to in writing,
+#  software distributed under the License is distributed on an
+#  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+#  KIND, either express or implied.  See the License for the
+#  specific language governing permissions and limitations
+#  under the License.
+
+#
+#  This file contains the localized resource definitions for
+#  the "default" template.  Any other template i18n file should
+#  be renamed in a similar way, e.g. "mytemplate.properties" under i18n/templates
+#
+# Provided by L. Gilardoni, Quinary, et. al. - Feb 2008.
+#
+# Common things
+
+common.nopage=Questa pagina non esiste ancora. Perch&egrave; non la {0}?
+common.createit=crei
+common.more=Segue...
+
+
+# AttachmentTab.jsp
+
+attach.tab=Allegati
+attach.list=Lista allegati
+attach.add=Aggiungi un nuovo allegato
+attach.add.info=Per caricare un nuovo allegato su questa pagina, \
+    usa il campo sottostante per trovare il file e poi seleziona&#8220;Carica&#8221;.
+attach.add.permission=Solo gli utenti autorizzati possono caricare nuovi allegati.
+attach.bytes=bytes
+attach.add.selectfile=Seleziona un file:
+attach.add.changenote=Nota alla modifica:
+attach.add.submit=Carica
+attach.preview=Anteprima immagine
+attach.deleteconfirm=Conferma che vuoi eliminare questo allegato permanentemente!
+attach.delete=Elimina
+attach.moreinfo.title=Informazioni sugli allegati e storia delle versioni
+
+# CommentContent.jsp
+
+comment.title.comment={0}: Commento: {1}
+comment.tab.discussionpage=Pagina di discussione
+comment.tab.addcomment=Aggiungi un commento
+comment.edithelpmissing=La pagina {0} sembra non esistere.  \
+    Probabilmente l&#8217;istallazione non &egrave; stata fatta correttamente ...\
+    <br /><br />\
+    Puoi comunque copiare il testo dalla pagina di help \
+    <a href="http://jspwiki-wiki.apache.org/Wiki.jsp?page=EditPageHelp"> \
+    su jspwiki-wiki.apache.org</a>.
+
+# ConflictContent.jsp
+
+conflict.oops.title=Oops!
+conflict.oops=<p><b>Oops!  La pagina &egrave; stata modificata da altri mentre la stavi editando!</b></p>\
+    <p>Poich&egrave; il sistema non &egrave; in grado di determinare le differenze, dovete farlo manualmente. \
+    Il testo riportato qu&igrave; &egrave; quello della nuova pagina, con le modifiche fatte da te. \
+    Devi ora copiare il testo in un qualsiasi editor e modificare nuovamente la pagina.</p> \
+    <p>Attenzione: quando tornate in editing, qualcun&#8217;altro potrebbe aver modificato ancora la pagina .... \
+	agisci velocemente.</p>
+conflict.goedit=<p>Modifica {0}</p>
+conflict.modified=Modificata da altri
+conflict.yourtext=Il vostro testo
+
+# DiffContent.jsp
+
+#diff.tab=Version changes
+diff.difference=Differenze tra la versione {0} e {1}
+diff.gotofirst.title=Vai alla prima modifica di questo documento
+diff.gotofirst=Visualizza la prima modifica
+diff.goback=Indietro a {0}, o {1}
+diff.versionhistory={0} info della pagina
+diff.nodiff=Nessuna differenza trovata.
+
+# EditContent.jsp
+
+edit.locked=L&#8217;utente &#8220;{0}&#8221; ha iniziato a modificare questa pagina, ma non l&#8217;ha ancora salvata. \
+    Puoi continuare a modificare, ma attenzione, l&#8217;altra persona potrebbe non esserne molto contenta ... \
+    Sarebbe estremamente cortese attendere cha abbia finito - o attendere almeno che scada il lock, tra {1} minuti.
+edit.restoring=Stai per ripristinare la versione {0}. \
+    Click su &#8220;Salva&#8221; per ripristinare.  Puoi anche modificare la pagina prima di ripristinarla.
+edit.chooseeditor=Editor
+edit.tab.attachments=Allegati
+edit.tab.help=Aiuto
+edit.tab.edit=Edit
+edit.tab.findreplacehelp=Aiuto cerca e sostituisci
+
+# EditTemplate.jsp
+# 0 : Application name
+# 1 : Page name
+edit.title.edit={0}: Modifica: {1}
+edit.sections=Sezioni
+
+# EditGroup.jsp
+editgroup.tab=Modifica il gruppo
+editgroup.heading.edit=Modifica il gruppo {0}
+editgroup.instructions=Questa pagina vi permette di aggiungere o modificare i membri del gruppo wiki chiamato \
+    <strong>{0}</strong>. Normalmente, solo i membri del gruppo possono editare la \
+    lista dei membri. Per default, la persona che crea un gruppo ne &egrave; membro.
+editgroup.saveerror=Non &egrave; possibile salvare il gruppo:&nbsp;
+editgroup.memberlist=I membri di questo gruppo. Inserite ogni nome utente o nome wiki \
+    separati da ritorni a capo.
+editgroup.savehelp=Se selezionate &#8220;Salva il grouppo,&#8221; questo gruppo ver&agrave; salvato come gruppo \
+    chiamato <strong>{0}</strong>. Potete poi usare questo \
+    nome nelle liste di controllo degli accessi (ACLs).
+editgroup.submit.save=Salva il gruppo
+
+# Favorites.jsp
+
+fav.myfavorites=I miei preferiti
+fav.nomenu=Per favore, crea un {0}
+fav.greet.anonymous=Utente anonimo
+fav.greet.asserted=Utente {0} (not autenticato)
+fav.greet.authenticated=Utente {0} (autenticato)
+fav.aggregatewiki.title=Aggrega il feed RSS sull&#8217;intero wiki
+
+# FindContent.jsp
+
+find.tab=Cerca nel Wiki
+find.tab.help=Help
+find.input=Inserisci qui la stringa di ricerca:
+find.heading.results=Risultati della ricerca di &#8220;{0}&#8221;
+find.resultsstart=Trovati {0} risultati, seguono i risultati da {1} a {2}.
+find.results.page=Pagina
+find.results.score=Score
+find.noresults=Nessun risultato
+find.getprevious=I precedenti {0} risultati
+find.getnext=I successivi {0} risultati
+find.externalsearch=Prova questa stessa ricerca su :
+find.submit.find=Cerca!
+find.submit.go=Vai!
+find.details=Mostra dettagli
+find.scope.all=Cerca ovunque
+find.scope.authors=Autori
+find.scope.pagename=Nomi delle pagine
+find.scope.content=Contenuto della pagina
+find.scope.attach=Allegati
+
+# GroupContent.jsp
+
+group.tab=Vedi il Gruppo
+#replaced by grp.deletegroup.confirm
+#group.areyousure=Sei sicuro di voler eliminare permanentemente il gruppo "{0}"? \
+#    Altri utenti potrebbero non poter pi&ugrave; accedere alle pagine i cui permessi referenziano questo gruppo. \\n\\n \
+#    Se selezioni OK, il gruppo verr&agrave; eliminato immediatamente.
+group.doesnotexist=Questo gruppo non esiste.
+group.createsuggestion=Perch&egrave; non {0}
+group.createit=lo crei?
+group.errorprefix=Errore&nbsp;
+group.groupintro=Questo &egrave; il gruppo wiki group chiamato {0}. Solo i membri del gruppo possono modificarlo.
+
+group.name=Nome del gruppo
+group.members=Membri del gruppo
+group.membership=La membership del gruppo.
+group.modifier={0} ha salvato questo gruppo il {1}
+group.creator={0} lo ha creato il {1}.
+
+# GroupTab.jsp
+grp.createdon=Creato il {0} da {1}
+grp.lastmodified=<br />Ultima modifica il {0} effettuata da {1}
+grp.groupnames.title=Click per modificare questo gruppo
+grp.newgroupname=(nome del nuovo gruppo)
+grp.savegroup=Salva il gruppo
+grp.savenewgroup=Salva come nuovo gruppo
+grp.cancel=Annulla
+grp.deletegroup=Cancella il gruppo
+grp.deletegroup.confirm=Conferma di voler eliminare permanentemente il gruppo!
+grp.formhelp=I membri di questo gruppo. Solo i membri del gruppo possono modificarlo. \
+	<br />Inserite i nomi wiki o i nomi completi degli utenti, separati da carriage returns.
+grp.allgroups=Tutti i gruppi
+
+# Header.jsp
+header.yourtrail=Il tuo percorso:&nbsp;
+header.homepage.title=Home page di questo wiki
+
+# InfoContent.jsp
+info.pagename=Nome della pagina
+info.parent=Pagina superiore
+info.lastmodified=Questa pagina (revision-{0}) &egrave; stata cambiata il {1} da {2}
+info.createdon=Questa pagina &egrave; stata creata il {0} da {1}
+info.current=Versione della pagina corrente
+info.feed=Feed RSS della pagina
+
+info.pagediff.title=Mostra le modifiche dell&#8217; ultimo aggiornamento
+
+info.rename.submit=Rinomina la pagina
+info.updatereferrers=Aggiorna i riferimenti?
+info.rename.permission=Solo gli utenti autorizzati possono rinominare una pagina.
+
+
+info.delete.submit=Elimina l&#8217;intera pagina
+#info.delete.attachmentwarning=<i>Cancella prima tutti gli allegati di questa pagina</i>
+info.confirmdelete=Per favore, conferma che vuoi eliminare questi contenuti permanentemente!
+info.delete.permission=Solo gli utenti autorizzati possono eliminare una pagina.
+
+info.moreinfo=Ulteriori informazioni ...
+info.backtomainpage=Torna a {0}
+info.backtoparentpage=Torna a {0} (pagina superiore)
+
+info.history=Storia delle revisioni
+info.noversions=Questa pagina ha una sola versione
+info.showrevisions=Mostra tutte le revisioni da {0} fino a {1}
+info.showfrom=Mostra {0} le revisioni da {1} a {2}
+
+info.pagination=Paginazione:
+info.pagination.first=<span class="first">Prima</span>
+info.pagination.last=<span class="last">Ultima</span>
+info.pagination.previous=<span class="prev">Precedente</span>
+info.pagination.next=<span class="next">Successiva</span>
+info.pagination.all=<span class="all">tutte</span>
+info.pagination.total=&nbsp;(Totale: {0} )
+info.pagination.show.title=Mostra tutti gli elementi da {0} a {1}
+info.pagination.showall.title=Mostra tutti gli elementi
+
+info.version=Versione
+info.date=Data di Modifica
+info.size=Dimensione
+info.author=Autore
+info.changes=Cambiamenti ...
+info.changenote=Nota di cambiamento
+info.actions=Azioni
+info.difftoprev=al precedente
+info.difftolast=all&#8217; ultimo
+
+info.tab=Informazioni
+info.attachment.tab=Info Allegato
+info.tab.links=Links
+info.tab.outgoing=Links uscenti
+info.tab.incoming=Links entranti
+info.tab.attachments=Allegati
+
+info.uploadnew=Caruca una nuova versione
+#info.uploadnew.submit=Carica un nuovo attachment
+info.uploadnew.filename=Seleziona un file:
+info.uploadnew.changenote=Nota alla modifica:
+info.uploadnew.help=Per caricare un nuovo allegato su questa pagina, \
+    usa il campo sottostante per trovare il file e poi seleziona&#8220;Carica&#8221;.
+info.uploadnew.nopermission=Solo gli utenti autorizzati possono caricare nuove versioni degli allegati.
+
+info.deleteattachment=Elimina l&#8217;allegato
+info.deleteattachment.submit=Elimina l&#8217;allegato
+
+info.attachment.history=Storia delle modifiche degli allegati
+info.attachment.type=Tipo
+info.attachment.name=Nome dell&#8217;allegato
+
+info.kilobytes=kB
+
+# LoginContent.jsp
+
+login.tab=Login
+login.title=Login
+login.heading.login=Effettua il login a {0}
+
+login.help=Autenticati con il tuo identificativo e password.
+login.errorprefix=Errore:&nbsp;
+login.login=Login
+login.password=Password
+login.remember=Ricordati di me?
+
+login.submit.login=Login
+login.invite=Vuoi autenticarti?
+login.nopassword=Non hai un account ?
+login.registernow=Registrati a {0} ora!
+login.registernow.title=Registra un nuovo account!
+
+login.lostpw=Password dimenticata?
+login.lostpw.tab=Password dimenticata
+login.lostpw.title=Password dimenticata?
+login.lostpw.getnew=Ottienine una nuova!
+login.lostpw.heading=Cambia la Password
+login.lostpw.help=Password dimenticata?  Inserisci l&#8217;indirizzo email che hai usato per registrarti.
+login.lostpw.name=Account email
+login.lostpw.submit=Cambia la password !
+login.lostpw.reset.clickhere=Clicca qu&igrave;
+login.lostpw.reset.login={0} per collegarti una volta che hai ottenuto una nuova password.
+
+login.register.tab=Registra un nuovo utente
+
+login.tab.help=Aiuto
+login.loginhelpmissing=La pagina {0} non esiste.  \
+    Qualcuno deve aver commesso degli errori nell&#8217;installazione...\
+    <br /><br />\
+    Puoi copiare il testo dalla pagina \
+    <a href="http://jspwiki-wiki.apache.org/Wiki.jsp?page=LoginHelp">LoginHelp \
+    su jspwiki-wiki.apache.org</a>.
+
+# NewGroupContent.jsp
+newgroup.heading.create=Crea un nuovo gruppo
+newgroup.errorprefix=Errore:&nbsp;
+newgroup.instructions.start=Questa pagina t permette di creare un nuovo gruppo wiki.
+newgroup.name=Nome
+newgroup.name.description=Il nome del nuovo gruppo.
+newgroup.members.description=I membri di questo gruppo. \
+    Inserite l&#8217;identificativo utente o il nome wiki di ogni utente separati da carriage returns.
+newgroup.instructions.end=Quando selezioni &#8220;Salva il gruppo,&#8221; \
+    questo gruppo verr&agrave; salvato. Puoi specificare il nome del gruppo \
+    nelle liste di controllo degli accessi (ACL) delle diverse pagine.
+newgroup.creategroup=Crea il gruppo
+newgroup.defaultgroupname=MyGroup
+
+
+# PageActions.jsp
+
+actions.gototop=Vai all&#8217;inizio
+actions.gotobottom=Vai alla fine
+actions.view=Vedi
+actions.view.title=Vedi la pagina corrente [ v ]
+actions.viewparent.title=Vedi la pagina principale [ v ]
+actions.home=Home
+actions.home.title=Vai alla home page {0}
+actions.edit=<span class='accesskey'>M</span>odifica
+actions.edit.title=Modifica la pagina [ m ]
+actions.editparent=<span class='accesskey'>M</span>odifica la pagina principale
+actions.editparent.title=Modifica la pagina principale [ m ]
+actions.index=Indice alfabetico
+actions.index.title=Indice alfabetico di tutte le pagina
+actions.recentchanges=Ultime modifiche
+actions.recentchanges.title=Pagine ordinate per data di modifica
+
+actions.more=Altro...
+actions.separator= - - - - - -
+actions.comment=Aggiungi un commento
+actions.comment.title=Aggiungi un commento
+actions.addcommenttoparent=Aggiungi un commento alla pagina superiore
+actions.upload=Allegati
+actions.info=Info
+actions.info.title=Ulterior informazioni di pagina e storia delle versioni [ i ]
+actions.prefs=<span class='accesskey'>P</span>referenze
+actions.prefs.title=Le tue preferenze [ p ]
+actions.editgroup=Modifica il gruppo
+actions.deletegroup=Elimina il gruppo
+actions.viewgroup=Vedi il gruppo
+actions.creategroup=Crea il gruppo
+actions.creategroup.title=Crea un nuovo gruppo autorizzativo
+actions.login=Autenticati
+actions.login.title=Autenticati o Registrati come nuovo utente
+actions.logout=Log out
+actions.logout.title=Log out
+actions.publishedon=Questa specifica versione &egrave; stata publicata il {0} da {1}.
+actions.notcreated=Pagina non ancora creata.
+actions.workflow=Workflow
+actions.workflow.title=Workflow
+actions.systeminfo=JSPWiki System Info
+actions.systeminfo.title=Mostra la configurazione di sistema di questo JSPWiki 
+actions.rawpage=Mostra il sorgente della pagina
+actions.rawpage.title=Mostra il sorgente della pagina
+
+# PageContent.jsp
+
+view.oldversion=Questa &egrave; la versione {0}. Non &egrave; la versione corrente, quindi non pu&ograve; essere modificata.
+view.backtocurrent=[Vai alla versione corrente]
+view.restore=[Ripristina questa versione]
+view.heading.attachments=Allegati
+
+# PageTab.jsp
+view.tab=Vedi
+
+# PreferencesContent.jsp
+
+# 0: applicationname
+prefs.heading=Preferenze
+prefs.clear.heading=Ripulisci le preferenze
+prefs.tab.prefs=Preferenze
+prefs.tab.profile=Profilo
+
+prefs.cookies=Le tue preferenze sono salvate nel browser via cookie.
+
+prefs.user.skin=Skin
+prefs.user.orientation=Stile dei preferiti
+prefs.user.orientation.left=Sinistra
+prefs.user.orientation.right=Destra
+#prefs.user.editorareaheight=Altezza dell&#8217;aerea di editing
+prefs.user.timeformat=Formato della data
+prefs.user.timezone=Seleziona la Time Zone
+prefs.user.timezone.server=[SERVER]
+prefs.user.language=Seleziona il linguaggio
+prefs.user.language.default=[DEFAULT]
+
+prefs.instructions=Inserisci qui le tue preferenze. Le tue preferenze sono salvate nel browser via cookie.
+prefs.assertedname=Nome
+prefs.assertedname.description=Il tuo nome. \
+    Se non hai ancora creato un profilo, puoi dire {0} \
+    chi sei &#8216;asserendo&#8217; un identit&agrave; (senza dire bugie ...).  \
+    <br /> \
+    Attenzione, asserire il tuo nome in questo modo non &egrave; un vero modo di autenticarti \
+    perch&egrave; lascia solo un valore in un cookie senza richiedere una password. \
+    A seconda delle politiche di sicurezza impostate su questo wiki, potresti avere associati \
+    privilegi limitati. {0} se preferisci essere identificato tramite identificativo utente e password.
+prefs.assertedname.create=Crea un nuovo profilo utente
+prefs.submit.setname=Nome utente
+prefs.save.prefs.submit=Salva le preferenze
+prefs.clear.submit=Ripulisci le preferenze
+prefs.clear.description=\
+    In qualche caso, potresti aver bisogno di rimuovere le tue credenziali da questo computer. \
+    Seleziona il bottone &#8216;Ripulisci le preferenze&#8217; per farlo. \
+    <br /> \
+    Attenzione per&ograve;, questa azione rimuove le preferenze permanentemente, e dovrai reimpostarle se necessario.
+
+prefs.newprofile=Crea un nuovo profilo utente
+prefs.oldprofile=Aggiorna il tuo profilo.
+
+prefs.errorprefix.prefs=Non &egrave; possibile salvare le preferenze:&nbsp;
+prefs.errorprefix.profile=Non &egrave; possibile salvare il profilo:&nbsp;
+
+prefs.loginname=Login name *
+prefs.loginname.description=Questo &egrave; il tuo identificativo utente.
+prefs.loginname.cannotset.new=Non potete modificare il vostro login name perch&egrave non siete ancora \
+  autenticati. Occorre che vi autentichiate, usando le credenziali fornitevi dal  \
+  vostro amministratore.
+prefs.loginname.cannotset.exists=Non puoi definire il tuo identificativo perch&egrave;\
+  le tue credenziali sono gestite dal the web container, non dal wiki.
+
+prefs.password=Password *
+prefs.password.description=La password del tuo account. Non pu&ograve; essere vuota.
+prefs.password2=Verifica Password *
+prefs.password2.description=Riscrivi la tua password per verifica.
+
+prefs.fullname=Nome *
+prefs.fullname.description=Usa questo nome nelle liste di controllo di accesso (ACL) o nei gruppi Wiki.
+
+prefs.email=Indirizzo E-mail 
+prefs.email.description= (opzionale). Se perdi la tua password, \
+    puoi richiederne una nuova - verr&agrave; inviata a questo indirizzo.
+
+prefs.cookie.info=Questo wiki si ricorda di te usando i cookies, \
+    senza richiedere autenticazioni addizionali. Per usare questa \
+    possibilit&agrave;, il tuo browser deve essere configurato in modo da accettare \
+    cookies da questo indirizzo web. Quando selezioni &#8220;salva il profilo,&#8221; un cookie \
+    verr&agrave; salvato dal tuo browser.
+prefs.acl.info=Le liste di controllo di accesso (ACL) o i gruppi Wiki legati alla tua identit&agrave; \
+    devono specificare il tuo identificativo o nome wiki. Tu sei anche un membro \
+    dei Ruoli e Gruppi menzionati sopra.
+
+prefs.lastmodified=Hai crato il tuo profilo su {0}, e l&#8217;hai salvato il {1}
+prefs.save.description=Seleziona &#8220;Salva il profilo&#8221; per salvare il tuo profilo.
+
+prefs.save.submit=Salva il profilo
+prefs.create.submit=Crea un nuovo profilo utente
+
+prefs.roles=Ruoli
+prefs.groups=Gruppi
+prefs.creationdate=Data creazione
+prefs.profile.lastmodified=Ultima modifica
+
+# Workflow generic messages
+workflow.tab=Workflow
+workflow.heading=I tuoi elementi dei Workflow 
+workflow.decisions.heading=Inbox
+workflow.workflows.heading=Outbox
+workflow.instructions=Questa pagina contiene informazioni \
+    sui workflows cha hai attivato, o su cui ti &egrave; stato richiesto di operare.
+workflow.noinstructions=Non hai nessun elemento di workflow.
+workflow.actor.instructions=Devi operare sui seguenti workflows:
+workflow.owner.instructions=HAi attivato i seguenti workflows:
+workflow.id=ID
+workflow.requester=Richiedente
+workflow.item=Elemento
+workflow.startTime=Ricevuto
+workflow.actions=Azioni
+workflow.actor=Soggetto
+workflow.submit=Esegui
+outcome.step.abort=Annulla
+outcome.step.complete=Completato
+outcome.step.continue=Continua
+outcome.decision.acknowledge=OK
+outcome.decision.approve=Approva
+outcome.decision.deny=Deny
+outcome.decision.hold=Blocca
+outcome.decision.reassign=Riassegna
+
+workflow.details.title=Mostra o nascondi i dettagli 
+workflow.details=dettagli ...
+
+# Specific workflow/decision messages
+workflow.saveWikiPage=Salva la pagina wiki <strong>{2}</strong>
+decision.saveWikiPage=Approva la pagina <strong>{2}</strong>
+notification.saveWikiPage.reject=La tua richiesta di salvare la pagina <strong>{2}</strong> &egrave; stata rigettata.
+fact.pageName=Nome della pagina
+fact.diffText=Differenze tra la versione proposta e quella corrente
+fact.proposedText=Proposta
+fact.currentText=Corrente
+fact.isAuthenticated=Autenticato?
+
+select.one=(selezionane uno)
+decision.createUserProfile=Nuovo profilo utente <strong>{2}</strong>
+notification.createUserProfile.accept.subject=Benvenuto in {0}\!
+notification.createUserProfile.accept.content=Congratulazioni\! Il tuo nuovo profilo su {0} è stato creato. I dettagli del profilo sono\: \n\nNome utente \: {1} \nIl tuo nome\: {2} \nE-mail      \: {3} \n\nSe hai dimenticato la password la puoi resettare qui: {4}.
+notification.createUserProfile.reject=La tua richiesta di creazione di profilo utente &egrave; stata rigettata.
+fact.submitter=Submitter
+
+#  PreviewContent.jsp
+preview.tab=Anteprima
+preview.info=Questa &egrave; un <strong>anteprima</strong>!  \
+    Seleziona &#8220;Continua a modificare&#8221; per ritornare all&#8217; editor, \
+    o seleziona &#8220;Salva&#8221; se v&agrave; gi&agrave; bene.
+
+#  SearchBox.jsp
+sbox.search.submit=Navigazione veloce
+sbox.view=mostra
+sbox.view.title=Mostra la pagina selezionata
+sbox.edit=modifica
+sbox.edit.title=Modifica la pagina selezionata
+sbox.clone=duplica
+sbox.clone.title=Duplica la pagina selezionata
+sbox.find=trova
+sbox.find.title=Ricerca avanzata
+sbox.search.result=Ricerca veloce
+sbox.search.target=(inserisci)
+sbox.clearrecent=(svuota)
+sbox.recentsearches=Ultime modifiche
+
+# UploadTemplate.jsp
+# move all to attach.
+upload.title={0}: Aggiungi un allegato
+upload.heading.upload=CArica un nuovo allegato a {0}
+upload.attachments=Allegati correnti
+upload.info=Per caricare un nuovo allegato, usa \
+    il campo seguente per specificare il file e poi seleziona &#8220;Carica&#8221;.
+upload.submit=Carica
+upload.done=Se hai completato il caricamento, puoi tornare a {0}
+
+
+# ViewTemplate.jsp
+# 0 : Application Name
+# 1 : Page name
+view.title.view={0}: {1}
+
+
+# The built-in editors also have their localized strings in this file.
+
+editor.plain.name=Il tuo <span class='accesskey'>n</span>ome
+editor.plain.remember=Ricorda?
+editor.plain.email=Homepage o e<span class='accesskey'>m</span>ail
+editor.plain.save.submit=Salva
+editor.plain.save.title=Salva [ s ]
+editor.plain.preview.submit=Anteprima
+editor.plain.preview.title=Anteprima [ v ]
+editor.plain.cancel.submit=Annulla
+editor.plain.cancel.title=Annulla. Le modifiche saranno perdute. [ q ]
+
+editor.plain.changenote=Nota alla revisione
+editor.commentsignature=Firma il commento
+editor.plain.toolbar=Toolbar
+editor.plain.find=Cerca
+editor.plain.replace=Sostituisci
+editor.plain.matchcase=Controlla maiuscole
+editor.plain.regexp=RegExp
+editor.plain.global=Sostituisci tutto
+editor.plain.find.submit=Sostituisci
+editor.plain.redo.submit=Redo
+editor.plain.undo.submit=Undo
+editor.plain.redo.title=Redo l'ultimo Undo
+editor.plain.undo.title=Undo l'ultima sostituzione [ z ]
+
+#new since v2.5.100
+editor.plain.posteditor=Inserisci Keyword+Tab:
+editor.plain.posteditor.title=shift+enter per il campo successivo
+
+editor.plain.smartpairs= Controllo automatico delle chiusure
+editor.plain.smartpairs.title= Controllo automatico delle chiusure di () [] {} &lt;&gt; &quot;&quot; &#39;&#39;
+editor.plain.tabcompletion=Completamento Tab (keyword+Tab)
+editor.plain.tabcompletion.title=Espansione automatica delle keyword in Wiki Markup
+
+#editor.plain.editassist=Assistente
+#editor.plain.editassist.title=Cambia i bottoni dell'assistente
+editor.plain.sneakpreview=Anteprima
+editor.plain.sneakpreview.title=Anteprima. \
+    Cliccate fuori dall&quot;area di testo per rinfrescare la area di anteprima.
+editor.plain.tbLink.title=link - Inserisci un link wiki 
+editor.plain.tbH1.title=h1 - Inserisci heading1
+editor.plain.tbH2.title=h2 - Inserisci heading2
+editor.plain.tbH3.title=h3 - Inserisci heading3
+editor.plain.tbHR.title=hr - Inserisci un ruler orizzontale
+editor.plain.tbBR.title=br - Inserisci un a capo
+editor.plain.tbPRE.title=pre - Inserisci un blocco preformattato
+editor.plain.tbDL.title=dl - Inserisci una lista di  definizioni
+editor.plain.tbB.title=grassetto
+editor.plain.tbI.title=corsivo
+editor.plain.tbMONO.title=mono - monospace
+editor.plain.tbSUP.title=sup - superscript
+editor.plain.tbSUB.title=sub - subscript
+editor.plain.tbSTRIKE.title=strike - sovrascritto
+editor.plain.tbTOC.title=toc - Inserisci un indice
+editor.plain.tbTAB.title=tab - Inserisci una sezione a linguette
+editor.plain.tbTABLE.title=table - Inserisci una tabella
+editor.plain.tbIMG.title=img - Inserisci un immagine
+editor.plain.tbCODE.title=code - Inserisci un blocco di codice
+editor.plain.tbQUOTE.title=quote - Inserisci un blocco quotato
+editor.plain.tbSIGN.title=sign - Inserisci la firma
+
+editor.preview.edit.submit=Continua a modificare
+editor.preview.edit.title=Continua a modificare la pagina corrente [ e ]
+editor.preview.save.submit=Salva
+editor.preview.save.title=Salva la pagina corrente [ s ]
+editor.preview.cancel.submit=Annulla
+editor.preview.cancel.title=Annulla le modifiche. Le modifiche verranno perse. [ q ]
+
+editor.fck.noscript=Devi abilitare il Javascript nel tuo browser per poter usare l&#8217;editor FCK 
+editor.wikiwizard.noscript=Devi abilitare il Javascript nel tuo browser per poter usare l&#8217;editor WikiWizard 
+editor.wikiwizard.noapplet=Applets non supportati o non abilitati nel tuo browser. \
+    Prego <a href="http://www.java.com/">scaricate una vesrione di Java</a>per poter utilizzare l&#8217;editor WikiWizard.
+
+#blog texts in various JSPs
+blog.commenttitle=commenti
+blog.backtomain=Torna alla pagina principale del blog
+blog.addcomments=Aggiungi nuovi commenti
+
+
+#
+#  The Javascript stuff
+#
+javascript.sbox.clone.suffix=-New
+
+javascript.edit.allsections=( Tutte )
+javascript.edit.startOfPage=( inizio della pagina )
+javascript.edit.findandreplace.nomatch=Nessun risultato!
+javascript.edit.toolbar.makeSelection=Seleziona qualcosa prima.
+javascript.edit.resize=Drag per ridimensionare la text area
+javascript.edit.areyousure=Se non hai prima selezionato il bottone Salva, perderai ogni modifica. \
+    Sei sicuro di voler uscire?
+
+javascript.favs.show=Click per vedere i Favorites
+javascript.favs.hide=Click per nascondere i Favorites
+javascript.quick.edit=Modifica questa sezione
+
+javascript.quick.edit.title=Modifica la sezione {0}...
+
+javascript.collapse=Click per chiudere
+javascript.expand=Click per espandere
+
+javascript.sort.click=Click per ordinare
+javascript.sort.ascending=Ordine ascendente. Click per invertire la direzione di ordinamento
+javascript.sort.descending=Ordine discendent. Click per invertire la direzione di ordinamento
+javascript.filter.all=( Tutti )
+
+javascript.group.validName=Fornisci un nome valido per il nuovo gruppo
+
+javascript.category.title=Click per mostrare la categoria [{0}] ...
+
+javascript.slimbox.info=Immagine {0} di {1}
+javascript.slimbox.error=<h2>Errore</h2>C&#8217;&egrave; stato un problema sulla richiesta.<br />Prego, riprovare
+javascript.slimbox.directLink=Link diretto al target
+javascript.slimbox.remoteRequest=Richiesta Remota {0} di {1}
+javascript.slimbox.previous=&laquo;Precedente
+javascript.slimbox.next=Successivo&raquo;
+javascript.slimbox.close=Chiudi &#215;
+javascript.slimbox.close.title=Chiudi [Esc]
+
+javascript.tip.default.title=Altro...
+
+javascript.prefs.areyousure=Senza cliccare il bottone Save User Preferences, \
+	i tuoi cambiamenti verranno persi. Sei sicuro di voler abbandonare questa pagina?
+	
+javascript.sectionediting.label = Riassunto della Sezione
+prefs.errorprefix.rename = Impossibile rinominare la pagina:&nbsp;
+prefs.user.sectionediting = Editing Sezioni
+prefs.user.sectionediting.text = Abilita l'editing delle sezioni con il collegamento<span class="editsection"><a href="#">[modifica]</a></span>
diff --git a/jspwiki-war/src/main/resources/templates/default_nl.properties b/jspwiki-main/src/main/resources/templates/default_nl.properties
similarity index 100%
rename from jspwiki-war/src/main/resources/templates/default_nl.properties
rename to jspwiki-main/src/main/resources/templates/default_nl.properties
diff --git a/jspwiki-war/src/main/resources/templates/default_pt_BR.properties b/jspwiki-main/src/main/resources/templates/default_pt_BR.properties
similarity index 97%
rename from jspwiki-war/src/main/resources/templates/default_pt_BR.properties
rename to jspwiki-main/src/main/resources/templates/default_pt_BR.properties
index 5ee6a0c..83d314a 100644
--- a/jspwiki-war/src/main/resources/templates/default_pt_BR.properties
+++ b/jspwiki-main/src/main/resources/templates/default_pt_BR.properties
@@ -1,451 +1,451 @@
-#  Licensed to the Apache Software Foundation (ASF) under one
-#  or more contributor license agreements.  See the NOTICE file
-#  distributed with this work for additional information
-#  regarding copyright ownership.  The ASF licenses this file
-#  to you under the Apache License, Version 2.0 (the
-#  "License"); you may not use this file except in compliance
-#  with the License.  You may obtain a copy of the License at
-#
-#    http://www.apache.org/licenses/LICENSE-2.0
-#
-#  Unless required by applicable law or agreed to in writing,
-#  software distributed under the License is distributed on an
-#  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-#  KIND, either express or implied.  See the License for the
-#  specific language governing permissions and limitations
-#  under the License.
-
-#
-#  This file contains the localized resource definitions for
-#  the "default" template.  Any other template i18n file should
-#  be renamed in a similar way, e.g. "mytemplate.properties" under i18n/templates
-#
-# Common things
-
-common.nopage=Esta p�gina n�o existe.  Por que voc� n�o {0}?
-common.createit=criar
-common.more=Mais...
-
-
-# AttachmentTab.jsp
-
-attach.tab=Anexar
-attach.list=Lista de anexos
-attach.add=Adicionar nono avexo
-attach.add.info=Para fazer o upload de um novo anexo nesta p�gina, por favor utilize o seguinte campo para achar o arquivo e ent�o clique \
-    			em &#8220;Upload&#8221;.
-attach.add.permission=Apenas usu�rios autorizados possuem permiss�o para anexar novos arquivos.
-attach.bytes=bytes
-attach.add.selectfile=Selecionar arquivo:
-attach.add.changenote=Observa��es:
-attach.add.submit=Upload
-attach.preview=Pr�-visualiza��o da imagem
-attach.deleteconfirm=Por favor confirme que voc� deseja remover este arquivo permanentemente!
-attach.delete=Remover
-attach.moreinfo.title=Informa��es e hist�rico de vers�o do anexo
-
-# CommentContent.jsp
-
-comment.title.comment={0}: Coment�rios: {1}
-comment.tab.discussionpage=P�gina de discuss�o
-comment.tab.addcomment=Adicionar coment�rio
-comment.edithelpmissing=Ho hum, parece que a p�gina {0} n�o foi encontrada.  Algu�m deve ter feito algo com a instala��o...<br /><br />\
-    					Voc� pode copiar o texto da <a href="http://jspwiki-wiki.apache.org/Wiki.jsp?page=EditPageHelp">p�gina EditPageHelp  \
-    					em jspwiki-wiki.apache.org</a>.
-
-# ConflictContent.jsp
-
-conflict.oops.title=Oops!
-conflict.oops=<p><b>Oops!  Algu�m modificou esta p�gina enquanto voc� a estava editando!</b></p>\
-    		  <p>E n�o foi poss�vel identificar todas as diferen�as entre as duas vers�es, voc� ter� que fazer isso para mim. \
-    		  Eu imprimi aqui (na Wiki) o texto da nova p�gina e as altera��es que voc� fez. Voc� precisar� salvar este texto em \
-    		  algum editor de textos (por exemplo o Notepad ou Word) e ent�o editar esta p�gina novamente.</p> \
-    		  <p>Perceba que quando voc� voltar ao modo de edi��o, algu�m pode ter modificado a p�gina novamente. Portanto seja r�pido.</p>
-conflict.goedit=<p>Editar {0}</p>
-conflict.modified=Modificado por alguma outra pessoa
-conflict.yourtext=Aqui est� o seu texto
-
-# DiffContent.jsp
-
-#diff.tab=Version changes
-diff.difference=Diferen�as entre as vers�es {0} e {1}
-diff.gotofirst.title=Ir para a primeira mudan�a neste documento
-diff.gotofirst=Ver primeira mudan�a
-diff.goback=Voltar para {0}, ou {1}
-diff.versionhistory=informa��es da p�gina {0}
-diff.nodiff=Nenhuma altera��o encontrada.
-
-# EditContent.jsp
-
-edit.locked=O usu�rio &#8220;{0}&#8221; come�ou a editar essa p�gina, mas ainda n�o \
-    salvou.  Apesar disso n�o lhe proibirei de editar essa p�gina, MAS esteja atento que \
-    a outra pessoa poder� ser atrapalhada em seu trabalho.  Seria mais prudente aguardar at� que a \
-    trava de edi��o expire ou a outra pessoa termine sua edi��o.  A trava de edi��o expira em \
-    {1} minutos.
-edit.restoring=Voc� est� prestes a restaurar a vers�o {0}. \
-    Clique em &#8220;Salvar&#8221; para restaurar. Vo�� tamb�m deveria editar essa p�gina antes de restaurar.
-edit.chooseeditor=Editor
-edit.tab.attachments=Anexos
-edit.tab.help=Ajuda
-edit.tab.edit=Edi��o
-edit.tab.findreplacehelp=Procurar e substituir ajuda
-
-# EditTemplate.jsp
-# 0 : Application name
-# 1 : Page name
-edit.title.edit={0}: Edi��o: {1}
-edit.sections=Se��es
-
-# EditGroup.jsp
-editgroup.tab=Edi��o de Grupo
-editgroup.heading.edit=Edi��o do Grupo {0}
-editgroup.instructions=Essa p�gina permite adicionar ou editar membros do grupo \
-    <strong>{0}</strong>. Geralmente, apenas membros do grupo podem editar a \
-    a lista de permiss�es. Por padr�o, a pessoa que cria o grupo � um membro.
-editgroup.saveerror=N�o foi poss�vel salvar o grupo:&nbsp;
-editgroup.memberlist=Ades�o para grupo. Informe o nome de cada usu�rio ou \
-    o nome wiki, separados por quebra de linha.
-editgroup.savehelp=Quando clicar em &#8220;Salvar grupo,&#8221; o grupo ser� salvo com o nome \
-    <strong>{0}</strong>. Voc� pode especificar esse \
-    nome na p�gina de listas de controle de acesso (LCAs).
-editgroup.submit.save=Salvar grupo
-
-# Favorites.jsp
-
-fav.myfavorites=Meus Favoritos
-fav.nomenu=Por favor fa�a {0}
-fav.greet.anonymous=Ol� (visitante an�nimo)
-fav.greet.asserted=Ol�, {0} (n�o logado)
-fav.greet.authenticated=Ol�, {0} (autenticado)
-fav.aggregatewiki.title=Agrege o feed RSS de toda wiki
-
-# FindContent.jsp
-
-find.tab=Pesquisa Wiki
-find.tab.help=Ajuda
-find.input=Sua consulta aqui:
-find.heading.results=Resultado da busca por &#8220;{0}&#8221;
-find.resultsstart=Encontrado {0} ocorr�ncias, resultados de {1} at� {2}.
-find.results.page=P�gina
-find.results.score=Ponto
-find.noresults=Nenhum resultado encontrado.  Pode ser que essa wiki n�o tenha o  \
-    documento que esteja procurando, ou que voc� n�o tenha permiss�o para v�-los.
-find.getprevious=Acesse {0} resultados anteriores
-find.getnext=Acesse {0} pr�ximos resultados
-find.externalsearch=Tente essa mesma pesquisa em :
-find.submit.find=Encontre!
-find.submit.go=Vai!
-find.details=Mostrar detalhes
-find.scope.all=Procurar em todos locais
-find.scope.authors=Autores
-find.scope.pagename=Nomes de p�gina
-find.scope.content=Conteudo da p�gina
-find.scope.attach=Anexos
-
-# GroupContent.jsp
-
-group.tab=Grupo
-#replaced by grp.deletegroup.confirm
-#group.areyousure=Are you sure you want to permanently delete group &quot;{0}&quot;? \
-#    Users might not be able to access pages whose ACLS contain this group. \\n\\n \
-#    If you click OK, the group will be removed immediately.
-group.doesnotexist=Esse grupo n�o existe.
-group.createsuggestion=Por que voc� n�o {0}
-group.createit=Criar isso?
-group.errorprefix=Erro&nbsp;
-group.groupintro=Esse � o grupo wiki chamado {0}. Apenas membros desse grupo podem edit�-lo.
-
-group.name=Nome do Grupo
-group.members=Membros do Grupo
-group.membership=Membro do Grupo.
-group.modifier={0} salvou esse grupo em {1}
-group.creator={0} criou esse grupo em {1}.
-
-# GroupTab.jsp
-grp.createdon=Criado em {0} por {1}
-grp.lastmodified=<br />�ltima altera��o em {0} por {1}
-grp.groupnames.title=Clique para editar esse grupo
-grp.newgroupname=(novo nome do grupo)
-grp.savegroup=Salvar Grupo
-grp.savenewgroup=Salvar Novo Grupo
-grp.cancel=Cancelar
-grp.deletegroup=Deletar Grupo
-grp.deletegroup.confirm=Por favor, confirme o desejo de deletar esse grupo permanentemente!
-grp.formhelp=Ades�o para grupo. Apenas membros do grupo podem edit�-lo. \
-	<br />Informe o nome de cada usu�rio na wiki ou o nome completo, separados por quebra de linha.
-grp.allgroups=Todos Grupos
-
-# Header.jsp
-header.yourtrail=Sua rota:&nbsp;
-header.homepage.title=P�gina inicial dessa wiki
-
-# InfoContent.jsp
-info.pagename=Nome da p�gina
-info.parent=P�gina "m�e"
-info.lastmodified=Essa p�gina (revis�o-{0}) foi alterada em {1} por {2}
-info.createdon=Essa p�gina foi criada em {0} por {1}
-info.current=Vers�o atual da p�gina 
-info.noversions=Sem vers�es.
-info.feed=Feed da p�gina
-
-info.pagediff.title=Mostre as mudan�as da �ltima atualiza��o
-
-info.rename.submit=Renomear p�gina
-info.updatereferrers=Atualizar refer�ncias?
-info.rename.permission=Apenas usu�rios autorizados podem renomear p�ginas.
-
-
-info.delete.submit=Deletar toda p�gina
-#info.delete.attachmentwarning=<i>First delete all attachments of this page</i>
-info.confirmdelete=Por favor, confirme que deseja deletar esse conte�do permanentemente!
-info.delete.permission=Apenas usu�rios autorizados podem deletar p�ginas.
-
-info.moreinfo=Mais informa��es...
-info.backtomainpage=Voltar para {0}
-info.backtoparentpage=Voltar para {0} (p�gina "m�e")
-
-info.history=Hist�rico de revis�o da p�gina
-info.showrevisions=Mostrar todas revis�es de {0} at� {1}
-info.showfrom=Mostrar {0} revis�es de {1} at� {2}
-
-info.pagination=Pagina��o:
-info.pagination.first=<span class="first">Primeira</span>
-info.pagination.last=<span class="last">�ltima</span>
-info.pagination.previous=<span class="prev">Anterior</span>
-info.pagination.next=<span class="next">Pr�xima</span>
-info.pagination.all=<span class="all">todas</span>
-info.pagination.total=&nbsp;(Itens totais: {0} )
-info.pagination.show.title=Mostrar itens de {0} at� {1}
-info.pagination.showall.title=Mostrar todos itens
-
-info.version=Vers�o
-info.date=Data modificada
-info.size=Tamanho
-info.author=Autor
-info.changes=Altera��es...
-info.changenote=Nota de mudan�a
-info.actions=A��es
-info.difftoprev=para anterior
-info.difftolast=para �ltima
-
-info.tab=Informa��o
-info.attachment.tab=Anexo � informa��o
-info.tab.links=Links
-info.tab.outgoing=Links de sa�da
-info.tab.incoming=Links de entrada
-info.tab.attachments=Anexos
-
-info.uploadnew=Upload nova vers�o
-#info.uploadnew.submit=Upload new attachment
-info.uploadnew.filename=Seleciona o arquivo:
-info.uploadnew.changenote=Noda de mudan�a:
-info.uploadnew.help=Para fazer upload de novos anexos nessa p�gina, \
-    use a caixa seguinte para escolher o arquivo, ent�o clique em &#8220;Upload&#8221;.
-info.uploadnew.nopermission=Apenas usu�rios autorizados podem fazer upload de novas vers�es de anexos.
-
-info.deleteattachment=Deletar anexo
-info.deleteattachment.submit=Deletar anexo
-
-info.attachment.history=Hist�rico de revis�o de anexo
-info.attachment.type=Tipo
-info.attachment.name=Nome do anexo
-
-info.kilobytes=kB
-
-# LoginContent.jsp
-
-login.tab=Login
-login.title=Login
-login.heading.login=Acesse {0}
-
-login.help=Por favor, acesse com seu nome de usu�rio e senha.
-login.errorprefix=Erro:&nbsp;
-login.login=Login
-login.password=Senha
-login.remember=Lembrar?
-
-login.submit.login=Login
-login.invite=Quer acessar?
-login.nopassword=N�o tem uma conta ?
-login.registernow=Junte-se {0} agora!
-login.registernow.title=Registrar novo usu�rio!
-
-login.lostpw=Perdeu sua senha?
-login.lostpw.tab=Perdeu a senha
-login.lostpw.title=Perdeu sua senha?
-login.lostpw.getnew=Adquira uma nova!
-login.lostpw.heading=Resete sua senha
-login.lostpw.help=Perdeu ou esqueceu sua senha? Informe o endere�o de email usado para se registrar.
-login.lostpw.name=Email da conta
-login.lostpw.submit=Resete a senha!
-login.lostpw.reset.clickhere=Clique aqui
-login.lostpw.reset.login={0} para acessar uma vez que voc� recuperou sua senha.
-
-login.register.tab=Registar novo usu�rio
-
-login.tab.help=Ajuda
-login.loginhelpmissing=Ho hum, parece que a p�gina {0} est� faltando.  \
-    Algu�m dever ter feito algo na instala��o...\
-    <br /><br />\
-    Voc� pode copiar o texto da \
-    <a href="http://jspwiki-wiki.apache.org/Wiki.jsp?page=LoginHelp">p�gina de ajuda de Login \
-    em jspwiki-wiki.apache.org</a>.
-
-# NewGroupContent.jsp
-newgroup.heading.create=Criar novo grupo
-newgroup.errorprefix=Erro:&nbsp;
-newgroup.instructions.start=Essa p�gina permite que voc� crie novos grupos wiki.
-newgroup.name=Nome
-newgroup.name.description=Nome do novo grupo.
-newgroup.members.description=Ades�o para grupo. \
-    Informe o nome de cada usu�rio wiki, separados por quebra de linha.
-newgroup.instructions.end=Quando clicar em &#8220;Salvar grupo,&#8221; \
-    esse grupo ser� salvo como um grupo. Voc� pode especificar o nome do grupo \
-    na p�gina de listas de controle de acesso (LCAs).
-newgroup.creategroup=Criar grupo
-newgroup.defaultgroupname=Meu Grupo
-
-
-# PageActions.jsp
-
-actions.gototop=Ir para topo
-actions.gotobottom=Ir para baixo
-actions.view=Ver
-actions.view.title=Ver p�gina atual [ v ]
-actions.viewparent.title=Ver p�gina "m�e" [ v ]
-actions.home=Home
-actions.home.title=Ir para p�gina incial {0}
-actions.edit=<span class='accesskey'>E</span>ditar
-actions.edit.title=Editar p�gina atual [ e ]
-actions.editparent=<span class='accesskey'>E</span>ditar p�gina "m�e"
-actions.editparent.title=Editar p�gina "m�e" [ e ]
-actions.index=�ndice alfab�tico
-actions.index.title=Lista de todas as p�ginas alfabeticamente ordenadas 
-actions.recentchanges=Altera��es recentes
-actions.recentchanges.title=P�ginas ordenadas por data de altera��o
-
-actions.more=Mais...
-actions.separator= - - - - - -
-actions.comment=Adicionar coment�rio
-actions.comment.title=Adicionar coment�rio
-actions.addcommenttoparent=Adicinar coment�rio na p�gina "m�e"
-actions.upload=Anexar Arquivo
-actions.info=Informa��o
-actions.info.title=P�gina de informa��o adicional e hist�rido de Vers�o [ i ]
-actions.prefs=Minhas <span class='accesskey'>P</span>refer�ncias
-actions.prefs.title=Gerencia suas prefer�ncias [ p ]
-actions.editgroup=Editar grupo
-actions.deletegroup=Deletar grupo
-actions.viewgroup=Ver grupo
-actions.creategroup=Criar grupo
-actions.creategroup.title=Criar novo grupo de autoriza��o
-actions.login=Acessar
-actions.login.title=Acesse ou Registre novo usu�rio
-actions.logout=Sair
-actions.logout.title=Sair
-actions.publishedon=Essa vers�o foi publicada em {0} por {1}.
-actions.notcreated=P�gina ainda n�o criada.
-actions.workflow=Ciclo de vida
-actions.workflow.title=Ciclo de vida
-actions.systeminfo=JSPWiki Sistema de Informa��es
-actions.systeminfo.title=Mostrar op��es do sistema JSPWiki de &amp; informa��es
-actions.rawpage=Ver fonte da p�gina
-actions.rawpage.title=Ver fonte da p�gina
-
-# PageContent.jsp
-
-view.oldversion=Essa � a vers�o {0}. N�o � a vers�o atual, portanto n�o pode ser editada.
-view.backtocurrent=[Voltar � vers�o atual]
-view.restore=[Restaurar essa vers�o]
-view.heading.attachments=Anexos
-
-# PageTab.jsp
-view.tab=Vis�o
-
-# PreferencesContent.jsp
-
-# 0: applicationname
-prefs.heading=Prefer�ncias de usu�rio
-prefs.clear.heading=Limpar prefer�ncias de usu�rio
-prefs.tab.prefs=Prefer�ncias
-prefs.tab.profile=Perfil
-
-prefs.cookies=Suas escolhas ser�o salvas nos cookies do seu navegador.
-
-prefs.user.skin=Skin
-prefs.user.orientation=Estilos favoritos
-prefs.user.orientation.left=Esquerda
-prefs.user.orientation.right=Direita
-#prefs.user.editorareaheight=Editor area height  //not user anymore
-prefs.user.sectionediting=�rea de edi��o
-prefs.user.sectionediting.text=Habilite a �rea de edi��o atrav�s dos links <span class="editsection"><a href="#">[editar]</a></span>
-prefs.user.timeformat=Formato de hora
-prefs.user.timezone=Fuso hor�rio
-prefs.user.timezone.server=[SERVIDOR]
-prefs.user.language=Idioma
-prefs.user.language.default=[PADR�O]
-
-prefs.instructions=Ajuste suas prefer�ncias aqui. Suas escolhas ser�o salvas nos cookies de seu navegador.
-prefs.assertedname=Nome
-prefs.assertedname.description=Seu nome. \
-    Se voc� ainda n�o criou um perfil, voc� pode falar {0} \
-    quem voc� � &#8216;informando&#8217; uma identidade. Voc� n�o mentiria para gente, n�o �? \
-    <br /> \
-    Note que ajustar seu nome de usu�rio dessa forma n�o � o m�todo real \
-    de autentica��o, porque isso ir� somente ajustar um cookie no seu navegador \
-    sem exigir uma senha. Dependendo da pol�tica de seguran�a, a wiki poder� lhe permitir \
-    alguns privil�gios como usu�rio &#8220;informado&#8221;. {0} se \
-    preferir um nome de usu�rio e senha tradicionais, que s�o mais \
-    seguros.
-prefs.assertedname.create=Criar um novo perfil de usu�rio
-prefs.submit.setname=Ajustar nome de usu�rio
-prefs.save.prefs.submit=Salvar Prefer�ncias de Usu�rio
-prefs.clear.submit=Limpar prefer�ncias de usu�rio
-prefs.clear.description=\
-	Em alguns casos voc� precisa remover seu nome de usu�rio &#8216;escolhido&#8217; e \
-	suas prefer�ncias desse computador. \
-	Clique em &#8216;Limpar prefer�ncias de usu�rio&#8217; para proseguir. \
-    <br /> \
-    Note que isso ir� remover todas as suas prefer�ncias, permanentemente. \
-    Voc� ir� precisar inform�-las novamente.
-
-prefs.newprofile=Crie um novo perfil
-prefs.oldprofile=Atualize seu perfil wiki.
-
-prefs.errorprefix.prefs=N�o foi poss�vel salvar as prefer�ncias:&nbsp;
-prefs.errorprefix.profile=N�o foi poss�vel salvar o perfil:&nbsp;
-prefs.errorprefix.rename=N�o foi poss�vel renomear a p�gina:&nbsp;
-
-prefs.loginname=Nome de login *
-prefs.loginname.description=Esse � seu id de Login.
-prefs.loginname.cannotset.new=Voc� n�o pode ajustar seu login porque voc� n�o est� \
-  logado ainda. Voc� primeiro deve se autenticar com as informa��es \
-  recebidas de seu administrador.
-prefs.loginname.cannotset.exists=Voc� n�o pode ajustar seu login porque \
-  suas credenciais s�o gerenciadas pelo container web, n�o pela wiki.
-
-prefs.password=Senha *
-prefs.password.description=Ajuste sua senha. N�o pode ficar em branco.
-prefs.password2=Confirme a senha *
-prefs.password2.description=Redigite a verifica��o de senha.
-
-prefs.fullname=Nome *
-prefs.fullname.description=Use seu nome da Lista de Controle de Acesso ou dos Grupos wiki.
-
-prefs.email=Endere�o de E-Mail
-prefs.email.description= (opcional). Se voc� perdeu sua senha, \
-    voc� pode solicitar uma nova senha que ser� enviada para esse endere�o.
-
-prefs.cookie.info=Essa wiki automaticamente relembra dos seus cookies, \
-    sem autentica��o adicional. Para usar esse \
-    recurso, seu navegador precisa aceitar cookies desse \
-    website. Quando voc� clicar em &#8220;salvar perfil,&#8221; o cookie \
-    ser� salvo no seu navegador.
-notification.createUserProfile.accept.subject=Bem-vindo ao {0}\!
-notification.createUserProfile.accept.content=Parab�ns\! Seu novo perfil em {0} foi criado. Seguem os detalhes\: \n\nLogin:\: {1} \nNome \: {2} \nE-Mail:    \: {3} \n\nSe voc� esquecer sua senha voc� pode reset�-la em {4}.
-
-# ------------------------------------------------------------------------
-# There are a lot of keys still missing here, please add your translations below.
-# You can find them in the file default.properties or at
-#   http://svn.apache.org/viewvc/incubator/jspwiki/trunk/jspwiki-war/src/main/resources/templates/default.properties?view=co
-# ------------------------------------------------------------------------
+#  Licensed to the Apache Software Foundation (ASF) under one
+#  or more contributor license agreements.  See the NOTICE file
+#  distributed with this work for additional information
+#  regarding copyright ownership.  The ASF licenses this file
+#  to you under the Apache License, Version 2.0 (the
+#  "License"); you may not use this file except in compliance
+#  with the License.  You may obtain a copy of the License at
+#
+#    http://www.apache.org/licenses/LICENSE-2.0
+#
+#  Unless required by applicable law or agreed to in writing,
+#  software distributed under the License is distributed on an
+#  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+#  KIND, either express or implied.  See the License for the
+#  specific language governing permissions and limitations
+#  under the License.
+
+#
+#  This file contains the localized resource definitions for
+#  the "default" template.  Any other template i18n file should
+#  be renamed in a similar way, e.g. "mytemplate.properties" under i18n/templates
+#
+# Common things
+
+common.nopage=Esta p�gina n�o existe.  Por que voc� n�o {0}?
+common.createit=criar
+common.more=Mais...
+
+
+# AttachmentTab.jsp
+
+attach.tab=Anexar
+attach.list=Lista de anexos
+attach.add=Adicionar nono avexo
+attach.add.info=Para fazer o upload de um novo anexo nesta p�gina, por favor utilize o seguinte campo para achar o arquivo e ent�o clique \
+    			em &#8220;Upload&#8221;.
+attach.add.permission=Apenas usu�rios autorizados possuem permiss�o para anexar novos arquivos.
+attach.bytes=bytes
+attach.add.selectfile=Selecionar arquivo:
+attach.add.changenote=Observa��es:
+attach.add.submit=Upload
+attach.preview=Pr�-visualiza��o da imagem
+attach.deleteconfirm=Por favor confirme que voc� deseja remover este arquivo permanentemente!
+attach.delete=Remover
+attach.moreinfo.title=Informa��es e hist�rico de vers�o do anexo
+
+# CommentContent.jsp
+
+comment.title.comment={0}: Coment�rios: {1}
+comment.tab.discussionpage=P�gina de discuss�o
+comment.tab.addcomment=Adicionar coment�rio
+comment.edithelpmissing=Ho hum, parece que a p�gina {0} n�o foi encontrada.  Algu�m deve ter feito algo com a instala��o...<br /><br />\
+    					Voc� pode copiar o texto da <a href="http://jspwiki-wiki.apache.org/Wiki.jsp?page=EditPageHelp">p�gina EditPageHelp  \
+    					em jspwiki-wiki.apache.org</a>.
+
+# ConflictContent.jsp
+
+conflict.oops.title=Oops!
+conflict.oops=<p><b>Oops!  Algu�m modificou esta p�gina enquanto voc� a estava editando!</b></p>\
+    		  <p>E n�o foi poss�vel identificar todas as diferen�as entre as duas vers�es, voc� ter� que fazer isso para mim. \
+    		  Eu imprimi aqui (na Wiki) o texto da nova p�gina e as altera��es que voc� fez. Voc� precisar� salvar este texto em \
+    		  algum editor de textos (por exemplo o Notepad ou Word) e ent�o editar esta p�gina novamente.</p> \
+    		  <p>Perceba que quando voc� voltar ao modo de edi��o, algu�m pode ter modificado a p�gina novamente. Portanto seja r�pido.</p>
+conflict.goedit=<p>Editar {0}</p>
+conflict.modified=Modificado por alguma outra pessoa
+conflict.yourtext=Aqui est� o seu texto
+
+# DiffContent.jsp
+
+#diff.tab=Version changes
+diff.difference=Diferen�as entre as vers�es {0} e {1}
+diff.gotofirst.title=Ir para a primeira mudan�a neste documento
+diff.gotofirst=Ver primeira mudan�a
+diff.goback=Voltar para {0}, ou {1}
+diff.versionhistory=informa��es da p�gina {0}
+diff.nodiff=Nenhuma altera��o encontrada.
+
+# EditContent.jsp
+
+edit.locked=O usu�rio &#8220;{0}&#8221; come�ou a editar essa p�gina, mas ainda n�o \
+    salvou.  Apesar disso n�o lhe proibirei de editar essa p�gina, MAS esteja atento que \
+    a outra pessoa poder� ser atrapalhada em seu trabalho.  Seria mais prudente aguardar at� que a \
+    trava de edi��o expire ou a outra pessoa termine sua edi��o.  A trava de edi��o expira em \
+    {1} minutos.
+edit.restoring=Voc� est� prestes a restaurar a vers�o {0}. \
+    Clique em &#8220;Salvar&#8221; para restaurar. Vo�� tamb�m deveria editar essa p�gina antes de restaurar.
+edit.chooseeditor=Editor
+edit.tab.attachments=Anexos
+edit.tab.help=Ajuda
+edit.tab.edit=Edi��o
+edit.tab.findreplacehelp=Procurar e substituir ajuda
+
+# EditTemplate.jsp
+# 0 : Application name
+# 1 : Page name
+edit.title.edit={0}: Edi��o: {1}
+edit.sections=Se��es
+
+# EditGroup.jsp
+editgroup.tab=Edi��o de Grupo
+editgroup.heading.edit=Edi��o do Grupo {0}
+editgroup.instructions=Essa p�gina permite adicionar ou editar membros do grupo \
+    <strong>{0}</strong>. Geralmente, apenas membros do grupo podem editar a \
+    a lista de permiss�es. Por padr�o, a pessoa que cria o grupo � um membro.
+editgroup.saveerror=N�o foi poss�vel salvar o grupo:&nbsp;
+editgroup.memberlist=Ades�o para grupo. Informe o nome de cada usu�rio ou \
+    o nome wiki, separados por quebra de linha.
+editgroup.savehelp=Quando clicar em &#8220;Salvar grupo,&#8221; o grupo ser� salvo com o nome \
+    <strong>{0}</strong>. Voc� pode especificar esse \
+    nome na p�gina de listas de controle de acesso (LCAs).
+editgroup.submit.save=Salvar grupo
+
+# Favorites.jsp
+
+fav.myfavorites=Meus Favoritos
+fav.nomenu=Por favor fa�a {0}
+fav.greet.anonymous=Ol� (visitante an�nimo)
+fav.greet.asserted=Ol�, {0} (n�o logado)
+fav.greet.authenticated=Ol�, {0} (autenticado)
+fav.aggregatewiki.title=Agrege o feed RSS de toda wiki
+
+# FindContent.jsp
+
+find.tab=Pesquisa Wiki
+find.tab.help=Ajuda
+find.input=Sua consulta aqui:
+find.heading.results=Resultado da busca por &#8220;{0}&#8221;
+find.resultsstart=Encontrado {0} ocorr�ncias, resultados de {1} at� {2}.
+find.results.page=P�gina
+find.results.score=Ponto
+find.noresults=Nenhum resultado encontrado.  Pode ser que essa wiki n�o tenha o  \
+    documento que esteja procurando, ou que voc� n�o tenha permiss�o para v�-los.
+find.getprevious=Acesse {0} resultados anteriores
+find.getnext=Acesse {0} pr�ximos resultados
+find.externalsearch=Tente essa mesma pesquisa em :
+find.submit.find=Encontre!
+find.submit.go=Vai!
+find.details=Mostrar detalhes
+find.scope.all=Procurar em todos locais
+find.scope.authors=Autores
+find.scope.pagename=Nomes de p�gina
+find.scope.content=Conteudo da p�gina
+find.scope.attach=Anexos
+
+# GroupContent.jsp
+
+group.tab=Grupo
+#replaced by grp.deletegroup.confirm
+#group.areyousure=Are you sure you want to permanently delete group &quot;{0}&quot;? \
+#    Users might not be able to access pages whose ACLS contain this group. \\n\\n \
+#    If you click OK, the group will be removed immediately.
+group.doesnotexist=Esse grupo n�o existe.
+group.createsuggestion=Por que voc� n�o {0}
+group.createit=Criar isso?
+group.errorprefix=Erro&nbsp;
+group.groupintro=Esse � o grupo wiki chamado {0}. Apenas membros desse grupo podem edit�-lo.
+
+group.name=Nome do Grupo
+group.members=Membros do Grupo
+group.membership=Membro do Grupo.
+group.modifier={0} salvou esse grupo em {1}
+group.creator={0} criou esse grupo em {1}.
+
+# GroupTab.jsp
+grp.createdon=Criado em {0} por {1}
+grp.lastmodified=<br />�ltima altera��o em {0} por {1}
+grp.groupnames.title=Clique para editar esse grupo
+grp.newgroupname=(novo nome do grupo)
+grp.savegroup=Salvar Grupo
+grp.savenewgroup=Salvar Novo Grupo
+grp.cancel=Cancelar
+grp.deletegroup=Deletar Grupo
+grp.deletegroup.confirm=Por favor, confirme o desejo de deletar esse grupo permanentemente!
+grp.formhelp=Ades�o para grupo. Apenas membros do grupo podem edit�-lo. \
+	<br />Informe o nome de cada usu�rio na wiki ou o nome completo, separados por quebra de linha.
+grp.allgroups=Todos Grupos
+
+# Header.jsp
+header.yourtrail=Sua rota:&nbsp;
+header.homepage.title=P�gina inicial dessa wiki
+
+# InfoContent.jsp
+info.pagename=Nome da p�gina
+info.parent=P�gina "m�e"
+info.lastmodified=Essa p�gina (revis�o-{0}) foi alterada em {1} por {2}
+info.createdon=Essa p�gina foi criada em {0} por {1}
+info.current=Vers�o atual da p�gina 
+info.noversions=Sem vers�es.
+info.feed=Feed da p�gina
+
+info.pagediff.title=Mostre as mudan�as da �ltima atualiza��o
+
+info.rename.submit=Renomear p�gina
+info.updatereferrers=Atualizar refer�ncias?
+info.rename.permission=Apenas usu�rios autorizados podem renomear p�ginas.
+
+
+info.delete.submit=Deletar toda p�gina
+#info.delete.attachmentwarning=<i>First delete all attachments of this page</i>
+info.confirmdelete=Por favor, confirme que deseja deletar esse conte�do permanentemente!
+info.delete.permission=Apenas usu�rios autorizados podem deletar p�ginas.
+
+info.moreinfo=Mais informa��es...
+info.backtomainpage=Voltar para {0}
+info.backtoparentpage=Voltar para {0} (p�gina "m�e")
+
+info.history=Hist�rico de revis�o da p�gina
+info.showrevisions=Mostrar todas revis�es de {0} at� {1}
+info.showfrom=Mostrar {0} revis�es de {1} at� {2}
+
+info.pagination=Pagina��o:
+info.pagination.first=<span class="first">Primeira</span>
+info.pagination.last=<span class="last">�ltima</span>
+info.pagination.previous=<span class="prev">Anterior</span>
+info.pagination.next=<span class="next">Pr�xima</span>
+info.pagination.all=<span class="all">todas</span>
+info.pagination.total=&nbsp;(Itens totais: {0} )
+info.pagination.show.title=Mostrar itens de {0} at� {1}
+info.pagination.showall.title=Mostrar todos itens
+
+info.version=Vers�o
+info.date=Data modificada
+info.size=Tamanho
+info.author=Autor
+info.changes=Altera��es...
+info.changenote=Nota de mudan�a
+info.actions=A��es
+info.difftoprev=para anterior
+info.difftolast=para �ltima
+
+info.tab=Informa��o
+info.attachment.tab=Anexo � informa��o
+info.tab.links=Links
+info.tab.outgoing=Links de sa�da
+info.tab.incoming=Links de entrada
+info.tab.attachments=Anexos
+
+info.uploadnew=Upload nova vers�o
+#info.uploadnew.submit=Upload new attachment
+info.uploadnew.filename=Seleciona o arquivo:
+info.uploadnew.changenote=Noda de mudan�a:
+info.uploadnew.help=Para fazer upload de novos anexos nessa p�gina, \
+    use a caixa seguinte para escolher o arquivo, ent�o clique em &#8220;Upload&#8221;.
+info.uploadnew.nopermission=Apenas usu�rios autorizados podem fazer upload de novas vers�es de anexos.
+
+info.deleteattachment=Deletar anexo
+info.deleteattachment.submit=Deletar anexo
+
+info.attachment.history=Hist�rico de revis�o de anexo
+info.attachment.type=Tipo
+info.attachment.name=Nome do anexo
+
+info.kilobytes=kB
+
+# LoginContent.jsp
+
+login.tab=Login
+login.title=Login
+login.heading.login=Acesse {0}
+
+login.help=Por favor, acesse com seu nome de usu�rio e senha.
+login.errorprefix=Erro:&nbsp;
+login.login=Login
+login.password=Senha
+login.remember=Lembrar?
+
+login.submit.login=Login
+login.invite=Quer acessar?
+login.nopassword=N�o tem uma conta ?
+login.registernow=Junte-se {0} agora!
+login.registernow.title=Registrar novo usu�rio!
+
+login.lostpw=Perdeu sua senha?
+login.lostpw.tab=Perdeu a senha
+login.lostpw.title=Perdeu sua senha?
+login.lostpw.getnew=Adquira uma nova!
+login.lostpw.heading=Resete sua senha
+login.lostpw.help=Perdeu ou esqueceu sua senha? Informe o endere�o de email usado para se registrar.
+login.lostpw.name=Email da conta
+login.lostpw.submit=Resete a senha!
+login.lostpw.reset.clickhere=Clique aqui
+login.lostpw.reset.login={0} para acessar uma vez que voc� recuperou sua senha.
+
+login.register.tab=Registar novo usu�rio
+
+login.tab.help=Ajuda
+login.loginhelpmissing=Ho hum, parece que a p�gina {0} est� faltando.  \
+    Algu�m dever ter feito algo na instala��o...\
+    <br /><br />\
+    Voc� pode copiar o texto da \
+    <a href="http://jspwiki-wiki.apache.org/Wiki.jsp?page=LoginHelp">p�gina de ajuda de Login \
+    em jspwiki-wiki.apache.org</a>.
+
+# NewGroupContent.jsp
+newgroup.heading.create=Criar novo grupo
+newgroup.errorprefix=Erro:&nbsp;
+newgroup.instructions.start=Essa p�gina permite que voc� crie novos grupos wiki.
+newgroup.name=Nome
+newgroup.name.description=Nome do novo grupo.
+newgroup.members.description=Ades�o para grupo. \
+    Informe o nome de cada usu�rio wiki, separados por quebra de linha.
+newgroup.instructions.end=Quando clicar em &#8220;Salvar grupo,&#8221; \
+    esse grupo ser� salvo como um grupo. Voc� pode especificar o nome do grupo \
+    na p�gina de listas de controle de acesso (LCAs).
+newgroup.creategroup=Criar grupo
+newgroup.defaultgroupname=Meu Grupo
+
+
+# PageActions.jsp
+
+actions.gototop=Ir para topo
+actions.gotobottom=Ir para baixo
+actions.view=Ver
+actions.view.title=Ver p�gina atual [ v ]
+actions.viewparent.title=Ver p�gina "m�e" [ v ]
+actions.home=Home
+actions.home.title=Ir para p�gina incial {0}
+actions.edit=<span class='accesskey'>E</span>ditar
+actions.edit.title=Editar p�gina atual [ e ]
+actions.editparent=<span class='accesskey'>E</span>ditar p�gina "m�e"
+actions.editparent.title=Editar p�gina "m�e" [ e ]
+actions.index=�ndice alfab�tico
+actions.index.title=Lista de todas as p�ginas alfabeticamente ordenadas 
+actions.recentchanges=Altera��es recentes
+actions.recentchanges.title=P�ginas ordenadas por data de altera��o
+
+actions.more=Mais...
+actions.separator= - - - - - -
+actions.comment=Adicionar coment�rio
+actions.comment.title=Adicionar coment�rio
+actions.addcommenttoparent=Adicinar coment�rio na p�gina "m�e"
+actions.upload=Anexar Arquivo
+actions.info=Informa��o
+actions.info.title=P�gina de informa��o adicional e hist�rido de Vers�o [ i ]
+actions.prefs=Minhas <span class='accesskey'>P</span>refer�ncias
+actions.prefs.title=Gerencia suas prefer�ncias [ p ]
+actions.editgroup=Editar grupo
+actions.deletegroup=Deletar grupo
+actions.viewgroup=Ver grupo
+actions.creategroup=Criar grupo
+actions.creategroup.title=Criar novo grupo de autoriza��o
+actions.login=Acessar
+actions.login.title=Acesse ou Registre novo usu�rio
+actions.logout=Sair
+actions.logout.title=Sair
+actions.publishedon=Essa vers�o foi publicada em {0} por {1}.
+actions.notcreated=P�gina ainda n�o criada.
+actions.workflow=Ciclo de vida
+actions.workflow.title=Ciclo de vida
+actions.systeminfo=JSPWiki Sistema de Informa��es
+actions.systeminfo.title=Mostrar op��es do sistema JSPWiki de &amp; informa��es
+actions.rawpage=Ver fonte da p�gina
+actions.rawpage.title=Ver fonte da p�gina
+
+# PageContent.jsp
+
+view.oldversion=Essa � a vers�o {0}. N�o � a vers�o atual, portanto n�o pode ser editada.
+view.backtocurrent=[Voltar � vers�o atual]
+view.restore=[Restaurar essa vers�o]
+view.heading.attachments=Anexos
+
+# PageTab.jsp
+view.tab=Vis�o
+
+# PreferencesContent.jsp
+
+# 0: applicationname
+prefs.heading=Prefer�ncias de usu�rio
+prefs.clear.heading=Limpar prefer�ncias de usu�rio
+prefs.tab.prefs=Prefer�ncias
+prefs.tab.profile=Perfil
+
+prefs.cookies=Suas escolhas ser�o salvas nos cookies do seu navegador.
+
+prefs.user.skin=Skin
+prefs.user.orientation=Estilos favoritos
+prefs.user.orientation.left=Esquerda
+prefs.user.orientation.right=Direita
+#prefs.user.editorareaheight=Editor area height  //not user anymore
+prefs.user.sectionediting=�rea de edi��o
+prefs.user.sectionediting.text=Habilite a �rea de edi��o atrav�s dos links <span class="editsection"><a href="#">[editar]</a></span>
+prefs.user.timeformat=Formato de hora
+prefs.user.timezone=Fuso hor�rio
+prefs.user.timezone.server=[SERVIDOR]
+prefs.user.language=Idioma
+prefs.user.language.default=[PADR�O]
+
+prefs.instructions=Ajuste suas prefer�ncias aqui. Suas escolhas ser�o salvas nos cookies de seu navegador.
+prefs.assertedname=Nome
+prefs.assertedname.description=Seu nome. \
+    Se voc� ainda n�o criou um perfil, voc� pode falar {0} \
+    quem voc� � &#8216;informando&#8217; uma identidade. Voc� n�o mentiria para gente, n�o �? \
+    <br /> \
+    Note que ajustar seu nome de usu�rio dessa forma n�o � o m�todo real \
+    de autentica��o, porque isso ir� somente ajustar um cookie no seu navegador \
+    sem exigir uma senha. Dependendo da pol�tica de seguran�a, a wiki poder� lhe permitir \
+    alguns privil�gios como usu�rio &#8220;informado&#8221;. {0} se \
+    preferir um nome de usu�rio e senha tradicionais, que s�o mais \
+    seguros.
+prefs.assertedname.create=Criar um novo perfil de usu�rio
+prefs.submit.setname=Ajustar nome de usu�rio
+prefs.save.prefs.submit=Salvar Prefer�ncias de Usu�rio
+prefs.clear.submit=Limpar prefer�ncias de usu�rio
+prefs.clear.description=\
+	Em alguns casos voc� precisa remover seu nome de usu�rio &#8216;escolhido&#8217; e \
+	suas prefer�ncias desse computador. \
+	Clique em &#8216;Limpar prefer�ncias de usu�rio&#8217; para proseguir. \
+    <br /> \
+    Note que isso ir� remover todas as suas prefer�ncias, permanentemente. \
+    Voc� ir� precisar inform�-las novamente.
+
+prefs.newprofile=Crie um novo perfil
+prefs.oldprofile=Atualize seu perfil wiki.
+
+prefs.errorprefix.prefs=N�o foi poss�vel salvar as prefer�ncias:&nbsp;
+prefs.errorprefix.profile=N�o foi poss�vel salvar o perfil:&nbsp;
+prefs.errorprefix.rename=N�o foi poss�vel renomear a p�gina:&nbsp;
+
+prefs.loginname=Nome de login *
+prefs.loginname.description=Esse � seu id de Login.
+prefs.loginname.cannotset.new=Voc� n�o pode ajustar seu login porque voc� n�o est� \
+  logado ainda. Voc� primeiro deve se autenticar com as informa��es \
+  recebidas de seu administrador.
+prefs.loginname.cannotset.exists=Voc� n�o pode ajustar seu login porque \
+  suas credenciais s�o gerenciadas pelo container web, n�o pela wiki.
+
+prefs.password=Senha *
+prefs.password.description=Ajuste sua senha. N�o pode ficar em branco.
+prefs.password2=Confirme a senha *
+prefs.password2.description=Redigite a verifica��o de senha.
+
+prefs.fullname=Nome *
+prefs.fullname.description=Use seu nome da Lista de Controle de Acesso ou dos Grupos wiki.
+
+prefs.email=Endere�o de E-Mail
+prefs.email.description= (opcional). Se voc� perdeu sua senha, \
+    voc� pode solicitar uma nova senha que ser� enviada para esse endere�o.
+
+prefs.cookie.info=Essa wiki automaticamente relembra dos seus cookies, \
+    sem autentica��o adicional. Para usar esse \
+    recurso, seu navegador precisa aceitar cookies desse \
+    website. Quando voc� clicar em &#8220;salvar perfil,&#8221; o cookie \
+    ser� salvo no seu navegador.
+notification.createUserProfile.accept.subject=Bem-vindo ao {0}\!
+notification.createUserProfile.accept.content=Parab�ns\! Seu novo perfil em {0} foi criado. Seguem os detalhes\: \n\nLogin:\: {1} \nNome \: {2} \nE-Mail:    \: {3} \n\nSe voc� esquecer sua senha voc� pode reset�-la em {4}.
+
+# ------------------------------------------------------------------------
+# There are a lot of keys still missing here, please add your translations below.
+# You can find them in the file default.properties or at
+#   http://svn.apache.org/viewvc/incubator/jspwiki/trunk/jspwiki-war/src/main/resources/templates/default.properties?view=co
+# ------------------------------------------------------------------------
diff --git a/jspwiki-war/src/main/resources/templates/default_ru.properties b/jspwiki-main/src/main/resources/templates/default_ru.properties
similarity index 100%
rename from jspwiki-war/src/main/resources/templates/default_ru.properties
rename to jspwiki-main/src/main/resources/templates/default_ru.properties
diff --git a/jspwiki-war/src/main/resources/templates/default_zh_CN.properties b/jspwiki-main/src/main/resources/templates/default_zh_CN.properties
similarity index 100%
rename from jspwiki-war/src/main/resources/templates/default_zh_CN.properties
rename to jspwiki-main/src/main/resources/templates/default_zh_CN.properties
diff --git a/jspwiki-war/src/test/config/hsql-userdb-setup.ddl b/jspwiki-main/src/test/config/hsql-userdb-setup.ddl
similarity index 100%
rename from jspwiki-war/src/test/config/hsql-userdb-setup.ddl
rename to jspwiki-main/src/test/config/hsql-userdb-setup.ddl
diff --git a/jspwiki-war/src/test/config/hsql-userdb-teardown.ddl b/jspwiki-main/src/test/config/hsql-userdb-teardown.ddl
similarity index 100%
rename from jspwiki-war/src/test/config/hsql-userdb-teardown.ddl
rename to jspwiki-main/src/test/config/hsql-userdb-teardown.ddl
diff --git a/jspwiki-war/src/test/java/SamplePlugin2.java b/jspwiki-main/src/test/java/SamplePlugin2.java
similarity index 100%
rename from jspwiki-war/src/test/java/SamplePlugin2.java
rename to jspwiki-main/src/test/java/SamplePlugin2.java
diff --git a/jspwiki-war/src/test/java/org/apache/wiki/HsqlDbUtils.java b/jspwiki-main/src/test/java/org/apache/wiki/HsqlDbUtils.java
similarity index 100%
rename from jspwiki-war/src/test/java/org/apache/wiki/HsqlDbUtils.java
rename to jspwiki-main/src/test/java/org/apache/wiki/HsqlDbUtils.java
diff --git a/jspwiki-war/src/test/java/org/apache/wiki/PageManagerTest.java b/jspwiki-main/src/test/java/org/apache/wiki/PageManagerTest.java
similarity index 100%
rename from jspwiki-war/src/test/java/org/apache/wiki/PageManagerTest.java
rename to jspwiki-main/src/test/java/org/apache/wiki/PageManagerTest.java
diff --git a/jspwiki-war/src/test/java/org/apache/wiki/PageSorterTest.java b/jspwiki-main/src/test/java/org/apache/wiki/PageSorterTest.java
similarity index 100%
rename from jspwiki-war/src/test/java/org/apache/wiki/PageSorterTest.java
rename to jspwiki-main/src/test/java/org/apache/wiki/PageSorterTest.java
diff --git a/jspwiki-war/src/test/java/org/apache/wiki/PropertyReaderTest.java b/jspwiki-main/src/test/java/org/apache/wiki/PropertyReaderTest.java
similarity index 100%
rename from jspwiki-war/src/test/java/org/apache/wiki/PropertyReaderTest.java
rename to jspwiki-main/src/test/java/org/apache/wiki/PropertyReaderTest.java
diff --git a/jspwiki-war/src/test/java/org/apache/wiki/ReferenceManagerTest.java b/jspwiki-main/src/test/java/org/apache/wiki/ReferenceManagerTest.java
similarity index 100%
rename from jspwiki-war/src/test/java/org/apache/wiki/ReferenceManagerTest.java
rename to jspwiki-main/src/test/java/org/apache/wiki/ReferenceManagerTest.java
diff --git a/jspwiki-war/src/test/java/org/apache/wiki/ReleaseTest.java b/jspwiki-main/src/test/java/org/apache/wiki/ReleaseTest.java
similarity index 100%
rename from jspwiki-war/src/test/java/org/apache/wiki/ReleaseTest.java
rename to jspwiki-main/src/test/java/org/apache/wiki/ReleaseTest.java
diff --git a/jspwiki-war/src/test/java/org/apache/wiki/TestAuthorizer.java b/jspwiki-main/src/test/java/org/apache/wiki/TestAuthorizer.java
similarity index 100%
rename from jspwiki-war/src/test/java/org/apache/wiki/TestAuthorizer.java
rename to jspwiki-main/src/test/java/org/apache/wiki/TestAuthorizer.java
diff --git a/jspwiki-war/src/test/java/org/apache/wiki/TestEngine.java b/jspwiki-main/src/test/java/org/apache/wiki/TestEngine.java
similarity index 100%
rename from jspwiki-war/src/test/java/org/apache/wiki/TestEngine.java
rename to jspwiki-main/src/test/java/org/apache/wiki/TestEngine.java
diff --git a/jspwiki-war/src/test/java/org/apache/wiki/TestJDBCDataSource.java b/jspwiki-main/src/test/java/org/apache/wiki/TestJDBCDataSource.java
similarity index 100%
rename from jspwiki-war/src/test/java/org/apache/wiki/TestJDBCDataSource.java
rename to jspwiki-main/src/test/java/org/apache/wiki/TestJDBCDataSource.java
diff --git a/jspwiki-war/src/test/java/org/apache/wiki/TestJNDIContext.java b/jspwiki-main/src/test/java/org/apache/wiki/TestJNDIContext.java
similarity index 100%
rename from jspwiki-war/src/test/java/org/apache/wiki/TestJNDIContext.java
rename to jspwiki-main/src/test/java/org/apache/wiki/TestJNDIContext.java
diff --git a/jspwiki-war/src/test/java/org/apache/wiki/Util.java b/jspwiki-main/src/test/java/org/apache/wiki/Util.java
similarity index 100%
rename from jspwiki-war/src/test/java/org/apache/wiki/Util.java
rename to jspwiki-main/src/test/java/org/apache/wiki/Util.java
diff --git a/jspwiki-war/src/test/java/org/apache/wiki/VariableManagerTest.java b/jspwiki-main/src/test/java/org/apache/wiki/VariableManagerTest.java
similarity index 100%
rename from jspwiki-war/src/test/java/org/apache/wiki/VariableManagerTest.java
rename to jspwiki-main/src/test/java/org/apache/wiki/VariableManagerTest.java
diff --git a/jspwiki-war/src/test/java/org/apache/wiki/WikiAjaxServletTest.java b/jspwiki-main/src/test/java/org/apache/wiki/WikiAjaxServletTest.java
similarity index 100%
rename from jspwiki-war/src/test/java/org/apache/wiki/WikiAjaxServletTest.java
rename to jspwiki-main/src/test/java/org/apache/wiki/WikiAjaxServletTest.java
diff --git a/jspwiki-war/src/test/java/org/apache/wiki/WikiEngineTest.java b/jspwiki-main/src/test/java/org/apache/wiki/WikiEngineTest.java
similarity index 100%
rename from jspwiki-war/src/test/java/org/apache/wiki/WikiEngineTest.java
rename to jspwiki-main/src/test/java/org/apache/wiki/WikiEngineTest.java
diff --git a/jspwiki-war/src/test/java/org/apache/wiki/WikiSessionTest.java b/jspwiki-main/src/test/java/org/apache/wiki/WikiSessionTest.java
similarity index 100%
rename from jspwiki-war/src/test/java/org/apache/wiki/WikiSessionTest.java
rename to jspwiki-main/src/test/java/org/apache/wiki/WikiSessionTest.java
diff --git a/jspwiki-war/src/test/java/org/apache/wiki/attachment/AttachmentManagerTest.java b/jspwiki-main/src/test/java/org/apache/wiki/attachment/AttachmentManagerTest.java
similarity index 100%
rename from jspwiki-war/src/test/java/org/apache/wiki/attachment/AttachmentManagerTest.java
rename to jspwiki-main/src/test/java/org/apache/wiki/attachment/AttachmentManagerTest.java
diff --git a/jspwiki-war/src/test/java/org/apache/wiki/auth/AuthenticationManagerTest.java b/jspwiki-main/src/test/java/org/apache/wiki/auth/AuthenticationManagerTest.java
similarity index 100%
rename from jspwiki-war/src/test/java/org/apache/wiki/auth/AuthenticationManagerTest.java
rename to jspwiki-main/src/test/java/org/apache/wiki/auth/AuthenticationManagerTest.java
diff --git a/jspwiki-war/src/test/java/org/apache/wiki/auth/AuthorizationManagerTest.java b/jspwiki-main/src/test/java/org/apache/wiki/auth/AuthorizationManagerTest.java
similarity index 100%
rename from jspwiki-war/src/test/java/org/apache/wiki/auth/AuthorizationManagerTest.java
rename to jspwiki-main/src/test/java/org/apache/wiki/auth/AuthorizationManagerTest.java
diff --git a/jspwiki-war/src/test/java/org/apache/wiki/auth/GroupManagerTest.java b/jspwiki-main/src/test/java/org/apache/wiki/auth/GroupManagerTest.java
similarity index 100%
rename from jspwiki-war/src/test/java/org/apache/wiki/auth/GroupManagerTest.java
rename to jspwiki-main/src/test/java/org/apache/wiki/auth/GroupManagerTest.java
diff --git a/jspwiki-war/src/test/java/org/apache/wiki/auth/SecurityEventTrap.java b/jspwiki-main/src/test/java/org/apache/wiki/auth/SecurityEventTrap.java
similarity index 100%
rename from jspwiki-war/src/test/java/org/apache/wiki/auth/SecurityEventTrap.java
rename to jspwiki-main/src/test/java/org/apache/wiki/auth/SecurityEventTrap.java
diff --git a/jspwiki-war/src/test/java/org/apache/wiki/auth/UserManagerTest.java b/jspwiki-main/src/test/java/org/apache/wiki/auth/UserManagerTest.java
old mode 100755
new mode 100644
similarity index 100%
rename from jspwiki-war/src/test/java/org/apache/wiki/auth/UserManagerTest.java
rename to jspwiki-main/src/test/java/org/apache/wiki/auth/UserManagerTest.java
diff --git a/jspwiki-war/src/test/java/org/apache/wiki/auth/Users.java b/jspwiki-main/src/test/java/org/apache/wiki/auth/Users.java
similarity index 100%
rename from jspwiki-war/src/test/java/org/apache/wiki/auth/Users.java
rename to jspwiki-main/src/test/java/org/apache/wiki/auth/Users.java
diff --git a/jspwiki-war/src/test/java/org/apache/wiki/auth/acl/AclEntryImplTest.java b/jspwiki-main/src/test/java/org/apache/wiki/auth/acl/AclEntryImplTest.java
similarity index 100%
rename from jspwiki-war/src/test/java/org/apache/wiki/auth/acl/AclEntryImplTest.java
rename to jspwiki-main/src/test/java/org/apache/wiki/auth/acl/AclEntryImplTest.java
diff --git a/jspwiki-war/src/test/java/org/apache/wiki/auth/acl/AclImplTest.java b/jspwiki-main/src/test/java/org/apache/wiki/auth/acl/AclImplTest.java
similarity index 100%
rename from jspwiki-war/src/test/java/org/apache/wiki/auth/acl/AclImplTest.java
rename to jspwiki-main/src/test/java/org/apache/wiki/auth/acl/AclImplTest.java
diff --git a/jspwiki-war/src/test/java/org/apache/wiki/auth/acl/DefaultAclManagerTest.java b/jspwiki-main/src/test/java/org/apache/wiki/auth/acl/DefaultAclManagerTest.java
similarity index 100%
rename from jspwiki-war/src/test/java/org/apache/wiki/auth/acl/DefaultAclManagerTest.java
rename to jspwiki-main/src/test/java/org/apache/wiki/auth/acl/DefaultAclManagerTest.java
diff --git a/jspwiki-war/src/test/java/org/apache/wiki/auth/authorize/GroupTest.java b/jspwiki-main/src/test/java/org/apache/wiki/auth/authorize/GroupTest.java
similarity index 100%
rename from jspwiki-war/src/test/java/org/apache/wiki/auth/authorize/GroupTest.java
rename to jspwiki-main/src/test/java/org/apache/wiki/auth/authorize/GroupTest.java
diff --git a/jspwiki-war/src/test/java/org/apache/wiki/auth/authorize/JDBCGroupDatabaseTest.java b/jspwiki-main/src/test/java/org/apache/wiki/auth/authorize/JDBCGroupDatabaseTest.java
similarity index 100%
rename from jspwiki-war/src/test/java/org/apache/wiki/auth/authorize/JDBCGroupDatabaseTest.java
rename to jspwiki-main/src/test/java/org/apache/wiki/auth/authorize/JDBCGroupDatabaseTest.java
diff --git a/jspwiki-war/src/test/java/org/apache/wiki/auth/authorize/WebContainerAuthorizerTest.java b/jspwiki-main/src/test/java/org/apache/wiki/auth/authorize/WebContainerAuthorizerTest.java
similarity index 100%
rename from jspwiki-war/src/test/java/org/apache/wiki/auth/authorize/WebContainerAuthorizerTest.java
rename to jspwiki-main/src/test/java/org/apache/wiki/auth/authorize/WebContainerAuthorizerTest.java
diff --git a/jspwiki-war/src/test/java/org/apache/wiki/auth/authorize/XMLGroupDatabaseTest.java b/jspwiki-main/src/test/java/org/apache/wiki/auth/authorize/XMLGroupDatabaseTest.java
similarity index 100%
rename from jspwiki-war/src/test/java/org/apache/wiki/auth/authorize/XMLGroupDatabaseTest.java
rename to jspwiki-main/src/test/java/org/apache/wiki/auth/authorize/XMLGroupDatabaseTest.java
diff --git a/jspwiki-war/src/test/java/org/apache/wiki/auth/login/AnonymousLoginModuleTest.java b/jspwiki-main/src/test/java/org/apache/wiki/auth/login/AnonymousLoginModuleTest.java
similarity index 100%
rename from jspwiki-war/src/test/java/org/apache/wiki/auth/login/AnonymousLoginModuleTest.java
rename to jspwiki-main/src/test/java/org/apache/wiki/auth/login/AnonymousLoginModuleTest.java
diff --git a/jspwiki-war/src/test/java/org/apache/wiki/auth/login/CookieAssertionLoginModuleTest.java b/jspwiki-main/src/test/java/org/apache/wiki/auth/login/CookieAssertionLoginModuleTest.java
similarity index 100%
rename from jspwiki-war/src/test/java/org/apache/wiki/auth/login/CookieAssertionLoginModuleTest.java
rename to jspwiki-main/src/test/java/org/apache/wiki/auth/login/CookieAssertionLoginModuleTest.java
diff --git a/jspwiki-war/src/test/java/org/apache/wiki/auth/login/UserDatabaseLoginModuleTest.java b/jspwiki-main/src/test/java/org/apache/wiki/auth/login/UserDatabaseLoginModuleTest.java
similarity index 100%
rename from jspwiki-war/src/test/java/org/apache/wiki/auth/login/UserDatabaseLoginModuleTest.java
rename to jspwiki-main/src/test/java/org/apache/wiki/auth/login/UserDatabaseLoginModuleTest.java
diff --git a/jspwiki-war/src/test/java/org/apache/wiki/auth/login/WebContainerLoginModuleTest.java b/jspwiki-main/src/test/java/org/apache/wiki/auth/login/WebContainerLoginModuleTest.java
similarity index 100%
rename from jspwiki-war/src/test/java/org/apache/wiki/auth/login/WebContainerLoginModuleTest.java
rename to jspwiki-main/src/test/java/org/apache/wiki/auth/login/WebContainerLoginModuleTest.java
diff --git a/jspwiki-war/src/test/java/org/apache/wiki/auth/permissions/AllPermissionCollectionTest.java b/jspwiki-main/src/test/java/org/apache/wiki/auth/permissions/AllPermissionCollectionTest.java
similarity index 100%
rename from jspwiki-war/src/test/java/org/apache/wiki/auth/permissions/AllPermissionCollectionTest.java
rename to jspwiki-main/src/test/java/org/apache/wiki/auth/permissions/AllPermissionCollectionTest.java
diff --git a/jspwiki-war/src/test/java/org/apache/wiki/auth/permissions/AllPermissionTest.java b/jspwiki-main/src/test/java/org/apache/wiki/auth/permissions/AllPermissionTest.java
similarity index 100%
rename from jspwiki-war/src/test/java/org/apache/wiki/auth/permissions/AllPermissionTest.java
rename to jspwiki-main/src/test/java/org/apache/wiki/auth/permissions/AllPermissionTest.java
diff --git a/jspwiki-war/src/test/java/org/apache/wiki/auth/permissions/GroupPermissionTest.java b/jspwiki-main/src/test/java/org/apache/wiki/auth/permissions/GroupPermissionTest.java
similarity index 100%
rename from jspwiki-war/src/test/java/org/apache/wiki/auth/permissions/GroupPermissionTest.java
rename to jspwiki-main/src/test/java/org/apache/wiki/auth/permissions/GroupPermissionTest.java
diff --git a/jspwiki-war/src/test/java/org/apache/wiki/auth/permissions/PagePermissionTest.java b/jspwiki-main/src/test/java/org/apache/wiki/auth/permissions/PagePermissionTest.java
similarity index 100%
rename from jspwiki-war/src/test/java/org/apache/wiki/auth/permissions/PagePermissionTest.java
rename to jspwiki-main/src/test/java/org/apache/wiki/auth/permissions/PagePermissionTest.java
diff --git a/jspwiki-war/src/test/java/org/apache/wiki/auth/permissions/WikiPermissionTest.java b/jspwiki-main/src/test/java/org/apache/wiki/auth/permissions/WikiPermissionTest.java
similarity index 100%
rename from jspwiki-war/src/test/java/org/apache/wiki/auth/permissions/WikiPermissionTest.java
rename to jspwiki-main/src/test/java/org/apache/wiki/auth/permissions/WikiPermissionTest.java
diff --git a/jspwiki-war/src/test/java/org/apache/wiki/auth/user/JDBCUserDatabaseTest.java b/jspwiki-main/src/test/java/org/apache/wiki/auth/user/JDBCUserDatabaseTest.java
similarity index 100%
rename from jspwiki-war/src/test/java/org/apache/wiki/auth/user/JDBCUserDatabaseTest.java
rename to jspwiki-main/src/test/java/org/apache/wiki/auth/user/JDBCUserDatabaseTest.java
diff --git a/jspwiki-war/src/test/java/org/apache/wiki/auth/user/UserProfileTest.java b/jspwiki-main/src/test/java/org/apache/wiki/auth/user/UserProfileTest.java
similarity index 100%
rename from jspwiki-war/src/test/java/org/apache/wiki/auth/user/UserProfileTest.java
rename to jspwiki-main/src/test/java/org/apache/wiki/auth/user/UserProfileTest.java
diff --git a/jspwiki-war/src/test/java/org/apache/wiki/auth/user/XMLUserDatabaseTest.java b/jspwiki-main/src/test/java/org/apache/wiki/auth/user/XMLUserDatabaseTest.java
similarity index 100%
rename from jspwiki-war/src/test/java/org/apache/wiki/auth/user/XMLUserDatabaseTest.java
rename to jspwiki-main/src/test/java/org/apache/wiki/auth/user/XMLUserDatabaseTest.java
diff --git a/jspwiki-war/src/test/java/org/apache/wiki/content/PageRenamerTest.java b/jspwiki-main/src/test/java/org/apache/wiki/content/PageRenamerTest.java
similarity index 100%
rename from jspwiki-war/src/test/java/org/apache/wiki/content/PageRenamerTest.java
rename to jspwiki-main/src/test/java/org/apache/wiki/content/PageRenamerTest.java
diff --git a/jspwiki-war/src/test/java/org/apache/wiki/diff/ContextualDiffProviderTest.java b/jspwiki-main/src/test/java/org/apache/wiki/diff/ContextualDiffProviderTest.java
similarity index 100%
rename from jspwiki-war/src/test/java/org/apache/wiki/diff/ContextualDiffProviderTest.java
rename to jspwiki-main/src/test/java/org/apache/wiki/diff/ContextualDiffProviderTest.java
diff --git a/jspwiki-war/src/test/java/org/apache/wiki/filters/DefaultFilterManagerTest.java b/jspwiki-main/src/test/java/org/apache/wiki/filters/DefaultFilterManagerTest.java
similarity index 100%
rename from jspwiki-war/src/test/java/org/apache/wiki/filters/DefaultFilterManagerTest.java
rename to jspwiki-main/src/test/java/org/apache/wiki/filters/DefaultFilterManagerTest.java
diff --git a/jspwiki-war/src/test/java/org/apache/wiki/filters/TestFilter.java b/jspwiki-main/src/test/java/org/apache/wiki/filters/TestFilter.java
similarity index 100%
rename from jspwiki-war/src/test/java/org/apache/wiki/filters/TestFilter.java
rename to jspwiki-main/src/test/java/org/apache/wiki/filters/TestFilter.java
diff --git a/jspwiki-war/src/test/java/org/apache/wiki/htmltowiki/HtmlStringToWikiTranslatorTest.java b/jspwiki-main/src/test/java/org/apache/wiki/htmltowiki/HtmlStringToWikiTranslatorTest.java
similarity index 100%
rename from jspwiki-war/src/test/java/org/apache/wiki/htmltowiki/HtmlStringToWikiTranslatorTest.java
rename to jspwiki-main/src/test/java/org/apache/wiki/htmltowiki/HtmlStringToWikiTranslatorTest.java
diff --git a/jspwiki-war/src/test/java/org/apache/wiki/i18n/InternationalizationManagerTest.java b/jspwiki-main/src/test/java/org/apache/wiki/i18n/InternationalizationManagerTest.java
similarity index 97%
rename from jspwiki-war/src/test/java/org/apache/wiki/i18n/InternationalizationManagerTest.java
rename to jspwiki-main/src/test/java/org/apache/wiki/i18n/InternationalizationManagerTest.java
index a7e421c..a397fea 100644
--- a/jspwiki-war/src/test/java/org/apache/wiki/i18n/InternationalizationManagerTest.java
+++ b/jspwiki-main/src/test/java/org/apache/wiki/i18n/InternationalizationManagerTest.java
@@ -1,67 +1,67 @@
-/*
-    Licensed to the Apache Software Foundation (ASF) under one
-    or more contributor license agreements.  See the NOTICE file
-    distributed with this work for additional information
-    regarding copyright ownership.  The ASF licenses this file
-    to you under the Apache License, Version 2.0 (the
-    "License"); you may not use this file except in compliance
-    with the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-    Unless required by applicable law or agreed to in writing,
-    software distributed under the License is distributed on an
-    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-    KIND, either express or implied.  See the License for the
-    specific language governing permissions and limitations
-    under the License.    
- */
+/*
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.    
+ */
 package org.apache.wiki.i18n;
 import org.junit.jupiter.api.BeforeEach;
 
-import org.junit.jupiter.api.Test;
-
-import java.util.Locale;
-
-import org.junit.jupiter.api.Assertions;
-
-public class InternationalizationManagerTest
-{
-    InternationalizationManager i18n = new InternationalizationManager( null );
-    
+import org.junit.jupiter.api.Test;
+
+import java.util.Locale;
+
+import org.junit.jupiter.api.Assertions;
+
+public class InternationalizationManagerTest
+{
+    InternationalizationManager i18n = new InternationalizationManager( null );
+    
     @BeforeEach
-    public void setUp() throws Exception
-    {
-    	// enforce english locale as the default one. Otherwise, if your default locale is one
-    	// of the given translations, ResourceBundle.getBundle(String, Locale.ENGLISH) will 
-    	// return the bundle of your locale, rather than returning the default -english- one
-    	Locale.setDefault( Locale.ENGLISH );
-    }
-    
+    public void setUp() throws Exception
+    {
+    	// enforce english locale as the default one. Otherwise, if your default locale is one
+    	// of the given translations, ResourceBundle.getBundle(String, Locale.ENGLISH) will 
+    	// return the bundle of your locale, rather than returning the default -english- one
+    	Locale.setDefault( Locale.ENGLISH );
+    }
+    
     @Test
-    public void testGetFromCoreWithArgs() 
-    {
-        String str = i18n.get( InternationalizationManager.CORE_BUNDLE, 
-                               Locale.ENGLISH, 
-                               "security.error.cannot.rename", 
-                               "Test User" );
-        Assertions.assertEquals( "Cannot rename: the login name 'Test User' is already taken.", str );
-    }
-    
+    public void testGetFromCoreWithArgs() 
+    {
+        String str = i18n.get( InternationalizationManager.CORE_BUNDLE, 
+                               Locale.ENGLISH, 
+                               "security.error.cannot.rename", 
+                               "Test User" );
+        Assertions.assertEquals( "Cannot rename: the login name 'Test User' is already taken.", str );
+    }
+    
     @Test
-    public void testGetFromDefTemplateWithArgs() 
-    {
-        String str = i18n.get( InternationalizationManager.DEF_TEMPLATE, 
-                               Locale.ENGLISH, 
-                               "notification.createUserProfile.accept.content", 
-                               "JSPWiki", "testUser", "Test User", "test@user.com", "www.foo.com" );
-        Assertions.assertEquals( "Congratulations! Your new profile on JSPWiki has been created. " +
-        		      "Your profile details are as follows: \n\n" +
-                      "Login name: testUser \n" +
-                      "Your name : Test User \n" +
-                      "E-mail    : test@user.com \n\n" +
-                      "If you forget your password, you can reset it at www.foo.com", 
-                      str );
-    }
-    
-}
+    public void testGetFromDefTemplateWithArgs() 
+    {
+        String str = i18n.get( InternationalizationManager.DEF_TEMPLATE, 
+                               Locale.ENGLISH, 
+                               "notification.createUserProfile.accept.content", 
+                               "JSPWiki", "testUser", "Test User", "test@user.com", "www.foo.com" );
+        Assertions.assertEquals( "Congratulations! Your new profile on JSPWiki has been created. " +
+        		      "Your profile details are as follows: \n\n" +
+                      "Login name: testUser \n" +
+                      "Your name : Test User \n" +
+                      "E-mail    : test@user.com \n\n" +
+                      "If you forget your password, you can reset it at www.foo.com", 
+                      str );
+    }
+    
+}
diff --git a/jspwiki-war/src/test/java/org/apache/wiki/parser/CreoleToJSPWikiTranslatorTest.java b/jspwiki-main/src/test/java/org/apache/wiki/parser/CreoleToJSPWikiTranslatorTest.java
similarity index 100%
rename from jspwiki-war/src/test/java/org/apache/wiki/parser/CreoleToJSPWikiTranslatorTest.java
rename to jspwiki-main/src/test/java/org/apache/wiki/parser/CreoleToJSPWikiTranslatorTest.java
diff --git a/jspwiki-war/src/test/java/org/apache/wiki/parser/JSPWikiMarkupParserTest.java b/jspwiki-main/src/test/java/org/apache/wiki/parser/JSPWikiMarkupParserTest.java
similarity index 100%
rename from jspwiki-war/src/test/java/org/apache/wiki/parser/JSPWikiMarkupParserTest.java
rename to jspwiki-main/src/test/java/org/apache/wiki/parser/JSPWikiMarkupParserTest.java
diff --git a/jspwiki-war/src/test/java/org/apache/wiki/parser/MarkupParserTest.java b/jspwiki-main/src/test/java/org/apache/wiki/parser/MarkupParserTest.java
similarity index 100%
rename from jspwiki-war/src/test/java/org/apache/wiki/parser/MarkupParserTest.java
rename to jspwiki-main/src/test/java/org/apache/wiki/parser/MarkupParserTest.java
diff --git a/jspwiki-war/src/test/java/org/apache/wiki/parser/creole.properties b/jspwiki-main/src/test/java/org/apache/wiki/parser/creole.properties
similarity index 100%
rename from jspwiki-war/src/test/java/org/apache/wiki/parser/creole.properties
rename to jspwiki-main/src/test/java/org/apache/wiki/parser/creole.properties
diff --git a/jspwiki-war/src/test/java/org/apache/wiki/plugin/CounterPluginTest.java b/jspwiki-main/src/test/java/org/apache/wiki/plugin/CounterPluginTest.java
similarity index 100%
rename from jspwiki-war/src/test/java/org/apache/wiki/plugin/CounterPluginTest.java
rename to jspwiki-main/src/test/java/org/apache/wiki/plugin/CounterPluginTest.java
diff --git a/jspwiki-war/src/test/java/org/apache/wiki/plugin/DefaultPluginManagerTest.java b/jspwiki-main/src/test/java/org/apache/wiki/plugin/DefaultPluginManagerTest.java
similarity index 100%
rename from jspwiki-war/src/test/java/org/apache/wiki/plugin/DefaultPluginManagerTest.java
rename to jspwiki-main/src/test/java/org/apache/wiki/plugin/DefaultPluginManagerTest.java
diff --git a/jspwiki-war/src/test/java/org/apache/wiki/plugin/GroupsTest.java b/jspwiki-main/src/test/java/org/apache/wiki/plugin/GroupsTest.java
similarity index 100%
rename from jspwiki-war/src/test/java/org/apache/wiki/plugin/GroupsTest.java
rename to jspwiki-main/src/test/java/org/apache/wiki/plugin/GroupsTest.java
diff --git a/jspwiki-war/src/test/java/org/apache/wiki/plugin/IfPluginTest.java b/jspwiki-main/src/test/java/org/apache/wiki/plugin/IfPluginTest.java
similarity index 100%
rename from jspwiki-war/src/test/java/org/apache/wiki/plugin/IfPluginTest.java
rename to jspwiki-main/src/test/java/org/apache/wiki/plugin/IfPluginTest.java
diff --git a/jspwiki-war/src/test/java/org/apache/wiki/plugin/InsertPageTest.java b/jspwiki-main/src/test/java/org/apache/wiki/plugin/InsertPageTest.java
similarity index 100%
rename from jspwiki-war/src/test/java/org/apache/wiki/plugin/InsertPageTest.java
rename to jspwiki-main/src/test/java/org/apache/wiki/plugin/InsertPageTest.java
diff --git a/jspwiki-war/src/test/java/org/apache/wiki/plugin/JavaScriptPlugin.java b/jspwiki-main/src/test/java/org/apache/wiki/plugin/JavaScriptPlugin.java
similarity index 100%
rename from jspwiki-war/src/test/java/org/apache/wiki/plugin/JavaScriptPlugin.java
rename to jspwiki-main/src/test/java/org/apache/wiki/plugin/JavaScriptPlugin.java
diff --git a/jspwiki-war/src/test/java/org/apache/wiki/plugin/PageViewPluginTest.java b/jspwiki-main/src/test/java/org/apache/wiki/plugin/PageViewPluginTest.java
similarity index 100%
rename from jspwiki-war/src/test/java/org/apache/wiki/plugin/PageViewPluginTest.java
rename to jspwiki-main/src/test/java/org/apache/wiki/plugin/PageViewPluginTest.java
diff --git a/jspwiki-war/src/test/java/org/apache/wiki/plugin/RecentChangesPluginTest.java b/jspwiki-main/src/test/java/org/apache/wiki/plugin/RecentChangesPluginTest.java
similarity index 100%
rename from jspwiki-war/src/test/java/org/apache/wiki/plugin/RecentChangesPluginTest.java
rename to jspwiki-main/src/test/java/org/apache/wiki/plugin/RecentChangesPluginTest.java
diff --git a/jspwiki-war/src/test/java/org/apache/wiki/plugin/ReferringPagesPluginTest.java b/jspwiki-main/src/test/java/org/apache/wiki/plugin/ReferringPagesPluginTest.java
similarity index 100%
rename from jspwiki-war/src/test/java/org/apache/wiki/plugin/ReferringPagesPluginTest.java
rename to jspwiki-main/src/test/java/org/apache/wiki/plugin/ReferringPagesPluginTest.java
diff --git a/jspwiki-war/src/test/java/org/apache/wiki/plugin/ReferringUndefinedPagesPluginTest.java b/jspwiki-main/src/test/java/org/apache/wiki/plugin/ReferringUndefinedPagesPluginTest.java
similarity index 100%
rename from jspwiki-war/src/test/java/org/apache/wiki/plugin/ReferringUndefinedPagesPluginTest.java
rename to jspwiki-main/src/test/java/org/apache/wiki/plugin/ReferringUndefinedPagesPluginTest.java
diff --git a/jspwiki-war/src/test/java/org/apache/wiki/plugin/SamplePlugin.java b/jspwiki-main/src/test/java/org/apache/wiki/plugin/SamplePlugin.java
similarity index 100%
rename from jspwiki-war/src/test/java/org/apache/wiki/plugin/SamplePlugin.java
rename to jspwiki-main/src/test/java/org/apache/wiki/plugin/SamplePlugin.java
diff --git a/jspwiki-war/src/test/java/org/apache/wiki/plugin/SamplePlugin3.java b/jspwiki-main/src/test/java/org/apache/wiki/plugin/SamplePlugin3.java
similarity index 100%
rename from jspwiki-war/src/test/java/org/apache/wiki/plugin/SamplePlugin3.java
rename to jspwiki-main/src/test/java/org/apache/wiki/plugin/SamplePlugin3.java
diff --git a/jspwiki-war/src/test/java/org/apache/wiki/plugin/TableOfContentsTest.java b/jspwiki-main/src/test/java/org/apache/wiki/plugin/TableOfContentsTest.java
similarity index 100%
rename from jspwiki-war/src/test/java/org/apache/wiki/plugin/TableOfContentsTest.java
rename to jspwiki-main/src/test/java/org/apache/wiki/plugin/TableOfContentsTest.java
diff --git a/jspwiki-war/src/test/java/org/apache/wiki/plugin/UndefinedPagesPluginTest.java b/jspwiki-main/src/test/java/org/apache/wiki/plugin/UndefinedPagesPluginTest.java
similarity index 100%
rename from jspwiki-war/src/test/java/org/apache/wiki/plugin/UndefinedPagesPluginTest.java
rename to jspwiki-main/src/test/java/org/apache/wiki/plugin/UndefinedPagesPluginTest.java
diff --git a/jspwiki-war/src/test/java/org/apache/wiki/providers/BasicAttachmentProviderTest.java b/jspwiki-main/src/test/java/org/apache/wiki/providers/BasicAttachmentProviderTest.java
similarity index 100%
rename from jspwiki-war/src/test/java/org/apache/wiki/providers/BasicAttachmentProviderTest.java
rename to jspwiki-main/src/test/java/org/apache/wiki/providers/BasicAttachmentProviderTest.java
diff --git a/jspwiki-war/src/test/java/org/apache/wiki/providers/CachingProviderTest.java b/jspwiki-main/src/test/java/org/apache/wiki/providers/CachingProviderTest.java
similarity index 100%
rename from jspwiki-war/src/test/java/org/apache/wiki/providers/CachingProviderTest.java
rename to jspwiki-main/src/test/java/org/apache/wiki/providers/CachingProviderTest.java
diff --git a/jspwiki-war/src/test/java/org/apache/wiki/providers/CounterProvider.java b/jspwiki-main/src/test/java/org/apache/wiki/providers/CounterProvider.java
similarity index 100%
rename from jspwiki-war/src/test/java/org/apache/wiki/providers/CounterProvider.java
rename to jspwiki-main/src/test/java/org/apache/wiki/providers/CounterProvider.java
diff --git a/jspwiki-war/src/test/java/org/apache/wiki/providers/FileSystemProviderTest.java b/jspwiki-main/src/test/java/org/apache/wiki/providers/FileSystemProviderTest.java
similarity index 100%
rename from jspwiki-war/src/test/java/org/apache/wiki/providers/FileSystemProviderTest.java
rename to jspwiki-main/src/test/java/org/apache/wiki/providers/FileSystemProviderTest.java
diff --git a/jspwiki-war/src/test/java/org/apache/wiki/providers/VersioningFileProviderTest.java b/jspwiki-main/src/test/java/org/apache/wiki/providers/VersioningFileProviderTest.java
similarity index 100%
rename from jspwiki-war/src/test/java/org/apache/wiki/providers/VersioningFileProviderTest.java
rename to jspwiki-main/src/test/java/org/apache/wiki/providers/VersioningFileProviderTest.java
diff --git a/jspwiki-war/src/test/java/org/apache/wiki/providers/VerySimpleProvider.java b/jspwiki-main/src/test/java/org/apache/wiki/providers/VerySimpleProvider.java
similarity index 100%
rename from jspwiki-war/src/test/java/org/apache/wiki/providers/VerySimpleProvider.java
rename to jspwiki-main/src/test/java/org/apache/wiki/providers/VerySimpleProvider.java
diff --git a/jspwiki-war/src/test/java/org/apache/wiki/render/CreoleRendererTest.java b/jspwiki-main/src/test/java/org/apache/wiki/render/CreoleRendererTest.java
similarity index 100%
rename from jspwiki-war/src/test/java/org/apache/wiki/render/CreoleRendererTest.java
rename to jspwiki-main/src/test/java/org/apache/wiki/render/CreoleRendererTest.java
diff --git a/jspwiki-war/src/test/java/org/apache/wiki/render/RenderingManagerTest.java b/jspwiki-main/src/test/java/org/apache/wiki/render/RenderingManagerTest.java
similarity index 100%
rename from jspwiki-war/src/test/java/org/apache/wiki/render/RenderingManagerTest.java
rename to jspwiki-main/src/test/java/org/apache/wiki/render/RenderingManagerTest.java
diff --git a/jspwiki-war/src/test/java/org/apache/wiki/render/WysiwygEditingRendererTest.java b/jspwiki-main/src/test/java/org/apache/wiki/render/WysiwygEditingRendererTest.java
similarity index 100%
rename from jspwiki-war/src/test/java/org/apache/wiki/render/WysiwygEditingRendererTest.java
rename to jspwiki-main/src/test/java/org/apache/wiki/render/WysiwygEditingRendererTest.java
diff --git a/jspwiki-war/src/test/java/org/apache/wiki/rss/RSSGeneratorTest.java b/jspwiki-main/src/test/java/org/apache/wiki/rss/RSSGeneratorTest.java
similarity index 100%
rename from jspwiki-war/src/test/java/org/apache/wiki/rss/RSSGeneratorTest.java
rename to jspwiki-main/src/test/java/org/apache/wiki/rss/RSSGeneratorTest.java
diff --git a/jspwiki-war/src/test/java/org/apache/wiki/search/SearchManagerTest.java b/jspwiki-main/src/test/java/org/apache/wiki/search/SearchManagerTest.java
similarity index 100%
rename from jspwiki-war/src/test/java/org/apache/wiki/search/SearchManagerTest.java
rename to jspwiki-main/src/test/java/org/apache/wiki/search/SearchManagerTest.java
diff --git a/jspwiki-war/src/test/java/org/apache/wiki/stress/Benchmark.java b/jspwiki-main/src/test/java/org/apache/wiki/stress/Benchmark.java
similarity index 100%
rename from jspwiki-war/src/test/java/org/apache/wiki/stress/Benchmark.java
rename to jspwiki-main/src/test/java/org/apache/wiki/stress/Benchmark.java
diff --git a/jspwiki-war/src/test/java/org/apache/wiki/stress/MassiveRepositoryTest.java b/jspwiki-main/src/test/java/org/apache/wiki/stress/MassiveRepositoryTest.java
similarity index 100%
rename from jspwiki-war/src/test/java/org/apache/wiki/stress/MassiveRepositoryTest.java
rename to jspwiki-main/src/test/java/org/apache/wiki/stress/MassiveRepositoryTest.java
diff --git a/jspwiki-war/src/test/java/org/apache/wiki/stress/StressTestVersioningProvider.java b/jspwiki-main/src/test/java/org/apache/wiki/stress/StressTestVersioningProvider.java
similarity index 100%
rename from jspwiki-war/src/test/java/org/apache/wiki/stress/StressTestVersioningProvider.java
rename to jspwiki-main/src/test/java/org/apache/wiki/stress/StressTestVersioningProvider.java
diff --git a/jspwiki-war/src/test/java/org/apache/wiki/ui/CommandResolverTest.java b/jspwiki-main/src/test/java/org/apache/wiki/ui/CommandResolverTest.java
similarity index 100%
rename from jspwiki-war/src/test/java/org/apache/wiki/ui/CommandResolverTest.java
rename to jspwiki-main/src/test/java/org/apache/wiki/ui/CommandResolverTest.java
diff --git a/jspwiki-war/src/test/java/org/apache/wiki/ui/GroupCommandTest.java b/jspwiki-main/src/test/java/org/apache/wiki/ui/GroupCommandTest.java
similarity index 100%
rename from jspwiki-war/src/test/java/org/apache/wiki/ui/GroupCommandTest.java
rename to jspwiki-main/src/test/java/org/apache/wiki/ui/GroupCommandTest.java
diff --git a/jspwiki-war/src/test/java/org/apache/wiki/ui/InputValidatorTest.java b/jspwiki-main/src/test/java/org/apache/wiki/ui/InputValidatorTest.java
similarity index 100%
rename from jspwiki-war/src/test/java/org/apache/wiki/ui/InputValidatorTest.java
rename to jspwiki-main/src/test/java/org/apache/wiki/ui/InputValidatorTest.java
diff --git a/jspwiki-war/src/test/java/org/apache/wiki/ui/PageCommandTest.java b/jspwiki-main/src/test/java/org/apache/wiki/ui/PageCommandTest.java
similarity index 100%
rename from jspwiki-war/src/test/java/org/apache/wiki/ui/PageCommandTest.java
rename to jspwiki-main/src/test/java/org/apache/wiki/ui/PageCommandTest.java
diff --git a/jspwiki-war/src/test/java/org/apache/wiki/ui/RedirectCommandTest.java b/jspwiki-main/src/test/java/org/apache/wiki/ui/RedirectCommandTest.java
similarity index 100%
rename from jspwiki-war/src/test/java/org/apache/wiki/ui/RedirectCommandTest.java
rename to jspwiki-main/src/test/java/org/apache/wiki/ui/RedirectCommandTest.java
diff --git a/jspwiki-war/src/test/java/org/apache/wiki/ui/WikiCommandTest.java b/jspwiki-main/src/test/java/org/apache/wiki/ui/WikiCommandTest.java
similarity index 100%
rename from jspwiki-war/src/test/java/org/apache/wiki/ui/WikiCommandTest.java
rename to jspwiki-main/src/test/java/org/apache/wiki/ui/WikiCommandTest.java
diff --git a/jspwiki-war/src/test/java/org/apache/wiki/ui/admin/beans/FilterBeanTest.java b/jspwiki-main/src/test/java/org/apache/wiki/ui/admin/beans/FilterBeanTest.java
old mode 100755
new mode 100644
similarity index 97%
rename from jspwiki-war/src/test/java/org/apache/wiki/ui/admin/beans/FilterBeanTest.java
rename to jspwiki-main/src/test/java/org/apache/wiki/ui/admin/beans/FilterBeanTest.java
index a28e7a0..47bf236
--- a/jspwiki-war/src/test/java/org/apache/wiki/ui/admin/beans/FilterBeanTest.java
+++ b/jspwiki-main/src/test/java/org/apache/wiki/ui/admin/beans/FilterBeanTest.java
@@ -1,56 +1,56 @@
-/*
-    Licensed to the Apache Software Foundation (ASF) under one
-    or more contributor license agreements.  See the NOTICE file
-    distributed with this work for additional information
-    regarding copyright ownership.  The ASF licenses this file
-    to you under the Apache License, Version 2.0 (the
-    "License"); you may not use this file except in compliance
-    with the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-    Unless required by applicable law or agreed to in writing,
-    software distributed under the License is distributed on an
-    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-    KIND, either express or implied.  See the License for the
-    specific language governing permissions and limitations
-    under the License.
- */
+/*
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
+ */
 package org.apache.wiki.ui.admin.beans;
 
-import org.junit.jupiter.api.Test;
-
-import java.util.Properties;
-
-import javax.management.NotCompliantMBeanException;
-
-import org.apache.wiki.TestEngine;
-import org.apache.wiki.WikiContext;
-import org.apache.wiki.WikiPage;
-import org.apache.wiki.api.exceptions.WikiException;
-
-import org.junit.jupiter.api.Assertions;
-
-
-public class FilterBeanTest {
-
-    Properties props = TestEngine.getTestProperties();
-
-    TestEngine testEngine;
-
+import org.junit.jupiter.api.Test;
+
+import java.util.Properties;
+
+import javax.management.NotCompliantMBeanException;
+
+import org.apache.wiki.TestEngine;
+import org.apache.wiki.WikiContext;
+import org.apache.wiki.WikiPage;
+import org.apache.wiki.api.exceptions.WikiException;
+
+import org.junit.jupiter.api.Assertions;
+
+
+public class FilterBeanTest {
+
+    Properties props = TestEngine.getTestProperties();
+
+    TestEngine testEngine;
+
     @Test
-    public void testDoGet() throws WikiException, NotCompliantMBeanException {
-        testEngine = new TestEngine( props );
-        WikiContext context = new WikiContext( testEngine, new WikiPage( testEngine, "TestPage01" ) );
-        FilterBean pb = new FilterBean( testEngine );
-        String expectedHtml = "<div>" +
-                                "<h4>Filters</h4>" +
-                                "<table border=\"1\">" +
-                                  "<tr><th>Name</th><th>Author</th><th>Notes</th></tr>" +
-                                  "<tr><td>org.apache.wiki.filters.SpamFilter</td><td>Janne Jalkanen</td><td></td></tr>" +
-                                "</table>" +
-                              "</div>";
-        Assertions.assertEquals( expectedHtml, pb.doGet( context ) );
-    }
-
-}
+    public void testDoGet() throws WikiException, NotCompliantMBeanException {
+        testEngine = new TestEngine( props );
+        WikiContext context = new WikiContext( testEngine, new WikiPage( testEngine, "TestPage01" ) );
+        FilterBean pb = new FilterBean( testEngine );
+        String expectedHtml = "<div>" +
+                                "<h4>Filters</h4>" +
+                                "<table border=\"1\">" +
+                                  "<tr><th>Name</th><th>Author</th><th>Notes</th></tr>" +
+                                  "<tr><td>org.apache.wiki.filters.SpamFilter</td><td>Janne Jalkanen</td><td></td></tr>" +
+                                "</table>" +
+                              "</div>";
+        Assertions.assertEquals( expectedHtml, pb.doGet( context ) );
+    }
+
+}
diff --git a/jspwiki-war/src/test/java/org/apache/wiki/ui/admin/beans/PluginBeanTest.java b/jspwiki-main/src/test/java/org/apache/wiki/ui/admin/beans/PluginBeanTest.java
similarity index 97%
rename from jspwiki-war/src/test/java/org/apache/wiki/ui/admin/beans/PluginBeanTest.java
rename to jspwiki-main/src/test/java/org/apache/wiki/ui/admin/beans/PluginBeanTest.java
index 9c36191..8d14153 100644
--- a/jspwiki-war/src/test/java/org/apache/wiki/ui/admin/beans/PluginBeanTest.java
+++ b/jspwiki-main/src/test/java/org/apache/wiki/ui/admin/beans/PluginBeanTest.java
@@ -1,59 +1,59 @@
-/* 
-    Licensed to the Apache Software Foundation (ASF) under one
-    or more contributor license agreements.  See the NOTICE file
-    distributed with this work for additional information
-    regarding copyright ownership.  The ASF licenses this file
-    to you under the Apache License, Version 2.0 (the
-    "License"); you may not use this file except in compliance
-    with the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-    Unless required by applicable law or agreed to in writing,
-    software distributed under the License is distributed on an
-    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-    KIND, either express or implied.  See the License for the
-    specific language governing permissions and limitations
-    under the License.  
- */
+/* 
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.  
+ */
 package org.apache.wiki.ui.admin.beans;
 
-import org.junit.jupiter.api.Test;
-
-import java.util.Properties;
-
-import javax.management.NotCompliantMBeanException;
-
-import org.junit.jupiter.api.Assertions;
-
-import org.apache.wiki.TestEngine;
-import org.apache.wiki.WikiContext;
-import org.apache.wiki.WikiPage;
-import org.apache.wiki.api.exceptions.WikiException;
-
-
-public class PluginBeanTest {
-    
-    Properties props = TestEngine.getTestProperties();
-
-    TestEngine testEngine;
-    
+import org.junit.jupiter.api.Test;
+
+import java.util.Properties;
+
+import javax.management.NotCompliantMBeanException;
+
+import org.junit.jupiter.api.Assertions;
+
+import org.apache.wiki.TestEngine;
+import org.apache.wiki.WikiContext;
+import org.apache.wiki.WikiPage;
+import org.apache.wiki.api.exceptions.WikiException;
+
+
+public class PluginBeanTest {
+    
+    Properties props = TestEngine.getTestProperties();
+
+    TestEngine testEngine;
+    
     @Test
-    public void testDoGet() throws WikiException, NotCompliantMBeanException {
-        testEngine = new TestEngine( props );
-        WikiContext context = new WikiContext( testEngine, new WikiPage( testEngine, "TestPage01" ) );
-        PluginBean pb = new PluginBean( testEngine );
-        String expectedHtml = "<div>" +
-                                "<h4>Plugins</h4>" +
-                                "<table border=\"1\">" +
-                                  "<tr><th>Name</th><th>Alias</th><th>Author</th><th>Notes</th></tr>" +
-                                  "<tr><td>IfPlugin</td><td>If</td><td>Janne Jalkanen</td><td></td></tr>" +
-                                  "<tr><td>Note</td><td></td><td>Janne Jalkanen</td><td></td></tr>" +
-                                  "<tr><td>SamplePlugin</td><td>samplealias</td><td>Janne Jalkanen</td><td></td></tr>" +
-                                  "<tr><td>SamplePlugin2</td><td>samplealias2</td><td>Janne Jalkanen</td><td></td></tr>" +
-                                "</table>" +
-                              "</div>";
-        Assertions.assertEquals( expectedHtml, pb.doGet( context ) );
-    }
-
-}
+    public void testDoGet() throws WikiException, NotCompliantMBeanException {
+        testEngine = new TestEngine( props );
+        WikiContext context = new WikiContext( testEngine, new WikiPage( testEngine, "TestPage01" ) );
+        PluginBean pb = new PluginBean( testEngine );
+        String expectedHtml = "<div>" +
+                                "<h4>Plugins</h4>" +
+                                "<table border=\"1\">" +
+                                  "<tr><th>Name</th><th>Alias</th><th>Author</th><th>Notes</th></tr>" +
+                                  "<tr><td>IfPlugin</td><td>If</td><td>Janne Jalkanen</td><td></td></tr>" +
+                                  "<tr><td>Note</td><td></td><td>Janne Jalkanen</td><td></td></tr>" +
+                                  "<tr><td>SamplePlugin</td><td>samplealias</td><td>Janne Jalkanen</td><td></td></tr>" +
+                                  "<tr><td>SamplePlugin2</td><td>samplealias2</td><td>Janne Jalkanen</td><td></td></tr>" +
+                                "</table>" +
+                              "</div>";
+        Assertions.assertEquals( expectedHtml, pb.doGet( context ) );
+    }
+
+}
diff --git a/jspwiki-war/src/test/java/org/apache/wiki/url/DefaultURLConstructorTest.java b/jspwiki-main/src/test/java/org/apache/wiki/url/DefaultURLConstructorTest.java
similarity index 100%
rename from jspwiki-war/src/test/java/org/apache/wiki/url/DefaultURLConstructorTest.java
rename to jspwiki-main/src/test/java/org/apache/wiki/url/DefaultURLConstructorTest.java
diff --git a/jspwiki-war/src/test/java/org/apache/wiki/url/ShortURLConstructorTest.java b/jspwiki-main/src/test/java/org/apache/wiki/url/ShortURLConstructorTest.java
similarity index 100%
rename from jspwiki-war/src/test/java/org/apache/wiki/url/ShortURLConstructorTest.java
rename to jspwiki-main/src/test/java/org/apache/wiki/url/ShortURLConstructorTest.java
diff --git a/jspwiki-war/src/test/java/org/apache/wiki/url/ShortViewURLConstructorTest.java b/jspwiki-main/src/test/java/org/apache/wiki/url/ShortViewURLConstructorTest.java
similarity index 100%
rename from jspwiki-war/src/test/java/org/apache/wiki/url/ShortViewURLConstructorTest.java
rename to jspwiki-main/src/test/java/org/apache/wiki/url/ShortViewURLConstructorTest.java
diff --git a/jspwiki-war/src/test/java/org/apache/wiki/util/ByteUtilsTest.java b/jspwiki-main/src/test/java/org/apache/wiki/util/ByteUtilsTest.java
similarity index 100%
rename from jspwiki-war/src/test/java/org/apache/wiki/util/ByteUtilsTest.java
rename to jspwiki-main/src/test/java/org/apache/wiki/util/ByteUtilsTest.java
diff --git a/jspwiki-war/src/test/java/org/apache/wiki/util/ClassUtilTest.java b/jspwiki-main/src/test/java/org/apache/wiki/util/ClassUtilTest.java
similarity index 100%
rename from jspwiki-war/src/test/java/org/apache/wiki/util/ClassUtilTest.java
rename to jspwiki-main/src/test/java/org/apache/wiki/util/ClassUtilTest.java
diff --git a/jspwiki-war/src/test/java/org/apache/wiki/util/CommentedPropertiesTest.java b/jspwiki-main/src/test/java/org/apache/wiki/util/CommentedPropertiesTest.java
similarity index 100%
rename from jspwiki-war/src/test/java/org/apache/wiki/util/CommentedPropertiesTest.java
rename to jspwiki-main/src/test/java/org/apache/wiki/util/CommentedPropertiesTest.java
diff --git a/jspwiki-war/src/test/java/org/apache/wiki/util/CryptoUtilTest.java b/jspwiki-main/src/test/java/org/apache/wiki/util/CryptoUtilTest.java
similarity index 100%
rename from jspwiki-war/src/test/java/org/apache/wiki/util/CryptoUtilTest.java
rename to jspwiki-main/src/test/java/org/apache/wiki/util/CryptoUtilTest.java
diff --git a/jspwiki-war/src/test/java/org/apache/wiki/util/FileUtilTest.java b/jspwiki-main/src/test/java/org/apache/wiki/util/FileUtilTest.java
similarity index 100%
rename from jspwiki-war/src/test/java/org/apache/wiki/util/FileUtilTest.java
rename to jspwiki-main/src/test/java/org/apache/wiki/util/FileUtilTest.java
diff --git a/jspwiki-war/src/test/java/org/apache/wiki/util/MailUtilTest.java b/jspwiki-main/src/test/java/org/apache/wiki/util/MailUtilTest.java
similarity index 100%
rename from jspwiki-war/src/test/java/org/apache/wiki/util/MailUtilTest.java
rename to jspwiki-main/src/test/java/org/apache/wiki/util/MailUtilTest.java
diff --git a/jspwiki-war/src/test/java/org/apache/wiki/util/PriorityListTest.java b/jspwiki-main/src/test/java/org/apache/wiki/util/PriorityListTest.java
similarity index 100%
rename from jspwiki-war/src/test/java/org/apache/wiki/util/PriorityListTest.java
rename to jspwiki-main/src/test/java/org/apache/wiki/util/PriorityListTest.java
diff --git a/jspwiki-war/src/test/java/org/apache/wiki/util/PropertyReaderTest.java b/jspwiki-main/src/test/java/org/apache/wiki/util/PropertyReaderTest.java
similarity index 100%
rename from jspwiki-war/src/test/java/org/apache/wiki/util/PropertyReaderTest.java
rename to jspwiki-main/src/test/java/org/apache/wiki/util/PropertyReaderTest.java
diff --git a/jspwiki-war/src/test/java/org/apache/wiki/util/SerializerTest.java b/jspwiki-main/src/test/java/org/apache/wiki/util/SerializerTest.java
similarity index 100%
rename from jspwiki-war/src/test/java/org/apache/wiki/util/SerializerTest.java
rename to jspwiki-main/src/test/java/org/apache/wiki/util/SerializerTest.java
diff --git a/jspwiki-war/src/test/java/org/apache/wiki/util/TextUtilTest.java b/jspwiki-main/src/test/java/org/apache/wiki/util/TextUtilTest.java
similarity index 100%
rename from jspwiki-war/src/test/java/org/apache/wiki/util/TextUtilTest.java
rename to jspwiki-main/src/test/java/org/apache/wiki/util/TextUtilTest.java
diff --git a/jspwiki-war/src/test/java/org/apache/wiki/util/TimedCounterListTest.java b/jspwiki-main/src/test/java/org/apache/wiki/util/TimedCounterListTest.java
similarity index 100%
rename from jspwiki-war/src/test/java/org/apache/wiki/util/TimedCounterListTest.java
rename to jspwiki-main/src/test/java/org/apache/wiki/util/TimedCounterListTest.java
diff --git a/jspwiki-war/src/test/java/org/apache/wiki/util/XmlUtilTest.java b/jspwiki-main/src/test/java/org/apache/wiki/util/XmlUtilTest.java
similarity index 97%
rename from jspwiki-war/src/test/java/org/apache/wiki/util/XmlUtilTest.java
rename to jspwiki-main/src/test/java/org/apache/wiki/util/XmlUtilTest.java
index 598e445..40fe6c2 100644
--- a/jspwiki-war/src/test/java/org/apache/wiki/util/XmlUtilTest.java
+++ b/jspwiki-main/src/test/java/org/apache/wiki/util/XmlUtilTest.java
@@ -1,86 +1,86 @@
-/*
-    Licensed to the Apache Software Foundation (ASF) under one
-    or more contributor license agreements.  See the NOTICE file
-    distributed with this work for additional information
-    regarding copyright ownership.  The ASF licenses this file
-    to you under the Apache License, Version 2.0 (the
-    "License"); you may not use this file except in compliance
-    with the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-    Unless required by applicable law or agreed to in writing,
-    software distributed under the License is distributed on an
-    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-    KIND, either express or implied.  See the License for the
-    specific language governing permissions and limitations
-    under the License.
- */
-package org.apache.wiki.util;
-
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileNotFoundException;
-import java.io.InputStream;
-import java.util.List;
-
-import org.apache.commons.io.IOUtils;
-import org.apache.wiki.modules.ModuleManager;
-import org.jdom2.Element;
-import org.junit.jupiter.api.Assertions;
-import org.junit.jupiter.api.Test;
-
-public class XmlUtilTest {
-
+/*
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
+ */
+package org.apache.wiki.util;
+
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileNotFoundException;
+import java.io.InputStream;
+import java.util.List;
+
+import org.apache.commons.io.IOUtils;
+import org.apache.wiki.modules.ModuleManager;
+import org.jdom2.Element;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
+
+public class XmlUtilTest {
+
     @Test
-    public void testParseFromClasspath() {
-    	List< Element > elements = XmlUtil.parse( ModuleManager.PLUGIN_RESOURCE_LOCATION, "/modules/plugin" );
-    	Assertions.assertEquals( 4, elements.size() ); // 2 on src/main/resources, another 2 on src/test/resources
-
-    	elements = XmlUtil.parse( ModuleManager.PLUGIN_RESOURCE_LOCATION, "/modules/filter" );
-    	Assertions.assertEquals( 1, elements.size() );
-
-     	elements = XmlUtil.parse( ModuleManager.PLUGIN_RESOURCE_LOCATION, "/modules/editor" );
-     	Assertions.assertEquals( 2, elements.size() );
-
-     	elements = XmlUtil.parse( ModuleManager.PLUGIN_RESOURCE_LOCATION, "/modules/heck" );
-     	Assertions.assertEquals( 0, elements.size() );
-
-     	elements = XmlUtil.parse( "doesnt/exist.this", "/modules/editor" );
-     	Assertions.assertEquals( 0, elements.size() );
-
-     	elements = XmlUtil.parse( ( String )null, "/modules/editor" );
-     	Assertions.assertEquals( 0, elements.size() );
-
-     	elements = XmlUtil.parse( ModuleManager.PLUGIN_RESOURCE_LOCATION, null );
-     	Assertions.assertEquals( 0, elements.size() );
-
-     	elements = XmlUtil.parse( ClassUtil.MAPPINGS, "/classmappings/mapping" );
-     	Assertions.assertEquals( 19, elements.size() );
-    }
-
+    public void testParseFromClasspath() {
+    	List< Element > elements = XmlUtil.parse( ModuleManager.PLUGIN_RESOURCE_LOCATION, "/modules/plugin" );
+    	Assertions.assertEquals( 4, elements.size() ); // 2 on src/main/resources, another 2 on src/test/resources
+
+    	elements = XmlUtil.parse( ModuleManager.PLUGIN_RESOURCE_LOCATION, "/modules/filter" );
+    	Assertions.assertEquals( 1, elements.size() );
+
+     	elements = XmlUtil.parse( ModuleManager.PLUGIN_RESOURCE_LOCATION, "/modules/editor" );
+     	Assertions.assertEquals( 2, elements.size() );
+
+     	elements = XmlUtil.parse( ModuleManager.PLUGIN_RESOURCE_LOCATION, "/modules/heck" );
+     	Assertions.assertEquals( 0, elements.size() );
+
+     	elements = XmlUtil.parse( "doesnt/exist.this", "/modules/editor" );
+     	Assertions.assertEquals( 0, elements.size() );
+
+     	elements = XmlUtil.parse( ( String )null, "/modules/editor" );
+     	Assertions.assertEquals( 0, elements.size() );
+
+     	elements = XmlUtil.parse( ModuleManager.PLUGIN_RESOURCE_LOCATION, null );
+     	Assertions.assertEquals( 0, elements.size() );
+
+     	elements = XmlUtil.parse( ClassUtil.MAPPINGS, "/classmappings/mapping" );
+     	Assertions.assertEquals( 19, elements.size() );
+    }
+
     @Test
-    public void testParseFromStream() throws FileNotFoundException {
-    	InputStream is = new FileInputStream( new File ("./src/test/resources/ini/jspwiki_module.xml" ) );
-    	List< Element > elements = XmlUtil.parse( is, "/modules/plugin" );
-    	Assertions.assertEquals( 2, elements.size() );
-
-    	elements = XmlUtil.parse( is, "/modules/filter" );
-    	Assertions.assertEquals( 0, elements.size() );
-
-     	elements = XmlUtil.parse( is, "/modules/editor" );
-     	Assertions.assertEquals( 0, elements.size() );
-
-     	elements = XmlUtil.parse( is, "/modules/heck" );
-     	Assertions.assertEquals( 0, elements.size() );
-
-     	elements = XmlUtil.parse( ( InputStream )null, "/modules/editor" );
-     	Assertions.assertEquals( 0, elements.size() );
-
-     	elements = XmlUtil.parse( is, null );
-     	Assertions.assertEquals( 0, elements.size() );
-
-     	IOUtils.closeQuietly( is );
-    }
-
-}
+    public void testParseFromStream() throws FileNotFoundException {
+    	InputStream is = new FileInputStream( new File ("./src/test/resources/ini/jspwiki_module.xml" ) );
+    	List< Element > elements = XmlUtil.parse( is, "/modules/plugin" );
+    	Assertions.assertEquals( 2, elements.size() );
+
+    	elements = XmlUtil.parse( is, "/modules/filter" );
+    	Assertions.assertEquals( 0, elements.size() );
+
+     	elements = XmlUtil.parse( is, "/modules/editor" );
+     	Assertions.assertEquals( 0, elements.size() );
+
+     	elements = XmlUtil.parse( is, "/modules/heck" );
+     	Assertions.assertEquals( 0, elements.size() );
+
+     	elements = XmlUtil.parse( ( InputStream )null, "/modules/editor" );
+     	Assertions.assertEquals( 0, elements.size() );
+
+     	elements = XmlUtil.parse( is, null );
+     	Assertions.assertEquals( 0, elements.size() );
+
+     	IOUtils.closeQuietly( is );
+    }
+
+}
diff --git a/jspwiki-war/src/test/java/org/apache/wiki/util/comparators/HumanComparatorTest.java b/jspwiki-main/src/test/java/org/apache/wiki/util/comparators/HumanComparatorTest.java
similarity index 100%
rename from jspwiki-war/src/test/java/org/apache/wiki/util/comparators/HumanComparatorTest.java
rename to jspwiki-main/src/test/java/org/apache/wiki/util/comparators/HumanComparatorTest.java
diff --git a/jspwiki-war/src/test/java/org/apache/wiki/web/StreamRedirector.java b/jspwiki-main/src/test/java/org/apache/wiki/web/StreamRedirector.java
similarity index 100%
rename from jspwiki-war/src/test/java/org/apache/wiki/web/StreamRedirector.java
rename to jspwiki-main/src/test/java/org/apache/wiki/web/StreamRedirector.java
diff --git a/jspwiki-war/src/test/java/org/apache/wiki/web/TestContainer.java b/jspwiki-main/src/test/java/org/apache/wiki/web/TestContainer.java
old mode 100755
new mode 100644
similarity index 100%
rename from jspwiki-war/src/test/java/org/apache/wiki/web/TestContainer.java
rename to jspwiki-main/src/test/java/org/apache/wiki/web/TestContainer.java
diff --git a/jspwiki-war/src/test/java/org/apache/wiki/workflow/ApprovalWorkflowTest.java b/jspwiki-main/src/test/java/org/apache/wiki/workflow/ApprovalWorkflowTest.java
similarity index 100%
rename from jspwiki-war/src/test/java/org/apache/wiki/workflow/ApprovalWorkflowTest.java
rename to jspwiki-main/src/test/java/org/apache/wiki/workflow/ApprovalWorkflowTest.java
diff --git a/jspwiki-war/src/test/java/org/apache/wiki/workflow/DecisionQueueTest.java b/jspwiki-main/src/test/java/org/apache/wiki/workflow/DecisionQueueTest.java
similarity index 100%
rename from jspwiki-war/src/test/java/org/apache/wiki/workflow/DecisionQueueTest.java
rename to jspwiki-main/src/test/java/org/apache/wiki/workflow/DecisionQueueTest.java
diff --git a/jspwiki-war/src/test/java/org/apache/wiki/workflow/FactTest.java b/jspwiki-main/src/test/java/org/apache/wiki/workflow/FactTest.java
similarity index 100%
rename from jspwiki-war/src/test/java/org/apache/wiki/workflow/FactTest.java
rename to jspwiki-main/src/test/java/org/apache/wiki/workflow/FactTest.java
diff --git a/jspwiki-war/src/test/java/org/apache/wiki/workflow/OutcomeTest.java b/jspwiki-main/src/test/java/org/apache/wiki/workflow/OutcomeTest.java
similarity index 100%
rename from jspwiki-war/src/test/java/org/apache/wiki/workflow/OutcomeTest.java
rename to jspwiki-main/src/test/java/org/apache/wiki/workflow/OutcomeTest.java
diff --git a/jspwiki-war/src/test/java/org/apache/wiki/workflow/SimpleDecisionTest.java b/jspwiki-main/src/test/java/org/apache/wiki/workflow/SimpleDecisionTest.java
similarity index 100%
rename from jspwiki-war/src/test/java/org/apache/wiki/workflow/SimpleDecisionTest.java
rename to jspwiki-main/src/test/java/org/apache/wiki/workflow/SimpleDecisionTest.java
diff --git a/jspwiki-war/src/test/java/org/apache/wiki/workflow/TaskTest.java b/jspwiki-main/src/test/java/org/apache/wiki/workflow/TaskTest.java
similarity index 100%
rename from jspwiki-war/src/test/java/org/apache/wiki/workflow/TaskTest.java
rename to jspwiki-main/src/test/java/org/apache/wiki/workflow/TaskTest.java
diff --git a/jspwiki-war/src/test/java/org/apache/wiki/workflow/WorkflowManagerTest.java b/jspwiki-main/src/test/java/org/apache/wiki/workflow/WorkflowManagerTest.java
similarity index 100%
rename from jspwiki-war/src/test/java/org/apache/wiki/workflow/WorkflowManagerTest.java
rename to jspwiki-main/src/test/java/org/apache/wiki/workflow/WorkflowManagerTest.java
diff --git a/jspwiki-war/src/test/java/org/apache/wiki/workflow/WorkflowTest.java b/jspwiki-main/src/test/java/org/apache/wiki/workflow/WorkflowTest.java
similarity index 100%
rename from jspwiki-war/src/test/java/org/apache/wiki/workflow/WorkflowTest.java
rename to jspwiki-main/src/test/java/org/apache/wiki/workflow/WorkflowTest.java
diff --git a/jspwiki-war/src/test/java/org/apache/wiki/xmlrpc/RPCHandlerTest.java b/jspwiki-main/src/test/java/org/apache/wiki/xmlrpc/RPCHandlerTest.java
similarity index 100%
rename from jspwiki-war/src/test/java/org/apache/wiki/xmlrpc/RPCHandlerTest.java
rename to jspwiki-main/src/test/java/org/apache/wiki/xmlrpc/RPCHandlerTest.java
diff --git a/jspwiki-war/src/test/resources/TestPlugins.txt b/jspwiki-main/src/test/resources/TestPlugins.txt
similarity index 97%
rename from jspwiki-war/src/test/resources/TestPlugins.txt
rename to jspwiki-main/src/test/resources/TestPlugins.txt
index a6a634a..eb85022 100644
--- a/jspwiki-war/src/test/resources/TestPlugins.txt
+++ b/jspwiki-main/src/test/resources/TestPlugins.txt
@@ -1,183 +1,183 @@
-#  Licensed to the Apache Software Foundation (ASF) under one
-#  or more contributor license agreements.  See the NOTICE file
-#  distributed with this work for additional information
-#  regarding copyright ownership.  The ASF licenses this file
-#  to you under the Apache License, Version 2.0 (the
-#  "License"); you may not use this file except in compliance
-#  with the License.  You may obtain a copy of the License at
-#
-#    http://www.apache.org/licenses/LICENSE-2.0
-#
-#  Unless required by applicable law or agreed to in writing,
-#  software distributed under the License is distributed on an
-#  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-#  KIND, either express or implied.  See the License for the
-#  specific language governing permissions and limitations
-#  under the License.
-
-Since v1.6.3 you can now define your own plugins.  These are just
-simply Java classes that implement the
-''org.apache.wiki.plugin.WikiPlugin'' interface and can be found from
-somewhere in your class path.  The plugins work so that when you write
-a special code on the Wiki page, the plugins are invoked and their
-output is inserted into the page, verbatim.
-
-The form is:
-
-  [[{INSERT <plugin class> WHERE <param1=value1>,<param2=value2>,...}]
-
-You can also use a shortcut: instead of using {{[[{INSERT org.apache.wiki.plugin.RecentChangesPlugin}} you can also use {{[[{INSERT RecentChangesPlugin}]}}.  This works only with the plugins that come with JSPWiki, though.
-
-In addition, you can now (since 1.9.30) omit even the "INSERT", so the shortest possible version for plugins becomes:
-
-[[{CurrentTimePlugin}]
-
-If a parameter contains spaces, you can use single quotes (') around the parameter.  Like this:
-
-[[{INSERT CurrentTimePlugin format='dd MM yyyy'}]
-
-Here are some sample plugins included in the archive:
-
-----
-
-!!RecentChangesPlugin
-
-Inserts the latest changes in order. 
-
-!Parameters: 
-* __since__=''n'' : show changes from the last n days.
-* __format__=''(full|compact)'' : if "full", then display a long
-  version with all possible info.  If "compact", then be as compact as possible.
-
-!Example:
-{{{
-[{INSERT RecentChangesPlugin since=5, format=compact}]
-}}}
-
-Inserts the changes from the past 5 days in a compact format.  You
-might use this to make an automatical list of changes to the [LeftMenu], or [LeftMenuFooter], for example.
-
-----
-  
-!!UnusedPagesPlugin
-
-Lists all pages that are not currently referred to by any other page, thus meaning they are inaccessible through any other means.
-
-!Parameters
-
-* __maxwidth__=''n'' : Limits the length of the generated links to at most ''n'' characters.  This should used to keep the [LeftMenu] or [LeftMenuFooter] at a manageable width.  Default is to not limit the length at all.
-
-
-!Example:
-
-See [UnusedPages].
-
-----
-
-!!UndefinedPagesPlugin
-
-Lists all pages that are referred to, but not yet created.
-
-!Parameters
-
-* __maxwidth__=''n'' : Limits the length of the generated links to at most ''n'' characters.  This should used to keep the [LeftMenu] or [LeftMenuFooter] at a manageable width.  Default is to not limit the length at all.
-
-!Example:
-
-See [UndefinedPages].
-
-----
-
-
-!!ReferringPagesPlugin
-
-Finds and lists all pages that refer to the current page.
-
-!Parameters 
-
-* __max__=''n'' : How many pages to list.  Default is 10. Some pages might create very long lists, so it's a good idea to limit the list size.
-* __maxwidth__=''n'' : Limits the length of the generated links to at most ''n'' characters.  This should used to keep the [LeftMenu] or [LeftMenuFooter] at a manageable width.  Default is to not limit the length at all.
-
-!Example
-
-See [LeftMenuFooter].
-
-----
-
-!!CurrentTimePlugin
-
-Just displays the current server time.
-
-!Parameters
-
-* __format__=''format string'' : How the date and time should be formatted.  If you omit this, a default format will be used. The following characters are available to you:
-
-{{{
- Symbol   Meaning                 Presentation        Example
- ------   -------                 ------------        -------
- G        era designator          (Text)              AD
- y        year                    (Number)            1996
- M        month in year           (Text & Number)     July & 07
- d        day in month            (Number)            10
- h        hour in am/pm (1~12)    (Number)            12
- H        hour in day (0~23)      (Number)            0
- m        minute in hour          (Number)            30
- s        second in minute        (Number)            55
- S        millisecond             (Number)            978
- E        day in week             (Text)              Tuesday
- D        day in year             (Number)            189
- F        day of week in month    (Number)            2 (2nd Wed in July)
- w        week in year            (Number)            27
- W        week in month           (Number)            2
- a        am/pm marker            (Text)              PM
- k        hour in day (1~24)      (Number)            24
- K        hour in am/pm (0~11)    (Number)            0
- z        time zone               (Text)              Pacific Standard Time
- \'       escape for text         (Delimiter)
- \''      single quote            (Literal)           '
-}}}
-
-For example, two 'y':s give you the year using two digits.  Four 'y':s give you the year in four digits.  Three 'M':s give you the month in letters, whereas two 'M':s give just the month number.
-
-(Yes, these are exactly the Java [SimpleDateFormat|http://java.sun.com/j2se/1.3/docs/api/java/text/SimpleDateFormat.html] arguments.  Sorry for copying them in.)
-
-!Example
-
-Using [[{INSERT CurrentTimePlugin format='yyyy.MM.dd G \'at\' hh:mm:ss z'}] would give you:
-
-[{INSERT CurrentTimePlugin format='yyyy.MM.dd G \'at\' hh:mm:ss z'}]
-
-----
-
-!!IndexPlugin
-
-Displays all of the pages in this Wiki in alphabetical order.  IndexPlugin has been contributed by AlainRavet.
-
-!Parameters
-* __itemsPerLine__ = ''n''.  Break every 'n' items on line.
-
-!Example
-
-See [PageIndex].
-
-----
-
-!!Counter
-
-A simple counter that starts counting at 1 at the top of the page, and each time it is invoked, will increase its value by one.   These counters are transient, and relative to the current page view only - i.e. two persons viewing the same page at the same time get their own counters.
-
-The current counter value is accessible also as a [WikiVariable].  The name of the variable is "counter", or "counter-<name>", if you have defined a counter name.
-
-!Parameters
-
-* __name__ = ''counter name''.  You may define as many counters per page as you want; you just need to separate them with the ''counter name''
-
-!Example
-
-[[{Counter}], [[{Counter}], [[{Counter}], [[{Counter name='aa'}] produces
-
-[{Counter}], [{Counter}], [{Counter}], [{Counter name='aa'}].
-
-The value of "counter" at the end is [{$counter}] and the value of "counter-aa" is [{$counter-aa}].
-
-
+#  Licensed to the Apache Software Foundation (ASF) under one
+#  or more contributor license agreements.  See the NOTICE file
+#  distributed with this work for additional information
+#  regarding copyright ownership.  The ASF licenses this file
+#  to you under the Apache License, Version 2.0 (the
+#  "License"); you may not use this file except in compliance
+#  with the License.  You may obtain a copy of the License at
+#
+#    http://www.apache.org/licenses/LICENSE-2.0
+#
+#  Unless required by applicable law or agreed to in writing,
+#  software distributed under the License is distributed on an
+#  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+#  KIND, either express or implied.  See the License for the
+#  specific language governing permissions and limitations
+#  under the License.
+
+Since v1.6.3 you can now define your own plugins.  These are just
+simply Java classes that implement the
+''org.apache.wiki.plugin.WikiPlugin'' interface and can be found from
+somewhere in your class path.  The plugins work so that when you write
+a special code on the Wiki page, the plugins are invoked and their
+output is inserted into the page, verbatim.
+
+The form is:
+
+  [[{INSERT <plugin class> WHERE <param1=value1>,<param2=value2>,...}]
+
+You can also use a shortcut: instead of using {{[[{INSERT org.apache.wiki.plugin.RecentChangesPlugin}} you can also use {{[[{INSERT RecentChangesPlugin}]}}.  This works only with the plugins that come with JSPWiki, though.
+
+In addition, you can now (since 1.9.30) omit even the "INSERT", so the shortest possible version for plugins becomes:
+
+[[{CurrentTimePlugin}]
+
+If a parameter contains spaces, you can use single quotes (') around the parameter.  Like this:
+
+[[{INSERT CurrentTimePlugin format='dd MM yyyy'}]
+
+Here are some sample plugins included in the archive:
+
+----
+
+!!RecentChangesPlugin
+
+Inserts the latest changes in order. 
+
+!Parameters: 
+* __since__=''n'' : show changes from the last n days.
+* __format__=''(full|compact)'' : if "full", then display a long
+  version with all possible info.  If "compact", then be as compact as possible.
+
+!Example:
+{{{
+[{INSERT RecentChangesPlugin since=5, format=compact}]
+}}}
+
+Inserts the changes from the past 5 days in a compact format.  You
+might use this to make an automatical list of changes to the [LeftMenu], or [LeftMenuFooter], for example.
+
+----
+  
+!!UnusedPagesPlugin
+
+Lists all pages that are not currently referred to by any other page, thus meaning they are inaccessible through any other means.
+
+!Parameters
+
+* __maxwidth__=''n'' : Limits the length of the generated links to at most ''n'' characters.  This should used to keep the [LeftMenu] or [LeftMenuFooter] at a manageable width.  Default is to not limit the length at all.
+
+
+!Example:
+
+See [UnusedPages].
+
+----
+
+!!UndefinedPagesPlugin
+
+Lists all pages that are referred to, but not yet created.
+
+!Parameters
+
+* __maxwidth__=''n'' : Limits the length of the generated links to at most ''n'' characters.  This should used to keep the [LeftMenu] or [LeftMenuFooter] at a manageable width.  Default is to not limit the length at all.
+
+!Example:
+
+See [UndefinedPages].
+
+----
+
+
+!!ReferringPagesPlugin
+
+Finds and lists all pages that refer to the current page.
+
+!Parameters 
+
+* __max__=''n'' : How many pages to list.  Default is 10. Some pages might create very long lists, so it's a good idea to limit the list size.
+* __maxwidth__=''n'' : Limits the length of the generated links to at most ''n'' characters.  This should used to keep the [LeftMenu] or [LeftMenuFooter] at a manageable width.  Default is to not limit the length at all.
+
+!Example
+
+See [LeftMenuFooter].
+
+----
+
+!!CurrentTimePlugin
+
+Just displays the current server time.
+
+!Parameters
+
+* __format__=''format string'' : How the date and time should be formatted.  If you omit this, a default format will be used. The following characters are available to you:
+
+{{{
+ Symbol   Meaning                 Presentation        Example
+ ------   -------                 ------------        -------
+ G        era designator          (Text)              AD
+ y        year                    (Number)            1996
+ M        month in year           (Text & Number)     July & 07
+ d        day in month            (Number)            10
+ h        hour in am/pm (1~12)    (Number)            12
+ H        hour in day (0~23)      (Number)            0
+ m        minute in hour          (Number)            30
+ s        second in minute        (Number)            55
+ S        millisecond             (Number)            978
+ E        day in week             (Text)              Tuesday
+ D        day in year             (Number)            189
+ F        day of week in month    (Number)            2 (2nd Wed in July)
+ w        week in year            (Number)            27
+ W        week in month           (Number)            2
+ a        am/pm marker            (Text)              PM
+ k        hour in day (1~24)      (Number)            24
+ K        hour in am/pm (0~11)    (Number)            0
+ z        time zone               (Text)              Pacific Standard Time
+ \'       escape for text         (Delimiter)
+ \''      single quote            (Literal)           '
+}}}
+
+For example, two 'y':s give you the year using two digits.  Four 'y':s give you the year in four digits.  Three 'M':s give you the month in letters, whereas two 'M':s give just the month number.
+
+(Yes, these are exactly the Java [SimpleDateFormat|http://java.sun.com/j2se/1.3/docs/api/java/text/SimpleDateFormat.html] arguments.  Sorry for copying them in.)
+
+!Example
+
+Using [[{INSERT CurrentTimePlugin format='yyyy.MM.dd G \'at\' hh:mm:ss z'}] would give you:
+
+[{INSERT CurrentTimePlugin format='yyyy.MM.dd G \'at\' hh:mm:ss z'}]
+
+----
+
+!!IndexPlugin
+
+Displays all of the pages in this Wiki in alphabetical order.  IndexPlugin has been contributed by AlainRavet.
+
+!Parameters
+* __itemsPerLine__ = ''n''.  Break every 'n' items on line.
+
+!Example
+
+See [PageIndex].
+
+----
+
+!!Counter
+
+A simple counter that starts counting at 1 at the top of the page, and each time it is invoked, will increase its value by one.   These counters are transient, and relative to the current page view only - i.e. two persons viewing the same page at the same time get their own counters.
+
+The current counter value is accessible also as a [WikiVariable].  The name of the variable is "counter", or "counter-<name>", if you have defined a counter name.
+
+!Parameters
+
+* __name__ = ''counter name''.  You may define as many counters per page as you want; you just need to separate them with the ''counter name''
+
+!Example
+
+[[{Counter}], [[{Counter}], [[{Counter}], [[{Counter name='aa'}] produces
+
+[{Counter}], [{Counter}], [{Counter}], [{Counter name='aa'}].
+
+The value of "counter" at the end is [{$counter}] and the value of "counter-aa" is [{$counter-aa}].
+
+
diff --git a/jspwiki-war/src/test/resources/TextFormattingRules.txt b/jspwiki-main/src/test/resources/TextFormattingRules.txt
similarity index 97%
rename from jspwiki-war/src/test/resources/TextFormattingRules.txt
rename to jspwiki-main/src/test/resources/TextFormattingRules.txt
index a5daa70..6ac9642 100644
--- a/jspwiki-war/src/test/resources/TextFormattingRules.txt
+++ b/jspwiki-main/src/test/resources/TextFormattingRules.txt
@@ -1,144 +1,144 @@
-When you've figured out how the editor works, then you should read [WikiEtiquette] so that you would know how to use your newly acquired skills...
-
-!Quick reference
-
-{{{
-----       = Make a horizontal ruler. Extra '-' is ignored.
-\\         = force a line break
-
-[link]     = creates a hyperlink to an internal WikiPage called 'Link'.
-[this is also a link] = creates a hyperlink to an internal WikiPage called
-'ThisIsAlsoALink'.
-[click here|link] = creates a hyperlink to an internal WikiPage called
-'Link', but displays the text 'click here' to the
-user instead of 'Link'.
-[1]        = Makes a reference to a footnote numbered 1.
-[#1]       = Marks the footnote number 1.
-[[link]    = creates text '[link]'.
-
-!heading   = small heading with text 'heading'
-!!heading  = medium heading with text 'heading'
-!!!heading = large heading with text 'heading'
-
-''text''   = prints 'text' in italic.
-__text__   = prints 'text' in bold.
-{{text}}   = prints 'text' in monospaced font.
-
-* text     = makes a bulleted list item with 'text'
-# text     = makes a numbered list item with 'text'
-}}}
-
-!Writing text
-
-You don't need to know anything about the Wiki text formatting rules to use Wiki.  Just write normal text, and then use an empty line to mark a paragraph.
-It's just like writing an email.
-
-You can always Edit this page (look at the left sidebar) to see how the different
-effects on this page are used.
-
-!Hyperlinks
-The link can also be a direct URL starting with http:, ftp:, mailto:, https:, or news:, in which case the link points to an external entity. For example, to point at the java.sun.com home page, use [[http://java.sun.com], which becomes [http://java.sun.com/] or [[Java home page|http://java.sun.com], which becomes [Java home page|http://java.sun.com].
-
-To add a new page you just create a link to it from somewhere else. After all, there isn't much point in having a page if you can't access it! You'll then see a small question mark after the page name when you return to that page. Then click on it and you have created a new page!
-
-It's allowed to use almost any kind of characters inside a [WikiName], as long
-as they are letters or numbers.
-
-!Footnotes
-
-These are a special kind of hyperlink.  By using nothing but a number inside
-a hyperlink you create a reference to a footnote, like this [[1], which 
-creates a footnote[1].  To make the actual footnote, you just put a [[#1]
-where you want that footnote to point at.  Look below to find the footnote.
-
-You can also make a named footnote, just as if you were doing a normal hyperlink.  For example, this refers to the same footnote[Footnote number 1|1] as the footnote above, but this refers to another footnote[2].
-
-!InterWiki links
-
-You can also do links between different Wikis without knowing the URL.  Just use a link in the form [[Wiki:WikiPage] and JSPWiki will create a link for you.  For example, this link points to the [JSPWiki TextFormatting rules|JSPWiki:TextFormattingRules]. Check the [SystemInfo] page for more information on which Wiki links are available.
-
-If an InterWiki link is not supported, you'll get a notification of it on the page when
-you save your page.
-
-!Adding pictures
-
-For security reasons uploading images is not permitted, but you can embed
-any image in the wiki code by putting the image available somewhere on the web in one of the allowed formats, and then just linking to it.
-For example, this is an inlined [PNG] image: [http://www.ecyrd.com/~jalkanen/test.png].
-
-If you specify a link text ([[this one here|http://example.com/example.png]) it becomes
-the ALT text for those who either can't or don't want to view images.
-
-The list of accepted image types depends on the Wiki.  See the [SystemInfo]
-page for a list of the different image types.
-
-!Bulleted lists
-Use an asterisk (*) in the first column to make bulleted lists. Use more asterisks for deeper indentation. For example:
-{{{
-* One
-* Two
-* Three
-** Three.One}}}
-
-creates
-* One
-* Two
-* Three
-** Three.One
-
-!Numbered lists
-Just like with bulleted lists, but use a hash (#) instead of the asterisk. Like this:
-{{{
-# One
-# Two
-# Three
-## Three.One
-}}}
-
-creates
-# One
-# Two
-# Three
-## Three.One
-
-If you want to write the list item on multiple lines, just add one or more spaces on the next line and the line will be automatically added to the
-previous item.  If this sounds complicated, edit this page for an example, below.
-
-* This is a single-line item.
-* This is actually a multi-line item.
-  We continue the second sentence on a line on a line of its own.
-  We might as well do a third line while we're at it...
-  Notice, however, as all these sentences get put inside a single item!
-* The third line is again a single-line item for your convinience.
-
-!Text effects
-
-You may use __bold__ text or ''italic'' text, by using two underscores (_) and two single quotes ('), respectively. If you're on a Windows computer, make sure that you are using the correct quote sign, as there is one that looks the same, but really isn't.
-
-
-!Preformatted text
-
-If you want to add preformatted text (like code) just use three consecutive braces ({) to open a block, and three consecutive braces (}) to close a block. Edit this page for an example.
-
-!Conflicts
-
-If someone happens to edit the same page as you at the same time, JSPWiki will prevent you from doing changes and show a conflict page instead. Sorry to say, but the first one to make changes wins...
-
-__A word of warning:__ If you use the Back button of your browser to go into the Edit page, you will almost certainly get a conflict. This is because the browser thinks its still editing an earlier copy of the page.
-
-!Deleting pages
-
-Deleting pages is possible from the "Info" page.  However, only authorized users can access
-this functionality - for example, administrators.
-
-!Adding new pages
-
-Create a link that points to a new (not existing) page using its [WikiName].
-Click that new link, which should now have a question mark (?) suffix and
-you will get an editor for the new page. -- [Asser]
-
-----
-
-[#1] Here's the footnote I mentioned.
-
+When you've figured out how the editor works, then you should read [WikiEtiquette] so that you would know how to use your newly acquired skills...
+
+!Quick reference
+
+{{{
+----       = Make a horizontal ruler. Extra '-' is ignored.
+\\         = force a line break
+
+[link]     = creates a hyperlink to an internal WikiPage called 'Link'.
+[this is also a link] = creates a hyperlink to an internal WikiPage called
+'ThisIsAlsoALink'.
+[click here|link] = creates a hyperlink to an internal WikiPage called
+'Link', but displays the text 'click here' to the
+user instead of 'Link'.
+[1]        = Makes a reference to a footnote numbered 1.
+[#1]       = Marks the footnote number 1.
+[[link]    = creates text '[link]'.
+
+!heading   = small heading with text 'heading'
+!!heading  = medium heading with text 'heading'
+!!!heading = large heading with text 'heading'
+
+''text''   = prints 'text' in italic.
+__text__   = prints 'text' in bold.
+{{text}}   = prints 'text' in monospaced font.
+
+* text     = makes a bulleted list item with 'text'
+# text     = makes a numbered list item with 'text'
+}}}
+
+!Writing text
+
+You don't need to know anything about the Wiki text formatting rules to use Wiki.  Just write normal text, and then use an empty line to mark a paragraph.
+It's just like writing an email.
+
+You can always Edit this page (look at the left sidebar) to see how the different
+effects on this page are used.
+
+!Hyperlinks
+The link can also be a direct URL starting with http:, ftp:, mailto:, https:, or news:, in which case the link points to an external entity. For example, to point at the java.sun.com home page, use [[http://java.sun.com], which becomes [http://java.sun.com/] or [[Java home page|http://java.sun.com], which becomes [Java home page|http://java.sun.com].
+
+To add a new page you just create a link to it from somewhere else. After all, there isn't much point in having a page if you can't access it! You'll then see a small question mark after the page name when you return to that page. Then click on it and you have created a new page!
+
+It's allowed to use almost any kind of characters inside a [WikiName], as long
+as they are letters or numbers.
+
+!Footnotes
+
+These are a special kind of hyperlink.  By using nothing but a number inside
+a hyperlink you create a reference to a footnote, like this [[1], which 
+creates a footnote[1].  To make the actual footnote, you just put a [[#1]
+where you want that footnote to point at.  Look below to find the footnote.
+
+You can also make a named footnote, just as if you were doing a normal hyperlink.  For example, this refers to the same footnote[Footnote number 1|1] as the footnote above, but this refers to another footnote[2].
+
+!InterWiki links
+
+You can also do links between different Wikis without knowing the URL.  Just use a link in the form [[Wiki:WikiPage] and JSPWiki will create a link for you.  For example, this link points to the [JSPWiki TextFormatting rules|JSPWiki:TextFormattingRules]. Check the [SystemInfo] page for more information on which Wiki links are available.
+
+If an InterWiki link is not supported, you'll get a notification of it on the page when
+you save your page.
+
+!Adding pictures
+
+For security reasons uploading images is not permitted, but you can embed
+any image in the wiki code by putting the image available somewhere on the web in one of the allowed formats, and then just linking to it.
+For example, this is an inlined [PNG] image: [http://www.ecyrd.com/~jalkanen/test.png].
+
+If you specify a link text ([[this one here|http://example.com/example.png]) it becomes
+the ALT text for those who either can't or don't want to view images.
+
+The list of accepted image types depends on the Wiki.  See the [SystemInfo]
+page for a list of the different image types.
+
+!Bulleted lists
+Use an asterisk (*) in the first column to make bulleted lists. Use more asterisks for deeper indentation. For example:
+{{{
+* One
+* Two
+* Three
+** Three.One}}}
+
+creates
+* One
+* Two
+* Three
+** Three.One
+
+!Numbered lists
+Just like with bulleted lists, but use a hash (#) instead of the asterisk. Like this:
+{{{
+# One
+# Two
+# Three
+## Three.One
+}}}
+
+creates
+# One
+# Two
+# Three
+## Three.One
+
+If you want to write the list item on multiple lines, just add one or more spaces on the next line and the line will be automatically added to the
+previous item.  If this sounds complicated, edit this page for an example, below.
+
+* This is a single-line item.
+* This is actually a multi-line item.
+  We continue the second sentence on a line on a line of its own.
+  We might as well do a third line while we're at it...
+  Notice, however, as all these sentences get put inside a single item!
+* The third line is again a single-line item for your convinience.
+
+!Text effects
+
+You may use __bold__ text or ''italic'' text, by using two underscores (_) and two single quotes ('), respectively. If you're on a Windows computer, make sure that you are using the correct quote sign, as there is one that looks the same, but really isn't.
+
+
+!Preformatted text
+
+If you want to add preformatted text (like code) just use three consecutive braces ({) to open a block, and three consecutive braces (}) to close a block. Edit this page for an example.
+
+!Conflicts
+
+If someone happens to edit the same page as you at the same time, JSPWiki will prevent you from doing changes and show a conflict page instead. Sorry to say, but the first one to make changes wins...
+
+__A word of warning:__ If you use the Back button of your browser to go into the Edit page, you will almost certainly get a conflict. This is because the browser thinks its still editing an earlier copy of the page.
+
+!Deleting pages
+
+Deleting pages is possible from the "Info" page.  However, only authorized users can access
+this functionality - for example, administrators.
+
+!Adding new pages
+
+Create a link that points to a new (not existing) page using its [WikiName].
+Click that new link, which should now have a question mark (?) suffix and
+you will get an editor for the new page. -- [Asser]
+
+----
+
+[#1] Here's the footnote I mentioned.
+
 [The other footnote|#2] The other footnote.  Note how it's name is different?
\ No newline at end of file
diff --git a/jspwiki-war/src/test/resources/WEB-INF/web.xml b/jspwiki-main/src/test/resources/WEB-INF/web.xml
similarity index 100%
rename from jspwiki-war/src/test/resources/WEB-INF/web.xml
rename to jspwiki-main/src/test/resources/WEB-INF/web.xml
diff --git a/jspwiki-war/src/test/resources/filters.xml b/jspwiki-main/src/test/resources/filters.xml
similarity index 100%
rename from jspwiki-war/src/test/resources/filters.xml
rename to jspwiki-main/src/test/resources/filters.xml
diff --git a/jspwiki-war/src/test/resources/groupdatabase.xml b/jspwiki-main/src/test/resources/groupdatabase.xml
similarity index 100%
rename from jspwiki-war/src/test/resources/groupdatabase.xml
rename to jspwiki-main/src/test/resources/groupdatabase.xml
diff --git a/jspwiki-war/src/test/resources/ini/jspwiki.properties b/jspwiki-main/src/test/resources/ini/jspwiki.properties
similarity index 100%
rename from jspwiki-war/src/test/resources/ini/jspwiki.properties
rename to jspwiki-main/src/test/resources/ini/jspwiki.properties
diff --git a/jspwiki-war/src/test/resources/ini/jspwiki_module.xml b/jspwiki-main/src/test/resources/ini/jspwiki_module.xml
similarity index 100%
rename from jspwiki-war/src/test/resources/ini/jspwiki_module.xml
rename to jspwiki-main/src/test/resources/ini/jspwiki_module.xml
diff --git a/jspwiki-war/src/test/resources/jspwiki-custom.properties b/jspwiki-main/src/test/resources/jspwiki-custom.properties
similarity index 100%
rename from jspwiki-war/src/test/resources/jspwiki-custom.properties
rename to jspwiki-main/src/test/resources/jspwiki-custom.properties
diff --git a/jspwiki-war/src/test/resources/jspwiki-testUserPolicy.policy b/jspwiki-main/src/test/resources/jspwiki-testUserPolicy.policy
old mode 100755
new mode 100644
similarity index 100%
rename from jspwiki-war/src/test/resources/jspwiki-testUserPolicy.policy
rename to jspwiki-main/src/test/resources/jspwiki-testUserPolicy.policy
diff --git a/jspwiki-war/src/test/resources/jspwiki-vers-custom.properties b/jspwiki-main/src/test/resources/jspwiki-vers-custom.properties
similarity index 100%
rename from jspwiki-war/src/test/resources/jspwiki-vers-custom.properties
rename to jspwiki-main/src/test/resources/jspwiki-vers-custom.properties
diff --git a/jspwiki-war/src/test/resources/jspwiki.policy b/jspwiki-main/src/test/resources/jspwiki.policy
similarity index 100%
rename from jspwiki-war/src/test/resources/jspwiki.policy
rename to jspwiki-main/src/test/resources/jspwiki.policy
diff --git a/jspwiki-war/src/test/resources/test.properties b/jspwiki-main/src/test/resources/test.properties
similarity index 100%
rename from jspwiki-war/src/test/resources/test.properties
rename to jspwiki-main/src/test/resources/test.properties
diff --git a/jspwiki-war/src/test/resources/userdatabase.xml b/jspwiki-main/src/test/resources/userdatabase.xml
similarity index 100%
rename from jspwiki-war/src/test/resources/userdatabase.xml
rename to jspwiki-main/src/test/resources/userdatabase.xml
diff --git a/jspwiki-markdown/pom.xml b/jspwiki-markdown/pom.xml
index fc7d996..1e20dfa 100755
--- a/jspwiki-markdown/pom.xml
+++ b/jspwiki-markdown/pom.xml
@@ -33,15 +33,14 @@
   <dependencies>
     <dependency>
       <groupId>${project.groupId}</groupId>
-      <artifactId>jspwiki-war</artifactId>
+      <artifactId>jspwiki-main</artifactId>
       <version>${project.version}</version>
-      <classifier>classes</classifier>
       <scope>provided</scope>
     </dependency>
     
     <dependency>
       <groupId>${project.groupId}</groupId>
-      <artifactId>jspwiki-war</artifactId>
+      <artifactId>jspwiki-main</artifactId>
       <type>test-jar</type>
       <version>${project.version}</version>
       <scope>test</scope>
diff --git a/jspwiki-war/pom.xml b/jspwiki-war/pom.xml
index c265edd..941264d 100644
--- a/jspwiki-war/pom.xml
+++ b/jspwiki-war/pom.xml
@@ -32,243 +32,21 @@
 
   <dependencies>
     <dependency>
-      <groupId>xmlrpc</groupId>
-      <artifactId>xmlrpc</artifactId>
+      <groupId>${project.groupId}</groupId>
+      <artifactId>jspwiki-main</artifactId>
+      <version>${project.version}</version>
     </dependency>
 
     <dependency>
-      <groupId>org.apache.lucene</groupId>
-      <artifactId>lucene-queryparser</artifactId>
-    </dependency>
-
-    <dependency>
-      <groupId>org.apache.lucene</groupId>
-      <artifactId>lucene-highlighter</artifactId>
-    </dependency>
-
-    <dependency>
-      <groupId>org.apache.lucene</groupId>
-      <artifactId>lucene-analyzers-common</artifactId>
-    </dependency>
-
-    <dependency>
-      <groupId>javax.servlet</groupId>
-      <artifactId>javax.servlet-api</artifactId>
-      <scope>provided</scope>
-    </dependency>
-
-    <dependency>
-      <groupId>javax.servlet.jsp</groupId>
-      <artifactId>javax.servlet.jsp-api</artifactId>
-      <scope>provided</scope>
-    </dependency>
-
-    <dependency>
-      <groupId>net.sourceforge</groupId>
-      <artifactId>sandler</artifactId>
-    </dependency>
-
-    <dependency>
-      <groupId>net.sf.ehcache</groupId>
-      <artifactId>ehcache</artifactId>
-    </dependency>
-    
-    <dependency>
-      <groupId>oro</groupId>
-      <artifactId>oro</artifactId>
-    </dependency>
-
-    <dependency>
-      <groupId>javax.mail</groupId>
-      <artifactId>mail</artifactId>
-    </dependency>
-
-    <dependency>
-      <groupId>log4j</groupId>
-      <artifactId>log4j</artifactId>
-    </dependency>
-
-    <dependency>
-      <groupId>org.slf4j</groupId>
-      <artifactId>slf4j-log4j12</artifactId>
-    </dependency>
-
-    <dependency>
-      <groupId>com.google.code.gson</groupId>
-      <artifactId>gson</artifactId>
-    </dependency>
-
-    <dependency>
-      <groupId>org.jvnet.hudson</groupId>
-      <artifactId>org.suigeneris.jrcs.diff</artifactId>
-    </dependency>
-
-    <dependency>
-      <groupId>org.jdom</groupId>
-      <artifactId>jdom2</artifactId>
-    </dependency>
-
-    <dependency>
-      <groupId>jaxen</groupId>
-      <artifactId>jaxen</artifactId>
-    </dependency>
-
-    <dependency>
-      <groupId>javax.servlet</groupId>
-      <artifactId>jstl</artifactId>
-    </dependency>
-
-    <dependency>
-      <groupId>org.freshcookies</groupId>
-      <artifactId>freshcookies-security</artifactId>
-    </dependency>
-
-    <dependency>
-      <groupId>commons-lang</groupId>
-      <artifactId>commons-lang</artifactId>
-    </dependency>
-
-    <dependency>
-      <groupId>commons-fileupload</groupId>
-      <artifactId>commons-fileupload</artifactId>
-    </dependency>
-
-    <dependency>
-      <groupId>net.sourceforge</groupId>
-      <artifactId>akismet-java</artifactId>
-    </dependency>
-
-    <dependency>
-      <groupId>commons-httpclient</groupId>
-      <artifactId>commons-httpclient</artifactId>
-    </dependency>
-
-    <dependency>
-      <groupId>commons-io</groupId>
-      <artifactId>commons-io</artifactId>
-    </dependency>
-
-    <dependency>
-      <groupId>net.sourceforge.nekohtml</groupId>
-      <artifactId>nekohtml</artifactId>
-      <scope>runtime</scope>
-    </dependency>
-
-    <dependency>
-      <groupId>net.sourceforge.stripes</groupId>
-      <artifactId>stripes</artifactId>
-      <scope>test</scope>
-    </dependency>
-
-    <dependency>
-      <groupId>org.hsqldb</groupId>
-      <artifactId>hsqldb</artifactId>
-      <scope>test</scope>
-    </dependency>
-
-    <dependency>
-      <groupId>org.hsqldb</groupId>
-      <artifactId>sqltool</artifactId>
-      <scope>test</scope>
-    </dependency>
-
-    <dependency>
-      <groupId>org.eclipse.jetty.aggregate</groupId>
-      <artifactId>jetty-all</artifactId>
-      <scope>test</scope>
-    </dependency>
-
-    <dependency>
-      <groupId>org.junit.jupiter</groupId>
-      <artifactId>junit-jupiter-api</artifactId>
-      <scope>test</scope>
-    </dependency>
-
-    <dependency>
-      <groupId>org.junit.jupiter</groupId>
-      <artifactId>junit-jupiter-params</artifactId>
-      <scope>test</scope>
-    </dependency>
-
-    <dependency>
-      <groupId>org.junit.jupiter</groupId>
-      <artifactId>junit-jupiter-engine</artifactId>
-      <scope>test</scope>
+      <groupId>${project.groupId}</groupId>
+      <artifactId>jspwiki-markdown</artifactId>
+      <version>${project.version}</version>
     </dependency>
   </dependencies>
 
   <build>
     <finalName>JSPWiki</finalName>
     <plugins>
-      
-      <plugin>
-        <artifactId>maven-jar-plugin</artifactId>
-        <executions>
-          <execution>
-            <goals>
-              <goal>test-jar</goal>
-            </goals>
-            <phase>package</phase>
-            <configuration>
-              <excludes>
-                <exclude>**/test*/**</exclude>
-                <exclude>**/*Test.class</exclude>
-                <exclude>**/*Test$*.class</exclude>
-                <exclude>**/*Tests.class</exclude>
-              </excludes>
-              <skipIfEmpty>true</skipIfEmpty>
-            </configuration>
-          </execution>
-        </executions>
-      </plugin>
-
-      <!-- Surefire plugin (running unit tests):
-         http://maven.apache.org/surefire/maven-surefire-plugin/
-
-         Individual tests can be run command line via:
-         mvn clean test -Dtest=WikiEngineTest,AclImplTest,...
-
-         All tests can be skipped via -Dmaven.test.skip
-       -->
-      <plugin>
-        <artifactId>maven-surefire-plugin</artifactId>
-        <configuration>
-          <systemPropertyVariables>
-              <java.io.tmpdir>${project.build.directory}</java.io.tmpdir>
-          </systemPropertyVariables>          
-          <excludes>
-            <!-- time-consuming tests excluded by default -->
-            <exclude>**/StressTestVersioningProvider.java</exclude>
-            <exclude>**/StressTestSpeed.java</exclude>
-            <exclude>**/MassiveRepositoryTest.java</exclude>
-          </excludes>
-          <includes>
-            <include>**/*Test.java</include>
-          </includes>
-        </configuration>
-      </plugin>
-      
-      <plugin>
-        <artifactId>maven-eclipse-plugin</artifactId>
-        <configuration>
-          <downloadSources>true</downloadSources>
-          <downloadJavadocs>true</downloadJavadocs>
-          <additionalConfig>
-            <file>
-              <name>.checkstyle</name>
-              <location>./src/main/config/dev/jspwiki-checkstyle.xml</location>
-            </file>
-            <file>
-              <name>.settings/org.eclipse.jdt.core.prefs</name>
-              <location>./src/main/config/dev/jspwiki-eclipse-codestyle.xml</location>
-            </file>
-          </additionalConfig>
-          <additionalProjectnatures>
-            <projectnature>net.sourceforge.metrics.nature</projectnature>
-            <projectnature>net.sf.eclipsecs.core.CheckstyleNature</projectnature>
-          </additionalProjectnatures>
-        </configuration>
-      </plugin>
 
       <!-- wro4j Web Resource Optimizer for Java (http://http://code.google.com/p/wro4j/)
         Merge and compress CSS and JS files using the WRO4J.
diff --git a/pom.xml b/pom.xml
index b6d0efe..ebdd5a4 100644
--- a/pom.xml
+++ b/pom.xml
@@ -115,8 +115,9 @@
 
   <modules>
     <module>jspwiki-wikipages</module>
-    <module>jspwiki-war</module>
+    <module>jspwiki-main</module>
     <module>jspwiki-markdown</module>
+    <module>jspwiki-war</module>
     <module>jspwiki-portable</module>
     <module>jspwiki-it-tests</module><!-- IT tests are launched only if -Pintegration-tests is given -->
   </modules>

[jspwiki] 16/17: AttachmentManager#listAttachments now returns a List instead of a Collection (breaking backwards-compatible change)

[ju...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

juanpablo pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/jspwiki.git

commit 37761217837f2a67b2440f5d1e9c027a858198ea
Author: juanpablo <ju...@apache.org>
AuthorDate: Sun Oct 28 22:56:03 2018 +0100

    AttachmentManager#listAttachments now returns a List<Attachment> instead of a Collection  (breaking backwards-compatible change)
---
 .../main/java/org/apache/wiki/ReferenceManager.java  |  3 ++-
 .../src/main/java/org/apache/wiki/WikiEngine.java    |  6 +++---
 .../apache/wiki/attachment/AttachmentManager.java    | 20 ++++----------------
 .../java/org/apache/wiki/content/PageRenamer.java    |  7 +++----
 .../wiki/providers/BasicAttachmentProvider.java      |  4 ++--
 .../wiki/providers/CachingAttachmentProvider.java    | 17 +++++++++--------
 .../wiki/providers/WikiAttachmentProvider.java       |  2 +-
 .../src/main/java/org/apache/wiki/rss/AtomFeed.java  | 15 ++++++++-------
 .../src/main/java/org/apache/wiki/rss/RSS20Feed.java |  6 +++---
 .../org/apache/wiki/search/BasicSearchProvider.java  | 10 ++++++----
 .../org/apache/wiki/search/LuceneSearchProvider.java |  7 ++++---
 .../org/apache/wiki/tags/AttachmentsIteratorTag.java |  8 ++++----
 .../wiki/attachment/AttachmentManagerTest.java       |  4 ++--
 13 files changed, 51 insertions(+), 58 deletions(-)

diff --git a/jspwiki-main/src/main/java/org/apache/wiki/ReferenceManager.java b/jspwiki-main/src/main/java/org/apache/wiki/ReferenceManager.java
index 9371f65..12be34e 100644
--- a/jspwiki-main/src/main/java/org/apache/wiki/ReferenceManager.java
+++ b/jspwiki-main/src/main/java/org/apache/wiki/ReferenceManager.java
@@ -37,6 +37,7 @@ import java.util.ConcurrentModificationException;
 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.Iterator;
+import java.util.List;
 import java.util.Map;
 import java.util.Set;
 import java.util.TreeSet;
@@ -193,7 +194,7 @@ public class ReferenceManager
         Collection<String> links = m_engine.scanWikiLinks( page, content );
 
         res.addAll( links );
-        Collection< Attachment > attachments = m_engine.getAttachmentManager().listAttachments( page );
+        List< Attachment > attachments = m_engine.getAttachmentManager().listAttachments( page );
 
         for( Iterator< Attachment > atti = attachments.iterator(); atti.hasNext(); )
         {
diff --git a/jspwiki-main/src/main/java/org/apache/wiki/WikiEngine.java b/jspwiki-main/src/main/java/org/apache/wiki/WikiEngine.java
index 213c26f..4c19788 100644
--- a/jspwiki-main/src/main/java/org/apache/wiki/WikiEngine.java
+++ b/jspwiki-main/src/main/java/org/apache/wiki/WikiEngine.java
@@ -2182,10 +2182,10 @@ public class WikiEngine
 
                 if (m_attachmentManager.hasAttachments( p ))
                 {
-                    Collection attachments = m_attachmentManager.listAttachments( p );
-                    for( Iterator atti = attachments.iterator(); atti.hasNext(); )
+                    List< Attachment > attachments = m_attachmentManager.listAttachments( p );
+                    for( Iterator< Attachment > atti = attachments.iterator(); atti.hasNext(); )
                     {
-                        Attachment attachment = (Attachment)atti.next();
+                        Attachment attachment = atti.next();
                         refTo.remove(attachment.getName());
 
                         m_attachmentManager.deleteAttachment( attachment );
diff --git a/jspwiki-main/src/main/java/org/apache/wiki/attachment/AttachmentManager.java b/jspwiki-main/src/main/java/org/apache/wiki/attachment/AttachmentManager.java
index 2c7719a..48d10c5 100644
--- a/jspwiki-main/src/main/java/org/apache/wiki/attachment/AttachmentManager.java
+++ b/jspwiki-main/src/main/java/org/apache/wiki/attachment/AttachmentManager.java
@@ -360,26 +360,14 @@ public class AttachmentManager
      *  @return a valid collection of attachments.
      *  @throws ProviderException If there was something wrong in the backend.
      */
-
-    // FIXME: This API should be changed to return a List.
-    @SuppressWarnings("unchecked")
-    public Collection listAttachments( WikiPage wikipage )
-        throws ProviderException
-    {
+    public List< Attachment > listAttachments( WikiPage wikipage ) throws ProviderException {
         if( m_provider == null )
         {
-            return new ArrayList();
+            return new ArrayList<>();
         }
 
-        Collection atts = m_provider.listAttachments( wikipage );
-
-        //
-        //  This is just a sanity check; all of our providers return a Collection.
-        //
-        if( atts instanceof List )
-        {
-            m_engine.getPageSorter().sortPages( (List) atts );
-        }
+        List< Attachment >atts = m_provider.listAttachments( wikipage );
+        m_engine.getPageSorter().sortPages( (List) atts );
 
         return atts;
     }
diff --git a/jspwiki-main/src/main/java/org/apache/wiki/content/PageRenamer.java b/jspwiki-main/src/main/java/org/apache/wiki/content/PageRenamer.java
index 22df9e0..ad91697 100644
--- a/jspwiki-main/src/main/java/org/apache/wiki/content/PageRenamer.java
+++ b/jspwiki-main/src/main/java/org/apache/wiki/content/PageRenamer.java
@@ -19,6 +19,7 @@
 package org.apache.wiki.content;
 
 import java.util.Collection;
+import java.util.List;
 import java.util.Set;
 import java.util.TreeSet;
 import java.util.regex.Matcher;
@@ -125,8 +126,7 @@ public class PageRenamer
         //
         
         //  Remove references to attachments under old name
-        @SuppressWarnings( "unchecked" )
-        Collection<Attachment> attachmentsOldName = engine.getAttachmentManager().listAttachments( fromPage );
+        List<Attachment> attachmentsOldName = engine.getAttachmentManager().listAttachments( fromPage );
         for (Attachment att:attachmentsOldName)
         {
             WikiPage fromAttPage = engine.getPage( att.getName() );
@@ -256,8 +256,7 @@ public class PageRenamer
         
         try
         {
-            @SuppressWarnings( "unchecked" )
-            Collection<Attachment> attachments = engine.getAttachmentManager().listAttachments( fromPage );
+            List<Attachment> attachments = engine.getAttachmentManager().listAttachments( fromPage );
 
             for( Attachment att : attachments  )
             {
diff --git a/jspwiki-main/src/main/java/org/apache/wiki/providers/BasicAttachmentProvider.java b/jspwiki-main/src/main/java/org/apache/wiki/providers/BasicAttachmentProvider.java
index 10b3f87..b3382a6 100644
--- a/jspwiki-main/src/main/java/org/apache/wiki/providers/BasicAttachmentProvider.java
+++ b/jspwiki-main/src/main/java/org/apache/wiki/providers/BasicAttachmentProvider.java
@@ -452,10 +452,10 @@ public class BasicAttachmentProvider
     /**
      *  {@inheritDoc}
      */
-    public Collection listAttachments( WikiPage page )
+    public List< Attachment > listAttachments( WikiPage page )
         throws ProviderException
     {
-        Collection<Attachment> result = new ArrayList<Attachment>();
+        List<Attachment> result = new ArrayList<Attachment>();
 
         File dir = findPageDir( page.getName() );
 
diff --git a/jspwiki-main/src/main/java/org/apache/wiki/providers/CachingAttachmentProvider.java b/jspwiki-main/src/main/java/org/apache/wiki/providers/CachingAttachmentProvider.java
index 491975d..12e0ac7 100644
--- a/jspwiki-main/src/main/java/org/apache/wiki/providers/CachingAttachmentProvider.java
+++ b/jspwiki-main/src/main/java/org/apache/wiki/providers/CachingAttachmentProvider.java
@@ -167,13 +167,13 @@ public class CachingAttachmentProvider
     /**
      * {@inheritDoc}
      */
-    public Collection listAttachments(WikiPage page) throws ProviderException {
+    public List< Attachment > listAttachments(WikiPage page) throws ProviderException {
         log.debug("Listing attachments for " + page);
-        Collection<Attachment> c = null;
+        List<Attachment> c = null;
         Element element = m_cache.get(page.getName());
 
         if (element != null) {
-            c = (Collection<Attachment>) element.getObjectValue();
+            c = (List<Attachment>) element.getObjectValue();
             log.debug("LIST from cache, " + page.getName() + ", size=" + c.size());
             return cloneCollection(c);
         }
@@ -183,9 +183,9 @@ public class CachingAttachmentProvider
         return refresh(page);
     }
 
-    private <T> Collection<T> cloneCollection( Collection<T> c )
+    private <T> List<T> cloneCollection( Collection<T> c )
     {
-        ArrayList<T> list = new ArrayList<T>();
+        ArrayList<T> list = new ArrayList<>();
 
         list.addAll( c );
 
@@ -255,9 +255,9 @@ public class CachingAttachmentProvider
      *
      *  @return The newly fetched object from the provider.
      */
-    private Collection<Attachment> refresh( WikiPage page ) throws ProviderException
+    private List<Attachment> refresh( WikiPage page ) throws ProviderException
     {
-        Collection<Attachment> c = m_provider.listAttachments( page );
+        List<Attachment> c = m_provider.listAttachments( page );
         m_cache.put(new Element(page.getName(), c));
 
         return c;
@@ -361,7 +361,8 @@ public class CachingAttachmentProvider
         //
         String checkName = oldParent + "/";
 
-        Collection< String > names = m_cache.getKeysWithExpiryCheck();
+        @SuppressWarnings("unchecked")
+		List< String > names = m_cache.getKeysWithExpiryCheck();
         for( String name : names )
         {
             if( name.startsWith( checkName ) )
diff --git a/jspwiki-main/src/main/java/org/apache/wiki/providers/WikiAttachmentProvider.java b/jspwiki-main/src/main/java/org/apache/wiki/providers/WikiAttachmentProvider.java
index 9630b69..91195b6 100644
--- a/jspwiki-main/src/main/java/org/apache/wiki/providers/WikiAttachmentProvider.java
+++ b/jspwiki-main/src/main/java/org/apache/wiki/providers/WikiAttachmentProvider.java
@@ -78,7 +78,7 @@ public interface WikiAttachmentProvider
      *  @throws ProviderException If something goes wrong when listing the attachments.
      */
 
-    Collection listAttachments( WikiPage page )
+    List< Attachment > listAttachments( WikiPage page )
         throws ProviderException;
 
     /**
diff --git a/jspwiki-main/src/main/java/org/apache/wiki/rss/AtomFeed.java b/jspwiki-main/src/main/java/org/apache/wiki/rss/AtomFeed.java
index feb5fe9..72b6866 100644
--- a/jspwiki-main/src/main/java/org/apache/wiki/rss/AtomFeed.java
+++ b/jspwiki-main/src/main/java/org/apache/wiki/rss/AtomFeed.java
@@ -24,20 +24,21 @@ import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Date;
 import java.util.Iterator;
+import java.util.List;
 
 import javax.servlet.ServletContext;
 
 import org.apache.commons.lang.time.DateFormatUtils;
-import org.jdom2.Element;
-import org.jdom2.Namespace;
-import org.jdom2.output.Format;
-import org.jdom2.output.XMLOutputter;
 import org.apache.wiki.Release;
 import org.apache.wiki.WikiContext;
 import org.apache.wiki.WikiEngine;
 import org.apache.wiki.WikiPage;
 import org.apache.wiki.api.exceptions.ProviderException;
 import org.apache.wiki.attachment.Attachment;
+import org.jdom2.Element;
+import org.jdom2.Namespace;
+import org.jdom2.output.Format;
+import org.jdom2.output.XMLOutputter;
 
 /**
  *  Provides an Atom 1.0 standard feed, with enclosures.
@@ -120,11 +121,11 @@ public class AtomFeed extends Feed
             {
                 try
                 {
-                    Collection c = engine.getAttachmentManager().listAttachments(p);
+                    List< Attachment > c = engine.getAttachmentManager().listAttachments(p);
 
-                    for( Iterator a = c.iterator(); a.hasNext(); )
+                    for( Iterator< Attachment > a = c.iterator(); a.hasNext(); )
                     {
-                        Attachment att = (Attachment) a.next();
+                        Attachment att = a.next();
 
                         Element attEl = getElement("link");
                         attEl.setAttribute( "rel","enclosure" );
diff --git a/jspwiki-main/src/main/java/org/apache/wiki/rss/RSS20Feed.java b/jspwiki-main/src/main/java/org/apache/wiki/rss/RSS20Feed.java
index 0da6e65..f6f66ee 100644
--- a/jspwiki-main/src/main/java/org/apache/wiki/rss/RSS20Feed.java
+++ b/jspwiki-main/src/main/java/org/apache/wiki/rss/RSS20Feed.java
@@ -87,11 +87,11 @@ public class RSS20Feed extends Feed
             {
                 try
                 {
-                    Collection c = engine.getAttachmentManager().listAttachments(p);
+                    List< Attachment > c = engine.getAttachmentManager().listAttachments(p);
 
-                    for( Iterator a = c.iterator(); a.hasNext(); )
+                    for( Iterator< Attachment > a = c.iterator(); a.hasNext(); )
                     {
-                        Attachment att = (Attachment) a.next();
+                        Attachment att = a.next();
 
                         Element attEl = new Element("enclosure");
                         attEl.setAttribute( "url", engine.getURL(WikiContext.ATTACH, att.getName(), null, true ) );
diff --git a/jspwiki-main/src/main/java/org/apache/wiki/search/BasicSearchProvider.java b/jspwiki-main/src/main/java/org/apache/wiki/search/BasicSearchProvider.java
index eaeb396..1dd2970 100644
--- a/jspwiki-main/src/main/java/org/apache/wiki/search/BasicSearchProvider.java
+++ b/jspwiki-main/src/main/java/org/apache/wiki/search/BasicSearchProvider.java
@@ -21,6 +21,7 @@ package org.apache.wiki.search;
 import java.io.IOException;
 import java.util.Collection;
 import java.util.Iterator;
+import java.util.List;
 import java.util.Properties;
 import java.util.StringTokenizer;
 import java.util.TreeSet;
@@ -122,7 +123,7 @@ public class BasicSearchProvider implements SearchProvider
     {
         if(m_engine.getAttachmentManager().hasAttachments(page))
         {
-            Collection attachments;
+            List< Attachment > attachments;
             try
             {
                 attachments = m_engine.getAttachmentManager().listAttachments(page);
@@ -134,12 +135,13 @@ public class BasicSearchProvider implements SearchProvider
             }
 
             StringBuilder attachmentNames = new StringBuilder();
-            for( Iterator it = attachments.iterator(); it.hasNext(); )
+            for( Iterator< Attachment > it = attachments.iterator(); it.hasNext(); )
             {
-                Attachment att = (Attachment) it.next();
+                Attachment att = it.next();
                 attachmentNames.append(att.getName());
-                if(it.hasNext())
+                if(it.hasNext()) {
                     attachmentNames.append(separator);
+                }
             }
             return attachmentNames.toString();
         }
diff --git a/jspwiki-main/src/main/java/org/apache/wiki/search/LuceneSearchProvider.java b/jspwiki-main/src/main/java/org/apache/wiki/search/LuceneSearchProvider.java
index ea56612..1902930 100644
--- a/jspwiki-main/src/main/java/org/apache/wiki/search/LuceneSearchProvider.java
+++ b/jspwiki-main/src/main/java/org/apache/wiki/search/LuceneSearchProvider.java
@@ -29,6 +29,7 @@ import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Date;
 import java.util.Iterator;
+import java.util.List;
 import java.util.Properties;
 import java.util.Vector;
 
@@ -483,12 +484,12 @@ public class LuceneSearchProvider implements SearchProvider {
         // Now add the names of the attachments of this page
         try
         {
-            Collection attachments = m_engine.getAttachmentManager().listAttachments(page);
+            List< Attachment > attachments = m_engine.getAttachmentManager().listAttachments(page);
             String attachmentNames = "";
 
-            for( Iterator it = attachments.iterator(); it.hasNext(); )
+            for( Iterator< Attachment > it = attachments.iterator(); it.hasNext(); )
             {
-                Attachment att = (Attachment) it.next();
+                Attachment att = it.next();
                 attachmentNames += att.getName() + ";";
             }
             field = new Field( LUCENE_ATTACHMENTS, attachmentNames, TextField.TYPE_STORED );
diff --git a/jspwiki-main/src/main/java/org/apache/wiki/tags/AttachmentsIteratorTag.java b/jspwiki-main/src/main/java/org/apache/wiki/tags/AttachmentsIteratorTag.java
index 8cea2f5..f3e301c 100644
--- a/jspwiki-main/src/main/java/org/apache/wiki/tags/AttachmentsIteratorTag.java
+++ b/jspwiki-main/src/main/java/org/apache/wiki/tags/AttachmentsIteratorTag.java
@@ -19,18 +19,18 @@
 package org.apache.wiki.tags;
 
 import java.io.IOException;
-import java.util.Collection;
+import java.util.List;
 
 import javax.servlet.jsp.JspWriter;
 import javax.servlet.jsp.PageContext;
 
 import org.apache.log4j.Logger;
-import org.apache.wiki.WikiEngine;
 import org.apache.wiki.WikiContext;
+import org.apache.wiki.WikiEngine;
 import org.apache.wiki.WikiPage;
 import org.apache.wiki.api.exceptions.ProviderException;
-import org.apache.wiki.attachment.AttachmentManager;
 import org.apache.wiki.attachment.Attachment;
+import org.apache.wiki.attachment.AttachmentManager;
 
 /**
  *  Iterates through the list of attachments one has.
@@ -75,7 +75,7 @@ public class AttachmentsIteratorTag
         {
             if( page != null && engine.pageExists(page) )
             {
-                Collection atts = mgr.listAttachments( page );
+                List< Attachment > atts = mgr.listAttachments( page );
 
                 if( atts == null )
                 {
diff --git a/jspwiki-main/src/test/java/org/apache/wiki/attachment/AttachmentManagerTest.java b/jspwiki-main/src/test/java/org/apache/wiki/attachment/AttachmentManagerTest.java
index 15f2504..192cb35 100644
--- a/jspwiki-main/src/test/java/org/apache/wiki/attachment/AttachmentManagerTest.java
+++ b/jspwiki-main/src/test/java/org/apache/wiki/attachment/AttachmentManagerTest.java
@@ -18,7 +18,7 @@ import java.io.InputStream;
 import java.io.InputStreamReader;
 import java.io.StringReader;
 import java.io.StringWriter;
-import java.util.Collection;
+import java.util.List;
 import java.util.Properties;
 
 import org.apache.wiki.TestEngine;
@@ -238,7 +238,7 @@ public class AttachmentManagerTest
 
         m_manager.storeAttachment( att, makeAttachmentFile() );
 
-        Collection<?> c = m_manager.listAttachments( new WikiPage(m_engine, NAME1) );
+        List< Attachment > c = m_manager.listAttachments( new WikiPage(m_engine, NAME1) );
 
         Assertions.assertEquals( 1, c.size(), "Length" );
 

[jspwiki] 05/17: dependencies sorted alphabetically by scope:groupId:artifactId; dependencies versions' as maven properties so it's easier to see which dependencies and versions ares used at a glance

[ju...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

juanpablo pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/jspwiki.git

commit 2a183d76cfd8e41d284ec1d8e3dcb90025630e52
Author: juanpablo <ju...@apache.org>
AuthorDate: Sun Oct 28 18:44:48 2018 +0100

    dependencies sorted alphabetically by scope:groupId:artifactId; dependencies versions' as maven properties so it's easier to see which dependencies and versions ares used at a glance
---
 pom.xml | 145 +++++++++++++++++++++++++++++++++++++---------------------------
 1 file changed, 85 insertions(+), 60 deletions(-)

diff --git a/pom.xml b/pom.xml
index cbdd7aa..5038abb 100644
--- a/pom.xml
+++ b/pom.xml
@@ -39,16 +39,42 @@
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
-    <flexmark.version>0.34.56</flexmark.version>
     <jdk.version>1.8</jdk.version>
+    <maven.version>3.5</maven.version>
+
+    <akismet-java.version>1.02</akismet-java.version>
+    <commons-fileupload.version>1.3</commons-fileupload.version>
+    <commons-httpclient.version>3.1</commons-httpclient.version>
+    <commons-io.version>2.4</commons-io.version>
+    <commons-lang.version>2.6</commons-lang.version>
+    <ehcache.version>2.8.3</ehcache.version>
+    <flexmark.version>0.34.56</flexmark.version>
+    <freshcookies-security.version>0.60</freshcookies-security.version>
+    <gson.version>2.3.1</gson.version>
+    <hsqldb.version>2.3.0</hsqldb.version>
+    <jaxen.version>1.1.4</jaxen.version>
+    <javax-jstl.version>1.2</javax-jstl.version>
+    <javax-mail.version>1.4.7</javax-mail.version>
+    <javax-jsp-api.version>2.3.0</javax-jsp-api.version>
+    <javax-servlet-api.version>3.1.0</javax-servlet-api.version>
+    <jdom2.version>2.0.5</jdom2.version>
+    <jetty.version>8.1.15.v20140411</jetty.version>
+    <jrcs-diff.version>0.4.2</jrcs-diff.version>
     <junit.version>5.3.1</junit.version>
-    <maven.compiler.source>${jdk}</maven.compiler.source> <!-- override values from parent pom -->
-    <maven.compiler.target>${jdk}</maven.compiler.target>
+    <log4j.version>1.2.17</log4j.version>
     <lucene.version>4.7.0</lucene.version>
+    <nekohtml.version>1.9.21</nekohtml.version>
+    <oro.version>2.0.8</oro.version>
+    <sandler.version>0.5</sandler.version>
     <selenium.version>2.42.0</selenium.version>
     <slf4j.version>1.7.25</slf4j.version>
+    <stripes.version>1.6.0</stripes.version>
     <tomcat.version>8.5.34</tomcat.version>
     <wro4j.version>1.8.0</wro4j.version>
+    <xmlrpc.version>2.0.1</xmlrpc.version>
+
+    <maven.compiler.source>${jdk}</maven.compiler.source> <!-- override values from parent pom -->
+    <maven.compiler.target>${jdk}</maven.compiler.target>
     <minimize>true</minimize> <!-- wro4j compression -->
   </properties>
 
@@ -71,6 +97,12 @@
     <dependencies>       <!-- ordered alphabetically by scope:groupId:artifactId                                     -->
       <!-- compile dependencies -->
       <dependency>
+        <groupId>com.google.code.gson</groupId>
+        <artifactId>gson</artifactId>
+        <version>${gson.version}</version>
+      </dependency>
+
+      <dependency>
         <groupId>com.vladsch.flexmark</groupId>
         <artifactId>flexmark</artifactId>
         <version>${flexmark.version}</version>
@@ -89,93 +121,69 @@
       </dependency>
 
       <dependency>
-        <groupId>com.google.code.gson</groupId>
-        <artifactId>gson</artifactId>
-        <version>2.3.1</version>
-      </dependency>
-
-      <dependency>
         <groupId>commons-fileupload</groupId>
         <artifactId>commons-fileupload</artifactId>
-        <version>1.3</version>
+        <version>${commons-fileupload.version}</version>
       </dependency>
 
       <dependency>
         <groupId>commons-httpclient</groupId>
         <artifactId>commons-httpclient</artifactId>
-        <version>3.1</version>
+        <version>${commons-httpclient.version}</version>
       </dependency>
 
       <dependency>
         <groupId>commons-io</groupId>
         <artifactId>commons-io</artifactId>
-        <version>2.4</version>
+        <version>${commons-io.version}</version>
       </dependency>
 
       <dependency>
         <groupId>commons-lang</groupId>
         <artifactId>commons-lang</artifactId>
-        <version>2.6</version>
+        <version>${commons-lang.version}</version>
       </dependency>
 
       <dependency>
         <groupId>javax.mail</groupId>
         <artifactId>mail</artifactId>
-        <version>1.4.7</version>
+        <version>${javax-mail.version}</version>
       </dependency>
 
       <dependency>
         <groupId>javax.servlet</groupId>
         <artifactId>jstl</artifactId>
-        <version>1.2</version>
-      </dependency>
-
-      <dependency>
-        <groupId>org.jdom</groupId>
-        <artifactId>jdom2</artifactId>
-        <version>2.0.5</version>
+        <version>${javax-jstl.version}</version>
       </dependency>
 
       <dependency>
         <groupId>jaxen</groupId>
         <artifactId>jaxen</artifactId>
-        <version>1.1.4</version>
+        <version>${jaxen.version}</version>
       </dependency>
 
       <dependency>
         <groupId>log4j</groupId>
         <artifactId>log4j</artifactId>
-        <version>1.2.17</version>
-      </dependency>
-
-      <dependency>
-        <groupId>org.slf4j</groupId>
-        <artifactId>slf4j-api</artifactId>
-        <version>${slf4j.version}</version>
-      </dependency>
-
-      <dependency>
-        <groupId>org.slf4j</groupId>
-        <artifactId>slf4j-log4j12</artifactId>
-        <version>${slf4j.version}</version>
+        <version>${log4j.version}</version>
       </dependency>
 
       <dependency>
         <groupId>net.sourceforge</groupId>
         <artifactId>akismet-java</artifactId>
-        <version>1.02</version>
+        <version>${akismet-java.version}</version>
       </dependency>
 
       <dependency>
         <groupId>net.sourceforge</groupId>
         <artifactId>sandler</artifactId>
-        <version>0.5</version>
+        <version>${sandler.version}</version>
       </dependency>
 
       <dependency>
         <groupId>net.sf.ehcache</groupId>
         <artifactId>ehcache</artifactId>
-        <version>2.8.3</version>
+        <version>${ehcache.version}</version>
       </dependency>
 
       <dependency>
@@ -193,20 +201,25 @@
       <dependency>
         <groupId>org.apache.lucene</groupId>
         <artifactId>lucene-analyzers-common</artifactId>
-        <scope>compile</scope>
         <version>${lucene.version}</version>
       </dependency>
 
       <dependency>
         <groupId>org.freshcookies</groupId>
         <artifactId>freshcookies-security</artifactId>
-        <version>0.60</version>
+        <version>${freshcookies-security.version}</version>
+      </dependency>
+
+      <dependency>
+        <groupId>org.jdom</groupId>
+        <artifactId>jdom2</artifactId>
+        <version>${jdom2.version}</version>
       </dependency>
 
       <dependency>
         <groupId>org.jvnet.hudson</groupId>
         <artifactId>org.suigeneris.jrcs.diff</artifactId>
-        <version>0.4.2</version>
+        <version>${jrcs-diff.version}</version>
       </dependency>
 
       <dependency>
@@ -228,30 +241,34 @@
       </dependency>
 
       <dependency>
+        <groupId>org.slf4j</groupId>
+        <artifactId>slf4j-api</artifactId>
+        <version>${slf4j.version}</version>
+      </dependency>
+
+      <dependency>
+        <groupId>org.slf4j</groupId>
+        <artifactId>slf4j-log4j12</artifactId>
+        <version>${slf4j.version}</version>
+      </dependency>
+
+      <dependency>
         <groupId>oro</groupId>
         <artifactId>oro</artifactId>
-        <version>2.0.8</version>
+        <version>${oro.version}</version>
       </dependency>
 
       <dependency>
         <groupId>xmlrpc</groupId>
         <artifactId>xmlrpc</artifactId>
-        <version>2.0.1</version>
+        <version>${xmlrpc.version}</version>
       </dependency>
 
       <!-- test dependencies -->
       <dependency>
-        <groupId>org.junit</groupId>
-        <artifactId>junit-bom</artifactId>
-        <version>${junit.version}</version>
-        <type>pom</type>
-        <scope>import</scope>
-      </dependency>
-
-      <dependency>
         <groupId>net.sourceforge.stripes</groupId>
         <artifactId>stripes</artifactId>
-        <version>1.6.0</version>
+        <version>${stripes.version}</version>
       </dependency>
 
       <!--
@@ -263,39 +280,47 @@
       <dependency>
         <groupId>org.eclipse.jetty.aggregate</groupId>
         <artifactId>jetty-all</artifactId>
-        <version>8.1.15.v20140411</version>
+        <version>${jetty.version}</version>
       </dependency>
 
       <dependency>
         <groupId>org.hsqldb</groupId>
         <artifactId>hsqldb</artifactId>
-        <version>2.3.0</version>
+        <version>${hsqldb.version}</version>
       </dependency>
 
       <dependency>
         <groupId>org.hsqldb</groupId>
         <artifactId>sqltool</artifactId>
-        <version>2.3.0</version>
+        <version>${hsqldb.version}</version>
+      </dependency>
+
+      <dependency>
+        <groupId>org.junit</groupId>
+        <artifactId>junit-bom</artifactId>
+        <version>${junit.version}</version>
+        <type>pom</type>
+        <scope>import</scope>
       </dependency>
 
       <!-- provided dependencies -->
       <dependency>
         <groupId>javax.servlet.jsp</groupId>
         <artifactId>javax.servlet.jsp-api</artifactId>
-        <version>2.3.0</version>
+        <version>${javax-jsp-api.version}</version>
       </dependency>
 
       <dependency>
         <groupId>javax.servlet</groupId>
         <artifactId>javax.servlet-api</artifactId>
-        <version>3.1.0</version>
+        <version>${javax-servlet-api.version}</version>
       </dependency>
 
       <!-- runtime dependencies -->
       <dependency>
         <groupId>net.sourceforge.nekohtml</groupId>
         <artifactId>nekohtml</artifactId>
-        <version>1.9.21</version>
+        <version>${nekohtml.version}</version>
       </dependency>
     </dependencies>
   </dependencyManagement>
@@ -393,8 +418,8 @@
                 <version>${jdk.version}</version>
               </requireJavaVersion>
               <requireMavenVersion>
-                <message>BUILD REQUIRES MAVEN 3</message>
-                <version>[3.5,)</version>
+                <message>BUILD REQUIRES MAVEN ${maven.version}</message>
+                <version>[${maven.version},)</version>
               </requireMavenVersion>
             </rules>
           </configuration>

[jspwiki] 14/17: suppress unchecked warning

[ju...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

juanpablo pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/jspwiki.git

commit cbe5977d1b72471bf67e5365ff7e4ff46b06a579
Author: juanpablo <ju...@apache.org>
AuthorDate: Sun Oct 28 22:43:04 2018 +0100

    suppress unchecked warning
---
 .../src/main/java/org/apache/wiki/filters/PingWeblogsComFilter.java    | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/jspwiki-main/src/main/java/org/apache/wiki/filters/PingWeblogsComFilter.java b/jspwiki-main/src/main/java/org/apache/wiki/filters/PingWeblogsComFilter.java
index a2337d9..8cbe7bf 100644
--- a/jspwiki-main/src/main/java/org/apache/wiki/filters/PingWeblogsComFilter.java
+++ b/jspwiki-main/src/main/java/org/apache/wiki/filters/PingWeblogsComFilter.java
@@ -104,7 +104,8 @@ public class PingWeblogsComFilter
                                                               URL url,
                                                               String method )
                                     {
-                                        Hashtable res = (Hashtable) result;
+                                        @SuppressWarnings("unchecked")
+                                        Hashtable< String, Object > res = (Hashtable < String, Object > ) result;
 
                                         Boolean flerror = (Boolean)res.get("flerror");
                                         String  msg     = (String)res.get("message");

[jspwiki] 06/17: plugins versions' as maven properties too

[ju...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

juanpablo pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/jspwiki.git

commit f3a3452f13f949e1086f75e9a60ffe34ab8926a3
Author: juanpablo <ju...@apache.org>
AuthorDate: Sun Oct 28 19:04:09 2018 +0100

    plugins versions' as maven properties too
---
 pom.xml | 130 +++++++++++++++++++++++++++++++++++++---------------------------
 1 file changed, 75 insertions(+), 55 deletions(-)

diff --git a/pom.xml b/pom.xml
index 5038abb..b6d0efe 100644
--- a/pom.xml
+++ b/pom.xml
@@ -73,6 +73,34 @@
     <wro4j.version>1.8.0</wro4j.version>
     <xmlrpc.version>2.0.1</xmlrpc.version>
 
+    <plugin.antrun.version>1.8</plugin.antrun.version>
+    <plugin.assembly.version>3.1.0</plugin.assembly.version>
+    <plugin.clean.version>3.1.0</plugin.clean.version>
+    <plugin.compiler.version>3.8.0</plugin.compiler.version>
+    <plugin.dependency.version>3.1.1</plugin.dependency.version>
+    <plugin.eclipse.version>2.10</plugin.eclipse.version>
+    <plugin.enforcer.version>1.4.1</plugin.enforcer.version>
+    <plugin.idea.version>2.2.1</plugin.idea.version>
+    <plugin.install.version>2.5.2</plugin.install.version>
+    <plugin.jar.version>3.1.0</plugin.jar.version>
+    <plugin.javadoc.version>3.0.1</plugin.javadoc.version>
+    <plugin.jxr.version>3.0.0</plugin.jxr.version>
+    <plugin.project-info-reports.version>3.0.0</plugin.project-info-reports.version>
+    <plugin.release.version>2.5.3</plugin.release.version>
+    <plugin.resources.version>3.1.0</plugin.resources.version>
+    <plugin.source.version>3.0.1</plugin.source.version>
+    <plugin.surefire.version>2.22.0</plugin.surefire.version>
+    <plugin.war.version>3.2.2</plugin.war.version>
+    <plugin.inmemdb.version>1.4.3</plugin.inmemdb.version>
+    <plugin.checksum.version>1.7</plugin.checksum.version>
+    <plugin.jslint.version>1.0.1</plugin.jslint.version>
+    <plugin.cargo.version>1.6.10</plugin.cargo.version>
+    <plugin.clirr.version>2.8</plugin.clirr.version>
+    <plugin.cobertura.version>2.7</plugin.cobertura.version>
+    <plugin.selenium.version>2.3</plugin.selenium.version>
+    <plugin.sonar.version>3.4.0.905</plugin.sonar.version>
+    <plugin.sonar-report.version>0.1</plugin.sonar-report.version>
+    <plugin.eclipse-lifecycle-mapping.version>1.0.0</plugin.eclipse-lifecycle-mapping.version>
     <maven.compiler.source>${jdk}</maven.compiler.source> <!-- override values from parent pom -->
     <maven.compiler.target>${jdk}</maven.compiler.target>
     <minimize>true</minimize> <!-- wro4j compression -->
@@ -347,22 +375,22 @@
       <plugins>        <!-- ordered alphabetically by groupId (default first):artifactId                                                -->
         <plugin>       <!-- default maven plugins have their version configured to make the build independent of the maven version used -->
           <artifactId>maven-antrun-plugin</artifactId>
-          <version>1.8</version>
+          <version>${plugin.antrun.version}</version>
         </plugin>
 
         <plugin>
           <artifactId>maven-assembly-plugin</artifactId>
-          <version>3.1.0</version>
+          <version>${plugin.assembly.version}</version>
         </plugin>
 
         <plugin>
           <artifactId>maven-clean-plugin</artifactId>
-          <version>3.1.0</version>
+          <version>${plugin.clean.version}</version>
         </plugin>
 
         <plugin>
           <artifactId>maven-compiler-plugin</artifactId>
-          <version>3.8.0</version>
+          <version>${plugin.compiler.version}</version>
           <configuration>
             <encoding>${project.build.sourceEncoding}</encoding>
             <source>${jdk.version}</source>
@@ -372,12 +400,12 @@
 
         <plugin>
           <artifactId>maven-dependency-plugin</artifactId>
-          <version>3.1.1</version>
+          <version>${plugin.dependency.version}</version>
         </plugin>
 
         <plugin>
           <artifactId>maven-eclipse-plugin</artifactId>
-          <version>2.10</version>
+          <version>${plugin.eclipse.version}</version>
           <configuration>
             <downloadSources>true</downloadSources>
             <downloadJavadocs>true</downloadJavadocs>
@@ -399,17 +427,8 @@
         </plugin>
 
         <plugin>
-          <artifactId>maven-idea-plugin</artifactId>
-          <version>2.2.1</version>
-          <configuration>
-            <downloadSources>true</downloadSources>
-            <downloadJavadocs>true</downloadJavadocs>
-          </configuration>
-        </plugin>
-
-        <plugin>
           <artifactId>maven-enforcer-plugin</artifactId>
-          <version>1.4.1</version>
+          <version>${plugin.enforcer.version}</version>
           <configuration>
             <fail>true</fail>
             <rules>
@@ -426,24 +445,17 @@
         </plugin>
 
         <plugin>
-          <artifactId>maven-jar-plugin</artifactId>
-          <version>3.1.0</version>
+          <artifactId>maven-idea-plugin</artifactId>
+          <version>${plugin.idea.version}</version>
           <configuration>
-            <archive>
-              <manifest>
-                <addDefaultSpecificationEntries>true</addDefaultSpecificationEntries>
-                <addDefaultImplementationEntries>true</addDefaultImplementationEntries>
-              </manifest>
-              <manifestEntries>
-                <Extension-Name>${project.artifactId}</Extension-Name>
-              </manifestEntries>
-            </archive>
+            <downloadSources>true</downloadSources>
+            <downloadJavadocs>true</downloadJavadocs>
           </configuration>
         </plugin>
 
         <plugin>
           <artifactId>maven-install-plugin</artifactId>
-          <version>2.5.2</version>
+          <version>${plugin.install.version}</version>
           <configuration>
             <createChecksum>true</createChecksum>
           </configuration>
@@ -451,7 +463,7 @@
 
         <plugin>
           <artifactId>maven-javadoc-plugin</artifactId>
-          <version>3.0.1</version>
+          <version>${plugin.javadoc.version}</version>
           <configuration>
             <additionalOptions>
               <additionalOption>-sourceclasspath ${project.build.outputDirectory}</additionalOption>
@@ -475,18 +487,34 @@
         </plugin>
 
         <plugin>
+          <artifactId>maven-jar-plugin</artifactId>
+          <version>${plugin.jar.version}</version>
+          <configuration>
+            <archive>
+              <manifest>
+                <addDefaultSpecificationEntries>true</addDefaultSpecificationEntries>
+                <addDefaultImplementationEntries>true</addDefaultImplementationEntries>
+              </manifest>
+              <manifestEntries>
+                <Extension-Name>${project.artifactId}</Extension-Name>
+              </manifestEntries>
+            </archive>
+          </configuration>
+        </plugin>
+
+        <plugin>
           <artifactId>maven-jxr-plugin</artifactId>
-          <version>3.0.0</version>
+          <version>${plugin.jxr.version}</version>
         </plugin>
 
         <plugin>
           <artifactId>maven-project-info-reports-plugin</artifactId>
-          <version>3.0.0</version>
+          <version>${plugin.project-info-reports.version}</version>
         </plugin>
 
         <plugin>
           <artifactId>maven-release-plugin</artifactId>
-          <version>2.5.3</version>
+          <version>${plugin.release.version}</version>
           <dependencies>
             <dependency>
               <groupId>org.apache.maven.scm</groupId>
@@ -505,7 +533,7 @@
 
         <plugin>
           <artifactId>maven-resources-plugin</artifactId>
-          <version>3.1.0</version>
+          <version>${plugin.resources.version}</version>
           <configuration>
             <encoding>${project.build.sourceEncoding}</encoding>
           </configuration>
@@ -513,12 +541,12 @@
 
         <plugin>
           <artifactId>maven-source-plugin</artifactId>
-          <version>3.0.1</version>
+          <version>${plugin.source.version}</version>
         </plugin>
 
         <plugin>
           <artifactId>maven-surefire-plugin</artifactId>
-          <version>2.22.0</version>
+          <version>${plugin.surefire.version}</version>
           <configuration>
             <systemPropertyVariables>
               <java.io.tmpdir>${project.build.directory}</java.io.tmpdir>
@@ -528,12 +556,12 @@
 
         <plugin>
           <artifactId>maven-surefire-report-plugin</artifactId>
-          <version>2.22.0</version>
+          <version>${plugin.surefire.version}</version>
         </plugin>
 
         <plugin>
           <artifactId>maven-war-plugin</artifactId>
-          <version>3.2.2</version>
+          <version>${plugin.war.version}</version>
           <configuration>
             <archive>
               <manifest>
@@ -559,13 +587,13 @@
         <plugin>
           <groupId>com.btmatthews.maven.plugins.inmemdb</groupId>
           <artifactId>inmemdb-maven-plugin</artifactId>
-          <version>1.4.3</version>
+          <version>${plugin.inmemdb.version}</version>
         </plugin>
         
         <plugin>
           <groupId>net.nicoulaj.maven.plugins</groupId>
           <artifactId>checksum-maven-plugin</artifactId>
-          <version>1.7</version>
+          <version>${plugin.checksum.version}</version>
           <executions>
             <execution>
               <goals>
@@ -593,18 +621,10 @@
           </configuration>
         </plugin>
 
-        <!-- yuicompressor  => replaced by wro4j
-        <plugin>
-          <groupId>net.alchim31.maven</groupId>
-          <artifactId>yuicompressor-maven-plugin</artifactId>
-          <version>1.3.2</version>
-        </plugin>
-        -->
-
         <plugin>
           <groupId>org.codehaus.mojo</groupId>
           <artifactId>jslint-maven-plugin</artifactId>
-          <version>1.0.1</version>
+          <version>${plugin.jslint.version}</version>
         </plugin>
 
         <plugin>
@@ -636,7 +656,7 @@
         <plugin>
           <groupId>org.codehaus.cargo</groupId>
           <artifactId>cargo-maven2-plugin</artifactId>
-          <version>1.6.10</version>
+          <version>${plugin.cargo.version}</version>
           <configuration>
             <container>
               <!-- https://codehaus-cargo.github.io/cargo/Maven2+Plugin+Reference+Guide.html#Maven2PluginReferenceGuide-container -->
@@ -674,13 +694,13 @@
         <plugin>
           <groupId>org.codehaus.mojo</groupId>
           <artifactId>clirr-maven-plugin</artifactId>
-          <version>2.8</version>
+          <version>${plugin.clirr.version}</version>
         </plugin>
 
         <plugin>
           <groupId>org.codehaus.mojo</groupId>
           <artifactId>cobertura-maven-plugin</artifactId>
-          <version>2.7</version>
+          <version>${plugin.cobertura.version}</version>
           <configuration>
             <formats>
               <format>html</format>
@@ -692,7 +712,7 @@
         <plugin>
           <groupId>org.codehaus.mojo</groupId>
           <artifactId>selenium-maven-plugin</artifactId>
-          <version>2.3</version>
+          <version>${plugin.selenium.version}</version>
           <configuration>
             <background>true</background>
           </configuration>
@@ -701,20 +721,20 @@
         <plugin>
           <groupId>org.sonarsource.scanner.maven</groupId>
           <artifactId>sonar-maven-plugin</artifactId>
-          <version>3.4.0.905</version>
+          <version>${plugin.sonar.version}</version>
         </plugin>
 
         <plugin>
           <groupId>org.codehaus.sonar-plugins</groupId>
           <artifactId>maven-report</artifactId>
-          <version>0.1</version>
+          <version>${plugin.sonar-report.version}</version>
         </plugin>
 
         <!--This plugin's configuration is used to store Eclipse m2e settings only. It has no influence on the Maven build itself.-->
         <plugin>
           <groupId>org.eclipse.m2e</groupId>
           <artifactId>lifecycle-mapping</artifactId>
-          <version>1.0.0</version>
+          <version>${plugin.eclipse-lifecycle-mapping.version}</version>
           <configuration>
             <lifecycleMappingMetadata>
               <pluginExecutions>

[jspwiki] 08/17: organize imports

[ju...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

juanpablo pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/jspwiki.git

commit e4b44ed72035f373b9a0774bb7b37c9932c81f0e
Author: juanpablo <ju...@apache.org>
AuthorDate: Sun Oct 28 21:08:43 2018 +0100

    organize imports
---
 .../src/main/java/org/apache/wiki/providers/WikiPageProvider.java    | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/jspwiki-main/src/main/java/org/apache/wiki/providers/WikiPageProvider.java b/jspwiki-main/src/main/java/org/apache/wiki/providers/WikiPageProvider.java
index a0e0a74..3644edd 100644
--- a/jspwiki-main/src/main/java/org/apache/wiki/providers/WikiPageProvider.java
+++ b/jspwiki-main/src/main/java/org/apache/wiki/providers/WikiPageProvider.java
@@ -18,11 +18,12 @@
  */
 package org.apache.wiki.providers;
 
-import java.util.List;
 import java.util.Collection;
 import java.util.Date;
+import java.util.List;
 
-import org.apache.wiki.*;
+import org.apache.wiki.WikiPage;
+import org.apache.wiki.WikiProvider;
 import org.apache.wiki.api.exceptions.ProviderException;
 import org.apache.wiki.search.QueryItem;
 

[jspwiki] 11/17: ReferenceManager#findReferrers returns Set< String > instead of Collection< String > (not backward compatible)

[ju...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

juanpablo pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/jspwiki.git

commit ce2648e97171633dd7ec6bacaa8035a945d8c164
Author: juanpablo <ju...@apache.org>
AuthorDate: Sun Oct 28 21:44:28 2018 +0100

    ReferenceManager#findReferrers returns Set< String > instead of Collection< String > (not backward compatible)
    
    also, add generics to ReferenceManager wherever needed and propagate the change to remove unnecessary warnings
---
 .../java/org/apache/wiki/ReferenceManager.java     | 72 ++++++++++------------
 .../java/org/apache/wiki/plugin/IndexPlugin.java   | 19 ++----
 .../apache/wiki/plugin/ReferringPagesPlugin.java   |  4 +-
 .../wiki/plugin/ReferringUndefinedPagesPlugin.java |  2 +-
 .../java/org/apache/wiki/plugin/WeblogPlugin.java  |  9 ++-
 .../java/org/apache/wiki/search/SearchManager.java |  6 +-
 .../java/org/apache/wiki/ReferenceManagerTest.java | 34 +++++-----
 .../test/java/org/apache/wiki/WikiEngineTest.java  | 12 ++--
 .../java/org/apache/wiki/rss/RSSGeneratorTest.java | 17 ++---
 9 files changed, 79 insertions(+), 96 deletions(-)

diff --git a/jspwiki-main/src/main/java/org/apache/wiki/ReferenceManager.java b/jspwiki-main/src/main/java/org/apache/wiki/ReferenceManager.java
index 0b9236c..9371f65 100644
--- a/jspwiki-main/src/main/java/org/apache/wiki/ReferenceManager.java
+++ b/jspwiki-main/src/main/java/org/apache/wiki/ReferenceManager.java
@@ -166,8 +166,8 @@ public class ReferenceManager
      */
     public ReferenceManager( WikiEngine engine )
     {
-        m_refersTo   = new HashMap<String,Collection<String>>();
-        m_referredBy = new HashMap<String,Set<String>>();
+        m_refersTo   = new HashMap<>();
+        m_referredBy = new HashMap<>();
         m_engine = engine;
 
         m_matchEnglishPlurals = TextUtil.getBooleanProperty( engine.getWikiProperties(),
@@ -193,11 +193,11 @@ public class ReferenceManager
         Collection<String> links = m_engine.scanWikiLinks( page, content );
 
         res.addAll( links );
-        Collection attachments = m_engine.getAttachmentManager().listAttachments( page );
+        Collection< Attachment > attachments = m_engine.getAttachmentManager().listAttachments( page );
 
-        for( Iterator atti = attachments.iterator(); atti.hasNext(); )
+        for( Iterator< Attachment > atti = attachments.iterator(); atti.hasNext(); )
         {
-            res.add( ((Attachment)(atti.next())).getName() );
+            res.add( atti.next().getName() );
         }
 
         internalUpdateReferences( page.getName(), res );
@@ -212,8 +212,7 @@ public class ReferenceManager
      *  @since 2.2
      *  @throws ProviderException If reading of pages fail.
      */
-    public void initialize( Collection pages )
-        throws ProviderException
+    public void initialize( Collection< WikiPage > pages ) throws ProviderException
     {
         log.debug( "Initializing new ReferenceManager with "+pages.size()+" initial pages." );
         StopWatch sw = new StopWatch();
@@ -237,9 +236,9 @@ public class ReferenceManager
             //
             long saved = unserializeFromDisk();
 
-            for( Iterator it = pages.iterator(); it.hasNext(); )
+            for( Iterator< WikiPage > it = pages.iterator(); it.hasNext(); )
             {
-                WikiPage page = (WikiPage) it.next();
+                WikiPage page = it.next();
 
                 unserializeAttrsFromDisk( page );
             }
@@ -250,11 +249,11 @@ public class ReferenceManager
             //  the references for them.
             //
 
-            Iterator it = pages.iterator();
+            Iterator< WikiPage > it = pages.iterator();
 
             while( it.hasNext() )
             {
-                WikiPage page = (WikiPage) it.next();
+                WikiPage page = it.next();
 
                 if( page instanceof Attachment )
                 {
@@ -284,10 +283,10 @@ public class ReferenceManager
             buildKeyLists( pages );
 
             // Scan the existing pages from disk and update references in the manager.
-            Iterator it = pages.iterator();
+            Iterator< WikiPage > it = pages.iterator();
             while( it.hasNext() )
             {
-                WikiPage page  = (WikiPage)it.next();
+                WikiPage page  = it.next();
 
                 if( page instanceof Attachment )
                 {
@@ -309,8 +308,7 @@ public class ReferenceManager
         sw.stop();
         log.info( "Cross reference scan done in "+sw );
 
-        WikiEventUtils.addWikiEventListener(m_engine.getPageManager(),
-                                            WikiPageEvent.PAGE_DELETED, this);
+        WikiEventUtils.addWikiEventListener(m_engine.getPageManager(), WikiPageEvent.PAGE_DELETED, this);
     }
 
     /**
@@ -342,8 +340,8 @@ public class ReferenceManager
             }
 
             saved        = in.readLong();
-            m_refersTo   = (Map) in.readObject();
-            m_referredBy = (Map) in.readObject();
+            m_refersTo   = ( Map< String, Collection< String > > ) in.readObject();
+            m_referredBy = ( Map< String, Set< String > > ) in.readObject();
 
             in.close();
 
@@ -615,10 +613,10 @@ public class ReferenceManager
 
         if( refTo != null )
         {
-            Iterator itRefTo = refTo.iterator();
+            Iterator< String > itRefTo = refTo.iterator();
             while( itRefTo.hasNext() )
             {
-                String referredPageName = (String)itRefTo.next();
+                String referredPageName = itRefTo.next();
                 Set<String> refBy = m_referredBy.get( referredPageName );
 
                 if( refBy == null )
@@ -702,7 +700,7 @@ public class ReferenceManager
         //
         // Create a new entry in m_refersTo.
         //
-        Collection oldRefTo = m_refersTo.get( page );
+        Collection< String > oldRefTo = m_refersTo.get( page );
         m_refersTo.remove( page );
 
         TreeSet<String> cleanedRefs = new TreeSet<String>();
@@ -750,7 +748,7 @@ public class ReferenceManager
      * 
      * @return The refers-to list.
      */
-    protected Map getRefersTo()
+    protected Map< String, Collection< String > > getRefersTo()
     {
         return m_refersTo;
     }
@@ -760,7 +758,7 @@ public class ReferenceManager
      * 
      * @return Referred-by lists.
      */
-    protected Map getReferredBy()
+    protected Map< String, Set< String > > getReferredBy()
     {
         return m_referredBy;
     }
@@ -770,7 +768,7 @@ public class ReferenceManager
      * any other page. Called after 'referrer' is removed.
      */
     private void cleanReferredBy( String referrer,
-                                  Collection oldReferred,
+                                  Collection<String> oldReferred,
                                   Collection<String> newReferred )
     {
         // Two ways to go about this. One is to look up all pages previously
@@ -784,11 +782,11 @@ public class ReferenceManager
         if( oldReferred == null )
             return;
 
-        Iterator it = oldReferred.iterator();
+        Iterator< String > it = oldReferred.iterator();
         while( it.hasNext() )
         {
-            String referredPage = (String)it.next();
-            Set oldRefBy = m_referredBy.get( referredPage );
+            String referredPage = it.next();
+            Set< String > oldRefBy = m_referredBy.get( referredPage );
             if( oldRefBy != null )
             {
                 oldRefBy.remove( referrer );
@@ -818,7 +816,7 @@ public class ReferenceManager
      *
      * @param pages   a Collection containing WikiPage objects.
      */
-    private synchronized void buildKeyLists( Collection pages )
+    private synchronized void buildKeyLists( Collection< WikiPage > pages )
     {
         m_refersTo.clear();
         m_referredBy.clear();
@@ -826,12 +824,12 @@ public class ReferenceManager
         if( pages == null )
             return;
 
-        Iterator it = pages.iterator();
+        Iterator< WikiPage > it = pages.iterator();
         try
         {
             while( it.hasNext() )
             {
-                WikiPage page = (WikiPage)it.next();
+                WikiPage page = it.next();
                 // We add a non-null entry to referredBy to indicate the referred page exists
                 m_referredBy.put( page.getName(), new TreeSet<String>() );
                 // Just add a key to refersTo; the keys need to be in sync with referredBy.
@@ -926,7 +924,7 @@ public class ReferenceManager
      *  
      *  @return The Collection of Strings
      */
-    public synchronized Collection findUnreferenced()
+    public synchronized Collection< String > findUnreferenced()
     {
         ArrayList<String> unref = new ArrayList<String>();
 
@@ -956,7 +954,7 @@ public class ReferenceManager
      * 
      * @return A Collection of Strings
      */
-    public synchronized Collection findUncreated()
+    public synchronized Collection< String > findUncreated()
     {
         TreeSet<String> uncreated = new TreeSet<String>();
 
@@ -1028,12 +1026,10 @@ public class ReferenceManager
      * collection containing page names (String) that refer to this one.
      * <p>
      * @param pagename The page to find referrers for.
-     * @return A Collection of Strings.  (This is, in fact, a Set, and is likely
-     *         to change at some point to a Set).  May return null, if the page
+     * @return A Set of Strings.  May return null, if the page
      *         does not exist, or if it has no references.
      */
-    // FIXME: Return a Set instead of a Collection.
-    public synchronized Collection findReferrers( String pagename )
+    public synchronized Set< String > findReferrers( String pagename )
     {
         Set<String> refs = getReferenceList( m_referredBy, pagename );
 
@@ -1062,7 +1058,7 @@ public class ReferenceManager
      *         has not been indexed yet.
      * @since 2.2.33
      */
-    public Set findReferredBy( String pageName )
+    public Set< String > findReferredBy( String pageName )
     {
         return m_unmutableReferredBy.get( getFinalPageName(pageName) );
     }
@@ -1085,7 +1081,7 @@ public class ReferenceManager
      *         been indexed yet.
      * @since 2.2.33
      */
-    public Collection findRefersTo( String pageName )
+    public Collection< String > findRefersTo( String pageName )
     {
         return m_unmutableRefersTo.get( getFinalPageName(pageName) );
     }
@@ -1140,7 +1136,7 @@ public class ReferenceManager
      *  @return A Set of all defined page names that ReferenceManager knows about.
      *  @since 2.3.24
      */
-    public Set findCreated()
+    public Set< String > findCreated()
     {
         return new HashSet<String>( m_refersTo.keySet() );
     }
diff --git a/jspwiki-main/src/main/java/org/apache/wiki/plugin/IndexPlugin.java b/jspwiki-main/src/main/java/org/apache/wiki/plugin/IndexPlugin.java
index 4c1128b..3b03fe8 100644
--- a/jspwiki-main/src/main/java/org/apache/wiki/plugin/IndexPlugin.java
+++ b/jspwiki-main/src/main/java/org/apache/wiki/plugin/IndexPlugin.java
@@ -139,20 +139,13 @@ public class IndexPlugin extends AbstractReferralPlugin implements WikiPlugin
      * @return A list containing page names which matched the filters.
      * @throws ProviderException
      */
-    private List<String> listPages( WikiContext context, String include, String exclude )
-            throws ProviderException
-    {
-        Pattern includePtrn = include != null 
-                ? Pattern.compile( include )
-                : Pattern.compile(".*");
-        Pattern excludePtrn = exclude != null
-                ? Pattern.compile( exclude )
-                : Pattern.compile("\\p{Cntrl}"); // there are no control characters in page names
-        List<String> result = new ArrayList<String>();
-        @SuppressWarnings("unchecked")
-        Collection<String> pages = (Collection<String>)context.getEngine().getReferenceManager().findCreated();
+    private List<String> listPages( WikiContext context, String include, String exclude ) throws ProviderException {
+        Pattern includePtrn = include != null ? Pattern.compile( include ) : Pattern.compile(".*");
+        Pattern excludePtrn = exclude != null ? Pattern.compile( exclude ) : Pattern.compile("\\p{Cntrl}"); // there are no control characters in page names
+        List<String> result = new ArrayList<>();
+        Collection<String> pages = context.getEngine().getReferenceManager().findCreated();
         for ( Iterator<String> i = pages.iterator(); i.hasNext(); ) {
-            String pageName = (String) i.next();
+            String pageName = i.next();
             if ( excludePtrn.matcher( pageName ).matches() ) continue;
             if ( includePtrn.matcher( pageName ).matches() ) {
                 result.add( pageName );
diff --git a/jspwiki-main/src/main/java/org/apache/wiki/plugin/ReferringPagesPlugin.java b/jspwiki-main/src/main/java/org/apache/wiki/plugin/ReferringPagesPlugin.java
index 3123c4c..e1ed0dc 100644
--- a/jspwiki-main/src/main/java/org/apache/wiki/plugin/ReferringPagesPlugin.java
+++ b/jspwiki-main/src/main/java/org/apache/wiki/plugin/ReferringPagesPlugin.java
@@ -88,8 +88,8 @@ public class ReferringPagesPlugin
         
         if( page != null )
         {
-            Collection   links  = refmgr.findReferrers( page.getName() );
-            String       wikitext = "";
+            Collection< String > links  = refmgr.findReferrers( page.getName() );
+            String wikitext = "";
 
             super.initialize( context, params );
 
diff --git a/jspwiki-main/src/main/java/org/apache/wiki/plugin/ReferringUndefinedPagesPlugin.java b/jspwiki-main/src/main/java/org/apache/wiki/plugin/ReferringUndefinedPagesPlugin.java
index 77287bc..f56aee4 100644
--- a/jspwiki-main/src/main/java/org/apache/wiki/plugin/ReferringUndefinedPagesPlugin.java
+++ b/jspwiki-main/src/main/java/org/apache/wiki/plugin/ReferringUndefinedPagesPlugin.java
@@ -71,7 +71,7 @@ public class ReferringUndefinedPagesPlugin extends AbstractReferralPlugin {
 
         Collection<String> result = null;
 
-        TreeMap sortedMap = new TreeMap();
+        TreeMap< String, String > sortedMap = new TreeMap<>();
         if (uncreatedPages != null) {
             for (String uncreatedPageName : uncreatedPages) {
                 Collection<String> referrers = referenceManager.findReferrers(uncreatedPageName);
diff --git a/jspwiki-main/src/main/java/org/apache/wiki/plugin/WeblogPlugin.java b/jspwiki-main/src/main/java/org/apache/wiki/plugin/WeblogPlugin.java
index 5d4c9de..f6c9931 100644
--- a/jspwiki-main/src/main/java/org/apache/wiki/plugin/WeblogPlugin.java
+++ b/jspwiki-main/src/main/java/org/apache/wiki/plugin/WeblogPlugin.java
@@ -435,20 +435,19 @@ public class WeblogPlugin
      *  @return a list of pages with their FIRST revisions.
      *  @throws ProviderException If something goes wrong
      */
-    public List findBlogEntries( WikiEngine engine,
-                                 String baseName, Date start, Date end )
+    public List< WikiPage > findBlogEntries( WikiEngine engine, String baseName, Date start, Date end )
         throws ProviderException
     {
         PageManager mgr = engine.getPageManager();
-        Set allPages = engine.getReferenceManager().findCreated();
+        Set< String > allPages = engine.getReferenceManager().findCreated();
 
         ArrayList<WikiPage> result = new ArrayList<WikiPage>();
 
         baseName = makeEntryPage( baseName );
 
-        for( Iterator i = allPages.iterator(); i.hasNext(); )
+        for( Iterator< String > i = allPages.iterator(); i.hasNext(); )
         {
-            String pageName = (String)i.next();
+            String pageName = i.next();
 
             if( pageName.startsWith( baseName ) )
             {
diff --git a/jspwiki-main/src/main/java/org/apache/wiki/search/SearchManager.java b/jspwiki-main/src/main/java/org/apache/wiki/search/SearchManager.java
index 6b6ed99..a638907 100644
--- a/jspwiki-main/src/main/java/org/apache/wiki/search/SearchManager.java
+++ b/jspwiki-main/src/main/java/org/apache/wiki/search/SearchManager.java
@@ -185,12 +185,12 @@ public class SearchManager extends BasicPageFilter implements InternalModule, Wi
 
                 String oldStyleName = MarkupParser.wikifyLink(wikiName).toLowerCase() + filename;
 
-                Set allPages = m_engine.getReferenceManager().findCreated();
+                Set< String > allPages = m_engine.getReferenceManager().findCreated();
 
                 int counter = 0;
-                for( Iterator i = allPages.iterator(); i.hasNext() && counter < maxLength; )
+                for( Iterator< String > i = allPages.iterator(); i.hasNext() && counter < maxLength; )
                 {
-                    String p = (String) i.next();
+                    String p = i.next();
                     String pp = p.toLowerCase();
                     if( pp.startsWith( cleanWikiName) || pp.startsWith( oldStyleName ) )
                     {
diff --git a/jspwiki-main/src/test/java/org/apache/wiki/ReferenceManagerTest.java b/jspwiki-main/src/test/java/org/apache/wiki/ReferenceManagerTest.java
index 3fde3ee..71afe02 100644
--- a/jspwiki-main/src/test/java/org/apache/wiki/ReferenceManagerTest.java
+++ b/jspwiki-main/src/test/java/org/apache/wiki/ReferenceManagerTest.java
@@ -129,8 +129,8 @@ public class ReferenceManagerTest
         c = mgr.findUnreferenced();
         Assertions.assertEquals( 1, c.size(), "Wrong # of orphan pages" );
 
-        Iterator i = c.iterator();
-        String first = (String) i.next();
+        Iterator< String > i = c.iterator();
+        String first = i.next();
         Assertions.assertEquals( "TestPage", first, "Not correct referrers" );
     }
 
@@ -168,7 +168,7 @@ public class ReferenceManagerTest
     public void testRefersTo()
         throws Exception
     {
-        Collection s = mgr.findRefersTo( "Foobar" );
+        Collection< String > s = mgr.findRefersTo( "Foobar" );
 
         Assertions.assertTrue( s.contains("Foobar"), "does not have Foobar" );
         // Assertions.assertTrue( "does not have Foobars", s.contains("Foobars") );
@@ -210,8 +210,6 @@ public class ReferenceManagerTest
 
         c = mgr.findReferrers( "Foobar" );
         Assertions.assertNotNull( c, "referrers expected" );
-        Iterator it = c.iterator();
-        String s1 = (String)it.next();
         Assertions.assertTrue( c.size()==2, "Foobar referrers" );
     }
 
@@ -254,10 +252,6 @@ public class ReferenceManagerTest
         Collection< String > c = mgr.findReferrers( "Foobars" );
         Assertions.assertNotNull( c, "referrers expected" );
         Assertions.assertEquals( 2, c.size(), "Foobars referrers count" );
-
-        Iterator< String > i = c.iterator();
-        String first = i.next();
-
         Assertions.assertTrue( c.contains("TestPage") && c.contains("Foobar"), "Foobars referrers" );
     }
 
@@ -382,17 +376,17 @@ public class ReferenceManagerTest
         {
             buf.append( "================================================================\n" );
             buf.append( "Referred By list:\n" );
-            Set keys = rm.getReferredBy().keySet();
-            Iterator it = keys.iterator();
+            Set< String > keys = rm.getReferredBy().keySet();
+            Iterator< String > it = keys.iterator();
             while( it.hasNext() )
             {
-                String key = (String) it.next();
+                String key = it.next();
                 buf.append( key + " referred by: " );
-                Set refs = (Set)rm.getReferredBy().get( key );
-                Iterator rit = refs.iterator();
+                Set< String > refs = rm.getReferredBy().get( key );
+                Iterator< String > rit = refs.iterator();
                 while( rit.hasNext() )
                 {
-                    String aRef = (String)rit.next();
+                    String aRef = rit.next();
                     buf.append( aRef + " " );
                 }
                 buf.append( "\n" );
@@ -407,19 +401,19 @@ public class ReferenceManagerTest
             {
                 String key = (String) it.next();
                 buf.append( key + " refers to: " );
-                Collection refs = (Collection)rm.getRefersTo().get( key );
+                Collection< String > refs = rm.getRefersTo().get( key );
                 if(refs != null)
                 {
-                    Iterator rit = refs.iterator();
+                    Iterator< String > rit = refs.iterator();
                     while( rit.hasNext() )
                     {
-                        String aRef = (String)rit.next();
+                        String aRef = rit.next();
                         buf.append( aRef + " " );
                     }
                     buf.append( "\n" );
-                }
-                else
+                } else {
                     buf.append("(no references)\n");
+                }
             }
             buf.append( "================================================================\n" );
         }
diff --git a/jspwiki-main/src/test/java/org/apache/wiki/WikiEngineTest.java b/jspwiki-main/src/test/java/org/apache/wiki/WikiEngineTest.java
index 906caa7..b3b6bfb 100644
--- a/jspwiki-main/src/test/java/org/apache/wiki/WikiEngineTest.java
+++ b/jspwiki-main/src/test/java/org/apache/wiki/WikiEngineTest.java
@@ -403,7 +403,7 @@ public class WikiEngineTest
         try
         {
             // and check post-conditions
-            Collection c = refMgr.findUncreated();
+            Collection< String > c = refMgr.findUncreated();
             Assertions.assertTrue( c==null || c.size()==0, "attachment exists: "+c );
 
             c = refMgr.findUnreferenced();
@@ -453,7 +453,7 @@ public class WikiEngineTest
 
         // check a few pre-conditions
 
-        Collection c = refMgr.findReferrers( "TestAtt.txt" );
+        Collection< String > c = refMgr.findReferrers( "TestAtt.txt" );
         Assertions.assertTrue( c!=null && ((String)c.iterator().next()).equals( NAME1 ), "normal, unexisting page" );
 
         c = refMgr.findReferrers( NAME1+"/TestAtt.txt" );
@@ -511,7 +511,7 @@ public class WikiEngineTest
         try
         {
             // and check post-conditions
-            Collection c = refMgr.findUncreated();
+            Collection< String > c = refMgr.findUncreated();
             Assertions.assertTrue( c==null || c.size()==0, "attachment exists" );
 
             c = refMgr.findUnreferenced();
@@ -547,7 +547,7 @@ public class WikiEngineTest
         try
         {
             // and check post-conditions
-            Collection c = refMgr.findUncreated();
+            Collection< String > c = refMgr.findUncreated();
             Assertions.assertTrue( c==null || c.size()==0, "attachment exists" );
 
             c = refMgr.findUnreferenced();
@@ -646,7 +646,7 @@ public class WikiEngineTest
         Assertions.assertNull( m_engine.getPage(NAME1), "Page not removed" );
         Assertions.assertNull( m_engine.getPage(NAME1+"/TestAtt.txt"), "Att not removed" );
 
-        Collection refs = m_engine.getReferenceManager().findReferrers(NAME1);
+        Collection< String > refs = m_engine.getReferenceManager().findReferrers(NAME1);
 
         Assertions.assertNull( refs, "referrers" );
     }
@@ -759,7 +759,7 @@ public class WikiEngineTest
         m_engine.saveText( "RenameBugTestPage", "Mary had a little generic object" );
         m_engine.saveText( "OldNameTestPage", "Linked to RenameBugTestPage" );
 
-        Collection pages = m_engine.getReferenceManager().findReferrers( "RenameBugTestPage" );
+        Collection< String > pages = m_engine.getReferenceManager().findReferrers( "RenameBugTestPage" );
         Assertions.assertEquals( "OldNameTestPage", pages.iterator().next(), "has one" );
 
         WikiContext ctx = new WikiContext( m_engine, m_engine.getPage("OldNameTestPage") );
diff --git a/jspwiki-main/src/test/java/org/apache/wiki/rss/RSSGeneratorTest.java b/jspwiki-main/src/test/java/org/apache/wiki/rss/RSSGeneratorTest.java
index 46fa453..aa58605 100644
--- a/jspwiki-main/src/test/java/org/apache/wiki/rss/RSSGeneratorTest.java
+++ b/jspwiki-main/src/test/java/org/apache/wiki/rss/RSSGeneratorTest.java
@@ -29,6 +29,7 @@ import java.util.Properties;
 
 import org.apache.wiki.TestEngine;
 import org.apache.wiki.WikiContext;
+import org.apache.wiki.WikiPage;
 import org.apache.wiki.plugin.WeblogEntryPlugin;
 import org.apache.wiki.plugin.WeblogPlugin;
 import org.apache.wiki.providers.FileSystemProvider;
@@ -82,10 +83,10 @@ public class RSSGeneratorTest
 
         WeblogPlugin blogplugin = new WeblogPlugin();
 
-        List< ? > entries = blogplugin.findBlogEntries( m_testEngine,
-                                                       "TestBlog",
-                                                        new Date(0),
-                                                        new Date(Long.MAX_VALUE) );
+        List< WikiPage > entries = blogplugin.findBlogEntries( m_testEngine,
+                                                               "TestBlog",
+                                                               new Date(0),
+                                                               new Date(Long.MAX_VALUE) );
 
         Feed feed = new RSS10Feed( context );
         String blog = gen.generateBlogRSS( context, entries, feed );
@@ -113,10 +114,10 @@ public class RSSGeneratorTest
 
         WeblogPlugin blogplugin = new WeblogPlugin();
 
-        List< ? > entries = blogplugin.findBlogEntries( m_testEngine,
-                                                       "TestBlog",
-                                                        new Date(0),
-                                                        new Date(Long.MAX_VALUE) );
+        List< WikiPage > entries = blogplugin.findBlogEntries( m_testEngine,
+                                                               "TestBlog",
+                                                               new Date(0),
+                                                               new Date(Long.MAX_VALUE) );
 
         Feed feed = new RSS20Feed( context );
         String blog = gen.generateBlogRSS( context, entries, feed );

[jspwiki] 13/17: remove unnecessary @SuppressWarnings

[ju...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

juanpablo pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/jspwiki.git

commit a9a628a5b02d5eb7d21235c73bdf3a7a6b2fb53d
Author: juanpablo <ju...@apache.org>
AuthorDate: Sun Oct 28 22:41:54 2018 +0100

    remove unnecessary @SuppressWarnings
---
 jspwiki-main/src/main/java/org/apache/wiki/content/PageRenamer.java | 2 --
 1 file changed, 2 deletions(-)

diff --git a/jspwiki-main/src/main/java/org/apache/wiki/content/PageRenamer.java b/jspwiki-main/src/main/java/org/apache/wiki/content/PageRenamer.java
index 96d33dc..22df9e0 100644
--- a/jspwiki-main/src/main/java/org/apache/wiki/content/PageRenamer.java
+++ b/jspwiki-main/src/main/java/org/apache/wiki/content/PageRenamer.java
@@ -251,7 +251,6 @@ public class PageRenamer
     {
         Set<String> referrers = new TreeSet<String>();
         
-        @SuppressWarnings( "unchecked" )
         Collection<String> r = engine.getReferenceManager().findReferrers( fromPage.getName() );
         if( r != null ) referrers.addAll( r );
         
@@ -262,7 +261,6 @@ public class PageRenamer
 
             for( Attachment att : attachments  )
             {
-                @SuppressWarnings( "unchecked" )
                 Collection<String> c = engine.getReferenceManager().findReferrers(att.getName());
 
                 if( c != null ) referrers.addAll(c);

[jspwiki] 09/17: WikiPage very small refactors

[ju...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

juanpablo pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/jspwiki.git

commit 35e544c8619eaaba07156188f2afbdcc9466a748
Author: juanpablo <ju...@apache.org>
AuthorDate: Sun Oct 28 21:11:07 2018 +0100

    WikiPage very small refactors
    
    implements Comparable< WikiPage > instead of Comparable
    returns Map< String, Object > on getAttributes instead of Map; use this change elsewhere
---
 .../src/main/java/org/apache/wiki/ReferenceManager.java    |  6 +++---
 jspwiki-main/src/main/java/org/apache/wiki/WikiPage.java   | 14 +++++---------
 2 files changed, 8 insertions(+), 12 deletions(-)

diff --git a/jspwiki-main/src/main/java/org/apache/wiki/ReferenceManager.java b/jspwiki-main/src/main/java/org/apache/wiki/ReferenceManager.java
index 74682da..0b9236c 100644
--- a/jspwiki-main/src/main/java/org/apache/wiki/ReferenceManager.java
+++ b/jspwiki-main/src/main/java/org/apache/wiki/ReferenceManager.java
@@ -519,7 +519,7 @@ public class ReferenceManager
             f = new File( f, getHashFileName(p.getName()) );
 
             // FIXME: There is a concurrency issue here...
-            Set entries = p.getAttributes().entrySet();
+            Set< Map.Entry < String, Object > > entries = p.getAttributes().entrySet();
 
             if( entries.size() == 0 ) 
             {
@@ -538,9 +538,9 @@ public class ReferenceManager
             out.writeUTF( p.getName() );
             out.writeLong( entries.size() );
 
-            for( Iterator i = entries.iterator(); i.hasNext(); )
+            for( Iterator< Map.Entry < String, Object > > i = entries.iterator(); i.hasNext(); )
             {
-                Map.Entry e = (Map.Entry) i.next();
+                Map.Entry< String, Object > e = i.next();
 
                 if( e.getValue() instanceof Serializable )
                 {
diff --git a/jspwiki-main/src/main/java/org/apache/wiki/WikiPage.java b/jspwiki-main/src/main/java/org/apache/wiki/WikiPage.java
index 09837da..b75bc2b 100644
--- a/jspwiki-main/src/main/java/org/apache/wiki/WikiPage.java
+++ b/jspwiki-main/src/main/java/org/apache/wiki/WikiPage.java
@@ -37,11 +37,7 @@ import org.apache.wiki.providers.WikiPageProvider;
 //        author, date, etc. should also be part of the metadata.  We also
 //        need to figure out the metadata lifecycle.
 
-public class WikiPage
-    implements Cloneable,
-               Comparable
-{
-    private static final long serialVersionUID = 1L;
+public class WikiPage implements Cloneable, Comparable< WikiPage > {
 
     private       String     m_name;
     private       WikiEngine m_engine;
@@ -50,7 +46,7 @@ public class WikiPage
     private long             m_fileSize = -1;
     private int              m_version = WikiPageProvider.LATEST_VERSION;
     private String           m_author = null;
-    private final HashMap<String,Object> m_attributes = new HashMap<String,Object>();
+    private final Map<String,Object> m_attributes = new HashMap<>();
 
     /**
      *  "Summary" is a short summary of the page.  It is a String.
@@ -131,7 +127,7 @@ public class WikiPage
      * @return The attribute Map.  Please note that this is a direct
      *         reference, not a copy.
      */
-    public Map getAttributes() 
+    public Map< String, Object > getAttributes() 
     {
         return m_attributes;
     }
@@ -357,9 +353,9 @@ public class WikiPage
      *  @param page The object to compare against
      *  @return -1, 0 or 1
      */
-    public int compareTo( Object page )
+    public int compareTo( WikiPage page )
     {
-        return m_engine.getPageSorter().compare( this, (WikiPage) page );
+        return m_engine.getPageSorter().compare( this, page );
     }
     
     /**

[jspwiki] 04/17: fix aditionalConfig file locations on maven-eclipse-plugin

[ju...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

juanpablo pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/jspwiki.git

commit 50ebbd7de2ff5f0220576a2a6914ff32e9a02e5c
Author: juanpablo <ju...@apache.org>
AuthorDate: Sun Oct 28 15:30:13 2018 +0100

    fix aditionalConfig file locations on maven-eclipse-plugin
---
 pom.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index 643f073..cbdd7aa 100644
--- a/pom.xml
+++ b/pom.xml
@@ -359,11 +359,11 @@
             <additionalConfig>
               <file>
                 <name>.checkstyle</name>
-                <location>./src/main/config/dev/jspwiki-checkstyle.xml</location>
+                <location>./jspwiki-war/src/main/config/dev/jspwiki-checkstyle.xml</location>
               </file>
               <file>
                 <name>.settings/org.eclipse.jdt.core.prefs</name>
-                <location>./src/main/config/dev/jspwiki-eclipse-codestyle.xml</location>
+                <location>./jspwiki-war/src/main/config/dev/jspwiki-eclipse-codestyle.xml</location>
               </file>
             </additionalConfig>
             <additionalProjectnatures>

[jspwiki] 17/17: 2.11.0-M1-git-05

[ju...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

juanpablo pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/jspwiki.git

commit 6a23999a3ffbb707bffa953110c26d2508e9f105
Author: juanpablo <ju...@apache.org>
AuthorDate: Mon Oct 29 00:25:48 2018 +0100

    2.11.0-M1-git-05
---
 ChangeLog                                          | 54 ++++++++++++++--------
 .../src/main/java/org/apache/wiki/Release.java     |  2 +-
 2 files changed, 35 insertions(+), 21 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 576f08c..e20a438 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,26 +1,40 @@
+2018-10-29  Juan Pablo Santos (juanpablo AT apache DOT org)
+
+       * 2.11.0-M1-git-05: maven build refactor
+         - java code split into its own module: custom extensions should now rely on 
+           the new org.apache.jspwiki:jspwiki-main dependency, instead of the 
+           org.apache.jspwiki:jspwiki-war:classes old one
+         - parent-pom: clean-up + dependencies and plugins versions' set as maven properties
+         - jspwiki-markdown module included into main war
+
+       * several small code refactors, including some backwards-incompatible ones:
+         - PropertiesUtils moved to the util package
+         - ReferenceManager#findReferrers returns Set< String > instead of Collection< String >
+         - AttachmentManager#listAttachments returns a List<Attachment> instead of a Collection
+
 2018-10-26  Juan Pablo Santos (juanpablo AT apache DOT org)
 
        * 2.11.0-M1-git-04: update tests to JUnit 5.3.1
-	   
-	   * updated versions of maven plugins
-	   
-	   * flexmark updated to 0.34.56
+
+       * updated versions of maven plugins
+
+       * flexmark updated to 0.34.56
 
 2018-10-21  Juan Pablo Santos (juanpablo AT apache DOT org)
 
        * 2.11.0-M1-git-03: Haddock is now the default template
-	     - to bring back the 2.10 template set the jspwiki.templateDir property to "210"
-
-	   * added the following pages to the core pages' bundles, as they enable some more haddock functionality
-	     - CSSBackgroundGradients: see https://jspwiki-wiki.apache.org/Wiki.jsp?page=Background%20Gradients
-	     - CSSBackgroundPatterns: see https://jspwiki-wiki.apache.org/Wiki.jsp?page=Background%20Patterns
-	     - CSSInstagramFilters: see https://jspwiki-wiki.apache.org/Wiki.jsp?page=Instagram%20Filters
-	     - CSSPrettifyThemeTomorrowNightBlue: see https://jspwiki-wiki.apache.org/Wiki.jsp?page=Prettify%20Theme%20Tomorrow%20Night%20Blue
-	     - CSSPrettifyThemeTomorrowPrism: see https://jspwiki-wiki.apache.org/Wiki.jsp?page=Prettify%20Theme%20Prism
-	     - CSSRibbon: see https://jspwiki-wiki.apache.org/Wiki.jsp?page=Ribbon
-	     - CSSStripedText: see https://jspwiki-wiki.apache.org/Wiki.jsp?page=Striped Text
-	     - CSSThemeCleanBlue: see https://jspwiki-wiki.apache.org/Wiki.jsp?page=Clean%20Blue%20Theme
-	     - CSSThemeDark: see https://jspwiki-wiki.apache.org/Wiki.jsp?page=Dark%20Theme
+         - to bring back the 2.10 template set the jspwiki.templateDir property to "210"
+
+       * added the following pages to the core pages' bundles, as they enable some more haddock functionality
+         - CSSBackgroundGradients: see https://jspwiki-wiki.apache.org/Wiki.jsp?page=Background%20Gradients
+         - CSSBackgroundPatterns: see https://jspwiki-wiki.apache.org/Wiki.jsp?page=Background%20Patterns
+         - CSSInstagramFilters: see https://jspwiki-wiki.apache.org/Wiki.jsp?page=Instagram%20Filters
+         - CSSPrettifyThemeTomorrowNightBlue: see https://jspwiki-wiki.apache.org/Wiki.jsp?page=Prettify%20Theme%20Tomorrow%20Night%20Blue
+         - CSSPrettifyThemeTomorrowPrism: see https://jspwiki-wiki.apache.org/Wiki.jsp?page=Prettify%20Theme%20Prism
+         - CSSRibbon: see https://jspwiki-wiki.apache.org/Wiki.jsp?page=Ribbon
+         - CSSStripedText: see https://jspwiki-wiki.apache.org/Wiki.jsp?page=Striped Text
+         - CSSThemeCleanBlue: see https://jspwiki-wiki.apache.org/Wiki.jsp?page=Clean%20Blue%20Theme
+         - CSSThemeDark: see https://jspwiki-wiki.apache.org/Wiki.jsp?page=Dark%20Theme
 
 2018-09-30  Juan Pablo Santos (juanpablo AT apache DOT org)
 
@@ -38,9 +52,9 @@
 
 2018-08-31  Juan Pablo Santos (juanpablo AT apache DOT org)
 
-	   * update flexmark to 0.34.22 and ASF parent pom to 21
+       * update flexmark to 0.34.22 and ASF parent pom to 21
 
-	   * prepare release for 2.10.5
+       * prepare release for 2.10.5
 
 2018-08-31  Siegfried Goeschl (sgoeschl@apache.org)
 
@@ -772,7 +786,7 @@
 
        * Fixed the AttachementServlet so you can now select multiple files
          before pressing the upload button.  You can also use
-		 drap & drop if your browser supports it.
+         drap & drop if your browser supports it.
 
         * [JSPWIKI-903] Fixed a page redirect issue when deleting an
          attachment from the Attachment info page.
@@ -1405,7 +1419,7 @@
               test
               }]
 
-		 We are still getting error-code: 490, "No permission to access this AJAX method!"
+         We are still getting error-code: 490, "No permission to access this AJAX method!"
          when invoking a plugin generated json-rpc call.
 
 
diff --git a/jspwiki-main/src/main/java/org/apache/wiki/Release.java b/jspwiki-main/src/main/java/org/apache/wiki/Release.java
index a71cec6..5991e00 100644
--- a/jspwiki-main/src/main/java/org/apache/wiki/Release.java
+++ b/jspwiki-main/src/main/java/org/apache/wiki/Release.java
@@ -72,7 +72,7 @@ public final class Release {
      *  <p>
      *  If the build identifier is empty, it is not added.
      */
-    public static final String     BUILD         = "4";
+    public static final String     BUILD         = "5";
 
     /**
      *  This is the generic version string you should use when printing out the version.  It is of

[jspwiki] 02/17: properly require Maven >= 3.5

[ju...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

juanpablo pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/jspwiki.git

commit ef02cd955e4e67d949ec5f16cfcd5b743902147c
Author: juanpablo <ju...@apache.org>
AuthorDate: Sun Oct 28 15:15:42 2018 +0100

    properly require Maven >= 3.5
---
 pom.xml | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/pom.xml b/pom.xml
index db79277..91a8ef1 100644
--- a/pom.xml
+++ b/pom.xml
@@ -52,10 +52,6 @@
     <minimize>true</minimize> <!-- wro4j compression -->
   </properties>
 
-  <prerequisites>
-    <maven>3.5.0</maven>
-  </prerequisites>
-
   <scm>
     <connection>scm:git:https://github.com/apache/jspwiki.git</connection>
     <developerConnection>scm:git:https://github.com/apache/jspwiki.git</developerConnection>
@@ -398,7 +394,7 @@
               </requireJavaVersion>
               <requireMavenVersion>
                 <message>BUILD REQUIRES MAVEN 3</message>
-                <version>[3.0,)</version>
+                <version>[3.5,)</version>
               </requireMavenVersion>
             </rules>
           </configuration>

[jspwiki] 01/17: bring down configuration for java modules to parent pom

[ju...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

juanpablo pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/jspwiki.git

commit 2ed0b0df8cb8720ca68680e04a0f98303b571a4b
Author: juanpablo <ju...@apache.org>
AuthorDate: Sun Oct 28 15:14:52 2018 +0100

    bring down configuration for java modules to parent pom
---
 pom.xml | 17 ++++++++++++++++-
 1 file changed, 16 insertions(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index eb582e5..db79277 100644
--- a/pom.xml
+++ b/pom.xml
@@ -47,7 +47,7 @@
     <lucene.version>4.7.0</lucene.version>
     <selenium.version>2.42.0</selenium.version>
     <slf4j.version>1.7.25</slf4j.version>
-	<tomcat.version>8.5.34</tomcat.version>
+    <tomcat.version>8.5.34</tomcat.version>
     <wro4j.version>1.8.0</wro4j.version>
     <minimize>true</minimize> <!-- wro4j compression -->
   </properties>
@@ -360,6 +360,16 @@
           <configuration>
             <downloadSources>true</downloadSources>
             <downloadJavadocs>true</downloadJavadocs>
+            <additionalConfig>
+              <file>
+                <name>.checkstyle</name>
+                <location>./src/main/config/dev/jspwiki-checkstyle.xml</location>
+              </file>
+              <file>
+                <name>.settings/org.eclipse.jdt.core.prefs</name>
+                <location>./src/main/config/dev/jspwiki-eclipse-codestyle.xml</location>
+              </file>
+            </additionalConfig>
             <additionalProjectnatures>
               <projectnature>net.sourceforge.metrics.nature</projectnature>
               <projectnature>net.sf.eclipsecs.core.CheckstyleNature</projectnature>
@@ -488,6 +498,11 @@
         <plugin>
           <artifactId>maven-surefire-plugin</artifactId>
           <version>2.22.0</version>
+          <configuration>
+            <systemPropertyVariables>
+              <java.io.tmpdir>${project.build.directory}</java.io.tmpdir>
+            </systemPropertyVariables>
+          </configuration>
         </plugin>
 
         <plugin>

[jspwiki] 12/17: make ModuleBean use WikiModuleInfo instead of to align with former change on FilterManager and PluginManager

[ju...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

juanpablo pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/jspwiki.git

commit 4fbb7680fab316c1ecf24b0eae81607838d72030
Author: juanpablo <ju...@apache.org>
AuthorDate: Sun Oct 28 22:41:09 2018 +0100

    make ModuleBean use WikiModuleInfo instead of <T extends WikiModuleInfo> to align with former change on FilterManager and PluginManager
---
 .../main/java/org/apache/wiki/ui/admin/beans/FilterBean.java |  2 +-
 .../main/java/org/apache/wiki/ui/admin/beans/ModuleBean.java | 12 ++++++------
 .../main/java/org/apache/wiki/ui/admin/beans/PluginBean.java |  9 +++++----
 3 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/jspwiki-main/src/main/java/org/apache/wiki/ui/admin/beans/FilterBean.java b/jspwiki-main/src/main/java/org/apache/wiki/ui/admin/beans/FilterBean.java
index edbfaee..8d952bc 100644
--- a/jspwiki-main/src/main/java/org/apache/wiki/ui/admin/beans/FilterBean.java
+++ b/jspwiki-main/src/main/java/org/apache/wiki/ui/admin/beans/FilterBean.java
@@ -29,7 +29,7 @@ import org.apache.wiki.util.XhtmlUtil;
 import org.jdom2.Element;
 
 
-public class FilterBean extends ModuleBean< WikiModuleInfo > {
+public class FilterBean extends ModuleBean {
 
     public FilterBean( WikiEngine engine ) throws NotCompliantMBeanException {
         super( engine );
diff --git a/jspwiki-main/src/main/java/org/apache/wiki/ui/admin/beans/ModuleBean.java b/jspwiki-main/src/main/java/org/apache/wiki/ui/admin/beans/ModuleBean.java
index 35d0308..af6c14c 100644
--- a/jspwiki-main/src/main/java/org/apache/wiki/ui/admin/beans/ModuleBean.java
+++ b/jspwiki-main/src/main/java/org/apache/wiki/ui/admin/beans/ModuleBean.java
@@ -32,7 +32,7 @@ import org.apache.wiki.util.XHTML;
 import org.apache.wiki.util.XhtmlUtil;
 import org.jdom2.Element;
 
-public abstract class ModuleBean< T extends WikiModuleInfo > extends SimpleAdminBean {
+public abstract class ModuleBean extends SimpleAdminBean {
 
     protected WikiEngine m_engine;
 
@@ -60,14 +60,14 @@ public abstract class ModuleBean< T extends WikiModuleInfo > extends SimpleAdmin
      * {@inheritDoc}
      */
     public String doGet( WikiContext context ) {
-        Collection< T > filters = modules();
+        Collection< WikiModuleInfo > filters = modules();
         Element root = title();
         Element tb = containerForModuleDetail( root );
 
         Element trHead = heading();
         tb.addContent( trHead );
 
-        for( T info : filters ) {
+        for( WikiModuleInfo info : filters ) {
             Element tr = rowBody( info );
             tb.addContent( tr );
         }
@@ -92,7 +92,7 @@ public abstract class ModuleBean< T extends WikiModuleInfo > extends SimpleAdmin
      *
      * @return a collection of {@link WikiModuleInfo}
      */
-    protected abstract Collection< T > modules();
+    protected abstract Collection< WikiModuleInfo > modules();
 
     /**
      * html blob describing the values of each {@link WikiModuleInfo} inspected.
@@ -107,9 +107,9 @@ public abstract class ModuleBean< T extends WikiModuleInfo > extends SimpleAdmin
      * @param module {@link WikiModuleInfo} inspected.
      * @return {@link Element} describing the {@link Element} inspected.
      */
-    protected abstract Element rowBody( T module );
+    protected abstract Element rowBody( WikiModuleInfo module );
 
-    protected String validModuleVersion( T info ) {
+    protected String validModuleVersion( WikiModuleInfo info ) {
         return Release.isNewerOrEqual( info.getMinVersion() ) && Release.isOlderOrEqual( info.getMaxVersion() )
                ? StringUtils.EMPTY
                : VER_WARNING;
diff --git a/jspwiki-main/src/main/java/org/apache/wiki/ui/admin/beans/PluginBean.java b/jspwiki-main/src/main/java/org/apache/wiki/ui/admin/beans/PluginBean.java
index c798764..175fe9a 100644
--- a/jspwiki-main/src/main/java/org/apache/wiki/ui/admin/beans/PluginBean.java
+++ b/jspwiki-main/src/main/java/org/apache/wiki/ui/admin/beans/PluginBean.java
@@ -23,13 +23,14 @@ import java.util.Collection;
 import javax.management.NotCompliantMBeanException;
 
 import org.apache.wiki.WikiEngine;
+import org.apache.wiki.modules.WikiModuleInfo;
 import org.apache.wiki.plugin.DefaultPluginManager.WikiPluginInfo;
 import org.apache.wiki.util.XHTML;
 import org.apache.wiki.util.XhtmlUtil;
 import org.jdom2.Element;
 
 
-public class PluginBean extends ModuleBean< WikiPluginInfo > {
+public class PluginBean extends ModuleBean {
 
     public PluginBean( WikiEngine engine ) throws NotCompliantMBeanException {
         super( engine );
@@ -53,7 +54,7 @@ public class PluginBean extends ModuleBean< WikiPluginInfo > {
      * {@inheritDoc}
      */
     @Override
-    protected Collection< WikiPluginInfo > modules() {
+    protected Collection< WikiModuleInfo > modules() {
         return m_engine.getPluginManager().modules();
     }
 
@@ -74,10 +75,10 @@ public class PluginBean extends ModuleBean< WikiPluginInfo > {
      * {@inheritDoc}
      */
     @Override
-    protected Element rowBody( WikiPluginInfo plugin ) {
+    protected Element rowBody( WikiModuleInfo plugin ) {
         Element tr = XhtmlUtil.element( XHTML.tr );
         tr.addContent( XhtmlUtil.element( XHTML.td ).addContent( plugin.getName() ) )
-          .addContent( XhtmlUtil.element( XHTML.td ).addContent( plugin.getAlias() ) )
+          .addContent( XhtmlUtil.element( XHTML.td ).addContent( ( ( WikiPluginInfo )plugin).getAlias() ) )
           .addContent( XhtmlUtil.element( XHTML.td ).addContent( plugin.getAuthor() ) )
           .addContent( XhtmlUtil.element( XHTML.td ).addContent( validModuleVersion( plugin ) ) );
         return tr;

[jspwiki] 15/17: move PropertiesUtils to util package (breaking backwards-compatible change)

[ju...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

juanpablo pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/jspwiki.git

commit e0fe10e0a26e81e2e8c8ba7c9bf61c2ab6c215b7
Author: juanpablo <ju...@apache.org>
AuthorDate: Sun Oct 28 22:44:34 2018 +0100

    move PropertiesUtils to util package (breaking backwards-compatible change)
---
 .../wiki/{htmltowiki => util}/PropertiesUtils.java  | 21 ++++++++++-----------
 1 file changed, 10 insertions(+), 11 deletions(-)

diff --git a/jspwiki-main/src/main/java/org/apache/wiki/htmltowiki/PropertiesUtils.java b/jspwiki-main/src/main/java/org/apache/wiki/util/PropertiesUtils.java
similarity index 91%
rename from jspwiki-main/src/main/java/org/apache/wiki/htmltowiki/PropertiesUtils.java
rename to jspwiki-main/src/main/java/org/apache/wiki/util/PropertiesUtils.java
index 51ea3bf..4bbe639 100644
--- a/jspwiki-main/src/main/java/org/apache/wiki/htmltowiki/PropertiesUtils.java
+++ b/jspwiki-main/src/main/java/org/apache/wiki/util/PropertiesUtils.java
@@ -16,7 +16,7 @@
     specific language governing permissions and limitations
     under the License.  
  */
-package org.apache.wiki.htmltowiki;
+package org.apache.wiki.util;
 
 import java.util.Iterator;
 import java.util.Map;
@@ -24,13 +24,12 @@ import java.util.Properties;
 import java.util.TreeMap;
 
 /**
- * some usefull methods for properties
+ * some useful methods for properties
  *
  * @version 1.0
  */
-// FIXME3.0 move to utils package
-public final class PropertiesUtils
-{
+public final class PropertiesUtils {
+
     private static final String OTHER_WHITESPACE = "\t\r\n\014";
     private static final char[] HEXDIGIT = { '0', '1', '2', '3', '4', '5', '6', '7', '8', '9', 'A', 'B', 'C', 'D', 'E', 'F' };
 
@@ -46,17 +45,17 @@ public final class PropertiesUtils
      * @param properties the properties object
      * @return String the properties, nicely formatted 
      */
-    @SuppressWarnings("unchecked")
     public static String toSortedString( Properties properties )
     {
-        TreeMap treemap = new TreeMap( properties );
+        @SuppressWarnings( { "unchecked", "rawtypes" } )
+		TreeMap< String, String > treemap = new TreeMap( properties );
         String string = "";
-        Iterator iterator = treemap.entrySet().iterator();
+        Iterator< Map.Entry< String, String > > iterator = treemap.entrySet().iterator();
         while( iterator.hasNext() )
         {
-            Map.Entry entry = (Map.Entry)iterator.next();
-            String key = (String)entry.getKey();
-            String value = entry.getValue() == null ? "null" : entry.getValue().toString();
+            Map.Entry< String, String > entry = iterator.next();
+            String key = entry.getKey();
+            String value = entry.getValue() == null ? "null" : entry.getValue();
             string += toLine( key, value ) + '\n';
         }
         return string;

[jspwiki] 03/17: remove markdown-support profile, module is on the main build now

[ju...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

juanpablo pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/jspwiki.git

commit ea2abc677129d9dd1798c51d0f83517ad7a05659
Author: juanpablo <ju...@apache.org>
AuthorDate: Sun Oct 28 15:16:25 2018 +0100

    remove markdown-support profile, module is on the main build now
---
 pom.xml | 14 --------------
 1 file changed, 14 deletions(-)

diff --git a/pom.xml b/pom.xml
index 91a8ef1..643f073 100644
--- a/pom.xml
+++ b/pom.xml
@@ -775,20 +775,6 @@
         </plugins>
       </build>
     </profile>
-
-    <profile>
-      <id>markdown-support</id>
-      <activation>
-        <jdk>[1.7,)</jdk>
-      </activation>
-      <modules>
-        <module>jspwiki-wikipages</module>
-        <module>jspwiki-war</module>
-        <module>jspwiki-markdown</module>
-        <module>jspwiki-portable</module>
-        <module>jspwiki-it-tests</module><!-- IT tests are launched only if -Pintegration-tests is given -->
-      </modules>
-    </profile>
   </profiles>
 
   <organization>