February 2009 - Jrst-commits - mailman.cloud.codelutin.com

r276 - maven-jrst-plugin/trunk
by tchemit＠users.labs.libre-entreprise.org 18 Feb '09

18 Feb '09

Author: tchemit Date: 2009-02-18 18:40:13 +0000 (Wed, 18 Feb 2009) New Revision: 276 Modified: maven-jrst-plugin/trunk/changelog.txt maven-jrst-plugin/trunk/pom.xml Log: dernier commit avant release Modified: maven-jrst-plugin/trunk/changelog.txt =================================================================== --- maven-jrst-plugin/trunk/changelog.txt 2009-02-18 18:34:50 UTC (rev 275) +++ maven-jrst-plugin/trunk/changelog.txt 2009-02-18 18:40:13 UTC (rev 276) @@ -1,8 +1,8 @@ -ver-0-8-4 chatellier 200902xx - * 20090210 [chemit] use lutinproject-3.4 - * 20090205 Set default locale to 'en' - * 20090205 Remove some required setting for parameter with default values - * 20090205 Write javadoc in english +ver-0-8-4 chemit 20090218 + * 20090210 [chemit] use lutinproject:3.4 + * 20090205 [chatellier] Set default locale to 'en' + * 20090205 [chatellier] Remove some required setting for parameter with default values + * 20090205 [chatellier] Write javadoc in english ver-0-8-3 thimel 200810XX * 20081008 [chemit] refactor plugin to generate ony when required Modified: maven-jrst-plugin/trunk/pom.xml =================================================================== --- maven-jrst-plugin/trunk/pom.xml 2009-02-18 18:34:50 UTC (rev 275) +++ maven-jrst-plugin/trunk/pom.xml 2009-02-18 18:40:13 UTC (rev 276) @@ -9,7 +9,7 @@ <parent> <groupId>org.codelutin</groupId> <artifactId>lutinproject</artifactId> - <version>3.4-SNAPSHOT</version> + <version>3.4</version> </parent> <artifactId>maven-jrst-plugin</artifactId> @@ -69,7 +69,7 @@  <maven.site.locales>fr,en</maven.site.locales> - <lutinpluginutil.version>0.3-SNAPSHOT</lutinpluginutil.version> + <lutinpluginutil.version>0.3</lutinpluginutil.version> <maven.version>2.0.9</maven.version> </properties> @@ -172,7 +172,7 @@ <plugin> <groupId>org.codelutin</groupId> <artifactId>maven-license-switcher-plugin</artifactId> - <version>0.5</version> + <version>0.6</version> <configuration> <licenseName>${license-switcher.licenseName}</licenseName> </configuration>

1 0

r275 - jrst/trunk
by tchemit＠users.labs.libre-entreprise.org 18 Feb '09

18 Feb '09

Author: tchemit Date: 2009-02-18 18:34:50 +0000 (Wed, 18 Feb 2009) New Revision: 275 Modified: jrst/trunk/pom.xml Log: [maven-release-plugin] prepare for next development iteration Modified: jrst/trunk/pom.xml =================================================================== --- jrst/trunk/pom.xml 2009-02-18 18:34:47 UTC (rev 274) +++ jrst/trunk/pom.xml 2009-02-18 18:34:50 UTC (rev 275) @@ -14,7 +14,7 @@ </parent> <artifactId>jrst</artifactId> - <version>0.8.4</version> + <version>0.8.5-SNAPSHOT</version> <dependencies> <dependency> @@ -218,9 +218,9 @@   <scm> - <connection>scm:svn:svn://anonymous@labs.libre-entreprise.org/svnroot/jrst/jrst/tags/0.8.4</connection> - <developerConnection>scm:svn:svn+ssh://tchemit@labs.libre-entreprise.org/svnroot/jrst/jrst/tags/0.8.4</developerConnection> - <url>http://labs.libre-entreprise.org/plugins/scmsvn/viewcvs.php/jrst/tags/0.8.4…</url> + <connection>scm:svn:svn://anonymous@labs.libre-entreprise.org/svnroot/jrst/jrst/trunk</connection> + <developerConnection>scm:svn:svn+ssh://tchemit@labs.libre-entreprise.org/svnroot/jrst/jrst/trunk</developerConnection> + <url>http://labs.libre-entreprise.org/plugins/scmsvn/viewcvs.php/jrst/trunk/?roo…</url> </scm>

1 0

r274 - in jrst/tags: . 0.8.4
by tchemit＠users.labs.libre-entreprise.org 18 Feb '09

