September 2009 - Sandbox-commits - mailman.cloud.codelutin.com

r264 - nuiton-rstedit
by tchemit＠users.nuiton.org 29 Sep '09

29 Sep '09

Author: tchemit Date: 2009-09-29 18:45:38 +0200 (Tue, 29 Sep 2009) New Revision: 264 Modified: nuiton-rstedit/pom.xml Log: - use mavenpom 1.0.3, junit 4.7, maven-helper-plugin 1.1.0 - fix xalan dependency pb without adding a dep to the labs :) Modified: nuiton-rstedit/pom.xml =================================================================== --- nuiton-rstedit/pom.xml 2009-09-29 10:45:48 UTC (rev 263) +++ nuiton-rstedit/pom.xml 2009-09-29 16:45:38 UTC (rev 264) @@ -1,3 +1,4 @@ + <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> <modelVersion>4.0.0</modelVersion> @@ -9,7 +10,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom</artifactId> - <version>1.0.2</version> + <version>1.0.3-SNAPSHOT</version> </parent> <artifactId>nuiton-rstedit</artifactId> @@ -18,15 +19,15 @@ <dependencies> <dependency> - <groupId>commons-logging</groupId> - <artifactId>commons-logging</artifactId> + <groupId>commons-logging</groupId> + <artifactId>commons-logging</artifactId> <version>1.1.1</version> </dependency> <dependency> <groupId>junit</groupId> <artifactId>junit</artifactId> - <version>4.6</version> + <version>4.7</version> <scope>test</scope> </dependency> @@ -125,9 +126,9 @@  <scm> - <connection>scm:svn:http://svn.nuiton.org/svn/mavenpom/nuiton-rstedit/trunk</connection> - <developerConnection>scm:svn:http://svn.nuiton.org/svn/mavenpom/nuiton-rstedit/trunk</developerConnection> - <url>http://www.nuiton.org/repositories/browse/mavenpom/nuiton-rstedit/trunk</url> + <connection>scm:svn:http://svn.nuiton.org/svn/sandbox/nuiton-rstedit/trunk</connection> + <developerConnection>scm:svn:http://svn.nuiton.org/svn/sandbox/nuiton-rstedit/trunk</developerConnection> + <url>http://www.nuiton.org/repositories/browse/sandbox/nuiton-rstedit/trunk</url> </scm> <profiles>

1 0

r263 - in jredmine/trunk: . maven-jredmine-plugin/src/main/java/org/nuiton/jredmine/plugin maven-jredmine-plugin/src/main/java/org/nuiton/jredmine/plugin/announcement maven-jredmine-plugin/src/main/java/org/nuiton/jredmine/plugin/report
by tchemit＠users.nuiton.org 29 Sep '09

29 Sep '09

