You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by br...@apache.org on 2005/12/19 05:57:04 UTC
svn commit: r357634 - in
/maven/components/branches/maven-2.0.x/maven-reporting: maven-reporting-api/
maven-reporting-api/src/main/java/org/apache/maven/reporting/
maven-reporting-api/src/main/java/org/apache/maven/reporting/sink/
maven-reporting-api/s...
Author: brett
Date: Sun Dec 18 20:56:39 2005
New Revision: 357634
URL: http://svn.apache.org/viewcvs?rev=357634&view=rev
Log:
compatibility updates
Removed:
maven/components/branches/maven-2.0.x/maven-reporting/maven-reporting-api/src/main/java/org/apache/maven/reporting/sink/
maven/components/branches/maven-2.0.x/maven-reporting/maven-reporting-api/src/main/java/org/codehaus/
maven/components/branches/maven-2.0.x/maven-reporting/maven-reporting-impl/src/main/java/org/codehaus/
maven/components/branches/maven-2.0.x/maven-reporting/maven-reporting-impl/src/main/resources/
Modified:
maven/components/branches/maven-2.0.x/maven-reporting/maven-reporting-api/pom.xml
maven/components/branches/maven-2.0.x/maven-reporting/maven-reporting-api/src/main/java/org/apache/maven/reporting/MavenReport.java
maven/components/branches/maven-2.0.x/maven-reporting/maven-reporting-impl/pom.xml
maven/components/branches/maven-2.0.x/maven-reporting/maven-reporting-impl/src/main/java/org/apache/maven/reporting/AbstractMavenMultiPageReport.java
maven/components/branches/maven-2.0.x/maven-reporting/maven-reporting-impl/src/main/java/org/apache/maven/reporting/AbstractMavenReport.java
maven/components/branches/maven-2.0.x/maven-reporting/maven-reporting-impl/src/main/java/org/apache/maven/reporting/AbstractMavenReportRenderer.java
maven/components/branches/maven-2.0.x/maven-reporting/maven-reporting-impl/src/main/java/org/apache/maven/reporting/sink/MultiPageSink.java
maven/components/branches/maven-2.0.x/maven-reporting/maven-reporting-impl/src/main/java/org/apache/maven/reporting/sink/SinkFactory.java
Modified: maven/components/branches/maven-2.0.x/maven-reporting/maven-reporting-api/pom.xml
URL: http://svn.apache.org/viewcvs/maven/components/branches/maven-2.0.x/maven-reporting/maven-reporting-api/pom.xml?rev=357634&r1=357633&r2=357634&view=diff
==============================================================================
--- maven/components/branches/maven-2.0.x/maven-reporting/maven-reporting-api/pom.xml (original)
+++ maven/components/branches/maven-2.0.x/maven-reporting/maven-reporting-api/pom.xml Sun Dec 18 20:56:39 2005
@@ -23,7 +23,7 @@
<dependency>
<groupId>org.apache.maven.doxia</groupId>
<artifactId>doxia-sink-api</artifactId>
- <version>1.0-alpha-6</version>
+ <version>1.0-alpha-7-SNAPSHOT</version>
</dependency>
</dependencies>
-</project>
\ No newline at end of file
+</project>
Modified: maven/components/branches/maven-2.0.x/maven-reporting/maven-reporting-api/src/main/java/org/apache/maven/reporting/MavenReport.java
URL: http://svn.apache.org/viewcvs/maven/components/branches/maven-2.0.x/maven-reporting/maven-reporting-api/src/main/java/org/apache/maven/reporting/MavenReport.java?rev=357634&r1=357633&r2=357634&view=diff
==============================================================================
--- maven/components/branches/maven-2.0.x/maven-reporting/maven-reporting-api/src/main/java/org/apache/maven/reporting/MavenReport.java (original)
+++ maven/components/branches/maven-2.0.x/maven-reporting/maven-reporting-api/src/main/java/org/apache/maven/reporting/MavenReport.java Sun Dec 18 20:56:39 2005
@@ -36,6 +36,7 @@
String CATEGORY_PROJECT_REPORTS = "Project Reports";
+ // eventually, we must replace this with the o.a.m.d.s.Sink class as a parameter
void generate( Sink sink, Locale locale )
throws MavenReportException;
Modified: maven/components/branches/maven-2.0.x/maven-reporting/maven-reporting-impl/pom.xml
URL: http://svn.apache.org/viewcvs/maven/components/branches/maven-2.0.x/maven-reporting/maven-reporting-impl/pom.xml?rev=357634&r1=357633&r2=357634&view=diff
==============================================================================
--- maven/components/branches/maven-2.0.x/maven-reporting/maven-reporting-impl/pom.xml (original)
+++ maven/components/branches/maven-2.0.x/maven-reporting/maven-reporting-impl/pom.xml Sun Dec 18 20:56:39 2005
@@ -33,17 +33,7 @@
<dependency>
<groupId>org.apache.maven.doxia</groupId>
<artifactId>doxia-core</artifactId>
- <version>1.0-alpha-6</version>
- <exclusions>
- <exclusion>
- <artifactId>plexus-container-default</artifactId>
- <groupId>plexus</groupId>
- </exclusion>
- <exclusion>
- <artifactId>plexus-utils</artifactId>
- <groupId>plexus</groupId>
- </exclusion>
- </exclusions>
+ <version>1.0-alpha-7-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.maven</groupId>
@@ -59,16 +49,6 @@
<groupId>org.apache.maven.reporting</groupId>
<artifactId>maven-reporting-api</artifactId>
<version>2.0.2-SNAPSHOT</version>
- <exclusions>
- <exclusion>
- <artifactId>plexus-container-default</artifactId>
- <groupId>plexus</groupId>
- </exclusion>
- <exclusion>
- <artifactId>plexus-utils</artifactId>
- <groupId>plexus</groupId>
- </exclusion>
- </exclusions>
</dependency>
</dependencies>
</project>
Modified: maven/components/branches/maven-2.0.x/maven-reporting/maven-reporting-impl/src/main/java/org/apache/maven/reporting/AbstractMavenMultiPageReport.java
URL: http://svn.apache.org/viewcvs/maven/components/branches/maven-2.0.x/maven-reporting/maven-reporting-impl/src/main/java/org/apache/maven/reporting/AbstractMavenMultiPageReport.java?rev=357634&r1=357633&r2=357634&view=diff
==============================================================================
--- maven/components/branches/maven-2.0.x/maven-reporting/maven-reporting-impl/src/main/java/org/apache/maven/reporting/AbstractMavenMultiPageReport.java (original)
+++ maven/components/branches/maven-2.0.x/maven-reporting/maven-reporting-impl/src/main/java/org/apache/maven/reporting/AbstractMavenMultiPageReport.java Sun Dec 18 20:56:39 2005
@@ -18,7 +18,7 @@
import org.apache.maven.reporting.sink.MultiPageSink;
import org.apache.maven.reporting.sink.SinkFactory;
-import org.codehaus.doxia.sink.Sink;
+import org.apache.maven.doxia.sink.Sink;
import java.io.InputStream;
import java.util.ArrayList;
Modified: maven/components/branches/maven-2.0.x/maven-reporting/maven-reporting-impl/src/main/java/org/apache/maven/reporting/AbstractMavenReport.java
URL: http://svn.apache.org/viewcvs/maven/components/branches/maven-2.0.x/maven-reporting/maven-reporting-impl/src/main/java/org/apache/maven/reporting/AbstractMavenReport.java?rev=357634&r1=357633&r2=357634&view=diff
==============================================================================
--- maven/components/branches/maven-2.0.x/maven-reporting/maven-reporting-impl/src/main/java/org/apache/maven/reporting/AbstractMavenReport.java (original)
+++ maven/components/branches/maven-2.0.x/maven-reporting/maven-reporting-impl/src/main/java/org/apache/maven/reporting/AbstractMavenReport.java Sun Dec 18 20:56:39 2005
@@ -19,9 +19,9 @@
import org.apache.maven.plugin.AbstractMojo;
import org.apache.maven.plugin.MojoExecutionException;
import org.apache.maven.project.MavenProject;
-import org.codehaus.doxia.module.xhtml.XhtmlSink;
-import org.codehaus.doxia.sink.Sink;
-import org.codehaus.doxia.site.renderer.SiteRenderer;
+import org.apache.maven.doxia.site.renderer.SiteRenderer;
+import org.apache.maven.doxia.sink.Sink;
+import org.apache.maven.doxia.module.xhtml.XhtmlSink;
import org.codehaus.plexus.util.IOUtil;
import org.codehaus.plexus.util.StringInputStream;
import org.codehaus.plexus.util.StringUtils;
@@ -75,7 +75,8 @@
}
catch ( Exception e )
{
- throw new MojoExecutionException( "An error has occurred in " + getName( locale ) + " report generation.", e );
+ throw new MojoExecutionException( "An error has occurred in " + getName( locale ) + " report generation.",
+ e );
}
}
@@ -89,10 +90,8 @@
{
throw new MavenReportException( "You must specify a sink." );
}
- else
- {
- this.sink = sink;
- }
+
+ this.sink = sink;
executeReport( locale );
Modified: maven/components/branches/maven-2.0.x/maven-reporting/maven-reporting-impl/src/main/java/org/apache/maven/reporting/AbstractMavenReportRenderer.java
URL: http://svn.apache.org/viewcvs/maven/components/branches/maven-2.0.x/maven-reporting/maven-reporting-impl/src/main/java/org/apache/maven/reporting/AbstractMavenReportRenderer.java?rev=357634&r1=357633&r2=357634&view=diff
==============================================================================
--- maven/components/branches/maven-2.0.x/maven-reporting/maven-reporting-impl/src/main/java/org/apache/maven/reporting/AbstractMavenReportRenderer.java (original)
+++ maven/components/branches/maven-2.0.x/maven-reporting/maven-reporting-impl/src/main/java/org/apache/maven/reporting/AbstractMavenReportRenderer.java Sun Dec 18 20:56:39 2005
@@ -18,7 +18,7 @@
import org.apache.commons.validator.EmailValidator;
import org.apache.commons.validator.UrlValidator;
-import org.codehaus.doxia.sink.Sink;
+import org.apache.maven.doxia.sink.Sink;
import org.codehaus.plexus.util.StringUtils;
import java.util.Collections;
Modified: maven/components/branches/maven-2.0.x/maven-reporting/maven-reporting-impl/src/main/java/org/apache/maven/reporting/sink/MultiPageSink.java
URL: http://svn.apache.org/viewcvs/maven/components/branches/maven-2.0.x/maven-reporting/maven-reporting-impl/src/main/java/org/apache/maven/reporting/sink/MultiPageSink.java?rev=357634&r1=357633&r2=357634&view=diff
==============================================================================
--- maven/components/branches/maven-2.0.x/maven-reporting/maven-reporting-impl/src/main/java/org/apache/maven/reporting/sink/MultiPageSink.java (original)
+++ maven/components/branches/maven-2.0.x/maven-reporting/maven-reporting-impl/src/main/java/org/apache/maven/reporting/sink/MultiPageSink.java Sun Dec 18 20:56:39 2005
@@ -17,7 +17,7 @@
*/
import org.apache.maven.doxia.sink.SinkAdapter;
-import org.codehaus.doxia.sink.Sink;
+import org.apache.maven.doxia.sink.Sink;
/**
* @author Emmanuel Venisse
Modified: maven/components/branches/maven-2.0.x/maven-reporting/maven-reporting-impl/src/main/java/org/apache/maven/reporting/sink/SinkFactory.java
URL: http://svn.apache.org/viewcvs/maven/components/branches/maven-2.0.x/maven-reporting/maven-reporting-impl/src/main/java/org/apache/maven/reporting/sink/SinkFactory.java?rev=357634&r1=357633&r2=357634&view=diff
==============================================================================
--- maven/components/branches/maven-2.0.x/maven-reporting/maven-reporting-impl/src/main/java/org/apache/maven/reporting/sink/SinkFactory.java (original)
+++ maven/components/branches/maven-2.0.x/maven-reporting/maven-reporting-impl/src/main/java/org/apache/maven/reporting/sink/SinkFactory.java Sun Dec 18 20:56:39 2005
@@ -16,9 +16,9 @@
* limitations under the License.
*/
-import org.codehaus.doxia.sink.Sink;
-import org.codehaus.doxia.site.renderer.SiteRenderer;
import org.codehaus.plexus.util.StringInputStream;
+import org.apache.maven.doxia.site.renderer.SiteRenderer;
+import org.apache.maven.doxia.sink.Sink;
import java.io.File;
import java.io.InputStream;
@@ -73,7 +73,7 @@
descriptor = new StringInputStream( "" );
}
- return (Sink) siteRenderer.createSink( new File( siteDirectory ), outputFileName, outputDirectory,
- descriptor, flavour );
+ return siteRenderer.createSink( new File( siteDirectory ), outputFileName, outputDirectory, descriptor,
+ flavour );
}
}