18 Feb '09

Author: tchemit Date: 2009-02-18 18:34:47 +0000 (Wed, 18 Feb 2009) New Revision: 274 Added: jrst/tags/0.8.4/ jrst/tags/0.8.4/changelog.txt jrst/tags/0.8.4/pom.xml Removed: jrst/tags/0.8.4/changelog.txt jrst/tags/0.8.4/pom.xml Log: [maven-release-plugin] copy for tag 0.8.4 Copied: jrst/tags/0.8.4 (from rev 269, jrst/trunk) Deleted: jrst/tags/0.8.4/changelog.txt =================================================================== --- jrst/trunk/changelog.txt 2009-02-17 17:02:04 UTC (rev 269) +++ jrst/tags/0.8.4/changelog.txt 2009-02-18 18:34:47 UTC (rev 274) @@ -1,25 +0,0 @@ -ver-0.8.4 xxx 2009XXXX - - * Fix javadoc - * Fix anchor in content - * Update xml2rst.xsl stylesheet - * Re add i18n plugin on build - * Reenable tests during maven build - * Move test to junit 4 - * switch to lutinproject 3.4 - -ver-0.8.3 chemit 20081009 - - * Add title property in xdoc xslt - * Switch license to lgpl - * maven 2 layout - -ver-0.7 poussin 20061110 - - * complete rewrite where dom4j tree is use as memory model - * parser is in 3 classes, reader, lexer, composer - * generation is based on XSL (support, xhtml, xdoc, docbook, other xsl) - -ver-0.6 poussin 20060327 - - * first version with only regexp and own memory model \ No newline at end of file Copied: jrst/tags/0.8.4/changelog.txt (from rev 272, jrst/trunk/changelog.txt) =================================================================== --- jrst/tags/0.8.4/changelog.txt (rev 0) +++ jrst/tags/0.8.4/changelog.txt 2009-02-18 18:34:47 UTC (rev 274) @@ -0,0 +1,25 @@ +ver-0.8.4 chemit 20090218 + + * Fix javadoc + * Fix anchor in content + * Update xml2rst.xsl stylesheet + * Re add i18n plugin on build + * Reenable tests during maven build + * Move test to junit 4 + * switch to lutinproject 3.4 + +ver-0.8.3 chemit 20081009 + + * Add title property in xdoc xslt + * Switch license to lgpl + * maven 2 layout + +ver-0.7 poussin 20061110 + + * complete rewrite where dom4j tree is use as memory model + * parser is in 3 classes, reader, lexer, composer + * generation is based on XSL (support, xhtml, xdoc, docbook, other xsl) + +ver-0.6 poussin 20060327 + + * first version with only regexp and own memory model \ No newline at end of file Deleted: jrst/tags/0.8.4/pom.xml =================================================================== --- jrst/trunk/pom.xml 2009-02-17 17:02:04 UTC (rev 269) +++ jrst/tags/0.8.4/pom.xml 2009-02-18 18:34:47 UTC (rev 274) @@ -1,275 +0,0 @@ -<?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> - -  -  -  - - <parent> - <groupId>org.codelutin</groupId> - <artifactId>lutinproject</artifactId> - <version>3.4-SNAPSHOT</version> - </parent> - - <artifactId>jrst</artifactId> - <version>0.8.4-SNAPSHOT</version> - - <dependencies> - <dependency> - <groupId>commons-lang</groupId> - <artifactId>commons-lang</artifactId> - <version>2.4</version> - <scope>compile</scope> - </dependency> - <dependency> - <groupId>org.codelutin</groupId> - <artifactId>lutinutil</artifactId> - <version>${lutinutil.version}</version> - <scope>compile</scope> - </dependency> - <dependency> - <groupId>xmlunit</groupId> - <artifactId>xmlunit</artifactId> - <version>1.2</version> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.apache.xmlgraphics</groupId> - <artifactId>fop</artifactId> - <version>0.95</version> - <scope>compile</scope> - </dependency> - <dependency> - <groupId>xalan</groupId> - <artifactId>xalan</artifactId> - <version>2.7.1</version> - <scope>runtime</scope> - </dependency> - <dependency> - <groupId>sdoc</groupId> - <artifactId>sdoc</artifactId> - <version>0.5.0-beta</version> - <scope>test</scope> - </dependency> - <dependency> - <groupId>dom4j</groupId> - <artifactId>dom4j</artifactId> - <version>1.6.1</version> - <scope>compile</scope> - </dependency> - <dependency> - <groupId>uk.co.flamingpenguin</groupId> - <artifactId>jewelcli</artifactId> - <version>0.54</version> - <scope>compile</scope> - </dependency> - <dependency> - <groupId>jaxen</groupId> - <artifactId>jaxen</artifactId> - <version>1.1.1</version> - <scope>runtime</scope> - </dependency> - <dependency> - <groupId>net.sf.docbook</groupId> - <artifactId>docbook-xsl</artifactId> - <version>1.74.0</version> - <type>zip</type> - <classifier>resources</classifier> - <scope>runtime</scope> - </dependency> - </dependencies> - -  -  -  - - <name>JRst</name> - <description>Parser RST en Java.</description> - <inceptionYear>2004</inceptionYear> - -  -  -  - <packaging>jar</packaging> - - <properties> -  - <labs.id>54</labs.id> - -  - <labs.project>jrst</labs.project> - -  - <maven.site.locales>fr,en</maven.site.locales> - </properties> - - <build> - - <defaultGoal>install</defaultGoal> - - <plugins> - - <plugin> - <artifactId>maven-jar-plugin</artifactId> - <configuration> - <archive> - <manifest> - <addClasspath>true</addClasspath> - <mainClass>org.codelutin.jrst.JRST</mainClass> - <classpathPrefix>lib/</classpathPrefix> - </manifest> - </archive> - </configuration> - </plugin> - - <plugin> - <artifactId>maven-dependency-plugin</artifactId> - <configuration> - <outputDirectory>${project.build.directory}/lib</outputDirectory> - </configuration> - <executions> - <execution> - <id>copy-dependencies</id> - </execution> - </executions> - </plugin> - -  - <plugin> - <groupId>org.codelutin</groupId> - <artifactId>maven-jrst-plugin</artifactId> - <version>${jrst.version}</version> - <configuration> - <directoryIn>${maven.src.dir}/site</directoryIn> - <directoryOut>${maven.site.gen.dir}</directoryOut> - <defaultLocale>fr</defaultLocale> - <inputEncoding>${maven.compile.encoding}</inputEncoding> - <outputEncoding>${maven.compile.encoding}</outputEncoding> - </configuration> - <executions> - <execution> - <phase>pre-site</phase> - <goals> - <goal>jrst</goal> - </goals> - </execution> - </executions> - </plugin> - -  - </plugins> - - <pluginManagement> - <plugins> - <plugin> - <artifactId>maven-assembly-plugin</artifactId> - <configuration> - <descriptors> - <descriptor>src/main/assembly/deps.xml</descriptor> - <descriptor>src/main/assembly/full.xml</descriptor> - </descriptors> - <attach>false</attach> - </configuration> - <executions> - <execution> - <id>create-assembly</id> - <goals> - <goal>single</goal> - </goals> - </execution> - </executions> - </plugin> - </plugins> - </pluginManagement> - - </build> - -  -  -  -  - <scm> - <connection>${maven.scm.connection}</connection> - <developerConnection>${maven.scm.developerConnection}</developerConnection> - <url>${maven.scm.url}</url> - </scm> - -  - <repositories> - <repository> - <id>codelutin-repository</id> - <name>CodeLutinRepository</name> - <url>http://lutinbuilder.labs.libre-entreprise.org/maven2</url> - <snapshots> - <enabled>true</enabled> - <checksumPolicy>warn</checksumPolicy> - </snapshots> - <releases> - <enabled>true</enabled> - <checksumPolicy>warn</checksumPolicy> - </releases> - </repository> - </repositories> - -  - <profiles> - <profile> - <id>release-profile</id> - <activation> - <property> - <name>performRelease</name> - <value>true</value> - </property> - </activation> - <build> - <plugins> - -  - <plugin> - <artifactId>maven-assembly-plugin</artifactId> - <executions> - <execution> - <id>create-assembly</id> - <phase>package</phase> - </execution> - </executions> - </plugin> - -  - <plugin> - <groupId>org.codelutin</groupId> - <artifactId>maven-license-switcher-plugin</artifactId> - <version>${license-switcher.version}</version> - <configuration> - <licenseName>${license-switcher.licenseName}</licenseName> - </configuration> - <executions> - <execution> - <id>attach-licenses</id> - <goals> - <goal>license</goal> - <goal>third-party</goal> - </goals> - </execution> - </executions> - </plugin> - - </plugins> - - </build> - </profile> - </profiles> - -</project> Copied: jrst/tags/0.8.4/pom.xml (from rev 273, jrst/trunk/pom.xml) =================================================================== --- jrst/tags/0.8.4/pom.xml (rev 0) +++ jrst/tags/0.8.4/pom.xml 2009-02-18 18:34:47 UTC (rev 274) @@ -0,0 +1,292 @@ +<?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> + +  +  +  + + <parent> + <groupId>org.codelutin</groupId> + <artifactId>lutinproject</artifactId> + <version>3.4</version> + </parent> + + <artifactId>jrst</artifactId> + <version>0.8.4</version> + + <dependencies> + <dependency> + <groupId>commons-lang</groupId> + <artifactId>commons-lang</artifactId> + <version>2.4</version> + <scope>compile</scope> + </dependency> + <dependency> + <groupId>org.codelutin</groupId> + <artifactId>lutinutil</artifactId> + <version>${lutinutil.version}</version> + <scope>compile</scope> + </dependency> + <dependency> + <groupId>xmlunit</groupId> + <artifactId>xmlunit</artifactId> + <version>1.2</version> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.apache.xmlgraphics</groupId> + <artifactId>fop</artifactId> + <version>0.95</version> + <scope>compile</scope> + </dependency> + <dependency> + <groupId>xalan</groupId> + <artifactId>xalan</artifactId> + <version>2.7.1</version> + <scope>runtime</scope> + </dependency> + <dependency> + <groupId>sdoc</groupId> + <artifactId>sdoc</artifactId> + <version>0.5.0-beta</version> + <scope>test</scope> + </dependency> + <dependency> + <groupId>dom4j</groupId> + <artifactId>dom4j</artifactId> + <version>1.6.1</version> + <scope>compile</scope> + </dependency> + <dependency> + <groupId>uk.co.flamingpenguin</groupId> + <artifactId>jewelcli</artifactId> + <version>0.54</version> + <scope>compile</scope> + </dependency> + <dependency> + <groupId>jaxen</groupId> + <artifactId>jaxen</artifactId> + <version>1.1.1</version> + <scope>runtime</scope> + </dependency> + <dependency> + <groupId>net.sf.docbook</groupId> + <artifactId>docbook-xsl</artifactId> + <version>1.74.0</version> + <type>zip</type> + <classifier>resources</classifier> + <scope>runtime</scope> + </dependency> + </dependencies> + +  +  +  + + <name>JRst</name> + <description>Parser RST en Java.</description> + <inceptionYear>2004</inceptionYear> + +  +  +  + <packaging>jar</packaging> + + <properties> +  + <labs.id>54</labs.id> + +  + <labs.project>jrst</labs.project> + +  + <maven.site.locales>fr,en</maven.site.locales> + + <lutinutil.version>1.0.3</lutinutil.version> + <i18n.version>0.9</i18n.version> + </properties> + + <build> + + <defaultGoal>install</defaultGoal> + + <plugins> + +  + <plugin> + <groupId>org.codelutin</groupId> + <artifactId>maven-i18n-plugin</artifactId> + <version>${i18n.version}</version> + <executions> + <execution> + <goals> + <goal>parserJava</goal> + <goal>gen</goal> + </goals> + </execution> + </executions> + </plugin> + + <plugin> + <artifactId>maven-jar-plugin</artifactId> + <configuration> + <archive> + <manifest> + <addClasspath>true</addClasspath> + <mainClass>org.codelutin.jrst.JRST</mainClass> + <classpathPrefix>lib/</classpathPrefix> + </manifest> + </archive> + </configuration> + </plugin> + + <plugin> + <artifactId>maven-dependency-plugin</artifactId> +  + <executions> + <execution> + <id>copy-dependencies</id> + </execution> + </executions> + </plugin> + +  + <plugin> + <groupId>org.codelutin</groupId> + <artifactId>maven-jrst-plugin</artifactId> + <version>0.8.3</version> + <configuration> + <directoryIn>${maven.src.dir}/site</directoryIn> + <directoryOut>${maven.site.gen.dir}</directoryOut> + <defaultLocale>fr</defaultLocale> + <inputEncoding>${project.build.sourceEncoding}</inputEncoding> + <outputEncoding>${project.build.sourceEncoding}</outputEncoding> + </configuration> + <executions> + <execution> + <phase>pre-site</phase> + <goals> + <goal>jrst</goal> + </goals> + </execution> + </executions> + </plugin> + +  + </plugins> + + <pluginManagement> + <plugins> + <plugin> + <artifactId>maven-assembly-plugin</artifactId> + <configuration> + <descriptors> + <descriptor>src/main/assembly/deps.xml</descriptor> + <descriptor>src/main/assembly/full.xml</descriptor> + </descriptors> + <attach>false</attach> + </configuration> + <executions> + <execution> + <id>create-assembly</id> + <goals> + <goal>single</goal> + </goals> + </execution> + </executions> + </plugin> + </plugins> + </pluginManagement> + + </build> + +  +  +  +  + <scm> + <connection>scm:svn:svn://anonymous@labs.libre-entreprise.org/svnroot/jrst/jrst/tags/0.8.4</connection> + <developerConnection>scm:svn:svn+ssh://tchemit@labs.libre-entreprise.org/svnroot/jrst/jrst/tags/0.8.4</developerConnection> + <url>http://labs.libre-entreprise.org/plugins/scmsvn/viewcvs.php/jrst/tags/0.8.4…</url> + </scm> + +  + <repositories> + <repository> + <id>codelutin-repository</id> + <name>CodeLutinRepository</name> + <url>http://lutinbuilder.labs.libre-entreprise.org/maven2</url> + <snapshots> + <enabled>true</enabled> + <checksumPolicy>warn</checksumPolicy> + </snapshots> + <releases> + <enabled>true</enabled> + <checksumPolicy>warn</checksumPolicy> + </releases> + </repository> + </repositories> + +  + <profiles> + <profile> + <id>release-profile</id> + <activation> + <property> + <name>performRelease</name> + <value>true</value> + </property> + </activation> + <build> + <plugins> + +  + <plugin> + <artifactId>maven-assembly-plugin</artifactId> + <executions> + <execution> + <id>create-assembly</id> + <phase>package</phase> + </execution> + </executions> + </plugin> + +  + <plugin> + <groupId>org.codelutin</groupId> + <artifactId>maven-license-switcher-plugin</artifactId> + <version>0.6</version> + <configuration> + <licenseName>${license-switcher.licenseName}</licenseName> + </configuration> + <executions> + <execution> + <id>attach-licenses</id> + <goals> + <goal>license</goal> + <goal>third-party</goal> + </goals> + </execution> + </executions> + </plugin> + + </plugins> + + </build> + </profile> + </profiles> + +</project>