Author: tchemit Date: 2009-09-29 12:45:48 +0200 (Tue, 29 Sep 2009) New Revision: 263 Modified: jredmine/trunk/maven-jredmine-plugin/src/main/java/org/nuiton/jredmine/plugin/AbstractRedmineMojo.java jredmine/trunk/maven-jredmine-plugin/src/main/java/org/nuiton/jredmine/plugin/GenerateChangesMojo.java jredmine/trunk/maven-jredmine-plugin/src/main/java/org/nuiton/jredmine/plugin/NextVersionMojo.java jredmine/trunk/maven-jredmine-plugin/src/main/java/org/nuiton/jredmine/plugin/PublishAttachmentsMojo.java jredmine/trunk/maven-jredmine-plugin/src/main/java/org/nuiton/jredmine/plugin/PublishNewsMojo.java jredmine/trunk/maven-jredmine-plugin/src/main/java/org/nuiton/jredmine/plugin/UpdateVersionMojo.java jredmine/trunk/maven-jredmine-plugin/src/main/java/org/nuiton/jredmine/plugin/announcement/AbstractAnnouncementMojo.java jredmine/trunk/maven-jredmine-plugin/src/main/java/org/nuiton/jredmine/plugin/report/AbstractIssuesReport.java jredmine/trunk/pom.xml Log: utilisation maven-helper-plugin 1.1.0 Modified: jredmine/trunk/maven-jredmine-plugin/src/main/java/org/nuiton/jredmine/plugin/AbstractRedmineMojo.java =================================================================== --- jredmine/trunk/maven-jredmine-plugin/src/main/java/org/nuiton/jredmine/plugin/AbstractRedmineMojo.java 2009-09-29 07:41:28 UTC (rev 262) +++ jredmine/trunk/maven-jredmine-plugin/src/main/java/org/nuiton/jredmine/plugin/AbstractRedmineMojo.java 2009-09-29 10:45:48 UTC (rev 263) @@ -188,11 +188,6 @@ /////////////////////////////////////////////////////////////////////////// /// AbstractPlugin /////////////////////////////////////////////////////////////////////////// - @Override - protected boolean ensurePackaging() { - // accept all project's packaging - return false; - } @Override protected boolean init() throws Exception { Modified: jredmine/trunk/maven-jredmine-plugin/src/main/java/org/nuiton/jredmine/plugin/GenerateChangesMojo.java =================================================================== --- jredmine/trunk/maven-jredmine-plugin/src/main/java/org/nuiton/jredmine/plugin/GenerateChangesMojo.java 2009-09-29 07:41:28 UTC (rev 262) +++ jredmine/trunk/maven-jredmine-plugin/src/main/java/org/nuiton/jredmine/plugin/GenerateChangesMojo.java 2009-09-29 10:45:48 UTC (rev 263) @@ -47,7 +47,7 @@ import org.nuiton.jredmine.model.User; import org.nuiton.jredmine.model.Version; import org.nuiton.jredmine.RedmineServiceException; -import org.nuiton.util.PluginHelper; +import org.nuiton.plugin.PluginHelper; /** * Generates the changes.xml file from the Redmine's server to be used Modified: jredmine/trunk/maven-jredmine-plugin/src/main/java/org/nuiton/jredmine/plugin/NextVersionMojo.java =================================================================== --- jredmine/trunk/maven-jredmine-plugin/src/main/java/org/nuiton/jredmine/plugin/NextVersionMojo.java 2009-09-29 07:41:28 UTC (rev 262) +++ jredmine/trunk/maven-jredmine-plugin/src/main/java/org/nuiton/jredmine/plugin/NextVersionMojo.java 2009-09-29 10:45:48 UTC (rev 263) @@ -25,7 +25,7 @@ import org.apache.maven.plugin.MojoExecutionException; import org.nuiton.jredmine.model.ModelHelper; import org.nuiton.jredmine.model.Version; -import org.nuiton.util.PluginHelper; +import org.nuiton.plugin.PluginHelper; /** * Prepare the next version to be used. Modified: jredmine/trunk/maven-jredmine-plugin/src/main/java/org/nuiton/jredmine/plugin/PublishAttachmentsMojo.java =================================================================== --- jredmine/trunk/maven-jredmine-plugin/src/main/java/org/nuiton/jredmine/plugin/PublishAttachmentsMojo.java 2009-09-29 07:41:28 UTC (rev 262) +++ jredmine/trunk/maven-jredmine-plugin/src/main/java/org/nuiton/jredmine/plugin/PublishAttachmentsMojo.java 2009-09-29 10:45:48 UTC (rev 263) @@ -29,8 +29,8 @@ import java.util.Properties; import org.apache.maven.plugin.MojoExecutionException; import org.nuiton.jredmine.model.Attachment; -import org.nuiton.plugin.CollectFilesMojo; -import org.nuiton.util.PluginHelper; +import org.nuiton.io.plugin.CollectFilesMojo; +import org.nuiton.plugin.PluginHelper; /** * Publish files for a given project and version on redmine server. @@ -212,7 +212,7 @@ List<File> incoming = null; try { - incoming = CollectFilesMojo.getFiles(filesFromProperties); + incoming = new CollectFilesMojo().getFiles(filesFromProperties); getLog().info("Loaded " + filesFromProperties); } catch (IOException ex) { throw new MojoExecutionException("could not load file " + filesFromProperties, ex); Modified: jredmine/trunk/maven-jredmine-plugin/src/main/java/org/nuiton/jredmine/plugin/PublishNewsMojo.java =================================================================== --- jredmine/trunk/maven-jredmine-plugin/src/main/java/org/nuiton/jredmine/plugin/PublishNewsMojo.java 2009-09-29 07:41:28 UTC (rev 262) +++ jredmine/trunk/maven-jredmine-plugin/src/main/java/org/nuiton/jredmine/plugin/PublishNewsMojo.java 2009-09-29 10:45:48 UTC (rev 263) @@ -22,7 +22,7 @@ import java.io.File; import org.nuiton.jredmine.model.News; -import org.nuiton.util.PluginHelper; +import org.nuiton.plugin.PluginHelper; /** * Publish a news on redmine server. Modified: jredmine/trunk/maven-jredmine-plugin/src/main/java/org/nuiton/jredmine/plugin/UpdateVersionMojo.java =================================================================== --- jredmine/trunk/maven-jredmine-plugin/src/main/java/org/nuiton/jredmine/plugin/UpdateVersionMojo.java 2009-09-29 07:41:28 UTC (rev 262) +++ jredmine/trunk/maven-jredmine-plugin/src/main/java/org/nuiton/jredmine/plugin/UpdateVersionMojo.java 2009-09-29 10:45:48 UTC (rev 263) @@ -25,7 +25,7 @@ import org.apache.maven.plugin.MojoExecutionException; import org.nuiton.jredmine.model.ModelHelper; import org.nuiton.jredmine.model.Version; -import org.nuiton.util.PluginHelper; +import org.nuiton.plugin.PluginHelper; /** * Create or update a version on redmine server. Modified: jredmine/trunk/maven-jredmine-plugin/src/main/java/org/nuiton/jredmine/plugin/announcement/AbstractAnnouncementMojo.java =================================================================== --- jredmine/trunk/maven-jredmine-plugin/src/main/java/org/nuiton/jredmine/plugin/announcement/AbstractAnnouncementMojo.java 2009-09-29 07:41:28 UTC (rev 262) +++ jredmine/trunk/maven-jredmine-plugin/src/main/java/org/nuiton/jredmine/plugin/announcement/AbstractAnnouncementMojo.java 2009-09-29 10:45:48 UTC (rev 263) @@ -34,7 +34,7 @@ import org.codehaus.plexus.util.StringUtils; import org.codehaus.plexus.velocity.VelocityComponent; import org.nuiton.jredmine.plugin.AbstractRedmineMojo; -import org.nuiton.util.PluginHelper; +import org.nuiton.plugin.PluginHelper; /** * Modified: jredmine/trunk/maven-jredmine-plugin/src/main/java/org/nuiton/jredmine/plugin/report/AbstractIssuesReport.java =================================================================== --- jredmine/trunk/maven-jredmine-plugin/src/main/java/org/nuiton/jredmine/plugin/report/AbstractIssuesReport.java 2009-09-29 07:41:28 UTC (rev 262) +++ jredmine/trunk/maven-jredmine-plugin/src/main/java/org/nuiton/jredmine/plugin/report/AbstractIssuesReport.java 2009-09-29 10:45:48 UTC (rev 263) @@ -27,7 +27,7 @@ import org.apache.maven.reporting.MavenReportException; import org.nuiton.jredmine.model.Issue; import org.nuiton.jredmine.RedmineServiceException; -import org.nuiton.util.PluginHelper; +import org.nuiton.plugin.PluginHelper; /** * Abstract Generates a report for issues from Redmine's server Modified: jredmine/trunk/pom.xml =================================================================== --- jredmine/trunk/pom.xml 2009-09-29 07:41:28 UTC (rev 262) +++ jredmine/trunk/pom.xml 2009-09-29 10:45:48 UTC (rev 263) @@ -242,7 +242,7 @@ <maven.javadoc.skip>false</maven.javadoc.skip> <maven.version>2.2.1</maven.version> - <helper.version>1.0.3-SNAPSHOT</helper.version> + <helper.version>1.1.0-SNAPSHOT</helper.version>  <license.licenseName>lgpl_v3</license.licenseName> @@ -275,10 +275,37 @@ <plugins> <plugin> + <artifactId>maven-enforcer-plugin</artifactId> + <executions> + <execution> + <id>check-project-files</id> + <goals> + <goal>enforce</goal> + </goals> + <phase>initialize</phase> + <configuration> + <rules> + <requireFilesExist> + <files> + <file>LICENSE.txt</file> + <file>README.txt</file> + <file>changelog.txt</file> + </files> + </requireFilesExist> + </rules> + <ignoreCache>true</ignoreCache> + <failFast>true</failFast> + <fail>true</fail> + + </configuration> + </execution> + </executions> + </plugin> +  + check that the root module has a changelog.txt file <execution> <id>check-project-files</id> <goals> @@ -289,7 +316,7 @@ </configuration> </execution> </executions> - </plugin> + </plugin>--> </plugins>

