[Nuiton-config-commits] [nuiton-config] 01/01: fixes #3542: Migrates to git

This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository nuiton-config. See http://git.nuiton.org/nuiton-config.git commit 1f81c08e19a7da71f5a16c497c6f09936fd29b12 Author: Tony CHEMIT <chemit@codelutin.com> Date: Sun Oct 26 09:33:33 2014 +0100 fixes #3542: Migrates to git --- .gitignore | 7 ++ pom.xml | 74 ++++---------- .../java/org/nuiton/config/ApplicationConfig.java | 2 - .../org/nuiton/config/ApplicationConfigHelper.java | 2 - .../nuiton/config/ApplicationConfigProvider.java | 2 - .../config/ApplicationConfigSaveException.java | 2 - .../nuiton/config/ArgumentsParserException.java | 2 - .../java/org/nuiton/config/ConfigActionDef.java | 2 - .../java/org/nuiton/config/ConfigOptionDef.java | 2 - src/site/apt/index.apt | 2 - src/site/apt/versions.apt | 8 +- src/site/site.xml | 60 +++++++++++ src/site/site_fr.xml | 112 --------------------- .../org/nuiton/config/ApplicationConfigTest.java | 2 - src/test/resources/log4j.properties | 2 - src/test/resources/wao.properties | 2 +- 16 files changed, 91 insertions(+), 192 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 ebab1d5..70c3a9c 100644 --- a/pom.xml +++ b/pom.xml @@ -1,11 +1,12 @@ <?xml version="1.0" encoding="UTF-8"?> -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> <modelVersion>4.0.0</modelVersion> <parent> <groupId>org.nuiton</groupId> - <artifactId>mavenpom4redmineAndCentral</artifactId> - <version>5.1</version> + <artifactId>nuitonpom</artifactId> + <version>1.5</version> </parent> <artifactId>nuiton-config</artifactId> @@ -13,7 +14,7 @@ <name>Nuiton Config</name> <description>Simple Application config API</description> - <url>https://doc.nuiton.org/nuiton-config</url> + <url>https://nuiton-config.nuiton.org</url> <inceptionYear>2013</inceptionYear> <developers> @@ -45,27 +46,26 @@ </developers> <scm> - <connection> - scm:svn:https://svn.nuiton.org/nuiton-config/trunk - </connection> - <developerConnection> - scm:svn:https://svn.nuiton.org/nuiton-config/trunk - </developerConnection> - <url>https://forge.nuiton.org/projects/nuiton-config/repository/show/trunk</url> + <connection>scm:git:http://git.nuiton.org/nuiton-config.git</connection> + <developerConnection>scm:git:https://git.nuiton.org/nuiton-config.git</developerConnection> + <url>https://gitweb.nuiton.org/nuiton-config.git</url> </scm> + <distributionManagement> <site> - <id>${siteDeployId}</id> - <url>${siteDeployUrl}</url> + <id>${site.server}</id> + <url>${site.url}</url> </site> </distributionManagement> <properties> + <!-- redmine project Id --> <projectId>nuiton-config</projectId> <!-- Documentation is in apt format --> <siteSourcesType>apt</siteSourcesType> + <locales>fr</locales> <!-- extra files to include in release --> <redmine.releaseFiles>${redmine.libReleaseFiles}</redmine.releaseFiles> @@ -91,37 +91,44 @@ <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>org.apache.commons</groupId> <artifactId>commons-collections4</artifactId> + <version>4.0</version> </dependency> <dependency> <groupId>commons-io</groupId> <artifactId>commons-io</artifactId> + <version>2.4</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> @@ -129,47 +136,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/config/ApplicationConfig.java b/src/main/java/org/nuiton/config/ApplicationConfig.java index dc498ef..31c31d7 100644 --- a/src/main/java/org/nuiton/config/ApplicationConfig.java +++ b/src/main/java/org/nuiton/config/ApplicationConfig.java @@ -3,8 +3,6 @@ package org.nuiton.config; /* * #%L * Nuiton Config - * $Id$ - * $HeadURL$ * %% * Copyright (C) 2011 - 2013 CodeLutin, Tony Chemit * %% diff --git a/src/main/java/org/nuiton/config/ApplicationConfigHelper.java b/src/main/java/org/nuiton/config/ApplicationConfigHelper.java index a75499a..bbdd6c4 100644 --- a/src/main/java/org/nuiton/config/ApplicationConfigHelper.java +++ b/src/main/java/org/nuiton/config/ApplicationConfigHelper.java @@ -3,8 +3,6 @@ package org.nuiton.config; /* * #%L * Nuiton Config - * $Id$ - * $HeadURL$ * %% * Copyright (C) 2011 - 2013 CodeLutin * %% diff --git a/src/main/java/org/nuiton/config/ApplicationConfigProvider.java b/src/main/java/org/nuiton/config/ApplicationConfigProvider.java index 23d0200..e9f3100 100644 --- a/src/main/java/org/nuiton/config/ApplicationConfigProvider.java +++ b/src/main/java/org/nuiton/config/ApplicationConfigProvider.java @@ -3,8 +3,6 @@ package org.nuiton.config; /* * #%L * Nuiton Config - * $Id$ - * $HeadURL$ * %% * Copyright (C) 2011 - 2013 CodeLutin * %% diff --git a/src/main/java/org/nuiton/config/ApplicationConfigSaveException.java b/src/main/java/org/nuiton/config/ApplicationConfigSaveException.java index 035e24c..0cf9e07 100644 --- a/src/main/java/org/nuiton/config/ApplicationConfigSaveException.java +++ b/src/main/java/org/nuiton/config/ApplicationConfigSaveException.java @@ -3,8 +3,6 @@ package org.nuiton.config; /* * #%L * Nuiton Config - * $Id$ - * $HeadURL$ * %% * Copyright (C) 2013 CodeLutin * %% diff --git a/src/main/java/org/nuiton/config/ArgumentsParserException.java b/src/main/java/org/nuiton/config/ArgumentsParserException.java index fb3ed45..e547c7f 100644 --- a/src/main/java/org/nuiton/config/ArgumentsParserException.java +++ b/src/main/java/org/nuiton/config/ArgumentsParserException.java @@ -3,8 +3,6 @@ package org.nuiton.config; /* * #%L * Nuiton Config - * $Id$ - * $HeadURL$ * %% * Copyright (C) 2011 - 2013 CodeLutin * %% diff --git a/src/main/java/org/nuiton/config/ConfigActionDef.java b/src/main/java/org/nuiton/config/ConfigActionDef.java index f734b20..5148ea5 100644 --- a/src/main/java/org/nuiton/config/ConfigActionDef.java +++ b/src/main/java/org/nuiton/config/ConfigActionDef.java @@ -3,8 +3,6 @@ package org.nuiton.config; /* * #%L * Nuiton Config - * $Id$ - * $HeadURL$ * %% * Copyright (C) 2011 - 2013 CodeLutin * %% diff --git a/src/main/java/org/nuiton/config/ConfigOptionDef.java b/src/main/java/org/nuiton/config/ConfigOptionDef.java index e6165ae..92a3e44 100644 --- a/src/main/java/org/nuiton/config/ConfigOptionDef.java +++ b/src/main/java/org/nuiton/config/ConfigOptionDef.java @@ -3,8 +3,6 @@ package org.nuiton.config; /* * #%L * Nuiton Config - * $Id$ - * $HeadURL$ * %% * Copyright (C) 2011 - 2013 CodeLutin * %% diff --git a/src/site/apt/index.apt b/src/site/apt/index.apt index c67f290..499c47a 100644 --- a/src/site/apt/index.apt +++ b/src/site/apt/index.apt @@ -1,8 +1,6 @@ ~~~ ~~ #%L ~~ Nuiton Config -~~ $Id$ -~~ $HeadURL$ ~~ %% ~~ Copyright (C) 2013 CodeLutin ~~ %% diff --git a/src/site/apt/versions.apt b/src/site/apt/versions.apt index b58bcdf..647d2f8 100644 --- a/src/site/apt/versions.apt +++ b/src/site/apt/versions.apt @@ -1,8 +1,6 @@ ~~~ ~~ #%L ~~ Nuiton Config -~~ $Id$ -~~ $HeadURL$ ~~ %% ~~ 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.config> - en <org.nuiton.config>. \ No newline at end of file + en <org.nuiton.config>. diff --git a/src/site/site.xml b/src/site/site.xml new file mode 100644 index 0000000..6baee14 --- /dev/null +++ b/src/site/site.xml @@ -0,0 +1,60 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + #%L + Nuiton Config + %% + Copyright (C) 2013 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 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 2c1dfd5..0000000 --- a/src/site/site_fr.xml +++ /dev/null @@ -1,112 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- - #%L - Nuiton Config - $Id$ - $HeadURL$ - %% - Copyright (C) 2013 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}/images/logos/maven-feather.png"/> - - </poweredBy> - - <body> - - <head> - <script type="text/javascript" - src="${mavenpomSiteCommonResourcesUrl}/js/mavenpom-site.js"> - </script> - - <link rel="stylesheet" type="text/css" - href="${mavenpomSiteCommonResourcesUrl}/css/mavenpom-site.css"/> - </head> - - <links> - <item name="Nuiton.org" href="http://forge.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"/> - <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"/> - - <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/config/ApplicationConfigTest.java b/src/test/java/org/nuiton/config/ApplicationConfigTest.java index 6b95bbc..3cc211d 100644 --- a/src/test/java/org/nuiton/config/ApplicationConfigTest.java +++ b/src/test/java/org/nuiton/config/ApplicationConfigTest.java @@ -3,8 +3,6 @@ package org.nuiton.config; /* * #%L * Nuiton Config - * $Id$ - * $HeadURL$ * %% * Copyright (C) 2011 - 2013 CodeLutin, Tony Chemit * %% diff --git a/src/test/resources/log4j.properties b/src/test/resources/log4j.properties index c6b513a..b16bd4c 100644 --- a/src/test/resources/log4j.properties +++ b/src/test/resources/log4j.properties @@ -1,8 +1,6 @@ ### # #%L # Nuiton Config -# $Id$ -# $HeadURL$ # %% # Copyright (C) 2011 - 2013 CodeLutin, Tony Chemit # %% diff --git a/src/test/resources/wao.properties b/src/test/resources/wao.properties index e47e547..1a46923 100644 --- a/src/test/resources/wao.properties +++ b/src/test/resources/wao.properties @@ -19,4 +19,4 @@ # <http://www.gnu.org/licenses/lgpl-3.0.html>. # #L% ### -wao.instanceUrl=http://localhost:9090/wao \ No newline at end of file +wao.instanceUrl=http://localhost:9090/wao -- To stop receiving notification emails like this one, please contact nuiton.org SCM administrator <admin+scm@nuiton.org>.