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

r469 - trunk
by tchemit＠users.nuiton.org April 29, 2010

April 29, 2010

Author: tchemit Date: 2010-04-29 07:44:12 +0200 (Thu, 29 Apr 2010) New Revision: 469 Log: Utilisation de mavenpom4redmine 2.1.3 Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2010-04-22 10:41:45 UTC (rev 468) +++ trunk/pom.xml 2010-04-29 05:44:12 UTC (rev 469) @@ -33,7 +33,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom4redmine</artifactId> - <version>2.1.2</version> + <version>2.1.3</version> </parent> <artifactId>jrst</artifactId>

1 0

r468 - in trunk: . doxia-module-jrst jrst
by tchemit＠users.nuiton.org April 22, 2010

April 22, 2010

Author: tchemit Date: 2010-04-22 12:41:45 +0200 (Thu, 22 Apr 2010) New Revision: 468 Log: improve release profiles + clean poms Modified: trunk/doxia-module-jrst/pom.xml trunk/jrst/pom.xml trunk/pom.xml Modified: trunk/doxia-module-jrst/pom.xml =================================================================== --- trunk/doxia-module-jrst/pom.xml 2010-04-20 13:06:53 UTC (rev 467) +++ trunk/doxia-module-jrst/pom.xml 2010-04-22 10:41:45 UTC (rev 468) @@ -127,8 +127,6 @@ <build> - <defaultGoal>install</defaultGoal> - <plugins> <plugin> <groupId>org.codehaus.plexus</groupId> Modified: trunk/jrst/pom.xml =================================================================== --- trunk/jrst/pom.xml 2010-04-20 13:06:53 UTC (rev 467) +++ trunk/jrst/pom.xml 2010-04-22 10:41:45 UTC (rev 468) @@ -128,8 +128,6 @@ <build> - <defaultGoal>install</defaultGoal> - <plugins>  @@ -217,8 +215,10 @@  <profiles> + +  <profile> - <id>release-profile</id> + <id>release-assembly-profile</id> <activation> <property> <name>performRelease</name> Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2010-04-20 13:06:53 UTC (rev 467) +++ trunk/pom.xml 2010-04-22 10:41:45 UTC (rev 468) @@ -338,8 +338,6 @@ <build> -  - <pluginManagement> <plugins> @@ -354,15 +352,6 @@ </build> -  - -

1 0

r467 - trunk
by tchemit＠users.nuiton.org April 20, 2010

April 20, 2010

Author: tchemit Date: 2010-04-20 15:06:53 +0200 (Tue, 20 Apr 2010) New Revision: 467 Log: Utilisation de mavenpom4redmine 2.1.2 Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2010-04-17 08:43:27 UTC (rev 466) +++ trunk/pom.xml 2010-04-20 13:06:53 UTC (rev 467) @@ -33,7 +33,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom4redmine</artifactId> - <version>2.1.1</version> + <version>2.1.2</version> </parent> <artifactId>jrst</artifactId>

1 0

r466 - in trunk: . doxia-module-jrst jrst jrst-doc maven-jrst-plugin
by tchemit＠users.nuiton.org April 17, 2010

April 17, 2010

Author: tchemit Date: 2010-04-17 10:43:27 +0200 (Sat, 17 Apr 2010) New Revision: 466 Log: - pass to version 1.2 - Evolution #35: Suppression du module "maven-jrst-plugin" Modified: trunk/doxia-module-jrst/pom.xml trunk/jrst-doc/pom.xml trunk/jrst/pom.xml trunk/maven-jrst-plugin/pom.xml trunk/pom.xml Modified: trunk/doxia-module-jrst/pom.xml =================================================================== --- trunk/doxia-module-jrst/pom.xml 2010-04-16 18:18:35 UTC (rev 465) +++ trunk/doxia-module-jrst/pom.xml 2010-04-17 08:43:27 UTC (rev 466) @@ -35,7 +35,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>jrst</artifactId> - <version>1.1.2-SNAPSHOT</version> + <version>1.2-SNAPSHOT</version> </parent> <groupId>org.nuiton.jrst</groupId> Modified: trunk/jrst/pom.xml =================================================================== --- trunk/jrst/pom.xml 2010-04-16 18:18:35 UTC (rev 465) +++ trunk/jrst/pom.xml 2010-04-17 08:43:27 UTC (rev 466) @@ -35,7 +35,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>jrst</artifactId> - <version>1.1.2-SNAPSHOT</version> + <version>1.2-SNAPSHOT</version> </parent> <groupId>org.nuiton.jrst</groupId> Modified: trunk/jrst-doc/pom.xml =================================================================== --- trunk/jrst-doc/pom.xml 2010-04-16 18:18:35 UTC (rev 465) +++ trunk/jrst-doc/pom.xml 2010-04-17 08:43:27 UTC (rev 466) @@ -35,7 +35,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>jrst</artifactId> - <version>1.1.2-SNAPSHOT</version> + <version>1.2-SNAPSHOT</version> </parent> <groupId>org.nuiton.jrst</groupId> Modified: trunk/maven-jrst-plugin/pom.xml =================================================================== --- trunk/maven-jrst-plugin/pom.xml 2010-04-16 18:18:35 UTC (rev 465) +++ trunk/maven-jrst-plugin/pom.xml 2010-04-17 08:43:27 UTC (rev 466) @@ -35,7 +35,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>jrst</artifactId> - <version>1.1.2-SNAPSHOT</version> + <version>1.2-SNAPSHOT</version> </parent> <groupId>org.nuiton.jrst</groupId> Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2010-04-16 18:18:35 UTC (rev 465) +++ trunk/pom.xml 2010-04-17 08:43:27 UTC (rev 466) @@ -37,11 +37,12 @@ </parent> <artifactId>jrst</artifactId> - <version>1.1.2-SNAPSHOT</version> + <version>1.2-SNAPSHOT</version> <modules> <module>jrst</module> - <module>maven-jrst-plugin</module> +  +  <module>doxia-module-jrst</module> <module>jrst-doc</module> </modules>

1 0

r465 - in trunk: . doxia-module-jrst jrst jrst-doc maven-jrst-plugin
by tchemit＠users.nuiton.org April 16, 2010

April 16, 2010

Author: tchemit Date: 2010-04-16 20:18:35 +0200 (Fri, 16 Apr 2010) New Revision: 465 Log: [maven-release-plugin] prepare for next development iteration Modified: trunk/doxia-module-jrst/pom.xml trunk/jrst-doc/pom.xml trunk/jrst/pom.xml trunk/maven-jrst-plugin/pom.xml trunk/pom.xml Modified: trunk/doxia-module-jrst/pom.xml =================================================================== --- trunk/doxia-module-jrst/pom.xml 2010-04-16 18:18:33 UTC (rev 464) +++ trunk/doxia-module-jrst/pom.xml 2010-04-16 18:18:35 UTC (rev 465) @@ -35,7 +35,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>jrst</artifactId> - <version>1.1.1</version> + <version>1.1.2-SNAPSHOT</version> </parent> <groupId>org.nuiton.jrst</groupId> Modified: trunk/jrst/pom.xml =================================================================== --- trunk/jrst/pom.xml 2010-04-16 18:18:33 UTC (rev 464) +++ trunk/jrst/pom.xml 2010-04-16 18:18:35 UTC (rev 465) @@ -35,7 +35,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>jrst</artifactId> - <version>1.1.1</version> + <version>1.1.2-SNAPSHOT</version> </parent> <groupId>org.nuiton.jrst</groupId> Modified: trunk/jrst-doc/pom.xml =================================================================== --- trunk/jrst-doc/pom.xml 2010-04-16 18:18:33 UTC (rev 464) +++ trunk/jrst-doc/pom.xml 2010-04-16 18:18:35 UTC (rev 465) @@ -35,7 +35,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>jrst</artifactId> - <version>1.1.1</version> + <version>1.1.2-SNAPSHOT</version> </parent> <groupId>org.nuiton.jrst</groupId> Modified: trunk/maven-jrst-plugin/pom.xml =================================================================== --- trunk/maven-jrst-plugin/pom.xml 2010-04-16 18:18:33 UTC (rev 464) +++ trunk/maven-jrst-plugin/pom.xml 2010-04-16 18:18:35 UTC (rev 465) @@ -35,7 +35,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>jrst</artifactId> - <version>1.1.1</version> + <version>1.1.2-SNAPSHOT</version> </parent> <groupId>org.nuiton.jrst</groupId> Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2010-04-16 18:18:33 UTC (rev 464) +++ trunk/pom.xml 2010-04-16 18:18:35 UTC (rev 465) @@ -37,7 +37,7 @@ </parent> <artifactId>jrst</artifactId> - <version>1.1.1</version> + <version>1.1.2-SNAPSHOT</version> <modules> <module>jrst</module> @@ -368,9 +368,9 @@  <scm> - <connection>scm:svn:http://svn.nuiton.org/svn/jrst/tags/jrst-1.1.1</connection> - <developerConnection>scm:svn:http://svn.nuiton.org/svn/jrst/tags/jrst-1.1.1</developerConnection> - <url>http://www.nuiton.org/repositories/browse/jrst/tags/jrst-1.1.1</url> + <connection>scm:svn:http://svn.nuiton.org/svn/jrst/trunk</connection> + <developerConnection>scm:svn:http://svn.nuiton.org/svn/jrst/trunk</developerConnection> + <url>http://www.nuiton.org/repositories/browse/jrst/trunk</url> </scm> </project>

1 0

r464 - tags
by tchemit＠users.nuiton.org April 16, 2010

April 16, 2010

Author: tchemit Date: 2010-04-16 20:18:33 +0200 (Fri, 16 Apr 2010) New Revision: 464 Log: [maven-release-plugin] copy for tag jrst-1.1.1 Added: tags/jrst-1.1.1/

