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

r545 - in trunk/jrst/src: main/java/org/nuiton/jrst test/java/org/nuiton/jrst
by echatellier＠users.nuiton.org 28 Feb '11

28 Feb '11

Author: echatellier Date: 2011-02-28 10:52:05 +0100 (Mon, 28 Feb 2011) New Revision: 545 Url: http://nuiton.org/repositories/revision/jrst/545 Log: Enable test about pdf generation Modified: trunk/jrst/src/main/java/org/nuiton/jrst/JRSTGenerator.java trunk/jrst/src/test/java/org/nuiton/jrst/JRSTGeneratorTest.java Modified: trunk/jrst/src/main/java/org/nuiton/jrst/JRSTGenerator.java =================================================================== --- trunk/jrst/src/main/java/org/nuiton/jrst/JRSTGenerator.java 2011-02-28 09:28:10 UTC (rev 544) +++ trunk/jrst/src/main/java/org/nuiton/jrst/JRSTGenerator.java 2011-02-28 09:52:05 UTC (rev 545) @@ -222,28 +222,6 @@ Transformer transformer = factory.newTransformer(new StreamSource( stylesheet.openStream())); - // DEBUG To see where is the probleme with the dtd locator :( - // transformer.setErrorListener(new ErrorListener() { - // public void error(TransformerException exception) throws - // TransformerException { - // exception.printStackTrace(); - // } - // public void fatalError(TransformerException exception) throws - // TransformerException { - // exception.printStackTrace(); - // } - // public void warning(TransformerException exception) throws - // TransformerException { - // exception.printStackTrace(); - // } - // - // }); - - // TODO - // for (int i=0; i<args.length; i+=2) { - // transformer. - // } - // now lets style the given document DocumentSource source = new DocumentSource(doc); DocumentResult result = new DocumentResult(); @@ -251,6 +229,7 @@ // return the transformed document Document transformedDoc = result.getDocument(); + return transformedDoc; } Modified: trunk/jrst/src/test/java/org/nuiton/jrst/JRSTGeneratorTest.java =================================================================== --- trunk/jrst/src/test/java/org/nuiton/jrst/JRSTGeneratorTest.java 2011-02-28 09:28:10 UTC (rev 544) +++ trunk/jrst/src/test/java/org/nuiton/jrst/JRSTGeneratorTest.java 2011-02-28 09:52:05 UTC (rev 545) @@ -29,6 +29,7 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; +import org.junit.Assert; import org.junit.Ignore; import org.junit.Test; @@ -69,6 +70,7 @@ File test1 = File.createTempFile("jrst-RstToHtml2", ".html"); JRST.main(new String[] { "-t", "html", "--force", "-o", test1.getAbsolutePath(), "src/test/resources/text.rst" }); + Assert.assertTrue(test1.length() > 0); test1.delete(); } @@ -82,6 +84,7 @@ File test1 = File.createTempFile("jrst-RstToDocbook", ".dbk"); JRST.main(new String[]{"-t", "docbook", "--force","-o", test1.getAbsolutePath(), "src/test/resources/test.rst"}); + Assert.assertTrue(test1.length() > 0); test1.delete(); } @@ -95,6 +98,7 @@ File test1 = File.createTempFile("jrst-RstToXdoc", ".xdoc"); JRST.main(new String[] { "-t", "xdoc", "--force","-o", test1.getAbsolutePath(), "src/test/resources/test.rst" }); + Assert.assertTrue(test1.length() > 0); test1.delete(); } @@ -113,6 +117,7 @@ File test1 = File.createTempFile("jrst-RstToXdoc2", ".xdoc"); JRST.main(new String[] { "-t", "xdoc", "--force","-o", test1.getAbsolutePath(), "src/test/resources/test2.rst" }); + Assert.assertTrue(test1.length() > 0); test1.delete(); } @@ -126,6 +131,7 @@ File test1 = File.createTempFile("jrst-RstToXdoc3", ".xdoc"); JRST.main(new String[] { "-t", "xdoc", "--force","-o", test1.getAbsolutePath(), "src/test/resources/test3.rst" }); + Assert.assertTrue(test1.length() > 0); test1.delete(); } @@ -139,6 +145,7 @@ File test1 = File.createTempFile("jrst-RstToXdoc4", ".xdoc"); JRST.main(new String[] { "-t", "xdoc", "--force","-o", test1.getAbsolutePath(), "src/test/resources/test4.rst" }); + Assert.assertTrue(test1.length() > 0); test1.delete(); } @@ -152,10 +159,11 @@ File test1 = File.createTempFile("jrst-RstToXdocJrstSite", ".xdoc"); JRST.main(new String[] { "-t", "xdoc", "--force","-o", test1.getAbsolutePath(), "src/test/resources/frEntier.rst" }); + Assert.assertTrue(test1.length() > 0); test1.delete(); } - @Ignore + @Test public void testRstToPDF() throws Exception { if (log.isInfoEnabled()) { @@ -164,7 +172,8 @@ File test1 = File.createTempFile("jrst-RstToPDF", ".pdf"); JRST.main(new String[] { "-t", "pdf", "--force","-o", test1.getAbsolutePath(), - "src/test/resources/frEntier.rst" }); + "src/test/resources/test.rst" }); + Assert.assertTrue(test1.length() > 0); test1.delete(); } }

1 0

r544 - trunk/jrst/src/main/java/org/nuiton/jrst
by echatellier＠users.nuiton.org 28 Feb '11

28 Feb '11

Author: echatellier Date: 2011-02-28 10:28:10 +0100 (Mon, 28 Feb 2011) New Revision: 544 Url: http://nuiton.org/repositories/revision/jrst/544 Log: Replace sysout by log.debug Modified: trunk/jrst/src/main/java/org/nuiton/jrst/JRST.java Modified: trunk/jrst/src/main/java/org/nuiton/jrst/JRST.java =================================================================== --- trunk/jrst/src/main/java/org/nuiton/jrst/JRST.java 2011-02-28 09:18:03 UTC (rev 543) +++ trunk/jrst/src/main/java/org/nuiton/jrst/JRST.java 2011-02-28 09:28:10 UTC (rev 544) @@ -153,7 +153,7 @@ /** ODT output format type */ public static final String TYPE_ODT = "odt"; - + /** FO output format type */ public static final String TYPE_FO = "fo"; @@ -534,9 +534,13 @@ String smallSystemId = systemId.substring(systemId.lastIndexOf("/") + 1); URL url = Resource.getURL("/docbook/common/" + smallSystemId); - System.out.println("Url found = " + url); - InputStream stream = url.openStream(); - source = new InputSource(stream); + if (url != null) { + if (log.isDebugEnabled()) { + log.debug("Resolved entity url : " + url); + } + InputStream stream = url.openStream(); + source = new InputSource(stream); + } return source; }

