Author: sletellier Date: 2012-05-10 17:42:39 +0200 (Thu, 10 May 2012) New Revision: 658 Url: http://nuiton.org/repositories/revision/jrst/658 Log: - Add missing dependency - Dont generate license header on docutils files - Update file headers Modified: branches/jrst-docutils-jython/docutils/pom.xml branches/jrst-docutils-jython/doxia-module-jrst/pom.xml branches/jrst-docutils-jython/jrst/src/main/java/org/nuiton/jrst/JRST.java branches/jrst-docutils-jython/jrst/src/test/java/org/nuiton/jrst/JRSTJython.java branches/jrst-docutils-jython/jrst/src/test/resources/test.rst branches/jrst-docutils-jython/jrst/src/test/resources/test5.rst Modified: branches/jrst-docutils-jython/docutils/pom.xml =================================================================== (Binary files differ) Modified: branches/jrst-docutils-jython/doxia-module-jrst/pom.xml =================================================================== --- branches/jrst-docutils-jython/doxia-module-jrst/pom.xml 2012-05-10 14:07:14 UTC (rev 657) +++ branches/jrst-docutils-jython/doxia-module-jrst/pom.xml 2012-05-10 15:42:39 UTC (rev 658) @@ -92,7 +92,6 @@ <dependency> <groupId>dom4j</groupId> <artifactId>dom4j</artifactId> - <version>1.6.1</version> <!--<scope>runtime</scope>--> </dependency> @@ -101,6 +100,11 @@ <artifactId>junit</artifactId> </dependency> + <dependency> + <groupId>org.codehaus.plexus</groupId> + <artifactId>plexus-utils</artifactId> + </dependency> + </dependencies> <!-- ************************************************************* --> Modified: branches/jrst-docutils-jython/jrst/src/main/java/org/nuiton/jrst/JRST.java =================================================================== --- branches/jrst-docutils-jython/jrst/src/main/java/org/nuiton/jrst/JRST.java 2012-05-10 14:07:14 UTC (rev 657) +++ branches/jrst-docutils-jython/jrst/src/main/java/org/nuiton/jrst/JRST.java 2012-05-10 15:42:39 UTC (rev 658) @@ -8,16 +8,16 @@ * Copyright (C) 2004 - 2011 CodeLutin, Chatellier Eric * %% * 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>. * #L% @@ -488,4 +488,4 @@ return result; } -} \ No newline at end of file +} Modified: branches/jrst-docutils-jython/jrst/src/test/java/org/nuiton/jrst/JRSTJython.java =================================================================== --- branches/jrst-docutils-jython/jrst/src/test/java/org/nuiton/jrst/JRSTJython.java 2012-05-10 14:07:14 UTC (rev 657) +++ branches/jrst-docutils-jython/jrst/src/test/java/org/nuiton/jrst/JRSTJython.java 2012-05-10 15:42:39 UTC (rev 658) @@ -1,5 +1,31 @@ +/* + * #%L + * JRst :: Api + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2004 - 2012 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.net.URL; +import java.util.Properties; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.junit.Test; @@ -7,10 +33,6 @@ import org.python.util.JarRunner; import org.python.util.PythonInterpreter; -import java.io.*; -import java.net.URL; -import java.util.Properties; - /** * Created with IntelliJ IDEA. * User: jpages Modified: branches/jrst-docutils-jython/jrst/src/test/resources/test.rst =================================================================== --- branches/jrst-docutils-jython/jrst/src/test/resources/test.rst 2012-05-10 14:07:14 UTC (rev 657) +++ branches/jrst-docutils-jython/jrst/src/test/resources/test.rst 2012-05-10 15:42:39 UTC (rev 658) @@ -1,3 +1,27 @@ +.. - +.. * #%L +.. * JRst :: Api +.. * +.. * $Id$ +.. * $HeadURL$ +.. * %% +.. * Copyright (C) 2004 - 2012 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% +.. - ===================================== An Introduction to reStructuredText ===================================== Modified: branches/jrst-docutils-jython/jrst/src/test/resources/test5.rst =================================================================== --- branches/jrst-docutils-jython/jrst/src/test/resources/test5.rst 2012-05-10 14:07:14 UTC (rev 657) +++ branches/jrst-docutils-jython/jrst/src/test/resources/test5.rst 2012-05-10 15:42:39 UTC (rev 658) @@ -1,3 +1,27 @@ +.. - +.. * #%L +.. * JRst :: Api +.. * +.. * $Id$ +.. * $HeadURL$ +.. * %% +.. * Copyright (C) 2004 - 2012 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% +.. - .. -*- coding: utf-8 -*- Acknowledgements