1 0

r463 - in trunk: . doxia-module-jrst jrst jrst-doc maven-jrst-plugin
by tchemit＠users.nuiton.org April 16, 2010

April 16, 2010

Author: tchemit Date: 2010-04-16 20:18:31 +0200 (Fri, 16 Apr 2010) New Revision: 463 Log: [maven-release-plugin] prepare release jrst-1.1.1 Modified: trunk/doxia-module-jrst/pom.xml trunk/jrst-doc/pom.xml trunk/jrst/pom.xml trunk/maven-jrst-plugin/pom.xml trunk/pom.xml Modified: trunk/doxia-module-jrst/pom.xml =================================================================== --- trunk/doxia-module-jrst/pom.xml 2010-04-16 18:12:16 UTC (rev 462) +++ trunk/doxia-module-jrst/pom.xml 2010-04-16 18:18:31 UTC (rev 463) @@ -35,7 +35,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>jrst</artifactId> - <version>1.1.1-SNAPSHOT</version> + <version>1.1.1</version> </parent> <groupId>org.nuiton.jrst</groupId> Modified: trunk/jrst/pom.xml =================================================================== --- trunk/jrst/pom.xml 2010-04-16 18:12:16 UTC (rev 462) +++ trunk/jrst/pom.xml 2010-04-16 18:18:31 UTC (rev 463) @@ -35,7 +35,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>jrst</artifactId> - <version>1.1.1-SNAPSHOT</version> + <version>1.1.1</version> </parent> <groupId>org.nuiton.jrst</groupId> Modified: trunk/jrst-doc/pom.xml =================================================================== --- trunk/jrst-doc/pom.xml 2010-04-16 18:12:16 UTC (rev 462) +++ trunk/jrst-doc/pom.xml 2010-04-16 18:18:31 UTC (rev 463) @@ -35,7 +35,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>jrst</artifactId> - <version>1.1.1-SNAPSHOT</version> + <version>1.1.1</version> </parent> <groupId>org.nuiton.jrst</groupId> Modified: trunk/maven-jrst-plugin/pom.xml =================================================================== --- trunk/maven-jrst-plugin/pom.xml 2010-04-16 18:12:16 UTC (rev 462) +++ trunk/maven-jrst-plugin/pom.xml 2010-04-16 18:18:31 UTC (rev 463) @@ -35,7 +35,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>jrst</artifactId> - <version>1.1.1-SNAPSHOT</version> + <version>1.1.1</version> </parent> <groupId>org.nuiton.jrst</groupId> Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2010-04-16 18:12:16 UTC (rev 462) +++ trunk/pom.xml 2010-04-16 18:18:31 UTC (rev 463) @@ -37,7 +37,7 @@ </parent> <artifactId>jrst</artifactId> - <version>1.1.1-SNAPSHOT</version> + <version>1.1.1</version> <modules> <module>jrst</module> @@ -368,9 +368,9 @@  <scm> - <connection>scm:svn:http://svn.nuiton.org/svn/jrst/trunk</connection> - <developerConnection>scm:svn:http://svn.nuiton.org/svn/jrst/trunk</developerConnection> - <url>http://www.nuiton.org/repositories/browse/jrst/trunk</url> + <connection>scm:svn:http://svn.nuiton.org/svn/jrst/tags/jrst-1.1.1</connection> + <developerConnection>scm:svn:http://svn.nuiton.org/svn/jrst/tags/jrst-1.1.1</developerConnection> + <url>http://www.nuiton.org/repositories/browse/jrst/tags/jrst-1.1.1</url> </scm> </project>

1 0

r462 - trunk
by tchemit＠users.nuiton.org April 16, 2010

April 16, 2010

Author: tchemit Date: 2010-04-16 20:12:16 +0200 (Fri, 16 Apr 2010) New Revision: 462 Log: Utilisation de mavenpom4redmine 2.1.1 Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2010-04-16 10:08:01 UTC (rev 461) +++ trunk/pom.xml 2010-04-16 18:12:16 UTC (rev 462) @@ -23,11 +23,8 @@ <http://www.gnu.org/licenses/lgpl-3.0.html>. #L% --> +<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/xsd/maven-4.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/xsd/maven-4.0.0.xsd"> - <modelVersion>4.0.0</modelVersion>  @@ -36,7 +33,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom4redmine</artifactId> - <version>2.1.1-SNAPSHOT</version> + <version>2.1.1</version> </parent> <artifactId>jrst</artifactId>

1 0

r461 - in trunk: . doxia-module-jrst doxia-module-jrst/src/main/java/org/nuiton/jrst doxia-module-jrst/src/site doxia-module-jrst/src/site/apt doxia-module-jrst/src/site/en/apt doxia-module-jrst/src/test/java/org/nuiton/jrst doxia-module-jrst/src/test/resources jrst jrst/src/main/java/org/nuiton/jrst jrst/src/main/java/org/nuiton/jrst/convertisor jrst/src/main/java/org/nuiton/jrst/directive jrst/src/site jrst/src/site/apt jrst/src/site/en/apt jrst/src/test/java/org/nuiton/jrst jrst-doc jrst-d
by tchemit＠users.nuiton.org April 16, 2010

April 16, 2010