1 0

r273 - jrst/trunk
by tchemit＠users.labs.libre-entreprise.org 18 Feb '09

18 Feb '09

Author: tchemit Date: 2009-02-18 18:34:44 +0000 (Wed, 18 Feb 2009) New Revision: 273 Modified: jrst/trunk/pom.xml Log: [maven-release-plugin] prepare release 0.8.4 Modified: jrst/trunk/pom.xml =================================================================== --- jrst/trunk/pom.xml 2009-02-18 18:31:07 UTC (rev 272) +++ jrst/trunk/pom.xml 2009-02-18 18:34:44 UTC (rev 273) @@ -1,6 +1,5 @@ <?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"> +<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> @@ -15,7 +14,7 @@ </parent> <artifactId>jrst</artifactId> - <version>0.8.4-SNAPSHOT</version> + <version>0.8.4</version> <dependencies> <dependency> @@ -219,9 +218,9 @@   <scm> - <connection>${maven.scm.connection}</connection> - <developerConnection>${maven.scm.developerConnection}</developerConnection> - <url>${maven.scm.url}</url> + <connection>scm:svn:svn://anonymous@labs.libre-entreprise.org/svnroot/jrst/jrst/tags/0.8.4</connection> + <developerConnection>scm:svn:svn+ssh://tchemit@labs.libre-entreprise.org/svnroot/jrst/jrst/tags/0.8.4</developerConnection> + <url>http://labs.libre-entreprise.org/plugins/scmsvn/viewcvs.php/jrst/tags/0.8.4…</url> </scm>

