Author: ymartel Date: 2010-04-21 14:12:20 +0200 (Wed, 21 Apr 2010) New Revision: 89 Log: [Evolution #540] Use maven-license-plugin 2.2 Added: trunk/src/license/ trunk/src/license/project.xml Modified: trunk/pom.xml trunk/src/main/java/org/nuiton/scmwebeditor/AbstractScmWebEditorServlet.java trunk/src/main/java/org/nuiton/scmwebeditor/PreviewServlet.java trunk/src/main/java/org/nuiton/scmwebeditor/PrivateSvnServlet.java trunk/src/main/java/org/nuiton/scmwebeditor/ScmWebEditorMainServlet.java trunk/src/main/java/org/nuiton/scmwebeditor/SearchServlet.java trunk/src/main/java/org/nuiton/scmwebeditor/SvnSession.java trunk/src/site/site_en.xml trunk/src/site/site_fr.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2010-04-20 17:55:12 UTC (rev 88) +++ trunk/pom.xml 2010-04-21 12:12:20 UTC (rev 89) @@ -106,6 +106,16 @@ <role>Developer</role> </roles> </developer> + <developer> + <name>Martel Yannick</name> + <id>ymartel</id> + <email>martel@codelutin.com</email> + <organization>CodeLutin</organization> + <timezone>+2</timezone> + <roles> + <role>Developer</role> + </roles> + </developer> </developers> <organization> Added: trunk/src/license/project.xml =================================================================== --- trunk/src/license/project.xml (rev 0) +++ trunk/src/license/project.xml 2010-04-21 12:12:20 UTC (rev 89) @@ -0,0 +1,67 @@ +<?xml version='1.0' encoding='UTF-8'?> +<!-- + #%L + Nuiton Utils + + $Author$ + $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 xmlns="http://maven-site.nuiton.org/maven-license-plugin/1.0.0" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven-site.nuiton.org/maven-license-plugin/1.0.0 http://maven-site.nuiton.org/maven-license-plugin/licenseProjectDescriptor-1.0.0.xsd"> + <mainLicense>lgpl_v3</mainLicense> + + <headers> + + <header> + <commentStyle>java</commentStyle> + <fileSets> + <fileSet> + <basedir>src/main/java</basedir> + <include>**/*.java</include> + </fileSet> + <fileSet> + <basedir>src/test/java</basedir> + <include>**/*.java</include> + </fileSet> + </fileSets> + </header> + + <header> + <commentStyle>apt</commentStyle> + <fileSet> + <basedir>src/site</basedir> + <include>**/*.apt</include> + </fileSet> + </header> + + <header> + <commentStyle>xml</commentStyle> + <fileSet> + <basedir>src/site</basedir> + <include>**/*.xml</include> + </fileSet> + </header> + + </headers> + +</project> \ No newline at end of file Property changes on: trunk/src/license/project.xml ___________________________________________________________________ Added: svn:keywords + Author Id HeadURL Modified: trunk/src/main/java/org/nuiton/scmwebeditor/AbstractScmWebEditorServlet.java =================================================================== --- trunk/src/main/java/org/nuiton/scmwebeditor/AbstractScmWebEditorServlet.java 2010-04-20 17:55:12 UTC (rev 88) +++ trunk/src/main/java/org/nuiton/scmwebeditor/AbstractScmWebEditorServlet.java 2010-04-21 12:12:20 UTC (rev 89) @@ -1,3 +1,27 @@ +/* + * #%L + * Nuiton-ScmWebEditor + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2009 - 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% + */ package org.nuiton.scmwebeditor; import info.monitorenter.cpdetector.io.*; Modified: trunk/src/main/java/org/nuiton/scmwebeditor/PreviewServlet.java =================================================================== --- trunk/src/main/java/org/nuiton/scmwebeditor/PreviewServlet.java 2010-04-20 17:55:12 UTC (rev 88) +++ trunk/src/main/java/org/nuiton/scmwebeditor/PreviewServlet.java 2010-04-21 12:12:20 UTC (rev 89) @@ -1,20 +1,27 @@ -/* *##% ScmWebEditor - * Copyright (C) 2004 - 2009 CodeLutin - * +/* + * #%L + * Nuiton-ScmWebEditor + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2009 - 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 + * 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 + * + * 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>. ##%*/ - + * <http://www.gnu.org/licenses/lgpl-3.0.html>. + * #L% + */ package org.nuiton.scmwebeditor; import org.apache.commons.io.FileUtils; Modified: trunk/src/main/java/org/nuiton/scmwebeditor/PrivateSvnServlet.java =================================================================== --- trunk/src/main/java/org/nuiton/scmwebeditor/PrivateSvnServlet.java 2010-04-20 17:55:12 UTC (rev 88) +++ trunk/src/main/java/org/nuiton/scmwebeditor/PrivateSvnServlet.java 2010-04-21 12:12:20 UTC (rev 89) @@ -1,20 +1,27 @@ -/* *##% ScmWebEditor - * Copyright (C) 2004 - 2009 CodeLutin - * +/* + * #%L + * Nuiton-ScmWebEditor + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2009 - 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 + * 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 + * + * 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>. ##%*/ - + * <http://www.gnu.org/licenses/lgpl-3.0.html>. + * #L% + */ package org.nuiton.scmwebeditor; import org.apache.commons.logging.Log; Modified: trunk/src/main/java/org/nuiton/scmwebeditor/ScmWebEditorMainServlet.java =================================================================== --- trunk/src/main/java/org/nuiton/scmwebeditor/ScmWebEditorMainServlet.java 2010-04-20 17:55:12 UTC (rev 88) +++ trunk/src/main/java/org/nuiton/scmwebeditor/ScmWebEditorMainServlet.java 2010-04-21 12:12:20 UTC (rev 89) @@ -1,20 +1,27 @@ -/* *##% ScmWebEditor - * Copyright (C) 2004 - 2009 CodeLutin - * +/* + * #%L + * Nuiton-ScmWebEditor + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2009 - 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 + * 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 + * + * 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>. ##%*/ - + * <http://www.gnu.org/licenses/lgpl-3.0.html>. + * #L% + */ package org.nuiton.scmwebeditor; import org.apache.commons.io.FileUtils; Modified: trunk/src/main/java/org/nuiton/scmwebeditor/SearchServlet.java =================================================================== --- trunk/src/main/java/org/nuiton/scmwebeditor/SearchServlet.java 2010-04-20 17:55:12 UTC (rev 88) +++ trunk/src/main/java/org/nuiton/scmwebeditor/SearchServlet.java 2010-04-21 12:12:20 UTC (rev 89) @@ -1,25 +1,29 @@ -/* *##% ScmWebEditor - * Copyright (C) 2004 - 2009 CodeLutin - * +/* + * #%L + * Nuiton-ScmWebEditor + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2009 - 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 + * 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 + * + * 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>. ##%*/ - + * <http://www.gnu.org/licenses/lgpl-3.0.html>. + * #L% + */ package org.nuiton.scmwebeditor; -import java.io.IOException; -import java.io.InputStream; -import java.io.OutputStream; import java.util.logging.Level; import java.util.logging.Logger; import javax.servlet.ServletException; @@ -27,24 +31,17 @@ import javax.servlet.http.HttpServletResponse; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.tmatesoft.svn.core.ISVNCanceller; import org.tmatesoft.svn.core.ISVNDirEntryHandler; import org.tmatesoft.svn.core.SVNDirEntry; import org.tmatesoft.svn.core.SVNException; import org.tmatesoft.svn.core.SVNURL; import org.tmatesoft.svn.core.auth.ISVNAuthenticationManager; -import org.tmatesoft.svn.core.internal.io.svn.ISVNConnector; -import org.tmatesoft.svn.core.internal.io.svn.SVNRepositoryImpl; import org.tmatesoft.svn.core.internal.wc.DefaultSVNOptions; -import org.tmatesoft.svn.core.io.ISVNTunnelProvider; -import org.tmatesoft.svn.core.io.SVNRepository; -import org.tmatesoft.svn.core.wc.DefaultSVNRepositoryPool; import org.tmatesoft.svn.core.wc.ISVNRepositoryPool; import org.tmatesoft.svn.core.wc.SVNClientManager; import org.tmatesoft.svn.core.wc.SVNLogClient; import org.tmatesoft.svn.core.wc.SVNRevision; import org.tmatesoft.svn.core.wc.SVNWCUtil; -import org.tmatesoft.svn.util.ISVNDebugLog; public class SearchServlet extends AbstractScmWebEditorServlet { Modified: trunk/src/main/java/org/nuiton/scmwebeditor/SvnSession.java =================================================================== --- trunk/src/main/java/org/nuiton/scmwebeditor/SvnSession.java 2010-04-20 17:55:12 UTC (rev 88) +++ trunk/src/main/java/org/nuiton/scmwebeditor/SvnSession.java 2010-04-21 12:12:20 UTC (rev 89) @@ -1,20 +1,27 @@ -/* *##% ScmWebEditor - * Copyright (C) 2004 - 2009 CodeLutin - * +/* + * #%L + * Nuiton-ScmWebEditor + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2009 - 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 + * 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 + * + * 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>. ##%*/ - + * <http://www.gnu.org/licenses/lgpl-3.0.html>. + * #L% + */ package org.nuiton.scmwebeditor; import org.apache.commons.io.FileUtils; Modified: trunk/src/site/site_en.xml =================================================================== --- trunk/src/site/site_en.xml 2010-04-20 17:55:12 UTC (rev 88) +++ trunk/src/site/site_en.xml 2010-04-21 12:12:20 UTC (rev 89) @@ -1,4 +1,29 @@ <?xml version="1.0" encoding="UTF-8"?> +<!-- + #%L + Nuiton-ScmWebEditor + + $Id$ + $HeadURL$ + %% + Copyright (C) 2009 - 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}"> <!--publishDate format="dd/MM/yyyy"/--> Modified: trunk/src/site/site_fr.xml =================================================================== --- trunk/src/site/site_fr.xml 2010-04-20 17:55:12 UTC (rev 88) +++ trunk/src/site/site_fr.xml 2010-04-21 12:12:20 UTC (rev 89) @@ -1,59 +1,84 @@ -<?xml version="1.0" encoding="UTF-8"?> -<project name="${project.name}"> - - <publishDate format="dd/MM/yyyy"/> - - <skin> - <groupId>org.nuiton</groupId> - <artifactId>maven-nuiton-skin</artifactId> - <version>${skin.version}</version> - </skin> - - <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> - - <poweredBy> - <logo href="http://maven.apache.org" name="Maven" img="http://maven-site.nuiton.org/scmwebeditor/images/logos/maven-feather.png"/> - <logo href="http://maven-site.nuiton.org/jrst" name="JRst" img="http://maven-site.nuiton.org/scmwebeditor/images/jrst-logo.png"/> - <logo href="http://docutils.sourceforge.net/rst.html" name="ReStructuredText" img="http://maven-site.nuiton.org/scmwebeditor/images/restructuredtext-logo.png"/> - </poweredBy> - - <body> - - <breadcrumbs> - <item name="${project.name}" href="index.html" /> - </breadcrumbs> - - <links> - <item name="Libre-Entreprise" href="http://www.libre-entreprise.org/" /> - <item name="[fr" href="${project.url}/index.html" /> - <item name="en]" href="/en/index.html" /> - </links> - - - <menu name ="Documentation"> - <item name="Utilisateur" href="user.html"> - <item name="Installation" href="install.html"/> - <item name="Tutorial" href="tutoriel.html"/> - </item> - - </menu> - - - <menu name ="Téléchargement"> - <item name="Téléchargement" href="http://www.nuiton.org/projects/list_files/scmwebeditor"/> - </menu> - - <menu name="Demo"> - <item name="Demo" href="http://scmwebeditor.nuiton.org/nuiton-scmwebeditor/scmwebeditor"/> - </menu> - </body> - -</project> +<?xml version="1.0" encoding="UTF-8"?> +<!-- + #%L + Nuiton-ScmWebEditor + + $Id$ + $HeadURL$ + %% + Copyright (C) 2009 - 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}"> + + <publishDate format="dd/MM/yyyy"/> + + <skin> + <groupId>org.nuiton</groupId> + <artifactId>maven-nuiton-skin</artifactId> + <version>${skin.version}</version> + </skin> + + <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> + + <poweredBy> + <logo href="http://maven.apache.org" name="Maven" img="http://maven-site.nuiton.org/scmwebeditor/images/logos/maven-feather.png"/> + <logo href="http://maven-site.nuiton.org/jrst" name="JRst" img="http://maven-site.nuiton.org/scmwebeditor/images/jrst-logo.png"/> + <logo href="http://docutils.sourceforge.net/rst.html" name="ReStructuredText" img="http://maven-site.nuiton.org/scmwebeditor/images/restructuredtext-logo.png"/> + </poweredBy> + + <body> + + <breadcrumbs> + <item name="${project.name}" href="index.html" /> + </breadcrumbs> + + <links> + <item name="Libre-Entreprise" href="http://www.libre-entreprise.org/" /> + <item name="[fr" href="${project.url}/index.html" /> + <item name="en]" href="/en/index.html" /> + </links> + + + <menu name ="Documentation"> + <item name="Utilisateur" href="user.html"> + <item name="Installation" href="install.html"/> + <item name="Tutorial" href="tutoriel.html"/> + </item> + + </menu> + + + <menu name ="Téléchargement"> + <item name="Téléchargement" href="http://www.nuiton.org/projects/list_files/scmwebeditor"/> + </menu> + + <menu name="Demo"> + <item name="Demo" href="http://scmwebeditor.nuiton.org/nuiton-scmwebeditor/scmwebeditor"/> + </menu> + </body> + +</project>