1 0

r262 - test_rstedit/src/site/rst
by glorieux＠users.nuiton.org 29 Sep '09

29 Sep '09

Author: glorieux Date: 2009-09-29 09:41:28 +0200 (Tue, 29 Sep 2009) New Revision: 262 Modified: test_rstedit/src/site/rst/index.rst Log: Modified: test_rstedit/src/site/rst/index.rst =================================================================== --- test_rstedit/src/site/rst/index.rst 2009-09-29 07:38:20 UTC (rev 261) +++ test_rstedit/src/site/rst/index.rst 2009-09-29 07:41:28 UTC (rev 262) @@ -79,3 +79,4 @@ .. _XSL: http://jrst.labs.libre-entreprise.org/fr/devel/presentationXSL.rst .. _DocBook: http://www.docbook.org/ .. _LaTex: http://www.latex-project.org/ +.. _RST: http://www.latex-project.org/

1 0

r261 - test_rstedit/src/site/rst
by glorieux＠users.nuiton.org 29 Sep '09

29 Sep '09

Author: glorieux Date: 2009-09-29 09:38:20 +0200 (Tue, 29 Sep 2009) New Revision: 261 Modified: test_rstedit/src/site/rst/index.rst Log: Modified: test_rstedit/src/site/rst/index.rst =================================================================== --- test_rstedit/src/site/rst/index.rst 2009-09-29 07:30:53 UTC (rev 260) +++ test_rstedit/src/site/rst/index.rst 2009-09-29 07:38:20 UTC (rev 261) @@ -79,4 +79,3 @@ .. _XSL: http://jrst.labs.libre-entreprise.org/fr/devel/presentationXSL.rst .. _DocBook: http://www.docbook.org/ .. _LaTex: http://www.latex-project.org/ -.dfjhdjfhsdkhfdskjhfksjh \ No newline at end of file