1 0

r272 - jrst/trunk
by tchemit＠users.labs.libre-entreprise.org 18 Feb '09

18 Feb '09

Author: tchemit Date: 2009-02-18 18:31:07 +0000 (Wed, 18 Feb 2009) New Revision: 272 Modified: jrst/trunk/changelog.txt jrst/trunk/pom.xml Log: dernier commit avant release Modified: jrst/trunk/changelog.txt =================================================================== --- jrst/trunk/changelog.txt 2009-02-18 15:24:59 UTC (rev 271) +++ jrst/trunk/changelog.txt 2009-02-18 18:31:07 UTC (rev 272) @@ -1,4 +1,4 @@ -ver-0.8.4 xxx 2009XXXX +ver-0.8.4 chemit 20090218 * Fix javadoc * Fix anchor in content Modified: jrst/trunk/pom.xml =================================================================== --- jrst/trunk/pom.xml 2009-02-18 15:24:59 UTC (rev 271) +++ jrst/trunk/pom.xml 2009-02-18 18:31:07 UTC (rev 272) @@ -11,7 +11,7 @@ <parent> <groupId>org.codelutin</groupId> <artifactId>lutinproject</artifactId> - <version>3.4-SNAPSHOT</version> + <version>3.4</version> </parent> <artifactId>jrst</artifactId> @@ -105,8 +105,8 @@  <maven.site.locales>fr,en</maven.site.locales> - <lutinutil.version>1.0.2</lutinutil.version> - <i18n.version>0.9-SNAPSHOT</i18n.version> + <lutinutil.version>1.0.3</lutinutil.version> + <i18n.version>0.9</i18n.version> </properties> <build> @@ -269,7 +269,7 @@ <plugin> <groupId>org.codelutin</groupId> <artifactId>maven-license-switcher-plugin</artifactId> - <version>0.5</version> + <version>0.6</version> <configuration> <licenseName>${license-switcher.licenseName}</licenseName> </configuration>

