Author: brett
Date: Wed Jul 20 23:54:21 2005
New Revision: 220009
URL: http://svn.apache.org/viewcvs?rev=220009&view=rev
Log:
PR: MNG-366
separate api from implementation keeping most of doxia, reporting and other
libraries out of the core
Added:
maven/components/trunk/maven-reporting/maven-reporting-impl/ (with props)
maven/components/trunk/maven-reporting/maven-reporting-impl/pom.xml (with
props)
maven/components/trunk/maven-reporting/maven-reporting-impl/src/
maven/components/trunk/maven-reporting/maven-reporting-impl/src/main/
maven/components/trunk/maven-reporting/maven-reporting-impl/src/main/java/
maven/components/trunk/maven-reporting/maven-reporting-impl/src/main/java/org/
maven/components/trunk/maven-reporting/maven-reporting-impl/src/main/java/org/apache/
maven/components/trunk/maven-reporting/maven-reporting-impl/src/main/java/org/apache/maven/
maven/components/trunk/maven-reporting/maven-reporting-impl/src/main/java/org/apache/maven/reporting/
maven/components/trunk/maven-reporting/maven-reporting-impl/src/main/java/org/apache/maven/reporting/AbstractMavenMultiPageReport.java
- copied, changed from r219985,
maven/components/trunk/maven-reporting/maven-reporting-api/src/main/java/org/apache/maven/reporting/AbstractMavenMultiPageReport.java
maven/components/trunk/maven-reporting/maven-reporting-impl/src/main/java/org/apache/maven/reporting/AbstractMavenReport.java
- copied, changed from r219985,
maven/components/trunk/maven-reporting/maven-reporting-api/src/main/java/org/apache/maven/reporting/AbstractMavenReport.java
maven/components/trunk/maven-reporting/maven-reporting-impl/src/main/java/org/apache/maven/reporting/AbstractMavenReportRenderer.java
(contents, props changed)
- copied, changed from r219985,
maven/components/trunk/maven-reporting/maven-reporting-api/src/main/java/org/apache/maven/reporting/AbstractMavenReportRenderer.java
maven/components/trunk/maven-reporting/maven-reporting-impl/src/main/java/org/apache/maven/reporting/sink/
maven/components/trunk/maven-reporting/maven-reporting-impl/src/main/java/org/apache/maven/reporting/sink/MultiPageSink.java
- copied, changed from r219985,
maven/components/trunk/maven-reporting/maven-reporting-api/src/main/java/org/apache/maven/reporting/sink/MultiPageSink.java
maven/components/trunk/maven-reporting/maven-reporting-impl/src/main/java/org/apache/maven/reporting/sink/SinkFactory.java
- copied, changed from r219985,
maven/components/trunk/maven-reporting/maven-reporting-api/src/main/java/org/apache/maven/reporting/sink/SinkFactory.java
Removed:
maven/components/trunk/maven-reporting/maven-reporting-api/src/main/java/org/apache/maven/reporting/AbstractMavenMultiPageReport.java
maven/components/trunk/maven-reporting/maven-reporting-api/src/main/java/org/apache/maven/reporting/AbstractMavenReport.java
maven/components/trunk/maven-reporting/maven-reporting-api/src/main/java/org/apache/maven/reporting/AbstractMavenReportRenderer.java
maven/components/trunk/maven-reporting/maven-reporting-api/src/main/java/org/apache/maven/reporting/sink/MultiPageSink.java
maven/components/trunk/maven-reporting/maven-reporting-api/src/main/java/org/apache/maven/reporting/sink/SinkFactory.java
Modified:
maven/components/trunk/maven-core/pom.xml
maven/components/trunk/maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginManager.java
maven/components/trunk/maven-mboot2/src/main/java/MBoot.java
maven/components/trunk/maven-plugins/maven-checkstyle-plugin/pom.xml
maven/components/trunk/maven-plugins/maven-javadoc-plugin/pom.xml
maven/components/trunk/maven-plugins/maven-pmd-plugin/pom.xml
maven/components/trunk/maven-plugins/maven-pmd-plugin/src/main/java/org/apache/maven/plugin/pmd/PmdReport.java
maven/components/trunk/maven-plugins/maven-project-info-reports-plugin/pom.xml
maven/components/trunk/maven-plugins/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/CimReport.java
maven/components/trunk/maven-plugins/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/DependenciesReport.java
maven/components/trunk/maven-plugins/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/IssueTrackingReport.java
maven/components/trunk/maven-plugins/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/LicenseReport.java
maven/components/trunk/maven-plugins/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/MailingListsReport.java
maven/components/trunk/maven-plugins/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/ScmReport.java
maven/components/trunk/maven-plugins/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/TeamListReport.java
maven/components/trunk/maven-plugins/maven-site-plugin/pom.xml
maven/components/trunk/maven-reporting/maven-reporting-api/pom.xml
maven/components/trunk/maven-reporting/maven-reporting-api/src/main/java/org/apache/maven/reporting/MavenReport.java
maven/components/trunk/maven-reporting/pom.xml
Modified: maven/components/trunk/maven-core/pom.xml
URL:
http://svn.apache.org/viewcvs/maven/components/trunk/maven-core/pom.xml?rev=220009&r1=220008&r2=220009&view=diff
==============================================================================
--- maven/components/trunk/maven-core/pom.xml (original)
+++ maven/components/trunk/maven-core/pom.xml Wed Jul 20 23:54:21 2005
@@ -15,7 +15,6 @@
<artifactId>wagon-provider-api</artifactId>
<version>1.0-alpha-4</version>
</dependency>
- <!-- TODO: remove -->
<dependency>
<groupId>org.apache.maven.reporting</groupId>
<artifactId>maven-reporting-api</artifactId>
Modified:
maven/components/trunk/maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginManager.java
URL:
http://svn.apache.org/viewcvs/maven/components/trunk/maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginManager.java?rev=220009&r1=220008&r2=220009&view=diff
==============================================================================
---
maven/components/trunk/maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginManager.java
(original)
+++
maven/components/trunk/maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginManager.java
Wed Jul 20 23:54:21 2005
@@ -499,13 +499,13 @@
pluginDescriptor.setClassRealm(
pluginContainer.getContainerRealm() );
List unresolved = new ArrayList( dependencies );
-
+
unresolved.removeAll( resolved );
-
+
resolveCoreArtifacts( unresolved );
List allResolved = new ArrayList( resolved.size() +
unresolved.size() );
-
+
allResolved.addAll( resolved );
allResolved.addAll( unresolved );
@@ -527,36 +527,36 @@
}
private Map resolvedCoreArtifactFiles = new HashMap();
-
+
private void resolveCoreArtifacts( List unresolved )
throws PluginConfigurationException
{
for ( Iterator it = unresolved.iterator(); it.hasNext(); )
{
Artifact artifact = (Artifact) it.next();
-
+
File artifactFile = (File) resolvedCoreArtifactFiles.get(
artifact.getId() );
-
+
if ( artifactFile == null )
{
String resource = "/META-INF/maven/" + artifact.getGroupId() +
"/" + artifact.getArtifactId() + "/pom.xml";
-
+
URL resourceUrl = container.getContainerRealm().getResource(
resource );
-
+
if ( resourceUrl == null )
{
throw new PluginConfigurationException( "Cannot resolve
core artifact: " + artifact.getId() );
}
-
+
String artifactPath = resourceUrl.getPath();
-
+
artifactPath = artifactPath.substring( 0,
artifactPath.length() - resource.length() );
-
+
artifactFile = new File( artifactPath );
-
+
resolvedCoreArtifactFiles.put( artifact.getId(), artifactFile
);
}
-
+
artifact.setFile( artifactFile );
}
}
@@ -926,7 +926,6 @@
Set artifacts = new HashSet();
artifacts.add( "classworlds" );
artifacts.add( "commons-cli" );
- artifacts.add( "commons-validator" );
artifacts.add( "jline" );
artifacts.add( "jsch" );
artifacts.add( "maven-artifact" );
@@ -938,6 +937,7 @@
artifacts.add( "maven-plugin-descriptor" );
artifacts.add( "maven-plugin-mapping" );
artifacts.add( "maven-plugin-registry" );
+ artifacts.add( "maven-profile" );
artifacts.add( "maven-project" );
artifacts.add( "maven-settings" );
artifacts.add( "plexus-container-default" );
@@ -947,10 +947,8 @@
artifacts.add( "wagon-file" );
artifacts.add( "wagon-http-lightweight" );
artifacts.add( "wagon-ssh" );
- // TODO: remove doxia
- artifacts.add( "doxia-core" );
+ artifacts.add( "doxia-sink-api" );
artifacts.add( "maven-reporting-api" );
- artifacts.add( "oro" );
artifactFilter = new ExclusionSetFilter( artifacts );
}
Modified: maven/components/trunk/maven-mboot2/src/main/java/MBoot.java
URL:
http://svn.apache.org/viewcvs/maven/components/trunk/maven-mboot2/src/main/java/MBoot.java?rev=220009&r1=220008&r2=220009&view=diff
==============================================================================
--- maven/components/trunk/maven-mboot2/src/main/java/MBoot.java (original)
+++ maven/components/trunk/maven-mboot2/src/main/java/MBoot.java Wed Jul 20
23:54:21 2005
@@ -41,7 +41,7 @@
"maven-artifact", "maven-plugin-descriptor", "maven-artifact-manager",
"maven-artifact-test",
"maven-plugin-mapping",
"maven-script/maven-script-beanshell",
"maven-script/maven-script-marmalade", "maven-project", "maven-profile",
- "maven-plugin-registry", "maven-reporting/maven-reporting-api",
"maven-core", "maven-archiver",
+ "maven-plugin-registry", "maven-reporting/maven-reporting-api",
"maven-reporting/maven-reporting-impl", "maven-core", "maven-archiver",
"maven-plugin-tools/maven-plugin-tools-api",
"maven-plugin-tools/maven-plugin-tools-java",
"maven-plugin-tools/maven-plugin-tools-beanshell",
"maven-plugin-tools/maven-plugin-tools-pluggy",
"maven-plugin-tools/maven-plugin-tools-marmalade",
"maven-core-it-verifier"};
Modified: maven/components/trunk/maven-plugins/maven-checkstyle-plugin/pom.xml
URL:
http://svn.apache.org/viewcvs/maven/components/trunk/maven-plugins/maven-checkstyle-plugin/pom.xml?rev=220009&r1=220008&r2=220009&view=diff
==============================================================================
--- maven/components/trunk/maven-plugins/maven-checkstyle-plugin/pom.xml
(original)
+++ maven/components/trunk/maven-plugins/maven-checkstyle-plugin/pom.xml Wed
Jul 20 23:54:21 2005
@@ -13,7 +13,7 @@
<dependencies>
<dependency>
<groupId>org.apache.maven.reporting</groupId>
- <artifactId>maven-reporting-api</artifactId>
+ <artifactId>maven-reporting-impl</artifactId>
<version>2.0-beta-1-SNAPSHOT</version>
</dependency>
<dependency>
Modified: maven/components/trunk/maven-plugins/maven-javadoc-plugin/pom.xml
URL:
http://svn.apache.org/viewcvs/maven/components/trunk/maven-plugins/maven-javadoc-plugin/pom.xml?rev=220009&r1=220008&r2=220009&view=diff
==============================================================================
--- maven/components/trunk/maven-plugins/maven-javadoc-plugin/pom.xml (original)
+++ maven/components/trunk/maven-plugins/maven-javadoc-plugin/pom.xml Wed Jul
20 23:54:21 2005
@@ -32,7 +32,7 @@
<dependencies>
<dependency>
<groupId>org.apache.maven.reporting</groupId>
- <artifactId>maven-reporting-api</artifactId>
+ <artifactId>maven-reporting-impl</artifactId>
<version>2.0-beta-1-SNAPSHOT</version>
</dependency>
<dependency>
Modified: maven/components/trunk/maven-plugins/maven-pmd-plugin/pom.xml
URL:
http://svn.apache.org/viewcvs/maven/components/trunk/maven-plugins/maven-pmd-plugin/pom.xml?rev=220009&r1=220008&r2=220009&view=diff
==============================================================================
--- maven/components/trunk/maven-plugins/maven-pmd-plugin/pom.xml (original)
+++ maven/components/trunk/maven-plugins/maven-pmd-plugin/pom.xml Wed Jul 20
23:54:21 2005
@@ -13,7 +13,7 @@
<dependencies>
<dependency>
<groupId>org.apache.maven.reporting</groupId>
- <artifactId>maven-reporting-api</artifactId>
+ <artifactId>maven-reporting-impl</artifactId>
<version>2.0-beta-1-SNAPSHOT</version>
</dependency>
<dependency>
Modified:
maven/components/trunk/maven-plugins/maven-pmd-plugin/src/main/java/org/apache/maven/plugin/pmd/PmdReport.java
URL:
http://svn.apache.org/viewcvs/maven/components/trunk/maven-plugins/maven-pmd-plugin/src/main/java/org/apache/maven/plugin/pmd/PmdReport.java?rev=220009&r1=220008&r2=220009&view=diff
==============================================================================
---
maven/components/trunk/maven-plugins/maven-pmd-plugin/src/main/java/org/apache/maven/plugin/pmd/PmdReport.java
(original)
+++
maven/components/trunk/maven-plugins/maven-pmd-plugin/src/main/java/org/apache/maven/plugin/pmd/PmdReport.java
Wed Jul 20 23:54:21 2005
@@ -120,15 +120,7 @@
public void executeReport( Locale locale )
throws MavenReportException
{
- Sink sink = null;
- try
- {
- sink = getSink();
- }
- catch ( IOException e )
- {
- throw new MavenReportException( "Can't obtain sink for PMD
report.", e );
- }
+ Sink sink = getSink();
PMD pmd = new PMD();
RuleContext ruleContext = new RuleContext();
Modified:
maven/components/trunk/maven-plugins/maven-project-info-reports-plugin/pom.xml
URL:
http://svn.apache.org/viewcvs/maven/components/trunk/maven-plugins/maven-project-info-reports-plugin/pom.xml?rev=220009&r1=220008&r2=220009&view=diff
==============================================================================
---
maven/components/trunk/maven-plugins/maven-project-info-reports-plugin/pom.xml
(original)
+++
maven/components/trunk/maven-plugins/maven-project-info-reports-plugin/pom.xml
Wed Jul 20 23:54:21 2005
@@ -32,8 +32,13 @@
<inceptionYear>2005</inceptionYear>
<dependencies>
<dependency>
+ <groupId>org.apache.maven</groupId>
+ <artifactId>maven-model</artifactId>
+ <version>2.0-beta-1-SNAPSHOT</version>
+ </dependency>
+ <dependency>
<groupId>org.apache.maven.reporting</groupId>
- <artifactId>maven-reporting-api</artifactId>
+ <artifactId>maven-reporting-impl</artifactId>
<version>2.0-beta-1-SNAPSHOT</version>
</dependency>
<dependency>
Modified:
maven/components/trunk/maven-plugins/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/CimReport.java
URL:
http://svn.apache.org/viewcvs/maven/components/trunk/maven-plugins/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/CimReport.java?rev=220009&r1=220008&r2=220009&view=diff
==============================================================================
---
maven/components/trunk/maven-plugins/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/CimReport.java
(original)
+++
maven/components/trunk/maven-plugins/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/CimReport.java
Wed Jul 20 23:54:21 2005
@@ -118,16 +118,9 @@
public void executeReport( Locale locale )
throws MavenReportException
{
- try
- {
- CimRenderer r = new CimRenderer( getSink(),
getProject().getModel(), locale );
+ CimRenderer r = new CimRenderer( getSink(), getProject().getModel(),
locale );
- r.render();
- }
- catch ( IOException e )
- {
- throw new MavenReportException( "Can't write the report " +
getOutputName(), e );
- }
+ r.render();
}
/**
Modified:
maven/components/trunk/maven-plugins/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/DependenciesReport.java
URL:
http://svn.apache.org/viewcvs/maven/components/trunk/maven-plugins/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/DependenciesReport.java?rev=220009&r1=220008&r2=220009&view=diff
==============================================================================
---
maven/components/trunk/maven-plugins/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/DependenciesReport.java
(original)
+++
maven/components/trunk/maven-plugins/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/DependenciesReport.java
Wed Jul 20 23:54:21 2005
@@ -138,17 +138,10 @@
public void executeReport( Locale locale )
throws MavenReportException
{
- try
- {
- DependenciesRenderer r = new DependenciesRenderer( getSink(),
getProject(), locale, mavenProjectBuilder,
- artifactFactory
);
+ DependenciesRenderer r = new DependenciesRenderer( getSink(),
getProject(), locale, mavenProjectBuilder,
+ artifactFactory );
- r.render();
- }
- catch ( IOException e )
- {
- throw new MavenReportException( "Can't write the report " +
getOutputName(), e );
- }
+ r.render();
}
/**
Modified:
maven/components/trunk/maven-plugins/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/IssueTrackingReport.java
URL:
http://svn.apache.org/viewcvs/maven/components/trunk/maven-plugins/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/IssueTrackingReport.java?rev=220009&r1=220008&r2=220009&view=diff
==============================================================================
---
maven/components/trunk/maven-plugins/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/IssueTrackingReport.java
(original)
+++
maven/components/trunk/maven-plugins/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/IssueTrackingReport.java
Wed Jul 20 23:54:21 2005
@@ -115,16 +115,9 @@
public void executeReport( Locale locale )
throws MavenReportException
{
- try
- {
- IssueTrackingRenderer r = new IssueTrackingRenderer( getSink(),
getProject().getModel(), locale );
+ IssueTrackingRenderer r = new IssueTrackingRenderer( getSink(),
getProject().getModel(), locale );
- r.render();
- }
- catch ( IOException e )
- {
- throw new MavenReportException( "Can't write the report " +
getOutputName(), e );
- }
+ r.render();
}
/**
Modified:
maven/components/trunk/maven-plugins/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/LicenseReport.java
URL:
http://svn.apache.org/viewcvs/maven/components/trunk/maven-plugins/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/LicenseReport.java?rev=220009&r1=220008&r2=220009&view=diff
==============================================================================
---
maven/components/trunk/maven-plugins/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/LicenseReport.java
(original)
+++
maven/components/trunk/maven-plugins/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/LicenseReport.java
Wed Jul 20 23:54:21 2005
@@ -123,16 +123,9 @@
public void executeReport( Locale locale )
throws MavenReportException
{
- try
- {
- LicenseRenderer r = new LicenseRenderer( getSink(), getProject(),
locale );
+ LicenseRenderer r = new LicenseRenderer( getSink(), getProject(),
locale );
- r.render();
- }
- catch ( IOException e )
- {
- throw new MavenReportException( "Can't write the report " +
getOutputName(), e );
- }
+ r.render();
}
/**
Modified:
maven/components/trunk/maven-plugins/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/MailingListsReport.java
URL:
http://svn.apache.org/viewcvs/maven/components/trunk/maven-plugins/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/MailingListsReport.java?rev=220009&r1=220008&r2=220009&view=diff
==============================================================================
---
maven/components/trunk/maven-plugins/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/MailingListsReport.java
(original)
+++
maven/components/trunk/maven-plugins/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/MailingListsReport.java
Wed Jul 20 23:54:21 2005
@@ -116,16 +116,9 @@
public void executeReport( Locale locale )
throws MavenReportException
{
- try
- {
- MailingListsRenderer r = new MailingListsRenderer( getSink(),
getProject().getModel(), locale );
+ MailingListsRenderer r = new MailingListsRenderer( getSink(),
getProject().getModel(), locale );
- r.render();
- }
- catch ( IOException e )
- {
- throw new MavenReportException( "Can't write the report " +
getOutputName(), e );
- }
+ r.render();
}
/**
Modified:
maven/components/trunk/maven-plugins/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/ScmReport.java
URL:
http://svn.apache.org/viewcvs/maven/components/trunk/maven-plugins/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/ScmReport.java?rev=220009&r1=220008&r2=220009&view=diff
==============================================================================
---
maven/components/trunk/maven-plugins/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/ScmReport.java
(original)
+++
maven/components/trunk/maven-plugins/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/ScmReport.java
Wed Jul 20 23:54:21 2005
@@ -115,16 +115,9 @@
public void executeReport( Locale locale )
throws MavenReportException
{
- try
- {
- ScmRenderer r = new ScmRenderer( getSink(),
getProject().getModel(), locale );
+ ScmRenderer r = new ScmRenderer( getSink(), getProject().getModel(),
locale );
- r.render();
- }
- catch ( IOException e )
- {
- throw new MavenReportException( "Can't write the report " +
getOutputName(), e );
- }
+ r.render();
}
/**
Modified:
maven/components/trunk/maven-plugins/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/TeamListReport.java
URL:
http://svn.apache.org/viewcvs/maven/components/trunk/maven-plugins/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/TeamListReport.java?rev=220009&r1=220008&r2=220009&view=diff
==============================================================================
---
maven/components/trunk/maven-plugins/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/TeamListReport.java
(original)
+++
maven/components/trunk/maven-plugins/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/TeamListReport.java
Wed Jul 20 23:54:21 2005
@@ -119,16 +119,9 @@
public void executeReport( Locale locale )
throws MavenReportException
{
- try
- {
- TeamListRenderer r = new TeamListRenderer( getSink(),
getProject().getModel(), locale );
+ TeamListRenderer r = new TeamListRenderer( getSink(),
getProject().getModel(), locale );
- r.render();
- }
- catch ( IOException e )
- {
- throw new MavenReportException( "Can't write the report " +
getOutputName(), e );
- }
+ r.render();
}
/**
Modified: maven/components/trunk/maven-plugins/maven-site-plugin/pom.xml
URL:
http://svn.apache.org/viewcvs/maven/components/trunk/maven-plugins/maven-site-plugin/pom.xml?rev=220009&r1=220008&r2=220009&view=diff
==============================================================================
--- maven/components/trunk/maven-plugins/maven-site-plugin/pom.xml (original)
+++ maven/components/trunk/maven-plugins/maven-site-plugin/pom.xml Wed Jul 20
23:54:21 2005
@@ -48,7 +48,7 @@
<dependency>
<groupId>plexus</groupId>
<artifactId>plexus-site-renderer</artifactId>
- <version>1.0-alpha-2-20050715.080727-2</version>
+ <version>1.0-alpha-2-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.maven.wagon</groupId>
Modified: maven/components/trunk/maven-reporting/maven-reporting-api/pom.xml
URL:
http://svn.apache.org/viewcvs/maven/components/trunk/maven-reporting/maven-reporting-api/pom.xml?rev=220009&r1=220008&r2=220009&view=diff
==============================================================================
--- maven/components/trunk/maven-reporting/maven-reporting-api/pom.xml
(original)
+++ maven/components/trunk/maven-reporting/maven-reporting-api/pom.xml Wed Jul
20 23:54:21 2005
@@ -39,29 +39,9 @@
</developers>
<dependencies>
<dependency>
- <groupId>org.apache.maven</groupId>
- <artifactId>maven-project</artifactId>
- <version>2.0-beta-1-SNAPSHOT</version>
- </dependency>
- <dependency>
<groupId>doxia</groupId>
- <artifactId>doxia-core</artifactId>
+ <artifactId>doxia-sink-api</artifactId>
<version>1.0-alpha-4-SNAPSHOT</version>
- </dependency>
- <dependency>
- <groupId>org.apache.maven</groupId>
- <artifactId>maven-plugin-api</artifactId>
- <version>2.0-beta-1-SNAPSHOT</version>
- </dependency>
- <dependency>
- <groupId>commons-validator</groupId>
- <artifactId>commons-validator</artifactId>
- <version>1.1.4</version>
- </dependency>
- <dependency>
- <groupId>oro</groupId>
- <artifactId>oro</artifactId>
- <version>2.0.7</version>
</dependency>
</dependencies>
</project>
Modified:
maven/components/trunk/maven-reporting/maven-reporting-api/src/main/java/org/apache/maven/reporting/MavenReport.java
URL:
http://svn.apache.org/viewcvs/maven/components/trunk/maven-reporting/maven-reporting-api/src/main/java/org/apache/maven/reporting/MavenReport.java?rev=220009&r1=220008&r2=220009&view=diff
==============================================================================
---
maven/components/trunk/maven-reporting/maven-reporting-api/src/main/java/org/apache/maven/reporting/MavenReport.java
(original)
+++
maven/components/trunk/maven-reporting/maven-reporting-api/src/main/java/org/apache/maven/reporting/MavenReport.java
Wed Jul 20 23:54:21 2005
@@ -18,7 +18,6 @@
import org.codehaus.doxia.sink.Sink;
-import java.io.IOException;
import java.io.File;
import java.util.Locale;
@@ -47,9 +46,6 @@
String getCategoryName();
String getDescription( Locale locale );
-
- Sink getSink()
- throws IOException;
// TODO: remove?
void setReportOutputDirectory( File outputDirectory );
Propchange: maven/components/trunk/maven-reporting/maven-reporting-impl/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Wed Jul 20 23:54:21 2005
@@ -0,0 +1,4 @@
+target
+*.iml
+*.iws
+*.ipr
Added: maven/components/trunk/maven-reporting/maven-reporting-impl/pom.xml
URL:
http://svn.apache.org/viewcvs/maven/components/trunk/maven-reporting/maven-reporting-impl/pom.xml?rev=220009&view=auto
==============================================================================
--- maven/components/trunk/maven-reporting/maven-reporting-impl/pom.xml (added)
+++ maven/components/trunk/maven-reporting/maven-reporting-impl/pom.xml Wed Jul
20 23:54:21 2005
@@ -0,0 +1,72 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+
+<!--
+/*
+ * Copyright 2001-2005 The Apache Software Foundation.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+ -->
+
+<project>
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <artifactId>maven-reporting</artifactId>
+ <groupId>org.apache.maven.reporting</groupId>
+ <version>2.0-beta-1-SNAPSHOT</version>
+ </parent>
+ <artifactId>maven-reporting-impl</artifactId>
+ <developers>
+ <developer>
+ <id>vsiveton</id>
+ <name>Vincent Siveton</name>
+ <email>[EMAIL PROTECTED]</email>
+ <roles>
+ <role>Java Developer</role>
+ </roles>
+ <timezone>-5</timezone>
+ </developer>
+ </developers>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.maven</groupId>
+ <artifactId>maven-project</artifactId>
+ <version>2.0-beta-1-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.maven.reporting</groupId>
+ <artifactId>maven-reporting-api</artifactId>
+ <version>2.0-beta-1-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>doxia</groupId>
+ <artifactId>doxia-core</artifactId>
+ <version>1.0-alpha-4-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.maven</groupId>
+ <artifactId>maven-plugin-api</artifactId>
+ <version>2.0-beta-1-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>commons-validator</groupId>
+ <artifactId>commons-validator</artifactId>
+ <version>1.1.4</version>
+ </dependency>
+ <dependency>
+ <groupId>oro</groupId>
+ <artifactId>oro</artifactId>
+ <version>2.0.7</version>
+ </dependency>
+ </dependencies>
+</project>
Propchange: maven/components/trunk/maven-reporting/maven-reporting-impl/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/components/trunk/maven-reporting/maven-reporting-impl/pom.xml
------------------------------------------------------------------------------
svn:keywords = "Author Date Id Revision"
Copied:
maven/components/trunk/maven-reporting/maven-reporting-impl/src/main/java/org/apache/maven/reporting/AbstractMavenMultiPageReport.java
(from r219985,
maven/components/trunk/maven-reporting/maven-reporting-api/src/main/java/org/apache/maven/reporting/AbstractMavenMultiPageReport.java)
URL:
http://svn.apache.org/viewcvs/maven/components/trunk/maven-reporting/maven-reporting-impl/src/main/java/org/apache/maven/reporting/AbstractMavenMultiPageReport.java?p2=maven/components/trunk/maven-reporting/maven-reporting-impl/src/main/java/org/apache/maven/reporting/AbstractMavenMultiPageReport.java&p1=maven/components/trunk/maven-reporting/maven-reporting-api/src/main/java/org/apache/maven/reporting/AbstractMavenMultiPageReport.java&r1=219985&r2=220009&rev=220009&view=diff
==============================================================================
(empty)
Copied:
maven/components/trunk/maven-reporting/maven-reporting-impl/src/main/java/org/apache/maven/reporting/AbstractMavenReport.java
(from r219985,
maven/components/trunk/maven-reporting/maven-reporting-api/src/main/java/org/apache/maven/reporting/AbstractMavenReport.java)
URL:
http://svn.apache.org/viewcvs/maven/components/trunk/maven-reporting/maven-reporting-impl/src/main/java/org/apache/maven/reporting/AbstractMavenReport.java?p2=maven/components/trunk/maven-reporting/maven-reporting-impl/src/main/java/org/apache/maven/reporting/AbstractMavenReport.java&p1=maven/components/trunk/maven-reporting/maven-reporting-api/src/main/java/org/apache/maven/reporting/AbstractMavenReport.java&r1=219985&r2=220009&rev=220009&view=diff
==============================================================================
---
maven/components/trunk/maven-reporting/maven-reporting-api/src/main/java/org/apache/maven/reporting/AbstractMavenReport.java
(original)
+++
maven/components/trunk/maven-reporting/maven-reporting-impl/src/main/java/org/apache/maven/reporting/AbstractMavenReport.java
Wed Jul 20 23:54:21 2005
@@ -1,7 +1,7 @@
package org.apache.maven.reporting;
/*
- * Copyright 2005 The Apache Software Foundation.
+ * Copyright 2001-2005 The Apache Software Foundation.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -101,6 +101,7 @@
/**
* @see
org.apache.maven.reporting.MavenReport#generate(org.codehaus.doxia.sink.Sink,
java.util.Locale)
+ * @deprecated
*/
public void generate( Sink sink, Locale locale )
throws MavenReportException
@@ -126,12 +127,6 @@
{
}
- public Sink getSink()
- throws IOException
- {
- return sink;
- }
-
public String getCategoryName()
{
return CATEGORY_PROJECT_REPORTS;
@@ -204,5 +199,10 @@
public void setReportOutputDirectory( File reportOutputDirectory )
{
this.reportOutputDirectory = reportOutputDirectory;
+ }
+
+ public Sink getSink()
+ {
+ return sink;
}
}
Copied:
maven/components/trunk/maven-reporting/maven-reporting-impl/src/main/java/org/apache/maven/reporting/AbstractMavenReportRenderer.java
(from r219985,
maven/components/trunk/maven-reporting/maven-reporting-api/src/main/java/org/apache/maven/reporting/AbstractMavenReportRenderer.java)
URL:
http://svn.apache.org/viewcvs/maven/components/trunk/maven-reporting/maven-reporting-impl/src/main/java/org/apache/maven/reporting/AbstractMavenReportRenderer.java?p2=maven/components/trunk/maven-reporting/maven-reporting-impl/src/main/java/org/apache/maven/reporting/AbstractMavenReportRenderer.java&p1=maven/components/trunk/maven-reporting/maven-reporting-api/src/main/java/org/apache/maven/reporting/AbstractMavenReportRenderer.java&r1=219985&r2=220009&rev=220009&view=diff
==============================================================================
---
maven/components/trunk/maven-reporting/maven-reporting-api/src/main/java/org/apache/maven/reporting/AbstractMavenReportRenderer.java
(original)
+++
maven/components/trunk/maven-reporting/maven-reporting-impl/src/main/java/org/apache/maven/reporting/AbstractMavenReportRenderer.java
Wed Jul 20 23:54:21 2005
@@ -1,7 +1,7 @@
package org.apache.maven.reporting;
/*
- * Copyright 2004-2005 The Apache Software Foundation.
+ * Copyright 2001-2005 The Apache Software Foundation.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Propchange:
maven/components/trunk/maven-reporting/maven-reporting-impl/src/main/java/org/apache/maven/reporting/AbstractMavenReportRenderer.java
------------------------------------------------------------------------------
svn:eol-style = native
Copied:
maven/components/trunk/maven-reporting/maven-reporting-impl/src/main/java/org/apache/maven/reporting/sink/MultiPageSink.java
(from r219985,
maven/components/trunk/maven-reporting/maven-reporting-api/src/main/java/org/apache/maven/reporting/sink/MultiPageSink.java)
URL:
http://svn.apache.org/viewcvs/maven/components/trunk/maven-reporting/maven-reporting-impl/src/main/java/org/apache/maven/reporting/sink/MultiPageSink.java?p2=maven/components/trunk/maven-reporting/maven-reporting-impl/src/main/java/org/apache/maven/reporting/sink/MultiPageSink.java&p1=maven/components/trunk/maven-reporting/maven-reporting-api/src/main/java/org/apache/maven/reporting/sink/MultiPageSink.java&r1=219985&r2=220009&rev=220009&view=diff
==============================================================================
---
maven/components/trunk/maven-reporting/maven-reporting-api/src/main/java/org/apache/maven/reporting/sink/MultiPageSink.java
(original)
+++
maven/components/trunk/maven-reporting/maven-reporting-impl/src/main/java/org/apache/maven/reporting/sink/MultiPageSink.java
Wed Jul 20 23:54:21 2005
@@ -1,7 +1,20 @@
-/**
- *
- */
package org.apache.maven.reporting.sink;
+
+/*
+ * Copyright 2001-2005 The Apache Software Foundation.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
import org.codehaus.doxia.sink.Sink;
import org.codehaus.doxia.sink.SinkAdapter;
Copied:
maven/components/trunk/maven-reporting/maven-reporting-impl/src/main/java/org/apache/maven/reporting/sink/SinkFactory.java
(from r219985,
maven/components/trunk/maven-reporting/maven-reporting-api/src/main/java/org/apache/maven/reporting/sink/SinkFactory.java)
URL:
http://svn.apache.org/viewcvs/maven/components/trunk/maven-reporting/maven-reporting-impl/src/main/java/org/apache/maven/reporting/sink/SinkFactory.java?p2=maven/components/trunk/maven-reporting/maven-reporting-impl/src/main/java/org/apache/maven/reporting/sink/SinkFactory.java&p1=maven/components/trunk/maven-reporting/maven-reporting-api/src/main/java/org/apache/maven/reporting/sink/SinkFactory.java&r1=219985&r2=220009&rev=220009&view=diff
==============================================================================
---
maven/components/trunk/maven-reporting/maven-reporting-api/src/main/java/org/apache/maven/reporting/sink/SinkFactory.java
(original)
+++
maven/components/trunk/maven-reporting/maven-reporting-impl/src/main/java/org/apache/maven/reporting/sink/SinkFactory.java
Wed Jul 20 23:54:21 2005
@@ -1,14 +1,7 @@
package org.apache.maven.reporting.sink;
-import java.io.File;
-import java.io.InputStream;
-
-import org.codehaus.doxia.sink.Sink;
-import org.codehaus.doxia.site.renderer.SiteRenderer;
-import org.codehaus.plexus.util.StringInputStream;
-
/*
- * Copyright 2005 The Apache Software Foundation.
+ * Copyright 2001-2005 The Apache Software Foundation.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -22,6 +15,13 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
+
+import java.io.File;
+import java.io.InputStream;
+
+import org.codehaus.doxia.sink.Sink;
+import org.codehaus.doxia.site.renderer.SiteRenderer;
+import org.codehaus.plexus.util.StringInputStream;
/**
* @author <a href="[EMAIL PROTECTED]">Emmanuel Venisse</a>
Modified: maven/components/trunk/maven-reporting/pom.xml
URL:
http://svn.apache.org/viewcvs/maven/components/trunk/maven-reporting/pom.xml?rev=220009&r1=220008&r2=220009&view=diff
==============================================================================
--- maven/components/trunk/maven-reporting/pom.xml (original)
+++ maven/components/trunk/maven-reporting/pom.xml Wed Jul 20 23:54:21 2005
@@ -12,5 +12,6 @@
<inceptionYear>2005</inceptionYear>
<modules>
<module>maven-reporting-api</module>
+ <module>maven-reporting-impl</module>
</modules>
</project>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