1 0

r543 - trunk/maven-jrst-plugin
by echatellier＠users.nuiton.org 28 Feb '11

28 Feb '11

Author: echatellier Date: 2011-02-28 10:18:03 +0100 (Mon, 28 Feb 2011) New Revision: 543 Url: http://nuiton.org/repositories/revision/jrst/543 Log: Update version Modified: trunk/maven-jrst-plugin/pom.xml Modified: trunk/maven-jrst-plugin/pom.xml =================================================================== --- trunk/maven-jrst-plugin/pom.xml 2011-02-26 10:22:57 UTC (rev 542) +++ trunk/maven-jrst-plugin/pom.xml 2011-02-28 09:18:03 UTC (rev 543) @@ -37,7 +37,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>jrst</artifactId> - <version>1.2-SNAPSHOT</version> + <version>1.2.1-SNAPSHOT</version> </parent> <groupId>org.nuiton.jrst</groupId>

1 0

r542 - in trunk/jrst: . src/main/assembly
by tchemit＠users.nuiton.org 26 Feb '11

26 Feb '11

Author: tchemit Date: 2011-02-26 11:22:57 +0100 (Sat, 26 Feb 2011) New Revision: 542 Url: http://nuiton.org/repositories/revision/jrst/542 Log: improve assembly-profile + reformat assembly descriptors Modified: trunk/jrst/pom.xml trunk/jrst/src/main/assembly/deps.xml trunk/jrst/src/main/assembly/full.xml Modified: trunk/jrst/pom.xml =================================================================== --- trunk/jrst/pom.xml 2011-02-17 10:34:11 UTC (rev 541) +++ trunk/jrst/pom.xml 2011-02-26 10:22:57 UTC (rev 542) @@ -261,6 +261,9 @@ </property> </activation> <build> + + <defaultGoal>verify</defaultGoal> + <plugins>  Modified: trunk/jrst/src/main/assembly/deps.xml =================================================================== --- trunk/jrst/src/main/assembly/deps.xml 2011-02-17 10:34:11 UTC (rev 541) +++ trunk/jrst/src/main/assembly/deps.xml 2011-02-26 10:22:57 UTC (rev 542) @@ -23,57 +23,57 @@ #L% --> <assembly> - <id>deps</id> - <formats> - <format>zip</format> - </formats> -  - <dependencySets> - <dependencySet> - <outputDirectory>lib</outputDirectory> - <excludes> - <exclude>junit:junit</exclude> - <exclude>${artifact.groupId}:${artifact.artifactId}</exclude> - </excludes> - <scope>runtime</scope> - </dependencySet> - </dependencySets> - <fileSets> - <fileSet> - <directory>target</directory> - <outputDirectory>/</outputDirectory> - <includes> - <include>*.jar</include> - </includes> - <excludes> - <exclude>*-sources.jar</exclude> - <exclude>*-javadoc.jar</exclude> - </excludes> - </fileSet> - <fileSet> - <outputDirectory>/</outputDirectory> - <includes> - <include>README*</include> - <include>LICENSE*</include> - <include>pom.xml</include> - </includes> - </fileSet> - <fileSet> - <directory>src/main/assembly</directory> - <outputDirectory /> - <filtered>true</filtered> - <fileMode>0755</fileMode> - <includes> - <include>jrst.bat</include> - <include>jrst.sh</include> - </includes> - </fileSet> - <fileSet> - <outputDirectory>/</outputDirectory> - <directory>target/classes</directory> - <includes> - <include>THIRD-PARTY.txt</include> - </includes> - </fileSet> - </fileSets> + <id>deps</id> + <formats> + <format>zip</format> + </formats> +  + <dependencySets> + <dependencySet> + <outputDirectory>lib</outputDirectory> + <excludes> + <exclude>junit:junit</exclude> + <exclude>${artifact.groupId}:${artifact.artifactId}</exclude> + </excludes> + <scope>runtime</scope> + </dependencySet> + </dependencySets> + <fileSets> + <fileSet> + <directory>target</directory> + <outputDirectory>/</outputDirectory> + <includes> + <include>*.jar</include> + </includes> + <excludes> + <exclude>*-sources.jar</exclude> + <exclude>*-javadoc.jar</exclude> + </excludes> + </fileSet> + <fileSet> + <outputDirectory>/</outputDirectory> + <includes> + <include>README*</include> + <include>LICENSE*</include> + <include>pom.xml</include> + </includes> + </fileSet> + <fileSet> + <directory>src/main/assembly</directory> + <outputDirectory/> + <filtered>true</filtered> + <fileMode>0755</fileMode> + <includes> + <include>jrst.bat</include> + <include>jrst.sh</include> + </includes> + </fileSet> + <fileSet> + <outputDirectory>/</outputDirectory> + <directory>target/classes</directory> + <includes> + <include>THIRD-PARTY.txt</include> + </includes> + </fileSet> + </fileSets> </assembly> \ No newline at end of file Modified: trunk/jrst/src/main/assembly/full.xml =================================================================== --- trunk/jrst/src/main/assembly/full.xml 2011-02-17 10:34:11 UTC (rev 541) +++ trunk/jrst/src/main/assembly/full.xml 2011-02-26 10:22:57 UTC (rev 542) @@ -23,59 +23,59 @@ #L% --> <assembly> - <id>full</id> - <formats> - <format>zip</format> - </formats> -  - <dependencySets> - <dependencySet> - <outputDirectory>lib</outputDirectory> - <excludes> - <exclude>${artifact.groupId}:${artifact.artifactId}</exclude> - </excludes> - <scope>runtime</scope> - </dependencySet> - </dependencySets> - <fileSets> - <fileSet> - <directory>target</directory> - <outputDirectory>/</outputDirectory> - <includes> - <include>*.jar</include> - </includes> - <excludes> - <exclude>*-sources.jar</exclude> - </excludes> - </fileSet> - <fileSet> - <outputDirectory>/</outputDirectory> - <includes> - <include>README*</include> - <include>LICENSE*</include> - <include>pom.xml</include> - </includes> - </fileSet> - <fileSet> - <outputDirectory>/</outputDirectory> - <directory>target/classes</directory> - <includes> - <include>THIRD-PARTY.txt</include> - </includes> - </fileSet> - <fileSet> - <directory>src/main/assembly</directory> - <outputDirectory /> - <filtered>true</filtered> - <fileMode>0755</fileMode> - <includes> - <include>jrst.bat</include> - <include>jrst.sh</include> - </includes> - </fileSet> - <fileSet> - <directory>src</directory> -  - </fileSet> - </fileSets> + <id>full</id> + <formats> + <format>zip</format> + </formats> +  + <dependencySets> + <dependencySet> + <outputDirectory>lib</outputDirectory> + <excludes> + <exclude>${artifact.groupId}:${artifact.artifactId}</exclude> + </excludes> + <scope>runtime</scope> + </dependencySet> + </dependencySets> + <fileSets> + <fileSet> + <directory>target</directory> + <outputDirectory>/</outputDirectory> + <includes> + <include>*.jar</include> + </includes> + <excludes> + <exclude>*-sources.jar</exclude> + </excludes> + </fileSet> + <fileSet> + <outputDirectory>/</outputDirectory> + <includes> + <include>README*</include> + <include>LICENSE*</include> + <include>pom.xml</include> + </includes> + </fileSet> + <fileSet> + <outputDirectory>/</outputDirectory> + <directory>target/classes</directory> + <includes> + <include>THIRD-PARTY.txt</include> + </includes> + </fileSet> + <fileSet> + <directory>src/main/assembly</directory> + <outputDirectory/> + <filtered>true</filtered> + <fileMode>0755</fileMode> + <includes> + <include>jrst.bat</include> + <include>jrst.sh</include> + </includes> + </fileSet> + <fileSet> + <directory>src</directory> +  + </fileSet> + </fileSets> </assembly> \ No newline at end of file