1 0

r271 - maven-jrst-plugin/trunk
by tchemit＠users.labs.libre-entreprise.org 18 Feb '09

18 Feb '09

Author: tchemit Date: 2009-02-18 15:24:59 +0000 (Wed, 18 Feb 2009) New Revision: 271 Modified: maven-jrst-plugin/trunk/pom.xml Log: suppression des versions de nos librairies de lutinproject Modified: maven-jrst-plugin/trunk/pom.xml =================================================================== --- maven-jrst-plugin/trunk/pom.xml 2009-02-18 15:24:51 UTC (rev 270) +++ maven-jrst-plugin/trunk/pom.xml 2009-02-18 15:24:59 UTC (rev 271) @@ -18,13 +18,13 @@ <dependency> <groupId>org.codelutin</groupId> <artifactId>jrst</artifactId> - <version>${jrst.version}</version> + <version>${project.version}</version> <scope>compile</scope> </dependency> <dependency> <groupId>org.codelutin</groupId> <artifactId>lutinpluginutil</artifactId> - <version>0.3-SNAPSHOT</version> + <version>${lutinpluginutil.version}</version> <scope>compile</scope> </dependency> @@ -69,8 +69,8 @@  <maven.site.locales>fr,en</maven.site.locales> - <jrst.version>0.8.4-SNAPSHOT</jrst.version> - + <lutinpluginutil.version>0.3-SNAPSHOT</lutinpluginutil.version> + <maven.version>2.0.9</maven.version> </properties> @@ -97,13 +97,13 @@ <plugin> <groupId>org.codelutin</groupId> <artifactId>maven-jrst-plugin</artifactId> - <version>${jrst.version}</version> + <version>${project.version}</version> <configuration> <directoryIn>${maven.src.dir}/site</directoryIn> <directoryOut>${maven.site.gen.dir}</directoryOut> <defaultLocale>fr</defaultLocale> - <inputEncoding>${maven.compile.encoding}</inputEncoding> - <outputEncoding>${maven.compile.encoding}</outputEncoding> + <inputEncoding>${project.build.sourceEncoding}</inputEncoding> + <outputEncoding>${project.build.sourceEncoding}</outputEncoding> </configuration> <executions> <execution> @@ -172,7 +172,7 @@ <plugin> <groupId>org.codelutin</groupId> <artifactId>maven-license-switcher-plugin</artifactId> - <version>${license-switcher.version}</version> + <version>0.5</version> <configuration> <licenseName>${license-switcher.licenseName}</licenseName> </configuration>

