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 0adb03df9afc2384aa34dfc5a69dc3ab122b74cc Author: Tony CHEMIT <chemit@codelutin.com> Date: Mon Oct 27 20:32:18 2014 +0100 fixes #1130: Migrates to git --- .gitignore | 11 ++ 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 | 12 +-- .../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 | 5 +- 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 | 5 +- 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 | 119 ++++++++++++++++----- src/site/rst/developper/bow-model.rst | 3 - src/site/rst/developper/installation.rst | 3 - src/site/rst/developper/presentation.rst | 3 - 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 ++++++++----- 129 files changed, 342 insertions(+), 580 deletions(-) diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..233f4da --- /dev/null +++ b/.gitignore @@ -0,0 +1,11 @@ +.idea +*.ipr +*.iws +*.iml +atlassian-ide-plugin.xml +target/* +*/target/* +*/*.ipr +*/*.iws +*/*.iml +*/.idea diff --git a/bow-extension-chromium/pom.xml b/bow-extension-chromium/pom.xml index 83a8c1a..ab32891 100644 --- a/bow-extension-chromium/pom.xml +++ b/bow-extension-chromium/pom.xml @@ -1,5 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> -<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/xsd/maven-4.0.0.xsd"> +<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/xsd/maven-4.0.0.xsd"> <modelVersion>4.0.0</modelVersion> <parent> diff --git a/bow-extension-chromium/src/main/webapp/_locales/en/messages.json b/bow-extension-chromium/src/main/webapp/_locales/en/messages.json index c7314f8..5c03605 100644 --- a/bow-extension-chromium/src/main/webapp/_locales/en/messages.json +++ b/bow-extension-chromium/src/main/webapp/_locales/en/messages.json @@ -1,9 +1,6 @@ /* * #%L * BOW :: Chromium extension - * - * $Id$ - * $HeadURL$ * %% * Copyright (C) 2011 CodeLutin * %% diff --git a/bow-extension-chromium/src/main/webapp/_locales/fr/messages.json b/bow-extension-chromium/src/main/webapp/_locales/fr/messages.json index 753df5f..e448eb2 100644 --- a/bow-extension-chromium/src/main/webapp/_locales/fr/messages.json +++ b/bow-extension-chromium/src/main/webapp/_locales/fr/messages.json @@ -1,9 +1,6 @@ /* * #%L * BOW :: Chromium extension - * - * $Id$ - * $HeadURL$ * %% * Copyright (C) 2011 CodeLutin * %% diff --git a/bow-extension-chromium/src/main/webapp/background.js b/bow-extension-chromium/src/main/webapp/background.js index eedc8cb..7fd3374 100644 --- a/bow-extension-chromium/src/main/webapp/background.js +++ b/bow-extension-chromium/src/main/webapp/background.js @@ -1,8 +1,6 @@ /* * #%L * BOW :: Chromium extension - * $Id$ - * $HeadURL$ * %% * Copyright (C) 2011 - 2013 CodeLutin * %% diff --git a/bow-extension-chromium/src/main/webapp/css/extension.css b/bow-extension-chromium/src/main/webapp/css/extension.css index cbde777..4d204af 100644 --- a/bow-extension-chromium/src/main/webapp/css/extension.css +++ b/bow-extension-chromium/src/main/webapp/css/extension.css @@ -1,6 +1,6 @@ /* * #%L - * bow + * BOW :: Chromium extension * %% * Copyright (C) 2010 - 2011 CodeLutin * %% diff --git a/bow-extension-chromium/src/main/webapp/css/options.css b/bow-extension-chromium/src/main/webapp/css/options.css index 39754f7..da48a3c 100644 --- a/bow-extension-chromium/src/main/webapp/css/options.css +++ b/bow-extension-chromium/src/main/webapp/css/options.css @@ -1,9 +1,6 @@ /* * #%L - * bow - * - * $Id$ - * $HeadURL$ + * BOW :: Chromium extension * %% * Copyright (C) 2010 CodeLutin * %% diff --git a/bow-extension-chromium/src/main/webapp/manifest.json b/bow-extension-chromium/src/main/webapp/manifest.json index 0646c3b..559178e 100644 --- a/bow-extension-chromium/src/main/webapp/manifest.json +++ b/bow-extension-chromium/src/main/webapp/manifest.json @@ -1,9 +1,6 @@ /* * #%L * BOW :: Chromium extension - * - * $Id$ - * $HeadURL$ * %% * Copyright (C) 2011 CodeLutin * %% diff --git a/bow-extension-chromium/src/main/webapp/options.html b/bow-extension-chromium/src/main/webapp/options.html index efd4928..05d1769 100644 --- a/bow-extension-chromium/src/main/webapp/options.html +++ b/bow-extension-chromium/src/main/webapp/options.html @@ -1,9 +1,6 @@ <!-- #%L - bow - - $Id$ - $HeadURL$ + BOW :: Chromium extension %% Copyright (C) 2010 CodeLutin %% diff --git a/bow-extension-chromium/src/main/webapp/options.js b/bow-extension-chromium/src/main/webapp/options.js index 2dab0a8..333dfbb 100644 --- a/bow-extension-chromium/src/main/webapp/options.js +++ b/bow-extension-chromium/src/main/webapp/options.js @@ -1,8 +1,6 @@ /* * #%L * BOW :: Chromium extension - * $Id$ - * $HeadURL$ * %% * Copyright (C) 2011 - 2013 CodeLutin * %% @@ -91,4 +89,4 @@ document.addEventListener('DOMContentLoaded', function () { init(); restore_options(); document.getElementById("saveOptionButton").addEventListener('click', save_options); -}); \ No newline at end of file +}); diff --git a/bow-extension-chromium/src/main/webapp/popup.html b/bow-extension-chromium/src/main/webapp/popup.html index ba1febd..e34ad27 100644 --- a/bow-extension-chromium/src/main/webapp/popup.html +++ b/bow-extension-chromium/src/main/webapp/popup.html @@ -1,9 +1,6 @@ <!-- #%L - bow - - $Id$ - $HeadURL$ + BOW :: Chromium extension %% Copyright (C) 2010 CodeLutin %% diff --git a/bow-extension-chromium/src/main/webapp/popup.js b/bow-extension-chromium/src/main/webapp/popup.js index 5c2c215..4df98be 100644 --- a/bow-extension-chromium/src/main/webapp/popup.js +++ b/bow-extension-chromium/src/main/webapp/popup.js @@ -1,8 +1,6 @@ /* * #%L * BOW :: Chromium extension - * $Id$ - * $HeadURL$ * %% * Copyright (C) 2011 - 2013 CodeLutin * %% diff --git a/bow-extension-chromium/src/main/webapp/properties.js b/bow-extension-chromium/src/main/webapp/properties.js index 9af6d99..c266772 100644 --- a/bow-extension-chromium/src/main/webapp/properties.js +++ b/bow-extension-chromium/src/main/webapp/properties.js @@ -1,9 +1,6 @@ /* * #%L * BOW :: Chromium extension - * - * $Id$ - * $HeadURL$ * %% * Copyright (C) 2011 CodeLutin * %% diff --git a/bow-ui/src/main/webapp/WEB-INF/decorators.xml b/bow-extension-chromium/src/site/site.xml similarity index 51% copy from bow-ui/src/main/webapp/WEB-INF/decorators.xml copy to bow-extension-chromium/src/site/site.xml index 97ecf89..03277b6 100644 --- a/bow-ui/src/main/webapp/WEB-INF/decorators.xml +++ b/bow-extension-chromium/src/site/site.xml @@ -1,45 +1,41 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- #%L - bow - - $Id$ - $HeadURL$ + BOW :: Chromium extension %% - Copyright (C) 2010 - 2011 CodeLutin + Copyright (C) 2010 CodeLutin %% This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. - This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - You should have received a copy of the GNU Affero General Public License along with this program. If not, see <http://www.gnu.org/licenses/>. #L% --> +<project name="${project.name}" + xmlns="http://maven.apache.org/DECORATION/1.4.0" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/DECORATION/1.4.0 http://maven.apache.org/xsd/decoration-1.4.0.xsd"> -<decorators defaultdir="/WEB-INF/decorators"> - <!-- Any urls that are excluded will never be decorated by Sitemesh --> - <excludes> - <pattern>/fragment/*</pattern> - <pattern>/nodecorate/*</pattern> - <pattern>/styles/*</pattern> - <pattern>/scripts/*</pattern> - <pattern>/images/*</pattern> - <pattern>/dojo/*</pattern> - <pattern>/struts/*</pattern> - <pattern>/jsp/inc/*</pattern> - <pattern>index.jsp</pattern> - </excludes> + <bannerLeft> + <name>${project.name}</name> + <href>index.html</href> + </bannerLeft> - <decorator name="main" page="main.jsp"> - <pattern>/*</pattern> - </decorator> + <body> -</decorators> + <breadcrumbs> + <item name="${project.name}" href="index.html"/> + </breadcrumbs> + + <menu ref="parent"/> + <menu ref="reports"/> + + </body> +</project> diff --git a/bow-ui/pom.xml b/bow-ui/pom.xml index de8d851..2b9f4c5 100644 --- a/bow-ui/pom.xml +++ b/bow-ui/pom.xml @@ -1,5 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> -<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/xsd/maven-4.0.0.xsd"> +<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/xsd/maven-4.0.0.xsd"> <modelVersion>4.0.0</modelVersion> <parent> @@ -184,25 +185,22 @@ <groupId>org.postgresql</groupId> <artifactId>postgresql</artifactId> </dependency> - + <dependency> <groupId>org.apache.httpcomponents</groupId> <artifactId>httpcore</artifactId> - <version>4.3</version> </dependency> <!-- used to call screenshot service and to get suggestion from search engine --> <dependency> <groupId>org.apache.httpcomponents</groupId> <artifactId>httpclient</artifactId> - <version>4.3</version> </dependency> - - <!-- used to parse html and extract favicon url --> + + <!-- used to parse html and extract favicon url --> <dependency> <groupId>org.jsoup</groupId> <artifactId>jsoup</artifactId> - <version>1.7.2</version> </dependency> </dependencies> diff --git a/bow-ui/src/main/java/org/chorem/bow/BookmarkUtils.java b/bow-ui/src/main/java/org/chorem/bow/BookmarkUtils.java index 29d3b6e..4e460e8 100644 --- a/bow-ui/src/main/java/org/chorem/bow/BookmarkUtils.java +++ b/bow-ui/src/main/java/org/chorem/bow/BookmarkUtils.java @@ -1,9 +1,6 @@ /* * #%L - * bow - * - * $Id$ - * $HeadURL$ + * BOW UI * %% * Copyright (C) 2010 - 2011 CodeLutin * %% diff --git a/bow-ui/src/main/java/org/chorem/bow/BowConfig.java b/bow-ui/src/main/java/org/chorem/bow/BowConfig.java index 1a5b5f5..bd185ce 100644 --- a/bow-ui/src/main/java/org/chorem/bow/BowConfig.java +++ b/bow-ui/src/main/java/org/chorem/bow/BowConfig.java @@ -1,9 +1,6 @@ /* * #%L - * bow - * - * $Id$ - * $HeadURL$ + * BOW UI * %% * Copyright (C) 2010 CodeLutin * %% diff --git a/bow-ui/src/main/java/org/chorem/bow/BowConfigOption.java b/bow-ui/src/main/java/org/chorem/bow/BowConfigOption.java index 12ef581..7d3a68d 100644 --- a/bow-ui/src/main/java/org/chorem/bow/BowConfigOption.java +++ b/bow-ui/src/main/java/org/chorem/bow/BowConfigOption.java @@ -1,9 +1,6 @@ /* * #%L * BOW UI - * - * $Id$ - * $HeadURL$ * %% * Copyright (C) 2010 - 2011 CodeLutin * %% @@ -194,4 +191,4 @@ public enum BowConfigOption implements ApplicationConfig.OptionDef { public void setFinal(boolean isFinal) { this.isFinal = isFinal; } -} \ No newline at end of file +} diff --git a/bow-ui/src/main/java/org/chorem/bow/BowMail.java b/bow-ui/src/main/java/org/chorem/bow/BowMail.java index 8259613..dbc096b 100644 --- a/bow-ui/src/main/java/org/chorem/bow/BowMail.java +++ b/bow-ui/src/main/java/org/chorem/bow/BowMail.java @@ -1,9 +1,6 @@ /* * #%L - * bow - * - * $Id$ - * $HeadURL$ + * BOW UI * %% * Copyright (C) 2010 - 2011 CodeLutin * %% diff --git a/bow-ui/src/main/java/org/chorem/bow/BowMigrationPreference.java b/bow-ui/src/main/java/org/chorem/bow/BowMigrationPreference.java index 515e58f..768ba85 100644 --- a/bow-ui/src/main/java/org/chorem/bow/BowMigrationPreference.java +++ b/bow-ui/src/main/java/org/chorem/bow/BowMigrationPreference.java @@ -1,9 +1,6 @@ /* * #%L * BOW UI - * - * $Id$ - * $HeadURL$ * %% * Copyright (C) 2010 - 2011 CodeLutin * %% diff --git a/bow-ui/src/main/java/org/chorem/bow/BowProxy.java b/bow-ui/src/main/java/org/chorem/bow/BowProxy.java index 343932c..64258de 100644 --- a/bow-ui/src/main/java/org/chorem/bow/BowProxy.java +++ b/bow-ui/src/main/java/org/chorem/bow/BowProxy.java @@ -1,9 +1,6 @@ /* * #%L - * bow - * - * $Id$ - * $HeadURL$ + * BOW UI * %% * Copyright (C) 2010 CodeLutin * %% diff --git a/bow-ui/src/main/java/org/chorem/bow/BowSearchResult.java b/bow-ui/src/main/java/org/chorem/bow/BowSearchResult.java index af15291..ce85a2d 100644 --- a/bow-ui/src/main/java/org/chorem/bow/BowSearchResult.java +++ b/bow-ui/src/main/java/org/chorem/bow/BowSearchResult.java @@ -1,9 +1,6 @@ /* * #%L - * bow - * - * $Id$ - * $HeadURL$ + * BOW UI * %% * Copyright (C) 2010 CodeLutin * %% diff --git a/bow-ui/src/main/java/org/chorem/bow/BowSession.java b/bow-ui/src/main/java/org/chorem/bow/BowSession.java index 5f5c46a..3666b2e 100644 --- a/bow-ui/src/main/java/org/chorem/bow/BowSession.java +++ b/bow-ui/src/main/java/org/chorem/bow/BowSession.java @@ -1,9 +1,6 @@ /* * #%L - * bow - * - * $Id$ - * $HeadURL$ + * BOW UI * %% * Copyright (C) 2010 - 2011 CodeLutin * %% diff --git a/bow-ui/src/main/java/org/chorem/bow/BowUtils.java b/bow-ui/src/main/java/org/chorem/bow/BowUtils.java index 953b53f..1abf130 100644 --- a/bow-ui/src/main/java/org/chorem/bow/BowUtils.java +++ b/bow-ui/src/main/java/org/chorem/bow/BowUtils.java @@ -1,9 +1,6 @@ /* * #%L - * bow - * - * $Id$ - * $HeadURL$ + * BOW UI * %% * Copyright (C) 2010 - 2011 CodeLutin * %% diff --git a/bow-ui/src/main/java/org/chorem/bow/action/AliasAction.java b/bow-ui/src/main/java/org/chorem/bow/action/AliasAction.java index dbf54ea..a8a6a8c 100644 --- a/bow-ui/src/main/java/org/chorem/bow/action/AliasAction.java +++ b/bow-ui/src/main/java/org/chorem/bow/action/AliasAction.java @@ -1,9 +1,6 @@ /* * #%L * BOW UI - * - * $Id$ - * $HeadURL$ * %% * Copyright (C) 2010 - 2011 CodeLutin * %% diff --git a/bow-ui/src/main/java/org/chorem/bow/action/BowBaseAction.java b/bow-ui/src/main/java/org/chorem/bow/action/BowBaseAction.java index 0f2644a..65ec010 100644 --- a/bow-ui/src/main/java/org/chorem/bow/action/BowBaseAction.java +++ b/bow-ui/src/main/java/org/chorem/bow/action/BowBaseAction.java @@ -1,9 +1,6 @@ /* * #%L - * bow - * - * $Id$ - * $HeadURL$ + * BOW UI * %% * Copyright (C) 2010 - 2011 CodeLutin * %% @@ -139,4 +136,4 @@ public class BowBaseAction extends BaseAction implements SessionAware { this.first = first; } -} \ No newline at end of file +} diff --git a/bow-ui/src/main/java/org/chorem/bow/action/LocaleAction.java b/bow-ui/src/main/java/org/chorem/bow/action/LocaleAction.java index 574bd6b..0144f48 100644 --- a/bow-ui/src/main/java/org/chorem/bow/action/LocaleAction.java +++ b/bow-ui/src/main/java/org/chorem/bow/action/LocaleAction.java @@ -1,9 +1,6 @@ /* * #%L - * bow - * - * $Id$ - * $HeadURL$ + * BOW UI * %% * Copyright (C) 2010 - 2011 CodeLutin * %% diff --git a/bow-ui/src/main/java/org/chorem/bow/action/admin/ReIndexationAction.java b/bow-ui/src/main/java/org/chorem/bow/action/admin/ReIndexationAction.java index 443e7ed..7bef2d9 100644 --- a/bow-ui/src/main/java/org/chorem/bow/action/admin/ReIndexationAction.java +++ b/bow-ui/src/main/java/org/chorem/bow/action/admin/ReIndexationAction.java @@ -1,9 +1,6 @@ /* * #%L - * bow - * - * $Id$ - * $HeadURL$ + * BOW UI * %% * Copyright (C) 2010 - 2011 CodeLutin * %% @@ -61,4 +58,4 @@ public class ReIndexationAction extends BowBaseAction { BowProxy proxy = BowProxy.getInstance(null); proxy.getWikittyService().syncSearchEngine(null); } -} \ No newline at end of file +} diff --git a/bow-ui/src/main/java/org/chorem/bow/action/bookmark/AddOrUpdateAction.java b/bow-ui/src/main/java/org/chorem/bow/action/bookmark/AddOrUpdateAction.java index 2ab5dd5..65e787b 100644 --- a/bow-ui/src/main/java/org/chorem/bow/action/bookmark/AddOrUpdateAction.java +++ b/bow-ui/src/main/java/org/chorem/bow/action/bookmark/AddOrUpdateAction.java @@ -1,9 +1,6 @@ /* * #%L - * bow - * - * $Id$ - * $HeadURL$ + * BOW UI * %% * Copyright (C) 2010 - 2011 CodeLutin * %% @@ -396,4 +393,4 @@ public class AddOrUpdateAction extends BowBaseAction { return result; } -} \ No newline at end of file +} diff --git a/bow-ui/src/main/java/org/chorem/bow/action/bookmark/DeleteSearchResultsAction.java b/bow-ui/src/main/java/org/chorem/bow/action/bookmark/DeleteSearchResultsAction.java index b218331..9e9d7d0 100644 --- a/bow-ui/src/main/java/org/chorem/bow/action/bookmark/DeleteSearchResultsAction.java +++ b/bow-ui/src/main/java/org/chorem/bow/action/bookmark/DeleteSearchResultsAction.java @@ -1,9 +1,6 @@ /* * #%L - * bow - * - * $Id$ - * $HeadURL$ + * BOW UI * %% * Copyright (C) 2010 - 2011 CodeLutin * %% @@ -75,4 +72,4 @@ public class DeleteSearchResultsAction extends BowBaseAction { } return SUCCESS; } -} \ No newline at end of file +} diff --git a/bow-ui/src/main/java/org/chorem/bow/action/bookmark/EditAction.java b/bow-ui/src/main/java/org/chorem/bow/action/bookmark/EditAction.java index 1eeb34f..a0cdcf7 100644 --- a/bow-ui/src/main/java/org/chorem/bow/action/bookmark/EditAction.java +++ b/bow-ui/src/main/java/org/chorem/bow/action/bookmark/EditAction.java @@ -1,9 +1,6 @@ /* * #%L * BOW UI - * - * $Id$ - * $HeadURL$ * %% * Copyright (C) 2010 - 2011 CodeLutin * %% diff --git a/bow-ui/src/main/java/org/chorem/bow/action/bookmark/HomeAction.java b/bow-ui/src/main/java/org/chorem/bow/action/bookmark/HomeAction.java index c2727ef..87c3a74 100644 --- a/bow-ui/src/main/java/org/chorem/bow/action/bookmark/HomeAction.java +++ b/bow-ui/src/main/java/org/chorem/bow/action/bookmark/HomeAction.java @@ -1,9 +1,6 @@ /* * #%L - * bow - * - * $Id$ - * $HeadURL$ + * BOW UI * %% * Copyright (C) 2010 - 2011 CodeLutin * %% @@ -116,4 +113,4 @@ public class HomeAction extends BowBaseAction { timeLog.log(start, "execute"); return SUCCESS; } -} \ No newline at end of file +} diff --git a/bow-ui/src/main/java/org/chorem/bow/action/bookmark/RemoveAction.java b/bow-ui/src/main/java/org/chorem/bow/action/bookmark/RemoveAction.java index d422bfe..8a0c131 100644 --- a/bow-ui/src/main/java/org/chorem/bow/action/bookmark/RemoveAction.java +++ b/bow-ui/src/main/java/org/chorem/bow/action/bookmark/RemoveAction.java @@ -1,9 +1,6 @@ /* * #%L - * bow - * - * $Id$ - * $HeadURL$ + * BOW UI * %% * Copyright (C) 2010 - 2011 CodeLutin * %% @@ -75,4 +72,4 @@ public class RemoveAction extends BowBaseAction { redirectTo = BowUtils.redirectTo(tagLine, fullTextLine); return SUCCESS; } -} \ No newline at end of file +} diff --git a/bow-ui/src/main/java/org/chorem/bow/action/bookmark/ScreenshotAction.java b/bow-ui/src/main/java/org/chorem/bow/action/bookmark/ScreenshotAction.java index 4e8ed2b..c202197 100644 --- a/bow-ui/src/main/java/org/chorem/bow/action/bookmark/ScreenshotAction.java +++ b/bow-ui/src/main/java/org/chorem/bow/action/bookmark/ScreenshotAction.java @@ -1,9 +1,6 @@ /* * #%L - * bow - * - * $Id$ - * $HeadURL$ + * BOW UI * %% * Copyright (C) 2010 - 2011 CodeLutin * %% @@ -100,4 +97,4 @@ public class ScreenshotAction extends BowBaseAction { redirectTo = BowUtils.redirectTo(tagLine, fullTextLine); return SUCCESS; } -} \ No newline at end of file +} diff --git a/bow-ui/src/main/java/org/chorem/bow/action/login/ForgotPasswordAction.java b/bow-ui/src/main/java/org/chorem/bow/action/login/ForgotPasswordAction.java index f0c325a..097bec5 100644 --- a/bow-ui/src/main/java/org/chorem/bow/action/login/ForgotPasswordAction.java +++ b/bow-ui/src/main/java/org/chorem/bow/action/login/ForgotPasswordAction.java @@ -1,9 +1,6 @@ /* * #%L - * bow - * - * $Id$ - * $HeadURL$ + * BOW UI * %% * Copyright (C) 2010 - 2011 CodeLutin * %% @@ -120,4 +117,4 @@ public class ForgotPasswordAction extends BowBaseAction { } return result; } -} \ No newline at end of file +} diff --git a/bow-ui/src/main/java/org/chorem/bow/action/login/LoginAction.java b/bow-ui/src/main/java/org/chorem/bow/action/login/LoginAction.java index 4aba560..45c357c 100644 --- a/bow-ui/src/main/java/org/chorem/bow/action/login/LoginAction.java +++ b/bow-ui/src/main/java/org/chorem/bow/action/login/LoginAction.java @@ -1,9 +1,6 @@ /* * #%L - * bow - * - * $Id$ - * $HeadURL$ + * BOW UI * %% * Copyright (C) 2010 CodeLutin * %% @@ -129,4 +126,4 @@ public class LoginAction extends BowBaseAction { } return result; } -} \ No newline at end of file +} diff --git a/bow-ui/src/main/java/org/chorem/bow/action/login/LogoutAction.java b/bow-ui/src/main/java/org/chorem/bow/action/login/LogoutAction.java index 1e30eb4..5882cea 100644 --- a/bow-ui/src/main/java/org/chorem/bow/action/login/LogoutAction.java +++ b/bow-ui/src/main/java/org/chorem/bow/action/login/LogoutAction.java @@ -1,9 +1,6 @@ /* * #%L - * bow - * - * $Id$ - * $HeadURL$ + * BOW UI * %% * Copyright (C) 2010 - 2011 CodeLutin * %% diff --git a/bow-ui/src/main/java/org/chorem/bow/action/login/RegisterAction.java b/bow-ui/src/main/java/org/chorem/bow/action/login/RegisterAction.java index 3d991e9..c58f74f 100644 --- a/bow-ui/src/main/java/org/chorem/bow/action/login/RegisterAction.java +++ b/bow-ui/src/main/java/org/chorem/bow/action/login/RegisterAction.java @@ -1,9 +1,6 @@ /* * #%L - * bow - * - * $Id$ - * $HeadURL$ + * BOW UI * %% * Copyright (C) 2010 - 2011 CodeLutin * %% diff --git a/bow-ui/src/main/java/org/chorem/bow/action/opensearch/OpenSearchBaseAction.java b/bow-ui/src/main/java/org/chorem/bow/action/opensearch/OpenSearchBaseAction.java index 9900aec..0b1e4f3 100644 --- a/bow-ui/src/main/java/org/chorem/bow/action/opensearch/OpenSearchBaseAction.java +++ b/bow-ui/src/main/java/org/chorem/bow/action/opensearch/OpenSearchBaseAction.java @@ -1,9 +1,6 @@ /* * #%L - * bow - * - * $Id$ - * $HeadURL$ + * BOW UI * %% * Copyright (C) 2010 - 2011 CodeLutin * %% diff --git a/bow-ui/src/main/java/org/chorem/bow/action/opensearch/OpenSearchResultAction.java b/bow-ui/src/main/java/org/chorem/bow/action/opensearch/OpenSearchResultAction.java index fffe247..1e8859d 100644 --- a/bow-ui/src/main/java/org/chorem/bow/action/opensearch/OpenSearchResultAction.java +++ b/bow-ui/src/main/java/org/chorem/bow/action/opensearch/OpenSearchResultAction.java @@ -1,9 +1,6 @@ /* * #%L - * bow - * - * $Id$ - * $HeadURL$ + * BOW UI * %% * Copyright (C) 2010 - 2011 CodeLutin * %% diff --git a/bow-ui/src/main/java/org/chorem/bow/action/opensearch/OpenSearchSuggestionAction.java b/bow-ui/src/main/java/org/chorem/bow/action/opensearch/OpenSearchSuggestionAction.java index 2f2c196..296603d 100644 --- a/bow-ui/src/main/java/org/chorem/bow/action/opensearch/OpenSearchSuggestionAction.java +++ b/bow-ui/src/main/java/org/chorem/bow/action/opensearch/OpenSearchSuggestionAction.java @@ -1,9 +1,6 @@ /* * #%L - * bow - * - * $Id$ - * $HeadURL$ + * BOW UI * %% * Copyright (C) 2010 - 2011 CodeLutin * %% @@ -140,4 +137,4 @@ public class OpenSearchSuggestionAction extends OpenSearchBaseAction { return SUCCESS; } -} \ No newline at end of file +} diff --git a/bow-ui/src/main/java/org/chorem/bow/action/opensearch/SuggestionAction.java b/bow-ui/src/main/java/org/chorem/bow/action/opensearch/SuggestionAction.java index f16b011..e1206ea 100644 --- a/bow-ui/src/main/java/org/chorem/bow/action/opensearch/SuggestionAction.java +++ b/bow-ui/src/main/java/org/chorem/bow/action/opensearch/SuggestionAction.java @@ -3,8 +3,6 @@ package org.chorem.bow.action.opensearch; /* * #%L * BOW UI - * $Id$ - * $HeadURL$ * %% * Copyright (C) 2010 - 2013 CodeLutin * %% diff --git a/bow-ui/src/main/java/org/chorem/bow/action/preference/AdminTagAction.java b/bow-ui/src/main/java/org/chorem/bow/action/preference/AdminTagAction.java index 471d4dd..0788042 100644 --- a/bow-ui/src/main/java/org/chorem/bow/action/preference/AdminTagAction.java +++ b/bow-ui/src/main/java/org/chorem/bow/action/preference/AdminTagAction.java @@ -1,9 +1,6 @@ /* * #%L * BOW UI - * - * $Id$ - * $HeadURL$ * %% * Copyright (C) 2010 - 2011 CodeLutin * %% diff --git a/bow-ui/src/main/java/org/chorem/bow/action/preference/DeleteImportAction.java b/bow-ui/src/main/java/org/chorem/bow/action/preference/DeleteImportAction.java index 5cda4bb..2be06ef 100644 --- a/bow-ui/src/main/java/org/chorem/bow/action/preference/DeleteImportAction.java +++ b/bow-ui/src/main/java/org/chorem/bow/action/preference/DeleteImportAction.java @@ -1,9 +1,6 @@ /* * #%L - * bow - * - * $Id$ - * $HeadURL$ + * BOW UI * %% * Copyright (C) 2010 - 2011 CodeLutin * %% @@ -92,4 +89,4 @@ public class DeleteImportAction extends PreferenceBaseAction { return result; } -} \ No newline at end of file +} diff --git a/bow-ui/src/main/java/org/chorem/bow/action/preference/ExportBookmarksAction.java b/bow-ui/src/main/java/org/chorem/bow/action/preference/ExportBookmarksAction.java index b2e2eb8..e2c3607 100644 --- a/bow-ui/src/main/java/org/chorem/bow/action/preference/ExportBookmarksAction.java +++ b/bow-ui/src/main/java/org/chorem/bow/action/preference/ExportBookmarksAction.java @@ -1,9 +1,6 @@ /* * #%L - * bow - * - * $Id$ - * $HeadURL$ + * BOW UI * %% * Copyright (C) 2010 - 2011 CodeLutin * %% @@ -131,4 +128,4 @@ public class ExportBookmarksAction extends BowBaseAction { } return SUCCESS; } -} \ No newline at end of file +} diff --git a/bow-ui/src/main/java/org/chorem/bow/action/preference/GenerateTokenAction.java b/bow-ui/src/main/java/org/chorem/bow/action/preference/GenerateTokenAction.java index c3deae0..54ebe94 100644 --- a/bow-ui/src/main/java/org/chorem/bow/action/preference/GenerateTokenAction.java +++ b/bow-ui/src/main/java/org/chorem/bow/action/preference/GenerateTokenAction.java @@ -1,9 +1,6 @@ /* * #%L * BOW UI - * - * $Id$ - * $HeadURL$ * %% * Copyright (C) 2010 - 2011 CodeLutin * %% diff --git a/bow-ui/src/main/java/org/chorem/bow/action/preference/ImportBookmarksAction.java b/bow-ui/src/main/java/org/chorem/bow/action/preference/ImportBookmarksAction.java index c6292ec..bd47d3e 100644 --- a/bow-ui/src/main/java/org/chorem/bow/action/preference/ImportBookmarksAction.java +++ b/bow-ui/src/main/java/org/chorem/bow/action/preference/ImportBookmarksAction.java @@ -1,9 +1,6 @@ /* * #%L - * bow - * - * $Id$ - * $HeadURL$ + * BOW UI * %% * Copyright (C) 2010 - 2011 CodeLutin * %% diff --git a/bow-ui/src/main/java/org/chorem/bow/action/preference/PreferenceBaseAction.java b/bow-ui/src/main/java/org/chorem/bow/action/preference/PreferenceBaseAction.java index 477d2e0..841aa90 100644 --- a/bow-ui/src/main/java/org/chorem/bow/action/preference/PreferenceBaseAction.java +++ b/bow-ui/src/main/java/org/chorem/bow/action/preference/PreferenceBaseAction.java @@ -1,9 +1,6 @@ /* * #%L - * bow - * - * $Id$ - * $HeadURL$ + * BOW UI * %% * Copyright (C) 2010 - 2011 CodeLutin * %% diff --git a/bow-ui/src/main/java/org/chorem/bow/action/preference/UpdateSiteAction.java b/bow-ui/src/main/java/org/chorem/bow/action/preference/UpdateSiteAction.java index 373987a..1b01531 100644 --- a/bow-ui/src/main/java/org/chorem/bow/action/preference/UpdateSiteAction.java +++ b/bow-ui/src/main/java/org/chorem/bow/action/preference/UpdateSiteAction.java @@ -1,9 +1,6 @@ /* * #%L * BOW UI - * - * $Id$ - * $HeadURL$ * %% * Copyright (C) 2010 - 2011 CodeLutin * %% diff --git a/bow-ui/src/main/java/org/chorem/bow/action/preference/UpdateUserAction.java b/bow-ui/src/main/java/org/chorem/bow/action/preference/UpdateUserAction.java index f0f2d8f..9cdc40c 100644 --- a/bow-ui/src/main/java/org/chorem/bow/action/preference/UpdateUserAction.java +++ b/bow-ui/src/main/java/org/chorem/bow/action/preference/UpdateUserAction.java @@ -1,9 +1,6 @@ /* * #%L * BOW UI - * - * $Id$ - * $HeadURL$ * %% * Copyright (C) 2010 - 2011 CodeLutin * %% diff --git a/bow-ui/src/main/java/org/chorem/bow/interceptor/LaxLoginInterceptor.java b/bow-ui/src/main/java/org/chorem/bow/interceptor/LaxLoginInterceptor.java index 530c18d..e897850 100644 --- a/bow-ui/src/main/java/org/chorem/bow/interceptor/LaxLoginInterceptor.java +++ b/bow-ui/src/main/java/org/chorem/bow/interceptor/LaxLoginInterceptor.java @@ -1,9 +1,6 @@ /* * #%L - * bow - * - * $Id$ - * $HeadURL$ + * BOW UI * %% * Copyright (C) 2010 - 2011 CodeLutin * %% diff --git a/bow-ui/src/main/java/org/chorem/bow/interceptor/LoginInterceptor.java b/bow-ui/src/main/java/org/chorem/bow/interceptor/LoginInterceptor.java index e9aeeec..529c161 100644 --- a/bow-ui/src/main/java/org/chorem/bow/interceptor/LoginInterceptor.java +++ b/bow-ui/src/main/java/org/chorem/bow/interceptor/LoginInterceptor.java @@ -1,9 +1,6 @@ /* * #%L - * bow - * - * $Id$ - * $HeadURL$ + * BOW UI * %% * Copyright (C) 2010 - 2011 CodeLutin * %% diff --git a/bow-ui/src/main/java/org/chorem/bow/interceptor/LogoutInterceptor.java b/bow-ui/src/main/java/org/chorem/bow/interceptor/LogoutInterceptor.java index 33073c2..d06bdd0 100644 --- a/bow-ui/src/main/java/org/chorem/bow/interceptor/LogoutInterceptor.java +++ b/bow-ui/src/main/java/org/chorem/bow/interceptor/LogoutInterceptor.java @@ -1,9 +1,6 @@ /* * #%L - * bow - * - * $Id$ - * $HeadURL$ + * BOW UI * %% * Copyright (C) 2010 - 2011 CodeLutin * %% diff --git a/bow-ui/src/main/resources/META-INF/aop.xml b/bow-ui/src/main/resources/META-INF/aop.xml index eee189c..488286e 100644 --- a/bow-ui/src/main/resources/META-INF/aop.xml +++ b/bow-ui/src/main/resources/META-INF/aop.xml @@ -1,9 +1,6 @@ <!-- #%L BOW UI - - $Id$ - $HeadURL$ %% Copyright (C) 2010 - 2011 CodeLutin %% diff --git a/bow-ui/src/main/resources/bow.properties b/bow-ui/src/main/resources/bow.properties index c67eb68..4795b56 100644 --- a/bow-ui/src/main/resources/bow.properties +++ b/bow-ui/src/main/resources/bow.properties @@ -1,9 +1,6 @@ ### # #%L -# bow -# -# $Id$ -# $HeadURL$ +# BOW UI # %% # Copyright (C) 2010 CodeLutin # %% diff --git a/bow-ui/src/main/resources/freemarker.properties b/bow-ui/src/main/resources/freemarker.properties index c02bb95..7479c46 100644 --- a/bow-ui/src/main/resources/freemarker.properties +++ b/bow-ui/src/main/resources/freemarker.properties @@ -1,9 +1,6 @@ ### # #%L # BOW UI -# -# $Id$ -# $HeadURL$ # %% # Copyright (C) 2010 - 2011 CodeLutin # %% @@ -21,4 +18,4 @@ # along with this program. If not, see <http://www.gnu.org/licenses/>. # #L% ### -template_update_delay=600000 \ No newline at end of file +template_update_delay=600000 diff --git a/bow-ui/src/main/resources/log4j.properties b/bow-ui/src/main/resources/log4j.properties index 644c162..1bce32b 100644 --- a/bow-ui/src/main/resources/log4j.properties +++ b/bow-ui/src/main/resources/log4j.properties @@ -1,9 +1,6 @@ ### # #%L -# bow -# -# $Id$ -# $HeadURL$ +# BOW UI # %% # Copyright (C) 2010 CodeLutin # %% diff --git a/bow-ui/src/main/resources/org/chorem/bow/action/ForgotPasswordAction-validation.xml b/bow-ui/src/main/resources/org/chorem/bow/action/ForgotPasswordAction-validation.xml index 38fbcb7..b566e09 100644 --- a/bow-ui/src/main/resources/org/chorem/bow/action/ForgotPasswordAction-validation.xml +++ b/bow-ui/src/main/resources/org/chorem/bow/action/ForgotPasswordAction-validation.xml @@ -1,9 +1,6 @@ <!-- #%L - bow - - $Id$ - $HeadURL$ + BOW UI %% Copyright (C) 2010 - 2011 CodeLutin %% diff --git a/bow-ui/src/main/resources/org/chorem/bow/action/LoginAction-validation.xml b/bow-ui/src/main/resources/org/chorem/bow/action/LoginAction-validation.xml index 54aae94..86a6c90 100644 --- a/bow-ui/src/main/resources/org/chorem/bow/action/LoginAction-validation.xml +++ b/bow-ui/src/main/resources/org/chorem/bow/action/LoginAction-validation.xml @@ -1,9 +1,6 @@ <!-- #%L - bow - - $Id$ - $HeadURL$ + BOW UI %% Copyright (C) 2010 - 2011 CodeLutin %% diff --git a/bow-ui/src/main/resources/org/chorem/bow/action/RegisterAction-validation.xml b/bow-ui/src/main/resources/org/chorem/bow/action/RegisterAction-validation.xml index 9494980..536d4aa 100644 --- a/bow-ui/src/main/resources/org/chorem/bow/action/RegisterAction-validation.xml +++ b/bow-ui/src/main/resources/org/chorem/bow/action/RegisterAction-validation.xml @@ -1,9 +1,6 @@ <!-- #%L - bow - - $Id$ - $HeadURL$ + BOW UI %% Copyright (C) 2010 - 2011 CodeLutin %% diff --git a/bow-ui/src/main/resources/org/chorem/bow/action/preference/UpdateUserAction-validation.xml b/bow-ui/src/main/resources/org/chorem/bow/action/preference/UpdateUserAction-validation.xml index 9494980..536d4aa 100644 --- a/bow-ui/src/main/resources/org/chorem/bow/action/preference/UpdateUserAction-validation.xml +++ b/bow-ui/src/main/resources/org/chorem/bow/action/preference/UpdateUserAction-validation.xml @@ -1,9 +1,6 @@ <!-- #%L - bow - - $Id$ - $HeadURL$ + BOW UI %% Copyright (C) 2010 - 2011 CodeLutin %% diff --git a/bow-ui/src/main/resources/struts.properties b/bow-ui/src/main/resources/struts.properties index e8a5910..61e13a5 100644 --- a/bow-ui/src/main/resources/struts.properties +++ b/bow-ui/src/main/resources/struts.properties @@ -1,9 +1,6 @@ ### # #%L -# bow -# -# $Id$ -# $HeadURL$ +# BOW UI # %% # Copyright (C) 2010 - 2011 CodeLutin # %% diff --git a/bow-ui/src/main/resources/struts.xml b/bow-ui/src/main/resources/struts.xml index ac7c858..0ac31dc 100644 --- a/bow-ui/src/main/resources/struts.xml +++ b/bow-ui/src/main/resources/struts.xml @@ -1,10 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- #%L - bow - - $Id$ - $HeadURL$ + BOW UI %% Copyright (C) 2010 - 2011 CodeLutin %% diff --git a/bow-ui/src/main/webapp/WEB-INF/decorators.xml b/bow-ui/src/main/webapp/WEB-INF/decorators.xml index 97ecf89..9ad3cc4 100644 --- a/bow-ui/src/main/webapp/WEB-INF/decorators.xml +++ b/bow-ui/src/main/webapp/WEB-INF/decorators.xml @@ -1,10 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- #%L - bow - - $Id$ - $HeadURL$ + BOW UI %% Copyright (C) 2010 - 2011 CodeLutin %% diff --git a/bow-ui/src/main/webapp/WEB-INF/decorators/main.jsp b/bow-ui/src/main/webapp/WEB-INF/decorators/main.jsp index 1629a38..f77707c 100644 --- a/bow-ui/src/main/webapp/WEB-INF/decorators/main.jsp +++ b/bow-ui/src/main/webapp/WEB-INF/decorators/main.jsp @@ -1,9 +1,6 @@ <!-- #%L - bow - - $Id$ - $HeadURL$ + BOW UI %% Copyright (C) 2010 - 2011 CodeLutin %% diff --git a/bow-ui/src/main/webapp/WEB-INF/jsp/CallStatistic.jsp b/bow-ui/src/main/webapp/WEB-INF/jsp/CallStatistic.jsp index fd1ff53..54b4590 100644 --- a/bow-ui/src/main/webapp/WEB-INF/jsp/CallStatistic.jsp +++ b/bow-ui/src/main/webapp/WEB-INF/jsp/CallStatistic.jsp @@ -1,9 +1,6 @@ <%-- #%L BOW UI - - $Id$ - $HeadURL$ %% Copyright (C) 2010 - 2011 CodeLutin %% diff --git a/bow-ui/src/main/webapp/WEB-INF/jsp/admin.jsp b/bow-ui/src/main/webapp/WEB-INF/jsp/admin.jsp index 553dffe..9ad7701 100644 --- a/bow-ui/src/main/webapp/WEB-INF/jsp/admin.jsp +++ b/bow-ui/src/main/webapp/WEB-INF/jsp/admin.jsp @@ -1,9 +1,6 @@ <%-- #%L - bow - - $Id$ - $HeadURL$ + BOW UI %% Copyright (C) 2010 CodeLutin %% diff --git a/bow-ui/src/main/webapp/WEB-INF/jsp/editBookmark.jsp b/bow-ui/src/main/webapp/WEB-INF/jsp/editBookmark.jsp index 74ca3ca..15e34f0 100644 --- a/bow-ui/src/main/webapp/WEB-INF/jsp/editBookmark.jsp +++ b/bow-ui/src/main/webapp/WEB-INF/jsp/editBookmark.jsp @@ -1,9 +1,6 @@ <%-- #%L - bow - - $Id$ - $HeadURL$ + BOW UI %% Copyright (C) 2010 CodeLutin %% diff --git a/bow-ui/src/main/webapp/WEB-INF/jsp/error.jsp b/bow-ui/src/main/webapp/WEB-INF/jsp/error.jsp index 5f739c7..89e583a 100644 --- a/bow-ui/src/main/webapp/WEB-INF/jsp/error.jsp +++ b/bow-ui/src/main/webapp/WEB-INF/jsp/error.jsp @@ -1,9 +1,6 @@ <%-- #%L - bow - - $Id$ - $HeadURL$ + BOW UI %% Copyright (C) 2010 CodeLutin %% diff --git a/bow-ui/src/main/webapp/WEB-INF/jsp/forgotPassword.jsp b/bow-ui/src/main/webapp/WEB-INF/jsp/forgotPassword.jsp index a830aab..ad82cc9 100644 --- a/bow-ui/src/main/webapp/WEB-INF/jsp/forgotPassword.jsp +++ b/bow-ui/src/main/webapp/WEB-INF/jsp/forgotPassword.jsp @@ -1,9 +1,6 @@ <%-- #%L - bow - - $Id$ - $HeadURL$ + BOW UI %% Copyright (C) 2010 CodeLutin %% diff --git a/bow-ui/src/main/webapp/WEB-INF/jsp/home.jsp b/bow-ui/src/main/webapp/WEB-INF/jsp/home.jsp index 30c7ac0..35a5e70 100644 --- a/bow-ui/src/main/webapp/WEB-INF/jsp/home.jsp +++ b/bow-ui/src/main/webapp/WEB-INF/jsp/home.jsp @@ -1,9 +1,6 @@ <%-- #%L - bow - - $Id$ - $HeadURL$ + BOW UI %% Copyright (C) 2010 CodeLutin %% diff --git a/bow-ui/src/main/webapp/WEB-INF/jsp/inc/bookmark.jsp b/bow-ui/src/main/webapp/WEB-INF/jsp/inc/bookmark.jsp index 9b87671..5e89bde 100644 --- a/bow-ui/src/main/webapp/WEB-INF/jsp/inc/bookmark.jsp +++ b/bow-ui/src/main/webapp/WEB-INF/jsp/inc/bookmark.jsp @@ -1,9 +1,6 @@ <%-- #%L - bow - - $Id$ - $HeadURL$ + BOW UI %% Copyright (C) 2010 CodeLutin %% diff --git a/bow-ui/src/main/webapp/WEB-INF/jsp/inc/footer.jsp b/bow-ui/src/main/webapp/WEB-INF/jsp/inc/footer.jsp index 50d823c..b65dcab 100644 --- a/bow-ui/src/main/webapp/WEB-INF/jsp/inc/footer.jsp +++ b/bow-ui/src/main/webapp/WEB-INF/jsp/inc/footer.jsp @@ -1,9 +1,6 @@ <%-- #%L - bow - - $Id$ - $HeadURL$ + BOW UI %% Copyright (C) 2010 - 2011 CodeLutin %% diff --git a/bow-ui/src/main/webapp/WEB-INF/jsp/inc/header.jsp b/bow-ui/src/main/webapp/WEB-INF/jsp/inc/header.jsp index 525b6b3..8c14bc2 100644 --- a/bow-ui/src/main/webapp/WEB-INF/jsp/inc/header.jsp +++ b/bow-ui/src/main/webapp/WEB-INF/jsp/inc/header.jsp @@ -1,8 +1,6 @@ <%-- #%L - bow - $Id$ - $HeadURL$ + BOW UI %% Copyright (C) 2010 - 2011 CodeLutin %% diff --git a/bow-ui/src/main/webapp/WEB-INF/jsp/inc/rightMenu.jsp b/bow-ui/src/main/webapp/WEB-INF/jsp/inc/rightMenu.jsp index 5de9983..4d55c3c 100644 --- a/bow-ui/src/main/webapp/WEB-INF/jsp/inc/rightMenu.jsp +++ b/bow-ui/src/main/webapp/WEB-INF/jsp/inc/rightMenu.jsp @@ -1,9 +1,6 @@ <%-- #%L - bow - - $Id$ - $HeadURL$ + BOW UI %% Copyright (C) 2010 CodeLutin %% @@ -11,12 +8,10 @@ it under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. - This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - You should have received a copy of the GNU Affero General Public License along with this program. If not, see <http://www.gnu.org/licenses/>. #L% diff --git a/bow-ui/src/main/webapp/WEB-INF/jsp/inc/tagsCloud.jsp b/bow-ui/src/main/webapp/WEB-INF/jsp/inc/tagsCloud.jsp index 8b21c62..45b24b9 100644 --- a/bow-ui/src/main/webapp/WEB-INF/jsp/inc/tagsCloud.jsp +++ b/bow-ui/src/main/webapp/WEB-INF/jsp/inc/tagsCloud.jsp @@ -1,9 +1,6 @@ <%-- #%L - bow - - $Id$ - $HeadURL$ + BOW UI %% Copyright (C) 2010 CodeLutin %% @@ -41,4 +38,4 @@ <s:property value="%{#tag.topicName}" /> </s:a> </s:iterator> -</div> \ No newline at end of file +</div> diff --git a/bow-ui/src/main/webapp/WEB-INF/jsp/login.jsp b/bow-ui/src/main/webapp/WEB-INF/jsp/login.jsp index 8fef241..0cd158a 100644 --- a/bow-ui/src/main/webapp/WEB-INF/jsp/login.jsp +++ b/bow-ui/src/main/webapp/WEB-INF/jsp/login.jsp @@ -1,9 +1,6 @@ <%-- #%L - bow - - $Id$ - $HeadURL$ + BOW UI %% Copyright (C) 2010 - 2011 CodeLutin %% diff --git a/bow-ui/src/main/webapp/WEB-INF/jsp/permanentXml.jsp b/bow-ui/src/main/webapp/WEB-INF/jsp/permanentXml.jsp index 07e8d5c..07779b3 100644 --- a/bow-ui/src/main/webapp/WEB-INF/jsp/permanentXml.jsp +++ b/bow-ui/src/main/webapp/WEB-INF/jsp/permanentXml.jsp @@ -1,9 +1,6 @@ <%-- #%L - bow - - $Id$ - $HeadURL$ + BOW UI %% Copyright (C) 2010 CodeLutin %% diff --git a/bow-ui/src/main/webapp/WEB-INF/jsp/preferences.jsp b/bow-ui/src/main/webapp/WEB-INF/jsp/preferences.jsp index dbe0dda..7e46862 100644 --- a/bow-ui/src/main/webapp/WEB-INF/jsp/preferences.jsp +++ b/bow-ui/src/main/webapp/WEB-INF/jsp/preferences.jsp @@ -1,25 +1,20 @@ <%-- #%L -bow - -$Id$ -$HeadURL$ -%% -Copyright (C) 2010 CodeLutin -%% -This program is free software: you can redistribute it and/or modify -it under the terms of the GNU Affero General Public License as published by -the Free Software Foundation, either version 3 of the License, or -(at your option) any later version. - -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. - -You should have received a copy of the GNU Affero General Public License -along with this program. If not, see <http://www.gnu.org/licenses/>. -#L% + BOW UI + %% + Copyright (C) 2010 CodeLutin + %% + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU Affero General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see <http://www.gnu.org/licenses/>. + #L% --%> <%@page import="org.chorem.bow.action.preference.PreferenceBaseAction"%> <%@page contentType="text/html; charset=UTF-8" pageEncoding="UTF-8" %> @@ -236,4 +231,4 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. </div> </body> -</html> \ No newline at end of file +</html> diff --git a/bow-ui/src/main/webapp/WEB-INF/jsp/register.jsp b/bow-ui/src/main/webapp/WEB-INF/jsp/register.jsp index e100709..6b87026 100644 --- a/bow-ui/src/main/webapp/WEB-INF/jsp/register.jsp +++ b/bow-ui/src/main/webapp/WEB-INF/jsp/register.jsp @@ -1,9 +1,6 @@ <%-- #%L - bow - - $Id$ - $HeadURL$ + BOW UI %% Copyright (C) 2010 CodeLutin %% diff --git a/bow-ui/src/main/webapp/WEB-INF/jsp/suggestions.jsp b/bow-ui/src/main/webapp/WEB-INF/jsp/suggestions.jsp index a26399c..bc39e3b 100644 --- a/bow-ui/src/main/webapp/WEB-INF/jsp/suggestions.jsp +++ b/bow-ui/src/main/webapp/WEB-INF/jsp/suggestions.jsp @@ -1,9 +1,6 @@ <%-- #%L - bow - - $Id$ - $HeadURL$ + BOW UI %% Copyright (C) 2010 CodeLutin %% diff --git a/bow-ui/src/main/webapp/WEB-INF/jsp/temporaryXml.jsp b/bow-ui/src/main/webapp/WEB-INF/jsp/temporaryXml.jsp index e2b3d89..b8034c4 100644 --- a/bow-ui/src/main/webapp/WEB-INF/jsp/temporaryXml.jsp +++ b/bow-ui/src/main/webapp/WEB-INF/jsp/temporaryXml.jsp @@ -1,9 +1,6 @@ <%-- #%L - bow - - $Id$ - $HeadURL$ + BOW UI %% Copyright (C) 2010 CodeLutin %% diff --git a/bow-ui/src/main/webapp/WEB-INF/sitemesh.xml b/bow-ui/src/main/webapp/WEB-INF/sitemesh.xml index 2dbab04..dff967c 100644 --- a/bow-ui/src/main/webapp/WEB-INF/sitemesh.xml +++ b/bow-ui/src/main/webapp/WEB-INF/sitemesh.xml @@ -1,10 +1,7 @@ <?xml version="1.0" encoding="UTF-8" ?> <!-- #%L - bow - - $Id$ - $HeadURL$ + BOW UI %% Copyright (C) 2010 - 2011 CodeLutin %% diff --git a/bow-ui/src/main/webapp/WEB-INF/web.xml b/bow-ui/src/main/webapp/WEB-INF/web.xml index 73a4da9..b3df661 100644 --- a/bow-ui/src/main/webapp/WEB-INF/web.xml +++ b/bow-ui/src/main/webapp/WEB-INF/web.xml @@ -1,10 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- #%L - bow - - $Id$ - $HeadURL$ + BOW UI %% Copyright (C) 2010 CodeLutin %% diff --git a/bow-ui/src/main/webapp/css/bookmark.css b/bow-ui/src/main/webapp/css/bookmark.css old mode 100755 new mode 100644 index 9081e19..e6548df --- a/bow-ui/src/main/webapp/css/bookmark.css +++ b/bow-ui/src/main/webapp/css/bookmark.css @@ -1,10 +1,7 @@ @charset "utf-8"; /* * #%L - * bow - * - * $Id$ - * $HeadURL$ + * BOW UI * %% * Copyright (C) 2010 CodeLutin * %% diff --git a/bow-ui/src/main/webapp/css/connexion.css b/bow-ui/src/main/webapp/css/connexion.css old mode 100755 new mode 100644 index b0bfcb6..75c64ee --- a/bow-ui/src/main/webapp/css/connexion.css +++ b/bow-ui/src/main/webapp/css/connexion.css @@ -1,10 +1,7 @@ @charset "utf-8"; /* * #%L - * bow - * - * $Id$ - * $HeadURL$ + * BOW UI * %% * Copyright (C) 2010 CodeLutin * %% @@ -144,4 +141,4 @@ input[type="submit"]{ #register{ margin-top:20px; -} \ No newline at end of file +} diff --git a/bow-ui/src/main/webapp/css/global.css b/bow-ui/src/main/webapp/css/global.css index 288b074..a32c92d 100644 --- a/bow-ui/src/main/webapp/css/global.css +++ b/bow-ui/src/main/webapp/css/global.css @@ -1,10 +1,7 @@ @charset "utf-8"; /* * #%L - * bow - * - * $Id$ - * $HeadURL$ + * BOW UI * %% * Copyright (C) 2010 CodeLutin * %% @@ -182,4 +179,4 @@ form, .wwFormTable{ color:#804561; font-size:11px; font-weight:bold; -} \ No newline at end of file +} diff --git a/bow-ui/src/main/webapp/css/jquery-ui-1.8.11.custom.bow.css b/bow-ui/src/main/webapp/css/jquery-ui-1.8.11.custom.bow.css index df59157..5d4cb94 100644 --- a/bow-ui/src/main/webapp/css/jquery-ui-1.8.11.custom.bow.css +++ b/bow-ui/src/main/webapp/css/jquery-ui-1.8.11.custom.bow.css @@ -1,9 +1,6 @@ /* * #%L * BOW UI - * - * $Id$ - * $HeadURL$ * %% * Copyright (C) 2010 - 2011 CodeLutin * %% diff --git a/bow-ui/src/main/webapp/index.jsp b/bow-ui/src/main/webapp/index.jsp index 365539e..11208c1 100644 --- a/bow-ui/src/main/webapp/index.jsp +++ b/bow-ui/src/main/webapp/index.jsp @@ -1,9 +1,6 @@ <!-- #%L - bow - - $Id$ - $HeadURL$ + BOW UI %% Copyright (C) 2010 - 2011 CodeLutin %% @@ -28,4 +25,4 @@ if (BowSession.getBowSession(session).getUser() == null) { } else { response.sendRedirect("home.action"); } -%> \ No newline at end of file +%> diff --git a/bow-ui/src/main/webapp/js/bookmark.js b/bow-ui/src/main/webapp/js/bookmark.js index 0771c4a..7cdb67a 100644 --- a/bow-ui/src/main/webapp/js/bookmark.js +++ b/bow-ui/src/main/webapp/js/bookmark.js @@ -1,9 +1,6 @@ /* * #%L * BOW UI - * - * $Id$ - * $HeadURL$ * %% * Copyright (C) 2010 - 2011 CodeLutin * %% diff --git a/bow-ui/src/main/webapp/styles/forms.css b/bow-ui/src/main/webapp/styles/forms.css index a2abaad..866d330 100644 --- a/bow-ui/src/main/webapp/styles/forms.css +++ b/bow-ui/src/main/webapp/styles/forms.css @@ -1,9 +1,6 @@ /* * #%L - * bow - * - * $Id$ - * $HeadURL$ + * BOW UI * %% * Copyright (C) 2010 - 2011 CodeLutin * %% @@ -120,4 +117,4 @@ width: 15em; } /* END FORM ELEMENTS */ - \ No newline at end of file + diff --git a/bow-ui/src/main/webapp/styles/layout-1col.css b/bow-ui/src/main/webapp/styles/layout-1col.css index 7cc993b..fee9902 100644 --- a/bow-ui/src/main/webapp/styles/layout-1col.css +++ b/bow-ui/src/main/webapp/styles/layout-1col.css @@ -1,9 +1,6 @@ /* * #%L - * bow - * - * $Id$ - * $HeadURL$ + * BOW UI * %% * Copyright (C) 2010 - 2011 CodeLutin * %% @@ -47,4 +44,4 @@ div#nav { display: none; } -/* END CONTENT */ \ No newline at end of file +/* END CONTENT */ diff --git a/bow-ui/src/main/webapp/styles/layout-navleft-1col.css b/bow-ui/src/main/webapp/styles/layout-navleft-1col.css index e7b40dc..2f410e7 100644 --- a/bow-ui/src/main/webapp/styles/layout-navleft-1col.css +++ b/bow-ui/src/main/webapp/styles/layout-navleft-1col.css @@ -1,9 +1,6 @@ /* * #%L - * bow - * - * $Id$ - * $HeadURL$ + * BOW UI * %% * Copyright (C) 2010 - 2011 CodeLutin * %% @@ -51,4 +48,4 @@ width: 200px; display: inline; } -/* END CONTENT */ \ No newline at end of file +/* END CONTENT */ diff --git a/bow-ui/src/main/webapp/styles/layout-navleft-2col.css b/bow-ui/src/main/webapp/styles/layout-navleft-2col.css index 7f8f830..5b0d4f5 100644 --- a/bow-ui/src/main/webapp/styles/layout-navleft-2col.css +++ b/bow-ui/src/main/webapp/styles/layout-navleft-2col.css @@ -1,9 +1,6 @@ /* * #%L - * bow - * - * $Id$ - * $HeadURL$ + * BOW UI * %% * Copyright (C) 2010 - 2011 CodeLutin * %% @@ -59,4 +56,4 @@ width: 200px; display: inline; } -/* END CONTENT */ \ No newline at end of file +/* END CONTENT */ diff --git a/bow-ui/src/main/webapp/styles/layout-navtop-1col.css b/bow-ui/src/main/webapp/styles/layout-navtop-1col.css index 1c87ddc..721ea96 100644 --- a/bow-ui/src/main/webapp/styles/layout-navtop-1col.css +++ b/bow-ui/src/main/webapp/styles/layout-navtop-1col.css @@ -1,9 +1,6 @@ /* * #%L - * bow - * - * $Id$ - * $HeadURL$ + * BOW UI * %% * Copyright (C) 2010 - 2011 CodeLutin * %% @@ -52,4 +49,4 @@ text-align: left; } -/* END CONTENT */ \ No newline at end of file +/* END CONTENT */ diff --git a/bow-ui/src/main/webapp/styles/layout-navtop-3col.css b/bow-ui/src/main/webapp/styles/layout-navtop-3col.css index 5f42757..f96e4a7 100644 --- a/bow-ui/src/main/webapp/styles/layout-navtop-3col.css +++ b/bow-ui/src/main/webapp/styles/layout-navtop-3col.css @@ -1,9 +1,6 @@ /* * #%L - * bow - * - * $Id$ - * $HeadURL$ + * BOW UI * %% * Copyright (C) 2010 - 2011 CodeLutin * %% @@ -63,4 +60,4 @@ text-align: left; } -/* END CONTENT */ \ No newline at end of file +/* END CONTENT */ diff --git a/bow-ui/src/main/webapp/styles/layout-navtop-localleft.css b/bow-ui/src/main/webapp/styles/layout-navtop-localleft.css index 7e78f89..3c13018 100644 --- a/bow-ui/src/main/webapp/styles/layout-navtop-localleft.css +++ b/bow-ui/src/main/webapp/styles/layout-navtop-localleft.css @@ -1,9 +1,6 @@ /* * #%L - * bow - * - * $Id$ - * $HeadURL$ + * BOW UI * %% * Copyright (C) 2010 - 2011 CodeLutin * %% @@ -56,4 +53,4 @@ text-align: left; } -/* END CONTENT */ \ No newline at end of file +/* END CONTENT */ diff --git a/bow-ui/src/main/webapp/styles/layout-navtop-subright.css b/bow-ui/src/main/webapp/styles/layout-navtop-subright.css index 2663a6d..1cb440d 100644 --- a/bow-ui/src/main/webapp/styles/layout-navtop-subright.css +++ b/bow-ui/src/main/webapp/styles/layout-navtop-subright.css @@ -1,9 +1,6 @@ /* * #%L - * bow - * - * $Id$ - * $HeadURL$ + * BOW UI * %% * Copyright (C) 2010 - 2011 CodeLutin * %% @@ -56,4 +53,4 @@ text-align: left; } -/* END CONTENT */ \ No newline at end of file +/* END CONTENT */ diff --git a/bow-ui/src/main/webapp/styles/layout.css b/bow-ui/src/main/webapp/styles/layout.css index 06f3d7f..d628148 100644 --- a/bow-ui/src/main/webapp/styles/layout.css +++ b/bow-ui/src/main/webapp/styles/layout.css @@ -1,9 +1,6 @@ /* * #%L - * bow - * - * $Id$ - * $HeadURL$ + * BOW UI * %% * Copyright (C) 2010 - 2011 CodeLutin * %% diff --git a/bow-ui/src/main/webapp/styles/main.css b/bow-ui/src/main/webapp/styles/main.css index 24ba429..b29d423 100644 --- a/bow-ui/src/main/webapp/styles/main.css +++ b/bow-ui/src/main/webapp/styles/main.css @@ -1,9 +1,6 @@ /* * #%L - * bow - * - * $Id$ - * $HeadURL$ + * BOW UI * %% * Copyright (C) 2010 - 2011 CodeLutin * %% @@ -41,4 +38,4 @@ */ @import url("layout-navtop-localleft.css"); @import url("layout.css"); - \ No newline at end of file + diff --git a/bow-ui/src/main/webapp/styles/nav-horizontal.css b/bow-ui/src/main/webapp/styles/nav-horizontal.css index b8aede9..c14262e 100644 --- a/bow-ui/src/main/webapp/styles/nav-horizontal.css +++ b/bow-ui/src/main/webapp/styles/nav-horizontal.css @@ -1,9 +1,6 @@ /* * #%L - * bow - * - * $Id$ - * $HeadURL$ + * BOW UI * %% * Copyright (C) 2010 - 2011 CodeLutin * %% @@ -100,4 +97,4 @@ color: white; background-color: black; } -/* END NAV */ \ No newline at end of file +/* END NAV */ diff --git a/bow-ui/src/main/webapp/styles/nav-vertical.css b/bow-ui/src/main/webapp/styles/nav-vertical.css index 947d3d8..41685f5 100644 --- a/bow-ui/src/main/webapp/styles/nav-vertical.css +++ b/bow-ui/src/main/webapp/styles/nav-vertical.css @@ -1,9 +1,6 @@ /* * #%L - * bow - * - * $Id$ - * $HeadURL$ + * BOW UI * %% * Copyright (C) 2010 - 2011 CodeLutin * %% @@ -99,4 +96,4 @@ color: white; background-color: black; } -/* END NAV */ \ No newline at end of file +/* END NAV */ diff --git a/bow-ui/src/main/webapp/styles/tools.css b/bow-ui/src/main/webapp/styles/tools.css index 7299ad5..1100ea0 100644 --- a/bow-ui/src/main/webapp/styles/tools.css +++ b/bow-ui/src/main/webapp/styles/tools.css @@ -1,9 +1,6 @@ /* * #%L - * bow - * - * $Id$ - * $HeadURL$ + * BOW UI * %% * Copyright (C) 2010 - 2011 CodeLutin * %% @@ -88,4 +85,4 @@ top: -999em; left: -999em; } -/* end accessibility */ \ No newline at end of file +/* end accessibility */ diff --git a/bow-ui/src/main/webapp/styles/typo.css b/bow-ui/src/main/webapp/styles/typo.css index 5d33913..bebe9c1 100644 --- a/bow-ui/src/main/webapp/styles/typo.css +++ b/bow-ui/src/main/webapp/styles/typo.css @@ -1,9 +1,6 @@ /* * #%L - * bow - * - * $Id$ - * $HeadURL$ + * BOW UI * %% * Copyright (C) 2010 - 2011 CodeLutin * %% @@ -197,4 +194,4 @@ border-bottom: 1px dotted black; } -/* END TYPOGRAPHY */ \ No newline at end of file +/* END TYPOGRAPHY */ diff --git a/bow-ui/src/main/webapp/template/simple/a-close.ftl b/bow-ui/src/main/webapp/template/simple/a-close.ftl index 944210e..4903528 100644 --- a/bow-ui/src/main/webapp/template/simple/a-close.ftl +++ b/bow-ui/src/main/webapp/template/simple/a-close.ftl @@ -1,8 +1,6 @@ <#-- #%L BOW UI - $Id$ - $HeadURL$ %% Copyright (C) 2010 - 2013 CodeLutin %% diff --git a/bow-ui/src/main/webapp/template/simple/form-common.ftl b/bow-ui/src/main/webapp/template/simple/form-common.ftl index b03a131..b1737ec 100644 --- a/bow-ui/src/main/webapp/template/simple/form-common.ftl +++ b/bow-ui/src/main/webapp/template/simple/form-common.ftl @@ -1,8 +1,6 @@ <#-- #%L BOW UI - $Id$ - $HeadURL$ %% Copyright (C) 2010 - 2013 CodeLutin %% diff --git a/bow-ui/src/main/webapp/template/xhtml/controlheader-core.ftl b/bow-ui/src/main/webapp/template/xhtml/controlheader-core.ftl index 46755b0..e543c01 100644 --- a/bow-ui/src/main/webapp/template/xhtml/controlheader-core.ftl +++ b/bow-ui/src/main/webapp/template/xhtml/controlheader-core.ftl @@ -1,8 +1,6 @@ <#-- #%L BOW UI - $Id$ - $HeadURL$ %% Copyright (C) 2010 - 2013 CodeLutin %% @@ -85,4 +83,4 @@ ${parameters.labelseparator?default(":")?html}<#t/> </#if> <#if parameters.labelposition?default("") == 'top'> <br /> -</#if> \ No newline at end of file +</#if> diff --git a/bow-ui/src/main/webapp/template/xhtml/file.ftl b/bow-ui/src/main/webapp/template/xhtml/file.ftl index c89e5b5..24e0e4d 100644 --- a/bow-ui/src/main/webapp/template/xhtml/file.ftl +++ b/bow-ui/src/main/webapp/template/xhtml/file.ftl @@ -1,8 +1,6 @@ <#-- #%L BOW UI - $Id$ - $HeadURL$ %% Copyright (C) 2010 - 2013 CodeLutin %% diff --git a/bow-ui/src/main/webapp/template/xhtml/form-close.ftl b/bow-ui/src/main/webapp/template/xhtml/form-close.ftl index 4e4a807..86ace2f 100644 --- a/bow-ui/src/main/webapp/template/xhtml/form-close.ftl +++ b/bow-ui/src/main/webapp/template/xhtml/form-close.ftl @@ -1,8 +1,6 @@ <#-- #%L BOW UI - $Id$ - $HeadURL$ %% Copyright (C) 2010 - 2013 CodeLutin %% diff --git a/bow-ui/src/main/webapp/template/xhtml/form.ftl b/bow-ui/src/main/webapp/template/xhtml/form.ftl index 7349afe..e6708df 100644 --- a/bow-ui/src/main/webapp/template/xhtml/form.ftl +++ b/bow-ui/src/main/webapp/template/xhtml/form.ftl @@ -1,8 +1,6 @@ <#-- #%L BOW UI - $Id$ - $HeadURL$ %% Copyright (C) 2010 - 2013 CodeLutin %% diff --git a/bow-ui/src/main/webapp/template/xhtml/password.ftl b/bow-ui/src/main/webapp/template/xhtml/password.ftl index 29572b1..3cdb8c3 100644 --- a/bow-ui/src/main/webapp/template/xhtml/password.ftl +++ b/bow-ui/src/main/webapp/template/xhtml/password.ftl @@ -1,8 +1,6 @@ <#-- #%L BOW UI - $Id$ - $HeadURL$ %% Copyright (C) 2010 - 2013 CodeLutin %% diff --git a/bow-ui/src/main/webapp/template/xhtml/submit-close.ftl b/bow-ui/src/main/webapp/template/xhtml/submit-close.ftl index 74aa9ec..55524b9 100644 --- a/bow-ui/src/main/webapp/template/xhtml/submit-close.ftl +++ b/bow-ui/src/main/webapp/template/xhtml/submit-close.ftl @@ -1,8 +1,6 @@ <#-- #%L BOW UI - $Id$ - $HeadURL$ %% Copyright (C) 2010 - 2013 CodeLutin %% diff --git a/bow-ui/src/main/webapp/template/xhtml/submit.ftl b/bow-ui/src/main/webapp/template/xhtml/submit.ftl index 6ac6515..de81fc6 100644 --- a/bow-ui/src/main/webapp/template/xhtml/submit.ftl +++ b/bow-ui/src/main/webapp/template/xhtml/submit.ftl @@ -1,8 +1,6 @@ <#-- #%L BOW UI - $Id$ - $HeadURL$ %% Copyright (C) 2010 - 2013 CodeLutin %% diff --git a/bow-ui/src/main/webapp/template/xhtml/text.ftl b/bow-ui/src/main/webapp/template/xhtml/text.ftl index d70593c..4abf51f 100644 --- a/bow-ui/src/main/webapp/template/xhtml/text.ftl +++ b/bow-ui/src/main/webapp/template/xhtml/text.ftl @@ -1,8 +1,6 @@ <#-- #%L BOW UI - $Id$ - $HeadURL$ %% Copyright (C) 2010 - 2013 CodeLutin %% diff --git a/bow-ui/src/main/webapp/index.jsp b/bow-ui/src/site/site.xml similarity index 52% copy from bow-ui/src/main/webapp/index.jsp copy to bow-ui/src/site/site.xml index 365539e..915ed8d 100644 --- a/bow-ui/src/main/webapp/index.jsp +++ b/bow-ui/src/site/site.xml @@ -1,31 +1,41 @@ +<?xml version="1.0" encoding="UTF-8"?> <!-- #%L - bow - - $Id$ - $HeadURL$ + BOW UI %% - Copyright (C) 2010 - 2011 CodeLutin + Copyright (C) 2010 CodeLutin %% This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. - This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - You should have received a copy of the GNU Affero General Public License along with this program. If not, see <http://www.gnu.org/licenses/>. #L% --> -<%@page import="org.chorem.bow.BowSession"%> -<% -if (BowSession.getBowSession(session).getUser() == null) { - response.sendRedirect("login_input.action"); -} else { - response.sendRedirect("home.action"); -} -%> \ No newline at end of file + +<project name="${project.name}" + xmlns="http://maven.apache.org/DECORATION/1.4.0" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/DECORATION/1.4.0 http://maven.apache.org/xsd/decoration-1.4.0.xsd"> + + <bannerLeft> + <name>${project.name}</name> + <href>index.html</href> + </bannerLeft> + + <body> + + <breadcrumbs> + <item name="${project.name}" href="index.html"/> + </breadcrumbs> + + <menu ref="parent"/> + <menu ref="reports"/> + + </body> +</project> diff --git a/pom.xml b/pom.xml index e6cb857..dd7c2a8 100644 --- a/pom.xml +++ b/pom.xml @@ -1,11 +1,12 @@ <?xml version="1.0" encoding="UTF-8"?> -<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/xsd/maven-4.0.0.xsd"> +<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/xsd/maven-4.0.0.xsd"> <modelVersion>4.0.0</modelVersion> <parent> <groupId>org.nuiton</groupId> - <artifactId>mavenpom4redmine</artifactId> - <version>5.0</version> + <artifactId>chorempom</artifactId> + <version>1.5</version> </parent> <groupId>org.chorem</groupId> @@ -15,8 +16,9 @@ <name>bow</name> <description>bookmarks on web</description> - <url>http://doc.chorem.org/bow</url> + <url>http://bow.chorem.org</url> <inceptionYear>2010</inceptionYear> + <licenses> <license> <name>GNU Affero General Public License version 3</name> @@ -29,8 +31,6 @@ <developer> <id>sletellier</id> <name>Sylvain Letellier</name> - <organization>CodeLutin</organization> - <organizationUrl>http://codelutin.com</organizationUrl> <timezone>Europe/Paris</timezone> <roles> <role>Developer</role> @@ -40,7 +40,7 @@ <developer> <id>kmorin</id> <name>Kevin Morin</name> - <email>morin at codelutin dot com</email> + <email>morin@codelutin.com</email> <organization>CodeLutin</organization> <organizationUrl>http://codelutin.com</organizationUrl> <timezone>Europe/Paris</timezone> @@ -52,7 +52,7 @@ <developer> <id>bpoussin</id> <name>Benjamin Poussin</name> - <email>poussin at codelutin dot com</email> + <email>poussin@codelutin.com</email> <organization>CodeLutin</organization> <organizationUrl>http://codelutin.com</organizationUrl> <timezone>Europe/Paris</timezone> @@ -64,7 +64,7 @@ <developer> <id>tchemit</id> <name>Tony Chemit</name> - <email>chemit at codelutin dot com</email> + <email>chemit@codelutin.com</email> <organization>CodeLutin</organization> <organizationUrl>http://codelutin.com</organizationUrl> <timezone>Europe/Paris</timezone> @@ -76,8 +76,6 @@ <contributors> <contributor> <name>Benoit Brossaud</name> - <organization>CodeLutin</organization> - <organizationUrl>http://codelutin.com</organizationUrl> <timezone>Europe/Paris</timezone> <roles> <role>Developer</role> @@ -86,8 +84,6 @@ <contributor> <name>Valentin Brillant</name> - <organization>CodeLutin</organization> - <organizationUrl>http://codelutin.com</organizationUrl> <timezone>Europe/Paris</timezone> <roles> <role>Developer</role> @@ -101,21 +97,21 @@ </modules> <scm> - <connection>scm:svn:http://svn.chorem.org/bow/trunk</connection> + <connection>scm:git:http://git.chorem.org/bow.git</connection> <developerConnection> - scm:svn:https://svn.chorem.org/bow/trunk + scm:git:https://git.chorem.org/bow.git </developerConnection> - <url>http://forge.chorem.org/repositories/browse/bow/trunk</url> + <url>https://gitweb.chorem.org/bow.git</url> </scm> <distributionManagement> <site> - <id>doc.${platform}</id> - <url>${our.site.repository}/${projectId}</url> + <id>${site.server}</id> + <url>${site.url}</url> </site> </distributionManagement> <properties> - <platform>chorem.org</platform> + <projectId>bow</projectId> <eugenePluginVersion>2.4.2</eugenePluginVersion> @@ -133,9 +129,13 @@ <h2Version>1.2.134</h2Version> <crxMavenPluginVersion>1.1.0</crxMavenPluginVersion> <jstlVersion>1.2</jstlVersion> - + <!-- license to use --> <license.licenseName>agpl_v3</license.licenseName> + + <!-- documentation locale --> + <locales>fr</locales> + </properties> <repositories> @@ -327,14 +327,79 @@ <scope>runtime</scope> </dependency> - <dependency> - <groupId>javax.servlet</groupId> - <artifactId>jstl</artifactId> - <version>${jstlVersion}</version> - <scope>runtime</scope> - </dependency> + <dependency> + <groupId>javax.servlet</groupId> + <artifactId>jstl</artifactId> + <version>${jstlVersion}</version> + <scope>runtime</scope> + </dependency> + + <dependency> + <groupId>log4j</groupId> + <artifactId>log4j</artifactId> + <version>1.2.17</version> + </dependency> + + <dependency> + <groupId>junit</groupId> + <artifactId>junit</artifactId> + <version>4.11</version> + <scope>test</scope> + </dependency> + + + <dependency> + <groupId>commons-io</groupId> + <artifactId>commons-io</artifactId> + <version>2.4</version> + </dependency> + + <dependency> + <groupId>org.apache.commons</groupId> + <artifactId>commons-lang3</artifactId> + <version>3.3.2</version> + </dependency> + + <dependency> + <groupId>commons-logging</groupId> + <artifactId>commons-logging</artifactId> + <version>1.2</version> + </dependency> + + <dependency> + <groupId>commons-collections</groupId> + <artifactId>commons-collections</artifactId> + <version>3.2.1</version> + </dependency> + + <dependency> + <groupId>commons-codec</groupId> + <artifactId>commons-codec</artifactId> + <version>1.9</version> + </dependency> + + <dependency> + <groupId>org.apache.httpcomponents</groupId> + <artifactId>httpcore</artifactId> + <version>4.3</version> + </dependency> + + <!-- used to call screenshot service and to get suggestion from search engine --> + <dependency> + <groupId>org.apache.httpcomponents</groupId> + <artifactId>httpclient</artifactId> + <version>4.3</version> + </dependency> + + <!-- used to parse html and extract favicon url --> + <dependency> + <groupId>org.jsoup</groupId> + <artifactId>jsoup</artifactId> + <version>1.7.2</version> + </dependency> + - </dependencies> + </dependencies> </dependencyManagement> diff --git a/src/site/rst/developper/bow-model.rst b/src/site/rst/developper/bow-model.rst index 98d81a7..462a846 100644 --- a/src/site/rst/developper/bow-model.rst +++ b/src/site/rst/developper/bow-model.rst @@ -1,9 +1,6 @@ .. - .. * #%L .. * bow -.. * -.. * $Id$ -.. * $HeadURL$ .. * %% .. * Copyright (C) 2010 - 2011 CodeLutin .. * %% diff --git a/src/site/rst/developper/installation.rst b/src/site/rst/developper/installation.rst index 85d19c8..31f2a0a 100644 --- a/src/site/rst/developper/installation.rst +++ b/src/site/rst/developper/installation.rst @@ -1,9 +1,6 @@ .. - .. * #%L .. * bow -.. * -.. * $Id$ -.. * $HeadURL$ .. * %% .. * Copyright (C) 2010 CodeLutin .. * %% diff --git a/src/site/rst/developper/presentation.rst b/src/site/rst/developper/presentation.rst index 47eacaa..6c10b6c 100644 --- a/src/site/rst/developper/presentation.rst +++ b/src/site/rst/developper/presentation.rst @@ -1,9 +1,6 @@ .. - .. * #%L .. * bow -.. * -.. * $Id$ -.. * $HeadURL$ .. * %% .. * Copyright (C) 2010 CodeLutin .. * %% diff --git a/src/site/rst/index.rst b/src/site/rst/index.rst index 7822eba..785db56 100644 --- a/src/site/rst/index.rst +++ b/src/site/rst/index.rst @@ -1,9 +1,6 @@ .. - .. * #%L .. * bow -.. * -.. * $Id$ -.. * $HeadURL$ .. * %% .. * Copyright (C) 2010 CodeLutin .. * %% @@ -21,6 +18,7 @@ .. * along with this program. If not, see <http://www.gnu.org/licenses/>. .. * #L% .. - + Bow === diff --git a/src/site/rst/todo.rst b/src/site/rst/todo.rst index ef5f538..b115253 100644 --- a/src/site/rst/todo.rst +++ b/src/site/rst/todo.rst @@ -1,9 +1,6 @@ .. - .. * #%L .. * bow -.. * -.. * $Id$ -.. * $HeadURL$ .. * %% .. * Copyright (C) 2010 CodeLutin .. * %% @@ -21,6 +18,7 @@ .. * along with this program. If not, see <http://www.gnu.org/licenses/>. .. * #L% .. - + Project BOW =========== diff --git a/src/site/rst/user/addBookmark.rst b/src/site/rst/user/addBookmark.rst index a53d9cc..89208a2 100644 --- a/src/site/rst/user/addBookmark.rst +++ b/src/site/rst/user/addBookmark.rst @@ -1,9 +1,6 @@ .. - .. * #%L .. * bow -.. * -.. * $Id$ -.. * $HeadURL$ .. * %% .. * Copyright (C) 2010 CodeLutin .. * %% @@ -21,6 +18,7 @@ .. * along with this program. If not, see <http://www.gnu.org/licenses/>. .. * #L% .. - + ===================== Ajout de marque-pages ===================== diff --git a/src/site/rst/user/alias.rst b/src/site/rst/user/alias.rst index d3a7cad..95b1f07 100644 --- a/src/site/rst/user/alias.rst +++ b/src/site/rst/user/alias.rst @@ -1,9 +1,6 @@ .. - .. * #%L .. * bow -.. * -.. * $Id$ -.. * $HeadURL$ .. * %% .. * Copyright (C) 2010 CodeLutin .. * %% @@ -21,6 +18,7 @@ .. * along with this program. If not, see <http://www.gnu.org/licenses/>. .. * #L% .. - + ============================================== Utilisation des alias / Service d'URLS courtes ============================================== diff --git a/src/site/rst/user/importExport.rst b/src/site/rst/user/importExport.rst index dcc60b3..df95c47 100644 --- a/src/site/rst/user/importExport.rst +++ b/src/site/rst/user/importExport.rst @@ -1,9 +1,6 @@ .. - .. * #%L .. * bow -.. * -.. * $Id$ -.. * $HeadURL$ .. * %% .. * Copyright (C) 2010 CodeLutin .. * %% @@ -21,6 +18,7 @@ .. * along with this program. If not, see <http://www.gnu.org/licenses/>. .. * #L% .. - + ============= Import/Export ============= diff --git a/src/site/rst/user/openSearch.rst b/src/site/rst/user/openSearch.rst index 8f3de14..4c51955 100644 --- a/src/site/rst/user/openSearch.rst +++ b/src/site/rst/user/openSearch.rst @@ -1,9 +1,6 @@ .. - .. * #%L .. * bow -.. * -.. * $Id$ -.. * $HeadURL$ .. * %% .. * Copyright (C) 2010 CodeLutin .. * %% @@ -21,6 +18,7 @@ .. * along with this program. If not, see <http://www.gnu.org/licenses/>. .. * #L% .. - + ==================================== OpenSearch/Barre de recherche rapide ==================================== diff --git a/src/site/rst/user/preferences.rst b/src/site/rst/user/preferences.rst index a0bbe15..940764a 100644 --- a/src/site/rst/user/preferences.rst +++ b/src/site/rst/user/preferences.rst @@ -1,9 +1,6 @@ .. - .. * #%L .. * bow -.. * -.. * $Id$ -.. * $HeadURL$ .. * %% .. * Copyright (C) 2010 CodeLutin .. * %% @@ -21,6 +18,7 @@ .. * along with this program. If not, see <http://www.gnu.org/licenses/>. .. * #L% .. - + =========== Préférences =========== @@ -35,4 +33,4 @@ marque-page d'ajout. Vous devrez alors les réinitialiser. C'est également sur cette page que vous pouvez déterminer le nombre de marque-pages affichés sur la page d'accueil de bow, la couleur du site, le nombre de tags affichés dans le nuage et les URLs de votre moteur de -recherche externe préféré. \ No newline at end of file +recherche externe préféré. diff --git a/src/site/rst/user/search.rst b/src/site/rst/user/search.rst index ea5655d..47008f5 100644 --- a/src/site/rst/user/search.rst +++ b/src/site/rst/user/search.rst @@ -1,9 +1,6 @@ .. - .. * #%L .. * bow -.. * -.. * $Id$ -.. * $HeadURL$ .. * %% .. * Copyright (C) 2010 CodeLutin .. * %% @@ -21,6 +18,7 @@ .. * along with this program. If not, see <http://www.gnu.org/licenses/>. .. * #L% .. - + ========= Recherche ========= diff --git a/src/site/rst/user/user.rst b/src/site/rst/user/user.rst index f6a7916..17af4ba 100644 --- a/src/site/rst/user/user.rst +++ b/src/site/rst/user/user.rst @@ -1,9 +1,6 @@ .. - .. * #%L .. * bow -.. * -.. * $Id$ -.. * $HeadURL$ .. * %% .. * Copyright (C) 2010 CodeLutin .. * %% @@ -21,6 +18,7 @@ .. * along with this program. If not, see <http://www.gnu.org/licenses/>. .. * #L% .. - + Documentation utilisateur ========================= @@ -36,4 +34,4 @@ Documentation utilisateur .. Ajouter des marque-pages:: addBookmark.html .. Créer des URLs courtes de ses marque-pages:: alias.html .. Faire des recherches depuis sa barre de recherche rapide:: openSearch.html -.. Gérer ses préférences:: preferences.html \ No newline at end of file +.. Gérer ses préférences:: preferences.html diff --git a/src/site/site.xml b/src/site/site.xml index b613e09..cafc6a7 100644 --- a/src/site/site.xml +++ b/src/site/site.xml @@ -2,9 +2,6 @@ <!-- #%L bow - - $Id$ - $HeadURL$ %% Copyright (C) 2010 CodeLutin %% @@ -23,32 +20,59 @@ #L% --> -<project name="${project.name}"> +<project name="${project.name}" + xmlns="http://maven.apache.org/DECORATION/1.4.0" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/DECORATION/1.4.0 http://maven.apache.org/xsd/decoration-1.4.0.xsd"> + + <bannerLeft> + <name>${project.name}</name> + <href>index.html</href> + </bannerLeft> + + <bannerRight> + <src>http://www.codelutin.com/images/lutinorange-codelutin.png</src> + <href>http://www.codelutin.com</href> + </bannerRight> + + <poweredBy> + <logo href="http://maven.apache.org" name="Maven" img="${siteCommonResourcesUrl}/images/logos/maven-feather.png"/> + <logo href="http://docutils.sourceforge.net/rst.html" + name="ReStructuredText" img="${siteCommonResourcesUrl}/images/logos/restructuredtext-logo.png"/> + <logo href="http://maven-site.nuiton.org/jrst" name="JRst" + img="${siteCommonResourcesUrl}/images/logos/jrst-logo.png"/> + </poweredBy> + + <body> - <publishDate format="dd/MM/yyyy"/> - - <bannerLeft> - <name>${project.name}</name> - <href>index.html</href> - </bannerLeft> + <links> + <item name="nuiton.org" href="https://forge.nuiton.org"/> + <item name="chorem.org" href="https://forge.chorem.org"/> + <item name="CodeLutin" href="https://codelutin.com"/> + <item name="Libre-Entreprise" href="http://www.libre-entreprise.org/"/> + </links> - <body> + <breadcrumbs> + <item name="${project.name}" href="${project.url}/s/index.html"/> + <item name="${project.version}" href="${project.url}/v/${siteDeployClassifier}/index.html"/> + </breadcrumbs> - <menu name="Utilisateur"> - <item name="Import/Export" href="user/importExport.html" /> - <item name="Recherche de marque-pages" href="user/search.html" /> - <item name="Ajout de marque-pages" href="user/addBookmark.html" /> - <item name="Alias/URL courtes" href="user/alias.html" /> - <item name="OpenSearch" href="user/openSearch.html" /> - <item name="Préférences" href="user/preferences.html" /> - </menu> + <menu name="Utilisateur"> + <item name="Import/Export" href="user/importExport.html"/> + <item name="Recherche de marque-pages" href="user/search.html"/> + <item name="Ajout de marque-pages" href="user/addBookmark.html"/> + <item name="Alias/URL courtes" href="user/alias.html"/> + <item name="OpenSearch" href="user/openSearch.html"/> + <item name="Préférences" href="user/preferences.html"/> + </menu> - <menu name="Développeur"> - <item name="Presentation" href="developper/presentation.html" /> - <item name="Installation" href="developper/installation.html" /> - </menu> + <menu name="Développeur"> + <item name="Presentation" href="developper/presentation.html"/> + <item name="Installation" href="developper/installation.html"/> + </menu> - <menu ref="reports"/> + <menu ref="modules"/> + <menu ref="reports"/> - </body> + </body> </project> -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.