1 0

r541 - in trunk/jrst/src: main/java/org/nuiton/jrst test/java/org/nuiton/jrst
by echatellier＠users.nuiton.org 17 Feb '11

17 Feb '11

Author: echatellier Date: 2011-02-17 11:34:11 +0100 (Thu, 17 Feb 2011) New Revision: 541 Url: http://nuiton.org/repositories/revision/jrst/541 Log: Test resources in classpath Modified: trunk/jrst/src/main/java/org/nuiton/jrst/JRST.java trunk/jrst/src/test/java/org/nuiton/jrst/JRSTTest.java Modified: trunk/jrst/src/main/java/org/nuiton/jrst/JRST.java =================================================================== --- trunk/jrst/src/main/java/org/nuiton/jrst/JRST.java 2011-02-16 21:14:16 UTC (rev 540) +++ trunk/jrst/src/main/java/org/nuiton/jrst/JRST.java 2011-02-17 10:34:11 UTC (rev 541) @@ -116,11 +116,11 @@ protected static final String rst2docbook = "/xsl/dn2dbk.xsl"; /** XSL Stylesheet to transform Docbook into xHTML. */ - protected static final String docbook2xhtml = "/xhtml/docbook.xsl"; + protected static final String docbook2xhtml = "/docbook/xhtml/docbook.xsl"; /** XSL Stylesheet to transform Docbook into javahelp. */ - protected static final String docbook2javahelp = "/javahelp/javahelp.xsl"; + protected static final String docbook2javahelp = "/docbook/javahelp/javahelp.xsl"; /** XSL Stylesheet to transform Docbook into htmlhelp. */ - protected static final String docbook2htmlhelp = "/htmlhelp/htmlhelp.xsl"; + protected static final String docbook2htmlhelp = "/docbook/htmlhelp/htmlhelp.xsl"; // /** XSL Stylesheet to transform xml into rst. */ // protected static final String rst2rst = "JRSTWriter"; Modified: trunk/jrst/src/test/java/org/nuiton/jrst/JRSTTest.java =================================================================== --- trunk/jrst/src/test/java/org/nuiton/jrst/JRSTTest.java 2011-02-16 21:14:16 UTC (rev 540) +++ trunk/jrst/src/test/java/org/nuiton/jrst/JRSTTest.java 2011-02-17 10:34:11 UTC (rev 541) @@ -28,12 +28,14 @@ import java.io.File; import java.util.Arrays; import java.util.List; + import org.apache.commons.io.FileUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.junit.Assert; import org.junit.BeforeClass; import org.junit.Test; +import org.nuiton.util.Resource; /** * @@ -43,7 +45,9 @@ /** to use log facility, just put in your code: log.info("..."); */ protected static Log log = LogFactory.getLog(JRSTTest.class); + static File basedir; + static File testBasedir; @BeforeClass @@ -62,7 +66,25 @@ log.info("test basedir : " + testBasedir); } + /** + * Test que les ressources sont bien dans le classpath. + * + * Test du cas particulier de la dependance docbook-xsl. + */ @Test + public void testResources() { + Assert.assertNotNull(Resource.getURL(JRST.rst2xhtml)); + Assert.assertNotNull(Resource.getURL(JRST.rst2xdoc)); + Assert.assertNotNull(Resource.getURL(JRST.rst2docbook)); + Assert.assertNotNull(Resource.getURL(JRST.docbook2xhtml)); + Assert.assertNotNull(Resource.getURL(JRST.docbook2javahelp)); + Assert.assertNotNull(Resource.getURL(JRST.docbook2htmlhelp)); + // FIXME echatellier 20110217 following assert fails + //Assert.assertNotNull(Resource.getURL(JRST.docbook2odf)); + Assert.assertNotNull(Resource.getURL(JRST.docbook2fo)); + } + + @Test public void generateRst() throws Exception { File in = new File(testBasedir, "toRst1-in.rst");

1 0

r540 - trunk
by tchemit＠users.nuiton.org 16 Feb '11

16 Feb '11

Author: tchemit Date: 2011-02-16 22:14:16 +0100 (Wed, 16 Feb 2011) New Revision: 540 Url: http://nuiton.org/repositories/revision/jrst/540 Log: Update mavenpom4redmineAndCentral to 2.5.1. Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2011-02-11 16:18:45 UTC (rev 539) +++ trunk/pom.xml 2011-02-16 21:14:16 UTC (rev 540) @@ -33,7 +33,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom4redmineAndCentral</artifactId> - <version>2.5</version> + <version>2.5.1</version> </parent> <artifactId>jrst</artifactId>

1 0

r539 - in trunk: . jrst jrst/src/main/java/org/nuiton/jrst
by echatellier＠users.nuiton.org 11 Feb '11

11 Feb '11