1 0

r270 - jrst/trunk
by tchemit＠users.labs.libre-entreprise.org 18 Feb '09

18 Feb '09

Author: tchemit Date: 2009-02-18 15:24:51 +0000 (Wed, 18 Feb 2009) New Revision: 270 Modified: jrst/trunk/pom.xml Log: suppression des versions de nos librairies de lutinproject Modified: jrst/trunk/pom.xml =================================================================== --- jrst/trunk/pom.xml 2009-02-17 17:02:04 UTC (rev 269) +++ jrst/trunk/pom.xml 2009-02-18 15:24:51 UTC (rev 270) @@ -104,6 +104,9 @@  <maven.site.locales>fr,en</maven.site.locales> + + <lutinutil.version>1.0.2</lutinutil.version> + <i18n.version>0.9-SNAPSHOT</i18n.version> </properties> <build> @@ -112,7 +115,22 @@ <plugins> +  <plugin> + <groupId>org.codelutin</groupId> + <artifactId>maven-i18n-plugin</artifactId> + <version>${i18n.version}</version> + <executions> + <execution> + <goals> + <goal>parserJava</goal> + <goal>gen</goal> + </goals> + </execution> + </executions> + </plugin> + + <plugin> <artifactId>maven-jar-plugin</artifactId> <configuration> <archive> @@ -127,9 +145,9 @@ <plugin> <artifactId>maven-dependency-plugin</artifactId> - <configuration> +  <executions> <execution> <id>copy-dependencies</id> @@ -141,13 +159,13 @@ <plugin> <groupId>org.codelutin</groupId> <artifactId>maven-jrst-plugin</artifactId> - <version>${jrst.version}</version> + <version>0.8.3</version> <configuration> <directoryIn>${maven.src.dir}/site</directoryIn> <directoryOut>${maven.site.gen.dir}</directoryOut> <defaultLocale>fr</defaultLocale> - <inputEncoding>${maven.compile.encoding}</inputEncoding> - <outputEncoding>${maven.compile.encoding}</outputEncoding> + <inputEncoding>${project.build.sourceEncoding}</inputEncoding> + <outputEncoding>${project.build.sourceEncoding}</outputEncoding> </configuration> <executions> <execution> @@ -251,7 +269,7 @@ <plugin> <groupId>org.codelutin</groupId> <artifactId>maven-license-switcher-plugin</artifactId> - <version>${license-switcher.version}</version> + <version>0.5</version> <configuration> <licenseName>${license-switcher.licenseName}</licenseName> </configuration>

