Author: tchemit Date: 2011-05-21 00:55:40 +0200 (Sat, 21 May 2011) New Revision: 194 Url: http://nuiton.org/repositories/revision/jredmine/194 Log: - optimize dependencies - improve code Modified: trunk/maven-jredmine-plugin/pom.xml trunk/maven-jredmine-plugin/src/license/THIRD-PARTY.properties trunk/maven-jredmine-plugin/src/main/java/org/nuiton/jredmine/plugin/DisplayDataMojo.java trunk/maven-jredmine-plugin/src/main/java/org/nuiton/jredmine/plugin/report/AbstractRedmineReport.java Modified: trunk/maven-jredmine-plugin/pom.xml =================================================================== --- trunk/maven-jredmine-plugin/pom.xml 2011-05-20 22:44:58 UTC (rev 193) +++ trunk/maven-jredmine-plugin/pom.xml 2011-05-20 22:55:40 UTC (rev 194) @@ -116,6 +116,11 @@ </dependency> <dependency> + <groupId>org.apache.maven.reporting</groupId> + <artifactId>maven-reporting-impl</artifactId> + </dependency> + + <dependency> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-changes-plugin</artifactId> </dependency> @@ -158,10 +163,10 @@ <artifactId>doxia-sink-api</artifactId> </dependency> - <dependency> + <!--dependency> <groupId>org.apache.maven.doxia</groupId> <artifactId>doxia-module-xhtml</artifactId> - </dependency> + </dependency--> <!-- tests dependencies --> @@ -237,7 +242,7 @@ <plugin> <artifactId>maven-plugin-plugin</artifactId> - <version>2.5.1</version> + <version>${pluginPluginVersion}</version> </plugin> </plugins> Modified: trunk/maven-jredmine-plugin/src/license/THIRD-PARTY.properties =================================================================== --- trunk/maven-jredmine-plugin/src/license/THIRD-PARTY.properties 2011-05-20 22:44:58 UTC (rev 193) +++ trunk/maven-jredmine-plugin/src/license/THIRD-PARTY.properties 2011-05-20 22:55:40 UTC (rev 194) @@ -1,23 +1,25 @@ -# Generated by org.nuiton.license.plugin.AddThirdPartyMojo +# Generated by org.codehaus.mojo.license.AddThirdPartyMojo #------------------------------------------------------------------------------- # Already used licenses in project : # - Apache License # - Apache Public License 2.0 +# - BSD License # - Common Public License Version 1.0 # - Lesser General Public License (LGPL) v 3.0 +# - Public Domain # - The Apache Software License, Version 2.0 +# - http://classworlds.codehaus.org/license.html #------------------------------------------------------------------------------- # Please fill the missing licenses for dependencies : # # -#Sun Jun 27 08:57:33 CEST 2010 -classworlds--classworlds--1.1=http\://classworlds.codehaus.org/license.html -commons-beanutils--commons-beanutils--1.7.0=The Apache Software License, Version 2.0 -commons-codec--commons-codec--1.2=The Apache Software License, Version 2.0 -commons-digester--commons-digester--1.6=The Apache Software License, Version 2.0 -org.codehaus.plexus--plexus-container-default--1.0-alpha-9-stable-1=The Apache Software License, Version 2.0 -org.codehaus.plexus--plexus-i18n--1.0-beta-7=The Apache Software License, Version 2.0 -org.codehaus.plexus--plexus-interactivity-api--1.0-alpha-4=The Apache Software License, Version 2.0 -org.codehaus.plexus--plexus-velocity--1.1.7=The Apache Software License, Version 2.0 -org.sonatype.plexus--plexus-build-api--0.0.4=The Apache Software License, Version 2.0 -oro--oro--2.0.8=The Apache Software License, Version 2.0 +#Sat May 21 00:54:09 CEST 2011 +classworlds--classworlds--1.1--jar=http\://classworlds.codehaus.org/license.html +commons-digester--commons-digester--1.6--jar=The Apache Software License, Version 2.0 +org.codehaus.plexus--plexus-classworlds--1.2-alpha-7--jar=The Apache Software License, Version 2.0 +org.codehaus.plexus--plexus-component-api--1.0-alpha-20--jar=The Apache Software License, Version 2.0 +org.codehaus.plexus--plexus-container-default--1.0-alpha-9-stable-1--jar=The Apache Software License, Version 2.0 +org.codehaus.plexus--plexus-i18n--1.0-beta-10--jar=The Apache Software License, Version 2.0 +org.codehaus.plexus--plexus-interactivity-api--1.0-alpha-4--jar=The Apache Software License, Version 2.0 +org.sonatype.plexus--plexus-build-api--0.0.4--jar=The Apache Software License, Version 2.0 +oro--oro--2.0.8--jar=The Apache Software License, Version 2.0 Modified: trunk/maven-jredmine-plugin/src/main/java/org/nuiton/jredmine/plugin/DisplayDataMojo.java =================================================================== --- trunk/maven-jredmine-plugin/src/main/java/org/nuiton/jredmine/plugin/DisplayDataMojo.java 2011-05-20 22:44:58 UTC (rev 193) +++ trunk/maven-jredmine-plugin/src/main/java/org/nuiton/jredmine/plugin/DisplayDataMojo.java 2011-05-20 22:55:40 UTC (rev 194) @@ -78,7 +78,7 @@ protected boolean sortById; /** - * Flag to know if anonymùous connexion to redmine server is required. + * Flag to know if anonymous connexion to redmine server is required. * <p/> * For this goal, the default value is {@code true} * <p/> Modified: trunk/maven-jredmine-plugin/src/main/java/org/nuiton/jredmine/plugin/report/AbstractRedmineReport.java =================================================================== --- trunk/maven-jredmine-plugin/src/main/java/org/nuiton/jredmine/plugin/report/AbstractRedmineReport.java 2011-05-20 22:44:58 UTC (rev 193) +++ trunk/maven-jredmine-plugin/src/main/java/org/nuiton/jredmine/plugin/report/AbstractRedmineReport.java 2011-05-20 22:55:40 UTC (rev 194) @@ -32,7 +32,6 @@ import org.apache.maven.artifact.resolver.ArtifactResolver; import org.apache.maven.artifact.versioning.InvalidVersionSpecificationException; import org.apache.maven.artifact.versioning.VersionRange; -import org.apache.maven.doxia.module.xhtml.decoration.render.RenderingContext; import org.apache.maven.doxia.sink.Sink; import org.apache.maven.doxia.site.decoration.Body; import org.apache.maven.doxia.site.decoration.DecorationModel; @@ -44,10 +43,9 @@ import org.apache.maven.plugin.MojoExecutionException; import org.apache.maven.reporting.MavenReport; import org.apache.maven.reporting.MavenReportException; +import org.apache.maven.reporting.sink.SinkFactory; import org.codehaus.plexus.i18n.I18N; -import org.nuiton.io.rest.RestClientConfiguration; import org.nuiton.jredmine.plugin.AbstractRedmineMojo; -import org.nuiton.plugin.Plugin; import java.io.File; import java.io.FileWriter; @@ -65,7 +63,7 @@ * @requiresReports true * @since 1.0.0 */ -public abstract class AbstractRedmineReport extends AbstractRedmineMojo implements MavenReport, Plugin, RestClientConfiguration { +public abstract class AbstractRedmineReport extends AbstractRedmineMojo implements MavenReport { /** * Flag to know if anonymùous connexion to redmine server is required. @@ -184,17 +182,24 @@ SiteRenderingContext siteContext = siteRenderer.createContextForSkin(getSkinArtifactFile(), attributes, model, getName(currentLocale), currentLocale); - RenderingContext context = new RenderingContext(outputDirectory, getOutputName() + ".html"); + createDirectoryIfNecessary(outputDirectory); - SiteRendererSink newSink = new SiteRendererSink(context); - generate(newSink, currentLocale); + String filename = getOutputName() + ".html"; + File file = new File(outputDirectory, filename); - createDirectoryIfNecessary(outputDirectory); + SiteRendererSink sink = SinkFactory.createSink(outputDirectory, filename); - Writer writer = new FileWriter(new File(outputDirectory, getOutputName() + ".html")); + generate(sink, currentLocale); - siteRenderer.generateDocument(writer, newSink, siteContext); + Writer writer = new FileWriter(file); + try { + siteRenderer.generateDocument(writer, sink, siteContext); + } finally { + + writer.close(); + } + siteRenderer.copyResources(siteContext, new File(project.getBasedir(), "src/site/resources"), outputDirectory);