Author: echatellier Date: 2011-02-11 17:18:45 +0100 (Fri, 11 Feb 2011) New Revision: 539 Url: http://nuiton.org/repositories/revision/jrst/539 Log: Improve resources resolution during xslt transformation. Manage docbook-xsl resources as ... resources. Modified: trunk/jrst/pom.xml trunk/jrst/src/main/java/org/nuiton/jrst/JRST.java trunk/jrst/src/main/java/org/nuiton/jrst/JRSTGenerator.java trunk/pom.xml Modified: trunk/jrst/pom.xml =================================================================== --- trunk/jrst/pom.xml 2011-02-10 12:11:19 UTC (rev 538) +++ trunk/jrst/pom.xml 2011-02-11 16:18:45 UTC (rev 539) @@ -60,7 +60,6 @@ <artifactId>commons-primitives</artifactId> </dependency> - <dependency> <groupId>org.nuiton</groupId> <artifactId>nuiton-utils</artifactId> @@ -84,40 +83,24 @@ <groupId>org.apache.xmlgraphics</groupId> <artifactId>fop</artifactId> </dependency> - + <dependency> + <groupId>net.sourceforge.saxon</groupId> + <artifactId>saxon</artifactId> + </dependency> +   <dependency> <groupId>uk.co.flamingpenguin.jewelcli</groupId> <artifactId>jewelcli</artifactId> </dependency> -  <dependency> - <groupId>xalan</groupId> - <artifactId>xalan</artifactId> - </dependency> -  - <dependency> - <groupId>xalan</groupId> - <artifactId>serializer</artifactId> - </dependency> - <dependency> - <groupId>xml-apis</groupId> - <artifactId>xml-apis</artifactId> - <scope>runtime</scope> - </dependency> -  - <dependency> - <groupId>org.nuiton.thirdparty</groupId> - <artifactId>sdoc</artifactId> -  - </dependency> -  - <dependency> <groupId>net.sf.docbook</groupId> <artifactId>docbook-xsl</artifactId> <type>zip</type> <classifier>resources</classifier> - <scope>runtime</scope> </dependency>  <dependency> @@ -130,12 +113,17 @@ <artifactId>junit</artifactId> <scope>test</scope> </dependency> + <dependency> + <groupId>org.nuiton.thirdparty</groupId> + <artifactId>sdoc</artifactId> + <scope>test</scope> + </dependency> - <dependency> - <groupId>log4j</groupId> - <artifactId>log4j</artifactId> - <scope>runtime</scope> - </dependency> + <dependency> + <groupId>log4j</groupId> + <artifactId>log4j</artifactId> + <scope>runtime</scope> + </dependency> </dependencies>  @@ -162,8 +150,17 @@ <build> + <resources> + <resource> + <directory>${project.basedir}/src/main/resources</directory> + </resource> + <resource> + <directory>${project.build.directory}/generated-resources</directory> + </resource> + </resources> + <plugins> - +  <plugin> <groupId>org.nuiton.i18n</groupId> @@ -178,24 +175,28 @@ </executions> </plugin> -  - <plugin> <artifactId>maven-dependency-plugin</artifactId> <executions> + +  <execution> + <id>unpack-shared-resources</id> + <goals> + <goal>unpack-dependencies</goal> + </goals> + <phase>generate-resources</phase> + <configuration> + <outputDirectory>${project.build.directory}/generated-resources</outputDirectory> + <includeGroupIds>net.sf.docbook</includeGroupIds> + <includeArtifacIds>docbook-xsl</includeArtifacIds> + <includeTypes>zip</includeTypes> + <includeClassifiers>resources</includeClassifiers> + <excludeTransitive>true</excludeTransitive> + </configuration> + </execution> + <execution> <id>copy-dependencies</id> -  <goals> <goal>copy-dependencies</goal> </goals> Modified: trunk/jrst/src/main/java/org/nuiton/jrst/JRST.java =================================================================== --- trunk/jrst/src/main/java/org/nuiton/jrst/JRST.java 2011-02-10 12:11:19 UTC (rev 538) +++ trunk/jrst/src/main/java/org/nuiton/jrst/JRST.java 2011-02-11 16:18:45 UTC (rev 539) @@ -32,10 +32,12 @@ import java.io.BufferedOutputStream; import java.io.BufferedReader; import java.io.File; +import java.io.FileInputStream; import java.io.FileNotFoundException; import java.io.FileOutputStream; import java.io.FileWriter; import java.io.IOException; +import java.io.InputStream; import java.io.InputStreamReader; import java.io.OutputStream; import java.io.Reader; @@ -45,11 +47,16 @@ import java.util.HashMap; import java.util.Map; +import javax.xml.parsers.ParserConfigurationException; +import javax.xml.parsers.SAXParser; +import javax.xml.parsers.SAXParserFactory; import javax.xml.transform.Result; import javax.xml.transform.Source; import javax.xml.transform.Transformer; import javax.xml.transform.TransformerFactory; +import javax.xml.transform.URIResolver; import javax.xml.transform.sax.SAXResult; +import javax.xml.transform.sax.SAXSource; import javax.xml.transform.stream.StreamSource; import org.apache.commons.logging.Log; @@ -58,17 +65,21 @@ import org.apache.fop.apps.Fop; import org.apache.fop.apps.FopFactory; import org.apache.fop.apps.MimeConstants; +import org.dom4j.Document; +import org.dom4j.io.OutputFormat; +import org.dom4j.io.XMLWriter; import org.nuiton.i18n.I18n; +import org.nuiton.jrst.convertisor.DocUtils2RST; +import org.nuiton.jrst.convertisor.DocUtilsVisitor; import org.nuiton.util.FileCompletion; import org.nuiton.util.FileUtil; import org.nuiton.util.Resource; import org.nuiton.util.StringUtil; -import org.dom4j.Document; -import org.dom4j.io.OutputFormat; -import org.dom4j.io.XMLWriter; +import org.xml.sax.EntityResolver; +import org.xml.sax.InputSource; +import org.xml.sax.SAXException; +import org.xml.sax.XMLReader; -import org.nuiton.jrst.convertisor.DocUtils2RST; -import org.nuiton.jrst.convertisor.DocUtilsVisitor; import uk.co.flamingpenguin.jewel.cli.Cli; import uk.co.flamingpenguin.jewel.cli.CliFactory; import uk.co.flamingpenguin.jewel.cli.CommandLineInterface; @@ -117,7 +128,7 @@ /** XSL Stylesheet to transform Docbook into ODF. */ protected static final String docbook2odf = "/xsl/docbook2odf-0.244/docbook.xsl"; /** XSL Stylesheet to transform Docbook into PDF. */ - protected static final String docbook2fo = "/fo/docbook.xsl"; + protected static final String docbook2fo = "/docbook/fo/docbook.xsl"; /** HTML output format type */ public static final String TYPE_HTML = "html"; @@ -410,7 +421,6 @@ * @param overwrite * @throws Exception */ - public static void generate(String xslListOrOutType, File fileIn, String inputEncoding, File fileOut, String outputEncoding, Overwrite overwrite) throws Exception { @@ -483,22 +493,71 @@ + xsl); } - // add uri resolver - /*gen.setUriResolver(new URIResolver() { + final String finalXsl = xsl; + + // add entity resolver + gen.setUriResolver(new URIResolver() { public Source resolve(String href, String base) { - System.out.println("RESOLVING: href: "+href+" base: "+base); + if (log.isDebugEnabled()) { + log.debug("RESOLVING: href: "+href+" base: "+base); + } + String xslDir = finalXsl.substring(0, finalXsl.lastIndexOf('/') + 1); + String resouceFullName = xslDir + href; + + if (log.isDebugEnabled()) { + log.debug("RESOLVING: resouceFullName: "+resouceFullName); + } - return null; try { - System.out.println("RESOLVING: href: "+href+" base: "+base); - StreamSource ss = new StreamSource(new FileInputStream(new File(href))); - return ss; - } catch (FileNotFoundException e) { + InputStream stream = null; + File file = new File(resouceFullName); + if (file.exists()) { + stream = new FileInputStream(file); + } else { + try { + stream = Resource.getURL(resouceFullName).openStream(); + } + catch (Exception e) { + stream = Resource.getURL("/docbook/common/" + href).openStream(); + } + } + + SAXParserFactory parserFactory = SAXParserFactory.newInstance(); + SAXParser saxParser = parserFactory.newSAXParser(); + XMLReader xmlReader = saxParser.getXMLReader(); + xmlReader.setEntityResolver(new EntityResolver() { + @Override + public InputSource resolveEntity(String publicId, String systemId) + throws SAXException, IOException { + + InputSource source = null; + + String smallSystemId = systemId.substring(systemId.lastIndexOf("/") + 1); + URL url = Resource.getURL("/docbook/common/" + smallSystemId); + System.out.println("Url found = " + url); + InputStream stream = url.openStream(); + source = new InputSource(stream); + + return source; + } + }); + InputSource inSrc = new InputSource(stream); + SAXSource saxs = new SAXSource(xmlReader, inSrc); + return saxs; + } catch (IOException e) { e.printStackTrace(); return null; + } catch (ParserConfigurationException e) { + // TODO Auto-generated catch block + e.printStackTrace(); + return null; + } catch (SAXException e) { + // TODO Auto-generated catch block + e.printStackTrace(); + return null; } } - });*/ + }); doc = gen.transform(doc, stylesheet); } Modified: trunk/jrst/src/main/java/org/nuiton/jrst/JRSTGenerator.java =================================================================== --- trunk/jrst/src/main/java/org/nuiton/jrst/JRSTGenerator.java 2011-02-10 12:11:19 UTC (rev 538) +++ trunk/jrst/src/main/java/org/nuiton/jrst/JRSTGenerator.java 2011-02-11 16:18:45 UTC (rev 539) @@ -26,9 +26,26 @@ package org.nuiton.jrst; +import static org.nuiton.jrst.ReStructuredText.*; + +import java.io.File; +import java.io.IOException; +import java.io.Writer; +import java.net.MalformedURLException; +import java.net.URL; +import java.util.LinkedList; + +import javax.xml.transform.Source; +import javax.xml.transform.Transformer; +import javax.xml.transform.TransformerException; +import javax.xml.transform.TransformerFactory; +import javax.xml.transform.URIResolver; +import javax.xml.transform.sax.SAXResult; +import javax.xml.transform.stream.StreamResult; +import javax.xml.transform.stream.StreamSource; + import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import static org.nuiton.jrst.ReStructuredText.*; import org.dom4j.Document; import org.dom4j.Element; import org.dom4j.Node; @@ -40,21 +57,6 @@ import org.xml.sax.InputSource; import org.xml.sax.SAXException; -import javax.xml.transform.Source; -import javax.xml.transform.Transformer; -import javax.xml.transform.TransformerException; -import javax.xml.transform.TransformerFactory; -import javax.xml.transform.URIResolver; -import javax.xml.transform.sax.SAXResult; -import javax.xml.transform.stream.StreamResult; -import javax.xml.transform.stream.StreamSource; -import java.io.File; -import java.io.IOException; -import java.io.Writer; -import java.net.MalformedURLException; -import java.net.URL; -import java.util.LinkedList; - /** * Cette classe contient plusieurs methodes pour générer, soit en utilisant une * feuille de style {@link #generate(Document, URL, Writer)}, soit un @@ -193,7 +195,7 @@ } /** - * Transform doc in another XML document + * Transform doc in another XML document. * * @param doc * @param stylesheet @@ -204,6 +206,11 @@ */ public Document transform(Document doc, URL stylesheet, String... args) throws TransformerException, IOException { + + if (log.isInfoEnabled()) { + log.info("Transform document using : " + stylesheet); + } + // load the transformer using JAXP TransformerFactory factory = TransformerFactory.newInstance(); if (uriResolver != null) { @@ -211,6 +218,7 @@ } else { factory.setURIResolver(new DocumentResolver(stylesheet)); } + Transformer transformer = factory.newTransformer(new StreamSource( stylesheet.openStream())); @@ -250,9 +258,6 @@ URL baseURL; - private DocumentResolver() { - } - public DocumentResolver(URL url) throws MalformedURLException { String path = new File(url.getPath()).getParent(); baseURL = new URL(url.getProtocol(), url.getHost(), url.getPort(), Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2011-02-10 12:11:19 UTC (rev 538) +++ trunk/pom.xml 2011-02-11 16:18:45 UTC (rev 539) @@ -164,6 +164,20 @@ <artifactId>fop</artifactId> <version>1.0</version> <scope>compile</scope> + <exclusions> + <exclusion> + <groupId>xml-apis</groupId> + <artifactId>xml-apis</artifactId> + </exclusion> + <exclusion> + <groupId>xml-apis</groupId> + <artifactId>xml-apis-ext</artifactId> + </exclusion> + <exclusion> + <artifactId>xalan</artifactId> + <groupId>xalan</groupId> + </exclusion> + </exclusions> </dependency> <dependency> @@ -171,6 +185,12 @@ <artifactId>xalan</artifactId> <version>${xalanVersion}</version> <scope>runtime</scope> + <exclusions> + <exclusion> + <groupId>xml-apis</groupId> + <artifactId>xml-apis</artifactId> + </exclusion> + </exclusions> </dependency> <dependency> @@ -178,24 +198,20 @@ <artifactId>serializer</artifactId> <version>${xalanVersion}</version> <scope>runtime</scope> + <exclusions> + <exclusion> + <groupId>xml-apis</groupId> + <artifactId>xml-apis</artifactId> + </exclusion> + </exclusions> </dependency> <dependency> - <groupId>xml-apis</groupId> - <artifactId>xml-apis</artifactId> - <version>1.0.b2</version> + <groupId>net.sourceforge.saxon</groupId> + <artifactId>saxon</artifactId> + <version>9.1.0.8</version> </dependency> -  - -  - <dependency> <groupId>org.nuiton.thirdparty</groupId> <artifactId>sdoc</artifactId> @@ -208,6 +224,12 @@ <artifactId>dom4j</artifactId> <version>1.6.1</version> <scope>compile</scope> + <exclusions> + <exclusion> + <groupId>xml-apis</groupId> + <artifactId>xml-apis</artifactId> + </exclusion> + </exclusions> </dependency> <dependency> @@ -224,18 +246,27 @@ <scope>runtime</scope> <exclusions> <exclusion> + <groupId>xml-apis</groupId> + <artifactId>xml-apis</artifactId> + </exclusion> + <exclusion> <groupId>xerces</groupId> <artifactId>xmlParserAPIs</artifactId> </exclusion> + <exclusion> + <artifactId>xalan</artifactId> + <groupId>xalan</groupId> + </exclusion> </exclusions> </dependency> <dependency> <groupId>net.sf.docbook</groupId> <artifactId>docbook-xsl</artifactId> - <version>1.75.2</version> + <version>1.76.1</version> <type>zip</type> <classifier>resources</classifier> + <scope>provided</scope> </dependency> <dependency>