Author: tchemit Date: 2010-04-16 12:08:01 +0200 (Fri, 16 Apr 2010) New Revision: 461 Log: - Anomalie #529: Fix documentation - Evolution #527: Use maven-license-plugin 2.2 Added: trunk/src/license/ trunk/src/license/project.xml Modified: trunk/doxia-module-jrst/pom.xml trunk/doxia-module-jrst/src/main/java/org/nuiton/jrst/JrstParser.java trunk/doxia-module-jrst/src/main/java/org/nuiton/jrst/JrstSiteModule.java trunk/doxia-module-jrst/src/site/apt/devel.apt trunk/doxia-module-jrst/src/site/apt/index.apt trunk/doxia-module-jrst/src/site/en/apt/devel.apt trunk/doxia-module-jrst/src/site/en/apt/index.apt trunk/doxia-module-jrst/src/site/site_en.xml trunk/doxia-module-jrst/src/site/site_fr.xml trunk/doxia-module-jrst/src/test/java/org/nuiton/jrst/JrstParserTest.java trunk/doxia-module-jrst/src/test/resources/test.rst trunk/jrst-doc/pom.xml trunk/jrst-doc/src/site/en/rst/devel/Todo.rst trunk/jrst-doc/src/site/en/rst/devel/XSLpresentation.rst trunk/jrst-doc/src/site/en/rst/devel/developerDoc.rst trunk/jrst-doc/src/site/en/rst/devel/externalDoc.rst trunk/jrst-doc/src/site/en/rst/devel/library.rst trunk/jrst-doc/src/site/en/rst/index.rst trunk/jrst-doc/src/site/en/rst/user/RSTpresentation.rst trunk/jrst-doc/src/site/en/rst/user/functionality.rst trunk/jrst-doc/src/site/en/rst/user/index.rst trunk/jrst-doc/src/site/rst/devel/Todo.rst trunk/jrst-doc/src/site/rst/devel/docDeveloppeur.rst trunk/jrst-doc/src/site/rst/devel/docExterne.rst trunk/jrst-doc/src/site/rst/devel/librairies.rst trunk/jrst-doc/src/site/rst/devel/presentationXSL.rst trunk/jrst-doc/src/site/rst/index.rst trunk/jrst-doc/src/site/rst/user/faq.rst trunk/jrst-doc/src/site/rst/user/fonctionnalites.rst trunk/jrst-doc/src/site/rst/user/index.rst trunk/jrst-doc/src/site/rst/user/presentationRST.rst trunk/jrst-doc/src/site/site_en.xml trunk/jrst-doc/src/site/site_fr.xml trunk/jrst/pom.xml trunk/jrst/src/main/java/org/nuiton/jrst/AdvancedReader.java trunk/jrst/src/main/java/org/nuiton/jrst/DocumentHandler.java trunk/jrst/src/main/java/org/nuiton/jrst/DocumentWalker.java trunk/jrst/src/main/java/org/nuiton/jrst/JRST.java trunk/jrst/src/main/java/org/nuiton/jrst/JRSTDirective.java trunk/jrst/src/main/java/org/nuiton/jrst/JRSTGenerator.java trunk/jrst/src/main/java/org/nuiton/jrst/JRSTInterface.java trunk/jrst/src/main/java/org/nuiton/jrst/JRSTLexer.java trunk/jrst/src/main/java/org/nuiton/jrst/JRSTReader.java trunk/jrst/src/main/java/org/nuiton/jrst/ReStructuredText.java trunk/jrst/src/main/java/org/nuiton/jrst/convertisor/DocUtils2RST.java trunk/jrst/src/main/java/org/nuiton/jrst/convertisor/DocUtilsVisitor.java trunk/jrst/src/main/java/org/nuiton/jrst/directive/ContentDirective.java trunk/jrst/src/main/java/org/nuiton/jrst/directive/DateDirective.java trunk/jrst/src/main/java/org/nuiton/jrst/directive/ImageDirective.java trunk/jrst/src/main/java/org/nuiton/jrst/directive/SectnumDirective.java trunk/jrst/src/site/apt/index.apt trunk/jrst/src/site/en/apt/index.apt trunk/jrst/src/site/site_en.xml trunk/jrst/src/site/site_fr.xml trunk/jrst/src/test/java/org/nuiton/jrst/AdvancedReaderTest.java trunk/jrst/src/test/java/org/nuiton/jrst/Compare.java trunk/jrst/src/test/java/org/nuiton/jrst/GutterColor.java trunk/jrst/src/test/java/org/nuiton/jrst/JRSTGeneratorTest.java trunk/jrst/src/test/java/org/nuiton/jrst/JRSTReaderTest.java trunk/jrst/src/test/java/org/nuiton/jrst/JRSTTest.java trunk/jrst/src/test/java/org/nuiton/jrst/ThreadRedirection.java trunk/jrst/src/test/java/org/nuiton/jrst/XMLCaseTest.java trunk/maven-jrst-plugin/pom.xml trunk/maven-jrst-plugin/src/main/java/org/nuiton/jrst/plugin/GenerationJRstException.java trunk/maven-jrst-plugin/src/main/java/org/nuiton/jrst/plugin/JRstPlugin.java trunk/maven-jrst-plugin/src/site/apt/index.apt trunk/maven-jrst-plugin/src/site/en/apt/index.apt trunk/maven-jrst-plugin/src/site/site_en.xml trunk/maven-jrst-plugin/src/site/site_fr.xml trunk/pom.xml trunk/src/site/apt/index.apt trunk/src/site/en/apt/index.apt trunk/src/site/site_en.xml trunk/src/site/site_fr.xml Modified: trunk/doxia-module-jrst/pom.xml =================================================================== --- trunk/doxia-module-jrst/pom.xml 2010-04-16 09:14:03 UTC (rev 460) +++ trunk/doxia-module-jrst/pom.xml 2010-04-16 10:08:01 UTC (rev 461) @@ -1,4 +1,29 @@ <?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/xsd/maven-4.0.0.xsd"> <modelVersion>4.0.0</modelVersion> Modified: trunk/doxia-module-jrst/src/main/java/org/nuiton/jrst/JrstParser.java =================================================================== --- trunk/doxia-module-jrst/src/main/java/org/nuiton/jrst/JrstParser.java 2010-04-16 09:14:03 UTC (rev 460) +++ trunk/doxia-module-jrst/src/main/java/org/nuiton/jrst/JrstParser.java 2010-04-16 10:08:01 UTC (rev 461) @@ -1,19 +1,27 @@ -/* *##% Doxia module jrst - * Copyright (C) 2009 CodeLutin - * +/* + * #%L + * JRst :: Doxia module + * + * $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.jrst; Modified: trunk/doxia-module-jrst/src/main/java/org/nuiton/jrst/JrstSiteModule.java =================================================================== --- trunk/doxia-module-jrst/src/main/java/org/nuiton/jrst/JrstSiteModule.java 2010-04-16 09:14:03 UTC (rev 460) +++ trunk/doxia-module-jrst/src/main/java/org/nuiton/jrst/JrstSiteModule.java 2010-04-16 10:08:01 UTC (rev 461) @@ -1,19 +1,27 @@ -/* *##% Doxia module jrst - * Copyright (C) 2009 CodeLutin - * +/* + * #%L + * JRst :: Doxia module + * + * $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.jrst; Modified: trunk/doxia-module-jrst/src/site/apt/devel.apt =================================================================== --- trunk/doxia-module-jrst/src/site/apt/devel.apt 2010-04-16 09:14:03 UTC (rev 460) +++ trunk/doxia-module-jrst/src/site/apt/devel.apt 2010-04-16 10:08:01 UTC (rev 461) @@ -1,3 +1,28 @@ +~~~ +~~ #%L +~~ JRst :: Doxia module +~~ +~~ $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% +~~~ + ------------- Documentation ------------- Modified: trunk/doxia-module-jrst/src/site/apt/index.apt =================================================================== --- trunk/doxia-module-jrst/src/site/apt/index.apt 2010-04-16 09:14:03 UTC (rev 460) +++ trunk/doxia-module-jrst/src/site/apt/index.apt 2010-04-16 10:08:01 UTC (rev 461) @@ -1,3 +1,28 @@ +~~~ +~~ #%L +~~ JRst :: Doxia module +~~ +~~ $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% +~~~ + ----------------- Doxia Module JRst ----------------- Modified: trunk/doxia-module-jrst/src/site/en/apt/devel.apt =================================================================== --- trunk/doxia-module-jrst/src/site/en/apt/devel.apt 2010-04-16 09:14:03 UTC (rev 460) +++ trunk/doxia-module-jrst/src/site/en/apt/devel.apt 2010-04-16 10:08:01 UTC (rev 461) @@ -1,3 +1,28 @@ +~~~ +~~ #%L +~~ JRst :: Doxia module +~~ +~~ $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% +~~~ + ------------- Documentation ------------- Modified: trunk/doxia-module-jrst/src/site/en/apt/index.apt =================================================================== --- trunk/doxia-module-jrst/src/site/en/apt/index.apt 2010-04-16 09:14:03 UTC (rev 460) +++ trunk/doxia-module-jrst/src/site/en/apt/index.apt 2010-04-16 10:08:01 UTC (rev 461) @@ -1,3 +1,28 @@ +~~~ +~~ #%L +~~ JRst :: Doxia module +~~ +~~ $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% +~~~ + ----------------- Doxia Module JRst ----------------- Modified: trunk/doxia-module-jrst/src/site/site_en.xml =================================================================== --- trunk/doxia-module-jrst/src/site/site_en.xml 2010-04-16 09:14:03 UTC (rev 460) +++ trunk/doxia-module-jrst/src/site/site_en.xml 2010-04-16 10:08:01 UTC (rev 461) @@ -1,4 +1,29 @@ <?xml version="1.0" encoding="UTF-8"?> + + <project name="${project.name}"> <bannerLeft> Modified: trunk/doxia-module-jrst/src/site/site_fr.xml =================================================================== --- trunk/doxia-module-jrst/src/site/site_fr.xml 2010-04-16 09:14:03 UTC (rev 460) +++ trunk/doxia-module-jrst/src/site/site_fr.xml 2010-04-16 10:08:01 UTC (rev 461) @@ -1,4 +1,29 @@ <?xml version="1.0" encoding="UTF-8"?> + + <project name="${project.name}"> <bannerLeft> Modified: trunk/doxia-module-jrst/src/test/java/org/nuiton/jrst/JrstParserTest.java =================================================================== --- trunk/doxia-module-jrst/src/test/java/org/nuiton/jrst/JrstParserTest.java 2010-04-16 09:14:03 UTC (rev 460) +++ trunk/doxia-module-jrst/src/test/java/org/nuiton/jrst/JrstParserTest.java 2010-04-16 10:08:01 UTC (rev 461) @@ -1,34 +1,38 @@ -/* *##% Doxia module jrst - * Copyright (C) 2009 CodeLutin - * +/* + * #%L + * JRst :: Doxia module + * + * $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.jrst; -import java.io.InputStream; -import java.io.InputStreamReader; -import java.io.Reader; -import java.io.StringWriter; - import org.apache.maven.doxia.AbstractModuleTest; import org.apache.maven.doxia.module.xdoc.XdocSink; -import org.apache.maven.doxia.parser.AbstractParserTest; import org.apache.maven.doxia.parser.Parser; import org.apache.maven.doxia.sink.Sink; -import org.codehaus.plexus.PlexusTestCase; +import java.io.Reader; +import java.io.StringWriter; + /** * @author chatellier * @version $Revision : 1$ @@ -55,10 +59,10 @@ Sink sink = new XdocSink(output){}; parser.parse(reader, sink); - assertTrue(output.toString().indexOf("emphasis") != -1); - assertTrue(output.toString().indexOf("This is the first item") != -1); - assertTrue(output.toString().indexOf("Title") != -1); - assertTrue(output.toString().indexOf("blocks.") != -1); + assertTrue(output.toString().contains("emphasis")); + assertTrue(output.toString().contains("This is the first item")); + assertTrue(output.toString().contains("Title")); + assertTrue(output.toString().contains("blocks.")); } finally { if (output != null) { output.close(); Modified: trunk/doxia-module-jrst/src/test/resources/test.rst =================================================================== --- trunk/doxia-module-jrst/src/test/resources/test.rst 2010-04-16 09:14:03 UTC (rev 460) +++ trunk/doxia-module-jrst/src/test/resources/test.rst 2010-04-16 10:08:01 UTC (rev 461) @@ -1,6 +1,10 @@ +.. comment + Title ===== +.. comment2 + Subtitle -------- Modified: trunk/jrst/pom.xml =================================================================== --- trunk/jrst/pom.xml 2010-04-16 09:14:03 UTC (rev 460) +++ trunk/jrst/pom.xml 2010-04-16 10:08:01 UTC (rev 461) @@ -1,4 +1,29 @@ <?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/xsd/maven-4.0.0.xsd"> <modelVersion>4.0.0</modelVersion> @@ -121,7 +146,7 @@ </executions> </plugin> - <plugin> +  <plugin> <artifactId>maven-dependency-plugin</artifactId> @@ -168,6 +193,18 @@ </links> </configuration> </plugin> + + <plugin> + <artifactId>maven-jar-plugin</artifactId> + <configuration> + <archive> + <manifest> + <addClasspath>true</addClasspath> + <classpathPrefix>lib/</classpathPrefix> + </manifest> + </archive> + </configuration> + </plugin> </plugins> </pluginManagement> Modified: trunk/jrst/src/main/java/org/nuiton/jrst/AdvancedReader.java =================================================================== --- trunk/jrst/src/main/java/org/nuiton/jrst/AdvancedReader.java 2010-04-16 09:14:03 UTC (rev 460) +++ trunk/jrst/src/main/java/org/nuiton/jrst/AdvancedReader.java 2010-04-16 10:08:01 UTC (rev 461) @@ -1,19 +1,27 @@ -/* *##% JRst - * Copyright (C) 2004 - 2009 CodeLutin - * +/* + * #%L + * JRst :: Api + * + * $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 + * 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.jrst; @@ -72,18 +80,18 @@ /** nombre de caractere lu au minimum sur le vrai reader */ protected static final int READ_AHEAD = 80; - protected Reader in = null; - protected CharList buffer = null; + protected Reader in; + protected CharList buffer; - protected int charNumber = 0; - protected int charNumberMark = 0; - protected int lineNumber = 0; - protected int lineNumberMark = 0; + protected int charNumber; + protected int charNumberMark; + protected int lineNumber; + protected int lineNumberMark; - protected int nextChar = 0; - protected int markChar = 0; + protected int nextChar; + protected int markChar; - protected int readInMark = 0; + protected int readInMark; /** * @@ -91,7 +99,7 @@ */ public AdvancedReader(Reader in) { this.in = new LineNumberReader(in); - this.buffer = new ArrayCharList(); + buffer = new ArrayCharList(); } public void mark() throws IOException { @@ -117,14 +125,14 @@ * @return the charNumber */ public int getCharNumber() { - return this.charNumber; + return charNumber; } /** * @return the lineNumber */ public int getLineNumber() { - return this.lineNumber; + return lineNumber; } /** Modified: trunk/jrst/src/main/java/org/nuiton/jrst/DocumentHandler.java =================================================================== --- trunk/jrst/src/main/java/org/nuiton/jrst/DocumentHandler.java 2010-04-16 09:14:03 UTC (rev 460) +++ trunk/jrst/src/main/java/org/nuiton/jrst/DocumentHandler.java 2010-04-16 10:08:01 UTC (rev 461) @@ -1,19 +1,27 @@ -/* *##% JRst - * Copyright (C) 2004 - 2009 CodeLutin - * +/* + * #%L + * JRst :: Api + * + * $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 + * 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.jrst; @@ -34,14 +42,14 @@ */ public interface DocumentHandler { - public void startDocument(Document doc); + void startDocument(Document doc); - public void endDocument(Document doc); + void endDocument(Document doc); - public void startElement(Element e); + void startElement(Element e); - public void endElement(Element e); + void endElement(Element e); - public void text(Text t); + void text(Text t); } Modified: trunk/jrst/src/main/java/org/nuiton/jrst/DocumentWalker.java =================================================================== --- trunk/jrst/src/main/java/org/nuiton/jrst/DocumentWalker.java 2010-04-16 09:14:03 UTC (rev 460) +++ trunk/jrst/src/main/java/org/nuiton/jrst/DocumentWalker.java 2010-04-16 10:08:01 UTC (rev 461) @@ -1,19 +1,27 @@ -/* *##% JRst - * Copyright (C) 2004 - 2009 CodeLutin - * +/* + * #%L + * JRst :: Api + * + * $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 + * 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.jrst; @@ -41,7 +49,7 @@ static private Log log = LogFactory.getLog(DocumentWalker.class); - protected DocumentHandler handler = null; + protected DocumentHandler handler; /** * Modified: trunk/jrst/src/main/java/org/nuiton/jrst/JRST.java =================================================================== --- trunk/jrst/src/main/java/org/nuiton/jrst/JRST.java 2010-04-16 09:14:03 UTC (rev 460) +++ trunk/jrst/src/main/java/org/nuiton/jrst/JRST.java 2010-04-16 10:08:01 UTC (rev 461) @@ -1,19 +1,27 @@ -/* *##% JRst - * Copyright (C) 2004 - 2009 CodeLutin - * +/* + * #%L + * JRst :: Api + * + * $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 + * 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.jrst; @@ -82,7 +90,7 @@ @CommandLineInterface(application = "JRST") public class JRST { - public static enum Overwrite { + public enum Overwrite { NEVER, IFNEWER, ALLTIME } @@ -144,7 +152,7 @@ /** * key, Out type; value: chain of XSL file to provide wanted file for output */ - protected static Map<String, String> stylesheets = null; + protected static Map<String, String> stylesheets; static { stylesheets = new HashMap<String, String>(); @@ -568,7 +576,7 @@ /** * Les options */ - public static interface JRSTOption { + public interface JRSTOption { @Option(description = "display this help and exit") boolean isHelp(); @@ -577,27 +585,27 @@ boolean isForce(); @Option(shortName = "c", description = "Console mode") - public boolean isConsole(); + boolean isConsole(); @Option(shortName = "x", description = "XSL file list to apply, comma separated") - public String getXslFile(); + String getXslFile(); - public boolean isXslFile(); + boolean isXslFile(); @Option(shortName = "t", pattern = "xml|xhtml|docbook|html|xdoc|rst|fo|pdf", // TODO // odt|rtf", description = "Output type") - public String getOutType(); + String getOutType(); - public boolean isOutType(); + boolean isOutType(); @Option(shortName = "o", description = "Output file") - public File getOutFile(); + File getOutFile(); - public boolean isOutFile(); + boolean isOutFile(); @Unparsed(name = "FILE") - public File getFile(); + File getFile(); } } Modified: trunk/jrst/src/main/java/org/nuiton/jrst/JRSTDirective.java =================================================================== --- trunk/jrst/src/main/java/org/nuiton/jrst/JRSTDirective.java 2010-04-16 09:14:03 UTC (rev 460) +++ trunk/jrst/src/main/java/org/nuiton/jrst/JRSTDirective.java 2010-04-16 10:08:01 UTC (rev 461) @@ -1,19 +1,27 @@ -/* *##% JRst - * Copyright (C) 2004 - 2009 CodeLutin - * +/* + * #%L + * JRst :: Api + * + * $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 + * 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.jrst; @@ -39,5 +47,5 @@ * @param e the element to scan * @return the parsed node */ - public Node parse(Element e); + Node parse(Element e); } Modified: trunk/jrst/src/main/java/org/nuiton/jrst/JRSTGenerator.java =================================================================== --- trunk/jrst/src/main/java/org/nuiton/jrst/JRSTGenerator.java 2010-04-16 09:14:03 UTC (rev 460) +++ trunk/jrst/src/main/java/org/nuiton/jrst/JRSTGenerator.java 2010-04-16 10:08:01 UTC (rev 461) @@ -1,20 +1,29 @@ -/* *##% JRst - * Copyright (C) 2004 - 2009 CodeLutin - * +/* + * #%L + * JRst :: Api + * + * $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 + * 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.jrst; import org.apache.commons.logging.Log; @@ -71,14 +80,14 @@ static private Log log = LogFactory.getLog(JRSTGenerator.class); - protected Writer out = null; - protected int sectionLevel = 0; - protected int indent = 0; + protected Writer out; + protected int sectionLevel; + protected int indent; protected String listType = "bullet|enumerated|..."; protected int enumStart = 1; - protected URIResolver uriResolver = null; + protected URIResolver uriResolver; public JRSTGenerator() { } @@ -91,7 +100,7 @@ * @return the uriResolver */ public URIResolver getUriResolver() { - return this.uriResolver; + return uriResolver; } /** @@ -239,7 +248,7 @@ static public class DocumentResolver implements URIResolver, EntityResolver { - URL baseURL = null; + URL baseURL; private DocumentResolver() { } Modified: trunk/jrst/src/main/java/org/nuiton/jrst/JRSTInterface.java =================================================================== --- trunk/jrst/src/main/java/org/nuiton/jrst/JRSTInterface.java 2010-04-16 09:14:03 UTC (rev 460) +++ trunk/jrst/src/main/java/org/nuiton/jrst/JRSTInterface.java 2010-04-16 10:08:01 UTC (rev 461) @@ -1,20 +1,28 @@ -/* *##% JRst - * Copyright (C) 2004 - 2009 CodeLutin - * +/* + * #%L + * JRst :: Api + * + * $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 + * 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.jrst; import static org.nuiton.i18n.I18n._; @@ -61,61 +69,61 @@ /** serialVersionUID */ private static final long serialVersionUID = 5327326730753891936L; - private JPanel savePanel = null; + private JPanel savePanel; - private JPanel formatPanel = null; + private JPanel formatPanel; - private JPanel openPanel = null; + private JPanel openPanel; - private JPanel formatLigne = null; + private JPanel formatLigne; - private JPanel xslLigne = null; + private JPanel xslLigne; - private JComboBox formatList = null; + private JComboBox formatList; - private JButton boutonAnnuler = null; + private JButton boutonAnnuler; - private JButton boutonConvertir = null; + private JButton boutonConvertir; - private JPanel panelPrincipal = null; + private JPanel panelPrincipal; - private JPanel boutonPanel = null; + private JPanel boutonPanel; - private JButton boutonSaveLocation = null; + private JButton boutonSaveLocation; - private JLabel errorLbl = null; + private JLabel errorLbl; - private JButton boutonOpenLocation = null; + private JButton boutonOpenLocation; - private JButton boutonXslLocation = null; + private JButton boutonXslLocation; - private String[] listFormats = null; + private String[] listFormats; - private JTextField saveText = null; + private JTextField saveText; - private JTextField openText = null; + private JTextField openText; - private JTextField xslText = null; + private JTextField xslText; - private JRadioButton format = null; + private JRadioButton format; - private JRadioButton xslRadio = null; + private JRadioButton xslRadio; - private LinkedList<JPanel> ListAddXslPanel = null; + private LinkedList<JPanel> ListAddXslPanel; - private LinkedList<JTextField> ListXslText = null; + private LinkedList<JTextField> ListXslText; - private LinkedList<JButton> ListXslBouton = null; + private LinkedList<JButton> ListXslBouton; - private LinkedList<JButton> ListXslBoutonLocation = null; - private boolean ecrase = false; - private String[] commande = null; + private LinkedList<JButton> ListXslBoutonLocation; + private boolean ecrase; + private String[] commande; private ImageIcon open = Resource.getIcon("icone/open.png"); private ImageIcon delete = Resource.getIcon("icone/cancel.png"); private ImageIcon more = Resource.getIcon("icone/more.gif"); - private LinkedList<Container> composantsXSL = null; + private LinkedList<Container> composantsXSL; /** * le parametre initialise les options disponibles @@ -124,19 +132,19 @@ */ public JRSTInterface(String o) { - this.setFormats(o); - this.setDefaultCloseOperation(JDialog.DISPOSE_ON_CLOSE); - this.setTitle("JRST"); - this.setLayout(new BorderLayout()); - this.add(getPanelPrincipal(), BorderLayout.CENTER); + setFormats(o); + setDefaultCloseOperation(JDialog.DISPOSE_ON_CLOSE); + setTitle("JRST"); + setLayout(new BorderLayout()); + add(getPanelPrincipal(), BorderLayout.CENTER); Dimension dim = Toolkit.getDefaultToolkit().getScreenSize(); - this.setModal(true); // pour que JRST attende que cette fenetre soit + setModal(true); // pour que JRST attende que cette fenetre soit // ferme - this.pack(); - this.setResizable(false); - this.setLocation(dim.width / 2 - this.getWidth() / 2, dim.height / 2 - - this.getHeight() / 2); // Centrer - this.setVisible(true); + pack(); + setResizable(false); + setLocation(dim.width / 2 - getWidth() / 2, dim.height / 2 + - getHeight() / 2); // Centrer + setVisible(true); } private JPanel getPanelPrincipal() { @@ -287,7 +295,7 @@ ListAddXslPanel.remove(i); ListXslBoutonLocation.remove(i); ListXslText.remove(i); - this.pack(); + pack(); } } @@ -300,7 +308,7 @@ ListXslBouton.getLast().setIcon(delete); ListAddXslPanel.add(ajoutXSL()); formatPanel.add(ListAddXslPanel.getLast()); - this.pack(); + pack(); } @@ -520,7 +528,7 @@ if (getOpenText().getText().equals("")) { getErrorLabel().setText(_("openEmpty?")); getErrorLabel().setForeground(Color.RED); - this.pack(); + pack(); } else { if (!ecrase) { File file = new File(getSaveText().getText()); @@ -552,7 +560,7 @@ cmd += " -o " + getSaveText().getText(); cmd += " " + getOpenText().getText() + " "; commande = cmd.trim().split(" "); - this.dispose(); + dispose(); } } } Modified: trunk/jrst/src/main/java/org/nuiton/jrst/JRSTLexer.java =================================================================== --- trunk/jrst/src/main/java/org/nuiton/jrst/JRSTLexer.java 2010-04-16 09:14:03 UTC (rev 460) +++ trunk/jrst/src/main/java/org/nuiton/jrst/JRSTLexer.java 2010-04-16 10:08:01 UTC (rev 461) @@ -1,19 +1,27 @@ -/* *##% JRst - * Copyright (C) 2004 - 2009 CodeLutin - * +/* + * #%L + * JRst :: Api + * + * $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 + * 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.jrst; @@ -186,18 +194,18 @@ * * donnera dans la liste ["==", "-"] */ - private List<String> titleLevels = null; + private List<String> titleLevels; - private AdvancedReader in = null; + private AdvancedReader in; /** * length of the last element returned (number of char need to this element) */ - private int elementLength = 0; + private int elementLength; public JRSTLexer(Reader reader) { titleLevels = new ArrayList<String>(); - this.in = new AdvancedReader(reader); + in = new AdvancedReader(reader); } /** Modified: trunk/jrst/src/main/java/org/nuiton/jrst/JRSTReader.java =================================================================== --- trunk/jrst/src/main/java/org/nuiton/jrst/JRSTReader.java 2010-04-16 09:14:03 UTC (rev 460) +++ trunk/jrst/src/main/java/org/nuiton/jrst/JRSTReader.java 2010-04-16 10:08:01 UTC (rev 461) @@ -1,19 +1,27 @@ -/* *##% JRst - * Copyright (C) 2004 - 2009 CodeLutin - * +/* + * #%L + * JRst :: Api + * + * $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 + * 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% + */ /* * * JRSTReader.java @@ -351,23 +359,23 @@ /** to use log facility, just put in your code: log.info(\"...\"); */ private static Log log = LogFactory.getLog(JRSTReader.class); - protected boolean ERROR_MISSING_ITEM = false; + protected boolean ERROR_MISSING_ITEM; protected static int MAX_SECTION_DEPTH = -1000; - protected static Map<String, JRSTDirective> defaultDirectives = null; + protected static Map<String, JRSTDirective> defaultDirectives; protected Map<String, JRSTDirective> directives = new HashMap<String, JRSTDirective>(); - private boolean sectnum = false; + private boolean sectnum; private Element footer; - private int idMax = 0; + private int idMax; - private int symbolMax = 0; + private int symbolMax; - private int symbolMaxRef = 0; + private int symbolMaxRef; private LinkedList<Integer> lblFootnotes = new LinkedList<Integer>(); Modified: trunk/jrst/src/main/java/org/nuiton/jrst/ReStructuredText.java =================================================================== --- trunk/jrst/src/main/java/org/nuiton/jrst/ReStructuredText.java 2010-04-16 09:14:03 UTC (rev 460) +++ trunk/jrst/src/main/java/org/nuiton/jrst/ReStructuredText.java 2010-04-16 10:08:01 UTC (rev 461) @@ -1,3 +1,27 @@ +/* + * #%L + * JRst :: Api + * + * $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% + */ /* *##% JRst * Copyright (C) 2004 - 2008 CodeLutin * Modified: trunk/jrst/src/main/java/org/nuiton/jrst/convertisor/DocUtils2RST.java =================================================================== --- trunk/jrst/src/main/java/org/nuiton/jrst/convertisor/DocUtils2RST.java 2010-04-16 09:14:03 UTC (rev 460) +++ trunk/jrst/src/main/java/org/nuiton/jrst/convertisor/DocUtils2RST.java 2010-04-16 10:08:01 UTC (rev 461) @@ -1,3 +1,27 @@ +/* + * #%L + * JRst :: Api + * + * $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% + */ package org.nuiton.jrst.convertisor; import java.util.List; @@ -18,7 +42,7 @@ /** to use log facility, just put in your code: log.info(\"...\"); */ private static Log log = LogFactory.getLog(DocUtils2RST.class); - protected int level = 0; + protected int level; @Override public String composeDocument(Element e) { Modified: trunk/jrst/src/main/java/org/nuiton/jrst/convertisor/DocUtilsVisitor.java =================================================================== --- trunk/jrst/src/main/java/org/nuiton/jrst/convertisor/DocUtilsVisitor.java 2010-04-16 09:14:03 UTC (rev 460) +++ trunk/jrst/src/main/java/org/nuiton/jrst/convertisor/DocUtilsVisitor.java 2010-04-16 10:08:01 UTC (rev 461) @@ -1,3 +1,27 @@ +/* + * #%L + * JRst :: Api + * + * $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% + */ package org.nuiton.jrst.convertisor; import java.util.ArrayList; @@ -477,7 +501,7 @@ } // Creation dune nouvelle instance du visitor utilise - DocUtilsVisitor visitor = this.getClass().newInstance(); + DocUtilsVisitor visitor = getClass().newInstance(); // Traitement recursif (pour parser un document dans un autre) try { Modified: trunk/jrst/src/main/java/org/nuiton/jrst/directive/ContentDirective.java =================================================================== --- trunk/jrst/src/main/java/org/nuiton/jrst/directive/ContentDirective.java 2010-04-16 09:14:03 UTC (rev 460) +++ trunk/jrst/src/main/java/org/nuiton/jrst/directive/ContentDirective.java 2010-04-16 10:08:01 UTC (rev 461) @@ -1,20 +1,28 @@ -/* *##% JRst - * Copyright (C) 2004 - 2009 CodeLutin - * +/* + * #%L + * JRst :: Api + * + * $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 + * 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.jrst.directive; import org.nuiton.jrst.JRSTDirective; Modified: trunk/jrst/src/main/java/org/nuiton/jrst/directive/DateDirective.java =================================================================== --- trunk/jrst/src/main/java/org/nuiton/jrst/directive/DateDirective.java 2010-04-16 09:14:03 UTC (rev 460) +++ trunk/jrst/src/main/java/org/nuiton/jrst/directive/DateDirective.java 2010-04-16 10:08:01 UTC (rev 461) @@ -1,19 +1,27 @@ -/* *##% JRst - * Copyright (C) 2004 - 2009 CodeLutin - * +/* + * #%L + * JRst :: Api + * + * $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 + * 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.jrst.directive; Modified: trunk/jrst/src/main/java/org/nuiton/jrst/directive/ImageDirective.java =================================================================== --- trunk/jrst/src/main/java/org/nuiton/jrst/directive/ImageDirective.java 2010-04-16 09:14:03 UTC (rev 460) +++ trunk/jrst/src/main/java/org/nuiton/jrst/directive/ImageDirective.java 2010-04-16 10:08:01 UTC (rev 461) @@ -1,19 +1,27 @@ -/* *##% JRst - * Copyright (C) 2004 - 2009 CodeLutin - * +/* + * #%L + * JRst :: Api + * + * $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 + * 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.jrst.directive; Modified: trunk/jrst/src/main/java/org/nuiton/jrst/directive/SectnumDirective.java =================================================================== --- trunk/jrst/src/main/java/org/nuiton/jrst/directive/SectnumDirective.java 2010-04-16 09:14:03 UTC (rev 460) +++ trunk/jrst/src/main/java/org/nuiton/jrst/directive/SectnumDirective.java 2010-04-16 10:08:01 UTC (rev 461) @@ -1,20 +1,28 @@ -/* *##% JRst - * Copyright (C) 2004 - 2009 CodeLutin - * +/* + * #%L + * JRst :: Api + * + * $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 + * 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.jrst.directive; import org.nuiton.jrst.JRSTDirective; Modified: trunk/jrst/src/site/apt/index.apt =================================================================== --- trunk/jrst/src/site/apt/index.apt 2010-04-16 09:14:03 UTC (rev 460) +++ trunk/jrst/src/site/apt/index.apt 2010-04-16 10:08:01 UTC (rev 461) @@ -1,3 +1,28 @@ +~~~ +~~ #%L +~~ JRst :: Api +~~ +~~ $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% +~~~ + ---- Jrst -lib ---- Modified: trunk/jrst/src/site/en/apt/index.apt =================================================================== --- trunk/jrst/src/site/en/apt/index.apt 2010-04-16 09:14:03 UTC (rev 460) +++ trunk/jrst/src/site/en/apt/index.apt 2010-04-16 10:08:01 UTC (rev 461) @@ -1,3 +1,28 @@ +~~~ +~~ #%L +~~ JRst :: Api +~~ +~~ $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% +~~~ + ---- Jrst -lib ---- Modified: trunk/jrst/src/site/site_en.xml =================================================================== --- trunk/jrst/src/site/site_en.xml 2010-04-16 09:14:03 UTC (rev 460) +++ trunk/jrst/src/site/site_en.xml 2010-04-16 10:08:01 UTC (rev 461) @@ -1,4 +1,29 @@ <?xml version="1.0" encoding="UTF-8"?> + + <project name="${project.name}"> <bannerLeft> Modified: trunk/jrst/src/site/site_fr.xml =================================================================== --- trunk/jrst/src/site/site_fr.xml 2010-04-16 09:14:03 UTC (rev 460) +++ trunk/jrst/src/site/site_fr.xml 2010-04-16 10:08:01 UTC (rev 461) @@ -1,4 +1,29 @@ <?xml version="1.0" encoding="UTF-8"?> + + <project name="${project.name}"> <bannerLeft> Modified: trunk/jrst/src/test/java/org/nuiton/jrst/AdvancedReaderTest.java =================================================================== --- trunk/jrst/src/test/java/org/nuiton/jrst/AdvancedReaderTest.java 2010-04-16 09:14:03 UTC (rev 460) +++ trunk/jrst/src/test/java/org/nuiton/jrst/AdvancedReaderTest.java 2010-04-16 10:08:01 UTC (rev 461) @@ -1,19 +1,27 @@ -/* *##% JRst - * Copyright (C) 2004 - 2009 CodeLutin - * +/* + * #%L + * JRst :: Api + * + * $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 + * 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.jrst; Modified: trunk/jrst/src/test/java/org/nuiton/jrst/Compare.java =================================================================== --- trunk/jrst/src/test/java/org/nuiton/jrst/Compare.java 2010-04-16 09:14:03 UTC (rev 460) +++ trunk/jrst/src/test/java/org/nuiton/jrst/Compare.java 2010-04-16 10:08:01 UTC (rev 461) @@ -1,21 +1,29 @@ -/* *##% JRst - * Copyright (C) 2004 - 2009 CodeLutin - * +/* + * #%L + * JRst :: Api + * + * $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 + * 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.jrst; import java.io.File; @@ -34,7 +42,6 @@ import javax.swing.JScrollPane; import javax.swing.JSplitPane; import javax.swing.JTextArea; -import javax.swing.plaf.FileChooserUI; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; Modified: trunk/jrst/src/test/java/org/nuiton/jrst/GutterColor.java =================================================================== --- trunk/jrst/src/test/java/org/nuiton/jrst/GutterColor.java 2010-04-16 09:14:03 UTC (rev 460) +++ trunk/jrst/src/test/java/org/nuiton/jrst/GutterColor.java 2010-04-16 10:08:01 UTC (rev 461) @@ -1,19 +1,26 @@ -/* *##% JRst - * Copyright (C) 2004 - 2009 CodeLutin - * +/* + * #%L + * JRst :: Api + * + * $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 + * 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.jrst; Modified: trunk/jrst/src/test/java/org/nuiton/jrst/JRSTGeneratorTest.java =================================================================== --- trunk/jrst/src/test/java/org/nuiton/jrst/JRSTGeneratorTest.java 2010-04-16 09:14:03 UTC (rev 460) +++ trunk/jrst/src/test/java/org/nuiton/jrst/JRSTGeneratorTest.java 2010-04-16 10:08:01 UTC (rev 461) @@ -1,19 +1,27 @@ -/* *##% JRst - * Copyright (C) 2004 - 2009 CodeLutin - * +/* + * #%L + * JRst :: Api + * + * $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 + * 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.jrst; Modified: trunk/jrst/src/test/java/org/nuiton/jrst/JRSTReaderTest.java =================================================================== --- trunk/jrst/src/test/java/org/nuiton/jrst/JRSTReaderTest.java 2010-04-16 09:14:03 UTC (rev 460) +++ trunk/jrst/src/test/java/org/nuiton/jrst/JRSTReaderTest.java 2010-04-16 10:08:01 UTC (rev 461) @@ -1,19 +1,27 @@ -/* *##% JRst - * Copyright (C) 2004 - 2009 CodeLutin - * +/* + * #%L + * JRst :: Api + * + * $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 + * 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.jrst; Modified: trunk/jrst/src/test/java/org/nuiton/jrst/JRSTTest.java =================================================================== --- trunk/jrst/src/test/java/org/nuiton/jrst/JRSTTest.java 2010-04-16 09:14:03 UTC (rev 460) +++ trunk/jrst/src/test/java/org/nuiton/jrst/JRSTTest.java 2010-04-16 10:08:01 UTC (rev 461) @@ -1,3 +1,28 @@ +/* + * #%L + * JRst :: Api + * + * $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% + */ + package org.nuiton.jrst; import java.io.File; Modified: trunk/jrst/src/test/java/org/nuiton/jrst/ThreadRedirection.java =================================================================== --- trunk/jrst/src/test/java/org/nuiton/jrst/ThreadRedirection.java 2010-04-16 09:14:03 UTC (rev 460) +++ trunk/jrst/src/test/java/org/nuiton/jrst/ThreadRedirection.java 2010-04-16 10:08:01 UTC (rev 461) @@ -1,19 +1,26 @@ -/* *##% JRst - * Copyright (C) 2004 - 2009 CodeLutin - * +/* + * #%L + * JRst :: Api + * + * $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 + * 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.jrst; Modified: trunk/jrst/src/test/java/org/nuiton/jrst/XMLCaseTest.java =================================================================== --- trunk/jrst/src/test/java/org/nuiton/jrst/XMLCaseTest.java 2010-04-16 09:14:03 UTC (rev 460) +++ trunk/jrst/src/test/java/org/nuiton/jrst/XMLCaseTest.java 2010-04-16 10:08:01 UTC (rev 461) @@ -1,19 +1,26 @@ -/* *##% JRst - * Copyright (C) 2004 - 2009 CodeLutin - * +/* + * #%L + * JRst :: Api + * + * $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 + * 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.jrst; Modified: trunk/jrst-doc/pom.xml =================================================================== --- trunk/jrst-doc/pom.xml 2010-04-16 09:14:03 UTC (rev 460) +++ trunk/jrst-doc/pom.xml 2010-04-16 10:08:01 UTC (rev 461) @@ -1,4 +1,29 @@ <?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/xsd/maven-4.0.0.xsd"> <modelVersion>4.0.0</modelVersion> Modified: trunk/jrst-doc/src/site/en/rst/devel/Todo.rst =================================================================== --- trunk/jrst-doc/src/site/en/rst/devel/Todo.rst 2010-04-16 09:14:03 UTC (rev 460) +++ trunk/jrst-doc/src/site/en/rst/devel/Todo.rst 2010-04-16 10:08:01 UTC (rev 461) @@ -1,3 +1,27 @@ +.. - +.. * #%L +.. * JRst :: Documentation +.. * +.. * $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% +.. - ==== Todo ==== Modified: trunk/jrst-doc/src/site/en/rst/devel/XSLpresentation.rst =================================================================== --- trunk/jrst-doc/src/site/en/rst/devel/XSLpresentation.rst 2010-04-16 09:14:03 UTC (rev 460) +++ trunk/jrst-doc/src/site/en/rst/devel/XSLpresentation.rst 2010-04-16 10:08:01 UTC (rev 461) @@ -1,3 +1,27 @@ +.. - +.. * #%L +.. * JRst :: Documentation +.. * +.. * $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% +.. - ===================================== XSL (Extensible Stylesheets Language) ===================================== Modified: trunk/jrst-doc/src/site/en/rst/devel/developerDoc.rst =================================================================== --- trunk/jrst-doc/src/site/en/rst/devel/developerDoc.rst 2010-04-16 09:14:03 UTC (rev 460) +++ trunk/jrst-doc/src/site/en/rst/devel/developerDoc.rst 2010-04-16 10:08:01 UTC (rev 461) @@ -1,3 +1,27 @@ +.. - +.. * #%L +.. * JRst :: Documentation +.. * +.. * $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% +.. - ======================= Developer Documentation ======================= Modified: trunk/jrst-doc/src/site/en/rst/devel/externalDoc.rst =================================================================== --- trunk/jrst-doc/src/site/en/rst/devel/externalDoc.rst 2010-04-16 09:14:03 UTC (rev 460) +++ trunk/jrst-doc/src/site/en/rst/devel/externalDoc.rst 2010-04-16 10:08:01 UTC (rev 461) @@ -1,3 +1,27 @@ +.. - +.. * #%L +.. * JRst :: Documentation +.. * +.. * $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% +.. - ====================== External documentation ====================== Modified: trunk/jrst-doc/src/site/en/rst/devel/library.rst =================================================================== --- trunk/jrst-doc/src/site/en/rst/devel/library.rst 2010-04-16 09:14:03 UTC (rev 460) +++ trunk/jrst-doc/src/site/en/rst/devel/library.rst 2010-04-16 10:08:01 UTC (rev 461) @@ -1,3 +1,27 @@ +.. - +.. * #%L +.. * JRst :: Documentation +.. * +.. * $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% +.. - ===================== Various librairy used ===================== Modified: trunk/jrst-doc/src/site/en/rst/index.rst =================================================================== --- trunk/jrst-doc/src/site/en/rst/index.rst 2010-04-16 09:14:03 UTC (rev 460) +++ trunk/jrst-doc/src/site/en/rst/index.rst 2010-04-16 10:08:01 UTC (rev 461) @@ -1,3 +1,27 @@ +.. - +.. * #%L +.. * JRst :: Documentation +.. * +.. * $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% +.. - =============================== reStructuredText_ parser : JRst =============================== @@ -63,13 +87,13 @@ Maven_ Plugin ------------- -Maven_ plugin is available at the following links : http://jrst.labs.libre-entreprise.org/maven-jrst-plugin. +Maven_ plugin is available at the following links : http://maven-site.nuiton.org/jrst/maven-jrst-plugin/en. It enables the use of JRST from Maven_. .. [1] Only html, xhtml, DocBook_, xdoc and pdf are available for the moment. .. _reStructuredText: RSTpresentation.html .. _Maven: http://maven.apache.org/ -.. _XSL: http://jrst.labs.libre-entreprise.org/en/devel/XSLpresentation.rst +.. _XSL: ./devel/XSLpresentation.html .. _DocBook: http://www.docbook.org/ .. _LaTex: http://www.latex-project.org/ Modified: trunk/jrst-doc/src/site/en/rst/user/RSTpresentation.rst =================================================================== --- trunk/jrst-doc/src/site/en/rst/user/RSTpresentation.rst 2010-04-16 09:14:03 UTC (rev 460) +++ trunk/jrst-doc/src/site/en/rst/user/RSTpresentation.rst 2010-04-16 10:08:01 UTC (rev 461) @@ -1,3 +1,27 @@ +.. - +.. * #%L +.. * JRst :: Documentation +.. * +.. * $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% +.. - ========================= A ReStructuredText Primer ========================= Modified: trunk/jrst-doc/src/site/en/rst/user/functionality.rst =================================================================== --- trunk/jrst-doc/src/site/en/rst/user/functionality.rst 2010-04-16 09:14:03 UTC (rev 460) +++ trunk/jrst-doc/src/site/en/rst/user/functionality.rst 2010-04-16 10:08:01 UTC (rev 461) @@ -1,3 +1,27 @@ +.. - +.. * #%L +.. * JRst :: Documentation +.. * +.. * $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% +.. - ========================= Functionalities suggested ========================= Modified: trunk/jrst-doc/src/site/en/rst/user/index.rst =================================================================== --- trunk/jrst-doc/src/site/en/rst/user/index.rst 2010-04-16 09:14:03 UTC (rev 460) +++ trunk/jrst-doc/src/site/en/rst/user/index.rst 2010-04-16 10:08:01 UTC (rev 461) @@ -1,3 +1,27 @@ +.. - +.. * #%L +.. * JRst :: Documentation +.. * +.. * $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% +.. - =============================== reStructuredText_ parser : JRst =============================== Modified: trunk/jrst-doc/src/site/rst/devel/Todo.rst =================================================================== --- trunk/jrst-doc/src/site/rst/devel/Todo.rst 2010-04-16 09:14:03 UTC (rev 460) +++ trunk/jrst-doc/src/site/rst/devel/Todo.rst 2010-04-16 10:08:01 UTC (rev 461) @@ -1,3 +1,27 @@ +.. - +.. * #%L +.. * JRst :: Documentation +.. * +.. * $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% +.. - ==== Todo ==== Modified: trunk/jrst-doc/src/site/rst/devel/docDeveloppeur.rst =================================================================== --- trunk/jrst-doc/src/site/rst/devel/docDeveloppeur.rst 2010-04-16 09:14:03 UTC (rev 460) +++ trunk/jrst-doc/src/site/rst/devel/docDeveloppeur.rst 2010-04-16 10:08:01 UTC (rev 461) @@ -1,3 +1,27 @@ +.. - +.. * #%L +.. * JRst :: Documentation +.. * +.. * $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% +.. - ========================= Documentation développeur ========================= Modified: trunk/jrst-doc/src/site/rst/devel/docExterne.rst =================================================================== --- trunk/jrst-doc/src/site/rst/devel/docExterne.rst 2010-04-16 09:14:03 UTC (rev 460) +++ trunk/jrst-doc/src/site/rst/devel/docExterne.rst 2010-04-16 10:08:01 UTC (rev 461) @@ -1,3 +1,27 @@ +.. - +.. * #%L +.. * JRst :: Documentation +.. * +.. * $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% +.. - ===================== Documentation externe ===================== Modified: trunk/jrst-doc/src/site/rst/devel/librairies.rst =================================================================== --- trunk/jrst-doc/src/site/rst/devel/librairies.rst 2010-04-16 09:14:03 UTC (rev 460) +++ trunk/jrst-doc/src/site/rst/devel/librairies.rst 2010-04-16 10:08:01 UTC (rev 461) @@ -1,3 +1,27 @@ +.. - +.. * #%L +.. * JRst :: Documentation +.. * +.. * $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% +.. - ==================================== Les différentes librairies utilisées ==================================== Modified: trunk/jrst-doc/src/site/rst/devel/presentationXSL.rst =================================================================== --- trunk/jrst-doc/src/site/rst/devel/presentationXSL.rst 2010-04-16 09:14:03 UTC (rev 460) +++ trunk/jrst-doc/src/site/rst/devel/presentationXSL.rst 2010-04-16 10:08:01 UTC (rev 461) @@ -1,3 +1,27 @@ +.. - +.. * #%L +.. * JRst :: Documentation +.. * +.. * $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% +.. - ======================================== Le XSL (Extensible Stylesheets Language) ======================================== Modified: trunk/jrst-doc/src/site/rst/index.rst =================================================================== --- trunk/jrst-doc/src/site/rst/index.rst 2010-04-16 09:14:03 UTC (rev 460) +++ trunk/jrst-doc/src/site/rst/index.rst 2010-04-16 10:08:01 UTC (rev 461) @@ -1,3 +1,27 @@ +.. - +.. * #%L +.. * JRst :: Documentation +.. * +.. * $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% +.. - =================================== Parseur reStructuredText_ : le JRst =================================== @@ -69,13 +93,13 @@ ------------- Un plugin Maven_ est disponible à l'adresse suivante -http://jrst.labs.libre-entreprise.org/maven-jrst-plugin. Il permet l'utilisation +http://maven-site.nuiton.org/jrst/maven-jrst-plugin. Il permet l'utilisation depuis Maven_ de JRst. .. [1] Seul les formats html, xhtml, DocBook_, xdoc et pdf sont disponible pour le moment. .. _reStructuredText: presentationRST.html .. _Maven: http://maven.apache.org/ -.. _XSL: http://jrst.labs.libre-entreprise.org/fr/devel/presentationXSL.rst +.. _XSL: ./devel/presentationXSL.html .. _DocBook: http://www.docbook.org/ .. _LaTex: http://www.latex-project.org/ \ No newline at end of file Modified: trunk/jrst-doc/src/site/rst/user/faq.rst =================================================================== --- trunk/jrst-doc/src/site/rst/user/faq.rst 2010-04-16 09:14:03 UTC (rev 460) +++ trunk/jrst-doc/src/site/rst/user/faq.rst 2010-04-16 10:08:01 UTC (rev 461) @@ -1,3 +1,27 @@ +.. - +.. * #%L +.. * JRst :: Documentation +.. * +.. * $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% +.. - === FAQ === Modified: trunk/jrst-doc/src/site/rst/user/fonctionnalites.rst =================================================================== --- trunk/jrst-doc/src/site/rst/user/fonctionnalites.rst 2010-04-16 09:14:03 UTC (rev 460) +++ trunk/jrst-doc/src/site/rst/user/fonctionnalites.rst 2010-04-16 10:08:01 UTC (rev 461) @@ -1,3 +1,27 @@ +.. - +.. * #%L +.. * JRst :: Documentation +.. * +.. * $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% +.. - ========================= Fonctionnalités proposées ========================= Modified: trunk/jrst-doc/src/site/rst/user/index.rst =================================================================== --- trunk/jrst-doc/src/site/rst/user/index.rst 2010-04-16 09:14:03 UTC (rev 460) +++ trunk/jrst-doc/src/site/rst/user/index.rst 2010-04-16 10:08:01 UTC (rev 461) @@ -1,3 +1,27 @@ +.. - +.. * #%L +.. * JRst :: Documentation +.. * +.. * $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% +.. - =================================== Parseur reStructuredText_ : le JRst =================================== Modified: trunk/jrst-doc/src/site/rst/user/presentationRST.rst =================================================================== --- trunk/jrst-doc/src/site/rst/user/presentationRST.rst 2010-04-16 09:14:03 UTC (rev 460) +++ trunk/jrst-doc/src/site/rst/user/presentationRST.rst 2010-04-16 10:08:01 UTC (rev 461) @@ -1,3 +1,27 @@ +.. - +.. * #%L +.. * JRst :: Documentation +.. * +.. * $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% +.. - =============================== Introduction à ReStructuredText =============================== Modified: trunk/jrst-doc/src/site/site_en.xml =================================================================== --- trunk/jrst-doc/src/site/site_en.xml 2010-04-16 09:14:03 UTC (rev 460) +++ trunk/jrst-doc/src/site/site_en.xml 2010-04-16 10:08:01 UTC (rev 461) @@ -1,4 +1,29 @@ <?xml version="1.0" encoding="UTF-8"?> + + <project name="${project.name}"> <poweredBy> Modified: trunk/jrst-doc/src/site/site_fr.xml =================================================================== --- trunk/jrst-doc/src/site/site_fr.xml 2010-04-16 09:14:03 UTC (rev 460) +++ trunk/jrst-doc/src/site/site_fr.xml 2010-04-16 10:08:01 UTC (rev 461) @@ -1,4 +1,29 @@ <?xml version="1.0" encoding="UTF-8"?> + + <project name="${project.name}"> <poweredBy> Modified: trunk/maven-jrst-plugin/pom.xml =================================================================== --- trunk/maven-jrst-plugin/pom.xml 2010-04-16 09:14:03 UTC (rev 460) +++ trunk/maven-jrst-plugin/pom.xml 2010-04-16 10:08:01 UTC (rev 461) @@ -1,4 +1,29 @@ <?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/xsd/maven-4.0.0.xsd"> <modelVersion>4.0.0</modelVersion> Modified: trunk/maven-jrst-plugin/src/main/java/org/nuiton/jrst/plugin/GenerationJRstException.java =================================================================== --- trunk/maven-jrst-plugin/src/main/java/org/nuiton/jrst/plugin/GenerationJRstException.java 2010-04-16 09:14:03 UTC (rev 460) +++ trunk/maven-jrst-plugin/src/main/java/org/nuiton/jrst/plugin/GenerationJRstException.java 2010-04-16 10:08:01 UTC (rev 461) @@ -1,19 +1,27 @@ -/* *##% Plugin maven JRst - * Copyright (C) 2006 - 2009 CodeLutin - * +/* + * #%L + * JRst :: Maven plugin + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2006 - 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.jrst.plugin; Modified: trunk/maven-jrst-plugin/src/main/java/org/nuiton/jrst/plugin/JRstPlugin.java =================================================================== --- trunk/maven-jrst-plugin/src/main/java/org/nuiton/jrst/plugin/JRstPlugin.java 2010-04-16 09:14:03 UTC (rev 460) +++ trunk/maven-jrst-plugin/src/main/java/org/nuiton/jrst/plugin/JRstPlugin.java 2010-04-16 10:08:01 UTC (rev 461) @@ -1,19 +1,27 @@ -/* *##% Plugin maven JRst - * Copyright (C) 2006 - 2009 CodeLutin - * +/* + * #%L + * JRst :: Maven plugin + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2006 - 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.jrst.plugin; @@ -167,10 +175,10 @@ */ public JRST.Overwrite getOverwrite() { JRST.Overwrite result = JRST.Overwrite.NEVER; - if (this.overwrite.contains("new")) { + if (overwrite.contains("new")) { result = JRST.Overwrite.IFNEWER; - } else if ("true".equalsIgnoreCase(this.overwrite) - || "alltime".equalsIgnoreCase(this.overwrite)) { + } else if ("true".equalsIgnoreCase(overwrite) + || "alltime".equalsIgnoreCase(overwrite)) { result = JRST.Overwrite.ALLTIME; } return result; Modified: trunk/maven-jrst-plugin/src/site/apt/index.apt =================================================================== --- trunk/maven-jrst-plugin/src/site/apt/index.apt 2010-04-16 09:14:03 UTC (rev 460) +++ trunk/maven-jrst-plugin/src/site/apt/index.apt 2010-04-16 10:08:01 UTC (rev 461) @@ -1,3 +1,28 @@ +~~~ +~~ #%L +~~ JRst :: Maven plugin +~~ +~~ $Id$ +~~ $HeadURL$ +~~ %% +~~ Copyright (C) 2006 - 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% +~~~ + ---- Maven-jrst-plugin ---- Modified: trunk/maven-jrst-plugin/src/site/en/apt/index.apt =================================================================== --- trunk/maven-jrst-plugin/src/site/en/apt/index.apt 2010-04-16 09:14:03 UTC (rev 460) +++ trunk/maven-jrst-plugin/src/site/en/apt/index.apt 2010-04-16 10:08:01 UTC (rev 461) @@ -1,3 +1,28 @@ +~~~ +~~ #%L +~~ JRst :: Maven plugin +~~ +~~ $Id$ +~~ $HeadURL$ +~~ %% +~~ Copyright (C) 2006 - 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% +~~~ + ---- Maven-jrst-plugin ---- Modified: trunk/maven-jrst-plugin/src/site/site_en.xml =================================================================== --- trunk/maven-jrst-plugin/src/site/site_en.xml 2010-04-16 09:14:03 UTC (rev 460) +++ trunk/maven-jrst-plugin/src/site/site_en.xml 2010-04-16 10:08:01 UTC (rev 461) @@ -1,4 +1,29 @@ <?xml version="1.0" encoding="UTF-8"?> + + <project name="${project.name}"> <bannerLeft> Modified: trunk/maven-jrst-plugin/src/site/site_fr.xml =================================================================== --- trunk/maven-jrst-plugin/src/site/site_fr.xml 2010-04-16 09:14:03 UTC (rev 460) +++ trunk/maven-jrst-plugin/src/site/site_fr.xml 2010-04-16 10:08:01 UTC (rev 461) @@ -1,4 +1,29 @@ <?xml version="1.0" encoding="UTF-8"?> + + <project name="${project.name}"> <bannerLeft> Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2010-04-16 09:14:03 UTC (rev 460) +++ trunk/pom.xml 2010-04-16 10:08:01 UTC (rev 461) @@ -1,6 +1,33 @@ <?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/xsd/maven-4.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/xsd/maven-4.0.0.xsd"> + <modelVersion>4.0.0</modelVersion>  Added: trunk/src/license/project.xml =================================================================== --- trunk/src/license/project.xml (rev 0) +++ trunk/src/license/project.xml 2010-04-16 10:08:01 UTC (rev 461) @@ -0,0 +1,85 @@ +<?xml version='1.0' encoding='UTF-8'?> + + +<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-…"> + <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>rst</commentStyle> + <fileSet> + <basedir>src/site</basedir> + <include>**/*.rst</include> + </fileSet> + </header> + + <header> + <commentStyle>apt</commentStyle> + <fileSet> + <basedir>src/site</basedir> + <include>**/*.apt</include> + </fileSet> + </header> + + <header> + <commentStyle>xml</commentStyle> + <fileSets> + + <fileSet> + <basedir>src/site</basedir> + <include>**/*.xml</include> + </fileSet> + <fileSet> + <basedir>src/license</basedir> + <include>**/*.xml</include> + </fileSet> + <fileSet> + <basedir/> + <include>pom.xml</include> + </fileSet> + </fileSets> + </header> + + </headers> + +</project> Property changes on: trunk/src/license/project.xml ___________________________________________________________________ Added: svn:keywords + "Author Date Id Revision HeadURL Modified: trunk/src/site/apt/index.apt =================================================================== --- trunk/src/site/apt/index.apt 2010-04-16 09:14:03 UTC (rev 460) +++ trunk/src/site/apt/index.apt 2010-04-16 10:08:01 UTC (rev 461) @@ -1,3 +1,28 @@ +~~~ +~~ #%L +~~ JRst +~~ +~~ $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% +~~~ + ---- JRsT ---- Modified: trunk/src/site/en/apt/index.apt =================================================================== --- trunk/src/site/en/apt/index.apt 2010-04-16 09:14:03 UTC (rev 460) +++ trunk/src/site/en/apt/index.apt 2010-04-16 10:08:01 UTC (rev 461) @@ -1,3 +1,28 @@ +~~~ +~~ #%L +~~ JRst +~~ +~~ $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% +~~~ + ---- JRsT ---- Modified: trunk/src/site/site_en.xml =================================================================== --- trunk/src/site/site_en.xml 2010-04-16 09:14:03 UTC (rev 460) +++ trunk/src/site/site_en.xml 2010-04-16 10:08:01 UTC (rev 461) @@ -1,4 +1,29 @@ <?xml version="1.0" encoding="UTF-8"?> + + <project name="${project.name}"> <bannerLeft> @@ -18,8 +43,6 @@ <links> <item name="Libre-Entreprise" href="http://www.libre-entreprise.org/"/> -  </links> <menu name="Language"> Modified: trunk/src/site/site_fr.xml =================================================================== --- trunk/src/site/site_fr.xml 2010-04-16 09:14:03 UTC (rev 460) +++ trunk/src/site/site_fr.xml 2010-04-16 10:08:01 UTC (rev 461) @@ -1,4 +1,29 @@ <?xml version="1.0" encoding="UTF-8"?> + + <project name="${project.name}"> <bannerLeft> @@ -15,8 +40,6 @@ <links> <item name="Libre-Entreprise" href="http://www.libre-entreprise.org/"/> -  </links> <breadcrumbs>

1 0

r460 - trunk/jrst/src/main/resources/xsl
by sletellier＠users.nuiton.org April 16, 2010

April 16, 2010

Author: sletellier Date: 2010-04-16 11:14:03 +0200 (Fri, 16 Apr 2010) New Revision: 460 Log: Add space before and after comment Modified: trunk/jrst/src/main/resources/xsl/rst2xhtml.xsl Modified: trunk/jrst/src/main/resources/xsl/rst2xhtml.xsl =================================================================== --- trunk/jrst/src/main/resources/xsl/rst2xhtml.xsl 2010-04-15 17:53:31 UTC (rev 459) +++ trunk/jrst/src/main/resources/xsl/rst2xhtml.xsl 2010-04-16 09:14:03 UTC (rev 460) @@ -20,7 +20,9 @@ <xsl:template match="comment"> <xsl:comment> + <xsl:text> </xsl:text> <xsl:apply-templates/> + <xsl:text> </xsl:text> </xsl:comment> </xsl:template>

1 0