August 2008 - Mavenpom-commits - mailman.cloud.codelutin.com

[Lutinbuilder-commits] r122 - trunk/lutinproject
by tchemit＠users.labs.libre-entreprise.org 18 Aug '08

18 Aug '08

Author: tchemit Date: 2008-08-18 19:40:39 +0000 (Mon, 18 Aug 2008) New Revision: 122 Added: trunk/lutinproject/LICENSE.txt trunk/lutinproject/THIRD-PARTY.txt Modified: trunk/lutinproject/pom.xml Log: ajout dans le cycle de build du plugin license-switcher ajout des fichiers de licence et third-party (mais pas dans le classpaht car il n'y en a pas!) Added: trunk/lutinproject/LICENSE.txt =================================================================== --- trunk/lutinproject/LICENSE.txt (rev 0) +++ trunk/lutinproject/LICENSE.txt 2008-08-18 19:40:39 UTC (rev 122) @@ -0,0 +1,166 @@ + GNU LESSER GENERAL PUBLIC LICENSE + Version 3, 29 June 2007 + + Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/> + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + + + This version of the GNU Lesser General Public License incorporates +the terms and conditions of version 3 of the GNU General Public +License, supplemented by the additional permissions listed below. + + 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 +General Public License. + + "The Library" refers to a covered work governed by this License, +other than an Application or a Combined Work as defined below. + + An "Application" is any work that makes use of an interface provided +by the Library, but which is not otherwise based on the Library. +Defining a subclass of a class defined by the Library is deemed a mode +of using an interface provided by the Library. + + A "Combined Work" is a work produced by combining or linking an +Application with the Library. The particular version of the Library +with which the Combined Work was made is also called the "Linked +Version". + + The "Minimal Corresponding Source" for a Combined Work means the +Corresponding Source for the Combined Work, excluding any source code +for portions of the Combined Work that, considered in isolation, are +based on the Application, and not on the Linked Version. + + The "Corresponding Application Code" for a Combined Work means the +object code and/or source code for the Application, including any data +and utility programs needed for reproducing the Combined Work from the +Application, but excluding the System Libraries of the Combined Work. + + 1. Exception to Section 3 of the GNU GPL. + + You may convey a covered work under sections 3 and 4 of this License +without being bound by section 3 of the GNU GPL. + + 2. Conveying Modified Versions. + + If you modify a copy of the Library, and, in your modifications, a +facility refers to a function or data to be supplied by an Application +that uses the facility (other than as an argument passed when the +facility is invoked), then you may convey a copy of the modified +version: + + a) under this License, provided that you make a good faith effort to + ensure that, in the event an Application does not supply the + function or data, the facility still operates, and performs + whatever part of its purpose remains meaningful, or + + b) under the GNU GPL, with none of the additional permissions of + this License applicable to that copy. + + 3. Object Code Incorporating Material from Library Header Files. + + The object code form of an Application may incorporate material from +a header file that is part of the Library. You may convey such object +code under terms of your choice, provided that, if the incorporated +material is not limited to numerical parameters, data structure +layouts and accessors, or small macros, inline functions and templates +(ten or fewer lines in length), you do both of the following: + + a) Give prominent notice with each copy of the object code that the + Library is used in it and that the Library and its use are + covered by this License. + + b) Accompany the object code with a copy of the GNU GPL and this license + document. + + 4. Combined Works. + + You may convey a Combined Work under terms of your choice that, +taken together, effectively do not restrict modification of the +portions of the Library contained in the Combined Work and reverse +engineering for debugging such modifications, if you also do each of +the following: + + a) Give prominent notice with each copy of the Combined Work that + the Library is used in it and that the Library and its use are + covered by this License. + + b) Accompany the Combined Work with a copy of the GNU GPL and this license + document. + + c) For a Combined Work that displays copyright notices during + execution, include the copyright notice for the Library among + these notices, as well as a reference directing the user to the + copies of the GNU GPL and this license document. + + d) Do one of the following: + + 0) Convey the Minimal Corresponding Source under the terms of this + License, and the Corresponding Application Code in a form + suitable for, and under terms that permit, the user to + recombine or relink the Application with a modified version of + the Linked Version to produce a modified Combined Work, in the + manner specified by section 6 of the GNU GPL for conveying + Corresponding Source. + + 1) Use a suitable shared library mechanism for linking with the + Library. A suitable mechanism is one that (a) uses at run time + 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. + + e) Provide Installation Information, but only if you would otherwise + be required to provide such information under section 6 of the + GNU GPL, and only to the extent that such information is + necessary to install and execute a modified version of the + Combined Work produced by recombining or relinking the + Application with a modified version of the Linked Version. (If + you use option 4d0, the Installation Information must accompany + the Minimal Corresponding Source and Corresponding Application + Code. If you use option 4d1, you must provide the Installation + Information in the manner specified by section 6 of the GNU GPL + for conveying Corresponding Source.) + + 5. Combined Libraries. + + You may place library facilities that are a work based on the +Library side by side in a single library together with other library +facilities that are not Applications and are not covered by this +License, and convey such a combined library under terms of your +choice, if you do both of the following: + + a) Accompany the combined library with a copy of the same work based + on the Library, uncombined with any other library facilities, + conveyed under the terms of this License. + + b) Give prominent notice with the combined library that part of it + is a work based on the Library, and explaining where to find the + accompanying uncombined form of the same work. + + 6. Revised Versions of the GNU Lesser General Public License. + + The Free Software Foundation may publish revised and/or new versions +of the GNU Lesser General Public License from time to time. Such new +versions will be similar in spirit to the present version, but may +differ in detail to address new problems or concerns. + + Each version is given a distinguishing version number. If the +Library as you received it specifies that a certain numbered version +of the GNU Lesser General Public License "or any later version" +applies to it, you have the option of following the terms and +conditions either of that published version or of any later version +published by the Free Software Foundation. If the Library as you +received it does not specify a version number of the GNU Lesser +General Public License, you may choose any version of the GNU Lesser +General Public License ever published by the Free Software Foundation. + + If the Library as you received it specifies that a proxy can decide +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. + Added: trunk/lutinproject/THIRD-PARTY.txt =================================================================== --- trunk/lutinproject/THIRD-PARTY.txt (rev 0) +++ trunk/lutinproject/THIRD-PARTY.txt 2008-08-18 19:40:39 UTC (rev 122) @@ -0,0 +1,7 @@ +List of third-party dependencies grouped by their license type. + +Common Public License Version 1.0 : + * JUnit (junit:junit:3.8.1 - http://junit.org) + +The Apache Software License, Version 2.0 : + * Commons Logging (commons-logging:commons-logging:1.1.1 - http://commons.apache.org/logging) \ No newline at end of file Modified: trunk/lutinproject/pom.xml =================================================================== --- trunk/lutinproject/pom.xml 2008-08-15 19:11:28 UTC (rev 121) +++ trunk/lutinproject/pom.xml 2008-08-18 19:40:39 UTC (rev 122) @@ -347,6 +347,24 @@ </configuration> </plugin> +  +  +  + +  + <plugin> + <groupId>org.codelutin.plugin</groupId> + <artifactId>maven-license-switcher-plugin</artifactId> + <version>0.1</version> + <executions> + <execution> + <goals> + <goal>license</goal> + </goals> + </execution> + </executions> + </plugin> +    @@ -533,6 +551,12 @@ <artifactId>maven-source-plugin</artifactId> </plugin> +  + <plugin> + <groupId>org.codelutin.plugin</groupId> + <artifactId>maven-license-switcher-plugin</artifactId> + </plugin> +  <plugin> <artifactId>maven-antrun-plugin</artifactId>

1 0

[Lutinbuilder-commits] r121 - trunk/lutinproject
by tchemit＠users.labs.libre-entreprise.org 15 Aug '08

15 Aug '08

Author: tchemit Date: 2008-08-15 19:11:28 +0000 (Fri, 15 Aug 2008) New Revision: 121 Modified: trunk/lutinproject/pom.xml Log: pour le moment utilisation maven-i18n-plugin:0.4-SNAPSHOT Modified: trunk/lutinproject/pom.xml =================================================================== --- trunk/lutinproject/pom.xml 2008-08-15 14:48:51 UTC (rev 120) +++ trunk/lutinproject/pom.xml 2008-08-15 19:11:28 UTC (rev 121) @@ -305,7 +305,7 @@ <plugin> <groupId>lutinplugin</groupId> <artifactId>maven-i18n-plugin</artifactId> - <version>0.4</version> + <version>0.4-SNAPSHOT</version> <configuration> <bundles> <param>fr_FR</param>

1 0

[Lutinbuilder-commits] r120 - trunk/lutinproject
by tchemit＠users.labs.libre-entreprise.org 15 Aug '08

15 Aug '08

Author: tchemit Date: 2008-08-15 14:48:51 +0000 (Fri, 15 Aug 2008) New Revision: 120 Modified: trunk/lutinproject/pom.xml Log: ajout variable kabs.project.url Modified: trunk/lutinproject/pom.xml =================================================================== --- trunk/lutinproject/pom.xml 2008-08-13 10:53:58 UTC (rev 119) +++ trunk/lutinproject/pom.xml 2008-08-15 14:48:51 UTC (rev 120) @@ -62,7 +62,7 @@ <description>Projet Maven de reference pour l'ensemble des autres projets Maven.</description>  - <url>http://${labs.host}/projects</url> + <url>${labs.project.url}</url> <inceptionYear>1999</inceptionYear> @@ -177,11 +177,15 @@ <properties>  -  + <labs.id>11</labs.id>  - <labs.project>${pom.artifactId}</labs.project> + <labs.project>lutinbuilder</labs.project> +  + <labs.project.url>http://${labs.host}/projects/${labs.project}</labs.project.url> + +  <maven.scm.url>https://${labs.host}/plugins/scmsvn/viewcvs.php/trunk/${labs.project}?root=${labs.project} </maven.scm.url>

1 0

[Lutinbuilder-commits] r119 - trunk/lutinproject
by tchemit＠users.labs.libre-entreprise.org 13 Aug '08

13 Aug '08

Author: tchemit Date: 2008-08-13 10:53:58 +0000 (Wed, 13 Aug 2008) New Revision: 119 Modified: trunk/lutinproject/pom.xml Log: pas de report pour les plugins a ce niveau (on doit ajouter le report dans les vrai plugin maven) Modified: trunk/lutinproject/pom.xml =================================================================== --- trunk/lutinproject/pom.xml 2008-08-13 01:06:37 UTC (rev 118) +++ trunk/lutinproject/pom.xml 2008-08-13 10:53:58 UTC (rev 119) @@ -566,10 +566,10 @@ <reporting> <plugins>  - <plugin> +

1 0

[Lutinbuilder-commits] r118 - trunk/lutinproject
by tchemit＠users.labs.libre-entreprise.org 13 Aug '08

13 Aug '08

Author: tchemit Date: 2008-08-13 01:06:37 +0000 (Wed, 13 Aug 2008) New Revision: 118 Modified: trunk/lutinproject/pom.xml Log: clean pom + remove plugin goals (will be done via report) Modified: trunk/lutinproject/pom.xml =================================================================== --- trunk/lutinproject/pom.xml 2008-08-12 22:55:31 UTC (rev 117) +++ trunk/lutinproject/pom.xml 2008-08-13 01:06:37 UTC (rev 118) @@ -510,13 +510,6 @@ <goal>helpmojo</goal> </goals> </execution> - <execution> - <id>report</id> - <phase>pre-site</phase> - <goals> - <goal>report</goal> - </goals> - </execution> </executions> </plugin> @@ -540,23 +533,6 @@ <plugin> <artifactId>maven-antrun-plugin</artifactId> <executions> -  -   <execution> <id>CopySiteFiles</id> @@ -590,21 +566,18 @@ <reporting> <plugins>  -  + <artifactId>maven-plugin-plugin</artifactId> + </plugin> +  <plugin>  <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-project-info-reports-plugin</artifactId> <version>2.1</version>  - </plugin> <plugin> @@ -689,30 +662,30 @@ <mailingLists> <mailingList> <name>${pom.artifactId}-commits</name> - <subscribe>http://${labs.list.host}/mailman/listinfo/${pom.artifactId}-commits</subscribe> - <unsubscribe>http://${labs.list.host}/mailman/listinfo/${pom.artifactId}-commits</unsubscribe> - <archive>http://${labs.list.host}/pipermail/${pom.artifactId}-commits/</archive> + <subscribe>http://${labs.list.host}/mailman/listinfo/${labs.project}-commits</subscribe> + <unsubscribe>http://${labs.list.host}/mailman/listinfo/${labs.project}-commits</unsubscribe> + <archive>http://${labs.list.host}/pipermail/${labs.project}-commits/</archive> </mailingList> <mailingList> <name>${pom.artifactId}-devel</name> - <subscribe>http://${labs.list.host}/mailman/listinfo/${pom.artifactId}-devel</subscribe> - <unsubscribe>http://${labs.list.host}/mailman/listinfo/${pom.artifactId}-devel</unsubscribe> - <archive>http://${labs.list.host}/pipermail/${pom.artifactId}-devel/</archive> + <subscribe>http://${labs.list.host}/mailman/listinfo/${labs.project}-devel</subscribe> + <unsubscribe>http://${labs.list.host}/mailman/listinfo/${labs.project}-devel</unsubscribe> + <archive>http://${labs.list.host}/pipermail/${labs.project}-devel/</archive> </mailingList> <mailingList> <name>${pom.artifactId}-user</name> - <subscribe>http://${labs.list.host}/mailman/listinfo/${pom.artifactId}-user</subscribe> - <unsubscribe>http://${labs.list.host}/mailman/listinfo/${pom.artifactId}-user</unsubscribe> - <archive>http://${labs.list.host}/pipermail/${pom.artifactId}-user/</archive> + <subscribe>http://${labs.list.host}/mailman/listinfo/${labs.project}-user</subscribe> + <unsubscribe>http://${labs.list.host}/mailman/listinfo/${labs.project}-user</unsubscribe> + <archive>http://${labs.list.host}/pipermail/${labs.project}-user/</archive> </mailingList>  </mailingLists>

1 0

[Lutinbuilder-commits] r117 - trunk/lutinproject
by tchemit＠users.labs.libre-entreprise.org 12 Aug '08

12 Aug '08

Author: tchemit Date: 2008-08-12 22:55:31 +0000 (Tue, 12 Aug 2008) New Revision: 117 Modified: trunk/lutinproject/pom.xml Log: improve site phase and fix some small errors Modified: trunk/lutinproject/pom.xml =================================================================== --- trunk/lutinproject/pom.xml 2008-08-12 15:04:36 UTC (rev 116) +++ trunk/lutinproject/pom.xml 2008-08-12 22:55:31 UTC (rev 117) @@ -61,7 +61,8 @@ <description>Projet Maven de reference pour l'ensemble des autres projets Maven.</description> - <url>http://${labs.host}/projects/${pom.artifactId}</url> +  + <url>http://${labs.host}/projects</url> <inceptionYear>1999</inceptionYear> @@ -175,36 +176,35 @@  <properties> -  +   -  +  <labs.project>${pom.artifactId}</labs.project>  -  + <maven.scm.url>https://${labs.host}/plugins/scmsvn/viewcvs.php/trunk/${labs.project}?root=${labs.project} + </maven.scm.url> -  -  +  + <maven.scm.developerConnection>scm:svn:svn+ssh://${username}@${labs.host}/svnroot/${labs.project}/trunk + </maven.scm.developerConnection> -  -  +  + <maven.scm.connection>scm:svn:svn://anonymous@${labs.host}/svnroot/${labs.project}/trunk</maven.scm.connection>  <labs.host>labs.libre-entreprise.org</labs.host>  - <labs.list.host>list.labs.libre-entreprise.org</labs.list.host> + <labs.list.host>lists.labs.libre-entreprise.org</labs.list.host>  - <labs.builder.host>lutinbuilder.labs.libre-entreprise.org</labs.builder.host> + <labs.builder.url>http://lutinbuilder.labs.libre-entreprise.org/maven2</labs.builder.url>  <maven.verbose>false</maven.verbose> -  -  -  <maven.compile.source>1.6</maven.compile.source> @@ -223,6 +223,8 @@  <maven.site.gen.dir>${basedir}/target/generated-site</maven.site.gen.dir> +  + <maven.test.testFailureIgnore>false</maven.test.testFailureIgnore> </properties> <packaging>pom</packaging> @@ -267,24 +269,20 @@ </resource> </resources> -  - + <testSourceDirectory>${maven.src.dir}/test/java</testSourceDirectory> <pluginManagement> <plugins> -  +  +  +  + +   -  - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-resources-plugin</artifactId> - <configuration> - <encoding>${maven.compile.encoding}</encoding> - </configuration> - </plugin> +  +  +  -  +  <plugin> <groupId>lutinplugin</groupId> <artifactId>maven-i18n-plugin</artifactId> @@ -322,9 +315,26 @@ </configuration> </plugin> -  +  +  +  + +  <plugin> <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-resources-plugin</artifactId> + <configuration> + <encoding>${maven.compile.encoding}</encoding> + </configuration> + </plugin> + +  +  +  + +  + <plugin> + <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-compiler-plugin</artifactId> <configuration> <source>${maven.compile.source}</source> @@ -333,12 +343,18 @@ </configuration> </plugin> -  +  +  +  + +  <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-surefire-plugin</artifactId> <configuration> <skip>${maven.test.skip}</skip> + <testFailureIgnore>${maven.test.testFailureIgnore}</testFailureIgnore> + <forkMode>never</forkMode>   +  +  +  + +  <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-dependency-plugin</artifactId> @@ -368,7 +388,7 @@ </executions> </plugin> -  +  <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-war-plugin</artifactId> @@ -378,7 +398,7 @@ </configuration> </plugin> -  +  <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-jar-plugin</artifactId> @@ -394,7 +414,11 @@ </configuration> </plugin> -  +  +  +  + +  <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-source-plugin</artifactId> @@ -408,7 +432,7 @@ </executions> </plugin> -  +  <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-javadoc-plugin</artifactId> @@ -426,22 +450,26 @@ </executions> </plugin> -  +  +  +  + +  <plugin> <groupId>lutinplugin</groupId> <artifactId>maven-jrst-plugin</artifactId> <version>0.8</version> <configuration> <directoryIn>${maven.src.dir}/site</directoryIn> - <directoryOut>${maven.gen.site.dir}/xdoc</directoryOut> + <directoryOut>${maven.site.gen.dir}</directoryOut> <verbose>${maven.verbose}</verbose> <defaultLocale>fr</defaultLocale> + <inputEncoding>${maven.compile.encoding}</inputEncoding> + <outputEncoding>${maven.compile.encoding}</outputEncoding> </configuration> <executions> <execution> - <id>jrst</id> - <phase>test</phase> -  + <phase>pre-site</phase> <goals> <goal>jrst</goal> </goals> @@ -449,7 +477,11 @@ </executions> </plugin> -  +  +  +  + +  <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-site-plugin</artifactId> @@ -459,13 +491,14 @@ <configuration> <siteDirectory>${maven.site.gen.dir}</siteDirectory> <xdocDirectory>${maven.site.gen.dir}/xdoc/fr/rst</xdocDirectory> + <inputEncoding>${maven.compile.encoding}</inputEncoding> <outputEncoding>${maven.compile.encoding}</outputEncoding> <generateReports>${maven.reports.generate}</generateReports> <locales>fr</locales> </configuration> </plugin> -  +  <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-plugin-plugin</artifactId> @@ -491,12 +524,13 @@ </pluginManagement> <plugins> - -  + <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-javadoc-plugin</artifactId> - </plugin--> + </plugin> +  <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-source-plugin</artifactId> @@ -556,12 +590,11 @@ <reporting> <plugins>  -   @@ -569,7 +602,9 @@ <plugin>  <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-project-info-reports-plugin</artifactId> - <version>2.0.1-cl</version> + <version>2.1</version> +  + </plugin> <plugin> @@ -594,6 +629,24 @@ </plugin> <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-checkstyle-plugin</artifactId> + </plugin> + + + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-pmd-plugin</artifactId> + <configuration> + <linkXref>true</linkXref> + <sourceEncoding>${maven.compile.encoding}</sourceEncoding> + <minimumTokens>100</minimumTokens> + <targetJdk>${maven.compile.target}</targetJdk> + </configuration> + + </plugin> + + <plugin> <groupId>org.codehaus.mojo</groupId> <artifactId>jxr-maven-plugin</artifactId> </plugin> @@ -625,7 +678,7 @@ <issueManagement> <system>gforge</system> - <url>http://${labs.host}/tracker/?group_id=${labs.id}/</url> + <url>http://${labs.host}/tracker/?group_id=${labs.id}</url> </issueManagement>  <mailingLists> <mailingList> - <name>${pom.artifactId}-commit</name> - <subscribe>http://${labs.list.host}/mailman/listinfo/${pom.artifactId}-commit</subscribe> - <unsubscribe>http://${labs.list.host}/mailman/listinfo/${pom.artifactId}-commit</unsubscribe> - <archive>http://${labs.list.host}/pipermail/${pom.artifactId}-commit/</archive> + <name>${pom.artifactId}-commits</name> + <subscribe>http://${labs.list.host}/mailman/listinfo/${pom.artifactId}-commits</subscribe> + <unsubscribe>http://${labs.list.host}/mailman/listinfo/${pom.artifactId}-commits</unsubscribe> + <archive>http://${labs.list.host}/pipermail/${pom.artifactId}-commits/</archive> </mailingList> <mailingList> @@ -655,46 +708,25 @@ <archive>http://${labs.list.host}/pipermail/${pom.artifactId}-user/</archive> </mailingList> - <mailingList> +  </mailingLists>  -  -  - <scm> -  +  <connection>${maven.scm.connection}</connection> -  + +  <developerConnection>${maven.scm.developerConnection}</developerConnection> -  - <url>${maven.scm.url}</url> + +  +  </scm>  @@ -713,7 +745,7 @@ <repository> <id>codelutin-repository</id> <name>CodeLutinRepository</name> - <url>http://lutinbuilder.labs.libre-entreprise.org/maven2</url> + <url>${labs.builder.url}</url> </repository> </repositories> @@ -747,7 +779,6 @@ <activeByDefault>true</activeByDefault> </activation> <properties> -  <maven.test.skip>true</maven.test.skip> <maven.reports.generate>false</maven.reports.generate> </properties> @@ -758,7 +789,6 @@ <activeByDefault>false</activeByDefault> </activation> <properties> -  <maven.test.skip>false</maven.test.skip> <maven.reports.generate>false</maven.reports.generate> </properties> @@ -769,8 +799,7 @@ <activeByDefault>false</activeByDefault> </activation> <properties> -  - <maven.test.skip>true</maven.test.skip> + <maven.test.skip>false</maven.test.skip> <maven.reports.generate>true</maven.reports.generate> </properties> </profile>

1 0

[Lutinbuilder-commits] r116 - trunk/lutinproject
by tchemit＠users.labs.libre-entreprise.org 12 Aug '08

12 Aug '08

Author: tchemit Date: 2008-08-12 15:04:36 +0000 (Tue, 12 Aug 2008) New Revision: 116 Modified: trunk/lutinproject/pom.xml Log: create src/site directory if not defined Modified: trunk/lutinproject/pom.xml =================================================================== --- trunk/lutinproject/pom.xml 2008-08-12 14:03:55 UTC (rev 115) +++ trunk/lutinproject/pom.xml 2008-08-12 15:04:36 UTC (rev 116) @@ -529,6 +529,7 @@ <phase>pre-site</phase> <configuration> <tasks> + <mkdir dir="${maven.src.dir}/site"/> <copy todir="${maven.site.gen.dir}" verbose="${maven.verbose}" overwrite="false"> <fileset dir="${maven.src.dir}/site"/> </copy>

1 0

[Lutinbuilder-commits] r115 - trunk/lutinproject
by tchemit＠users.labs.libre-entreprise.org 12 Aug '08

12 Aug '08

Author: tchemit Date: 2008-08-12 14:03:55 +0000 (Tue, 12 Aug 2008) New Revision: 115 Modified: trunk/lutinproject/changelog trunk/lutinproject/pom.xml Log: create org.codelutin:lutinproject:2.4 :) Modified: trunk/lutinproject/changelog =================================================================== --- trunk/lutinproject/changelog 2008-08-12 08:25:04 UTC (rev 114) +++ trunk/lutinproject/changelog 2008-08-12 14:03:55 UTC (rev 115) @@ -1,2 +1,7 @@ +ver-2-4 poussin (20080812) + * refactor pom to new directory layout compiliance with maven 2 + * use svn instead of CVS + * improve plugin configurations + ver-2-1 poussin (20060913) * add support for services directory in resources to put in jar Modified: trunk/lutinproject/pom.xml =================================================================== --- trunk/lutinproject/pom.xml 2008-08-12 08:25:04 UTC (rev 114) +++ trunk/lutinproject/pom.xml 2008-08-12 14:03:55 UTC (rev 115) @@ -1,57 +1,78 @@ -<?xml version="1.0" encoding="ISO-8859-1"?> +<?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/maven-v4_0_0.xsd"> -  <modelVersion>4.0.0</modelVersion> -  - <groupId>lutinlib</groupId> +  +  +  + +  + <groupId>org.codelutin</groupId> <artifactId>lutinproject</artifactId> + <version>2.4</version> -  - <version>2.2</version> +  -  - <packaging>pom</packaging> - <description> - Projet Maven de r�f�rence pour l'ensemble des autres projet Maven. - </description> +  -  - <url>http://labs.libre-entreprise.org/projects/${pom.artifactId}</url> +  -  - <issueManagement> - <url>http://labs.libre-entreprise.org/tracker/</url> - </issueManagement> +  -  - <mailingLists> - <mailingList> - <name>${pom.artifactId}-cvscomit</name> - <subscribe>http://lists.labs.libre-entreprise.org/mailman/listinfo/${pom.artifactId}-c…</subscribe> - <unsubscribe>http://lists.labs.libre-entreprise.org/mailman/listinfo/${pom.artifactId}-c… - </unsubscribe> - <archive>http://lists.labs.libre-entreprise.org/pipermail/${pom.artifactId}-cvscommi…</archive> - </mailingList> + <dependencies> - <mailingList> - <name>${pom.artifactId}-devel</name> - <subscribe>http://lists.labs.libre-entreprise.org/mailman/listinfo/${pom.artifactId}-d…</subscribe> - <unsubscribe>http://lists.labs.libre-entreprise.org/mailman/listinfo/${pom.artifactId}-d…</unsubscribe> - <archive>http://lists.labs.libre-entreprise.org/pipermail/${pom.artifactId}-devel/</archive> - </mailingList> + <dependency> + <groupId>junit</groupId> + <artifactId>junit</artifactId> + <version>3.8.1</version> + <scope>test</scope> + </dependency> - <mailingList> - <name>${pom.artifactId}-user</name> - <subscribe>http://lists.labs.libre-entreprise.org/mailman/listinfo/${pom.artifactId}-u…</subscribe> - <unsubscribe>http://lists.labs.libre-entreprise.org/mailman/listinfo/${pom.artifactId}-u…</unsubscribe> - <archive>http://lists.labs.libre-entreprise.org/pipermail/${pom.artifactId}-user/</archive> - </mailingList> - </mailingLists> + <dependency> + <groupId>commons-logging</groupId> + <artifactId>commons-logging</artifactId> + <version>1.1.1</version> + <scope>compile</scope> + </dependency> -  + </dependencies> + +  + +  + +  +  +  + + <name>Codelutin project superpom</name> + + <description>Projet Maven de reference pour l'ensemble des autres projets Maven.</description> + + <url>http://${labs.host}/projects/${pom.artifactId}</url> + + <inceptionYear>1999</inceptionYear> + + <licenses> + <license> + <name>LGPL</name> + <url>http://www.gnu.org/licenses/lgpl.txt</url> + <distribution>repo</distribution> + </license> + </licenses> + <developers> <developer> <name>Benjamin Poussin</name> @@ -60,30 +81,30 @@ <organization>CodeLutin</organization> <timezone>+2</timezone> <roles> - <role>D�veloppeur</role> + <role>Développeur</role> <role>Debian packager</role> </roles> </developer> <developer> <name>Arnaud Thimel</name> - <id>thimel</id> + <id>athimel</id> <email>thimel(a)codelutin.com</email> <organization>CodeLutin</organization> <timezone>+2</timezone> <roles> - <role>D�veloppeur</role> + <role>Développeur</role> </roles> </developer> <developer> <name>Julien Ruchaud</name> - <id>ruchaud</id> + <id>jruchaud</id> <email>ruchaud(a)codelutin.com</email> <organization>CodeLutin</organization> <timezone>+2</timezone> <roles> - <role>D�veloppeur</role> + <role>Développeur</role> </roles> </developer> @@ -94,7 +115,7 @@ <organization>CodeLutin</organization> <timezone>+2</timezone> <roles> - <role>D�veloppeur</role> + <role>Développeur</role> </roles> </developer> @@ -105,7 +126,7 @@ <organization>CodeLutin</organization> <timezone>+2</timezone> <roles> - <role>D�veloppeur</role> + <role>Développeur</role> </roles> </developer> @@ -116,78 +137,111 @@ <organization>CodeLutin</organization> <timezone>+2</timezone> <roles> - <role>D�veloppeur</role> + <role>Développeur</role> </roles> </developer> + + <developer> + <name>Sylvain Letellier</name> + <id>sletellier</id> + <email>lettelier(a)codelutin.com</email> + <organization>CodeLutin</organization> + <timezone>+2</timezone> + <roles> + <role>Développeur</role> + </roles> + </developer> + + <developer> + <name>Yannick Martel</name> + <id>ymartel</id> + <email>martel(a)codelutin.com</email> + <organization>CodeLutin</organization> + <timezone>+2</timezone> + <roles> + <role>Développeur</role> + </roles> + </developer> + </developers> -  - <licenses> - <license> - <name>GPL</name> - <url>http://www.gnu.org/licenses/gpl.txt</url> - <distribution>repo</distribution> - </license> - </licenses> + <organization> + <name>CodeLutin</name> + <url>http://www.codelutin.com/</url> + </organization> +  +  +  + <properties> -  +  +  + +  + <labs.project>${pom.artifactId}</labs.project> + +  +  + +  +  + +  +  + +  + <labs.host>labs.libre-entreprise.org</labs.host> + +  + <labs.list.host>list.labs.libre-entreprise.org</labs.list.host> + +  + <labs.builder.host>lutinbuilder.labs.libre-entreprise.org</labs.builder.host> + +  + <maven.verbose>false</maven.verbose> + +  +  + +  + <maven.compile.source>1.6</maven.compile.source> + +  + <maven.compile.target>1.6</maven.compile.target> + +  + <maven.compile.encoding>UTF-8</maven.compile.encoding> + +  <maven.src.dir>${basedir}/src</maven.src.dir> -  - <maven.test.skip>false</maven.test.skip> +  + <maven.gen.dir>${basedir}/target/generated-sources</maven.gen.dir> -  - <maven.compile.source>1.5</maven.compile.source> - <maven.compile.target>1.5</maven.compile.target> +  + <maven.site.gen.dir>${basedir}/target/generated-site</maven.site.gen.dir> -  - <maven.jar.main.class>org.codelutin.util.Resource</maven.jar.main.class> - -  - <maven.verbose>true</maven.verbose> </properties> -  -  - <scm> - <url>http://cvs.labs.libre-entreprise.org/cgi-bin/cvsweb.cgi/?cvsroot=${pom.arti…</url> - <connection>scm:cvs:pserver:anonymous@cvs.labs.libre-entreprise.org:/cvsroot/${pom.artifactId}:${pom.artifactId} - </connection> - <developerConnection> - scm:cvs:ext:${username}@cvs.labs.libre-entreprise.org:/cvsroot/${pom.artifactId}:${pom.artifactId} - </developerConnection> - </scm> + <packaging>pom</packaging> -  - <organization> - <name>CodeLutin</name> - <url>http://www.codelutin.com/</url> - </organization> - -  <build> -  - <sourceDirectory>${maven.src.dir}/java</sourceDirectory> - <testSourceDirectory>${maven.src.dir}/test</testSourceDirectory> -  -  <resources> - <resource> +  <resource> - <directory>${maven.src.dir}/resources</directory> + <directory>${maven.src.dir}/main/resources</directory> <includes> <include>**/*</include> </includes> @@ -197,7 +251,7 @@ </resource> <resource> - <directory>${maven.src.dir}/uimodel</directory> + <directory>${maven.src.dir}/main/uimodel</directory> <includes> <include>**/*.xml</include> <include>**/*.xgl</include> @@ -206,87 +260,246 @@ </resource> <resource> - <directory>${maven.src.dir}/xsl</directory> + <directory>${maven.src.dir}/main/xsl</directory> <includes> <include>**/*.xsl</include> </includes> </resource> </resources> - <testResources> +  -  - <plugins> -  - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-surefire-plugin</artifactId> - <configuration> - <skip>${maven.test.skip}</skip> -  -  - </configuration> - </plugin> + <pluginManagement> -  - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-compiler-plugin</artifactId> - <configuration> - <source>${maven.compile.source}</source> - <target>${maven.compile.target}</target> - </configuration> - </plugin> + <plugins> -  - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-war-plugin</artifactId> - <version>2.0.1</version> -  - <configuration> - <warSourceDirectory>${basedir}/src/webapp</warSourceDirectory> - </configuration> - </plugin> +  +  -  - <plugin> +  + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-resources-plugin</artifactId> + <configuration> + <encoding>${maven.compile.encoding}</encoding> + </configuration> + </plugin> + +  + <plugin> + <groupId>lutinplugin</groupId> + <artifactId>maven-i18n-plugin</artifactId> + <version>0.4</version> + <configuration> + <bundles> + <param>fr_FR</param> + <param>en_GB</param> + </bundles> + <encoding>${maven.compile.encoding}</encoding> + <src>${maven.src.dir}/main/resources/i18n</src> + <defaultBasedir>${maven.src.dir}/main/java</defaultBasedir> + <keysModifier>false</keysModifier> + <keepBackup>false</keepBackup> + </configuration> + </plugin> + +  + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-compiler-plugin</artifactId> + <configuration> + <source>${maven.compile.source}</source> + <target>${maven.compile.target}</target> + <encoding>${maven.compile.encoding}</encoding> + </configuration> + </plugin> + +  + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-surefire-plugin</artifactId> + <configuration> + <skip>${maven.test.skip}</skip> +  +  + </configuration> + </plugin> + +  + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-dependency-plugin</artifactId> + <configuration> + <overWriteReleases>false</overWriteReleases> + <overWriteSnapshots>false</overWriteSnapshots> + <overWriteIfNewer>true</overWriteIfNewer> + </configuration> + <executions> + <execution> + <phase>package</phase> + <goals> + <goal>copy-dependencies</goal> + </goals> + </execution> + </executions> + </plugin> + +  + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-war-plugin</artifactId> + <version>2.0.1</version> + <configuration> + <warSourceDirectory>${maven.src.dir}/main/webapp</warSourceDirectory> + </configuration> + </plugin> + +  + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-jar-plugin</artifactId> + <configuration> + <archive> + <manifest> + <mainClass>${maven.jar.main.class}</mainClass> + </manifest> + <manifestEntries> + <url>${pom.url}</url> + </manifestEntries> + </archive> + </configuration> + </plugin> + +  + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-source-plugin</artifactId> + <executions> + <execution> + <phase>verify</phase> + <goals> + <goal>jar</goal> + </goals> + </execution> + </executions> + </plugin> + +  + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-javadoc-plugin</artifactId> + <configuration> + <docencoding>${maven.compile.encoding}</docencoding> + <encoding>${maven.compile.encoding}</encoding> + </configuration> + <executions> + <execution> + <phase>verify</phase> + <goals> + <goal>jar</goal> + </goals> + </execution> + </executions> + </plugin> + +  + <plugin> + <groupId>lutinplugin</groupId> + <artifactId>maven-jrst-plugin</artifactId> + <version>0.8</version> + <configuration> + <directoryIn>${maven.src.dir}/site</directoryIn> + <directoryOut>${maven.gen.site.dir}/xdoc</directoryOut> + <verbose>${maven.verbose}</verbose> + <defaultLocale>fr</defaultLocale> + </configuration> + <executions> + <execution> + <id>jrst</id> + <phase>test</phase> +  + <goals> + <goal>jrst</goal> + </goals> + </execution> + </executions> + </plugin> + +  + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-site-plugin</artifactId> + <version>2.0-beta-7</version> +  +  + <configuration> + <siteDirectory>${maven.site.gen.dir}</siteDirectory> + <xdocDirectory>${maven.site.gen.dir}/xdoc/fr/rst</xdocDirectory> + <outputEncoding>${maven.compile.encoding}</outputEncoding> + <generateReports>${maven.reports.generate}</generateReports> + <locales>fr</locales> + </configuration> + </plugin> + +  + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-plugin-plugin</artifactId> + <version>2.4.2</version> + <executions> + <execution> + <id>helpmojo</id> + <goals> + <goal>helpmojo</goal> + </goals> + </execution> + <execution> + <id>report</id> + <phase>pre-site</phase> + <goals> + <goal>report</goal> + </goals> + </execution> + </executions> + </plugin> + + </plugins> + </pluginManagement> + + <plugins> + +  -  <plugin> <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-site-plugin</artifactId> - <version>2.0-beta-5-cl</version> -  - <configuration> - <siteDirectory>target/site-build</siteDirectory> - <locales>fr</locales> - </configuration> + <artifactId>maven-source-plugin</artifactId> </plugin>  @@ -294,7 +507,7 @@ <artifactId>maven-antrun-plugin</artifactId> <executions>  - <execution> +   <execution> <id>CopySiteFiles</id> <phase>pre-site</phase> <configuration> <tasks> - <copy todir="${basedir}/target/site-build" verbose="${maven.verbose}" overwrite="false"> - <fileset dir="${basedir}/site"/> + <copy todir="${maven.site.gen.dir}" verbose="${maven.verbose}" overwrite="false"> + <fileset dir="${maven.src.dir}/site"/> </copy> </tasks> </configuration> @@ -328,26 +541,6 @@ </executions> </plugin> -  - <plugin> - <groupId>lutinplugin</groupId> - <artifactId>maven-jrst-plugin</artifactId> - <version>0.7</version> - <executions> - <execution> - <id>jrst</id> - <phase>pre-site</phase> - <goals> - <goal>jrst</goal> - </goals> - </execution> - </executions> - <configuration> - <defaultLocale>fr</defaultLocale> - <verbose>${maven.verbose}</verbose> - </configuration> - </plugin> -   - <plugin> +  +   <plugin>  @@ -422,6 +616,97 @@ </plugins> </reporting> +  +  +  + +  + + <issueManagement> + <system>gforge</system> + <url>http://${labs.host}/tracker/?group_id=${labs.id}/</url> + </issueManagement> + +  + +  + <mailingLists> + <mailingList> + <name>${pom.artifactId}-commit</name> + <subscribe>http://${labs.list.host}/mailman/listinfo/${pom.artifactId}-commit</subscribe> + <unsubscribe>http://${labs.list.host}/mailman/listinfo/${pom.artifactId}-commit</unsubscribe> + <archive>http://${labs.list.host}/pipermail/${pom.artifactId}-commit/</archive> + </mailingList> + + <mailingList> + <name>${pom.artifactId}-devel</name> + <subscribe>http://${labs.list.host}/mailman/listinfo/${pom.artifactId}-devel</subscribe> + <unsubscribe>http://${labs.list.host}/mailman/listinfo/${pom.artifactId}-devel</unsubscribe> + <archive>http://${labs.list.host}/pipermail/${pom.artifactId}-devel/</archive> + </mailingList> + + <mailingList> + <name>${pom.artifactId}-user</name> + <subscribe>http://${labs.list.host}/mailman/listinfo/${pom.artifactId}-user</subscribe> + <unsubscribe>http://${labs.list.host}/mailman/listinfo/${pom.artifactId}-user</unsubscribe> + <archive>http://${labs.list.host}/pipermail/${pom.artifactId}-user/</archive> + </mailingList> + + <mailingList> + <name>${pom.artifactId}-bugreport</name> + <subscribe>http://${labs.list.host}/mailman/listinfo/${pom.artifactId}-bugreport</subscribe> + <unsubscribe>http://${labs.list.host}/mailman/listinfo/${pom.artifactId}-bugreport</unsubscribe> + <archive>http://${labs.list.host}/pipermail/${pom.artifactId}-bugreport/</archive> + </mailingList> + </mailingLists> + +  +  +  + + <scm> +  + <connection>${maven.scm.connection}</connection> +  + <developerConnection>${maven.scm.developerConnection}</developerConnection> +  + <url>${maven.scm.url}</url> + </scm> + +  +  +  + +  + <prerequisites> + <maven>2.0.8</maven> + </prerequisites> + +  +  <repositories> <repository> @@ -431,33 +716,63 @@ </repository> </repositories> -  - <dependencies> - <dependency> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - <version>3.8.1</version> - <scope>test</scope> - </dependency> - <dependency> - <groupId>commons-logging</groupId> - <artifactId>commons-logging</artifactId> - <version>1.1</version> - <scope>compile</scope> - </dependency> - </dependencies> +  +  <distributionManagement> <repository> <id>labs</id> - <url>scp://labs.libre-entreprise.org/home/groups/lutinbuilder/htdocs/maven2</url> + <url>scp://${labs.host}/home/groups/lutinbuilder/htdocs/maven2</url> </repository> - <site> <id>labs</id> - <url>scp://labs.libre-entreprise.org/home/groups/${pom.artifactId}/htdocs/toto-t…</url> +  + <url>scp://${labs.host}/home/groups/${labs.project}/htdocs</url> </site> </distributionManagement> +  + <profiles> + <profile> + <id>project</id> + <activation> + <activeByDefault>true</activeByDefault> + </activation> + <properties> +  + <maven.test.skip>true</maven.test.skip> + <maven.reports.generate>false</maven.reports.generate> + </properties> + </profile> + <profile> + <id>tests</id> + <activation> + <activeByDefault>false</activeByDefault> + </activation> + <properties> +  + <maven.test.skip>false</maven.test.skip> + <maven.reports.generate>false</maven.reports.generate> + </properties> + </profile> + <profile> + <id>site</id> + <activation> + <activeByDefault>false</activeByDefault> + </activation> + <properties> +  + <maven.test.skip>true</maven.test.skip> + <maven.reports.generate>true</maven.reports.generate> + </properties> + </profile> + </profiles> + </project>

