This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository bow. See http://git.chorem.org/bow.git commit 47db070d589b38b35c06cc19761872fc6ba3ff80 Merge: aea6ed3 58448ca Author: Maven Release <maven-release@codelutin.com> Date: Thu Nov 20 18:36:01 2014 +0000 Merge branch 'release/1.4' .gitignore | 11 ++ bow-extension-chromium/LICENSE.txt | 2 +- bow-extension-chromium/pom.xml | 3 +- .../src/main/webapp/_locales/en/messages.json | 3 - .../src/main/webapp/_locales/fr/messages.json | 3 - .../src/main/webapp/background.js | 2 - .../src/main/webapp/css/extension.css | 2 +- .../src/main/webapp/css/options.css | 5 +- .../src/main/webapp/manifest.json | 3 - .../src/main/webapp/options.html | 5 +- bow-extension-chromium/src/main/webapp/options.js | 4 +- bow-extension-chromium/src/main/webapp/popup.html | 5 +- bow-extension-chromium/src/main/webapp/popup.js | 2 - .../src/main/webapp/properties.js | 3 - .../src/site/site.xml | 44 +++---- bow-ui/pom.xml | 13 +- bow-ui/src/license/THIRD-PARTY.properties | 7 +- .../main/java/org/chorem/bow/BookmarkUtils.java | 5 +- bow-ui/src/main/java/org/chorem/bow/BowConfig.java | 5 +- .../main/java/org/chorem/bow/BowConfigOption.java | 5 +- bow-ui/src/main/java/org/chorem/bow/BowMail.java | 5 +- .../org/chorem/bow/BowMigrationPreference.java | 3 - bow-ui/src/main/java/org/chorem/bow/BowProxy.java | 5 +- .../main/java/org/chorem/bow/BowSearchResult.java | 5 +- .../src/main/java/org/chorem/bow/BowSession.java | 5 +- bow-ui/src/main/java/org/chorem/bow/BowUtils.java | 5 +- .../java/org/chorem/bow/action/AliasAction.java | 3 - .../java/org/chorem/bow/action/BowBaseAction.java | 7 +- .../java/org/chorem/bow/action/LocaleAction.java | 5 +- .../bow/action/admin/ReIndexationAction.java | 7 +- .../bow/action/bookmark/AddOrUpdateAction.java | 7 +- .../action/bookmark/DeleteSearchResultsAction.java | 7 +- .../org/chorem/bow/action/bookmark/EditAction.java | 3 - .../org/chorem/bow/action/bookmark/HomeAction.java | 7 +- .../chorem/bow/action/bookmark/RemoveAction.java | 7 +- .../bow/action/bookmark/ScreenshotAction.java | 7 +- .../bow/action/login/ForgotPasswordAction.java | 7 +- .../org/chorem/bow/action/login/LoginAction.java | 7 +- .../org/chorem/bow/action/login/LogoutAction.java | 5 +- .../chorem/bow/action/login/RegisterAction.java | 5 +- .../action/opensearch/OpenSearchBaseAction.java | 5 +- .../action/opensearch/OpenSearchResultAction.java | 5 +- .../opensearch/OpenSearchSuggestionAction.java | 7 +- .../bow/action/opensearch/SuggestionAction.java | 2 - .../bow/action/preference/AdminTagAction.java | 3 - .../bow/action/preference/DeleteImportAction.java | 7 +- .../action/preference/ExportBookmarksAction.java | 7 +- .../bow/action/preference/GenerateTokenAction.java | 3 - .../action/preference/ImportBookmarksAction.java | 5 +- .../action/preference/PreferenceBaseAction.java | 5 +- .../bow/action/preference/UpdateSiteAction.java | 3 - .../bow/action/preference/UpdateUserAction.java | 3 - .../bow/interceptor/LaxLoginInterceptor.java | 5 +- .../chorem/bow/interceptor/LoginInterceptor.java | 5 +- .../chorem/bow/interceptor/LogoutInterceptor.java | 5 +- bow-ui/src/main/resources/META-INF/aop.xml | 3 - bow-ui/src/main/resources/bow.properties | 5 +- bow-ui/src/main/resources/freemarker.properties | 5 +- bow-ui/src/main/resources/log4j.properties | 5 +- .../bow/action/ForgotPasswordAction-validation.xml | 5 +- .../chorem/bow/action/LoginAction-validation.xml | 5 +- .../bow/action/RegisterAction-validation.xml | 5 +- .../preference/UpdateUserAction-validation.xml | 5 +- bow-ui/src/main/resources/struts.properties | 7 +- bow-ui/src/main/resources/struts.xml | 5 +- bow-ui/src/main/webapp/WEB-INF/decorators.xml | 5 +- bow-ui/src/main/webapp/WEB-INF/decorators/main.jsp | 5 +- .../src/main/webapp/WEB-INF/jsp/CallStatistic.jsp | 3 - bow-ui/src/main/webapp/WEB-INF/jsp/admin.jsp | 5 +- .../src/main/webapp/WEB-INF/jsp/editBookmark.jsp | 5 +- bow-ui/src/main/webapp/WEB-INF/jsp/error.jsp | 5 +- .../src/main/webapp/WEB-INF/jsp/forgotPassword.jsp | 5 +- bow-ui/src/main/webapp/WEB-INF/jsp/home.jsp | 5 +- .../src/main/webapp/WEB-INF/jsp/inc/bookmark.jsp | 5 +- bow-ui/src/main/webapp/WEB-INF/jsp/inc/footer.jsp | 5 +- bow-ui/src/main/webapp/WEB-INF/jsp/inc/header.jsp | 4 +- .../src/main/webapp/WEB-INF/jsp/inc/rightMenu.jsp | 7 +- .../src/main/webapp/WEB-INF/jsp/inc/tagsCloud.jsp | 7 +- bow-ui/src/main/webapp/WEB-INF/jsp/login.jsp | 5 +- .../src/main/webapp/WEB-INF/jsp/permanentXml.jsp | 5 +- bow-ui/src/main/webapp/WEB-INF/jsp/preferences.jsp | 37 +++--- bow-ui/src/main/webapp/WEB-INF/jsp/register.jsp | 5 +- bow-ui/src/main/webapp/WEB-INF/jsp/suggestions.jsp | 5 +- .../src/main/webapp/WEB-INF/jsp/temporaryXml.jsp | 5 +- bow-ui/src/main/webapp/WEB-INF/sitemesh.xml | 5 +- bow-ui/src/main/webapp/WEB-INF/web.xml | 26 ++-- bow-ui/src/main/webapp/css/bookmark.css | 5 +- bow-ui/src/main/webapp/css/connexion.css | 7 +- bow-ui/src/main/webapp/css/global.css | 7 +- .../webapp/css/jquery-ui-1.8.11.custom.bow.css | 3 - bow-ui/src/main/webapp/index.jsp | 7 +- bow-ui/src/main/webapp/js/bookmark.js | 3 - bow-ui/src/main/webapp/styles/forms.css | 7 +- bow-ui/src/main/webapp/styles/layout-1col.css | 7 +- .../src/main/webapp/styles/layout-navleft-1col.css | 7 +- .../src/main/webapp/styles/layout-navleft-2col.css | 7 +- .../src/main/webapp/styles/layout-navtop-1col.css | 7 +- .../src/main/webapp/styles/layout-navtop-3col.css | 7 +- .../main/webapp/styles/layout-navtop-localleft.css | 7 +- .../main/webapp/styles/layout-navtop-subright.css | 7 +- bow-ui/src/main/webapp/styles/layout.css | 5 +- bow-ui/src/main/webapp/styles/main.css | 7 +- bow-ui/src/main/webapp/styles/nav-horizontal.css | 7 +- bow-ui/src/main/webapp/styles/nav-vertical.css | 7 +- bow-ui/src/main/webapp/styles/tools.css | 7 +- bow-ui/src/main/webapp/styles/typo.css | 7 +- bow-ui/src/main/webapp/template/simple/a-close.ftl | 2 - .../main/webapp/template/simple/form-common.ftl | 2 - .../webapp/template/xhtml/controlheader-core.ftl | 4 +- bow-ui/src/main/webapp/template/xhtml/file.ftl | 2 - .../src/main/webapp/template/xhtml/form-close.ftl | 2 - bow-ui/src/main/webapp/template/xhtml/form.ftl | 2 - bow-ui/src/main/webapp/template/xhtml/password.ftl | 2 - .../main/webapp/template/xhtml/submit-close.ftl | 2 - bow-ui/src/main/webapp/template/xhtml/submit.ftl | 2 - bow-ui/src/main/webapp/template/xhtml/text.ftl | 2 - .../src/{main/webapp/index.jsp => site/site.xml} | 40 +++--- pom.xml | 139 ++++++++++++++++----- src/site/rst/developper/bow-model.rst | 4 +- src/site/rst/developper/installation.rst | 4 +- src/site/rst/developper/presentation.rst | 4 +- src/site/rst/index.rst | 4 +- src/site/rst/todo.rst | 4 +- src/site/rst/user/addBookmark.rst | 4 +- src/site/rst/user/alias.rst | 4 +- src/site/rst/user/importExport.rst | 4 +- src/site/rst/user/openSearch.rst | 4 +- src/site/rst/user/preferences.rst | 6 +- src/site/rst/user/search.rst | 4 +- src/site/rst/user/user.rst | 6 +- src/site/site.xml | 74 +++++++---- 131 files changed, 382 insertions(+), 596 deletions(-) diff --cc bow-ui/pom.xml index 0bcb474,f9939b3..31d4aff --- a/bow-ui/pom.xml +++ b/bow-ui/pom.xml @@@ -24,10 -24,10 +24,12 @@@ </i18n.bundleOutputDir> <i18n.addBundleOuputDirParent>false</i18n.addBundleOuputDirParent> + <redmine.releaseFiles>target/${project.artifactId}-${project.version}.war</redmine.releaseFiles> + <!-- Post Release configuration --> <skipPostRelease>false</skipPostRelease> + <redmine.releaseFiles>target/${project.artifactId}-${project.version}.war</redmine.releaseFiles> + </properties> <dependencies> -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.