This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository scmwebeditor. See http://git.nuiton.org/scmwebeditor.git commit 9719518e90e589b6391502264e0f170f6ee105e0 Merge: 5083a31 f9cbbae Author: Eric Chatellier <chatellier@codelutin.com> Date: Tue Dec 2 18:14:52 2014 +0100 Merge branch 'release/0.4' .gitignore | 10 + LICENSE.txt | 5 +- changelog.txt | 1 - pom.xml | 321 +++++++++++---------- src/license/THIRD-PARTY.properties | 19 +- src/license/project.xml | 10 +- .../java/org/nuiton/scmwebeditor/ScmSession.java | 5 +- src/main/java/org/nuiton/scmwebeditor/ScmUser.java | 5 +- .../ScmWebEditorApplicationListener.java | 5 +- .../scmwebeditor/ScmWebEditorBaseAction.java | 17 +- .../nuiton/scmwebeditor/ScmWebEditorConfig.java | 9 +- .../scmwebeditor/ScmWebEditorConfigOption.java | 11 +- .../org/nuiton/scmwebeditor/SvnConnection.java | 12 +- .../nuiton/scmwebeditor/actions/LogoutAction.java | 5 +- .../nuiton/scmwebeditor/actions/PreviewAction.java | 10 +- .../nuiton/scmwebeditor/actions/ResetAction.java | 5 +- .../nuiton/scmwebeditor/actions/SaveAction.java | 3 - .../actions/ScmWebEditorCommitAction.java | 3 - .../actions/ScmWebEditorMainAction.java | 3 - .../nuiton/scmwebeditor/actions/SearchAction.java | 3 - .../nuiton/scmwebeditor/actions/UploadAction.java | 3 - .../scmwebeditor/urlResolver/ScmUrlResolver.java | 5 +- .../urlResolver/ScmUrlResolverEngine.java | 5 +- .../impl/ScmUrlResolverDefaultImpl.java | 3 - .../impl/ScmUrlResolverMavenDocImpl.java | 3 - .../impl/ScmUrlResolverMavenSiteXmlImpl.java | 3 - .../resources/i18n/scmwebeditor_en_GB.properties | 2 +- .../resources/i18n/scmwebeditor_fr_FR.properties | 8 +- src/main/resources/log4j.properties | 3 - src/main/resources/scmwebeditor.properties | 5 +- src/main/resources/struts.properties | 3 - src/main/resources/struts.xml | 5 +- .../webapp/WEB-INF/content/badFileRedirect.jsp | 5 +- src/main/webapp/WEB-INF/content/badRstFile.jsp | 5 +- src/main/webapp/WEB-INF/content/badUseRedirect.jsp | 5 +- src/main/webapp/WEB-INF/content/error.jsp | 5 +- src/main/webapp/WEB-INF/content/fileModify.jsp | 5 +- src/main/webapp/WEB-INF/content/index.jsp | 5 +- src/main/webapp/WEB-INF/content/loginSearch.jsp | 5 +- src/main/webapp/WEB-INF/content/logout.jsp | 7 +- .../webapp/WEB-INF/content/modificationViewer.jsp | 5 +- src/main/webapp/WEB-INF/content/outConnection.jsp | 5 +- src/main/webapp/WEB-INF/content/preview.jsp | 3 - .../webapp/WEB-INF/content/privateSvnRedirect.jsp | 7 +- src/main/webapp/WEB-INF/content/recall.jsp | 3 - src/main/webapp/WEB-INF/content/redirect.jsp | 5 +- src/main/webapp/WEB-INF/content/reset.jsp | 5 +- src/main/webapp/WEB-INF/content/save.jsp | 5 +- src/main/webapp/WEB-INF/content/search.jsp | 3 - src/main/webapp/WEB-INF/content/upload.jsp | 5 +- src/main/webapp/WEB-INF/content/uploadForm.jsp | 5 +- src/main/webapp/WEB-INF/content/uploadSuccess.jsp | 5 +- src/main/webapp/WEB-INF/web.xml | 37 ++- .../codemirror-ui/css/codemirror-ui-find.css | 5 +- .../webapp/codemirror-ui/css/codemirror-ui.css | 3 - src/main/webapp/codemirror-ui/index.html | 3 - .../webapp/codemirror-ui/js/codemirror-ui-find.js | 3 - src/main/webapp/codemirror-ui/js/codemirror-ui.js | 3 - src/main/webapp/codemirror-ui/js/find_replace.html | 3 - .../codemirror-ui/lib/CodeMirror-2.1/compress.html | 3 - .../codemirror-ui/lib/CodeMirror-2.1/css/docs.css | 3 - .../lib/CodeMirror-2.1/demo/activeline.html | 3 - .../lib/CodeMirror-2.1/demo/complete.html | 3 - .../lib/CodeMirror-2.1/demo/complete.js | 3 - .../lib/CodeMirror-2.1/demo/marker.html | 3 - .../lib/CodeMirror-2.1/demo/mustache.html | 3 - .../lib/CodeMirror-2.1/demo/resize.html | 3 - .../lib/CodeMirror-2.1/demo/runmode.html | 3 - .../lib/CodeMirror-2.1/demo/search.html | 3 - .../lib/CodeMirror-2.1/demo/theme.html | 3 - .../codemirror-ui/lib/CodeMirror-2.1/index.html | 3 - .../lib/CodeMirror-2.1/internals.html | 3 - .../lib/CodeMirror-2.1/lib/codemirror.css | 3 - .../lib/CodeMirror-2.1/lib/codemirror.js | 3 - .../lib/CodeMirror-2.1/lib/overlay.js | 3 - .../lib/CodeMirror-2.1/lib/runmode.js | 3 - .../codemirror-ui/lib/CodeMirror-2.1/manual.html | 3 - .../lib/CodeMirror-2.1/mode/clike/clike.css | 3 - .../lib/CodeMirror-2.1/mode/clike/clike.js | 3 - .../lib/CodeMirror-2.1/mode/clike/index.html | 3 - .../lib/CodeMirror-2.1/mode/css/css.js | 3 - .../lib/CodeMirror-2.1/mode/css/index.html | 3 - .../lib/CodeMirror-2.1/mode/diff/diff.css | 3 - .../lib/CodeMirror-2.1/mode/diff/diff.js | 3 - .../lib/CodeMirror-2.1/mode/diff/index.html | 3 - .../lib/CodeMirror-2.1/mode/haskell/haskell.js | 3 - .../lib/CodeMirror-2.1/mode/haskell/index.html | 3 - .../lib/CodeMirror-2.1/mode/htmlmixed/htmlmixed.js | 3 - .../lib/CodeMirror-2.1/mode/htmlmixed/index.html | 3 - .../lib/CodeMirror-2.1/mode/javascript/index.html | 3 - .../CodeMirror-2.1/mode/javascript/javascript.js | 3 - .../lib/CodeMirror-2.1/mode/lua/index.html | 3 - .../lib/CodeMirror-2.1/mode/lua/lua.js | 3 - .../lib/CodeMirror-2.1/mode/php/index.html | 3 - .../lib/CodeMirror-2.1/mode/php/php.js | 3 - .../lib/CodeMirror-2.1/mode/plsql/index.html | 3 - .../lib/CodeMirror-2.1/mode/plsql/plsql.js | 3 - .../lib/CodeMirror-2.1/mode/python/index.html | 3 - .../lib/CodeMirror-2.1/mode/python/python.js | 3 - .../lib/CodeMirror-2.1/mode/rst/index.html | 3 - .../lib/CodeMirror-2.1/mode/rst/rst.css | 3 - .../lib/CodeMirror-2.1/mode/rst/rst.js | 3 - .../lib/CodeMirror-2.1/mode/smalltalk/index.html | 3 - .../lib/CodeMirror-2.1/mode/smalltalk/smalltalk.js | 3 - .../lib/CodeMirror-2.1/mode/stex/index.html | 3 - .../lib/CodeMirror-2.1/mode/stex/stex.js | 3 - .../lib/CodeMirror-2.1/mode/xml/index.html | 3 - .../lib/CodeMirror-2.1/mode/xml/xml.js | 3 - .../lib/CodeMirror-2.1/oldrelease.html | 3 - .../lib/CodeMirror-2.1/test/index.html | 3 - .../codemirror-ui/lib/CodeMirror-2.1/test/test.js | 3 - .../lib/CodeMirror-2.1/theme/default.css | 3 - .../lib/CodeMirror-2.1/theme/elegant.css | 3 - .../lib/CodeMirror-2.1/theme/neat.css | 3 - .../lib/CodeMirror-2.1/theme/night.css | 3 - src/main/webapp/css/main.css | 3 - src/main/webapp/css/uploadForm.css | 5 +- src/main/webapp/js/cancelRedirect.js | 5 +- src/main/webapp/js/gereSession.js | 3 - src/main/webapp/js/pictureUpload.js | 5 +- src/main/webapp/js/selectLanguage.js | 5 +- src/site/en/rst/index.rst | 4 +- src/site/en/rst/install.rst | 4 +- src/site/en/rst/tutoriel.rst | 6 +- src/site/en/rst/user.rst | 6 +- src/site/rst/index.rst | 4 +- src/site/rst/install.rst | 4 +- src/site/rst/tutoriel.rst | 6 +- src/site/rst/user.rst | 6 +- src/site/site_en.xml | 97 +++---- src/site/site_fr.xml | 99 +++---- .../org/nuiton/scmwebeditor/BaseActionTest.java | 3 - 132 files changed, 374 insertions(+), 724 deletions(-) -- To stop receiving notification emails like this one, please contact nuiton.org SCM administrator <admin+scm@nuiton.org>.