1 0

r538 - trunk
by tchemit＠users.nuiton.org 10 Feb '11

10 Feb '11

Author: tchemit Date: 2011-02-10 13:11:19 +0100 (Thu, 10 Feb 2011) New Revision: 538 Url: http://nuiton.org/repositories/revision/jrst/538 Log: Update mavenpom4redmineAndCentral to 2.5. Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2011-02-09 15:49:35 UTC (rev 537) +++ trunk/pom.xml 2011-02-10 12:11:19 UTC (rev 538) @@ -33,7 +33,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom4redmineAndCentral</artifactId> - <version>2.4.4</version> + <version>2.5</version> </parent> <artifactId>jrst</artifactId>

1 0

r537 - in trunk: doxia-module-jrst/src/site doxia-module-jrst/src/site/apt jrst/src/site jrst-doc/src/site src/site src/site/apt src/site/en/apt
by jcouteau＠users.nuiton.org 09 Feb '11

09 Feb '11

Author: jcouteau Date: 2011-02-09 16:49:35 +0100 (Wed, 09 Feb 2011) New Revision: 537 Url: http://nuiton.org/repositories/revision/jrst/537 Log: Improve documentation homepage and menu Modified: trunk/doxia-module-jrst/src/site/apt/index.apt trunk/doxia-module-jrst/src/site/site_en.xml trunk/doxia-module-jrst/src/site/site_fr.xml trunk/jrst-doc/src/site/site_en.xml trunk/jrst-doc/src/site/site_fr.xml trunk/jrst/src/site/site_en.xml trunk/jrst/src/site/site_fr.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/src/site/apt/index.apt =================================================================== --- trunk/doxia-module-jrst/src/site/apt/index.apt 2011-02-09 08:00:50 UTC (rev 536) +++ trunk/doxia-module-jrst/src/site/apt/index.apt 2011-02-09 15:49:35 UTC (rev 537) @@ -44,9 +44,4 @@ </plugin> -------------------------------------------------- - That it ! Then run "mvn site". - - -Warning - - Version 1.0.x only works with doxia-1.0.x (provided by maven-site-plugin-2.0.x). \ No newline at end of file + Ensuite vous avez plus qu'à lancer la commande mvn site \ No newline at end of file Modified: trunk/doxia-module-jrst/src/site/site_en.xml =================================================================== --- trunk/doxia-module-jrst/src/site/site_en.xml 2011-02-09 08:00:50 UTC (rev 536) +++ trunk/doxia-module-jrst/src/site/site_en.xml 2011-02-09 15:49:35 UTC (rev 537) @@ -54,6 +54,16 @@ <item href="/devel.html" name="Documentation"/> </menu> + <menu name="Community"> + <item name="Bugtracker" href="http://nuiton.org/projects/jrst/issues"/> + <item name="Roadmap" href="http://nuiton.org/projects/roadmap/jrst"/> + <item name="Downloads" href="http://nuiton.org/projects/list_files/jrst"/> + <item name="Continuous integration" + href="http://hudson.nuiton.org/hudson/job/jrst"/> + <item name="Code analysis" + href="http://sonar.nuiton.org/sonar/project/index/org.nuiton:jrst"/> + </menu> + <menu ref="reports"/> </body> Modified: trunk/doxia-module-jrst/src/site/site_fr.xml =================================================================== --- trunk/doxia-module-jrst/src/site/site_fr.xml 2011-02-09 08:00:50 UTC (rev 536) +++ trunk/doxia-module-jrst/src/site/site_fr.xml 2011-02-09 15:49:35 UTC (rev 537) @@ -44,14 +44,26 @@ <menu ref="parent"/> - <menu name="User"> - <item href="/index.html" name="About"/> + <menu name="Utilisateur"> + <item href="/index.html" name="A propos"/> </menu> - <menu name="Developer"> + <menu name="Developpeur"> <item href="/devel.html" name="Documentation"/> </menu> + <menu name="Communauté"> + <item name="Suivi des bugs" + href="http://nuiton.org/projects/jrst/issues"/> + <item name="Roadmap" href="http://nuiton.org/projects/roadmap/jrst"/> + <item name="Téléchargements" + href="http://nuiton.org/projects/list_files/jrst"/> + <item name="Intégration continue" + href="http://hudson.nuiton.org/hudson/job/jrst"/> + <item name="Analyse du code" + href="http://sonar.nuiton.org/sonar/project/index/org.nuiton:jrst"/> + </menu> + <menu ref="reports"/> </body> Modified: trunk/jrst/src/site/site_en.xml =================================================================== --- trunk/jrst/src/site/site_en.xml 2011-02-09 08:00:50 UTC (rev 536) +++ trunk/jrst/src/site/site_en.xml 2011-02-09 15:49:35 UTC (rev 537) @@ -46,6 +46,16 @@ <item name="JRst" href="../../en/index.html"/> </menu> + <menu name="Community"> + <item name="Bugtracker" href="http://nuiton.org/projects/jrst/issues"/> + <item name="Roadmap" href="http://nuiton.org/projects/roadmap/jrst"/> + <item name="Downloads" href="http://nuiton.org/projects/list_files/jrst"/> + <item name="Continuous integration" + href="http://hudson.nuiton.org/hudson/job/jrst"/> + <item name="Code analysis" + href="http://sonar.nuiton.org/sonar/project/index/org.nuiton:jrst"/> + </menu> + <menu name="Download"> <item href="${repository.home.url}/org/nuiton/jrst/${project.artifactId}/${project.version}/${project.build.finalName}.jar" Modified: trunk/jrst/src/site/site_fr.xml =================================================================== --- trunk/jrst/src/site/site_fr.xml 2011-02-09 08:00:50 UTC (rev 536) +++ trunk/jrst/src/site/site_fr.xml 2011-02-09 15:49:35 UTC (rev 537) @@ -56,6 +56,18 @@ name="Sources (jar)"/> </menu> + <menu name="Communauté"> + <item name="Suivi des bugs" + href="http://nuiton.org/projects/jrst/issues"/> + <item name="Roadmap" href="http://nuiton.org/projects/roadmap/jrst"/> + <item name="Téléchargements" + href="http://nuiton.org/projects/list_files/jrst"/> + <item name="Intégration continue" + href="http://hudson.nuiton.org/hudson/job/jrst"/> + <item name="Analyse du code" + href="http://sonar.nuiton.org/sonar/project/index/org.nuiton:jrst"/> + </menu> + <menu ref="reports"/> </body> Modified: trunk/jrst-doc/src/site/site_en.xml =================================================================== --- trunk/jrst-doc/src/site/site_en.xml 2011-02-09 08:00:50 UTC (rev 536) +++ trunk/jrst-doc/src/site/site_en.xml 2011-02-09 15:49:35 UTC (rev 537) @@ -68,5 +68,15 @@ <item name="External documentation" href="/devel/externalDoc.html"/> </menu> + <menu name="Community"> + <item name="Bugtracker" href="http://nuiton.org/projects/jrst/issues"/> + <item name="Roadmap" href="http://nuiton.org/projects/roadmap/jrst"/> + <item name="Downloads" href="http://nuiton.org/projects/list_files/jrst"/> + <item name="Continuous integration" + href="http://hudson.nuiton.org/hudson/job/jrst"/> + <item name="Code analysis" + href="http://sonar.nuiton.org/sonar/project/index/org.nuiton:jrst"/> + </menu> + </body> </project> Modified: trunk/jrst-doc/src/site/site_fr.xml =================================================================== --- trunk/jrst-doc/src/site/site_fr.xml 2011-02-09 08:00:50 UTC (rev 536) +++ trunk/jrst-doc/src/site/site_fr.xml 2011-02-09 15:49:35 UTC (rev 537) @@ -68,5 +68,17 @@ <item name="Documentation externe" href="/devel/docExterne.html"/> </menu> + <menu name="Communauté"> + <item name="Suivi des bugs" + href="http://nuiton.org/projects/jrst/issues"/> + <item name="Roadmap" href="http://nuiton.org/projects/roadmap/jrst"/> + <item name="Téléchargements" + href="http://nuiton.org/projects/list_files/jrst"/> + <item name="Intégration continue" + href="http://hudson.nuiton.org/hudson/job/jrst"/> + <item name="Analyse du code" + href="http://sonar.nuiton.org/sonar/project/index/org.nuiton:jrst"/> + </menu> + </body> </project> \ No newline at end of file Modified: trunk/src/site/apt/index.apt =================================================================== --- trunk/src/site/apt/index.apt 2011-02-09 08:00:50 UTC (rev 536) +++ trunk/src/site/apt/index.apt 2011-02-09 15:49:35 UTC (rev 537) @@ -23,20 +23,19 @@ ~~ #L% ~~~ ----- JRsT ----- - TODO + JRsT est un parseur pour le format RestructuredText écrit en Java sous license + LGPL. - Les quatre modules du projet JRst : + Si vous voulez en savoir plus sur JRst, jettez un oeil à la + {{{../jrst-doc/en/index.html}documentation}} (écrite en RsT et + construite en utilisant JRsT). - - {{{./jrst/index.html}JRst :: Api}} + Les trois modules de JRst : - - {{{./maven-jrst-plugin/index.html}JRst :: Maven Plugin}} + - {{{./jrst/index.html}JRsT :: Api}} - - {{{./ant-jrst-task/index.html}JRst :: Ant task}} + - {{{./doxia-module-jrst/index.html}JRsT :: Doxia module}} - - {{{./doxia-module-jrst/index.html}JRst :: Doxia module}} - - - {{{./jrst-doc/index.html}JRst :: Documentation}} + - {{{./jrst-doc/index.html}JRsT :: Documentation}} Modified: trunk/src/site/en/apt/index.apt =================================================================== --- trunk/src/site/en/apt/index.apt 2011-02-09 08:00:50 UTC (rev 536) +++ trunk/src/site/en/apt/index.apt 2011-02-09 15:49:35 UTC (rev 537) @@ -23,18 +23,20 @@ ~~ #L% ~~~ ----- + JRsT ----- - TODO + JRsT is a parser for the RestructuredText format written in Java under the + LGPL license. + + If you want to know more about JRsT, have a look to the + {{{../jrst-doc/en/index.html}documentation}} (written in RsT and built + using JRst). - The four JRst project modules : + The three JRsT project modules : - - {{{../jrst/en/index.html}JRst :: Api}} + - {{{../jrst/en/index.html}JRsT :: Api}} - - {{{../maven-jrst-plugin/en/index.html}JRst :: Maven Plugin}} + - {{{../doxia-module-jrst/en/index.html}JRsT :: Doxia module}} - - {{{../doxia-module-jrst/en/index.html}JRst :: Doxia module}} - - - {{{../jrst-doc/en/index.html}JRst :: Documentation}} + - {{{../jrst-doc/en/index.html}JRsT :: Documentation}} Modified: trunk/src/site/site_en.xml =================================================================== --- trunk/src/site/site_en.xml 2011-02-09 08:00:50 UTC (rev 536) +++ trunk/src/site/site_en.xml 2011-02-09 15:49:35 UTC (rev 537) @@ -46,10 +46,18 @@ </links> <menu name="Language"> - <item name="French" href="../index.html"/> + <item name="Français" href="../index.html"/> <item name="English" href="index.html"/> </menu> + <menu name="Community"> + <item name="Bugtracker" href="http://nuiton.org/projects/jrst/issues"/> + <item name="Roadmap" href="http://nuiton.org/projects/roadmap/jrst"/> + <item name="Downloads" href="http://nuiton.org/projects/list_files/jrst"/> + <item name="Continuous integration" href="http://hudson.nuiton.org/hudson/job/jrst"/> + <item name="Code analysis" href="http://sonar.nuiton.org/sonar/project/index/org.nuiton:jrst"/> + </menu> +  <menu name="Modules"> Modified: trunk/src/site/site_fr.xml =================================================================== --- trunk/src/site/site_fr.xml 2011-02-09 08:00:50 UTC (rev 536) +++ trunk/src/site/site_fr.xml 2011-02-09 15:49:35 UTC (rev 537) @@ -47,10 +47,22 @@ </breadcrumbs> <menu name="Langue"> - <item name="French" href="index.html"/> + <item name="Français" href="index.html"/> <item name="English" href="./en/index.html"/> </menu> + <menu name="Communauté"> + <item name="Suivi des bugs" + href="http://nuiton.org/projects/jrst/issues"/> + <item name="Roadmap" href="http://nuiton.org/projects/roadmap/jrst"/> + <item name="Téléchargements" + href="http://nuiton.org/projects/list_files/jrst"/> + <item name="Intégration continue" + href="http://hudson.nuiton.org/hudson/job/jrst"/> + <item name="Analyse du code" + href="http://sonar.nuiton.org/sonar/project/index/org.nuiton:jrst"/> + </menu> + <menu ref="modules"/> <menu ref="reports"/>

