This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository nuiton-web. See http://git.nuiton.org/nuiton-web.git commit cbfc9883ff0f270baa11a2db6523082024968ecf Author: Tony CHEMIT <chemit@codelutin.com> Date: Sun Oct 26 11:11:50 2014 +0100 fixes #3547: Migrates to git --- .gitignore | 12 +++ nuiton-gwt/pom.xml | 21 ++++ .../main/java/org/nuiton/web/gwt/NuitonGWT.gwt.xml | 2 +- .../web/gwt/comparable/ComparableAnchor.java | 2 +- .../org/nuiton/web/gwt/messages/UIMessages.java | 2 +- .../web/gwt/table/SortableFlexTableWithModel.java | 2 +- nuiton-rss/pom.xml | 6 +- .../src/main/java/org/nuiton/rss/BaseServlet.java | 5 +- .../java/org/nuiton/rss/ConfigInitializer.java | 5 +- .../src/main/java/org/nuiton/rss/FeedData.java | 5 +- .../java/org/nuiton/rss/FeedEntryComparator.java | 5 +- .../main/java/org/nuiton/rss/FeedHTMLRenderer.java | 5 +- .../src/main/java/org/nuiton/rss/FeedRenderer.java | 5 +- .../java/org/nuiton/rss/FeedRendererConfig.java | 5 +- .../src/main/java/org/nuiton/rss/FeedType.java | 5 +- .../main/java/org/nuiton/rss/FeedURLResolver.java | 5 +- nuiton-rss/src/main/java/org/nuiton/rss/Field.java | 5 +- .../src/main/java/org/nuiton/rss/HTMLCleaner.java | 5 +- .../java/org/nuiton/rss/HTMLScriptCleaner.java | 5 +- .../src/main/java/org/nuiton/rss/RSSConfig.java | 5 +- .../src/main/java/org/nuiton/rss/RSSGenerator.java | 5 +- .../java/org/nuiton/rss/RSSGeneratorConfig.java | 5 +- .../java/org/nuiton/rss/RSSGeneratorServlet.java | 5 +- .../src/main/java/org/nuiton/rss/RSSHelper.java | 5 +- .../src/main/java/org/nuiton/rss/RSSIOUtil.java | 5 +- .../src/main/java/org/nuiton/rss/RSSServlet.java | 5 +- .../java/org/nuiton/rss/SimpleFeedURLResolver.java | 5 +- .../editor/plugins/rssinclude/fck_rssinclude.html | 5 +- .../editor/plugins/rssinclude/fck_rssinclude.js | 3 - .../editor/plugins/rssinclude/fckplugin.js | 3 - .../fckeditor/editor/plugins/rssinclude/lang/en.js | 3 - .../fckeditor/editor/plugins/rssinclude/lang/fr.js | 3 - nuiton-rss/src/main/resources/log4j.properties | 5 +- nuiton-rss/src/main/webapp/WEB-INF/web.xml | 5 +- nuiton-rss/src/main/webapp/feed.css | 5 +- nuiton-rss/src/main/webapp/index.html | 5 +- nuiton-rss/src/main/webapp/rssgenerator.js | 3 - nuiton-rss/src/main/webapp/rssinclude.js | 3 - nuiton-rss/src/main/webapp/testFck.html | 5 +- nuiton-rss/src/main/webapp/testGenerator.html | 5 +- nuiton-rss/src/main/webapp/testRender.html | 5 +- nuiton-rss/src/site/apt/index.apt | 7 +- {nuiton-security => nuiton-rss}/src/site/site.xml | 27 ++++-- nuiton-rss/src/site/site_fr.xml | 82 ---------------- .../org/nuiton/rss/RSSGeneratorHelperTest.java | 5 +- .../src/test/java/org/nuiton/rss/RSSTest.java | 5 +- nuiton-rss/src/test/resources/log4j.properties | 5 +- nuiton-security/pom.xml | 22 ++++- .../nuiton/web/security/SecurityShiroFilter.java | 2 - .../web/security/SecuritySubjectFactory.java | 2 - .../java/org/nuiton/web/security/SecurityUtil.java | 2 - .../nuiton/web/security/TopiaSecurityRealm.java | 2 - .../org/nuiton/web/security/TopiaWebSubject.java | 2 - .../web/security/actions/AbstractAction.java | 2 - .../nuiton/web/security/actions/LoginAction.java | 2 - .../nuiton/web/security/actions/LogoutAction.java | 2 - .../nuiton/web/security/actions/RoleAction.java | 2 - .../security/actions/RolePermissionsAction.java | 2 - .../nuiton/web/security/actions/UserAction.java | 2 - .../web/security/actions/UserRolesAction.java | 2 - .../src/main/resources/WEB-INF/security/login.jsp | 2 - .../WEB-INF/security/role-permissions.jsp | 2 - .../src/main/resources/WEB-INF/security/role.jsp | 2 - .../main/resources/WEB-INF/security/user-roles.jsp | 2 - .../src/main/resources/WEB-INF/security/user.jsp | 2 - nuiton-security/src/main/resources/struts.xml | 2 - nuiton-security/src/main/xmi/security.properties | 2 - nuiton-security/src/site/apt/index.apt | 5 +- nuiton-security/src/site/site.xml | 5 +- nuiton-struts2/pom.xml | 21 ++++ .../java/org/nuiton/web/struts2/BaseAction.java | 3 - .../org/nuiton/web/struts2/I18nTextProvider.java | 3 - .../web/struts2/converters/DoubleConverter.java | 2 - .../converters/HundredthLocalNumberConverter.java | 2 - .../web/struts2/converters/JsonConverter.java | 2 +- .../struts2/converters/LocalNumberConverter.java | 2 - .../filter/CloseTopiaTransactionFilter.java | 3 - .../OpenTopiaTransactionInterceptor.java | 3 - .../org/nuiton/web/struts2/taglib/FieldError2.java | 3 - .../nuiton/web/struts2/taglib/FieldError2Tag.java | 3 - .../org/nuiton/web/struts2/taglib/HelpBean.java | 3 - .../org/nuiton/web/struts2/taglib/HelpTag.java | 3 - .../resources/template/css_xhtml/help-close.ftl | 5 +- .../src/main/resources/template/css_xhtml/help.ftl | 5 +- .../template/css_xhtml/mycheckboxlist.ftl | 3 - .../resources/template/simple/mycheckboxlist.ftl | 5 +- nuiton-struts2/src/site/apt/index.apt | 3 - nuiton-struts2/src/site/apt/taglib.apt | 3 - .../src/site/site.xml | 28 ++++-- nuiton-struts2/src/site/site_fr.xml | 82 ---------------- .../nuiton/web/struts2/I18nTextProviderTest.java | 3 - .../converters/LocalNumberConverterTest.java | 2 - .../resources/META-INF/toto-definition.properties | 3 - .../test/resources/META-INF/toto_fr_FR.properties | 5 +- nuiton-tapestry/pom.xml | 21 ++++ .../annotations/RequiresAuthentication.java | 3 - .../nuiton/web/tapestry5/components/FeedBack.java | 3 - .../data/AbstractMappedGridDataSource.java | 3 - .../org/nuiton/web/tapestry5/mixins/Confirm.java | 3 - .../nuiton/web/tapestry5/mixins/ZoneUpdater.java | 3 - .../services/AbstractAuthenticationFilter.java | 3 - .../web/tapestry5/services/FormatBinding.java | 3 - .../tapestry5/services/FormatBindingFactory.java | 3 - .../web/tapestry5/services/NuitonModule.java | 3 - .../tapestry5/services/ServiceAuthentication.java | 3 - .../services/ServiceAuthenticationImpl.java | 3 - .../web/tapestry5/services/package-info.java | 5 +- .../nuiton/web/tapestry5/components/feedback.css | 5 +- .../org/nuiton/web/tapestry5/mixins/confirm.js | 5 +- .../org/nuiton/web/tapestry5/mixins/zoneUpdater.js | 5 +- nuiton-web/pom.xml | 22 ++++- .../nuiton/web/filter/JpaTransactionFilter.java | 2 - .../org/nuiton/web/filter/MonitoringFilter.java | 3 - .../nuiton/web/filter/TopiaTransactionFilter.java | 3 - .../web/filter/TypedTopiaTransactionFilter.java | 3 - .../java/org/nuiton/web/jmx/RequestStatistics.java | 3 - .../nuiton/web/jmx/ServletStatisticsService.java | 3 - .../web/jmx/ServletStatisticsServiceMBean.java | 3 - .../java/org/nuiton/web/war/JettyLauncher.java | 3 - .../java/org/nuiton/web/war/WinstoneLauncher.java | 3 - .../main/java/org/nuiton/web/war/package-info.java | 3 - nuiton-web/src/site/apt/index.apt | 3 - nuiton-web/src/site/{site_fr.xml => site.xml} | 40 ++------ pom.xml | 102 +++++++++++++++---- src/site/apt/index.apt | 5 +- src/site/site.xml | 61 ++++++++++++ src/site/site_fr.xml | 108 --------------------- 127 files changed, 361 insertions(+), 689 deletions(-) diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..9c102da --- /dev/null +++ b/.gitignore @@ -0,0 +1,12 @@ +/target +/.idea +/*.ipr +/*.iml +/*.iws +/*~ +/*/.idea +/*/*.ipr +/*/*.iml +/*/*.iws +/*/*~ +/*/target diff --git a/nuiton-gwt/pom.xml b/nuiton-gwt/pom.xml index c93778d..c48e787 100644 --- a/nuiton-gwt/pom.xml +++ b/nuiton-gwt/pom.xml @@ -1,4 +1,25 @@ <?xml version="1.0" encoding="UTF-8"?> +<!-- + #%L + Nuiton Web :: Nuiton GWT + %% + Copyright (C) 2008 - 2014 CodeLutin, Tony Chemit + %% + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU Lesser 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 Lesser Public License for more details. + + You should have received a copy of the GNU General Lesser Public + License along with this program. If not, see + <http://www.gnu.org/licenses/lgpl-3.0.html>. + #L% + --> <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> diff --git a/nuiton-gwt/src/main/java/org/nuiton/web/gwt/NuitonGWT.gwt.xml b/nuiton-gwt/src/main/java/org/nuiton/web/gwt/NuitonGWT.gwt.xml index 4a18877..471517c 100644 --- a/nuiton-gwt/src/main/java/org/nuiton/web/gwt/NuitonGWT.gwt.xml +++ b/nuiton-gwt/src/main/java/org/nuiton/web/gwt/NuitonGWT.gwt.xml @@ -31,4 +31,4 @@ <source path="misc"/> <source path="table"/> -</module> \ No newline at end of file +</module> diff --git a/nuiton-gwt/src/main/java/org/nuiton/web/gwt/comparable/ComparableAnchor.java b/nuiton-gwt/src/main/java/org/nuiton/web/gwt/comparable/ComparableAnchor.java index f82b0f8..17c8e8a 100644 --- a/nuiton-gwt/src/main/java/org/nuiton/web/gwt/comparable/ComparableAnchor.java +++ b/nuiton-gwt/src/main/java/org/nuiton/web/gwt/comparable/ComparableAnchor.java @@ -45,4 +45,4 @@ public class ComparableAnchor extends Anchor implements Comparable<Anchor> { return value.compareTo(oValue); } -} \ No newline at end of file +} diff --git a/nuiton-gwt/src/main/java/org/nuiton/web/gwt/messages/UIMessages.java b/nuiton-gwt/src/main/java/org/nuiton/web/gwt/messages/UIMessages.java index a896bd5..88fc03b 100644 --- a/nuiton-gwt/src/main/java/org/nuiton/web/gwt/messages/UIMessages.java +++ b/nuiton-gwt/src/main/java/org/nuiton/web/gwt/messages/UIMessages.java @@ -31,4 +31,4 @@ public interface UIMessages extends Messages { @Key("nuiton.gwt.loading") String loading(); -} \ No newline at end of file +} diff --git a/nuiton-gwt/src/main/java/org/nuiton/web/gwt/table/SortableFlexTableWithModel.java b/nuiton-gwt/src/main/java/org/nuiton/web/gwt/table/SortableFlexTableWithModel.java index d71c3a9..a6fd41f 100644 --- a/nuiton-gwt/src/main/java/org/nuiton/web/gwt/table/SortableFlexTableWithModel.java +++ b/nuiton-gwt/src/main/java/org/nuiton/web/gwt/table/SortableFlexTableWithModel.java @@ -183,4 +183,4 @@ public class SortableFlexTableWithModel extends FlexTable getCellFormatter().setVisible(i, col, b); } } -} \ No newline at end of file +} diff --git a/nuiton-rss/pom.xml b/nuiton-rss/pom.xml index cf85d77..bea8964 100644 --- a/nuiton-rss/pom.xml +++ b/nuiton-rss/pom.xml @@ -1,11 +1,9 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- #%L - Nuiton Utils :: Nuiton RSS - $Id$ - $HeadURL$ + Nuiton Web :: Nuiton RSS %% - Copyright (C) 2008 - 2010 CodeLutin, Tony Chemit + Copyright (C) 2008 - 2014 CodeLutin, Tony Chemit %% This program is free software: you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as diff --git a/nuiton-rss/src/main/java/org/nuiton/rss/BaseServlet.java b/nuiton-rss/src/main/java/org/nuiton/rss/BaseServlet.java index ecd6836..98ad978 100644 --- a/nuiton-rss/src/main/java/org/nuiton/rss/BaseServlet.java +++ b/nuiton-rss/src/main/java/org/nuiton/rss/BaseServlet.java @@ -1,9 +1,6 @@ /* * #%L - * Nuiton Utils :: Nuiton RSS - * - * $Id$ - * $HeadURL$ + * Nuiton Web :: Nuiton RSS * %% * Copyright (C) 2008 - 2010 CodeLutin, Tony Chemit, Benjamin Poussin * %% diff --git a/nuiton-rss/src/main/java/org/nuiton/rss/ConfigInitializer.java b/nuiton-rss/src/main/java/org/nuiton/rss/ConfigInitializer.java index 81b3df5..8475916 100644 --- a/nuiton-rss/src/main/java/org/nuiton/rss/ConfigInitializer.java +++ b/nuiton-rss/src/main/java/org/nuiton/rss/ConfigInitializer.java @@ -1,9 +1,6 @@ /* * #%L - * Nuiton Utils :: Nuiton RSS - * - * $Id$ - * $HeadURL$ + * Nuiton Web :: Nuiton RSS * %% * Copyright (C) 2008 - 2010 CodeLutin, Tony Chemit, Benjamin Poussin * %% diff --git a/nuiton-rss/src/main/java/org/nuiton/rss/FeedData.java b/nuiton-rss/src/main/java/org/nuiton/rss/FeedData.java index 243de2d..d8c3f51 100644 --- a/nuiton-rss/src/main/java/org/nuiton/rss/FeedData.java +++ b/nuiton-rss/src/main/java/org/nuiton/rss/FeedData.java @@ -1,9 +1,6 @@ /* * #%L - * Nuiton Utils :: Nuiton RSS - * - * $Id$ - * $HeadURL$ + * Nuiton Web :: Nuiton RSS * %% * Copyright (C) 2008 - 2010 CodeLutin, Tony Chemit, Benjamin Poussin * %% diff --git a/nuiton-rss/src/main/java/org/nuiton/rss/FeedEntryComparator.java b/nuiton-rss/src/main/java/org/nuiton/rss/FeedEntryComparator.java index c72a3d7..e4e44a0 100644 --- a/nuiton-rss/src/main/java/org/nuiton/rss/FeedEntryComparator.java +++ b/nuiton-rss/src/main/java/org/nuiton/rss/FeedEntryComparator.java @@ -1,9 +1,6 @@ /* * #%L - * Nuiton Utils :: Nuiton RSS - * - * $Id$ - * $HeadURL$ + * Nuiton Web :: Nuiton RSS * %% * Copyright (C) 2008 - 2010 CodeLutin, Tony Chemit, Benjamin Poussin * %% diff --git a/nuiton-rss/src/main/java/org/nuiton/rss/FeedHTMLRenderer.java b/nuiton-rss/src/main/java/org/nuiton/rss/FeedHTMLRenderer.java index bb24387..a77bf8e 100644 --- a/nuiton-rss/src/main/java/org/nuiton/rss/FeedHTMLRenderer.java +++ b/nuiton-rss/src/main/java/org/nuiton/rss/FeedHTMLRenderer.java @@ -1,9 +1,6 @@ /* * #%L - * Nuiton Utils :: Nuiton RSS - * - * $Id$ - * $HeadURL$ + * Nuiton Web :: Nuiton RSS * %% * Copyright (C) 2008 - 2010 CodeLutin, Tony Chemit, Benjamin Poussin * %% diff --git a/nuiton-rss/src/main/java/org/nuiton/rss/FeedRenderer.java b/nuiton-rss/src/main/java/org/nuiton/rss/FeedRenderer.java index 90c025e..d4181fc 100644 --- a/nuiton-rss/src/main/java/org/nuiton/rss/FeedRenderer.java +++ b/nuiton-rss/src/main/java/org/nuiton/rss/FeedRenderer.java @@ -1,9 +1,6 @@ /* * #%L - * Nuiton Utils :: Nuiton RSS - * - * $Id$ - * $HeadURL$ + * Nuiton Web :: Nuiton RSS * %% * Copyright (C) 2008 - 2010 CodeLutin, Tony Chemit, Benjamin Poussin * %% diff --git a/nuiton-rss/src/main/java/org/nuiton/rss/FeedRendererConfig.java b/nuiton-rss/src/main/java/org/nuiton/rss/FeedRendererConfig.java index 5ae5cf4..645dd00 100644 --- a/nuiton-rss/src/main/java/org/nuiton/rss/FeedRendererConfig.java +++ b/nuiton-rss/src/main/java/org/nuiton/rss/FeedRendererConfig.java @@ -1,9 +1,6 @@ /* * #%L - * Nuiton Utils :: Nuiton RSS - * - * $Id$ - * $HeadURL$ + * Nuiton Web :: Nuiton RSS * %% * Copyright (C) 2008 - 2010 CodeLutin, Tony Chemit, Benjamin Poussin * %% diff --git a/nuiton-rss/src/main/java/org/nuiton/rss/FeedType.java b/nuiton-rss/src/main/java/org/nuiton/rss/FeedType.java index 03ae264..6724285 100644 --- a/nuiton-rss/src/main/java/org/nuiton/rss/FeedType.java +++ b/nuiton-rss/src/main/java/org/nuiton/rss/FeedType.java @@ -1,9 +1,6 @@ /* * #%L - * Nuiton Utils :: Nuiton RSS - * - * $Id$ - * $HeadURL$ + * Nuiton Web :: Nuiton RSS * %% * Copyright (C) 2008 - 2010 CodeLutin, Tony Chemit, Benjamin Poussin * %% diff --git a/nuiton-rss/src/main/java/org/nuiton/rss/FeedURLResolver.java b/nuiton-rss/src/main/java/org/nuiton/rss/FeedURLResolver.java index ce9b3d6..a9b66a9 100644 --- a/nuiton-rss/src/main/java/org/nuiton/rss/FeedURLResolver.java +++ b/nuiton-rss/src/main/java/org/nuiton/rss/FeedURLResolver.java @@ -1,9 +1,6 @@ /* * #%L - * Nuiton Utils :: Nuiton RSS - * - * $Id$ - * $HeadURL$ + * Nuiton Web :: Nuiton RSS * %% * Copyright (C) 2008 - 2010 CodeLutin, Tony Chemit, Benjamin Poussin * %% diff --git a/nuiton-rss/src/main/java/org/nuiton/rss/Field.java b/nuiton-rss/src/main/java/org/nuiton/rss/Field.java index fe4335e..b97fcce 100644 --- a/nuiton-rss/src/main/java/org/nuiton/rss/Field.java +++ b/nuiton-rss/src/main/java/org/nuiton/rss/Field.java @@ -1,9 +1,6 @@ /* * #%L - * Nuiton Utils :: Nuiton RSS - * - * $Id$ - * $HeadURL$ + * Nuiton Web :: Nuiton RSS * %% * Copyright (C) 2008 - 2010 CodeLutin, Tony Chemit, Benjamin Poussin * %% diff --git a/nuiton-rss/src/main/java/org/nuiton/rss/HTMLCleaner.java b/nuiton-rss/src/main/java/org/nuiton/rss/HTMLCleaner.java index 27acb8d..f677526 100644 --- a/nuiton-rss/src/main/java/org/nuiton/rss/HTMLCleaner.java +++ b/nuiton-rss/src/main/java/org/nuiton/rss/HTMLCleaner.java @@ -1,9 +1,6 @@ /* * #%L - * Nuiton Utils :: Nuiton RSS - * - * $Id$ - * $HeadURL$ + * Nuiton Web :: Nuiton RSS * %% * Copyright (C) 2008 - 2010 CodeLutin, Tony Chemit, Benjamin Poussin * %% diff --git a/nuiton-rss/src/main/java/org/nuiton/rss/HTMLScriptCleaner.java b/nuiton-rss/src/main/java/org/nuiton/rss/HTMLScriptCleaner.java index 917eba6..f7a36c1 100644 --- a/nuiton-rss/src/main/java/org/nuiton/rss/HTMLScriptCleaner.java +++ b/nuiton-rss/src/main/java/org/nuiton/rss/HTMLScriptCleaner.java @@ -1,9 +1,6 @@ /* * #%L - * Nuiton Utils :: Nuiton RSS - * - * $Id$ - * $HeadURL$ + * Nuiton Web :: Nuiton RSS * %% * Copyright (C) 2008 - 2010 CodeLutin, Tony Chemit, Benjamin Poussin * %% diff --git a/nuiton-rss/src/main/java/org/nuiton/rss/RSSConfig.java b/nuiton-rss/src/main/java/org/nuiton/rss/RSSConfig.java index da50cda..284bf77 100644 --- a/nuiton-rss/src/main/java/org/nuiton/rss/RSSConfig.java +++ b/nuiton-rss/src/main/java/org/nuiton/rss/RSSConfig.java @@ -1,9 +1,6 @@ /* * #%L - * Nuiton Utils :: Nuiton RSS - * - * $Id$ - * $HeadURL$ + * Nuiton Web :: Nuiton RSS * %% * Copyright (C) 2008 - 2010 CodeLutin, Tony Chemit, Benjamin Poussin * %% diff --git a/nuiton-rss/src/main/java/org/nuiton/rss/RSSGenerator.java b/nuiton-rss/src/main/java/org/nuiton/rss/RSSGenerator.java index 9af637d..f3e1166 100644 --- a/nuiton-rss/src/main/java/org/nuiton/rss/RSSGenerator.java +++ b/nuiton-rss/src/main/java/org/nuiton/rss/RSSGenerator.java @@ -1,9 +1,6 @@ /* * #%L - * Nuiton Utils :: Nuiton RSS - * - * $Id$ - * $HeadURL$ + * Nuiton Web :: Nuiton RSS * %% * Copyright (C) 2008 - 2010 CodeLutin, Tony Chemit, Benjamin Poussin * %% diff --git a/nuiton-rss/src/main/java/org/nuiton/rss/RSSGeneratorConfig.java b/nuiton-rss/src/main/java/org/nuiton/rss/RSSGeneratorConfig.java index 2626e94..1378100 100644 --- a/nuiton-rss/src/main/java/org/nuiton/rss/RSSGeneratorConfig.java +++ b/nuiton-rss/src/main/java/org/nuiton/rss/RSSGeneratorConfig.java @@ -1,9 +1,6 @@ /* * #%L - * Nuiton Utils :: Nuiton RSS - * - * $Id$ - * $HeadURL$ + * Nuiton Web :: Nuiton RSS * %% * Copyright (C) 2008 - 2010 CodeLutin, Tony Chemit, Benjamin Poussin * %% diff --git a/nuiton-rss/src/main/java/org/nuiton/rss/RSSGeneratorServlet.java b/nuiton-rss/src/main/java/org/nuiton/rss/RSSGeneratorServlet.java index 4f79930..d122f48 100644 --- a/nuiton-rss/src/main/java/org/nuiton/rss/RSSGeneratorServlet.java +++ b/nuiton-rss/src/main/java/org/nuiton/rss/RSSGeneratorServlet.java @@ -1,9 +1,6 @@ /* * #%L - * Nuiton Utils :: Nuiton RSS - * - * $Id$ - * $HeadURL$ + * Nuiton Web :: Nuiton RSS * %% * Copyright (C) 2008 - 2010 CodeLutin, Tony Chemit, Benjamin Poussin * %% diff --git a/nuiton-rss/src/main/java/org/nuiton/rss/RSSHelper.java b/nuiton-rss/src/main/java/org/nuiton/rss/RSSHelper.java index 0522c7e..1765d3d 100644 --- a/nuiton-rss/src/main/java/org/nuiton/rss/RSSHelper.java +++ b/nuiton-rss/src/main/java/org/nuiton/rss/RSSHelper.java @@ -1,9 +1,6 @@ /* * #%L - * Nuiton Utils :: Nuiton RSS - * - * $Id$ - * $HeadURL$ + * Nuiton Web :: Nuiton RSS * %% * Copyright (C) 2008 - 2010 CodeLutin, Tony Chemit, Benjamin Poussin * %% diff --git a/nuiton-rss/src/main/java/org/nuiton/rss/RSSIOUtil.java b/nuiton-rss/src/main/java/org/nuiton/rss/RSSIOUtil.java index 107341b..79711ca 100644 --- a/nuiton-rss/src/main/java/org/nuiton/rss/RSSIOUtil.java +++ b/nuiton-rss/src/main/java/org/nuiton/rss/RSSIOUtil.java @@ -1,9 +1,6 @@ /* * #%L - * Nuiton Utils :: Nuiton RSS - * - * $Id$ - * $HeadURL$ + * Nuiton Web :: Nuiton RSS * %% * Copyright (C) 2008 - 2010 CodeLutin, Tony Chemit, Benjamin Poussin * %% diff --git a/nuiton-rss/src/main/java/org/nuiton/rss/RSSServlet.java b/nuiton-rss/src/main/java/org/nuiton/rss/RSSServlet.java index 9e6b057..f3af0a2 100644 --- a/nuiton-rss/src/main/java/org/nuiton/rss/RSSServlet.java +++ b/nuiton-rss/src/main/java/org/nuiton/rss/RSSServlet.java @@ -1,9 +1,6 @@ /* * #%L - * Nuiton Utils :: Nuiton RSS - * - * $Id$ - * $HeadURL$ + * Nuiton Web :: Nuiton RSS * %% * Copyright (C) 2008 - 2010 CodeLutin, Tony Chemit, Benjamin Poussin * %% diff --git a/nuiton-rss/src/main/java/org/nuiton/rss/SimpleFeedURLResolver.java b/nuiton-rss/src/main/java/org/nuiton/rss/SimpleFeedURLResolver.java index b3117b7..24d1012 100644 --- a/nuiton-rss/src/main/java/org/nuiton/rss/SimpleFeedURLResolver.java +++ b/nuiton-rss/src/main/java/org/nuiton/rss/SimpleFeedURLResolver.java @@ -1,9 +1,6 @@ /* * #%L - * Nuiton Utils :: Nuiton RSS - * - * $Id$ - * $HeadURL$ + * Nuiton Web :: Nuiton RSS * %% * Copyright (C) 2008 - 2010 CodeLutin, Tony Chemit, Benjamin Poussin * %% diff --git a/nuiton-rss/src/main/resources/fckeditor/editor/plugins/rssinclude/fck_rssinclude.html b/nuiton-rss/src/main/resources/fckeditor/editor/plugins/rssinclude/fck_rssinclude.html index 2563f61..4ac3ea0 100644 --- a/nuiton-rss/src/main/resources/fckeditor/editor/plugins/rssinclude/fck_rssinclude.html +++ b/nuiton-rss/src/main/resources/fckeditor/editor/plugins/rssinclude/fck_rssinclude.html @@ -1,9 +1,6 @@ <!-- #%L - Nuiton Utils :: Nuiton RSS - - $Id$ - $HeadURL$ + Nuiton Web :: Nuiton RSS %% Copyright (C) 2008 - 2010 CodeLutin, Tony Chemit, Benjamin Poussin %% diff --git a/nuiton-rss/src/main/resources/fckeditor/editor/plugins/rssinclude/fck_rssinclude.js b/nuiton-rss/src/main/resources/fckeditor/editor/plugins/rssinclude/fck_rssinclude.js index c507126..49c28ed 100644 --- a/nuiton-rss/src/main/resources/fckeditor/editor/plugins/rssinclude/fck_rssinclude.js +++ b/nuiton-rss/src/main/resources/fckeditor/editor/plugins/rssinclude/fck_rssinclude.js @@ -1,9 +1,6 @@ /* * #%L * Nuiton Web :: Nuiton RSS - * - * $Id$ - * $HeadURL$ * %% * Copyright (C) 2008 - 2011 CodeLutin * %% diff --git a/nuiton-rss/src/main/resources/fckeditor/editor/plugins/rssinclude/fckplugin.js b/nuiton-rss/src/main/resources/fckeditor/editor/plugins/rssinclude/fckplugin.js index 1b4d15f..65d21b6 100644 --- a/nuiton-rss/src/main/resources/fckeditor/editor/plugins/rssinclude/fckplugin.js +++ b/nuiton-rss/src/main/resources/fckeditor/editor/plugins/rssinclude/fckplugin.js @@ -1,9 +1,6 @@ /* * #%L * Nuiton Web :: Nuiton RSS - * - * $Id$ - * $HeadURL$ * %% * Copyright (C) 2008 - 2011 CodeLutin * %% diff --git a/nuiton-rss/src/main/resources/fckeditor/editor/plugins/rssinclude/lang/en.js b/nuiton-rss/src/main/resources/fckeditor/editor/plugins/rssinclude/lang/en.js index 53d7973..8ca52ce 100644 --- a/nuiton-rss/src/main/resources/fckeditor/editor/plugins/rssinclude/lang/en.js +++ b/nuiton-rss/src/main/resources/fckeditor/editor/plugins/rssinclude/lang/en.js @@ -1,9 +1,6 @@ /* * #%L * Nuiton Web :: Nuiton RSS - * - * $Id$ - * $HeadURL$ * %% * Copyright (C) 2008 - 2011 CodeLutin * %% diff --git a/nuiton-rss/src/main/resources/fckeditor/editor/plugins/rssinclude/lang/fr.js b/nuiton-rss/src/main/resources/fckeditor/editor/plugins/rssinclude/lang/fr.js index fcf0da3..3407b78 100644 --- a/nuiton-rss/src/main/resources/fckeditor/editor/plugins/rssinclude/lang/fr.js +++ b/nuiton-rss/src/main/resources/fckeditor/editor/plugins/rssinclude/lang/fr.js @@ -1,9 +1,6 @@ /* * #%L * Nuiton Web :: Nuiton RSS - * - * $Id$ - * $HeadURL$ * %% * Copyright (C) 2008 - 2011 CodeLutin * %% diff --git a/nuiton-rss/src/main/resources/log4j.properties b/nuiton-rss/src/main/resources/log4j.properties index 17282b2..03fbd3a 100644 --- a/nuiton-rss/src/main/resources/log4j.properties +++ b/nuiton-rss/src/main/resources/log4j.properties @@ -1,9 +1,6 @@ ### # #%L -# Nuiton Utils :: Nuiton RSS -# -# $Id$ -# $HeadURL$ +# Nuiton Web :: Nuiton RSS # %% # Copyright (C) 2008 - 2010 CodeLutin, Tony Chemit, Benjamin Poussin # %% diff --git a/nuiton-rss/src/main/webapp/WEB-INF/web.xml b/nuiton-rss/src/main/webapp/WEB-INF/web.xml index 0d5d006..e3b1432 100644 --- a/nuiton-rss/src/main/webapp/WEB-INF/web.xml +++ b/nuiton-rss/src/main/webapp/WEB-INF/web.xml @@ -1,10 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- #%L - Nuiton Utils :: Nuiton RSS - - $Id$ - $HeadURL$ + Nuiton Web :: Nuiton RSS %% Copyright (C) 2008 - 2010 CodeLutin, Tony Chemit, Benjamin Poussin %% diff --git a/nuiton-rss/src/main/webapp/feed.css b/nuiton-rss/src/main/webapp/feed.css index 11897cd..b3d8f91 100644 --- a/nuiton-rss/src/main/webapp/feed.css +++ b/nuiton-rss/src/main/webapp/feed.css @@ -1,9 +1,6 @@ /* * #%L - * Nuiton Utils :: Nuiton RSS - * - * $Id$ - * $HeadURL$ + * Nuiton Web :: Nuiton RSS * %% * Copyright (C) 2008 - 2010 CodeLutin * %% diff --git a/nuiton-rss/src/main/webapp/index.html b/nuiton-rss/src/main/webapp/index.html index 947ef59..488df8d 100644 --- a/nuiton-rss/src/main/webapp/index.html +++ b/nuiton-rss/src/main/webapp/index.html @@ -1,9 +1,6 @@ <!-- #%L - Nuiton Utils :: Nuiton RSS - - $Id$ - $HeadURL$ + Nuiton Web :: Nuiton RSS %% Copyright (C) 2008 - 2010 CodeLutin, Tony Chemit, Benjamin Poussin %% diff --git a/nuiton-rss/src/main/webapp/rssgenerator.js b/nuiton-rss/src/main/webapp/rssgenerator.js index 30ee5d8..4fa7b8b 100644 --- a/nuiton-rss/src/main/webapp/rssgenerator.js +++ b/nuiton-rss/src/main/webapp/rssgenerator.js @@ -1,9 +1,6 @@ /* * #%L * Nuiton Web :: Nuiton RSS - * - * $Id$ - * $HeadURL$ * %% * Copyright (C) 2008 - 2011 CodeLutin * %% diff --git a/nuiton-rss/src/main/webapp/rssinclude.js b/nuiton-rss/src/main/webapp/rssinclude.js index f24854e..7550e8b 100644 --- a/nuiton-rss/src/main/webapp/rssinclude.js +++ b/nuiton-rss/src/main/webapp/rssinclude.js @@ -1,9 +1,6 @@ /* * #%L * Nuiton Web :: Nuiton RSS - * - * $Id$ - * $HeadURL$ * %% * Copyright (C) 2008 - 2011 CodeLutin * %% diff --git a/nuiton-rss/src/main/webapp/testFck.html b/nuiton-rss/src/main/webapp/testFck.html index f509eb9..bd4f0eb 100644 --- a/nuiton-rss/src/main/webapp/testFck.html +++ b/nuiton-rss/src/main/webapp/testFck.html @@ -1,9 +1,6 @@ <!-- #%L - Nuiton Utils :: Nuiton RSS - - $Id$ - $HeadURL$ + Nuiton Web :: Nuiton RSS %% Copyright (C) 2008 - 2010 CodeLutin, Tony Chemit, Benjamin Poussin %% diff --git a/nuiton-rss/src/main/webapp/testGenerator.html b/nuiton-rss/src/main/webapp/testGenerator.html index 699762e..b01e68c 100644 --- a/nuiton-rss/src/main/webapp/testGenerator.html +++ b/nuiton-rss/src/main/webapp/testGenerator.html @@ -1,9 +1,6 @@ <!-- #%L - Nuiton Utils :: Nuiton RSS - - $Id$ - $HeadURL$ + Nuiton Web :: Nuiton RSS %% Copyright (C) 2008 - 2010 CodeLutin, Tony Chemit, Benjamin Poussin %% diff --git a/nuiton-rss/src/main/webapp/testRender.html b/nuiton-rss/src/main/webapp/testRender.html index 6e5d54f..6331640 100644 --- a/nuiton-rss/src/main/webapp/testRender.html +++ b/nuiton-rss/src/main/webapp/testRender.html @@ -1,9 +1,6 @@ <!-- #%L - Nuiton Utils :: Nuiton RSS - - $Id$ - $HeadURL$ + Nuiton Web :: Nuiton RSS %% Copyright (C) 2008 - 2010 CodeLutin, Tony Chemit, Benjamin Poussin %% diff --git a/nuiton-rss/src/site/apt/index.apt b/nuiton-rss/src/site/apt/index.apt index 162719c..b7dcf6c 100644 --- a/nuiton-rss/src/site/apt/index.apt +++ b/nuiton-rss/src/site/apt/index.apt @@ -1,9 +1,6 @@ ~~~ ~~ #%L -~~ Nuiton Utils :: Nuiton RSS -~~ -~~ $Id$ -~~ $HeadURL$ +~~ Nuiton Web :: Nuiton RSS ~~ %% ~~ Copyright (C) 2008 - 2010 CodeLutin, Tony Chemit, Benjamin Poussin ~~ %% @@ -47,4 +44,4 @@ Utilisation - si pas de fichier html pour l'url demandée ou plus vielle que N - récupération de de l'url et sauvegarde en html -- renvoi du html \ No newline at end of file +- renvoi du html diff --git a/nuiton-security/src/site/site.xml b/nuiton-rss/src/site/site.xml similarity index 50% copy from nuiton-security/src/site/site.xml copy to nuiton-rss/src/site/site.xml index eb885ce..9c7f1b6 100644 --- a/nuiton-security/src/site/site.xml +++ b/nuiton-rss/src/site/site.xml @@ -1,12 +1,9 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- #%L - Nuiton Utils :: Nuiton Web Security - - $Id$ - $HeadURL$ + Nuiton Web :: Nuiton RSS %% - Copyright (C) 2012 CodeLutin, Chatellier Eric + Copyright (C) 2008 - 2010 CodeLutin, Tony Chemit, Benjamin Poussin %% This program is free software: you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as @@ -24,7 +21,9 @@ #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> @@ -39,8 +38,20 @@ <menu ref="parent"/> - <menu name="Users"> - <item name="Overview" href="index.html"/> + <menu name="Utilisateur"> + <item name="Accueil" href="index.html"/> + </menu> + + <menu name="Téléchargement"> + <item + href="${repository.home.url}/org/nuiton/${project.artifactId}/${project.version}/${project.build.finalName}.jar" + name="Librairie (jar)"/> + <item + href="${repository.home.url}/org/nuiton/${project.artifactId}/${project.version}/${project.build.finalName}-javadoc.jar" + name="Javadoc (jar)"/> + <item + href="${repository.home.url}/org/nuiton/${project.artifactId}/${project.version}/${project.build.finalName}-sources.jar" + name="Sources (jar)"/> </menu> <menu ref="reports"/> diff --git a/nuiton-rss/src/site/site_fr.xml b/nuiton-rss/src/site/site_fr.xml deleted file mode 100644 index 8fca462..0000000 --- a/nuiton-rss/src/site/site_fr.xml +++ /dev/null @@ -1,82 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- - #%L - Nuiton Utils :: Nuiton RSS - - $Id$ - $HeadURL$ - %% - Copyright (C) 2008 - 2010 CodeLutin, Tony Chemit, Benjamin Poussin - %% - This program is free software: you can redistribute it and/or modify - it under the terms of the GNU Lesser 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 Lesser Public License for more details. - - You should have received a copy of the GNU General Lesser Public - License along with this program. If not, see - <http://www.gnu.org/licenses/lgpl-3.0.html>. - #L% - --> - - -<project name="${project.name}"> - - <bannerLeft> - <name>${project.name}</name> - <href>index.html</href> - </bannerLeft> - - <body> - - <breadcrumbs> - <item name="${project.name}" href="index.html"/> - </breadcrumbs> - - <menu ref="parent"/> - - <menu name="Utilisateur"> - <item name="Accueil" href="index.html"/> - </menu> - - <menu name="Téléchargement"> - <item - href="${repository.home.url}/org/nuiton/${project.artifactId}/${project.version}/${project.build.finalName}.jar" - name="Librairie (jar)"/> - <item - href="${repository.home.url}/org/nuiton/${project.artifactId}/${project.version}/${project.build.finalName}-javadoc.jar" - name="Javadoc (jar)"/> - <item - href="${repository.home.url}/org/nuiton/${project.artifactId}/${project.version}/${project.build.finalName}-sources.jar" - name="Sources (jar)"/> - </menu> - - <menu ref="reports"/> - - <footer> - - <script type="text/javascript" - src="${mavenpomSiteCommonResourcesUrl}/js/maven-site-nuiton.org.js"> - </script> - - <div id='projectMetas' - projectversion='${project.version}' - platform='${project.platform}' - projectid='${project.projectId}' - scm='${project.scm.connection}' - scmwebeditorenabled='${project.scmwebeditorEnabled}' - scmwebeditorurl='${project.scmwebeditorUrl}' - siteSourcesType='${project.siteSourcesType}' - piwikEnabled='${project.piwikEnabled}' - piwikId='${project.piwikId}' - scmwebeditor_skipDefaultFiles="true" - > - </div> - </footer> - </body> -</project> diff --git a/nuiton-rss/src/test/java/org/nuiton/rss/RSSGeneratorHelperTest.java b/nuiton-rss/src/test/java/org/nuiton/rss/RSSGeneratorHelperTest.java index 8b11ce7..2cc87aa 100644 --- a/nuiton-rss/src/test/java/org/nuiton/rss/RSSGeneratorHelperTest.java +++ b/nuiton-rss/src/test/java/org/nuiton/rss/RSSGeneratorHelperTest.java @@ -1,9 +1,6 @@ /* * #%L - * Nuiton Utils :: Nuiton RSS - * - * $Id$ - * $HeadURL$ + * Nuiton Web :: Nuiton RSS * %% * Copyright (C) 2008 - 2010 CodeLutin, Tony Chemit, Benjamin Poussin * %% diff --git a/nuiton-rss/src/test/java/org/nuiton/rss/RSSTest.java b/nuiton-rss/src/test/java/org/nuiton/rss/RSSTest.java index f3c21f5..77e3ccb 100644 --- a/nuiton-rss/src/test/java/org/nuiton/rss/RSSTest.java +++ b/nuiton-rss/src/test/java/org/nuiton/rss/RSSTest.java @@ -1,9 +1,6 @@ /* * #%L - * Nuiton Utils :: Nuiton RSS - * - * $Id$ - * $HeadURL$ + * Nuiton Web :: Nuiton RSS * %% * Copyright (C) 2008 - 2010 CodeLutin, Tony Chemit, Benjamin Poussin * %% diff --git a/nuiton-rss/src/test/resources/log4j.properties b/nuiton-rss/src/test/resources/log4j.properties index 8dc7cc7..e2e6d5d 100644 --- a/nuiton-rss/src/test/resources/log4j.properties +++ b/nuiton-rss/src/test/resources/log4j.properties @@ -1,9 +1,6 @@ ### # #%L -# Nuiton Utils :: Nuiton RSS -# -# $Id$ -# $HeadURL$ +# Nuiton Web :: Nuiton RSS # %% # Copyright (C) 2008 - 2010 CodeLutin, Tony Chemit, Benjamin Poussin # %% diff --git a/nuiton-security/pom.xml b/nuiton-security/pom.xml index 70365ac..f8c843f 100644 --- a/nuiton-security/pom.xml +++ b/nuiton-security/pom.xml @@ -1,4 +1,25 @@ <?xml version="1.0" encoding="UTF-8"?> +<!-- + #%L + Nuiton Web :: Nuiton Security + %% + Copyright (C) 2008 - 2014 CodeLutin, Tony Chemit + %% + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU Lesser 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 Lesser Public License for more details. + + You should have received a copy of the GNU General Lesser Public + License along with this program. If not, see + <http://www.gnu.org/licenses/lgpl-3.0.html>. + #L% + --> <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> @@ -9,7 +30,6 @@ </parent> <artifactId>nuiton-security</artifactId> - <packaging>jar</packaging> <name>Nuiton Web :: Nuiton Security</name> <description>Security module based on ToPIA</description> diff --git a/nuiton-security/src/main/java/org/nuiton/web/security/SecurityShiroFilter.java b/nuiton-security/src/main/java/org/nuiton/web/security/SecurityShiroFilter.java index 1d9968f..7f156b8 100644 --- a/nuiton-security/src/main/java/org/nuiton/web/security/SecurityShiroFilter.java +++ b/nuiton-security/src/main/java/org/nuiton/web/security/SecurityShiroFilter.java @@ -1,8 +1,6 @@ /* * #%L * Nuiton Web :: Nuiton Security - * $Id$ - * $HeadURL$ * %% * Copyright (C) 2012 - 2013 CodeLutin, Chatellier Eric * %% diff --git a/nuiton-security/src/main/java/org/nuiton/web/security/SecuritySubjectFactory.java b/nuiton-security/src/main/java/org/nuiton/web/security/SecuritySubjectFactory.java index ee90c92..1c0b003 100644 --- a/nuiton-security/src/main/java/org/nuiton/web/security/SecuritySubjectFactory.java +++ b/nuiton-security/src/main/java/org/nuiton/web/security/SecuritySubjectFactory.java @@ -1,8 +1,6 @@ /* * #%L * Nuiton Web :: Nuiton Security - * $Id$ - * $HeadURL$ * %% * Copyright (C) 2012 - 2013 CodeLutin, Chatellier Eric * %% diff --git a/nuiton-security/src/main/java/org/nuiton/web/security/SecurityUtil.java b/nuiton-security/src/main/java/org/nuiton/web/security/SecurityUtil.java index 854db3e..5617a98 100644 --- a/nuiton-security/src/main/java/org/nuiton/web/security/SecurityUtil.java +++ b/nuiton-security/src/main/java/org/nuiton/web/security/SecurityUtil.java @@ -1,8 +1,6 @@ /* * #%L * Nuiton Web :: Nuiton Security - * $Id$ - * $HeadURL$ * %% * Copyright (C) 2012 - 2013 CodeLutin, Chatellier Eric * %% diff --git a/nuiton-security/src/main/java/org/nuiton/web/security/TopiaSecurityRealm.java b/nuiton-security/src/main/java/org/nuiton/web/security/TopiaSecurityRealm.java index 8fc7627..ce19e15 100644 --- a/nuiton-security/src/main/java/org/nuiton/web/security/TopiaSecurityRealm.java +++ b/nuiton-security/src/main/java/org/nuiton/web/security/TopiaSecurityRealm.java @@ -1,8 +1,6 @@ /* * #%L * Nuiton Web :: Nuiton Security - * $Id$ - * $HeadURL$ * %% * Copyright (C) 2012 - 2013 CodeLutin, Chatellier Eric * %% diff --git a/nuiton-security/src/main/java/org/nuiton/web/security/TopiaWebSubject.java b/nuiton-security/src/main/java/org/nuiton/web/security/TopiaWebSubject.java index 4063743..0b27dea 100644 --- a/nuiton-security/src/main/java/org/nuiton/web/security/TopiaWebSubject.java +++ b/nuiton-security/src/main/java/org/nuiton/web/security/TopiaWebSubject.java @@ -1,8 +1,6 @@ /* * #%L * Nuiton Web :: Nuiton Security - * $Id$ - * $HeadURL$ * %% * Copyright (C) 2012 - 2013 CodeLutin, Chatellier Eric * %% diff --git a/nuiton-security/src/main/java/org/nuiton/web/security/actions/AbstractAction.java b/nuiton-security/src/main/java/org/nuiton/web/security/actions/AbstractAction.java index 2ba1054..45fe7ba 100644 --- a/nuiton-security/src/main/java/org/nuiton/web/security/actions/AbstractAction.java +++ b/nuiton-security/src/main/java/org/nuiton/web/security/actions/AbstractAction.java @@ -1,8 +1,6 @@ /* * #%L * Nuiton Web :: Nuiton Security - * $Id$ - * $HeadURL$ * %% * Copyright (C) 2012 CodeLutin, Chatellier Eric * %% diff --git a/nuiton-security/src/main/java/org/nuiton/web/security/actions/LoginAction.java b/nuiton-security/src/main/java/org/nuiton/web/security/actions/LoginAction.java index f9b0f87..69c5fa3 100644 --- a/nuiton-security/src/main/java/org/nuiton/web/security/actions/LoginAction.java +++ b/nuiton-security/src/main/java/org/nuiton/web/security/actions/LoginAction.java @@ -1,8 +1,6 @@ /* * #%L * Nuiton Web :: Nuiton Security - * $Id$ - * $HeadURL$ * %% * Copyright (C) 2012 CodeLutin, Chatellier Eric * %% diff --git a/nuiton-security/src/main/java/org/nuiton/web/security/actions/LogoutAction.java b/nuiton-security/src/main/java/org/nuiton/web/security/actions/LogoutAction.java index bcff18e..6fcfaf9 100644 --- a/nuiton-security/src/main/java/org/nuiton/web/security/actions/LogoutAction.java +++ b/nuiton-security/src/main/java/org/nuiton/web/security/actions/LogoutAction.java @@ -1,8 +1,6 @@ /* * #%L * Nuiton Web :: Nuiton Security - * $Id$ - * $HeadURL$ * %% * Copyright (C) 2012 CodeLutin, Chatellier Eric * %% diff --git a/nuiton-security/src/main/java/org/nuiton/web/security/actions/RoleAction.java b/nuiton-security/src/main/java/org/nuiton/web/security/actions/RoleAction.java index 60c2ef4..53062da 100644 --- a/nuiton-security/src/main/java/org/nuiton/web/security/actions/RoleAction.java +++ b/nuiton-security/src/main/java/org/nuiton/web/security/actions/RoleAction.java @@ -1,8 +1,6 @@ /* * #%L * Nuiton Web :: Nuiton Security - * $Id$ - * $HeadURL$ * %% * Copyright (C) 2012 CodeLutin, Chatellier Eric * %% diff --git a/nuiton-security/src/main/java/org/nuiton/web/security/actions/RolePermissionsAction.java b/nuiton-security/src/main/java/org/nuiton/web/security/actions/RolePermissionsAction.java index 82224b2..dc4b423 100644 --- a/nuiton-security/src/main/java/org/nuiton/web/security/actions/RolePermissionsAction.java +++ b/nuiton-security/src/main/java/org/nuiton/web/security/actions/RolePermissionsAction.java @@ -1,8 +1,6 @@ /* * #%L * Nuiton Web :: Nuiton Security - * $Id$ - * $HeadURL$ * %% * Copyright (C) 2012 CodeLutin, Chatellier Eric * %% diff --git a/nuiton-security/src/main/java/org/nuiton/web/security/actions/UserAction.java b/nuiton-security/src/main/java/org/nuiton/web/security/actions/UserAction.java index b8657f3..71ace3b 100644 --- a/nuiton-security/src/main/java/org/nuiton/web/security/actions/UserAction.java +++ b/nuiton-security/src/main/java/org/nuiton/web/security/actions/UserAction.java @@ -1,8 +1,6 @@ /* * #%L * Nuiton Web :: Nuiton Security - * $Id$ - * $HeadURL$ * %% * Copyright (C) 2012 CodeLutin, Chatellier Eric * %% diff --git a/nuiton-security/src/main/java/org/nuiton/web/security/actions/UserRolesAction.java b/nuiton-security/src/main/java/org/nuiton/web/security/actions/UserRolesAction.java index a8b8a41..f483225 100644 --- a/nuiton-security/src/main/java/org/nuiton/web/security/actions/UserRolesAction.java +++ b/nuiton-security/src/main/java/org/nuiton/web/security/actions/UserRolesAction.java @@ -1,8 +1,6 @@ /* * #%L * Nuiton Web :: Nuiton Security - * $Id$ - * $HeadURL$ * %% * Copyright (C) 2012 CodeLutin, Chatellier Eric * %% diff --git a/nuiton-security/src/main/resources/WEB-INF/security/login.jsp b/nuiton-security/src/main/resources/WEB-INF/security/login.jsp index e805de0..b16733c 100644 --- a/nuiton-security/src/main/resources/WEB-INF/security/login.jsp +++ b/nuiton-security/src/main/resources/WEB-INF/security/login.jsp @@ -1,8 +1,6 @@ <%-- #%L Nuiton Web :: Nuiton Security - $Id$ - $HeadURL$ %% Copyright (C) 2012 - 2013 CodeLutin, Chatellier Eric %% diff --git a/nuiton-security/src/main/resources/WEB-INF/security/role-permissions.jsp b/nuiton-security/src/main/resources/WEB-INF/security/role-permissions.jsp index 998fa2d..cd883b3 100644 --- a/nuiton-security/src/main/resources/WEB-INF/security/role-permissions.jsp +++ b/nuiton-security/src/main/resources/WEB-INF/security/role-permissions.jsp @@ -1,8 +1,6 @@ <%-- #%L Nuiton Web :: Nuiton Security - $Id$ - $HeadURL$ %% Copyright (C) 2012 - 2013 CodeLutin, Chatellier Eric %% diff --git a/nuiton-security/src/main/resources/WEB-INF/security/role.jsp b/nuiton-security/src/main/resources/WEB-INF/security/role.jsp index e041221..5334562 100644 --- a/nuiton-security/src/main/resources/WEB-INF/security/role.jsp +++ b/nuiton-security/src/main/resources/WEB-INF/security/role.jsp @@ -1,8 +1,6 @@ <%-- #%L Nuiton Web :: Nuiton Security - $Id$ - $HeadURL$ %% Copyright (C) 2012 - 2013 CodeLutin, Chatellier Eric %% diff --git a/nuiton-security/src/main/resources/WEB-INF/security/user-roles.jsp b/nuiton-security/src/main/resources/WEB-INF/security/user-roles.jsp index ee844ac..99cbf1e 100644 --- a/nuiton-security/src/main/resources/WEB-INF/security/user-roles.jsp +++ b/nuiton-security/src/main/resources/WEB-INF/security/user-roles.jsp @@ -1,8 +1,6 @@ <%-- #%L Nuiton Web :: Nuiton Security - $Id$ - $HeadURL$ %% Copyright (C) 2012 - 2013 CodeLutin, Chatellier Eric %% diff --git a/nuiton-security/src/main/resources/WEB-INF/security/user.jsp b/nuiton-security/src/main/resources/WEB-INF/security/user.jsp index 93a679f..8ead60e 100644 --- a/nuiton-security/src/main/resources/WEB-INF/security/user.jsp +++ b/nuiton-security/src/main/resources/WEB-INF/security/user.jsp @@ -1,8 +1,6 @@ <%-- #%L Nuiton Web :: Nuiton Security - $Id$ - $HeadURL$ %% Copyright (C) 2012 - 2013 CodeLutin, Chatellier Eric %% diff --git a/nuiton-security/src/main/resources/struts.xml b/nuiton-security/src/main/resources/struts.xml index 694c05e..f3da700 100644 --- a/nuiton-security/src/main/resources/struts.xml +++ b/nuiton-security/src/main/resources/struts.xml @@ -1,8 +1,6 @@ <!-- #%L Nuiton Web :: Nuiton Security - $Id$ - $HeadURL$ %% Copyright (C) 2012 - 2013 CodeLutin, Chatellier Eric %% diff --git a/nuiton-security/src/main/xmi/security.properties b/nuiton-security/src/main/xmi/security.properties index c5ee3d9..fbef37e 100644 --- a/nuiton-security/src/main/xmi/security.properties +++ b/nuiton-security/src/main/xmi/security.properties @@ -1,8 +1,6 @@ ### # #%L # Nuiton Web :: Nuiton Security -# $Id$ -# $HeadURL$ # %% # Copyright (C) 2012 CodeLutin, Chatellier Eric # %% diff --git a/nuiton-security/src/site/apt/index.apt b/nuiton-security/src/site/apt/index.apt index 035b2d0..edbd32f 100644 --- a/nuiton-security/src/site/apt/index.apt +++ b/nuiton-security/src/site/apt/index.apt @@ -1,9 +1,6 @@ ~~~ ~~ #%L ~~ Nuiton Web :: Nuiton Security -~~ -~~ $Id$ -~~ $HeadURL$ ~~ %% ~~ Copyright (C) 2012 CodeLutin, Chatellier Eric ~~ %% @@ -178,4 +175,4 @@ Maven </execution> </executions> </plugin> --------------------------------------------------------------------------------- \ No newline at end of file +-------------------------------------------------------------------------------- diff --git a/nuiton-security/src/site/site.xml b/nuiton-security/src/site/site.xml index eb885ce..ef3b940 100644 --- a/nuiton-security/src/site/site.xml +++ b/nuiton-security/src/site/site.xml @@ -1,10 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- #%L - Nuiton Utils :: Nuiton Web Security - - $Id$ - $HeadURL$ + Nuiton Web :: Nuiton Security %% Copyright (C) 2012 CodeLutin, Chatellier Eric %% diff --git a/nuiton-struts2/pom.xml b/nuiton-struts2/pom.xml index cebf337..16e72ae 100644 --- a/nuiton-struts2/pom.xml +++ b/nuiton-struts2/pom.xml @@ -1,4 +1,25 @@ <?xml version="1.0" encoding="UTF-8"?> +<!-- + #%L + Nuiton Web :: Nuiton Struts2 + %% + Copyright (C) 2008 - 2014 CodeLutin, Tony Chemit + %% + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU Lesser 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 Lesser Public License for more details. + + You should have received a copy of the GNU General Lesser Public + License along with this program. If not, see + <http://www.gnu.org/licenses/lgpl-3.0.html>. + #L% + --> <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> diff --git a/nuiton-struts2/src/main/java/org/nuiton/web/struts2/BaseAction.java b/nuiton-struts2/src/main/java/org/nuiton/web/struts2/BaseAction.java index 55d2bb4..6d62ba5 100644 --- a/nuiton-struts2/src/main/java/org/nuiton/web/struts2/BaseAction.java +++ b/nuiton-struts2/src/main/java/org/nuiton/web/struts2/BaseAction.java @@ -1,9 +1,6 @@ /* * #%L * Nuiton Web :: Nuiton Struts 2 - * - * $Id$ - * $HeadURL$ * %% * Copyright (C) 2010 - 2011 CodeLutin, Tony Chemit * %% diff --git a/nuiton-struts2/src/main/java/org/nuiton/web/struts2/I18nTextProvider.java b/nuiton-struts2/src/main/java/org/nuiton/web/struts2/I18nTextProvider.java index d183a56..e1be513 100644 --- a/nuiton-struts2/src/main/java/org/nuiton/web/struts2/I18nTextProvider.java +++ b/nuiton-struts2/src/main/java/org/nuiton/web/struts2/I18nTextProvider.java @@ -1,9 +1,6 @@ /* * #%L * Nuiton Web :: Nuiton Struts 2 - * - * $Id$ - * $HeadURL$ * %% * Copyright (C) 2010 - 2011 CodeLutin * %% diff --git a/nuiton-struts2/src/main/java/org/nuiton/web/struts2/converters/DoubleConverter.java b/nuiton-struts2/src/main/java/org/nuiton/web/struts2/converters/DoubleConverter.java index 3e1542b..781acfe 100644 --- a/nuiton-struts2/src/main/java/org/nuiton/web/struts2/converters/DoubleConverter.java +++ b/nuiton-struts2/src/main/java/org/nuiton/web/struts2/converters/DoubleConverter.java @@ -3,8 +3,6 @@ package org.nuiton.web.struts2.converters; /* * #%L * Nuiton Web :: Nuiton Struts 2 - * $Id$ - * $HeadURL$ * %% * Copyright (C) 2010 - 2013 CodeLutin * %% diff --git a/nuiton-struts2/src/main/java/org/nuiton/web/struts2/converters/HundredthLocalNumberConverter.java b/nuiton-struts2/src/main/java/org/nuiton/web/struts2/converters/HundredthLocalNumberConverter.java index 2843076..3a91dab 100644 --- a/nuiton-struts2/src/main/java/org/nuiton/web/struts2/converters/HundredthLocalNumberConverter.java +++ b/nuiton-struts2/src/main/java/org/nuiton/web/struts2/converters/HundredthLocalNumberConverter.java @@ -3,8 +3,6 @@ package org.nuiton.web.struts2.converters; /* * #%L * Nuiton Web :: Nuiton Struts 2 - * $Id$ - * $HeadURL$ * %% * Copyright (C) 2010 - 2014 CodeLutin * %% diff --git a/nuiton-struts2/src/main/java/org/nuiton/web/struts2/converters/JsonConverter.java b/nuiton-struts2/src/main/java/org/nuiton/web/struts2/converters/JsonConverter.java index 9f38bf6..746f9b8 100644 --- a/nuiton-struts2/src/main/java/org/nuiton/web/struts2/converters/JsonConverter.java +++ b/nuiton-struts2/src/main/java/org/nuiton/web/struts2/converters/JsonConverter.java @@ -118,4 +118,4 @@ public class JsonConverter extends StrutsTypeConverter { return json; } -} \ No newline at end of file +} diff --git a/nuiton-struts2/src/main/java/org/nuiton/web/struts2/converters/LocalNumberConverter.java b/nuiton-struts2/src/main/java/org/nuiton/web/struts2/converters/LocalNumberConverter.java index 7b49dc8..a745a87 100644 --- a/nuiton-struts2/src/main/java/org/nuiton/web/struts2/converters/LocalNumberConverter.java +++ b/nuiton-struts2/src/main/java/org/nuiton/web/struts2/converters/LocalNumberConverter.java @@ -3,8 +3,6 @@ package org.nuiton.web.struts2.converters; /* * #%L * Nuiton Web :: Nuiton Struts 2 - * $Id$ - * $HeadURL$ * %% * Copyright (C) 2010 - 2014 CodeLutin * %% diff --git a/nuiton-struts2/src/main/java/org/nuiton/web/struts2/filter/CloseTopiaTransactionFilter.java b/nuiton-struts2/src/main/java/org/nuiton/web/struts2/filter/CloseTopiaTransactionFilter.java index 3b8e442..2a860f4 100644 --- a/nuiton-struts2/src/main/java/org/nuiton/web/struts2/filter/CloseTopiaTransactionFilter.java +++ b/nuiton-struts2/src/main/java/org/nuiton/web/struts2/filter/CloseTopiaTransactionFilter.java @@ -1,9 +1,6 @@ /* * #%L * Nuiton Web :: Nuiton Struts 2 - * - * $Id$ - * $HeadURL$ * %% * Copyright (C) 2010 - 2011 CodeLutin * %% diff --git a/nuiton-struts2/src/main/java/org/nuiton/web/struts2/interceptor/OpenTopiaTransactionInterceptor.java b/nuiton-struts2/src/main/java/org/nuiton/web/struts2/interceptor/OpenTopiaTransactionInterceptor.java index 9997177..8d7642f 100644 --- a/nuiton-struts2/src/main/java/org/nuiton/web/struts2/interceptor/OpenTopiaTransactionInterceptor.java +++ b/nuiton-struts2/src/main/java/org/nuiton/web/struts2/interceptor/OpenTopiaTransactionInterceptor.java @@ -1,9 +1,6 @@ /* * #%L * Nuiton Web :: Nuiton Struts 2 - * - * $Id$ - * $HeadURL$ * %% * Copyright (C) 2010 - 2011 CodeLutin * %% diff --git a/nuiton-struts2/src/main/java/org/nuiton/web/struts2/taglib/FieldError2.java b/nuiton-struts2/src/main/java/org/nuiton/web/struts2/taglib/FieldError2.java index ad34ca5..1657c99 100644 --- a/nuiton-struts2/src/main/java/org/nuiton/web/struts2/taglib/FieldError2.java +++ b/nuiton-struts2/src/main/java/org/nuiton/web/struts2/taglib/FieldError2.java @@ -1,9 +1,6 @@ /* * #%L * Nuiton Web :: Nuiton Struts 2 - * - * $Id$ - * $HeadURL$ * %% * Copyright (C) 2010 - 2012 CodeLutin * %% diff --git a/nuiton-struts2/src/main/java/org/nuiton/web/struts2/taglib/FieldError2Tag.java b/nuiton-struts2/src/main/java/org/nuiton/web/struts2/taglib/FieldError2Tag.java index e240d4a..c6b494e 100644 --- a/nuiton-struts2/src/main/java/org/nuiton/web/struts2/taglib/FieldError2Tag.java +++ b/nuiton-struts2/src/main/java/org/nuiton/web/struts2/taglib/FieldError2Tag.java @@ -1,9 +1,6 @@ /* * #%L * Nuiton Web :: Nuiton Struts 2 - * - * $Id$ - * $HeadURL$ * %% * Copyright (C) 2010 - 2012 CodeLutin * %% diff --git a/nuiton-struts2/src/main/java/org/nuiton/web/struts2/taglib/HelpBean.java b/nuiton-struts2/src/main/java/org/nuiton/web/struts2/taglib/HelpBean.java index 0f7c9c5..3402f70 100644 --- a/nuiton-struts2/src/main/java/org/nuiton/web/struts2/taglib/HelpBean.java +++ b/nuiton-struts2/src/main/java/org/nuiton/web/struts2/taglib/HelpBean.java @@ -1,9 +1,6 @@ /* * #%L * Nuiton Web :: Nuiton Struts 2 - * - * $Id$ - * $HeadURL$ * %% * Copyright (C) 2010 - 2011 CodeLutin * %% diff --git a/nuiton-struts2/src/main/java/org/nuiton/web/struts2/taglib/HelpTag.java b/nuiton-struts2/src/main/java/org/nuiton/web/struts2/taglib/HelpTag.java index 126750e..02fd8ed 100644 --- a/nuiton-struts2/src/main/java/org/nuiton/web/struts2/taglib/HelpTag.java +++ b/nuiton-struts2/src/main/java/org/nuiton/web/struts2/taglib/HelpTag.java @@ -1,9 +1,6 @@ /* * #%L * Nuiton Web :: Nuiton Struts 2 - * - * $Id$ - * $HeadURL$ * %% * Copyright (C) 2010 - 2011 CodeLutin * %% diff --git a/nuiton-struts2/src/main/resources/template/css_xhtml/help-close.ftl b/nuiton-struts2/src/main/resources/template/css_xhtml/help-close.ftl index e6dcf8d..a5a4497 100644 --- a/nuiton-struts2/src/main/resources/template/css_xhtml/help-close.ftl +++ b/nuiton-struts2/src/main/resources/template/css_xhtml/help-close.ftl @@ -1,9 +1,6 @@ <#-- #%L Nuiton Web :: Nuiton Struts 2 - - $Id$ - $HeadURL$ %% Copyright (C) 2010 - 2011 CodeLutin %% @@ -22,4 +19,4 @@ <http://www.gnu.org/licenses/lgpl-3.0.html>. #L% --> -</div> \ No newline at end of file +</div> diff --git a/nuiton-struts2/src/main/resources/template/css_xhtml/help.ftl b/nuiton-struts2/src/main/resources/template/css_xhtml/help.ftl index f263526..18a9694 100644 --- a/nuiton-struts2/src/main/resources/template/css_xhtml/help.ftl +++ b/nuiton-struts2/src/main/resources/template/css_xhtml/help.ftl @@ -1,9 +1,6 @@ <#-- #%L Nuiton Web :: Nuiton Struts 2 - - $Id$ - $HeadURL$ %% Copyright (C) 2010 - 2011 CodeLutin %% @@ -59,4 +56,4 @@ fieldsNeedingHelpWhenMouseOver.mouseover(showHelp); fieldsNeedingHelpWhenMouseOver.mouseout(hideHelp); }); - </script> \ No newline at end of file + </script> diff --git a/nuiton-struts2/src/main/resources/template/css_xhtml/mycheckboxlist.ftl b/nuiton-struts2/src/main/resources/template/css_xhtml/mycheckboxlist.ftl index 8e5e9b1..c41b406 100644 --- a/nuiton-struts2/src/main/resources/template/css_xhtml/mycheckboxlist.ftl +++ b/nuiton-struts2/src/main/resources/template/css_xhtml/mycheckboxlist.ftl @@ -1,9 +1,6 @@ <#-- #%L Nuiton Web :: Nuiton Struts 2 - - $Id$ - $HeadURL$ %% Copyright (C) 2010 - 2011 CodeLutin %% diff --git a/nuiton-struts2/src/main/resources/template/simple/mycheckboxlist.ftl b/nuiton-struts2/src/main/resources/template/simple/mycheckboxlist.ftl index 5473417..c6bbbc0 100644 --- a/nuiton-struts2/src/main/resources/template/simple/mycheckboxlist.ftl +++ b/nuiton-struts2/src/main/resources/template/simple/mycheckboxlist.ftl @@ -1,9 +1,6 @@ <#-- #%L Nuiton Web :: Nuiton Struts 2 - - $Id$ - $HeadURL$ %% Copyright (C) 2010 - 2011 CodeLutin %% @@ -66,4 +63,4 @@ <#if parameters.disabled?default(false)> disabled="disabled"<#rt/> </#if> - /> \ No newline at end of file + /> diff --git a/nuiton-struts2/src/site/apt/index.apt b/nuiton-struts2/src/site/apt/index.apt index 47364e9..ee3f12a 100644 --- a/nuiton-struts2/src/site/apt/index.apt +++ b/nuiton-struts2/src/site/apt/index.apt @@ -1,9 +1,6 @@ ~~~ ~~ #%L ~~ Nuiton Web :: Nuiton Struts 2 -~~ -~~ $Id$ -~~ $HeadURL$ ~~ %% ~~ Copyright (C) 2010 - 2011 CodeLutin ~~ %% diff --git a/nuiton-struts2/src/site/apt/taglib.apt b/nuiton-struts2/src/site/apt/taglib.apt index ffe6977..daa5228 100644 --- a/nuiton-struts2/src/site/apt/taglib.apt +++ b/nuiton-struts2/src/site/apt/taglib.apt @@ -1,9 +1,6 @@ ~~~ ~~ #%L ~~ Nuiton Web :: Nuiton Struts 2 -~~ -~~ $Id$ -~~ $HeadURL$ ~~ %% ~~ Copyright (C) 2010 - 2011 CodeLutin ~~ %% diff --git a/nuiton-security/src/site/site.xml b/nuiton-struts2/src/site/site.xml similarity index 50% copy from nuiton-security/src/site/site.xml copy to nuiton-struts2/src/site/site.xml index eb885ce..9944efe 100644 --- a/nuiton-security/src/site/site.xml +++ b/nuiton-struts2/src/site/site.xml @@ -1,12 +1,9 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- #%L - Nuiton Utils :: Nuiton Web Security - - $Id$ - $HeadURL$ + Nuiton Web :: Nuiton Struts 2 %% - Copyright (C) 2012 CodeLutin, Chatellier Eric + Copyright (C) 2008 - 2010 CodeLutin, Tony Chemit, Benjamin Poussin %% This program is free software: you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as @@ -24,7 +21,10 @@ #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> @@ -39,8 +39,20 @@ <menu ref="parent"/> - <menu name="Users"> - <item name="Overview" href="index.html"/> + <menu name="Utilisateur"> + <item name="Nuiton taglib" href="taglib.html"/> + </menu> + + <menu name="Downloads"> + <item + href="${repository.home.url}/org/nuiton/${project.artifactId}/${project.version}/${project.build.finalName}.jar" + name="Librairie (jar)"/> + <item + href="${repository.home.url}/org/nuiton/${project.artifactId}/${project.version}/${project.build.finalName}-javadoc.jar" + name="Javadoc (jar)"/> + <item + href="${repository.home.url}/org/nuiton/${project.artifactId}/${project.version}/${project.build.finalName}-sources.jar" + name="Sources (jar)"/> </menu> <menu ref="reports"/> diff --git a/nuiton-struts2/src/site/site_fr.xml b/nuiton-struts2/src/site/site_fr.xml deleted file mode 100644 index 4e51abf..0000000 --- a/nuiton-struts2/src/site/site_fr.xml +++ /dev/null @@ -1,82 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- - #%L - Nuiton Utils :: Nuiton RSS - - $Id$ - $HeadURL$ - %% - Copyright (C) 2008 - 2010 CodeLutin, Tony Chemit, Benjamin Poussin - %% - This program is free software: you can redistribute it and/or modify - it under the terms of the GNU Lesser 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 Lesser Public License for more details. - - You should have received a copy of the GNU General Lesser Public - License along with this program. If not, see - <http://www.gnu.org/licenses/lgpl-3.0.html>. - #L% - --> - - -<project name="${project.name}"> - - <bannerLeft> - <name>${project.name}</name> - <href>index.html</href> - </bannerLeft> - - <body> - - <breadcrumbs> - <item name="${project.name}" href="index.html"/> - </breadcrumbs> - - <menu ref="parent"/> - - <menu name="Utilisateur"> - <item name="Nuiton taglib" href="taglib.html"/> - </menu> - - <menu name="Downloads"> - <item - href="${repository.home.url}/org/nuiton/${project.artifactId}/${project.version}/${project.build.finalName}.jar" - name="Librairie (jar)"/> - <item - href="${repository.home.url}/org/nuiton/${project.artifactId}/${project.version}/${project.build.finalName}-javadoc.jar" - name="Javadoc (jar)"/> - <item - href="${repository.home.url}/org/nuiton/${project.artifactId}/${project.version}/${project.build.finalName}-sources.jar" - name="Sources (jar)"/> - </menu> - - <menu ref="reports"/> - - <footer> - - <script type="text/javascript" - src="${mavenpomSiteCommonResourcesUrl}/js/maven-site-nuiton.org.js"> - </script> - - <div id='projectMetas' - projectversion='${project.version}' - platform='${project.platform}' - projectid='${project.projectId}' - scm='${project.scm.connection}' - scmwebeditorenabled='${project.scmwebeditorEnabled}' - scmwebeditorurl='${project.scmwebeditorUrl}' - siteSourcesType='${project.siteSourcesType}' - piwikEnabled='${project.piwikEnabled}' - piwikId='${project.piwikId}' - scmwebeditor_skipDefaultFiles="true" - > - </div> - </footer> - </body> -</project> diff --git a/nuiton-struts2/src/test/java/org/nuiton/web/struts2/I18nTextProviderTest.java b/nuiton-struts2/src/test/java/org/nuiton/web/struts2/I18nTextProviderTest.java index 2e6b71c..0e31c51 100644 --- a/nuiton-struts2/src/test/java/org/nuiton/web/struts2/I18nTextProviderTest.java +++ b/nuiton-struts2/src/test/java/org/nuiton/web/struts2/I18nTextProviderTest.java @@ -1,9 +1,6 @@ /* * #%L * Nuiton Web :: Nuiton Struts 2 - * - * $Id$ - * $HeadURL$ * %% * Copyright (C) 2010 - 2011 CodeLutin * %% diff --git a/nuiton-struts2/src/test/java/org/nuiton/web/struts2/converters/LocalNumberConverterTest.java b/nuiton-struts2/src/test/java/org/nuiton/web/struts2/converters/LocalNumberConverterTest.java index 4cc67a8..ce53465 100644 --- a/nuiton-struts2/src/test/java/org/nuiton/web/struts2/converters/LocalNumberConverterTest.java +++ b/nuiton-struts2/src/test/java/org/nuiton/web/struts2/converters/LocalNumberConverterTest.java @@ -3,8 +3,6 @@ package org.nuiton.web.struts2.converters; /* * #%L * Nuiton Web :: Nuiton Struts 2 - * $Id$ - * $HeadURL$ * %% * Copyright (C) 2010 - 2014 CodeLutin * %% diff --git a/nuiton-struts2/src/test/resources/META-INF/toto-definition.properties b/nuiton-struts2/src/test/resources/META-INF/toto-definition.properties index f7d31dc..3061693 100644 --- a/nuiton-struts2/src/test/resources/META-INF/toto-definition.properties +++ b/nuiton-struts2/src/test/resources/META-INF/toto-definition.properties @@ -1,9 +1,6 @@ ### # #%L # Nuiton Web :: Nuiton Struts 2 -# -# $Id$ -# $HeadURL$ # %% # Copyright (C) 2010 - 2011 CodeLutin # %% diff --git a/nuiton-struts2/src/test/resources/META-INF/toto_fr_FR.properties b/nuiton-struts2/src/test/resources/META-INF/toto_fr_FR.properties index 121a95d..3597e68 100644 --- a/nuiton-struts2/src/test/resources/META-INF/toto_fr_FR.properties +++ b/nuiton-struts2/src/test/resources/META-INF/toto_fr_FR.properties @@ -1,9 +1,6 @@ ### # #%L # Nuiton Web :: Nuiton Struts 2 -# -# $Id$ -# $HeadURL$ # %% # Copyright (C) 2010 - 2011 CodeLutin # %% @@ -24,4 +21,4 @@ ### present=yes hello=Hello %s ! -hello_plus=Hello %s, %s ? \ No newline at end of file +hello_plus=Hello %s, %s ? diff --git a/nuiton-tapestry/pom.xml b/nuiton-tapestry/pom.xml index 65ab087..8209eeb 100644 --- a/nuiton-tapestry/pom.xml +++ b/nuiton-tapestry/pom.xml @@ -1,4 +1,25 @@ <?xml version="1.0" encoding="UTF-8"?> +<!-- + #%L + Nuiton Web :: Nuiton Tapestry + %% + Copyright (C) 2008 - 2014 CodeLutin, Tony Chemit + %% + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU Lesser 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 Lesser Public License for more details. + + You should have received a copy of the GNU General Lesser Public + License along with this program. If not, see + <http://www.gnu.org/licenses/lgpl-3.0.html>. + #L% + --> <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> diff --git a/nuiton-tapestry/src/main/java/org/nuiton/web/tapestry5/annotations/RequiresAuthentication.java b/nuiton-tapestry/src/main/java/org/nuiton/web/tapestry5/annotations/RequiresAuthentication.java index e40c277..59236c9 100644 --- a/nuiton-tapestry/src/main/java/org/nuiton/web/tapestry5/annotations/RequiresAuthentication.java +++ b/nuiton-tapestry/src/main/java/org/nuiton/web/tapestry5/annotations/RequiresAuthentication.java @@ -1,9 +1,6 @@ /* * #%L * Nuiton Web :: Nuiton Tapestry - * - * $Id$ - * $HeadURL$ * %% * Copyright (C) 2010 - 2011 CodeLutin * %% diff --git a/nuiton-tapestry/src/main/java/org/nuiton/web/tapestry5/components/FeedBack.java b/nuiton-tapestry/src/main/java/org/nuiton/web/tapestry5/components/FeedBack.java index 54e89d2..90cfc84 100644 --- a/nuiton-tapestry/src/main/java/org/nuiton/web/tapestry5/components/FeedBack.java +++ b/nuiton-tapestry/src/main/java/org/nuiton/web/tapestry5/components/FeedBack.java @@ -1,9 +1,6 @@ /* * #%L * Nuiton Web :: Nuiton Tapestry - * - * $Id$ - * $HeadURL$ * %% * Copyright (C) 2010 - 2011 CodeLutin * %% diff --git a/nuiton-tapestry/src/main/java/org/nuiton/web/tapestry5/data/AbstractMappedGridDataSource.java b/nuiton-tapestry/src/main/java/org/nuiton/web/tapestry5/data/AbstractMappedGridDataSource.java index 6b53406..204823a 100644 --- a/nuiton-tapestry/src/main/java/org/nuiton/web/tapestry5/data/AbstractMappedGridDataSource.java +++ b/nuiton-tapestry/src/main/java/org/nuiton/web/tapestry5/data/AbstractMappedGridDataSource.java @@ -1,9 +1,6 @@ /* * #%L * Nuiton Web :: Nuiton Tapestry - * - * $Id$ - * $HeadURL$ * %% * Copyright (C) 2010 - 2011 CodeLutin * %% diff --git a/nuiton-tapestry/src/main/java/org/nuiton/web/tapestry5/mixins/Confirm.java b/nuiton-tapestry/src/main/java/org/nuiton/web/tapestry5/mixins/Confirm.java index 6532b34..9de3a69 100644 --- a/nuiton-tapestry/src/main/java/org/nuiton/web/tapestry5/mixins/Confirm.java +++ b/nuiton-tapestry/src/main/java/org/nuiton/web/tapestry5/mixins/Confirm.java @@ -1,9 +1,6 @@ /* * #%L * Nuiton Web :: Nuiton Tapestry - * - * $Id$ - * $HeadURL$ * %% * Copyright (C) 2010 - 2011 CodeLutin * %% diff --git a/nuiton-tapestry/src/main/java/org/nuiton/web/tapestry5/mixins/ZoneUpdater.java b/nuiton-tapestry/src/main/java/org/nuiton/web/tapestry5/mixins/ZoneUpdater.java index 6720b6b..1eaf2b5 100644 --- a/nuiton-tapestry/src/main/java/org/nuiton/web/tapestry5/mixins/ZoneUpdater.java +++ b/nuiton-tapestry/src/main/java/org/nuiton/web/tapestry5/mixins/ZoneUpdater.java @@ -1,9 +1,6 @@ /* * #%L * Nuiton Web :: Nuiton Tapestry - * - * $Id$ - * $HeadURL$ * %% * Copyright (C) 2010 - 2011 CodeLutin * %% diff --git a/nuiton-tapestry/src/main/java/org/nuiton/web/tapestry5/services/AbstractAuthenticationFilter.java b/nuiton-tapestry/src/main/java/org/nuiton/web/tapestry5/services/AbstractAuthenticationFilter.java index 5b7d8ff..829c4dc 100644 --- a/nuiton-tapestry/src/main/java/org/nuiton/web/tapestry5/services/AbstractAuthenticationFilter.java +++ b/nuiton-tapestry/src/main/java/org/nuiton/web/tapestry5/services/AbstractAuthenticationFilter.java @@ -1,9 +1,6 @@ /* * #%L * Nuiton Web :: Nuiton Tapestry - * - * $Id$ - * $HeadURL$ * %% * Copyright (C) 2010 - 2011 CodeLutin * %% diff --git a/nuiton-tapestry/src/main/java/org/nuiton/web/tapestry5/services/FormatBinding.java b/nuiton-tapestry/src/main/java/org/nuiton/web/tapestry5/services/FormatBinding.java index 160ca18..82bb56c 100644 --- a/nuiton-tapestry/src/main/java/org/nuiton/web/tapestry5/services/FormatBinding.java +++ b/nuiton-tapestry/src/main/java/org/nuiton/web/tapestry5/services/FormatBinding.java @@ -1,9 +1,6 @@ /* * #%L * Nuiton Web :: Nuiton Tapestry - * - * $Id$ - * $HeadURL$ * %% * Copyright (C) 2010 - 2011 CodeLutin * %% diff --git a/nuiton-tapestry/src/main/java/org/nuiton/web/tapestry5/services/FormatBindingFactory.java b/nuiton-tapestry/src/main/java/org/nuiton/web/tapestry5/services/FormatBindingFactory.java index 690cf4e..876e2e7 100644 --- a/nuiton-tapestry/src/main/java/org/nuiton/web/tapestry5/services/FormatBindingFactory.java +++ b/nuiton-tapestry/src/main/java/org/nuiton/web/tapestry5/services/FormatBindingFactory.java @@ -1,9 +1,6 @@ /* * #%L * Nuiton Web :: Nuiton Tapestry - * - * $Id$ - * $HeadURL$ * %% * Copyright (C) 2010 - 2011 CodeLutin * %% diff --git a/nuiton-tapestry/src/main/java/org/nuiton/web/tapestry5/services/NuitonModule.java b/nuiton-tapestry/src/main/java/org/nuiton/web/tapestry5/services/NuitonModule.java index 70c6c11..2504c84 100644 --- a/nuiton-tapestry/src/main/java/org/nuiton/web/tapestry5/services/NuitonModule.java +++ b/nuiton-tapestry/src/main/java/org/nuiton/web/tapestry5/services/NuitonModule.java @@ -1,9 +1,6 @@ /* * #%L * Nuiton Web :: Nuiton Tapestry - * - * $Id$ - * $HeadURL$ * %% * Copyright (C) 2010 - 2011 CodeLutin * %% diff --git a/nuiton-tapestry/src/main/java/org/nuiton/web/tapestry5/services/ServiceAuthentication.java b/nuiton-tapestry/src/main/java/org/nuiton/web/tapestry5/services/ServiceAuthentication.java index 06cf298..123ad99 100644 --- a/nuiton-tapestry/src/main/java/org/nuiton/web/tapestry5/services/ServiceAuthentication.java +++ b/nuiton-tapestry/src/main/java/org/nuiton/web/tapestry5/services/ServiceAuthentication.java @@ -1,9 +1,6 @@ /* * #%L * Nuiton Web :: Nuiton Tapestry - * - * $Id$ - * $HeadURL$ * %% * Copyright (C) 2010 - 2011 CodeLutin * %% diff --git a/nuiton-tapestry/src/main/java/org/nuiton/web/tapestry5/services/ServiceAuthenticationImpl.java b/nuiton-tapestry/src/main/java/org/nuiton/web/tapestry5/services/ServiceAuthenticationImpl.java index e9ebc0b..9d1e19c 100644 --- a/nuiton-tapestry/src/main/java/org/nuiton/web/tapestry5/services/ServiceAuthenticationImpl.java +++ b/nuiton-tapestry/src/main/java/org/nuiton/web/tapestry5/services/ServiceAuthenticationImpl.java @@ -1,9 +1,6 @@ /* * #%L * Nuiton Web :: Nuiton Tapestry - * - * $Id$ - * $HeadURL$ * %% * Copyright (C) 2010 - 2011 CodeLutin * %% diff --git a/nuiton-tapestry/src/main/java/org/nuiton/web/tapestry5/services/package-info.java b/nuiton-tapestry/src/main/java/org/nuiton/web/tapestry5/services/package-info.java index 49ecd00..ea2ecd7 100644 --- a/nuiton-tapestry/src/main/java/org/nuiton/web/tapestry5/services/package-info.java +++ b/nuiton-tapestry/src/main/java/org/nuiton/web/tapestry5/services/package-info.java @@ -1,9 +1,6 @@ /* * #%L * Nuiton Web :: Nuiton Tapestry - * - * $Id$ - * $HeadURL$ * %% * Copyright (C) 2010 - 2011 CodeLutin * %% @@ -27,4 +24,4 @@ * applications. Generally, these services need to be built in the * AppModule class of your Tapestry application. */ -package org.nuiton.web.tapestry5.services; \ No newline at end of file +package org.nuiton.web.tapestry5.services; diff --git a/nuiton-tapestry/src/main/resources/org/nuiton/web/tapestry5/components/feedback.css b/nuiton-tapestry/src/main/resources/org/nuiton/web/tapestry5/components/feedback.css index aae90ab..595477c 100644 --- a/nuiton-tapestry/src/main/resources/org/nuiton/web/tapestry5/components/feedback.css +++ b/nuiton-tapestry/src/main/resources/org/nuiton/web/tapestry5/components/feedback.css @@ -1,9 +1,6 @@ /* * #%L * Nuiton Web :: Nuiton Tapestry - * - * $Id$ - * $HeadURL$ * %% * Copyright (C) 2010 - 2011 CodeLutin * %% @@ -45,4 +42,4 @@ border: solid; border-color: #000; border-width: 2px; -} \ No newline at end of file +} diff --git a/nuiton-tapestry/src/main/resources/org/nuiton/web/tapestry5/mixins/confirm.js b/nuiton-tapestry/src/main/resources/org/nuiton/web/tapestry5/mixins/confirm.js index 302c421..d8c842e 100644 --- a/nuiton-tapestry/src/main/resources/org/nuiton/web/tapestry5/mixins/confirm.js +++ b/nuiton-tapestry/src/main/resources/org/nuiton/web/tapestry5/mixins/confirm.js @@ -1,9 +1,6 @@ /* * #%L * Nuiton Web :: Nuiton Tapestry - * - * $Id$ - * $HeadURL$ * %% * Copyright (C) 2010 - 2011 CodeLutin * %% @@ -44,4 +41,4 @@ var Confirm = Class.create({ } } } -}); \ No newline at end of file +}); diff --git a/nuiton-tapestry/src/main/resources/org/nuiton/web/tapestry5/mixins/zoneUpdater.js b/nuiton-tapestry/src/main/resources/org/nuiton/web/tapestry5/mixins/zoneUpdater.js index 67dfaae..415613d 100644 --- a/nuiton-tapestry/src/main/resources/org/nuiton/web/tapestry5/mixins/zoneUpdater.js +++ b/nuiton-tapestry/src/main/resources/org/nuiton/web/tapestry5/mixins/zoneUpdater.js @@ -1,9 +1,6 @@ /* * #%L * Nuiton Web :: Nuiton Tapestry - * - * $Id$ - * $HeadURL$ * %% * Copyright (C) 2010 - 2011 CodeLutin * %% @@ -124,4 +121,4 @@ ZoneUpdater.prototype = { } -} \ No newline at end of file +} diff --git a/nuiton-web/pom.xml b/nuiton-web/pom.xml index 4a5389a..92d027a 100644 --- a/nuiton-web/pom.xml +++ b/nuiton-web/pom.xml @@ -1,5 +1,25 @@ <?xml version="1.0" encoding="UTF-8"?> - +<!-- + #%L + Nuiton Web :: Nuiton Web + %% + Copyright (C) 2008 - 2014 CodeLutin, Tony Chemit + %% + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU Lesser 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 Lesser Public License for more details. + + You should have received a copy of the GNU General Lesser Public + License along with this program. If not, see + <http://www.gnu.org/licenses/lgpl-3.0.html>. + #L% + --> <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> diff --git a/nuiton-web/src/main/java/org/nuiton/web/filter/JpaTransactionFilter.java b/nuiton-web/src/main/java/org/nuiton/web/filter/JpaTransactionFilter.java index 1c4e3b0..555c60a 100644 --- a/nuiton-web/src/main/java/org/nuiton/web/filter/JpaTransactionFilter.java +++ b/nuiton-web/src/main/java/org/nuiton/web/filter/JpaTransactionFilter.java @@ -3,8 +3,6 @@ package org.nuiton.web.filter; /* * #%L * Nuiton Web :: Nuiton Web - * $Id$ - * $HeadURL$ * %% * Copyright (C) 2011 - 2013 CodeLutin * %% diff --git a/nuiton-web/src/main/java/org/nuiton/web/filter/MonitoringFilter.java b/nuiton-web/src/main/java/org/nuiton/web/filter/MonitoringFilter.java index 121d46d..436e3ec 100644 --- a/nuiton-web/src/main/java/org/nuiton/web/filter/MonitoringFilter.java +++ b/nuiton-web/src/main/java/org/nuiton/web/filter/MonitoringFilter.java @@ -1,9 +1,6 @@ /* * #%L * Nuiton Web :: Nuiton Web - * - * $Id$ - * $HeadURL$ * %% * Copyright (C) 2011 CodeLutin * %% diff --git a/nuiton-web/src/main/java/org/nuiton/web/filter/TopiaTransactionFilter.java b/nuiton-web/src/main/java/org/nuiton/web/filter/TopiaTransactionFilter.java index 2887cbf..dcb3e0b 100644 --- a/nuiton-web/src/main/java/org/nuiton/web/filter/TopiaTransactionFilter.java +++ b/nuiton-web/src/main/java/org/nuiton/web/filter/TopiaTransactionFilter.java @@ -1,9 +1,6 @@ /* * #%L * Nuiton Web :: Nuiton Web - * - * $Id$ - * $HeadURL$ * %% * Copyright (C) 2011 CodeLutin * %% diff --git a/nuiton-web/src/main/java/org/nuiton/web/filter/TypedTopiaTransactionFilter.java b/nuiton-web/src/main/java/org/nuiton/web/filter/TypedTopiaTransactionFilter.java index c05ab3a..91a6109 100644 --- a/nuiton-web/src/main/java/org/nuiton/web/filter/TypedTopiaTransactionFilter.java +++ b/nuiton-web/src/main/java/org/nuiton/web/filter/TypedTopiaTransactionFilter.java @@ -1,9 +1,6 @@ /* * #%L * Nuiton Web :: Nuiton Web - * - * $Id$ - * $HeadURL$ * %% * Copyright (C) 2011 CodeLutin * %% diff --git a/nuiton-web/src/main/java/org/nuiton/web/jmx/RequestStatistics.java b/nuiton-web/src/main/java/org/nuiton/web/jmx/RequestStatistics.java index aacd020..236bccd 100644 --- a/nuiton-web/src/main/java/org/nuiton/web/jmx/RequestStatistics.java +++ b/nuiton-web/src/main/java/org/nuiton/web/jmx/RequestStatistics.java @@ -1,9 +1,6 @@ /* * #%L * Nuiton Web :: Nuiton Web - * - * $Id$ - * $HeadURL$ * %% * Copyright (C) 2011 CodeLutin * %% diff --git a/nuiton-web/src/main/java/org/nuiton/web/jmx/ServletStatisticsService.java b/nuiton-web/src/main/java/org/nuiton/web/jmx/ServletStatisticsService.java index f51cda0..f176839 100644 --- a/nuiton-web/src/main/java/org/nuiton/web/jmx/ServletStatisticsService.java +++ b/nuiton-web/src/main/java/org/nuiton/web/jmx/ServletStatisticsService.java @@ -1,9 +1,6 @@ /* * #%L * Nuiton Web :: Nuiton Web - * - * $Id$ - * $HeadURL$ * %% * Copyright (C) 2011 CodeLutin * %% diff --git a/nuiton-web/src/main/java/org/nuiton/web/jmx/ServletStatisticsServiceMBean.java b/nuiton-web/src/main/java/org/nuiton/web/jmx/ServletStatisticsServiceMBean.java index 86eed6c..c15e76f 100644 --- a/nuiton-web/src/main/java/org/nuiton/web/jmx/ServletStatisticsServiceMBean.java +++ b/nuiton-web/src/main/java/org/nuiton/web/jmx/ServletStatisticsServiceMBean.java @@ -1,9 +1,6 @@ /* * #%L * Nuiton Web :: Nuiton Web - * - * $Id$ - * $HeadURL$ * %% * Copyright (C) 2011 CodeLutin * %% diff --git a/nuiton-web/src/main/java/org/nuiton/web/war/JettyLauncher.java b/nuiton-web/src/main/java/org/nuiton/web/war/JettyLauncher.java index 9a51536..161715e 100644 --- a/nuiton-web/src/main/java/org/nuiton/web/war/JettyLauncher.java +++ b/nuiton-web/src/main/java/org/nuiton/web/war/JettyLauncher.java @@ -1,9 +1,6 @@ /* * #%L * Nuiton Web :: Nuiton Web - * - * $Id$ - * $HeadURL$ * %% * Copyright (C) 2011 CodeLutin * %% diff --git a/nuiton-web/src/main/java/org/nuiton/web/war/WinstoneLauncher.java b/nuiton-web/src/main/java/org/nuiton/web/war/WinstoneLauncher.java index 2f419da..09ff0ab 100644 --- a/nuiton-web/src/main/java/org/nuiton/web/war/WinstoneLauncher.java +++ b/nuiton-web/src/main/java/org/nuiton/web/war/WinstoneLauncher.java @@ -1,9 +1,6 @@ /* * #%L * Nuiton Web :: Nuiton Web - * - * $Id$ - * $HeadURL$ * %% * Copyright (C) 2011 CodeLutin * %% diff --git a/nuiton-web/src/main/java/org/nuiton/web/war/package-info.java b/nuiton-web/src/main/java/org/nuiton/web/war/package-info.java index 23a3185..2ceb8b0 100644 --- a/nuiton-web/src/main/java/org/nuiton/web/war/package-info.java +++ b/nuiton-web/src/main/java/org/nuiton/web/war/package-info.java @@ -1,9 +1,6 @@ /* * #%L * Nuiton Web :: Nuiton Web - * - * $Id$ - * $HeadURL$ * %% * Copyright (C) 2011 CodeLutin * %% diff --git a/nuiton-web/src/site/apt/index.apt b/nuiton-web/src/site/apt/index.apt index ebb0fe9..e16714a 100644 --- a/nuiton-web/src/site/apt/index.apt +++ b/nuiton-web/src/site/apt/index.apt @@ -1,9 +1,6 @@ ~~~ ~~ #%L ~~ Nuiton Web :: Nuiton Web -~~ -~~ $Id$ -~~ $HeadURL$ ~~ %% ~~ Copyright (C) 2011 CodeLutin ~~ %% diff --git a/nuiton-web/src/site/site_fr.xml b/nuiton-web/src/site/site.xml similarity index 51% rename from nuiton-web/src/site/site_fr.xml rename to nuiton-web/src/site/site.xml index 67db4d7..674d833 100644 --- a/nuiton-web/src/site/site_fr.xml +++ b/nuiton-web/src/site/site.xml @@ -2,9 +2,6 @@ <!-- #%L Nuiton Web :: Nuiton Web - - $Id$ - $HeadURL$ %% Copyright (C) 2011 CodeLutin %% @@ -24,7 +21,9 @@ #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> @@ -48,38 +47,17 @@ <menu name="Téléchargement"> <item - href="${repository.home.url}/org/nuiton/${project.artifactId}/${project.version}/${project.build.finalName}.jar" - name="Librairie (jar)"/> + href="${repository.home.url}/org/nuiton/${project.artifactId}/${project.version}/${project.build.finalName}.jar" + name="Librairie (jar)"/> <item - href="${repository.home.url}/org/nuiton/${project.artifactId}/${project.version}/${project.build.finalName}-javadoc.jar" - name="Javadoc (jar)"/> + href="${repository.home.url}/org/nuiton/${project.artifactId}/${project.version}/${project.build.finalName}-javadoc.jar" + name="Javadoc (jar)"/> <item - href="${repository.home.url}/org/nuiton/${project.artifactId}/${project.version}/${project.build.finalName}-sources.jar" - name="Sources (jar)"/> + href="${repository.home.url}/org/nuiton/${project.artifactId}/${project.version}/${project.build.finalName}-sources.jar" + name="Sources (jar)"/> </menu> <menu ref="reports"/> - <footer> - - <script type="text/javascript" - src="${mavenpomSiteCommonResourcesUrl}/js/maven-site-nuiton.org.js"> - </script> - - <div id='projectMetas' - projectversion='${project.version}' - platform='${project.platform}' - projectid='${project.projectId}' - scm='${project.scm.connection}' - scmwebeditorenabled='${project.scmwebeditorEnabled}' - scmwebeditorurl='${project.scmwebeditorUrl}' - siteSourcesType='${project.siteSourcesType}' - piwikEnabled='${project.piwikEnabled}' - piwikId='${project.piwikId}' - scmwebeditor_vmFiles=",MonitoringFilter.html,TopiaFilter.html,WarLauncher.html," - scmwebeditor_skipDefaultFiles="true" - > - </div> - </footer> </body> </project> diff --git a/pom.xml b/pom.xml index daca6ae..d878abe 100644 --- a/pom.xml +++ b/pom.xml @@ -1,21 +1,44 @@ <?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"> +<!-- +#%L +Nuiton Web +%% +Copyright (C) 2008 - 2014 CodeLutin, Tony Chemit +%% +This program is free software: you can redistribute it and/or modify +it under the terms of the GNU Lesser 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 Lesser Public License for more details. + +You should have received a copy of the GNU General Lesser Public +License along with this program. If not, see +<http://www.gnu.org/licenses/lgpl-3.0.html>. +#L% +--> +<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>mavenpom4redmineAndCentral</artifactId> - <version>5.1</version> + <artifactId>nuitonpom</artifactId> + <version>1.5</version> </parent> <groupId>org.nuiton.web</groupId> <artifactId>nuiton-web-parent</artifactId> <version>1.18-SNAPSHOT</version> + <packaging>pom</packaging> <name>Nuiton Web</name> <description>Common ressources for web applications</description> - <url>https://doc.nuiton.org/nuiton-web/</url> + <url>https://nuiton-web.nuiton.org</url> <inceptionYear>2010</inceptionYear> <developers> @@ -71,22 +94,21 @@ </modules> <scm> - <connection>scm:svn:https://svn.nuiton.org/nuiton-web/trunk</connection> - <developerConnection> - scm:svn:https://svn.nuiton.org/nuiton-web/trunk - </developerConnection> - <url>https://forge.nuiton.org/projects/nuiton-web/repository/show/trunk</url> + <connection>scm:git:http://git.nuiton.org/nuiton-web.git</connection> + <developerConnection>scm:git:https://git.nuiton.org/nuiton-web.git</developerConnection> + <url>https://gitweb.nuiton.org/nuiton-web.git</url> </scm> + <distributionManagement> <site> - <id>${siteDeployId}</id> - <url>${siteDeployUrl}</url> + <id>${site.server}</id> + <url>${site.url}</url> </site> </distributionManagement> <properties> - <!-- redmine configuration --> + <!-- redmine project Id --> <projectId>nuiton-web</projectId> <eugeneVersion>2.13</eugeneVersion> @@ -99,7 +121,8 @@ <topiaVersion>3.0-beta-12</topiaVersion> <!-- Tapestry --> - <tapestryVersion>5.2.4</tapestryVersion> <!-- Do not upgrade to 5.3.x because on some incompatibilities --> + <tapestryVersion>5.2.4</tapestryVersion> + <!-- Do not upgrade to 5.3.x because on some incompatibilities --> <slf4jVersion>1.7.5</slf4jVersion> <!-- GWT --> @@ -115,11 +138,7 @@ <windstoneVersion>0.9.10-hudson-24</windstoneVersion> <!--Multilanguage maven-site --> - <siteLocales>en,fr</siteLocales> - - <!-- Can't use version 3.4 since jrst is not compatible --> - <!-- see https://forge.nuiton.org/issues/3342 --> - <sitePluginVersion>3.3</sitePluginVersion> + <siteLocales>fr</siteLocales> <!-- license to use --> <license.licenseName>lgpl_v3</license.licenseName> @@ -130,6 +149,38 @@ <dependencies> + <!-- Commons --> + + <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-beanutils</groupId> + <artifactId>commons-beanutils</artifactId> + <version>1.9.2</version> + </dependency> + + <dependency> + <groupId>commons-collections</groupId> + <artifactId>commons-collections</artifactId> + <version>3.2.1</version> + </dependency> + + <dependency> + <groupId>com.google.guava</groupId> + <artifactId>guava</artifactId> + <version>17.0</version> + </dependency> + <!-- WarLaunchers --> <dependency> @@ -216,6 +267,13 @@ <scope>provided</scope> </dependency> + <dependency> + <groupId>log4j</groupId> + <artifactId>log4j</artifactId> + <version>1.2.17</version> + <scope>provided</scope> + </dependency> + <!-- librairie i18n --> <dependency> <groupId>org.nuiton.i18n</groupId> @@ -304,6 +362,14 @@ <version>${shiroVersion}</version> </dependency> + <!-- Tests --> + <dependency> + <groupId>junit</groupId> + <artifactId>junit</artifactId> + <version>4.11</version> + <scope>test</scope> + </dependency> + </dependencies> </dependencyManagement> diff --git a/src/site/apt/index.apt b/src/site/apt/index.apt index 9f1038c..46303fa 100644 --- a/src/site/apt/index.apt +++ b/src/site/apt/index.apt @@ -1,9 +1,6 @@ ~~~ ~~ #%L -~~ Nuiton Web :: Nuiton Web -~~ -~~ $Id$ -~~ $HeadURL$ +~~ Nuiton Web ~~ %% ~~ Copyright (C) 2011 CodeLutin ~~ %% diff --git a/src/site/site.xml b/src/site/site.xml new file mode 100644 index 0000000..214ee2c --- /dev/null +++ b/src/site/site.xml @@ -0,0 +1,61 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + #%L + Nuiton Web + %% + Copyright (C) 2004 - 2010 CodeLutin + %% + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU Lesser 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 Lesser Public License for more details. + + You should have received a copy of the GNU General Lesser Public + License along with this program. If not, see + <http://www.gnu.org/licenses/lgpl-3.0.html>. + #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"> + + + <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> + + <body> + + <links> + <item name="Nuiton.org" href="https://forge.nuiton.org"/> + <item name="Code Lutin" href="https://www.codelutin.com"/> + <item name="Libre entreprise" href="http://www.libre-entreprise.org"/> + </links> + + <breadcrumbs> + <item name="${project.name}" href="${project.url}/index.html"/> + <item name="${project.version}" href="${project.url}/v/${siteDeployClassifier}/index.html"/> + </breadcrumbs> + + <menu ref="modules"/> + + <menu name="Utilisateur"> + <item name="Accueil" href="index.html"/> + </menu> + + <menu ref="reports"/> + + </body> +</project> diff --git a/src/site/site_fr.xml b/src/site/site_fr.xml deleted file mode 100644 index 2d4380d..0000000 --- a/src/site/site_fr.xml +++ /dev/null @@ -1,108 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- - #%L - Nuiton Utils - - $Id$ - $HeadURL$ - %% - Copyright (C) 2004 - 2010 CodeLutin - %% - This program is free software: you can redistribute it and/or modify - it under the terms of the GNU Lesser 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 Lesser Public License for more details. - - You should have received a copy of the GNU General Lesser Public - License along with this program. If not, see - <http://www.gnu.org/licenses/lgpl-3.0.html>. - #L% - --> - - -<project name="${project.name}"> - - <skin> - <groupId>org.apache.maven.skins</groupId> - <artifactId>maven-fluido-skin</artifactId> - <version>${fluidoSkinVersion}</version> - </skin> - - <custom> - <fluidoSkin> - <topBarEnabled>true</topBarEnabled> - <googleSearch/> - <sideBarEnabled>false</sideBarEnabled> - <searchEnabled>true</searchEnabled> - <sourceLineNumbersEnabled>true</sourceLineNumbersEnabled> - </fluidoSkin> - </custom> - - <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> - - <publishDate position="right" /> - <version position="right" /> - - <poweredBy> - <logo href="http://maven.apache.org" name="Maven" - img="${mavenpomSiteCommonResourcesUrl}/images/logos/maven-feather.png"/> - </poweredBy> - - <body> - - <links> - <item name="Nuiton.org" href="http://forge.nuiton.org"/> - <item name="Code Lutin" href="http://www.codelutin.com"/> - </links> - - <breadcrumbs> - <item name="${project.name}" - href="${project.url}/index.html"/> - <item name="${project.version}" - href="${project.url}/${siteDeployClassifier}/index.html"/> - </breadcrumbs> - - <menu ref="modules"/> - - <menu name="Utilisateur"> - <item name="Accueil" href="index.html"/> - </menu> - - <menu ref="reports"/> - - <footer> - - <script type="text/javascript" - src="${mavenpomSiteCommonResourcesUrl}/js/maven-site-nuiton.org.js"> - </script> - - <div id='projectMetas' - projectversion='${project.version}' - platform='${project.platform}' - projectid='${project.projectId}' - scm='${project.scm.connection}' - scmwebeditorenabled='${project.scmwebeditorEnabled}' - scmwebeditorurl='${project.scmwebeditorUrl}' - siteSourcesType='${project.siteSourcesType}' - piwikEnabled='${project.piwikEnabled}' - piwikId='${project.piwikId}' - scmwebeditor_skipDefaultFiles="true" - > - </div> - </footer> - - </body> -</project> -- To stop receiving notification emails like this one, please contact nuiton.org SCM administrator <admin+scm@nuiton.org>.