1 0

[Lutinbuilder-commits] r114 - tags
by tchemit＠users.labs.libre-entreprise.org 12 Aug '08

12 Aug '08

Author: tchemit Date: 2008-08-12 08:25:04 +0000 (Tue, 12 Aug 2008) New Revision: 114 Added: tags/lutinproject-2.2/ Log: taggage avant nouveau pom 2.4 Copied: tags/lutinproject-2.2 (from rev 113, trunk/lutinproject)

1 0

[Lutinbuilder-commits] r113 - trunk/lutinproject
by tchemit＠users.labs.libre-entreprise.org 05 Aug '08

05 Aug '08

Author: tchemit Date: 2008-08-05 09:43:22 +0000 (Tue, 05 Aug 2008) New Revision: 113 Removed: trunk/lutinproject/profiles.xml Modified: trunk/lutinproject/pom.xml Log: suppression profiles.xml + reformat pom Modified: trunk/lutinproject/pom.xml =================================================================== --- trunk/lutinproject/pom.xml 2008-08-05 09:42:24 UTC (rev 112) +++ trunk/lutinproject/pom.xml 2008-08-05 09:43:22 UTC (rev 113) @@ -1,439 +1,463 @@ <?xml version="1.0" encoding="ISO-8859-1"?> <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/maven-v4_0_0.xsd"> + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> -  - <modelVersion>4.0.0</modelVersion> - -  - <groupId>lutinlib</groupId> - <artifactId>lutinproject</artifactId> - -  - <version>2.2</version> - -  - <packaging>pom</packaging> - <description> - Projet Maven de r�f�rence pour l'ensemble des autres projet Maven. - </description> - -  - <url>http://labs.libre-entreprise.org/projects/${pom.artifactId}</url> - -  - <issueManagement> - <url>http://labs.libre-entreprise.org/tracker/</url> - </issueManagement> - -  - <mailingLists> - <mailingList> - <name>${pom.artifactId}-cvscomit</name> - <subscribe>http://lists.labs.libre-entreprise.org/mailman/listinfo/${pom.artifactId}-c…</subscribe> - <unsubscribe>http://lists.labs.libre-entreprise.org/mailman/listinfo/${pom.artifactId}-c…</unsubscribe> - <archive>http://lists.labs.libre-entreprise.org/pipermail/${pom.artifactId}-cvscommi…</archive> - </mailingList> - - <mailingList> - <name>${pom.artifactId}-devel</name> - <subscribe>http://lists.labs.libre-entreprise.org/mailman/listinfo/${pom.artifactId}-d…</subscribe> - <unsubscribe>http://lists.labs.libre-entreprise.org/mailman/listinfo/${pom.artifactId}-d…</unsubscribe> - <archive>http://lists.labs.libre-entreprise.org/pipermail/${pom.artifactId}-devel/</archive> - </mailingList> - - <mailingList> - <name>${pom.artifactId}-user</name> - <subscribe>http://lists.labs.libre-entreprise.org/mailman/listinfo/${pom.artifactId}-u…</subscribe> - <unsubscribe>http://lists.labs.libre-entreprise.org/mailman/listinfo/${pom.artifactId}-u…</unsubscribe> - <archive>http://lists.labs.libre-entreprise.org/pipermail/${pom.artifactId}-user/</archive> - </mailingList> - </mailingLists> - -  - <developers> - <developer> - <name>Benjamin Poussin</name> - <id>bpoussin</id> - <email>poussin(a)codelutin.com</email> - <organization>CodeLutin</organization> - <timezone>+2</timezone> - <roles> - <role>D�veloppeur</role> - <role>Debian packager</role> - </roles> - </developer> - - <developer> - <name>Arnaud Thimel</name> - <id>thimel</id> - <email>thimel(a)codelutin.com</email> - <organization>CodeLutin</organization> - <timezone>+2</timezone> - <roles> - <role>D�veloppeur</role> - </roles> - </developer> - - <developer> - <name>Julien Ruchaud</name> - <id>ruchaud</id> - <email>ruchaud(a)codelutin.com</email> - <organization>CodeLutin</organization> - <timezone>+2</timezone> - <roles> - <role>D�veloppeur</role> - </roles> - </developer> - - <developer> - <name>Eric Chatellier</name> - <id>echatellier</id> - <email>chatellier(a)codelutin.com</email> - <organization>CodeLutin</organization> - <timezone>+2</timezone> - <roles> - <role>D�veloppeur</role> - </roles> - </developer> - - <developer> - <name>Tony Chemit</name> - <id>tchemit</id> - <email>chemit(a)codelutin.com</email> - <organization>CodeLutin</organization> - <timezone>+2</timezone> - <roles> - <role>D�veloppeur</role> - </roles> - </developer> - - <developer> - <name>Gabriel Gandais</name> - <id>glandais</id> - <email>landais(a)codelutin.com</email> - <organization>CodeLutin</organization> - <timezone>+2</timezone> - <roles> - <role>D�veloppeur</role> - </roles> - </developer> - </developers> - -  - <licenses> - <license> - <name>GPL</name> - <url>http://www.gnu.org/licenses/gpl.txt</url> - <distribution>repo</distribution> - </license> - </licenses> +  + <modelVersion>4.0.0</modelVersion> -  -  - <scm> - <url>http://cvs.labs.libre-entreprise.org/cgi-bin/cvsweb.cgi/?cvsroot=${pom.arti…</url> - <connection>scm:cvs:pserver:anonymous@cvs.labs.libre-entreprise.org:/cvsroot/${pom.artifactId}:${pom.artifactId}</connection> - <developerConnection>scm:cvs:ext:${username}@cvs.labs.libre-entreprise.org:/cvsroot/${pom.artifactId}:${pom.artifactId}</developerConnection> - </scm> - -  - <organization> - <name>CodeLutin</name> - <url>http://www.codelutin.com/</url> - </organization> - -  - <build> -  - <sourceDirectory>${maven.src.dir}/java</sourceDirectory> - <testSourceDirectory>${maven.src.dir}/test</testSourceDirectory> - -  - -  - <resources> - <resource> - <directory>${maven.src.dir}/java</directory> - <includes> - <include>**/*.properties</include> - <include>**/*.xml</include> - <include>**/*.jdo</include> - </includes> - </resource> - - <resource> - <directory>${maven.src.dir}/resources</directory> - <includes> - <include>**/*</include> - </includes> - <excludes> - <exclude>**/*~</exclude> - </excludes> - </resource> - - <resource> - <directory>${maven.src.dir}/uimodel</directory> - <includes> - <include>**/*.xml</include> - <include>**/*.xgl</include> - <include>**/*.bsh</include> - </includes> - </resource> +  + <groupId>lutinlib</groupId> + <artifactId>lutinproject</artifactId> - <resource> - <directory>${maven.src.dir}/xsl</directory> - <includes> - <include>**/*.xsl</include> - </includes> - </resource> - </resources> - - <testResources> - <testResource> - <directory>${maven.src.dir}/test</directory> - <excludes> - <exclude>**/*.java</exclude> - </excludes> - </testResource> - </testResources> - -  - <plugins> -  - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-surefire-plugin</artifactId> - <configuration> - <skip>${maven.test.skip}</skip> -  -  - </configuration> - </plugin> - -  - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-compiler-plugin</artifactId> - <configuration> - <source>${maven.compile.source}</source> - <target>${maven.compile.target}</target> - </configuration> - </plugin> - -  - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-war-plugin</artifactId> - <version>2.0.1</version>  - <configuration> - <warSourceDirectory>${basedir}/src/webapp</warSourceDirectory> - </configuration> - </plugin> +  + <version>2.2</version> -  - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-jar-plugin</artifactId> - <configuration> - <archive> - <manifest> - <mainClass>${maven.jar.main.class}</mainClass> - </manifest> - <manifestEntries> - <url>${pom.url}</url> - </manifestEntries> - </archive> - </configuration> - </plugin> - -  - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-site-plugin</artifactId> - <version>2.0-beta-5-cl</version>  - <configuration> - <siteDirectory>target/site-build</siteDirectory> - <locales>fr</locales> - </configuration> - </plugin> - -  - <plugin> - <artifactId>maven-antrun-plugin</artifactId> - <executions> -  - <execution> - <id>CopyRessourcesFiles</id> - <phase>generate-sources</phase> - <configuration> - <tasks> - <copy todir="${maven.src.dir}" verbose="${maven.verbose}" overwrite="false"> - <fileset dir="${basedir}/src"> - <exclude name="**/*.java"/> - </fileset> - </copy> - </tasks> - </configuration> - <goals> - <goal>run</goal> - </goals> - </execution> -  - <execution> - <id>CopySiteFiles</id> - <phase>pre-site</phase> - <configuration> - <tasks> - <copy todir="${basedir}/target/site-build" verbose="${maven.verbose}" overwrite="false"> - <fileset dir="${basedir}/site"/> - </copy> - </tasks> - </configuration> - <goals> - <goal>run</goal> - </goals> - </execution> - </executions> - </plugin> - -  - <plugin> - <groupId>lutinplugin</groupId> - <artifactId>maven-jrst-plugin</artifactId> - <version>0.7</version> - <executions> - <execution> - <id>jrst</id> - <phase>pre-site</phase> - <goals> - <goal>jrst</goal> - </goals> - </execution> - </executions> - <configuration> - <defaultLocale>fr</defaultLocale> - <verbose>${maven.verbose}</verbose> - </configuration> - </plugin> - -  -  - </plugins> - </build> - -  - <reporting> - <plugins> -  - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-plugin-plugin</artifactId> - <configuration> - <outputDirectory>target/site-build/xdoc</outputDirectory> - </configuration> - </plugin> +  + <packaging>pom</packaging> + <description> + Projet Maven de r�f�rence pour l'ensemble des autres projet Maven. + </description> -  - <plugin>  - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-project-info-reports-plugin</artifactId> - <version>2.0.1-cl</version> - </plugin> +  + <url>http://labs.libre-entreprise.org/projects/${pom.artifactId}</url> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-javadoc-plugin</artifactId> - </plugin> - -  - <plugin>  - <groupId>org.codehaus.mojo</groupId> - <artifactId>changelog-maven-plugin</artifactId> - </plugin> - - <plugin> - <groupId>org.codehaus.mojo</groupId> - <artifactId>changes-maven-plugin</artifactId> - </plugin> - - <plugin> - <groupId>org.codehaus.mojo</groupId> - <artifactId>jdepend-maven-plugin</artifactId> - </plugin> - - <plugin> - <groupId>org.codehaus.mojo</groupId> - <artifactId>jxr-maven-plugin</artifactId> - </plugin> - - <plugin> - <groupId>org.codehaus.mojo</groupId> - <artifactId>surefire-report-maven-plugin</artifactId> - </plugin> - - <plugin> - <groupId>org.codehaus.mojo</groupId> - <artifactId>taglist-maven-plugin</artifactId> - </plugin> +  + <issueManagement> + <url>http://labs.libre-entreprise.org/tracker/</url> + </issueManagement> -  - <plugin> - <groupId>statcvs</groupId> - <artifactId>maven-statcvs-plugin</artifactId> - <version>3.0</version> - </plugin> - </plugins> - </reporting> - -  - <repositories> - <repository> - <id>codelutin-repository</id> - <name>CodeLutinRepository</name> - <url>http://lutinbuilder.labs.libre-entreprise.org/maven2</url> - </repository> - </repositories> - -  - <dependencies> - <dependency> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - <version>3.8.1</version> - <scope>test</scope> - </dependency> - <dependency> - <groupId>commons-logging</groupId> - <artifactId>commons-logging</artifactId> - <version>1.1</version> - <scope>compile</scope> - </dependency> - </dependencies> - -  - <distributionManagement> - <repository> - <id>labs</id> - <url>scp://labs.libre-entreprise.org/home/groups/lutinbuilder/htdocs/maven2</url> - </repository> - - <site> - <id>labs</id> - <url>scp://labs.libre-entreprise.org/home/groups/${pom.artifactId}/htdocs/toto-t…</url> - </site> - </distributionManagement> +  + <mailingLists> + <mailingList> + <name>${pom.artifactId}-cvscomit</name> + <subscribe>http://lists.labs.libre-entreprise.org/mailman/listinfo/${pom.artifactId}-c…</subscribe> + <unsubscribe>http://lists.labs.libre-entreprise.org/mailman/listinfo/${pom.artifactId}-c… + </unsubscribe> + <archive>http://lists.labs.libre-entreprise.org/pipermail/${pom.artifactId}-cvscommi…</archive> + </mailingList> + <mailingList> + <name>${pom.artifactId}-devel</name> + <subscribe>http://lists.labs.libre-entreprise.org/mailman/listinfo/${pom.artifactId}-d…</subscribe> + <unsubscribe>http://lists.labs.libre-entreprise.org/mailman/listinfo/${pom.artifactId}-d…</unsubscribe> + <archive>http://lists.labs.libre-entreprise.org/pipermail/${pom.artifactId}-devel/</archive> + </mailingList> + + <mailingList> + <name>${pom.artifactId}-user</name> + <subscribe>http://lists.labs.libre-entreprise.org/mailman/listinfo/${pom.artifactId}-u…</subscribe> + <unsubscribe>http://lists.labs.libre-entreprise.org/mailman/listinfo/${pom.artifactId}-u…</unsubscribe> + <archive>http://lists.labs.libre-entreprise.org/pipermail/${pom.artifactId}-user/</archive> + </mailingList> + </mailingLists> + +  + <developers> + <developer> + <name>Benjamin Poussin</name> + <id>bpoussin</id> + <email>poussin(a)codelutin.com</email> + <organization>CodeLutin</organization> + <timezone>+2</timezone> + <roles> + <role>D�veloppeur</role> + <role>Debian packager</role> + </roles> + </developer> + + <developer> + <name>Arnaud Thimel</name> + <id>thimel</id> + <email>thimel(a)codelutin.com</email> + <organization>CodeLutin</organization> + <timezone>+2</timezone> + <roles> + <role>D�veloppeur</role> + </roles> + </developer> + + <developer> + <name>Julien Ruchaud</name> + <id>ruchaud</id> + <email>ruchaud(a)codelutin.com</email> + <organization>CodeLutin</organization> + <timezone>+2</timezone> + <roles> + <role>D�veloppeur</role> + </roles> + </developer> + + <developer> + <name>Eric Chatellier</name> + <id>echatellier</id> + <email>chatellier(a)codelutin.com</email> + <organization>CodeLutin</organization> + <timezone>+2</timezone> + <roles> + <role>D�veloppeur</role> + </roles> + </developer> + + <developer> + <name>Tony Chemit</name> + <id>tchemit</id> + <email>chemit(a)codelutin.com</email> + <organization>CodeLutin</organization> + <timezone>+2</timezone> + <roles> + <role>D�veloppeur</role> + </roles> + </developer> + + <developer> + <name>Gabriel Gandais</name> + <id>glandais</id> + <email>landais(a)codelutin.com</email> + <organization>CodeLutin</organization> + <timezone>+2</timezone> + <roles> + <role>D�veloppeur</role> + </roles> + </developer> + </developers> + +  + <licenses> + <license> + <name>GPL</name> + <url>http://www.gnu.org/licenses/gpl.txt</url> + <distribution>repo</distribution> + </license> + </licenses> + + <properties> +  + <maven.src.dir>${basedir}/src</maven.src.dir> + +  + <maven.test.skip>false</maven.test.skip> + +  + <maven.compile.source>1.5</maven.compile.source> + <maven.compile.target>1.5</maven.compile.target> + +  + <maven.jar.main.class>org.codelutin.util.Resource</maven.jar.main.class> + +  + <maven.verbose>true</maven.verbose> + </properties> + +  +  + <scm> + <url>http://cvs.labs.libre-entreprise.org/cgi-bin/cvsweb.cgi/?cvsroot=${pom.arti…</url> + <connection>scm:cvs:pserver:anonymous@cvs.labs.libre-entreprise.org:/cvsroot/${pom.artifactId}:${pom.artifactId} + </connection> + <developerConnection> + scm:cvs:ext:${username}@cvs.labs.libre-entreprise.org:/cvsroot/${pom.artifactId}:${pom.artifactId} + </developerConnection> + </scm> + +  + <organization> + <name>CodeLutin</name> + <url>http://www.codelutin.com/</url> + </organization> + +  + <build> +  + <sourceDirectory>${maven.src.dir}/java</sourceDirectory> + <testSourceDirectory>${maven.src.dir}/test</testSourceDirectory> + +  + +  + <resources> + <resource> + <directory>${maven.src.dir}/java</directory> + <includes> + <include>**/*.properties</include> + <include>**/*.xml</include> + <include>**/*.jdo</include> + </includes> + </resource> + + <resource> + <directory>${maven.src.dir}/resources</directory> + <includes> + <include>**/*</include> + </includes> + <excludes> + <exclude>**/*~</exclude> + </excludes> + </resource> + + <resource> + <directory>${maven.src.dir}/uimodel</directory> + <includes> + <include>**/*.xml</include> + <include>**/*.xgl</include> + <include>**/*.bsh</include> + </includes> + </resource> + + <resource> + <directory>${maven.src.dir}/xsl</directory> + <includes> + <include>**/*.xsl</include> + </includes> + </resource> + </resources> + + <testResources> + <testResource> + <directory>${maven.src.dir}/test</directory> + <excludes> + <exclude>**/*.java</exclude> + </excludes> + </testResource> + </testResources> + +  + <plugins> +  + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-surefire-plugin</artifactId> + <configuration> + <skip>${maven.test.skip}</skip> +  +  + </configuration> + </plugin> + +  + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-compiler-plugin</artifactId> + <configuration> + <source>${maven.compile.source}</source> + <target>${maven.compile.target}</target> + </configuration> + </plugin> + +  + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-war-plugin</artifactId> + <version>2.0.1</version> +  + <configuration> + <warSourceDirectory>${basedir}/src/webapp</warSourceDirectory> + </configuration> + </plugin> + +  + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-jar-plugin</artifactId> + <configuration> + <archive> + <manifest> + <mainClass>${maven.jar.main.class}</mainClass> + </manifest> + <manifestEntries> + <url>${pom.url}</url> + </manifestEntries> + </archive> + </configuration> + </plugin> + +  + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-site-plugin</artifactId> + <version>2.0-beta-5-cl</version> +  + <configuration> + <siteDirectory>target/site-build</siteDirectory> + <locales>fr</locales> + </configuration> + </plugin> + +  + <plugin> + <artifactId>maven-antrun-plugin</artifactId> + <executions> +  + <execution> + <id>CopyRessourcesFiles</id> + <phase>generate-sources</phase> + <configuration> + <tasks> + <copy todir="${maven.src.dir}" verbose="${maven.verbose}" overwrite="false"> + <fileset dir="${basedir}/src"> + <exclude name="**/*.java"/> + </fileset> + </copy> + </tasks> + </configuration> + <goals> + <goal>run</goal> + </goals> + </execution> +  + <execution> + <id>CopySiteFiles</id> + <phase>pre-site</phase> + <configuration> + <tasks> + <copy todir="${basedir}/target/site-build" verbose="${maven.verbose}" overwrite="false"> + <fileset dir="${basedir}/site"/> + </copy> + </tasks> + </configuration> + <goals> + <goal>run</goal> + </goals> + </execution> + </executions> + </plugin> + +  + <plugin> + <groupId>lutinplugin</groupId> + <artifactId>maven-jrst-plugin</artifactId> + <version>0.7</version> + <executions> + <execution> + <id>jrst</id> + <phase>pre-site</phase> + <goals> + <goal>jrst</goal> + </goals> + </execution> + </executions> + <configuration> + <defaultLocale>fr</defaultLocale> + <verbose>${maven.verbose}</verbose> + </configuration> + </plugin> + +  +  + </plugins> + </build> + +  + <reporting> + <plugins> +  + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-plugin-plugin</artifactId> + <configuration> + <outputDirectory>target/site-build/xdoc</outputDirectory> + </configuration> + </plugin> + +  + <plugin>  + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-project-info-reports-plugin</artifactId> + <version>2.0.1-cl</version> + </plugin> + + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-javadoc-plugin</artifactId> + </plugin> + +  + <plugin>  + <groupId>org.codehaus.mojo</groupId> + <artifactId>changelog-maven-plugin</artifactId> + </plugin> + + <plugin> + <groupId>org.codehaus.mojo</groupId> + <artifactId>changes-maven-plugin</artifactId> + </plugin> + + <plugin> + <groupId>org.codehaus.mojo</groupId> + <artifactId>jdepend-maven-plugin</artifactId> + </plugin> + + <plugin> + <groupId>org.codehaus.mojo</groupId> + <artifactId>jxr-maven-plugin</artifactId> + </plugin> + + <plugin> + <groupId>org.codehaus.mojo</groupId> + <artifactId>surefire-report-maven-plugin</artifactId> + </plugin> + + <plugin> + <groupId>org.codehaus.mojo</groupId> + <artifactId>taglist-maven-plugin</artifactId> + </plugin> + +  + <plugin> + <groupId>statcvs</groupId> + <artifactId>maven-statcvs-plugin</artifactId> + <version>3.0</version> + </plugin> + </plugins> + </reporting> + +  + <repositories> + <repository> + <id>codelutin-repository</id> + <name>CodeLutinRepository</name> + <url>http://lutinbuilder.labs.libre-entreprise.org/maven2</url> + </repository> + </repositories> + +  + <dependencies> + <dependency> + <groupId>junit</groupId> + <artifactId>junit</artifactId> + <version>3.8.1</version> + <scope>test</scope> + </dependency> + <dependency> + <groupId>commons-logging</groupId> + <artifactId>commons-logging</artifactId> + <version>1.1</version> + <scope>compile</scope> + </dependency> + </dependencies> + +  + <distributionManagement> + <repository> + <id>labs</id> + <url>scp://labs.libre-entreprise.org/home/groups/lutinbuilder/htdocs/maven2</url> + </repository> + + <site> + <id>labs</id> + <url>scp://labs.libre-entreprise.org/home/groups/${pom.artifactId}/htdocs/toto-t…</url> + </site> + </distributionManagement> + </project> Deleted: trunk/lutinproject/profiles.xml =================================================================== --- trunk/lutinproject/profiles.xml 2008-08-05 09:42:24 UTC (rev 112) +++ trunk/lutinproject/profiles.xml 2008-08-05 09:43:22 UTC (rev 113) @@ -1,30 +0,0 @@ -<?xml version="1.0" encoding="ISO-8859-1"?> -<settings> - <profiles> - <profile> - <id>project</id> - - <activation> - <activeByDefault>true</activeByDefault> - </activation> - - <properties> -  - <maven.src.dir>${basedir}/src</maven.src.dir> - -  - <maven.test.skip>false</maven.test.skip> - -  - <maven.compile.source>1.5</maven.compile.source> - <maven.compile.target>1.5</maven.compile.target> - -  - <maven.jar.main.class>org.codelutin.util.Resource</maven.jar.main.class> - -  - <maven.verbose>true</maven.verbose> - </properties> - </profile> - </profiles> -</settings>

1 0