1 0

r536 - in trunk: . jrst jrst/src/main/assembly jrst/src/test/resources jrst/src/test/resources/bugs maven-jrst-plugin/src/license
by tchemit＠users.nuiton.org 09 Feb '11

09 Feb '11

Author: tchemit Date: 2011-02-09 09:00:50 +0100 (Wed, 09 Feb 2011) New Revision: 536 Url: http://nuiton.org/repositories/revision/jrst/536 Log: Evolution #1301: Updates to mavenpom 2.4.4 Anomalie #1299: jrst sh script does not work Anomalie #1300: poms are using hardcoded plugin version older than the ones in mavenpom Adds svn keywords + headers Modified: trunk/jrst/pom.xml trunk/jrst/src/main/assembly/jrst.bat trunk/jrst/src/main/assembly/jrst.sh trunk/jrst/src/test/resources/bugs/testNoSubtitle.rst trunk/jrst/src/test/resources/log4j.properties trunk/maven-jrst-plugin/src/license/THIRD-PARTY.properties trunk/pom.xml Modified: trunk/jrst/pom.xml =================================================================== --- trunk/jrst/pom.xml 2011-02-08 17:16:27 UTC (rev 535) +++ trunk/jrst/pom.xml 2011-02-09 08:00:50 UTC (rev 536) @@ -252,7 +252,7 @@  <profile> - <id>release-assembly-profile</id> + <id>assembly-profile</id> <activation> <property> <name>performRelease</name> @@ -265,7 +265,6 @@  <plugin> <artifactId>maven-assembly-plugin</artifactId> - <version>2.2-beta-5</version> <executions> <execution> <id>create-assemblies</id> Property changes on: trunk/jrst/src/main/assembly/jrst.bat ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Modified: trunk/jrst/src/main/assembly/jrst.sh =================================================================== --- trunk/jrst/src/main/assembly/jrst.sh 2011-02-08 17:16:27 UTC (rev 535) +++ trunk/jrst/src/main/assembly/jrst.sh 2011-02-09 08:00:50 UTC (rev 536) @@ -1,3 +1,4 @@ +#!/bin/sh ### # #%L # JRst :: Api @@ -22,7 +23,6 @@ # <http://www.gnu.org/licenses/lgpl-3.0.html>. # #L% ### -#!/bin/sh MX=512M cd `dirname $0` if [ -n "$JAVA_HOME" ]; then Property changes on: trunk/jrst/src/main/assembly/jrst.sh ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Modified: trunk/jrst/src/test/resources/bugs/testNoSubtitle.rst =================================================================== --- trunk/jrst/src/test/resources/bugs/testNoSubtitle.rst 2011-02-08 17:16:27 UTC (rev 535) +++ trunk/jrst/src/test/resources/bugs/testNoSubtitle.rst 2011-02-09 08:00:50 UTC (rev 536) @@ -1,3 +1,27 @@ +.. - +.. * #%L +.. * JRst :: Api +.. * +.. * $Id$ +.. * $HeadURL$ +.. * %% +.. * Copyright (C) 2004 - 2011 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% +.. - ============== ECMAScriptEdit ============== @@ -3,6 +27,6 @@ :Author: Benjamin Poussin <poussin(a)codelutin.com> -:Revision: $Revision: 1545 $ -:Date: $Date: 2008-10-08 16:13:44 +0200 (mer 08 oct 2008) $ +:Revision: $Revision$ +:Date: $Date$ .. sectnum:: Property changes on: trunk/jrst/src/test/resources/bugs/testNoSubtitle.rst ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Modified: trunk/jrst/src/test/resources/log4j.properties =================================================================== --- trunk/jrst/src/test/resources/log4j.properties 2011-02-08 17:16:27 UTC (rev 535) +++ trunk/jrst/src/test/resources/log4j.properties 2011-02-09 08:00:50 UTC (rev 536) @@ -3,7 +3,7 @@ # I18n :: Api # # $Id$ -# $HeadURL: http://svn.nuiton.org/svn/i18n/trunk/nuiton-i18n/src/test/resources/log4j.p… $ +# $HeadURL$ # %% # Copyright (C) 2004 - 2010 CodeLutin # %% Property changes on: trunk/jrst/src/test/resources/log4j.properties ___________________________________________________________________ Modified: svn:keywords - Author Date Id Revision + Author Date Id Revision HeadURL Property changes on: trunk/maven-jrst-plugin/src/license/THIRD-PARTY.properties ___________________________________________________________________ Modified: svn:keywords - Author Date Id Revision + Author Date Id Revision HeadURL Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2011-02-08 17:16:27 UTC (rev 535) +++ trunk/pom.xml 2011-02-09 08:00:50 UTC (rev 536) @@ -33,7 +33,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom4redmineAndCentral</artifactId> - <version>2.4.3</version> + <version>2.4.4</version> </parent> <artifactId>jrst</artifactId> @@ -390,7 +390,7 @@ <profiles>  <profile> - <id>extra-modules-profile</id> + <id>extra-modules</id> <modules> <module>maven-jrst-plugin</module>

1 0