This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository processor. See http://git.nuiton.org/processor.git commit e7a5e2840a4c1ab45143db6bce0ed5e3f00c55d6 Author: Tony CHEMIT <chemit@codelutin.com> Date: Sun Oct 26 13:02:42 2014 +0100 fixes #3550: Migrates to git --- .gitignore | 12 ++ LICENSE.txt | 5 +- ant-processor-task/LICENSE.txt | 5 +- ant-processor-task/pom.xml | 13 +- .../src/license/THIRD-PARTY.properties | 14 -- .../org/nuiton/processor/ant/ProcessorTask.java | 3 - ant-processor-task/src/site/apt/index.apt | 3 - .../src/site/{site_fr.xml => site.xml} | 26 +-- nuiton-processor/LICENSE.txt | 5 +- nuiton-processor/pom.xml | 52 ++---- .../processor/GeneratorTemplatesProcessor.java | 3 - .../java/org/nuiton/processor/LogsProcessor.java | 3 - .../nuiton/processor/OptimisationProcessor.java | 3 - .../main/java/org/nuiton/processor/Processor.java | 3 - .../java/org/nuiton/processor/ProcessorReader.java | 3 - .../java/org/nuiton/processor/ProcessorUtil.java | 3 - .../java/org/nuiton/processor/ProcessorWriter.java | 3 - .../processor/filters/ActiveLogsCodeFilter.java | 3 - .../nuiton/processor/filters/DefaultFilter.java | 3 - .../java/org/nuiton/processor/filters/Filter.java | 3 - .../filters/GeneratorTemplatesFilter.java | 3 - .../filters/GeneratorTemplatesFilterBody.java | 3 - .../filters/GeneratorTemplatesFilterIn.java | 3 - .../org/nuiton/processor/filters/LogsFilter.java | 3 - .../nuiton/processor/filters/NoActionFilter.java | 3 - .../processor/filters/OptimisationFilter.java | 3 - .../processor/filters/RemoveLogsCodeFilter.java | 3 - nuiton-processor/src/site/apt/Todo.apt | 3 - nuiton-processor/src/site/apt/index.apt | 3 - .../src/site/{site_fr.xml => site.xml} | 26 +-- .../nuiton/processor/filters/StringFilterTest.java | 3 - .../src/test/resources/log4j.properties | 3 - pom.xml | 194 ++++++++++----------- processor-maven-plugin/LICENSE.txt | 5 +- processor-maven-plugin/pom.xml | 31 +--- .../src/site/{site_fr.xml => site.xml} | 23 +-- src/site/apt/index.apt | 3 - src/site/site.xml | 56 ++++++ src/site/site_fr.xml | 92 ---------- 39 files changed, 206 insertions(+), 425 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/LICENSE.txt b/LICENSE.txt index 3f7b8b1..cca7fc2 100644 --- a/LICENSE.txt +++ b/LICENSE.txt @@ -10,7 +10,7 @@ the terms and conditions of version 3 of the GNU General Public License, supplemented by the additional permissions listed below. - 0. Additional Definitions. + 0. Additional Definitions. As used herein, "this License" refers to version 3 of the GNU Lesser General Public License, and the "GNU GPL" refers to version 3 of the GNU @@ -111,7 +111,7 @@ the following: a copy of the Library already present on the user's computer system, and (b) will operate properly with a modified version of the Library that is interface-compatible with the Linked - Version. + Version. e) Provide Installation Information, but only if you would otherwise be required to provide such information under section 6 of the @@ -163,4 +163,3 @@ whether future versions of the GNU Lesser General Public License shall apply, that proxy's public statement of acceptance of any version is permanent authorization for you to choose that version for the Library. - diff --git a/ant-processor-task/LICENSE.txt b/ant-processor-task/LICENSE.txt index 3f7b8b1..cca7fc2 100644 --- a/ant-processor-task/LICENSE.txt +++ b/ant-processor-task/LICENSE.txt @@ -10,7 +10,7 @@ the terms and conditions of version 3 of the GNU General Public License, supplemented by the additional permissions listed below. - 0. Additional Definitions. + 0. Additional Definitions. As used herein, "this License" refers to version 3 of the GNU Lesser General Public License, and the "GNU GPL" refers to version 3 of the GNU @@ -111,7 +111,7 @@ the following: a copy of the Library already present on the user's computer system, and (b) will operate properly with a modified version of the Library that is interface-compatible with the Linked - Version. + Version. e) Provide Installation Information, but only if you would otherwise be required to provide such information under section 6 of the @@ -163,4 +163,3 @@ whether future versions of the GNU Lesser General Public License shall apply, that proxy's public statement of acceptance of any version is permanent authorization for you to choose that version for the Library. - diff --git a/ant-processor-task/pom.xml b/ant-processor-task/pom.xml index 3f46506..e8f3a25 100644 --- a/ant-processor-task/pom.xml +++ b/ant-processor-task/pom.xml @@ -2,9 +2,6 @@ <!-- #%L Nuiton Processor :: Ant task - - $Id$ - $HeadURL$ %% Copyright (C) 2009 - 2010 CodeLutin %% @@ -24,8 +21,8 @@ #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"> - +<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> @@ -37,6 +34,9 @@ <groupId>org.nuiton.processor</groupId> <artifactId>ant-processor-task</artifactId> + <name>Nuiton Processor :: Ant task</name> + <inceptionYear>2009</inceptionYear> + <dependencies> <dependency> @@ -63,7 +63,4 @@ </dependencies> - <name>Nuiton Processor :: Ant task</name> - <inceptionYear>2009</inceptionYear> - </project> diff --git a/ant-processor-task/src/license/THIRD-PARTY.properties b/ant-processor-task/src/license/THIRD-PARTY.properties deleted file mode 100644 index 1ae0d7f..0000000 --- a/ant-processor-task/src/license/THIRD-PARTY.properties +++ /dev/null @@ -1,14 +0,0 @@ -# Generated by org.nuiton.license.plugin.AddThirdPartyMojo -#------------------------------------------------------------------------------- -# Already used licenses in project : -# - BSD License -# - Common Public License Version 1.0 -# - Lesser General Public License (LGPL) v 3.0 -# - The Apache Software License, Version 2.0 -#------------------------------------------------------------------------------- -# Please fill the missing licenses for dependencies : -# -# -#Fri Nov 19 12:31:48 CET 2010 -org.apache.ant--ant--1.8.0--jar=The Apache Software License, Version 2.0 -org.apache.ant--ant-launcher--1.8.0--jar=The Apache Software License, Version 2.0 diff --git a/ant-processor-task/src/main/java/org/nuiton/processor/ant/ProcessorTask.java b/ant-processor-task/src/main/java/org/nuiton/processor/ant/ProcessorTask.java index c0360a6..5375dce 100644 --- a/ant-processor-task/src/main/java/org/nuiton/processor/ant/ProcessorTask.java +++ b/ant-processor-task/src/main/java/org/nuiton/processor/ant/ProcessorTask.java @@ -1,9 +1,6 @@ /* * #%L * Nuiton Processor :: Ant task - * - * $Id$ - * $HeadURL$ * %% * Copyright (C) 2009 - 2010 CodeLutin * %% diff --git a/ant-processor-task/src/site/apt/index.apt b/ant-processor-task/src/site/apt/index.apt index b0cb9b6..cd2ad0c 100644 --- a/ant-processor-task/src/site/apt/index.apt +++ b/ant-processor-task/src/site/apt/index.apt @@ -1,9 +1,6 @@ ~~~ ~~ #%L ~~ Nuiton Processor :: Ant task -~~ ~~ -~~ $Id$ -~~ $HeadURL$ ~~ %% ~~ Copyright (C) 2009 - 2010 CodeLutin ~~ %% diff --git a/ant-processor-task/src/site/site_fr.xml b/ant-processor-task/src/site/site.xml similarity index 70% rename from ant-processor-task/src/site/site_fr.xml rename to ant-processor-task/src/site/site.xml index bea4526..be18c4e 100644 --- a/ant-processor-task/src/site/site_fr.xml +++ b/ant-processor-task/src/site/site.xml @@ -2,9 +2,6 @@ <!-- #%L Nuiton Processor :: Ant task - - $Id$ - $HeadURL$ %% Copyright (C) 2009 - 2010 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"> <body> @@ -52,24 +51,5 @@ <menu ref="reports"/> - <footer> - - <script type="text/javascript" - src="http://maven-site.nuiton.org/public/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}'> - </div> - </footer> - </body> </project> diff --git a/nuiton-processor/LICENSE.txt b/nuiton-processor/LICENSE.txt index 3f7b8b1..cca7fc2 100644 --- a/nuiton-processor/LICENSE.txt +++ b/nuiton-processor/LICENSE.txt @@ -10,7 +10,7 @@ the terms and conditions of version 3 of the GNU General Public License, supplemented by the additional permissions listed below. - 0. Additional Definitions. + 0. Additional Definitions. As used herein, "this License" refers to version 3 of the GNU Lesser General Public License, and the "GNU GPL" refers to version 3 of the GNU @@ -111,7 +111,7 @@ the following: a copy of the Library already present on the user's computer system, and (b) will operate properly with a modified version of the Library that is interface-compatible with the Linked - Version. + Version. e) Provide Installation Information, but only if you would otherwise be required to provide such information under section 6 of the @@ -163,4 +163,3 @@ whether future versions of the GNU Lesser General Public License shall apply, that proxy's public statement of acceptance of any version is permanent authorization for you to choose that version for the Library. - diff --git a/nuiton-processor/pom.xml b/nuiton-processor/pom.xml index 4491111..05452b5 100644 --- a/nuiton-processor/pom.xml +++ b/nuiton-processor/pom.xml @@ -2,9 +2,6 @@ <!-- #%L Nuiton Processor :: Api - - $Id$ - $HeadURL$ %% Copyright (C) 2002 - 2010 CodeLutin %% @@ -24,14 +21,10 @@ #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"> - +<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> - <!-- ************************************************************* --> - <!-- *** POM Relationships *************************************** --> - <!-- ************************************************************* --> - <parent> <groupId>org.nuiton</groupId> <artifactId>processor</artifactId> @@ -41,6 +34,18 @@ <groupId>org.nuiton.processor</groupId> <artifactId>nuiton-processor</artifactId> + <name>Nuiton Processor :: Api</name> + <description> + Cette librairie permet la création de filtre sur les fichiers sources. + </description> + <inceptionYear>2002</inceptionYear> + + <properties> + <!-- extra files to include in release --> + <redmine.releaseFiles>${redmine.libReleaseFiles}</redmine.releaseFiles> + + </properties> + <dependencies> <dependency> @@ -66,32 +71,7 @@ </dependency> </dependencies> - <!-- ************************************************************* --> - <!-- *** Project Information ************************************* --> - <!-- ************************************************************* --> - - <name>Nuiton Processor :: Api</name> - <description> - Cette librairie permet la création de filtre sur les fichiers sources. - </description> - <inceptionYear>2002</inceptionYear> - - <!-- ************************************************************* --> - <!-- *** Build Settings ****************************************** --> - <!-- ************************************************************* --> - - <properties> - <!-- extra files to include in release --> - <redmine.releaseFiles>${redmine.libReleaseFiles}</redmine.releaseFiles> - - </properties> - - <!-- ************************************************************* --> - <!-- *** Build Environment ************************************** --> - <!-- ************************************************************* --> - <build> - <testResources> <testResource> <directory>src/test/resources</directory> @@ -102,8 +82,7 @@ </testResource> </testResources> </build> - - <!-- perform only on a release stage when using the maven-release-plugin --> +<!-- perform only on a release stage when using the maven-release-plugin --> <profiles> <profile> <id>release-profile</id> @@ -139,5 +118,4 @@ </build> </profile> </profiles> - </project> diff --git a/nuiton-processor/src/main/java/org/nuiton/processor/GeneratorTemplatesProcessor.java b/nuiton-processor/src/main/java/org/nuiton/processor/GeneratorTemplatesProcessor.java index b0b66a1..9d35c7e 100644 --- a/nuiton-processor/src/main/java/org/nuiton/processor/GeneratorTemplatesProcessor.java +++ b/nuiton-processor/src/main/java/org/nuiton/processor/GeneratorTemplatesProcessor.java @@ -1,9 +1,6 @@ /* * #%L * Nuiton Processor :: Api - * - * $Id$ - * $HeadURL$ * %% * Copyright (C) 2002 - 2010 CodeLutin * %% diff --git a/nuiton-processor/src/main/java/org/nuiton/processor/LogsProcessor.java b/nuiton-processor/src/main/java/org/nuiton/processor/LogsProcessor.java index ef25da0..730c2e7 100644 --- a/nuiton-processor/src/main/java/org/nuiton/processor/LogsProcessor.java +++ b/nuiton-processor/src/main/java/org/nuiton/processor/LogsProcessor.java @@ -1,9 +1,6 @@ /* * #%L * Nuiton Processor :: Api - * - * $Id$ - * $HeadURL$ * %% * Copyright (C) 2002 - 2010 CodeLutin * %% diff --git a/nuiton-processor/src/main/java/org/nuiton/processor/OptimisationProcessor.java b/nuiton-processor/src/main/java/org/nuiton/processor/OptimisationProcessor.java index 05b3364..2695407 100644 --- a/nuiton-processor/src/main/java/org/nuiton/processor/OptimisationProcessor.java +++ b/nuiton-processor/src/main/java/org/nuiton/processor/OptimisationProcessor.java @@ -1,9 +1,6 @@ /* * #%L * Nuiton Processor :: Api - * - * $Id$ - * $HeadURL$ * %% * Copyright (C) 2002 - 2010 CodeLutin * %% diff --git a/nuiton-processor/src/main/java/org/nuiton/processor/Processor.java b/nuiton-processor/src/main/java/org/nuiton/processor/Processor.java index 6b86df2..c2e0eda 100644 --- a/nuiton-processor/src/main/java/org/nuiton/processor/Processor.java +++ b/nuiton-processor/src/main/java/org/nuiton/processor/Processor.java @@ -1,9 +1,6 @@ /* * #%L * Nuiton Processor :: Api - * - * $Id$ - * $HeadURL$ * %% * Copyright (C) 2002 - 2010 CodeLutin * %% diff --git a/nuiton-processor/src/main/java/org/nuiton/processor/ProcessorReader.java b/nuiton-processor/src/main/java/org/nuiton/processor/ProcessorReader.java index 91e5d51..97d2191 100644 --- a/nuiton-processor/src/main/java/org/nuiton/processor/ProcessorReader.java +++ b/nuiton-processor/src/main/java/org/nuiton/processor/ProcessorReader.java @@ -1,9 +1,6 @@ /* * #%L * Nuiton Processor :: Api - * - * $Id$ - * $HeadURL$ * %% * Copyright (C) 2002 - 2010 CodeLutin * %% diff --git a/nuiton-processor/src/main/java/org/nuiton/processor/ProcessorUtil.java b/nuiton-processor/src/main/java/org/nuiton/processor/ProcessorUtil.java index 5e8753a..8957da5 100644 --- a/nuiton-processor/src/main/java/org/nuiton/processor/ProcessorUtil.java +++ b/nuiton-processor/src/main/java/org/nuiton/processor/ProcessorUtil.java @@ -1,9 +1,6 @@ /* * #%L * Nuiton Processor :: Api - * - * $Id$ - * $HeadURL$ * %% * Copyright (C) 2002 - 2010 CodeLutin * %% diff --git a/nuiton-processor/src/main/java/org/nuiton/processor/ProcessorWriter.java b/nuiton-processor/src/main/java/org/nuiton/processor/ProcessorWriter.java index 66335d9..e6186d2 100644 --- a/nuiton-processor/src/main/java/org/nuiton/processor/ProcessorWriter.java +++ b/nuiton-processor/src/main/java/org/nuiton/processor/ProcessorWriter.java @@ -1,9 +1,6 @@ /* * #%L * Nuiton Processor :: Api - * - * $Id$ - * $HeadURL$ * %% * Copyright (C) 2002 - 2010 CodeLutin * %% diff --git a/nuiton-processor/src/main/java/org/nuiton/processor/filters/ActiveLogsCodeFilter.java b/nuiton-processor/src/main/java/org/nuiton/processor/filters/ActiveLogsCodeFilter.java index a82efbb..4cde016 100644 --- a/nuiton-processor/src/main/java/org/nuiton/processor/filters/ActiveLogsCodeFilter.java +++ b/nuiton-processor/src/main/java/org/nuiton/processor/filters/ActiveLogsCodeFilter.java @@ -1,9 +1,6 @@ /* * #%L * Nuiton Processor :: Api - * - * $Id$ - * $HeadURL$ * %% * Copyright (C) 2002 - 2010 CodeLutin * %% diff --git a/nuiton-processor/src/main/java/org/nuiton/processor/filters/DefaultFilter.java b/nuiton-processor/src/main/java/org/nuiton/processor/filters/DefaultFilter.java index 0d86ac6..6dd2c07 100644 --- a/nuiton-processor/src/main/java/org/nuiton/processor/filters/DefaultFilter.java +++ b/nuiton-processor/src/main/java/org/nuiton/processor/filters/DefaultFilter.java @@ -1,9 +1,6 @@ /* * #%L * Nuiton Processor :: Api - * - * $Id$ - * $HeadURL$ * %% * Copyright (C) 2002 - 2010 CodeLutin * %% diff --git a/nuiton-processor/src/main/java/org/nuiton/processor/filters/Filter.java b/nuiton-processor/src/main/java/org/nuiton/processor/filters/Filter.java index 1265d27..0ed775d 100644 --- a/nuiton-processor/src/main/java/org/nuiton/processor/filters/Filter.java +++ b/nuiton-processor/src/main/java/org/nuiton/processor/filters/Filter.java @@ -1,9 +1,6 @@ /* * #%L * Nuiton Processor :: Api - * - * $Id$ - * $HeadURL$ * %% * Copyright (C) 2002 - 2010 CodeLutin * %% diff --git a/nuiton-processor/src/main/java/org/nuiton/processor/filters/GeneratorTemplatesFilter.java b/nuiton-processor/src/main/java/org/nuiton/processor/filters/GeneratorTemplatesFilter.java index 80182af..4eff6a0 100644 --- a/nuiton-processor/src/main/java/org/nuiton/processor/filters/GeneratorTemplatesFilter.java +++ b/nuiton-processor/src/main/java/org/nuiton/processor/filters/GeneratorTemplatesFilter.java @@ -1,9 +1,6 @@ /* * #%L * Nuiton Processor :: Api - * - * $Id$ - * $HeadURL$ * %% * Copyright (C) 2002 - 2010 CodeLutin * %% diff --git a/nuiton-processor/src/main/java/org/nuiton/processor/filters/GeneratorTemplatesFilterBody.java b/nuiton-processor/src/main/java/org/nuiton/processor/filters/GeneratorTemplatesFilterBody.java index 7b87fd1..8a4313f 100644 --- a/nuiton-processor/src/main/java/org/nuiton/processor/filters/GeneratorTemplatesFilterBody.java +++ b/nuiton-processor/src/main/java/org/nuiton/processor/filters/GeneratorTemplatesFilterBody.java @@ -1,9 +1,6 @@ /* * #%L * Nuiton Processor :: Api - * - * $Id$ - * $HeadURL$ * %% * Copyright (C) 2002 - 2010 CodeLutin * %% diff --git a/nuiton-processor/src/main/java/org/nuiton/processor/filters/GeneratorTemplatesFilterIn.java b/nuiton-processor/src/main/java/org/nuiton/processor/filters/GeneratorTemplatesFilterIn.java index ddacb5c..37bc6e5 100644 --- a/nuiton-processor/src/main/java/org/nuiton/processor/filters/GeneratorTemplatesFilterIn.java +++ b/nuiton-processor/src/main/java/org/nuiton/processor/filters/GeneratorTemplatesFilterIn.java @@ -1,9 +1,6 @@ /* * #%L * Nuiton Processor :: Api - * - * $Id$ - * $HeadURL$ * %% * Copyright (C) 2002 - 2010 CodeLutin * %% diff --git a/nuiton-processor/src/main/java/org/nuiton/processor/filters/LogsFilter.java b/nuiton-processor/src/main/java/org/nuiton/processor/filters/LogsFilter.java index de57800..d22221c 100644 --- a/nuiton-processor/src/main/java/org/nuiton/processor/filters/LogsFilter.java +++ b/nuiton-processor/src/main/java/org/nuiton/processor/filters/LogsFilter.java @@ -1,9 +1,6 @@ /* * #%L * Nuiton Processor :: Api - * - * $Id$ - * $HeadURL$ * %% * Copyright (C) 2002 - 2010 CodeLutin * %% diff --git a/nuiton-processor/src/main/java/org/nuiton/processor/filters/NoActionFilter.java b/nuiton-processor/src/main/java/org/nuiton/processor/filters/NoActionFilter.java index 58c0897..4038781 100644 --- a/nuiton-processor/src/main/java/org/nuiton/processor/filters/NoActionFilter.java +++ b/nuiton-processor/src/main/java/org/nuiton/processor/filters/NoActionFilter.java @@ -1,9 +1,6 @@ /* * #%L * Nuiton Processor :: Api - * - * $Id$ - * $HeadURL$ * %% * Copyright (C) 2002 - 2010 CodeLutin * %% diff --git a/nuiton-processor/src/main/java/org/nuiton/processor/filters/OptimisationFilter.java b/nuiton-processor/src/main/java/org/nuiton/processor/filters/OptimisationFilter.java index 72e92c0..68e3f5f 100644 --- a/nuiton-processor/src/main/java/org/nuiton/processor/filters/OptimisationFilter.java +++ b/nuiton-processor/src/main/java/org/nuiton/processor/filters/OptimisationFilter.java @@ -1,9 +1,6 @@ /* * #%L * Nuiton Processor :: Api - * - * $Id$ - * $HeadURL$ * %% * Copyright (C) 2002 - 2010 CodeLutin * %% diff --git a/nuiton-processor/src/main/java/org/nuiton/processor/filters/RemoveLogsCodeFilter.java b/nuiton-processor/src/main/java/org/nuiton/processor/filters/RemoveLogsCodeFilter.java index 8d77c05..bea12a4 100644 --- a/nuiton-processor/src/main/java/org/nuiton/processor/filters/RemoveLogsCodeFilter.java +++ b/nuiton-processor/src/main/java/org/nuiton/processor/filters/RemoveLogsCodeFilter.java @@ -1,9 +1,6 @@ /* * #%L * Nuiton Processor :: Api - * - * $Id$ - * $HeadURL$ * %% * Copyright (C) 2002 - 2010 CodeLutin * %% diff --git a/nuiton-processor/src/site/apt/Todo.apt b/nuiton-processor/src/site/apt/Todo.apt index a290a5c..ceb459f 100644 --- a/nuiton-processor/src/site/apt/Todo.apt +++ b/nuiton-processor/src/site/apt/Todo.apt @@ -1,9 +1,6 @@ ~~~ ~~ #%L ~~ Nuiton Processor :: Api -~~ ~~ -~~ $Id$ -~~ $HeadURL$ ~~ %% ~~ Copyright (C) 2002 - 2010 CodeLutin ~~ %% diff --git a/nuiton-processor/src/site/apt/index.apt b/nuiton-processor/src/site/apt/index.apt old mode 100755 new mode 100644 index fe0f566..c6e3d36 --- a/nuiton-processor/src/site/apt/index.apt +++ b/nuiton-processor/src/site/apt/index.apt @@ -1,9 +1,6 @@ ~~~ ~~ #%L ~~ Nuiton Processor :: Api -~~ ~~ -~~ $Id$ -~~ $HeadURL$ ~~ %% ~~ Copyright (C) 2002 - 2010 CodeLutin ~~ %% diff --git a/nuiton-processor/src/site/site_fr.xml b/nuiton-processor/src/site/site.xml similarity index 71% rename from nuiton-processor/src/site/site_fr.xml rename to nuiton-processor/src/site/site.xml index 8085c69..3ab5d88 100644 --- a/nuiton-processor/src/site/site_fr.xml +++ b/nuiton-processor/src/site/site.xml @@ -2,9 +2,6 @@ <!-- #%L Nuiton Processor :: Api - - $Id$ - $HeadURL$ %% Copyright (C) 2002 - 2010 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"> <body> @@ -57,24 +56,5 @@ <menu ref="reports"/> - <footer> - - <script type="text/javascript" - src="http://maven-site.nuiton.org/public/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}'> - </div> - </footer> - </body> </project> diff --git a/nuiton-processor/src/test/java/org/nuiton/processor/filters/StringFilterTest.java b/nuiton-processor/src/test/java/org/nuiton/processor/filters/StringFilterTest.java index 7a7bb67..172a22c 100644 --- a/nuiton-processor/src/test/java/org/nuiton/processor/filters/StringFilterTest.java +++ b/nuiton-processor/src/test/java/org/nuiton/processor/filters/StringFilterTest.java @@ -1,9 +1,6 @@ /* * #%L * Nuiton Processor :: Api - * - * $Id$ - * $HeadURL$ * %% * Copyright (C) 2002 - 2010 CodeLutin * %% diff --git a/nuiton-processor/src/test/resources/log4j.properties b/nuiton-processor/src/test/resources/log4j.properties index f9ad9fe..b6a7d5f 100644 --- a/nuiton-processor/src/test/resources/log4j.properties +++ b/nuiton-processor/src/test/resources/log4j.properties @@ -1,9 +1,6 @@ ### # #%L # Nuiton Processor :: Api -# -# $Id$ -# $HeadURL$ # %% # Copyright (C) 2002 - 2010 CodeLutin # %% diff --git a/pom.xml b/pom.xml index 6884ace..a5a07d8 100644 --- a/pom.xml +++ b/pom.xml @@ -2,11 +2,8 @@ <!-- #%L Nuiton Processor - - $Id$ - $HeadURL$ %% - Copyright (C) 2004 - 2010 CodeLutin + Copyright (C) 2004 - 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 @@ -23,21 +20,51 @@ <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"> - +<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> - <!-- ************************************************************* --> - <!-- *** POM Relationships *************************************** --> - <!-- ************************************************************* --> <parent> <groupId>org.nuiton</groupId> - <artifactId>mavenpom4redmineAndCentral</artifactId> - <version>3.4.7</version> + <artifactId>nuitonpom</artifactId> + <version>1.5</version> </parent> <artifactId>processor</artifactId> <version>1.4-SNAPSHOT</version> + <packaging>pom</packaging> + + <name>Nuiton Processor</name> + <description>Efficient Universal Processor</description> + <url>http://processor.nuiton.org</url> + <inceptionYear>2004</inceptionYear> + + <developers> + <developer> + <name>Benjamin Poussin</name> + <id>bpoussin</id> + <email>poussin@codelutin.com</email> + <organization>CodeLutin</organization> + <organizationUrl>http://codelutin.com</organizationUrl> + <timezone>Europe/Paris</timezone> + <roles> + <role>developer</role> + </roles> + </developer> + + <developer> + <name>Tony Chemit</name> + <id>tchemit</id> + <email>chemit@codelutin.com</email> + <organization>CodeLutin</organization> + <organizationUrl>http://codelutin.com</organizationUrl> + <timezone>Europe/Paris</timezone> + <roles> + <role>developer</role> + </roles> + </developer> + + </developers> <modules> <module>nuiton-processor</module> @@ -45,10 +72,53 @@ <module>ant-processor-task</module> </modules> + <scm> + <connection>scm:git:http://git.nuiton.org/processor.git</connection> + <developerConnection>scm:git:https://git.nuiton.org/processor.git</developerConnection> + <url>https://gitweb.nuiton.org/processor.git</url> + </scm> + + <distributionManagement> + <site> + <id>${site.server}</id> + <url>${site.url}</url> + </site> + </distributionManagement> + + <properties> + + <!-- redmine project Id --> + <projectId>processor</projectId> + + <!-- locales for site generation --> + <locales>fr</locales> + + <mavenVersion>2.2.1</mavenVersion> + <antVersion>1.8.3</antVersion> + + <!-- Stay on jdk5 (requirement for some other project using this + library) --> + <maven.compiler.source>1.5</maven.compiler.source> + <maven.compiler.target>1.5</maven.compiler.target> + + </properties> + <dependencyManagement> <dependencies> <dependency> + <groupId>commons-logging</groupId> + <artifactId>commons-logging</artifactId> + <version>1.2</version> + </dependency> + + <dependency> + <groupId>commons-lang</groupId> + <artifactId>commons-lang</artifactId> + <version>2.6</version> + </dependency> + + <dependency> <groupId>org.nuiton</groupId> <artifactId>helper-maven-plugin-api</artifactId> <version>${helperPluginVersion}</version> @@ -125,96 +195,20 @@ <scope>provided</scope> </dependency> - </dependencies> - </dependencyManagement> - - <!-- ************************************************************* --> - <!-- *** Project Information ************************************* --> - <!-- ************************************************************* --> - <name>Nuiton Processor</name> - <description>Efficient Universal Processor</description> - <inceptionYear>2004</inceptionYear> - <url>http://maven-site.nuiton.org/processor</url> - - <!-- ************************************************************* --> - <!-- *** Build Settings ****************************************** --> - <!-- ************************************************************* --> - - <packaging>pom</packaging> - - <properties> - <!-- pour un multi module on doit fixer le projectId --> - <projectId>processor</projectId> - - <!-- Stay on jdk5 (requirement for some other project using this - library) --> - <maven.compiler.source>1.5</maven.compiler.source> - <maven.compiler.target>1.5</maven.compiler.target> - - </properties> - - <!-- ************************************************************* --> - <!-- *** Build Environment ************************************** --> - <!-- ************************************************************* --> - - <!-- Source control management. --> - <scm> + <dependency> + <groupId>junit</groupId> + <artifactId>junit</artifactId> + <version>4.11</version> + <scope>test</scope> + </dependency> - <connection>scm:svn:http://svn.nuiton.org/svn/processor/trunk</connection> - <developerConnection> - scm:svn:http://svn.nuiton.org/svn/processor/trunk - </developerConnection> - <url>http://www.nuiton.org/projects/processor/repository/show/trunk</url> - </scm> + <dependency> + <groupId>log4j</groupId> + <artifactId>log4j</artifactId> + <version>1.2.17</version> + </dependency> - <distributionManagement> - <site> - <id>${platform}</id> - <url>${our.site.repository}/${projectId}</url> - </site> - </distributionManagement> + </dependencies> + </dependencyManagement> - <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>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> - - </profiles> </project> diff --git a/processor-maven-plugin/LICENSE.txt b/processor-maven-plugin/LICENSE.txt index 3f7b8b1..cca7fc2 100644 --- a/processor-maven-plugin/LICENSE.txt +++ b/processor-maven-plugin/LICENSE.txt @@ -10,7 +10,7 @@ the terms and conditions of version 3 of the GNU General Public License, supplemented by the additional permissions listed below. - 0. Additional Definitions. + 0. Additional Definitions. As used herein, "this License" refers to version 3 of the GNU Lesser General Public License, and the "GNU GPL" refers to version 3 of the GNU @@ -111,7 +111,7 @@ the following: a copy of the Library already present on the user's computer system, and (b) will operate properly with a modified version of the Library that is interface-compatible with the Linked - Version. + Version. e) Provide Installation Information, but only if you would otherwise be required to provide such information under section 6 of the @@ -163,4 +163,3 @@ whether future versions of the GNU Lesser General Public License shall apply, that proxy's public statement of acceptance of any version is permanent authorization for you to choose that version for the Library. - diff --git a/processor-maven-plugin/pom.xml b/processor-maven-plugin/pom.xml index d1ab1ff..840e07f 100644 --- a/processor-maven-plugin/pom.xml +++ b/processor-maven-plugin/pom.xml @@ -2,9 +2,6 @@ <!-- #%L Nuiton Processor :: Maven plugin - - $Id$ - $HeadURL$ %% Copyright (C) 2006 - 2010 CodeLutin %% @@ -24,14 +21,10 @@ #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"> - +<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> - <!-- ************************************************************* --> - <!-- *** POM Relationships *************************************** --> - <!-- ************************************************************* --> - <parent> <groupId>org.nuiton</groupId> <artifactId>processor</artifactId> @@ -40,6 +33,10 @@ <groupId>org.nuiton.processor</groupId> <artifactId>processor-maven-plugin</artifactId> + <packaging>maven-plugin</packaging> + + <name>Nuiton Processor :: Maven plugin</name> + <inceptionYear>2006</inceptionYear> <dependencies> @@ -91,20 +88,7 @@ </dependencies> - <!-- ************************************************************* --> - <!-- *** Project Information ************************************* --> - <!-- ************************************************************* --> - <name>Nuiton Processor :: Maven plugin</name> - <inceptionYear>2006</inceptionYear> - - <!-- ************************************************************* --> - <!-- *** Build Settings ****************************************** --> - <!-- ************************************************************* --> - - <packaging>maven-plugin</packaging> - <build> - <pluginManagement> <plugins> @@ -125,8 +109,8 @@ </plugins> </pluginManagement> - </build> + <profiles> <!-- perform only on a release stage when using the maven-release-plugin --> @@ -153,5 +137,4 @@ </profile> </profiles> - </project> diff --git a/processor-maven-plugin/src/site/site_fr.xml b/processor-maven-plugin/src/site/site.xml similarity index 73% rename from processor-maven-plugin/src/site/site_fr.xml rename to processor-maven-plugin/src/site/site.xml index 30da3c9..a05802c 100644 --- a/processor-maven-plugin/src/site/site_fr.xml +++ b/processor-maven-plugin/src/site/site.xml @@ -24,7 +24,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"> <body> @@ -56,24 +58,5 @@ <menu ref="reports"/> - <footer> - - <script type="text/javascript" - src="http://maven-site.nuiton.org/public/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}'> - </div> - </footer> - </body> </project> diff --git a/src/site/apt/index.apt b/src/site/apt/index.apt index c395c92..26ed213 100644 --- a/src/site/apt/index.apt +++ b/src/site/apt/index.apt @@ -1,9 +1,6 @@ ~~~ ~~ #%L ~~ Nuiton Processor -~~ ~~ -~~ $Id$ -~~ $HeadURL$ ~~ %% ~~ Copyright (C) 2004 - 2010 CodeLutin ~~ %% diff --git a/src/site/site.xml b/src/site/site.xml new file mode 100644 index 0000000..628f3ad --- /dev/null +++ b/src/site/site.xml @@ -0,0 +1,56 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + #%L + Nuiton Processor + %% + 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 ref="reports"/> + + </body> +</project> diff --git a/src/site/site_fr.xml b/src/site/site_fr.xml deleted file mode 100644 index 61c394d..0000000 --- a/src/site/site_fr.xml +++ /dev/null @@ -1,92 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- - #%L - Nuiton Processor - - $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>1.2.1</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="${project.url}/images/logos/maven-feather.png"/> - </poweredBy> - - <body> - - <breadcrumbs> - <item name="${project.name}" href="${project.url}/index.html"/> - </breadcrumbs> - - <menu ref="modules"/> - - <menu ref="reports"/> - - <footer> - - <script type="text/javascript" - src="http://maven-site.nuiton.org/public/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}'> - </div> - </footer> - </body> -</project> -- To stop receiving notification emails like this one, please contact nuiton.org SCM administrator <admin+scm@nuiton.org>.