Return-Path: Delivered-To: apmail-maven-commits-archive@www.apache.org Received: (qmail 13134 invoked from network); 27 Feb 2011 10:27:28 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.3) by minotaur.apache.org with SMTP; 27 Feb 2011 10:27:28 -0000 Received: (qmail 96364 invoked by uid 500); 27 Feb 2011 10:27:28 -0000 Delivered-To: apmail-maven-commits-archive@maven.apache.org Received: (qmail 96162 invoked by uid 500); 27 Feb 2011 10:27:25 -0000 Mailing-List: contact commits-help@maven.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@maven.apache.org Delivered-To: mailing list commits@maven.apache.org Received: (qmail 96147 invoked by uid 99); 27 Feb 2011 10:27:25 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 27 Feb 2011 10:27:25 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 27 Feb 2011 10:27:24 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 84CC323889B2; Sun, 27 Feb 2011 10:27:03 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1075018 - /maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/ Date: Sun, 27 Feb 2011 10:27:03 -0000 To: commits@maven.apache.org From: ltheussl@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20110227102703.84CC323889B2@eris.apache.org> Author: ltheussl Date: Sun Feb 27 10:27:02 2011 New Revision: 1075018 URL: http://svn.apache.org/viewvc?rev=1075018&view=rev Log: order imports Modified: maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/CategorySummaryDocumentRenderer.java maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/EffectiveSiteMojo.java maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/ReportDocumentRenderer.java maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/SiteDescriptorArtifactMetadata.java maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/SiteDescriptorAttachMojo.java maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/SiteJarMojo.java maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/SiteMojo.java maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/SiteRunMojo.java Modified: maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/CategorySummaryDocumentRenderer.java URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/CategorySummaryDocumentRenderer.java?rev=1075018&r1=1075017&r2=1075018&view=diff ============================================================================== --- maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/CategorySummaryDocumentRenderer.java (original) +++ maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/CategorySummaryDocumentRenderer.java Sun Feb 27 10:27:02 2011 @@ -19,6 +19,13 @@ package org.apache.maven.plugins.site; * under the License. */ +import java.io.FileNotFoundException; +import java.io.Writer; + +import java.util.Collections; +import java.util.List; +import java.util.Locale; + import org.apache.maven.doxia.sink.Sink; import org.apache.maven.doxia.sink.render.RenderingContext; import org.apache.maven.doxia.siterenderer.DocumentRenderer; @@ -29,13 +36,8 @@ import org.apache.maven.doxia.siterender import org.apache.maven.doxia.tools.MojoLogWrapper; import org.apache.maven.plugin.logging.Log; import org.apache.maven.reporting.MavenReport; -import org.codehaus.plexus.i18n.I18N; -import java.io.FileNotFoundException; -import java.io.Writer; -import java.util.Collections; -import java.util.List; -import java.util.Locale; +import org.codehaus.plexus.i18n.I18N; /** * Renders a Maven report. Modified: maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/EffectiveSiteMojo.java URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/EffectiveSiteMojo.java?rev=1075018&r1=1075017&r2=1075018&view=diff ============================================================================== --- maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/EffectiveSiteMojo.java (original) +++ maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/EffectiveSiteMojo.java Sun Feb 27 10:27:02 2011 @@ -23,8 +23,10 @@ import java.io.File; import java.io.IOException; import java.io.StringWriter; import java.io.Writer; + import java.text.DateFormat; import java.text.SimpleDateFormat; + import java.util.Date; import java.util.List; import java.util.Locale; @@ -34,6 +36,7 @@ import org.apache.maven.doxia.site.decor import org.apache.maven.doxia.siterenderer.SiteRenderingContext; import org.apache.maven.plugin.MojoExecutionException; import org.apache.maven.plugin.MojoFailureException; + import org.codehaus.plexus.util.IOUtil; import org.codehaus.plexus.util.StringUtils; import org.codehaus.plexus.util.WriterFactory; Modified: maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/ReportDocumentRenderer.java URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/ReportDocumentRenderer.java?rev=1075018&r1=1075017&r2=1075018&view=diff ============================================================================== --- maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/ReportDocumentRenderer.java (original) +++ maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/ReportDocumentRenderer.java Sun Feb 27 10:27:02 2011 @@ -19,6 +19,19 @@ package org.apache.maven.plugins.site; * under the License. */ +import java.io.FileNotFoundException; +import java.io.IOException; +import java.io.OutputStream; +import java.io.Writer; +import java.io.File; + +import java.lang.reflect.InvocationTargetException; +import java.lang.reflect.Method; + +import java.util.ArrayList; +import java.util.Locale; +import java.util.List; + import org.apache.maven.doxia.sink.Sink; import org.apache.maven.doxia.sink.SinkFactory; import org.apache.maven.doxia.sink.render.RenderingContext; @@ -31,19 +44,10 @@ import org.apache.maven.doxia.tools.Mojo import org.apache.maven.plugin.logging.Log; import org.apache.maven.reporting.MavenReport; import org.apache.maven.reporting.MavenReportException; + import org.codehaus.plexus.util.IOUtil; import org.codehaus.plexus.util.WriterFactory; -import java.io.FileNotFoundException; -import java.io.IOException; -import java.io.OutputStream; -import java.io.Writer; -import java.io.File; -import java.lang.reflect.InvocationTargetException; -import java.lang.reflect.Method; -import java.util.ArrayList; -import java.util.Locale; -import java.util.List; /** * Renders a Maven report in a doxia site. Modified: maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/SiteDescriptorArtifactMetadata.java URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/SiteDescriptorArtifactMetadata.java?rev=1075018&r1=1075017&r2=1075018&view=diff ============================================================================== --- maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/SiteDescriptorArtifactMetadata.java (original) +++ maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/SiteDescriptorArtifactMetadata.java Sun Feb 27 10:27:02 2011 @@ -19,6 +19,10 @@ package org.apache.maven.plugins.site; * under the License. */ +import java.io.File; +import java.io.IOException; +import java.io.Writer; + import org.apache.maven.artifact.Artifact; import org.apache.maven.artifact.metadata.AbstractArtifactMetadata; import org.apache.maven.artifact.metadata.ArtifactMetadata; @@ -26,13 +30,10 @@ import org.apache.maven.artifact.reposit import org.apache.maven.artifact.repository.metadata.RepositoryMetadataStoreException; import org.apache.maven.doxia.site.decoration.DecorationModel; import org.apache.maven.doxia.site.decoration.io.xpp3.DecorationXpp3Writer; + import org.codehaus.plexus.util.IOUtil; import org.codehaus.plexus.util.WriterFactory; -import java.io.File; -import java.io.IOException; -import java.io.Writer; - /** * Attach a POM to an artifact. * Modified: maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/SiteDescriptorAttachMojo.java URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/SiteDescriptorAttachMojo.java?rev=1075018&r1=1075017&r2=1075018&view=diff ============================================================================== --- maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/SiteDescriptorAttachMojo.java (original) +++ maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/SiteDescriptorAttachMojo.java Sun Feb 27 10:27:02 2011 @@ -23,6 +23,7 @@ import java.io.File; import java.io.IOException; import java.io.StringReader; import java.io.Writer; + import java.util.List; import java.util.Locale; Modified: maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/SiteJarMojo.java URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/SiteJarMojo.java?rev=1075018&r1=1075017&r2=1075018&view=diff ============================================================================== --- maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/SiteJarMojo.java (original) +++ maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/SiteJarMojo.java Sun Feb 27 10:27:02 2011 @@ -19,15 +19,16 @@ package org.apache.maven.plugins.site; * under the License. */ +import java.io.File; +import java.io.IOException; + import org.apache.maven.plugin.MojoExecutionException; import org.apache.maven.plugin.MojoFailureException; import org.apache.maven.project.MavenProjectHelper; + import org.codehaus.plexus.archiver.ArchiverException; import org.codehaus.plexus.archiver.jar.JarArchiver; -import java.io.File; -import java.io.IOException; - /** * Bundles the site output into a JAR so that it can be deployed to a repository. * Modified: maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/SiteMojo.java URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/SiteMojo.java?rev=1075018&r1=1075017&r2=1075018&view=diff ============================================================================== --- maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/SiteMojo.java (original) +++ maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/SiteMojo.java Sun Feb 27 10:27:02 2011 @@ -19,20 +19,21 @@ package org.apache.maven.plugins.site; * under the License. */ -import org.apache.maven.doxia.siterenderer.DocumentRenderer; -import org.apache.maven.doxia.siterenderer.RendererException; -import org.apache.maven.doxia.siterenderer.SiteRenderingContext; -import org.apache.maven.plugin.MojoExecutionException; -import org.apache.maven.plugin.MojoFailureException; -import org.apache.maven.reporting.MavenReport; - import java.io.File; import java.io.IOException; + import java.util.Collections; import java.util.List; import java.util.Locale; import java.util.Map; +import org.apache.maven.doxia.siterenderer.DocumentRenderer; +import org.apache.maven.doxia.siterenderer.RendererException; +import org.apache.maven.doxia.siterenderer.SiteRenderingContext; +import org.apache.maven.plugin.MojoExecutionException; +import org.apache.maven.plugin.MojoFailureException; +import org.apache.maven.reporting.MavenReport; + /** * Generates the site for a single project. *

Modified: maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/SiteRunMojo.java URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/SiteRunMojo.java?rev=1075018&r1=1075017&r2=1075018&view=diff ============================================================================== --- maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/SiteRunMojo.java (original) +++ maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/SiteRunMojo.java Sun Feb 27 10:27:02 2011 @@ -24,6 +24,7 @@ import java.io.FileNotFoundException; import java.io.FileOutputStream; import java.io.IOException; import java.io.InputStream; + import java.util.HashMap; import java.util.List; import java.util.Locale; @@ -36,7 +37,9 @@ import org.apache.maven.plugin.MojoFailu import org.apache.maven.plugins.site.webapp.DoxiaBean; import org.apache.maven.plugins.site.webapp.DoxiaFilter; import org.apache.maven.reporting.MavenReport; + import org.codehaus.plexus.util.IOUtil; + import org.mortbay.jetty.Connector; import org.mortbay.jetty.Handler; import org.mortbay.jetty.Server;