Author: tchemit Date: 2008-08-17 22:07:04 +0000 (Sun, 17 Aug 2008) New Revision: 113 Added: trunk/lutinprocessor/src/main/ trunk/lutinprocessor/src/main/java/ trunk/lutinprocessor/src/main/java/org/ trunk/lutinprocessor/src/site/ trunk/lutinprocessor/src/site/xdoc/ trunk/lutinprocessor/src/site/xdoc/fr/ trunk/lutinprocessor/src/site/xdoc/fr/rst/ trunk/lutinprocessor/src/site/xdoc/fr/rst/Todo.rst trunk/lutinprocessor/src/site/xdoc/fr/rst/index.rst Removed: trunk/lutinprocessor/doc/Todo.rst trunk/lutinprocessor/doc/index.rst trunk/lutinprocessor/lutincheckstyle.xml trunk/lutinprocessor/lutinheader.txt trunk/lutinprocessor/site/ trunk/lutinprocessor/src/java/ trunk/lutinprocessor/src/main/java/org/ trunk/lutinprocessor/xdocs/ Modified: trunk/lutinprocessor/changelog trunk/lutinprocessor/pom.xml Log: passage en org.codelutin:lutinproject:2.4 (layout maven 2) Modified: trunk/lutinprocessor/changelog =================================================================== --- trunk/lutinprocessor/changelog 2008-08-17 21:55:40 UTC (rev 112) +++ trunk/lutinprocessor/changelog 2008-08-17 22:07:04 UTC (rev 113) @@ -1,3 +1,7 @@ +ver-0-14 chemit (2008????) + * utilisation super-pom org.codelutin:lutinproject:2.4 (reusingage de directory layout) + * passage en licence lgpl v3 + ver-0-? poussin (2005????) * modification pour que le processor fonctionne avec des StringReader Deleted: trunk/lutinprocessor/doc/Todo.rst =================================================================== --- trunk/lutinprocessor/doc/Todo.rst 2008-08-17 21:55:40 UTC (rev 112) +++ trunk/lutinprocessor/doc/Todo.rst 2008-08-17 22:07:04 UTC (rev 113) @@ -1,10 +0,0 @@ -==== -Todo -==== - -Voici la liste des tâches qui reste à faire. Si quelqu'un souhaite aider, ou -a une idée à proposer il ne faut pas hésiter. - -- La documentation utilisateur -- La documentation développeur - Deleted: trunk/lutinprocessor/doc/index.rst =================================================================== (Binary files differ) Deleted: trunk/lutinprocessor/lutincheckstyle.xml =================================================================== --- trunk/lutinprocessor/lutincheckstyle.xml 2008-08-17 21:55:40 UTC (rev 112) +++ trunk/lutinprocessor/lutincheckstyle.xml 2008-08-17 22:07:04 UTC (rev 113) @@ -1,189 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE module PUBLIC - "-//Puppy Crawl//DTD Check Configuration 1.1//EN" - "http://www.puppycrawl.com/dtds/configuration_1_1.dtd"> - -<!-- - - Checkstyle configuration that checks the sun coding conventions from: - - - the Java Language Specification at - http://java.sun.com/docs/books/jls/second_edition/html/index.html - - - the Sun Code Conventions at http://java.sun.com/docs/codeconv/ - - - the Javadoc guidelines at - http://java.sun.com/j2se/javadoc/writingdoccomments/index.html - - - the JDK Api documentation http://java.sun.com/j2se/docs/api/index.html - - - some best practices - - Checkstyle is very configurable. Be sure to read the documentation at - http://checkstyle.sf.net (or in your downloaded distribution). - - Most Checks are configurable, be sure to consult the documentation. - - To completely disable a check, just comment it out or delete it from the file. - - Finally, it is worth reading the documentation. - ---> - -<module name="Checker"> - - <!-- Checks that a package.html file exists for each package. --> - <!-- See http://checkstyle.sf.net/config_javadoc.html#PackageHtml --> - <module name="PackageHtml"/> - - <!-- Checks whether files end with a new line. --> - <!-- See http://checkstyle.sf.net/config_misc.html#NewlineAtEndOfFile --> - <module name="NewlineAtEndOfFile"/> - - <!-- Checks that property files contain the same keys. --> - <!-- See http://checkstyle.sf.net/config_misc.html#Translation --> - <module name="Translation"/> - - - <module name="TreeWalker"> - - <property name="cacheFile" value="${checkstyle.cache.file}"/> - - <!-- Checks for Javadoc comments. --> - <!-- See http://checkstyle.sf.net/config_javadoc.html --> - <module name="JavadocMethod"/> - <module name="JavadocType"/> - <module name="JavadocVariable"/> - - - <!-- Checks for Naming Conventions. --> - <!-- See http://checkstyle.sf.net/config_naming.html --> - <module name="ConstantName"/> - <module name="LocalFinalVariableName"/> - <module name="LocalVariableName"/> - <module name="MemberName"/> - <module name="MethodName"/> - <module name="PackageName"/> - <module name="ParameterName"/> - <module name="StaticVariableName"/> - <module name="TypeName"/> - - - <!-- Checks for Headers --> - <!-- See http://checkstyle.sf.net/config_header.html --> - <module name="Header"> - <!-- The follow property value demonstrates the ability --> - <!-- to have access to ANT properties. In this case it uses --> - <!-- the ${basedir} property to allow Checkstyle to be run --> - <!-- from any directory within a project. --> - <property name="headerFile" value="${checkstyle.header.file}"/> - <property name="ignoreLines" value="4,22,24,26,27,29,30"/> - </module> - - <!-- Following interprets the header file as regular expressions. --> - <!-- <module name="RegexpHeader"/> --> - - - <!-- Checks for imports --> - <!-- See http://checkstyle.sf.net/config_import.html --> - <module name="AvoidStarImport"/> - <module name="IllegalImport"/> <!-- defaults to sun.* packages --> - <module name="RedundantImport"/> - <module name="UnusedImports"/> - - - <!-- Checks for Size Violations. --> - <!-- See http://checkstyle.sf.net/config_sizes.html --> - <module name="FileLength"/> - <module name="LineLength"/> - <module name="MethodLength"/> - <module name="ParameterNumber"/> - - - <!-- Checks for whitespace --> - <!-- See http://checkstyle.sf.net/config_whitespace.html --> - <module name="EmptyForIteratorPad"/> - <module name="NoWhitespaceAfter"/> - <module name="NoWhitespaceBefore"/> - <module name="OperatorWrap"/> - <module name="ParenPad"/> - <module name="TabCharacter"/> - <module name="WhitespaceAfter"> - <property name="tokens" value="COMMA, SEMI"/> - </module> - <module name="WhitespaceAround"> - <property name="tokens" value="ASSIGN, BAND, BAND_ASSIGN, BOR, BOR_ASSIGN, BSR, BSR_ASSIGN, BXOR, BXOR_ASSIGN, COLON, DIV, DIV_ASSIGN, EQUAL, GE, GT, LAND, LCURLY, LE, LITERAL_ASSERT, LITERAL_RETURN, LITERAL_SYNCHRONIZED, LITERAL_TRY, LITERAL_WHILE, LOR, LT, MINUS, MINUS_ASSIGN, MOD, MOD_ASSIGN, NOT_EQUAL, PLUS, PLUS_ASSIGN, QUESTION, RCURLY, SL, SLIST, SL_ASSIGN, SR, SR_ASSIGN, STAR, STAR_ASSIGN"/> - <!-- BB: LITERAL_CATCH, LITERAL_DO, LITERAL_ELSE, LITERAL_FINALLY, LITERAL_FOR, LITERAL_IF, --> - </module> - - <!-- Modifier Checks --> - <!-- See http://checkstyle.sf.net/config_modifiers.html --> - <module name="ModifierOrder"/> - <module name="RedundantModifier"/> - - - <!-- Checks for blocks. You know, those {}'s --> - <!-- See http://checkstyle.sf.net/config_blocks.html --> - <module name="AvoidNestedBlocks"/> - <module name="EmptyBlock"/> - <module name="LeftCurly"> - <property name="option" value="eol"/> - </module> - <module name="NeedBraces"/> - <module name="RightCurly"/> - - - <!-- Checks for common coding problems --> - <!-- See http://checkstyle.sf.net/config_coding.html --> - <module name="AvoidInlineConditionals"/> - <module name="DoubleCheckedLocking"/> <!-- MY FAVOURITE --> - <module name="EmptyStatement"/> - <module name="EqualsHashCode"/> - <module name="HiddenField"> - <property name="ignoreConstructorParameter" value="true"/> - </module> - <module name="IllegalInstantiation"/> - <module name="InnerAssignment"/> - <module name="MagicNumber"/> - <module name="MissingSwitchDefault"/> - <module name="RedundantThrows"/> - <module name="SimplifyBooleanExpression"/> - <module name="SimplifyBooleanReturn"/> - <module name="SuperClone"/> - <module name="SuperFinalize"/> - <module name="PackageDeclaration"/> - <module name="ReturnCount"/> - <module name="DeclarationOrder"/> - <module name="ParameterAssignment"/> - <module name="DefaultComesLast"/> - <module name="FallThrough"/> -<!-- BB que dans le 3.5 :( <module name="MultipleStringLiterals"/> --> - <module name="MultipleVariableDeclarations"/> - - - - <!-- Checks for class design --> - <!-- See http://checkstyle.sf.net/config_design.html --> -<!-- BB <module name="DesignForExtension"/> --> - <module name="FinalClass"/> - <module name="HideUtilityClassConstructor"/> - <module name="InterfaceIsType"/> - <module name="VisibilityModifier"> - <property name="protectedAllowed" value="true"/> - </module> - - - <!-- Miscellaneous other checks. --> - <!-- See http://checkstyle.sf.net/config_misc.html --> - <module name="ArrayTypeStyle"/> -<!-- BB peut-être <module name="FinalParameters"/> --> - <module name="GenericIllegalRegexp"> - <property name="format" value="\s+$"/> - <property name="message" value="Line has trailing spaces."/> - </module> - <module name="TodoComment"/> - <module name="UpperEll"/> - - </module> - -</module> Deleted: trunk/lutinprocessor/lutinheader.txt =================================================================== --- trunk/lutinprocessor/lutinheader.txt 2008-08-17 21:55:40 UTC (rev 112) +++ trunk/lutinprocessor/lutinheader.txt 2008-08-17 22:07:04 UTC (rev 113) @@ -1,31 +0,0 @@ -/* *##% -* Copyright (C) 2002, 2003, 2004, 2005 Code Lutin, -* Cédric Pineau, Benjamin Poussin, -* -* -* 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 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. -* -* 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. -*##%*/ - -/* * -* <FILENAME.java> -* -* Created: <DATE> -* -* @author Benjamin Poussin <poussin@codelutin.com> -* @version $Revision$ -* -* Mise a jour: $Date$ -* par : $Author$ -*/ Modified: trunk/lutinprocessor/pom.xml =================================================================== --- trunk/lutinprocessor/pom.xml 2008-08-17 21:55:40 UTC (rev 112) +++ trunk/lutinprocessor/pom.xml 2008-08-17 22:07:04 UTC (rev 113) @@ -2,87 +2,69 @@ <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"> - <!--The version of maven's project object model--> <modelVersion>4.0.0</modelVersion> - <!--lutinproject.xml--> + <!-- ************************************************************* --> + <!-- *** POM Relationships *************************************** --> + <!-- ************************************************************* --> + <parent> - <groupId>lutinlib</groupId> + <groupId>org.codelutin</groupId> <artifactId>lutinproject</artifactId> - <version>2.2</version> + <version>2.4</version> </parent> - <distributionManagement> - <site> - <id>labs</id> - <url>scp://labs.libre-entreprise.org/home/groups/${pom.artifactId}/htdocs/</url> - </site> - </distributionManagement> - - <!--A unique name for this project--> <artifactId>lutinprocessor</artifactId> - <name>Lutin file processor</name> - <!--ejb, jar, war...--> - <packaging>jar</packaging> + <dependencies> + <dependency> + <groupId>ant</groupId> + <artifactId>ant</artifactId> + <version>1.6.5</version> + <scope>compile</scope> + </dependency> + </dependencies> - <!--Version--> - <version>0.13-SNAPSHOT</version> + <!-- ************************************************************* --> + <!-- *** Project Information ************************************* --> + <!-- ************************************************************* --> - <!--Description--> + <name>Lutin file processor</name> + <version>0.14</version> <description> Cette librairie permet la création de filtre sur les fichiers sources. </description> <inceptionYear>2004</inceptionYear> + <url>${labs.project.url}</url> - <!--Tracking--> - <issueManagement> - <url>http://labs.libre-entreprise.org/tracker/?group_id=28</url> - </issueManagement> + <!-- ************************************************************* --> + <!-- *** Build Settings ****************************************** --> + <!-- ************************************************************* --> + + <packaging>jar</packaging> + <properties> - <!--Source base dir--> - <maven.src.dir>${basedir}/src</maven.src.dir> - <!--Compile with ?--> - <maven.compile.source>1.5</maven.compile.source> - <maven.compile.target>1.5</maven.compile.target> - <maven.compile.encoding>UTF-8</maven.compile.encoding> + <!-- id du projet du labs --> + <labs.id>28</labs.id> + + <!-- nom du projet sur le labs (pas necessaire car = artifactId) --> + <!--labs.project>lutinprocessor</labs.project--> + + <!-- BE WARE, this value must rewritten here since it will be otherwise suffixed by inheritance --> + <maven.scm.url>https://${labs.host}/plugins/scmsvn/viewcvs.php/trunk/${pom.artifactId}?root=${labs.project} + </maven.scm.url> + </properties> - <!--Librairies--> - <dependencies> - <dependency> - <groupId>ant</groupId> - <artifactId>ant</artifactId> - <version>1.6.5</version> - <scope>compile</scope> - </dependency> - </dependencies> + <scm> + <url>${maven.scm.url}</url> + </scm> <build> <plugins> - <plugin> - <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-source-plugin</artifactId> - <executions> - <execution> - <phase>verify</phase> - <goals> - <goal>jar</goal> - </goals> - </execution> - </executions> - </plugin> </plugins> </build> + </project> Copied: trunk/lutinprocessor/src/main/java (from rev 106, trunk/lutinprocessor/src/java) Copied: trunk/lutinprocessor/src/main/java/org (from rev 112, trunk/lutinprocessor/src/java/org) Copied: trunk/lutinprocessor/src/site (from rev 106, trunk/lutinprocessor/site) Copied: trunk/lutinprocessor/src/site/xdoc/fr/rst/Todo.rst (from rev 106, trunk/lutinprocessor/doc/Todo.rst) =================================================================== --- trunk/lutinprocessor/src/site/xdoc/fr/rst/Todo.rst (rev 0) +++ trunk/lutinprocessor/src/site/xdoc/fr/rst/Todo.rst 2008-08-17 22:07:04 UTC (rev 113) @@ -0,0 +1,10 @@ +==== +Todo +==== + +Voici la liste des tâches qui reste à faire. Si quelqu'un souhaite aider, ou +a une idée à proposer il ne faut pas hésiter. + +- La documentation utilisateur +- La documentation développeur + Property changes on: trunk/lutinprocessor/src/site/xdoc/fr/rst/Todo.rst ___________________________________________________________________ Name: svn:keywords + Author Date Id Revision Name: svn:eol-style + native Copied: trunk/lutinprocessor/src/site/xdoc/fr/rst/index.rst (from rev 106, trunk/lutinprocessor/doc/index.rst) =================================================================== (Binary files differ) Property changes on: trunk/lutinprocessor/src/site/xdoc/fr/rst/index.rst ___________________________________________________________________ Name: svn:executable + * Name: svn:mime-type + application/octet-stream