1 0

r269 - maven-jrst-plugin/trunk/src/main/java/org/codelutin/jrst/plugin
by chatellier＠users.labs.libre-entreprise.org 17 Feb '09

17 Feb '09

Author: chatellier Date: 2009-02-17 17:02:04 +0000 (Tue, 17 Feb 2009) New Revision: 269 Modified: maven-jrst-plugin/trunk/src/main/java/org/codelutin/jrst/plugin/JRstPlugin.java Log: Use ${project.build.sourceEncoding} for default encoding Modified: maven-jrst-plugin/trunk/src/main/java/org/codelutin/jrst/plugin/JRstPlugin.java =================================================================== --- maven-jrst-plugin/trunk/src/main/java/org/codelutin/jrst/plugin/JRstPlugin.java 2009-02-17 13:46:14 UTC (rev 268) +++ maven-jrst-plugin/trunk/src/main/java/org/codelutin/jrst/plugin/JRstPlugin.java 2009-02-17 17:02:04 UTC (rev 269) @@ -79,7 +79,7 @@ /** * Site source encoding. * - * @parameter default-value="UTF-8" + * @parameter default-value="${project.build.sourceEncoding}" * @since 0.8 */ protected String inputEncoding = "UTF-8"; @@ -95,7 +95,7 @@ /** * Site generated encoding. * - * @parameter default-value="UTF-8" + * @parameter default-value="${project.build.sourceEncoding}" * @since 0.8 */ protected String outputEncoding = "UTF-8";

1 0

r268 - jrst/trunk/src/main/java/org/codelutin/jrst
by chatellier＠users.labs.libre-entreprise.org 17 Feb '09

17 Feb '09

Author: chatellier Date: 2009-02-17 13:46:14 +0000 (Tue, 17 Feb 2009) New Revision: 268 Modified: jrst/trunk/src/main/java/org/codelutin/jrst/JRST.java Log: Fix some checktyle Modified: jrst/trunk/src/main/java/org/codelutin/jrst/JRST.java =================================================================== --- jrst/trunk/src/main/java/org/codelutin/jrst/JRST.java 2009-02-17 13:34:45 UTC (rev 267) +++ jrst/trunk/src/main/java/org/codelutin/jrst/JRST.java 2009-02-17 13:46:14 UTC (rev 268) @@ -325,17 +325,21 @@ done = true; ecraser = true; } - } else + } else { done = true; + } } String cmd = ""; - if (ecraser) + if (ecraser) { cmd += "--force "; + } cmd += "-t " + type; - if (cheminXSL.length() > 0) + if (cheminXSL.length() > 0) { cmd += " -x " + cheminXSL; - if (cheminSortie.length() > 0) + } + if (cheminSortie.length() > 0) { cmd += " -o " + cheminSortie; + } cmd += " " + cheminRST + " "; return cmd.split(" "); } @@ -363,10 +367,12 @@ throws IOException { String line = ""; FileCompletion fc = new FileCompletion(enreg, exit); - if (fc.consoleAvailable()) + if (fc.consoleAvailable()) { line = fc.read(); - if (line == null) + } + if (line == null) { line = ""; + } return line; }

