This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository nuiton-decorator. See http://git.nuiton.org/nuiton-decorator.git commit 4ad4fccdb328261edd216ff455926e57e7adafae Author: Tony CHEMIT <chemit@codelutin.com> Date: Sun Oct 26 09:50:03 2014 +0100 fixes #3543: Migrates to git --- .gitignore | 7 ++ pom.xml | 97 ++++++++---------- src/main/java/org/nuiton/decorator/Decorator.java | 2 - .../decorator/DecoratorMulti18nProvider.java | 2 - .../org/nuiton/decorator/DecoratorProvider.java | 2 - .../java/org/nuiton/decorator/DecoratorUtil.java | 2 - .../java/org/nuiton/decorator/JXPathDecorator.java | 2 - .../org/nuiton/decorator/MapPropertyHandler.java | 2 - .../org/nuiton/decorator/MultiJXPathDecorator.java | 2 - .../org/nuiton/decorator/PropertyDecorator.java | 2 - .../java/org/nuiton/decorator/package-info.java | 2 - src/site/apt/index.apt | 8 +- src/site/apt/versions.apt | 10 +- src/site/site.xml | 60 +++++++++++ src/site/site_fr.xml | 112 --------------------- src/test/java/org/nuiton/decorator/Data.java | 2 - .../decorator/DecoratorMulti18nProviderTest.java | 2 - .../nuiton/decorator/DecoratorProviderTest.java | 2 - .../org/nuiton/decorator/JXPathContextTester.java | 2 - .../org/nuiton/decorator/JXPathDecoratorTest.java | 2 - .../nuiton/decorator/MapPropertyHandlerTest.java | 2 - .../nuiton/decorator/MultiJXPathDecoratorTest.java | 2 - src/test/resources/log4j.properties | 5 +- 23 files changed, 117 insertions(+), 214 deletions(-) diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..340ab47 --- /dev/null +++ b/.gitignore @@ -0,0 +1,7 @@ +/target +/.idea +/*.ipr +/*.iml +/*.iws +/*~ +/*~ \ No newline at end of file diff --git a/pom.xml b/pom.xml index 8e407c9..67a2f84 100644 --- a/pom.xml +++ b/pom.xml @@ -1,11 +1,35 @@ <?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 Decorator + %% + Copyright (C) 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>4.7</version> + <artifactId>nuitonpom</artifactId> + <version>1.5</version> </parent> <artifactId>nuiton-decorator</artifactId> @@ -13,7 +37,7 @@ <name>Nuiton Decorator</name> <description>Simple Decorator API</description> - <url>http://maven-site.nuiton.org/nuiton-decorator</url> + <url>http://nuiton-decorator.nuiton.org</url> <inceptionYear>2013</inceptionYear> <developers> @@ -21,7 +45,7 @@ <developer> <name>Tony Chemit</name> <id>tchemit</id> - <email>chemit at codelutin dot com</email> + <email>chemit@codelutin.com</email> <organization>CodeLutin</organization> <organizationUrl>http://www.codelutin.com/</organizationUrl> <timezone>Europe/Paris</timezone> @@ -33,27 +57,26 @@ </developers> <scm> - <connection> - scm:svn:https://nuiton.org/svn/nuiton-decorator/trunk - </connection> - <developerConnection> - scm:svn:https://nuiton.org/svn/nuiton-decorator/trunk - </developerConnection> - <url>https://nuiton.org/projects/nuiton-decorator/repository/show/trunk</url> + <connection>scm:git:http://git.nuiton.org/nuiton-decorator.git</connection> + <developerConnection>scm:git:https://git.nuiton.org/nuiton-decorator.git</developerConnection> + <url>https://gitweb.nuiton.org/nuiton-decorator.git</url> </scm> + <distributionManagement> <site> - <id>${platform}</id> - <url>${our.site.repository}/${projectId}</url> + <id>${site.server}</id> + <url>${site.url}</url> </site> </distributionManagement> <properties> + <!-- redmine project Id --> <projectId>nuiton-decorator</projectId> <!-- Documentation is in apt format --> <siteSourcesType>apt</siteSourcesType> + <locales>fr</locales> <!-- extra files to include in release --> <redmine.releaseFiles>${redmine.libReleaseFiles}</redmine.releaseFiles> @@ -67,27 +90,32 @@ <dependency> <groupId>commons-jxpath</groupId> <artifactId>commons-jxpath</artifactId> + <version>1.3</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>junit</groupId> <artifactId>junit</artifactId> + <version>4.11</version> <scope>test</scope> </dependency> <dependency> <groupId>log4j</groupId> <artifactId>log4j</artifactId> + <version>1.2.17</version> <scope>provided</scope> </dependency> @@ -95,47 +123,6 @@ <profiles> - <profile> - <id>reporting</id> - <activation> - <property> - <name>performRelease</name> - <value>true</value> - </property> - </activation> - - <reporting> - <plugins> - - <plugin> - <artifactId>maven-project-info-reports-plugin</artifactId> - <version>${projectInfoReportsPluginVersion}</version> - <reportSets> - <reportSet> - <reports> - <report>project-team</report> - <report>mailing-list</report> - <report>cim</report> - <report>issue-tracking</report> - <report>license</report> - <report>scm</report> - <report>dependency-info</report> - <report>dependencies</report> - <report>dependency-convergence</report> - <report>plugin-management</report> - <report>plugins</report> - <report>dependency-management</report> - <report>summary</report> - </reports> - </reportSet> - </reportSets> - </plugin> - - </plugins> - </reporting> - - </profile> - <!-- create assemblies at release time --> <profile> <id>assembly-profile</id> diff --git a/src/main/java/org/nuiton/decorator/Decorator.java b/src/main/java/org/nuiton/decorator/Decorator.java index c53907a..510e161 100644 --- a/src/main/java/org/nuiton/decorator/Decorator.java +++ b/src/main/java/org/nuiton/decorator/Decorator.java @@ -1,8 +1,6 @@ /* * #%L * Nuiton Decorator - * $Id$ - * $HeadURL$ * %% * Copyright (C) 2004 - 2011 CodeLutin * %% diff --git a/src/main/java/org/nuiton/decorator/DecoratorMulti18nProvider.java b/src/main/java/org/nuiton/decorator/DecoratorMulti18nProvider.java index 8c6646d..57c018e 100644 --- a/src/main/java/org/nuiton/decorator/DecoratorMulti18nProvider.java +++ b/src/main/java/org/nuiton/decorator/DecoratorMulti18nProvider.java @@ -1,8 +1,6 @@ /* * #%L * Nuiton Decorator - * $Id$ - * $HeadURL$ * %% * Copyright (C) 2011 CodeLutin, Tony Chemit * %% diff --git a/src/main/java/org/nuiton/decorator/DecoratorProvider.java b/src/main/java/org/nuiton/decorator/DecoratorProvider.java index 98d2a48..29e1281 100644 --- a/src/main/java/org/nuiton/decorator/DecoratorProvider.java +++ b/src/main/java/org/nuiton/decorator/DecoratorProvider.java @@ -1,8 +1,6 @@ /* * #%L * Nuiton Decorator - * $Id$ - * $HeadURL$ * %% * Copyright (C) 2011 CodeLutin, Tony Chemit * %% diff --git a/src/main/java/org/nuiton/decorator/DecoratorUtil.java b/src/main/java/org/nuiton/decorator/DecoratorUtil.java index e78b3ba..5a3b19c 100644 --- a/src/main/java/org/nuiton/decorator/DecoratorUtil.java +++ b/src/main/java/org/nuiton/decorator/DecoratorUtil.java @@ -1,8 +1,6 @@ /* * #%L * Nuiton Decorator - * $Id$ - * $HeadURL$ * %% * Copyright (C) 2011 CodeLutin, Tony Chemit * %% diff --git a/src/main/java/org/nuiton/decorator/JXPathDecorator.java b/src/main/java/org/nuiton/decorator/JXPathDecorator.java index fca7e81..7f25c76 100644 --- a/src/main/java/org/nuiton/decorator/JXPathDecorator.java +++ b/src/main/java/org/nuiton/decorator/JXPathDecorator.java @@ -1,8 +1,6 @@ /* * #%L * Nuiton Decorator - * $Id$ - * $HeadURL$ * %% * Copyright (C) 2011 CodeLutin, Tony Chemit * %% diff --git a/src/main/java/org/nuiton/decorator/MapPropertyHandler.java b/src/main/java/org/nuiton/decorator/MapPropertyHandler.java index e4b016a..e757081 100644 --- a/src/main/java/org/nuiton/decorator/MapPropertyHandler.java +++ b/src/main/java/org/nuiton/decorator/MapPropertyHandler.java @@ -1,8 +1,6 @@ /* * #%L * Nuiton Decorator - * $Id$ - * $HeadURL$ * %% * Copyright (C) 2011 CodeLutin, Tony Chemit * %% diff --git a/src/main/java/org/nuiton/decorator/MultiJXPathDecorator.java b/src/main/java/org/nuiton/decorator/MultiJXPathDecorator.java index ccabfff..2962952 100644 --- a/src/main/java/org/nuiton/decorator/MultiJXPathDecorator.java +++ b/src/main/java/org/nuiton/decorator/MultiJXPathDecorator.java @@ -1,8 +1,6 @@ /* * #%L * Nuiton Decorator - * $Id$ - * $HeadURL$ * %% * Copyright (C) 2011 CodeLutin, Tony Chemit * %% diff --git a/src/main/java/org/nuiton/decorator/PropertyDecorator.java b/src/main/java/org/nuiton/decorator/PropertyDecorator.java index 384998e..35df3a1 100644 --- a/src/main/java/org/nuiton/decorator/PropertyDecorator.java +++ b/src/main/java/org/nuiton/decorator/PropertyDecorator.java @@ -1,8 +1,6 @@ /* * #%L * Nuiton Decorator - * $Id$ - * $HeadURL$ * %% * Copyright (C) 2011 CodeLutin, Tony Chemit * %% diff --git a/src/main/java/org/nuiton/decorator/package-info.java b/src/main/java/org/nuiton/decorator/package-info.java index 964392a..5bd3ff0 100644 --- a/src/main/java/org/nuiton/decorator/package-info.java +++ b/src/main/java/org/nuiton/decorator/package-info.java @@ -1,8 +1,6 @@ /* * #%L * Nuiton Decorator - * $Id$ - * $HeadURL$ * %% * Copyright (C) 2004 - 2011 CodeLutin * %% diff --git a/src/site/apt/index.apt b/src/site/apt/index.apt index 3b7665b..67fe67e 100644 --- a/src/site/apt/index.apt +++ b/src/site/apt/index.apt @@ -1,8 +1,6 @@ ~~~ ~~ #%L ~~ Nuiton Decorator -~~ $Id$ -~~ $HeadURL$ ~~ %% ~~ Copyright (C) 2004 - 2010 CodeLutin ~~ %% @@ -40,11 +38,11 @@ Note Voici quelques liens sur le nouveau projet: - * {{{http://svn.nuiton.org/svn/nuiton-decorator}svn}} + * {{{https://git.nuiton.org/nuiton-decorator}git}} - * {{{http://nuiton.org/projects/nuiton-decorator}forge}} + * {{{https://forge.nuiton.org/projects/nuiton-decorator}forge}} - * {{{http://maven-site.nuiton.org/nuiton-decorator}site}} + * {{{https://nuiton-decorator.nuiton.org}site}} [] diff --git a/src/site/apt/versions.apt b/src/site/apt/versions.apt index a8c1cda..279791d 100644 --- a/src/site/apt/versions.apt +++ b/src/site/apt/versions.apt @@ -1,8 +1,6 @@ ~~~ ~~ #%L -~~ Nuiton Config -~~ $Id$ -~~ $HeadURL$ +~~ Nuiton Decorator ~~ %% ~~ Copyright (C) 2013 CodeLutin ~~ %% @@ -10,12 +8,12 @@ ~~ 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>. @@ -31,4 +29,4 @@ Utilisation de la version 3.0 * Pour passer sur cette version, il faut changer les packages <org.nuiton.util.decorator> - en <org.nuiton.decorator>. \ No newline at end of file + en <org.nuiton.decorator>. diff --git a/src/site/site.xml b/src/site/site.xml new file mode 100644 index 0000000..7db14a1 --- /dev/null +++ b/src/site/site.xml @@ -0,0 +1,60 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + #%L + Nuiton Decorator + %% + 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}/${siteDeployClassifier}/index.html"/> + </breadcrumbs> + + <menu name="Utilisateur"> + <item name="Accueil" href="index.html"/> + <item name="Note de versions" href="versions.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 4d5c1a3..0000000 --- a/src/site/site_fr.xml +++ /dev/null @@ -1,112 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- - #%L - Nuiton Decorator - $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>false</topBarEnabled> - <googleSearch/> - <sideBarEnabled>true</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}/public/images/logos/maven-feather.png"/> - - </poweredBy> - - <body> - - <head> - <script type="text/javascript" - src="${mavenpomSiteCommonResourcesUrl}/public/js/mavenpom-site.js"> - </script> - - <link rel="stylesheet" type="text/css" - href="${mavenpomSiteCommonResourcesUrl}/public/css/mavenpom-site.css"/> - </head> - - <links> - <item name="Nuiton.org" href="http://nuiton.org"/> - <item name="Code Lutin" href="http://www.codelutin.com"/> - <item name="Libre entreprise" href="http://www.libre-entreprise.org"/> - </links> - - <breadcrumbs> - <item name="${project.name}" - href="${project.url}/index.html"/> - </breadcrumbs> - - <menu ref="modules"/> - - <menu name="Utilisateur"> - <item name="Accueil" href="index.html"/> - <item name="Note de versions" href="versions.html"/> - </menu> - - <menu ref="reports"/> - - <footer> - - <div id='projectMetas' locale='fr' - projectversion='${project.version}' - platform='${project.platform}' - projectid='${project.projectId}' - scm='${project.scm.developerConnection}' - 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/src/test/java/org/nuiton/decorator/Data.java b/src/test/java/org/nuiton/decorator/Data.java index 8acf33f..6da7d78 100644 --- a/src/test/java/org/nuiton/decorator/Data.java +++ b/src/test/java/org/nuiton/decorator/Data.java @@ -1,8 +1,6 @@ /* * #%L * Nuiton Decorator - * $Id$ - * $HeadURL$ * %% * Copyright (C) 2004 - 2011 CodeLutin, Tony Chemit * %% diff --git a/src/test/java/org/nuiton/decorator/DecoratorMulti18nProviderTest.java b/src/test/java/org/nuiton/decorator/DecoratorMulti18nProviderTest.java index a0a642d..6a37d95 100644 --- a/src/test/java/org/nuiton/decorator/DecoratorMulti18nProviderTest.java +++ b/src/test/java/org/nuiton/decorator/DecoratorMulti18nProviderTest.java @@ -1,8 +1,6 @@ /* * #%L * Nuiton Decorator - * $Id$ - * $HeadURL$ * %% * Copyright (C) 2011 CodeLutin, Tony Chemit * %% diff --git a/src/test/java/org/nuiton/decorator/DecoratorProviderTest.java b/src/test/java/org/nuiton/decorator/DecoratorProviderTest.java index 1352f60..d43db66 100644 --- a/src/test/java/org/nuiton/decorator/DecoratorProviderTest.java +++ b/src/test/java/org/nuiton/decorator/DecoratorProviderTest.java @@ -1,8 +1,6 @@ /* * #%L * Nuiton Decorator - * $Id$ - * $HeadURL$ * %% * Copyright (C) 2011 CodeLutin, Tony Chemit * %% diff --git a/src/test/java/org/nuiton/decorator/JXPathContextTester.java b/src/test/java/org/nuiton/decorator/JXPathContextTester.java index a814cc0..479e695 100644 --- a/src/test/java/org/nuiton/decorator/JXPathContextTester.java +++ b/src/test/java/org/nuiton/decorator/JXPathContextTester.java @@ -1,8 +1,6 @@ /* * #%L * Nuiton Decorator - * $Id$ - * $HeadURL$ * %% * Copyright (C) 2011 CodeLutin, Tony Chemit * %% diff --git a/src/test/java/org/nuiton/decorator/JXPathDecoratorTest.java b/src/test/java/org/nuiton/decorator/JXPathDecoratorTest.java index 6b8ca07..cd98cf9 100644 --- a/src/test/java/org/nuiton/decorator/JXPathDecoratorTest.java +++ b/src/test/java/org/nuiton/decorator/JXPathDecoratorTest.java @@ -1,8 +1,6 @@ /* * #%L * Nuiton Decorator - * $Id$ - * $HeadURL$ * %% * Copyright (C) 2011 CodeLutin, Tony Chemit * %% diff --git a/src/test/java/org/nuiton/decorator/MapPropertyHandlerTest.java b/src/test/java/org/nuiton/decorator/MapPropertyHandlerTest.java index 8592d3e..abfa491 100644 --- a/src/test/java/org/nuiton/decorator/MapPropertyHandlerTest.java +++ b/src/test/java/org/nuiton/decorator/MapPropertyHandlerTest.java @@ -1,8 +1,6 @@ /* * #%L * Nuiton Decorator - * $Id$ - * $HeadURL$ * %% * Copyright (C) 2011 CodeLutin, Tony Chemit * %% diff --git a/src/test/java/org/nuiton/decorator/MultiJXPathDecoratorTest.java b/src/test/java/org/nuiton/decorator/MultiJXPathDecoratorTest.java index e9a4d5f..ff952ed 100644 --- a/src/test/java/org/nuiton/decorator/MultiJXPathDecoratorTest.java +++ b/src/test/java/org/nuiton/decorator/MultiJXPathDecoratorTest.java @@ -1,8 +1,6 @@ /* * #%L * Nuiton Decorator - * $Id$ - * $HeadURL$ * %% * Copyright (C) 2011 CodeLutin, Tony Chemit * %% diff --git a/src/test/resources/log4j.properties b/src/test/resources/log4j.properties index dd8f192..6add5ea 100644 --- a/src/test/resources/log4j.properties +++ b/src/test/resources/log4j.properties @@ -1,9 +1,6 @@ ### # #%L -# Nuiton Utils -# -# $Id$ -# $HeadURL$ +# Nuiton Decorator # %% # Copyright (C) 2004 - 2011 CodeLutin, Chatellier Eric # %% -- To stop receiving notification emails like this one, please contact nuiton.org SCM administrator <admin+scm@nuiton.org>.