Author: chatellier Date: 2008-08-27 13:19:41 +0000 (Wed, 27 Aug 2008) New Revision: 186 Added: trunk/maven-jrst-plugin/LICENSE.txt trunk/maven-jrst-plugin/THIRD-PARTY.txt trunk/maven-jrst-plugin/src/main/ trunk/maven-jrst-plugin/src/main/java/ trunk/maven-jrst-plugin/src/site/ Removed: trunk/maven-jrst-plugin/site/ trunk/maven-jrst-plugin/src/java/ Modified: trunk/maven-jrst-plugin/pom.xml trunk/maven-jrst-plugin/src/main/java/org/codelutin/jrst/plugin/GenerationJRstException.java trunk/maven-jrst-plugin/src/main/java/org/codelutin/jrst/plugin/JRstPlugin.java Log: Maven2 layout, and switch to lgplv3 Added: trunk/maven-jrst-plugin/LICENSE.txt =================================================================== --- trunk/maven-jrst-plugin/LICENSE.txt (rev 0) +++ trunk/maven-jrst-plugin/LICENSE.txt 2008-08-27 13:19:41 UTC (rev 186) @@ -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/maven-jrst-plugin/THIRD-PARTY.txt =================================================================== --- trunk/maven-jrst-plugin/THIRD-PARTY.txt (rev 0) +++ trunk/maven-jrst-plugin/THIRD-PARTY.txt 2008-08-27 13:19:41 UTC (rev 186) @@ -0,0 +1,58 @@ +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) + +GPL : + * JRst (lutinlib:jrst:0.8.2-SNAPSHOT - http://labs.libre-entreprise.org/projects/jrst/jrst) + * Lutin utilities library (lutinlib:lutinutil:0.26 - http://labs.libre-entreprise.org/projects/lutinutil/lutinutil) + +LGPL : + * xom (xom:xom:1.0 - http://www.xom.nu) + +The Apache Software License, Version 2.0 : + * Apache XML Graphics Commons (org.apache.xmlgraphics:xmlgraphics-commons:1.1 - http://xmlgraphics.apache.org/commons/) + * Commons Logging (commons-logging:commons-logging:1.1.1 - http://commons.apache.org/logging) + * IO (commons-io:commons-io:1.1 - http://jakarta.apache.org/commons/io/) + * IO (commons-io:commons-io:1.3.1 - http://jakarta.apache.org/commons/io/) + * Lang (commons-lang:commons-lang:2.1 - http://jakarta.apache.org/commons/${pom.artifactId.substring(8)}/) + * Log4j (log4j:log4j:1.2.14 - http://logging.apache.org/log4j/docs/) + * Logging (commons-logging:commons-logging:1.1 - http://jakarta.apache.org/commons/${pom.artifactId.substring(8)}/) + * Maven Artifact (org.apache.maven:maven-artifact:2.0.9 - http://maven.apache.org/maven-artifact) + * Maven Artifact Manager (org.apache.maven:maven-artifact-manager:2.0.9 - http://maven.apache.org/maven-artifact-manager) + * Maven Local Settings Model (org.apache.maven:maven-settings:2.0.9 - http://maven.apache.org/maven-settings) + * Maven Model (org.apache.maven:maven-model:2.0.9 - http://maven.apache.org/maven-model) + * Maven Plugin API (org.apache.maven:maven-plugin-api:2.0.9 - http://maven.apache.org/maven-plugin-api) + * Maven Plugin Registry Model (org.apache.maven:maven-plugin-registry:2.0.9 - http://maven.apache.org/maven-plugin-registry) + * Maven Profile Model (org.apache.maven:maven-profile:2.0.9 - http://maven.apache.org/maven-profile) + * Maven Project Builder (org.apache.maven:maven-project:2.0.9 - http://maven.apache.org/maven-project) + * Maven Repository Metadata Model (org.apache.maven:maven-repository-metadata:2.0.9 - http://maven.apache.org/maven-repository-metadata) + * Maven Wagon API (org.apache.maven.wagon:wagon-provider-api:1.0-beta-2 - http://maven.apache.org/wagon/wagon-provider-api) + * Plexus Common Utilities (org.codehaus.plexus:plexus-utils:1.5.1 - http://plexus.codehaus.org/plexus-utils) + * XML Commons External Components XML APIs (xml-apis:xml-apis:1.0.b2 - http://xml.apache.org/commons/#external) + +Unknown license : + * Batik Ext (batik:batik-ext:1.6-1 - no url defined) + * Batik GUI Utilities (batik:batik-gui-util:1.6-1 - no url defined) + * Batik Utilities (batik:batik-util:1.6-1 - no url defined) + * Default Plexus Container (org.codehaus.plexus:plexus-container-default:1.0-alpha-9-stable-1 - no url defined) + * Plexus Common Utilities (org.codehaus.plexus:plexus-utils:1.0.4 - no url defined) + * Unnamed - com.ibm.icu:icu4j:jar:2.6.1 (com.ibm.icu:icu4j:2.6.1 - no url defined) + * Unnamed - commons-collections:commons-collections:jar:3.1 (commons-collections:commons-collections:3.1 - no url defined) + * Unnamed - commons-primitives:commons-primitives:jar:1.0 (commons-primitives:commons-primitives:1.0 - no url defined) + * Unnamed - fop:fop:jar:0.93 (fop:fop:0.93 - no url defined) + * Unnamed - jaxen:jaxen:jar:1.0-FCS (jaxen:jaxen:1.0-FCS - no url defined) + * Unnamed - jdom:jdom:jar:1.0 (jdom:jdom:1.0 - no url defined) + * Unnamed - jewelcli:jewelcli:jar:0.41 (jewelcli:jewelcli:0.41 - no url defined) + * Unnamed - nwalsh:docbook-xsl-nwalsh:jar:1.71.1 (nwalsh:docbook-xsl-nwalsh:1.71.1 - no url defined) + * Unnamed - org.apache.ant:ant-launcher:jar:1.7.0 (org.apache.ant:ant-launcher:1.7.0 - http://ant.apache.org/ant-launcher) + * Unnamed - xalan:xalan:jar:2.6.0 (xalan:xalan:2.6.0 - no url defined) + * Unnamed - xerces:xercesImpl:jar:2.6.2 (xerces:xercesImpl:2.6.2 - no url defined) + * Unnamed - xerces:xmlParserAPIs:jar:2.6.2 (xerces:xmlParserAPIs:2.6.2 - no url defined) + * Unnamed - xml-apis:xml-apis:jar:1.3.02 (xml-apis:xml-apis:1.3.02 - http://xml.apache.org/commons/#external) + * Unnamed - xml-apis:xmlParserAPIs:jar:2.0.2 (xml-apis:xmlParserAPIs:2.0.2 - no url defined) + * classworlds (classworlds:classworlds:1.1-alpha-2 - http://classworlds.codehaus.org/) + * dom4j (dom4j:dom4j:1.6.1 - http://dom4j.org) + * jaxen (jaxen:jaxen:1.1-beta-6 - http://jaxen.codehaus.org/) + * jaxen (jaxen:jaxen:1.1.1 - http://jaxen.codehaus.org/) + * org.apache.tools.ant (org.apache.ant:ant:1.7.0 - http://ant.apache.org/ant) \ No newline at end of file Modified: trunk/maven-jrst-plugin/pom.xml =================================================================== --- trunk/maven-jrst-plugin/pom.xml 2008-08-27 12:57:01 UTC (rev 185) +++ trunk/maven-jrst-plugin/pom.xml 2008-08-27 13:19:41 UTC (rev 186) @@ -5,12 +5,12 @@ <!--The version of maven's project object model--> <modelVersion>4.0.0</modelVersion> - <!--lutinproject.xml--> <!-- bug dans maven, les plugins ne fonctionne pas s'il herite d'un projet, mais pour la generation du site --> - <!--parent> - <groupId>lutinlib</groupId> + <!-- parent --> + <parent> + <groupId>org.codelutin</groupId> <artifactId>lutinproject</artifactId> - <version>2.2</version> - </parent--> + <version>2.4</version> + </parent> <!--A unique name for this project--> <groupId>lutinplugin</groupId> @@ -30,47 +30,16 @@ <inceptionYear>2006</inceptionYear> <properties> - <!--Test--> - <maven.test.skip>true</maven.test.skip> + <!-- id du projet du labs --> + <labs.id>54</labs.id> - <!--Source base dir--> - <maven.src.dir>${basedir}/src</maven.src.dir> + <!-- nom du projet sur le labs --> + <labs.project>jrst</labs.project> + + <!-- Test --> + <maven.test.skip>false</maven.test.skip> </properties> - <!-- debut de ce qui devrait etre dans le pere --> - <build> - <sourceDirectory>${maven.src.dir}/java</sourceDirectory> - <testSourceDirectory>${maven.src.dir}/test</testSourceDirectory> - - <plugins> - <plugin> - <artifactId>maven-compiler-plugin</artifactId> - <configuration> - <source>1.5</source> - <target>1.5</target> - </configuration> - </plugin> - </plugins> - </build> - <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/jrst/htdocs/${pom.artifactId}</url> - </site> - </distributionManagement> - <!-- fin de ce qui devrait etre dans le pere --> - - - <!--Tracking--> - <issueManagement> - <url>http://labs.libre-entreprise.org/tracker/?group_id=54</url> - </issueManagement> - <!--who the developers are for the project--> <contributors> <contributor> @@ -103,50 +72,16 @@ <dependency> <groupId>org.apache.ant</groupId> <artifactId>ant</artifactId> - <version>1.7.0</version> + <version>1.7.1</version> <scope>compile</scope> </dependency> <dependency> - <groupId>lutinlib</groupId> + <groupId>org.codelutin</groupId> <artifactId>jrst</artifactId> <version>[0.8,)</version> <scope>compile</scope> </dependency> </dependencies> - <!-- - | surcharge des valeurs par defaut - +--> - <mailingLists> - <mailingList> - <name>jrst-cvscomit</name> - <subscribe>http://lists.labs.libre-entreprise.org/mailman/listinfo/jrst-cvscommit</subscribe> - <unsubscribe>http://lists.labs.libre-entreprise.org/mailman/listinfo/jrst-cvscommit</unsubscribe> - <archive>http://lists.labs.libre-entreprise.org/pipermail/jrst-cvscommit/</archive> - </mailingList> - - <mailingList> - <name>jrst-devel</name> - <subscribe>http://lists.labs.libre-entreprise.org/mailman/listinfo/jrst-devel</subscribe> - <unsubscribe>http://lists.labs.libre-entreprise.org/mailman/listinfo/jrst-devel</unsubscribe> - <archive>http://lists.labs.libre-entreprise.org/pipermail/jrst-devel/</archive> - </mailingList> - - <mailingList> - <name>jrst-user</name> - <subscribe>http://lists.labs.libre-entreprise.org/mailman/listinfo/jrst-user</subscribe> - <unsubscribe>http://lists.labs.libre-entreprise.org/mailman/listinfo/jrst-user</unsubscribe> - <archive>http://lists.labs.libre-entreprise.org/pipermail/jrst-user/</archive> - </mailingList> - </mailingLists> - - <scm> - <url>http://cvs.labs.libre-entreprise.org/cgi-bin/cvsweb.cgi/?cvsroot=jrst</url> - <connection>scm:cvs:pserver:anonymous@cvs.labs.libre-entreprise.org:/cvsroot/jrst:${pom.artifactId}</connection> - </scm> - <!-- - | fin de surcharge - +--> - </project> Copied: trunk/maven-jrst-plugin/src/main/java (from rev 184, trunk/maven-jrst-plugin/src/java) Property changes on: trunk/maven-jrst-plugin/src/main/java ___________________________________________________________________ Name: svn:mergeinfo + Modified: trunk/maven-jrst-plugin/src/main/java/org/codelutin/jrst/plugin/GenerationJRstException.java =================================================================== --- trunk/maven-jrst-plugin/src/java/org/codelutin/jrst/plugin/GenerationJRstException.java 2008-08-26 17:22:01 UTC (rev 184) +++ trunk/maven-jrst-plugin/src/main/java/org/codelutin/jrst/plugin/GenerationJRstException.java 2008-08-27 13:19:41 UTC (rev 186) @@ -1,21 +1,19 @@ -/* *##% - * Copyright (C) 2006 - * Code Lutin, Cédric Pineau, Benjamin Poussin +/* *##% Plugin maven JRst + * Copyright (C) 2006 - 2008 CodeLutin * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * as published by the Free Software Foundation; either version 2 - * of the License, or (at your option) any later version. + * 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 Public License for more details. + * GNU General Lesser Public License for more details. * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - *##%*/ + * 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>. ##%*/ /* * * GenerationJRstException.java Modified: trunk/maven-jrst-plugin/src/main/java/org/codelutin/jrst/plugin/JRstPlugin.java =================================================================== --- trunk/maven-jrst-plugin/src/java/org/codelutin/jrst/plugin/JRstPlugin.java 2008-08-26 17:22:01 UTC (rev 184) +++ trunk/maven-jrst-plugin/src/main/java/org/codelutin/jrst/plugin/JRstPlugin.java 2008-08-27 13:19:41 UTC (rev 186) @@ -1,21 +1,19 @@ -/* *##% - * Copyright (C) 2006 - * Code Lutin, Cédric Pineau, Benjamin Poussin +/* *##% Plugin maven JRst + * Copyright (C) 2006 - 2008 CodeLutin * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * as published by the Free Software Foundation; either version 2 - * of the License, or (at your option) any later version. + * 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 Public License for more details. + * GNU General Lesser Public License for more details. * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - *##%*/ + * 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>. ##%*/ /* * * JRstPlugin.java @@ -31,16 +29,15 @@ package org.codelutin.jrst.plugin; +import java.io.File; +import java.io.IOException; + import org.apache.maven.plugin.AbstractMojo; import org.apache.maven.plugin.MojoExecutionException; -import org.apache.maven.project.MavenProject; import org.codelutin.jrst.JRST; import org.codelutin.util.FileUtil; import org.codelutin.util.FileUtil.FileAction; -import java.io.File; -import java.io.IOException; - /** * Génére du xdoc à partir de fichiers Rst. * <p/> @@ -118,13 +115,6 @@ private boolean verbose = false; /** - * Projet en cours de deploiement. - * - * @parameter expression="${project}" - */ - private MavenProject project; - - /** * Number of generated files. */ private int numberFilesGenerates; Copied: trunk/maven-jrst-plugin/src/site (from rev 184, trunk/maven-jrst-plugin/site) Property changes on: trunk/maven-jrst-plugin/src/site ___________________________________________________________________ Name: svn:mergeinfo +