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 5ed57bd79 remove extra semicolon.
new a39e1a81a Upgrade Tika to 2.4.0
new 1617a34ab only build & destroy one Engine for all tests in class
new 0cbf45c78 Minor format edits
new 3d498669c Footnote links start with #ref-, instead of #
new 903be0fd8 format class
new 5bb7f9734 bom must have packaging == pom
new 7c1255e2e new jspwiki-http module
new f2d231ba1 fix integration tests setup
new ccaf74ad8 Session gets new antiCsrfToken method
new 45f22ecac fix IT check
new 84740147a format web.xml files
new 18bb41c56 Allow TestEngine to disable properties' cleaning through
jspwiki.test.disable-clean-props property
new 63f0617b8 Use Context instead of WikiContext
new 8365f5bee Add dependency on jspwiki-http module
new cdfb63d26 new wiki:CsrfProtection custom tag
new d42623bcc FormOpen generates csrf protection hidden input
new 1f1c94e77 Use new wiki:CsrfProtection tag on JSPs
new 25f3c707a Ensure AJAX requests send the csrf protection parameter
new 087f90afa JSPWiki to Markdown syntax conversion tool
new a55c6afd2 Add missing AL headers
new c4c5f411a Dependency updates
new 9dec27e23 Update Tomcat's binaries
new 5afdd0cdf Update versions
new b7cf446d8 Update mvn cheat sheet
new 69a48e16f 2.11.3-git-09
The 25 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.md | 28 +
LICENSE | 24 +-
.../src/main/java/org/apache/wiki/api/Release.java | 2 +-
.../java/org/apache/wiki/api/core/Session.java | 6 +
jspwiki-bom/pom.xml | 7 +
{jspwiki-bootstrap => jspwiki-http}/pom.xml | 26 +-
.../wiki/http/filter/CsrfProtectionFilter.java | 63 +
.../src/main/resources/META-INF/web-fragment.xml | 30 +-
.../src/main/webapp/WEB-INF/web.xml | 58 +-
.../src/main/webapp/WEB-INF/web.xml | 58 +-
.../src/main/webapp/WEB-INF/web.xml | 58 +-
.../src/main/webapp/WEB-INF/web.xml | 58 +-
.../src/main/webapp/WEB-INF/web.xml | 58 +-
.../apache/wiki/pages/haddock/ViewWikiPage.java | 2 +-
jspwiki-it-tests/pom.xml | 2 +
jspwiki-main/pom.xml | 6 +
.../src/main/java/org/apache/wiki/WikiSession.java | 9 +
.../main/java/org/apache/wiki/forms/FormOpen.java | 8 +-
.../apache/wiki/parser/JSPWikiMarkupParser.java | 1624 +++++++-------------
.../org/apache/wiki/plugin/TableOfContents.java | 4 +-
.../org/apache/wiki/tags/CsrfProtectionTag.java | 53 +
.../java/org/apache/wiki/ui/WikiJSPFilter.java | 22 +-
.../java/org/apache/wiki/ui/WikiServletFilter.java | 14 +-
.../src/main/resources/META-INF/jspwiki.tld | 9 +
.../src/test/java/org/apache/wiki/TestEngine.java | 11 +-
.../org/apache/wiki/plugin/WeblogPluginTest.java | 8 +-
.../markdown/migration/WikiSyntaxConverter.java | 74 +
.../migration/filters/TidyMarkupFilter.java | 24 +-
.../parser/JSPWikiToMarkdownMarkupParser.java | 81 +
.../tomcat/woas.app/Contents/Java/bootstrap.jar | Bin 34699 -> 34699 bytes
.../tomcat/woas.app/Contents/Java/tomcat-juli.jar | Bin 46897 -> 46898 bytes
.../src/overlay/launchers/tomcat/woas.exe | Bin 3659368 -> 3669432
bytes
jspwiki-war/src/main/scripts/jspwiki-common.js | 4 +-
jspwiki-war/src/main/scripts/jspwiki-edit.js | 2 +-
.../src/main/scripts/wiki-edit/Wiki.Edit.js | 3 +-
jspwiki-war/src/main/scripts/wiki/Category.js | 5 +-
jspwiki-war/src/main/scripts/wiki/Wiki.js | 5 +-
jspwiki-war/src/main/webapp/Captcha.jsp | 1 +
jspwiki-war/src/main/webapp/Install.jsp | 2 +-
jspwiki-war/src/main/webapp/WEB-INF/web.xml | 24 +-
.../main/webapp/templates/210/AttachmentTab.jsp | 13 +-
.../src/main/webapp/templates/210/DiffTab.jsp | 1 +
.../main/webapp/templates/210/EditGroupContent.jsp | 3 +-
.../src/main/webapp/templates/210/FindContent.jsp | 2 +-
.../src/main/webapp/templates/210/GroupContent.jsp | 1 +
.../src/main/webapp/templates/210/GroupTab.jsp | 1 +
.../src/main/webapp/templates/210/InfoContent.jsp | 5 +-
.../src/main/webapp/templates/210/LoginContent.jsp | 4 +-
.../main/webapp/templates/210/NewGroupContent.jsp | 2 +-
.../src/main/webapp/templates/210/PageTab.jsp | 1 +
.../main/webapp/templates/210/PreferencesTab.jsp | 2 +
.../src/main/webapp/templates/210/ProfileTab.jsp | 1 +
.../src/main/webapp/templates/210/SearchBox.jsp | 1 +
.../main/webapp/templates/210/WorkflowContent.jsp | 2 +
.../webapp/templates/210/admin/AdminTemplate.jsp | 2 +
.../webapp/templates/210/admin/UserManagement.jsp | 1 +
.../src/main/webapp/templates/210/commonheader.jsp | 1 +
.../main/webapp/templates/210/editors/CKeditor.jsp | 3 +-
.../src/main/webapp/templates/210/editors/FCK.jsp | 1 +
.../main/webapp/templates/210/editors/TinyMCE.jsp | 1 +
.../main/webapp/templates/210/editors/plain.jsp | 1 +
.../main/webapp/templates/210/editors/preview.jsp | 1 +
.../main/webapp/templates/210/editors/wysiwyg.jsp | 1 +
.../webapp/templates/default/AttachmentTab.jsp | 5 +-
.../src/main/webapp/templates/default/DiffTab.jsp | 1 +
.../webapp/templates/default/EditGroupContent.jsp | 1 +
.../main/webapp/templates/default/FindContent.jsp | 1 +
.../src/main/webapp/templates/default/GroupTab.jsp | 2 +
.../main/webapp/templates/default/InfoContent.jsp | 5 +-
.../main/webapp/templates/default/LoginContent.jsp | 4 +-
.../src/main/webapp/templates/default/PageTab.jsp | 1 +
.../webapp/templates/default/PreferencesTab.jsp | 1 +
.../main/webapp/templates/default/ProfileTab.jsp | 1 +
.../main/webapp/templates/default/SearchBox.jsp | 1 +
.../src/main/webapp/templates/default/UserBox.jsp | 10 +-
.../webapp/templates/default/WorkflowContent.jsp | 2 +
.../templates/default/admin/AdminTemplate.jsp | 2 +
.../templates/default/admin/UserManagement.jsp | 3 +-
.../main/webapp/templates/default/commonheader.jsp | 1 +
.../webapp/templates/default/editors/CKeditor.jsp | 1 +
.../webapp/templates/default/editors/TinyMCE.jsp | 1 +
.../webapp/templates/default/editors/plain.jsp | 1 +
.../webapp/templates/default/editors/preview.jsp | 2 +-
.../webapp/templates/default/editors/wysiwyg.jsp | 1 +
.../wiki/htmltowiki/syntax/MarkupHelper.java | 2 +-
mvn_cheat-sheet.md | 2 +-
pom.xml | 21 +-
87 files changed, 1181 insertions(+), 1415 deletions(-)
copy {jspwiki-bootstrap => jspwiki-http}/pom.xml (89%)
create mode 100644
jspwiki-http/src/main/java/org/apache/wiki/http/filter/CsrfProtectionFilter.java
copy jspwiki-api/src/main/java/org/apache/wiki/api/core/package.html =>
jspwiki-http/src/main/resources/META-INF/web-fragment.xml (56%)
create mode 100644
jspwiki-main/src/main/java/org/apache/wiki/tags/CsrfProtectionTag.java
create mode 100644
jspwiki-markdown/src/test/java/org/apache/wiki/markdown/migration/WikiSyntaxConverter.java
copy jspwiki-main/src/test/java/org/apache/wiki/filters/TestFilter.java =>
jspwiki-markdown/src/test/java/org/apache/wiki/markdown/migration/filters/TidyMarkupFilter.java
(63%)
create mode 100644
jspwiki-markdown/src/test/java/org/apache/wiki/markdown/migration/parser/JSPWikiToMarkdownMarkupParser.java