1 0

r267 - jrst/trunk/src/main/java/org/codelutin/jrst
by chatellier＠users.labs.libre-entreprise.org 17 Feb '09

17 Feb '09

Author: chatellier Date: 2009-02-17 13:34:45 +0000 (Tue, 17 Feb 2009) New Revision: 267 Modified: jrst/trunk/src/main/java/org/codelutin/jrst/JRST.java jrst/trunk/src/main/java/org/codelutin/jrst/JRSTLexer.java Log: Fix some checktyle Modified: jrst/trunk/src/main/java/org/codelutin/jrst/JRST.java =================================================================== --- jrst/trunk/src/main/java/org/codelutin/jrst/JRST.java 2009-02-17 13:29:30 UTC (rev 266) +++ jrst/trunk/src/main/java/org/codelutin/jrst/JRST.java 2009-02-17 13:34:45 UTC (rev 267) @@ -253,8 +253,9 @@ if (!fileRST.exists()) { System.out.println(_("dontExist")); cheminRST = ""; - } else + } else { done = true; + } } done = false; String type = ""; @@ -263,8 +264,9 @@ System.out.println(_("outputFormat?")); type = lire(); if (type.matches("xhtml|docbook|xml|html|xdoc|rst|pdf|odt|rtf") - || type.length() == 0) + || type.length() == 0) { done = true; + } } String cheminXSL = ""; if (type.length() == 0) { @@ -275,9 +277,10 @@ File fileRST = new File(cheminXSLtmp); if (cheminXSLtmp.equals("")) { - if (cheminXSL.length() != 0) + if (cheminXSL.length() != 0) { cheminXSL = cheminXSL.substring(0, cheminXSL.length() - 1); + } done = true; } else { if (!fileRST.exists()) { @@ -289,10 +292,12 @@ System.out.println(_("other?")); other = lire(); } while (!other.matches("y|n|o")); - if (other.equals("y") || other.equals("o")) + if (other.equals("y") || other.equals("o")) { cheminXSL += ","; - else if (other.equals("n")) + } + else if (other.equals("n")) { done = true; + } } } Modified: jrst/trunk/src/main/java/org/codelutin/jrst/JRSTLexer.java =================================================================== --- jrst/trunk/src/main/java/org/codelutin/jrst/JRSTLexer.java 2009-02-17 13:29:30 UTC (rev 266) +++ jrst/trunk/src/main/java/org/codelutin/jrst/JRSTLexer.java 2009-02-17 13:34:45 UTC (rev 267) @@ -54,17 +54,17 @@ public class JRSTLexer { /** to use log facility, just put in your code: log.info(\"...\"); */ - static private Log log = LogFactory.getLog(JRSTLexer.class); + private static Log log = LogFactory.getLog(JRSTLexer.class); - static final public String BULLET_CHAR = "*" + "+" + "-"/* + public static final String BULLET_CHAR = "*" + "+" + "-"/* * + "\u2022" + * "\u2023" + * "\u2043" */; - static final public String TITLE_CHAR = "-=-~'`^+:!\"#$%&*,./;|?@\\_[\\]{}<>()"; + public static final String TITLE_CHAR = "-=-~'`^+:!\"#$%&*,./;|?@\\_[\\]{}<>()"; - static final public String DOCINFO_ITEM = "author|authors|organization|address|contact|version|revision|status|date|copyright"; + public static final String DOCINFO_ITEM = "author|authors|organization|address|contact|version|revision|status|date|copyright"; public static final String ADMONITION_PATTERN = "admonition|attention|caution|danger|error|hint|important|note|tip|warning"; @@ -72,13 +72,13 @@ // Title Elements // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ - static final public String TITLE = "title"; + public static final String TITLE = "title"; // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ // Bibliographic Elements // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ - static final public String DOCINFO = "docinfo"; + public static final String DOCINFO = "docinfo"; // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ // Decoration Elements @@ -94,7 +94,7 @@ // Structural Elements // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ - static final public String TRANSITION = "transition"; + public static final String TRANSITION = "transition"; public static final String SIDEBAR = "sidebar";

1 0