1 0

r260 - test_rstedit/src/site/rst
by glorieux＠users.nuiton.org 29 Sep '09

29 Sep '09

Author: glorieux Date: 2009-09-29 09:30:53 +0200 (Tue, 29 Sep 2009) New Revision: 260 Modified: test_rstedit/src/site/rst/index.rst Log: Modified: test_rstedit/src/site/rst/index.rst =================================================================== --- test_rstedit/src/site/rst/index.rst 2009-09-29 07:30:28 UTC (rev 259) +++ test_rstedit/src/site/rst/index.rst 2009-09-29 07:30:53 UTC (rev 260) @@ -79,4 +79,4 @@ .. _XSL: http://jrst.labs.libre-entreprise.org/fr/devel/presentationXSL.rst .. _DocBook: http://www.docbook.org/ .. _LaTex: http://www.latex-project.org/ -. \ No newline at end of file +.dfjhdjfhsdkhfdskjhfksjh \ No newline at end of file

1 0

r259 - test_rstedit/src/site/rst
by glorieux＠users.nuiton.org 29 Sep '09

29 Sep '09

Author: glorieux Date: 2009-09-29 09:30:28 +0200 (Tue, 29 Sep 2009) New Revision: 259 Modified: test_rstedit/src/site/rst/index.rst Log: Modified: test_rstedit/src/site/rst/index.rst =================================================================== --- test_rstedit/src/site/rst/index.rst 2009-09-29 07:21:26 UTC (rev 258) +++ test_rstedit/src/site/rst/index.rst 2009-09-29 07:30:28 UTC (rev 259) @@ -79,4 +79,4 @@ .. _XSL: http://jrst.labs.libre-entreprise.org/fr/devel/presentationXSL.rst .. _DocBook: http://www.docbook.org/ .. _LaTex: http://www.latex-project.org/ -.. _RST: http://docutils.sourceforge.net/rst.html \ No newline at end of file +. \ No newline at end of file

1 0

r258 - test_rstedit/src/site/rst
by glorieux＠users.nuiton.org 29 Sep '09

29 Sep '09

Author: glorieux Date: 2009-09-29 09:21:26 +0200 (Tue, 29 Sep 2009) New Revision: 258 Modified: test_rstedit/src/site/rst/index.rst Log: Modified: test_rstedit/src/site/rst/index.rst =================================================================== --- test_rstedit/src/site/rst/index.rst 2009-09-29 07:20:19 UTC (rev 257) +++ test_rstedit/src/site/rst/index.rst 2009-09-29 07:21:26 UTC (rev 258) @@ -79,3 +79,4 @@ .. _XSL: http://jrst.labs.libre-entreprise.org/fr/devel/presentationXSL.rst .. _DocBook: http://www.docbook.org/ .. _LaTex: http://www.latex-project.org/ +.. _RST: http://docutils.sourceforge.net/rst.html \ No newline at end of file

1 0

r257 - test_rstedit/src/site/rst
by glorieux＠users.nuiton.org 29 Sep '09

29 Sep '09

Author: glorieux Date: 2009-09-29 09:20:19 +0200 (Tue, 29 Sep 2009) New Revision: 257 Modified: test_rstedit/src/site/rst/index.rst Log: Modified: test_rstedit/src/site/rst/index.rst =================================================================== --- test_rstedit/src/site/rst/index.rst 2009-09-28 15:17:27 UTC (rev 256) +++ test_rstedit/src/site/rst/index.rst 2009-09-29 07:20:19 UTC (rev 257) @@ -79,4 +79,3 @@ .. _XSL: http://jrst.labs.libre-entreprise.org/fr/devel/presentationXSL.rst .. _DocBook: http://www.docbook.org/ .. _LaTex: http://www.latex-project.org/ -.. _RST: http://docutils.sourceforge.net/rst.html \ No newline at end of file

1 0

r256 - test_rstedit/src/site/rst
by glorieux＠users.nuiton.org 28 Sep '09

28 Sep '09

Author: glorieux Date: 2009-09-28 17:17:27 +0200 (Mon, 28 Sep 2009) New Revision: 256 Modified: test_rstedit/src/site/rst/index.rst Log: Modified: test_rstedit/src/site/rst/index.rst =================================================================== --- test_rstedit/src/site/rst/index.rst 2009-09-28 15:15:58 UTC (rev 255) +++ test_rstedit/src/site/rst/index.rst 2009-09-28 15:17:27 UTC (rev 256) @@ -79,3 +79,4 @@ .. _XSL: http://jrst.labs.libre-entreprise.org/fr/devel/presentationXSL.rst .. _DocBook: http://www.docbook.org/ .. _LaTex: http://www.latex-project.org/ +.. _RST: http://docutils.sourceforge.net/rst.html \ No newline at end of file

1 0

r255 - test_rstedit/src/site/rst
by glorieux＠users.nuiton.org 28 Sep '09

28 Sep '09

Author: glorieux Date: 2009-09-28 17:15:58 +0200 (Mon, 28 Sep 2009) New Revision: 255 Modified: test_rstedit/src/site/rst/index.rst Log: Modified: test_rstedit/src/site/rst/index.rst =================================================================== --- test_rstedit/src/site/rst/index.rst 2009-09-28 15:06:51 UTC (rev 254) +++ test_rstedit/src/site/rst/index.rst 2009-09-28 15:15:58 UTC (rev 255) @@ -79,4 +79,3 @@ .. _XSL: http://jrst.labs.libre-entreprise.org/fr/devel/presentationXSL.rst .. _DocBook: http://www.docbook.org/ .. _LaTex: http://www.latex-project.org/ -.. _RST: http://docutils.sourceforge.net/rst.html \ No newline at end of file

1 0