Author: brett
Date: Tue Jan 3 17:14:17 2006
New Revision: 365790
URL: http://svn.apache.org/viewcvs?rev=365790&view=rev
Log:
merge from branch maven-2.0.x, up to rev 365776
Removed:
maven/components/trunk/maven-artifact-ant/src/main/resources/META-INF/
maven/components/trunk/maven-reporting/maven-reporting-api/src/main/java/org/apache/maven/reporting/sink/
maven/components/trunk/maven-reporting/maven-reporting-api/src/main/java/org/codehaus/
maven/components/trunk/maven-reporting/maven-reporting-impl/src/main/java/org/codehaus/
Modified:
maven/components/trunk/maven-artifact-ant/pom.xml
maven/components/trunk/maven-artifact-ant/src/main/assembly/dep.xml
maven/components/trunk/maven-artifact-ant/src/main/java/org/apache/maven/artifact/ant/Pom.java
maven/components/trunk/maven-artifact-ant/src/main/java/org/apache/maven/artifact/ant/Repository.java
maven/components/trunk/maven-artifact/src/main/java/org/apache/maven/artifact/resolver/DefaultArtifactCollector.java
maven/components/trunk/maven-core/src/bin/mvn
maven/components/trunk/maven-core/src/main/java/org/apache/maven/lifecycle/DefaultLifecycleExecutor.java
maven/components/trunk/maven-core/src/main/java/org/apache/maven/lifecycle/LifecycleExecutor.java
maven/components/trunk/maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginManager.java
maven/components/trunk/maven-core/src/main/java/org/apache/maven/plugin/PluginManager.java
maven/components/trunk/maven-embedder/pom.xml
maven/components/trunk/maven-plugin-tools/maven-plugin-tools-ant/ (props
changed)
maven/components/trunk/maven-plugin-tools/maven-plugin-tools-model/
(props changed)
maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/artifact/MavenMetadataSource.java
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/maven-reporting-impl/pom.xml
maven/components/trunk/maven-reporting/maven-reporting-impl/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
maven/components/trunk/maven-reporting/maven-reporting-impl/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/MultiPageSink.java
maven/components/trunk/maven-reporting/maven-reporting-impl/src/main/java/org/apache/maven/reporting/sink/SinkFactory.java
maven/components/trunk/maven-script/maven-script-ant/ (props changed)
maven/components/trunk/pom.xml
Modified: maven/components/trunk/maven-artifact-ant/pom.xml
URL:
http://svn.apache.org/viewcvs/maven/components/trunk/maven-artifact-ant/pom.xml?rev=365790&r1=365789&r2=365790&view=diff
==============================================================================
--- maven/components/trunk/maven-artifact-ant/pom.xml (original)
+++ maven/components/trunk/maven-artifact-ant/pom.xml Tue Jan 3 17:14:17 2006
@@ -1,4 +1,4 @@
-<project>
+<?xml version="1.0" encoding="UTF-8"?><project>
<parent>
<artifactId>maven</artifactId>
<groupId>org.apache.maven</groupId>
@@ -54,10 +54,6 @@
</dependency>
<dependency>
<groupId>org.apache.maven.wagon</groupId>
- <artifactId>wagon-provider-api</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.maven.wagon</groupId>
<artifactId>wagon-http-lightweight</artifactId>
<scope>runtime</scope>
</dependency>
@@ -85,6 +81,10 @@
<groupId>org.apache.maven</groupId>
<artifactId>maven-artifact</artifactId>
<version>2.1-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.maven.wagon</groupId>
+ <artifactId>wagon-provider-api</artifactId>
</dependency>
<dependency>
<groupId>org.codehaus.plexus</groupId>
Modified: maven/components/trunk/maven-artifact-ant/src/main/assembly/dep.xml
URL:
http://svn.apache.org/viewcvs/maven/components/trunk/maven-artifact-ant/src/main/assembly/dep.xml?rev=365790&r1=365789&r2=365790&view=diff
==============================================================================
--- maven/components/trunk/maven-artifact-ant/src/main/assembly/dep.xml
(original)
+++ maven/components/trunk/maven-artifact-ant/src/main/assembly/dep.xml Tue Jan
3 17:14:17 2006
@@ -5,13 +5,6 @@
<format>jar</format>
</formats>
<includeBaseDirectory>false</includeBaseDirectory>
- <fileSets>
- <fileSet>
- <!-- TODO: use expressions instead: ${project.build.directory},
${project.build.finalName}, or have a <build /> tag to include the built
artifact -->
- <directory>target/classes</directory>
- <outputDirectory>/</outputDirectory>
- </fileSet>
- </fileSets>
<dependencySets>
<dependencySet>
<outputDirectory>/</outputDirectory>
Modified:
maven/components/trunk/maven-artifact-ant/src/main/java/org/apache/maven/artifact/ant/Pom.java
URL:
http://svn.apache.org/viewcvs/maven/components/trunk/maven-artifact-ant/src/main/java/org/apache/maven/artifact/ant/Pom.java?rev=365790&r1=365789&r2=365790&view=diff
==============================================================================
---
maven/components/trunk/maven-artifact-ant/src/main/java/org/apache/maven/artifact/ant/Pom.java
(original)
+++
maven/components/trunk/maven-artifact-ant/src/main/java/org/apache/maven/artifact/ant/Pom.java
Tue Jan 3 17:14:17 2006
@@ -111,6 +111,12 @@
void initialise( MavenProjectBuilder builder, ArtifactRepository
localRepository )
{
+ if ( mavenProject != null )
+ {
+ log( "POM is already initialized for: " + mavenProject.getId(),
Project.MSG_DEBUG );
+
+ return;
+ }
// TODO: should this be in execute() too? Would that work when it is
used as a type?
if ( file != null )
{
Modified:
maven/components/trunk/maven-artifact-ant/src/main/java/org/apache/maven/artifact/ant/Repository.java
URL:
http://svn.apache.org/viewcvs/maven/components/trunk/maven-artifact-ant/src/main/java/org/apache/maven/artifact/ant/Repository.java?rev=365790&r1=365789&r2=365790&view=diff
==============================================================================
---
maven/components/trunk/maven-artifact-ant/src/main/java/org/apache/maven/artifact/ant/Repository.java
(original)
+++
maven/components/trunk/maven-artifact-ant/src/main/java/org/apache/maven/artifact/ant/Repository.java
Tue Jan 3 17:14:17 2006
@@ -28,25 +28,24 @@
public abstract class Repository
extends ProjectComponent
{
- private String id;
-
+ private String id;
+
private String refid;
private String layout = "default";
public String getId()
{
- System.out.println("Repository.getId() == " + getInstance().id);
- if (getInstance().id == null)
- {
- throw new BuildException("id must be specified for a
repository definition");
- }
- return getInstance().id;
+ if ( getInstance().id == null )
+ {
+ getInstance().setId( "remote" );
+ }
+ return getInstance().id;
}
public void setId( String id )
{
- this.id = id;
+ this.id = id;
}
public String getRefid()
Modified:
maven/components/trunk/maven-artifact/src/main/java/org/apache/maven/artifact/resolver/DefaultArtifactCollector.java
URL:
http://svn.apache.org/viewcvs/maven/components/trunk/maven-artifact/src/main/java/org/apache/maven/artifact/resolver/DefaultArtifactCollector.java?rev=365790&r1=365789&r2=365790&view=diff
==============================================================================
---
maven/components/trunk/maven-artifact/src/main/java/org/apache/maven/artifact/resolver/DefaultArtifactCollector.java
(original)
+++
maven/components/trunk/maven-artifact/src/main/java/org/apache/maven/artifact/resolver/DefaultArtifactCollector.java
Tue Jan 3 17:14:17 2006
@@ -278,6 +278,7 @@
fireEvent(
ResolutionListener.SELECT_VERSION_FROM_RANGE, listeners, child );
}
+ artifact.setDependencyTrail( node.getDependencyTrail()
);
ResolutionGroup rGroup = source.retrieve( artifact,
localRepository, remoteRepositories );
//TODO might be better to have source.retreive() throw
a specific exception for this situation
@@ -343,7 +344,7 @@
if ( updateScope )
{
- fireEvent( ResolutionListener.UPDATE_SCOPE, listeners, nearest,
farthestArtifact );
+ fireEvent( ResolutionListener.UPDATE_SCOPE, listeners, farthest,
nearestArtifact );
// previously we cloned the artifact, but it is more effecient to
just update the scope
// if problems are later discovered that the original object needs
its original scope value, cloning may
Modified: maven/components/trunk/maven-core/src/bin/mvn
URL:
http://svn.apache.org/viewcvs/maven/components/trunk/maven-core/src/bin/mvn?rev=365790&r1=365789&r2=365790&view=diff
==============================================================================
--- maven/components/trunk/maven-core/src/bin/mvn (original)
+++ maven/components/trunk/maven-core/src/bin/mvn Tue Jan 3 17:14:17 2006
@@ -43,6 +43,12 @@
;;
esac
+if [ -z "$JAVA_HOME" ] ; then
+ if [ -e /etc/gentoo-release ] ; then
+ JAVA_HOME=`java-config --jre-home`
+ fi
+fi
+
if [ -z "$M2_HOME" ] ; then
# try to find MAVEN
if [ -d /opt/m2 ] ; then
Modified:
maven/components/trunk/maven-core/src/main/java/org/apache/maven/lifecycle/DefaultLifecycleExecutor.java
URL:
http://svn.apache.org/viewcvs/maven/components/trunk/maven-core/src/main/java/org/apache/maven/lifecycle/DefaultLifecycleExecutor.java?rev=365790&r1=365789&r2=365790&view=diff
==============================================================================
---
maven/components/trunk/maven-core/src/main/java/org/apache/maven/lifecycle/DefaultLifecycleExecutor.java
(original)
+++
maven/components/trunk/maven-core/src/main/java/org/apache/maven/lifecycle/DefaultLifecycleExecutor.java
Tue Jan 3 17:14:17 2006
@@ -482,7 +482,8 @@
{
// guaranteed to come from the CLI and not be part of a phase
MojoDescriptor mojoDescriptor = getMojoDescriptor( task, session,
project, task, true );
- executeGoals( Collections.singletonList( new MojoExecution(
mojoDescriptor ) ), forkEntryPoints, session, project );
+ executeGoals( Collections.singletonList( new MojoExecution(
mojoDescriptor ) ), forkEntryPoints, session,
+ project );
}
private void executeGoals( List goals, Stack forkEntryPoints, MavenSession
session, MavenProject project )
@@ -703,7 +704,8 @@
return reports;
}
- private void forkLifecycle( MojoDescriptor mojoDescriptor, Stack
ancestorLifecycleForkers, MavenSession session, MavenProject project )
+ private void forkLifecycle( MojoDescriptor mojoDescriptor, Stack
ancestorLifecycleForkers, MavenSession session,
+ MavenProject project )
throws LifecycleExecutionException, BuildFailureException,
PluginNotFoundException
{
PluginDescriptor pluginDescriptor =
mojoDescriptor.getPluginDescriptor();
@@ -730,7 +732,8 @@
}
}
- private void forkProjectLifecycle( MojoDescriptor mojoDescriptor, Stack
forkEntryPoints, MavenSession session, MavenProject project )
+ private void forkProjectLifecycle( MojoDescriptor mojoDescriptor, Stack
forkEntryPoints, MavenSession session,
+ MavenProject project )
throws LifecycleExecutionException, BuildFailureException,
PluginNotFoundException
{
forkEntryPoints.push( mojoDescriptor );
@@ -776,9 +779,9 @@
Phase phase = (Phase) i.next();
for ( Iterator j = phase.getExecutions().iterator();
j.hasNext(); )
{
- Execution e = (Execution) j.next();
+ Execution exec = (Execution) j.next();
- for ( Iterator k = e.getGoals().iterator();
k.hasNext(); )
+ for ( Iterator k = exec.getGoals().iterator();
k.hasNext(); )
{
String goal = (String) k.next();
@@ -817,20 +820,17 @@
String groupId = s[0];
String artifactId = s[1];
- String externalGoal = s[2];
- lifecycleGoal = externalGoal;
+ lifecycleGoal = s[2];
- try
+ Plugin plugin = new Plugin();
+ plugin.setGroupId( groupId );
+ plugin.setArtifactId( artifactId );
+ lifecyclePluginDescriptor = verifyPlugin(
plugin, project, session.getSettings(),
+
session.getLocalRepository() );
+ if ( lifecyclePluginDescriptor == null )
{
- lifecyclePluginDescriptor =
pluginManager.getPluginDescriptor( groupId,
-
artifactId,
-
project,
-
session.getSettings(),
-
session.getLocalRepository() );
- }
- catch ( Exception ex )
- {
- throw new LifecycleExecutionException( ex
);
+ throw new LifecycleExecutionException(
+ "Unable to find plugin " + groupId +
":" + artifactId );
}
}
else
@@ -840,8 +840,9 @@
}
MojoDescriptor desc = getMojoDescriptor(
lifecyclePluginDescriptor, lifecycleGoal );
- MojoExecution mojoExecution = new MojoExecution(
desc, (Xpp3Dom) e.getConfiguration() );
- addToLifecycleMappings( lifecycleMappings,
phase.getId(), mojoExecution, session.getSettings() );
+ MojoExecution mojoExecution = new MojoExecution(
desc, (Xpp3Dom) exec.getConfiguration() );
+ addToLifecycleMappings( lifecycleMappings,
phase.getId(), mojoExecution,
+ session.getSettings() );
}
}
}
@@ -855,13 +856,15 @@
{
Lifecycle lifecycle = getLifecycleForPhase( targetPhase );
- executeGoalWithLifecycle( targetPhase, forkEntryPoints, session,
lifecycleMappings, executionProject, lifecycle );
+ executeGoalWithLifecycle( targetPhase, forkEntryPoints, session,
lifecycleMappings, executionProject,
+ lifecycle );
}
else
{
String goal = mojoDescriptor.getExecuteGoal();
MojoDescriptor desc = getMojoDescriptor( pluginDescriptor, goal );
- executeGoals( Collections.singletonList( new MojoExecution( desc )
), forkEntryPoints, session, executionProject );
+ executeGoals( Collections.singletonList( new MojoExecution( desc )
), forkEntryPoints, session,
+ executionProject );
}
project.setExecutionProject( executionProject );
}
@@ -925,9 +928,8 @@
if ( removed )
{
- getLogger().warn(
- "Removing: " + mojoDescriptor.getGoal()
- + " from forked lifecycle, to
prevent recursive invocation." );
+ getLogger().warn( "Removing: " + mojoDescriptor.getGoal() +
+ " from forked lifecycle, to prevent recursive
invocation." );
}
}
}
@@ -1133,10 +1135,10 @@
private void bindPluginToLifecycle( Plugin plugin, MavenSession session,
Map phaseMap, MavenProject project )
throws LifecycleExecutionException, PluginNotFoundException
{
- PluginDescriptor pluginDescriptor;
Settings settings = session.getSettings();
- pluginDescriptor = verifyPlugin( plugin, project,
session.getSettings(), session.getLocalRepository() );
+ PluginDescriptor pluginDescriptor =
+ verifyPlugin( plugin, project, session.getSettings(),
session.getLocalRepository() );
if ( pluginDescriptor.getMojos() != null &&
!pluginDescriptor.getMojos().isEmpty() )
{
@@ -1287,7 +1289,8 @@
}
}
- private void addToLifecycleMappings( Map lifecycleMappings, String phase,
MojoExecution mojoExecution, Settings settings )
+ private void addToLifecycleMappings( Map lifecycleMappings, String phase,
MojoExecution mojoExecution,
+ Settings settings )
{
List goals = (List) lifecycleMappings.get( phase );
Modified:
maven/components/trunk/maven-core/src/main/java/org/apache/maven/lifecycle/LifecycleExecutor.java
URL:
http://svn.apache.org/viewcvs/maven/components/trunk/maven-core/src/main/java/org/apache/maven/lifecycle/LifecycleExecutor.java?rev=365790&r1=365789&r2=365790&view=diff
==============================================================================
---
maven/components/trunk/maven-core/src/main/java/org/apache/maven/lifecycle/LifecycleExecutor.java
(original)
+++
maven/components/trunk/maven-core/src/main/java/org/apache/maven/lifecycle/LifecycleExecutor.java
Tue Jan 3 17:14:17 2006
@@ -29,7 +29,7 @@
{
String ROLE = LifecycleExecutor.class.getName();
- void execute( MavenSession session, ReactorManager rpm, EventDispatcher
dispatcher )
+ void execute( MavenSession session, ReactorManager rm, EventDispatcher
dispatcher )
throws LifecycleExecutionException, BuildFailureException;
}
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=365790&r1=365789&r2=365790&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
Tue Jan 3 17:14:17 2006
@@ -137,24 +137,6 @@
return pluginCollector.getPluginDescriptorForPrefix( prefix );
}
- public PluginDescriptor getPluginDescriptor( String groupId,
- String artifactId,
- MavenProject project,
- Settings settings,
- ArtifactRepository
localRepository )
- throws PluginVersionResolutionException, InvalidPluginException,
PluginVersionNotFoundException
- {
- Plugin plugin = new Plugin();
-
- plugin.setGroupId( groupId );
-
- plugin.setArtifactId( artifactId );
-
- String version = pluginVersionManager.resolvePluginVersion( groupId,
artifactId, project, settings, localRepository );
-
- return pluginCollector.getPluginDescriptor( plugin );
- }
-
public Plugin getPluginDefinitionForPrefix( String prefix, MavenSession
session, MavenProject project )
{
// TODO: since this is only used in the lifecycle executor, maybe it
should be moved there? There is no other
Modified:
maven/components/trunk/maven-core/src/main/java/org/apache/maven/plugin/PluginManager.java
URL:
http://svn.apache.org/viewcvs/maven/components/trunk/maven-core/src/main/java/org/apache/maven/plugin/PluginManager.java?rev=365790&r1=365789&r2=365790&view=diff
==============================================================================
---
maven/components/trunk/maven-core/src/main/java/org/apache/maven/plugin/PluginManager.java
(original)
+++
maven/components/trunk/maven-core/src/main/java/org/apache/maven/plugin/PluginManager.java
Tue Jan 3 17:14:17 2006
@@ -52,14 +52,6 @@
PluginDescriptor getPluginDescriptorForPrefix( String prefix );
- PluginDescriptor getPluginDescriptor( String groupId,
- String artifactId,
- MavenProject project,
- Settings settings,
- ArtifactRepository localRepository )
- throws PluginVersionResolutionException, InvalidPluginException,
PluginVersionNotFoundException;
-
-
Plugin getPluginDefinitionForPrefix( String prefix, MavenSession session,
MavenProject project );
PluginDescriptor verifyPlugin( Plugin plugin, MavenProject project,
Settings settings,
Modified: maven/components/trunk/maven-embedder/pom.xml
URL:
http://svn.apache.org/viewcvs/maven/components/trunk/maven-embedder/pom.xml?rev=365790&r1=365789&r2=365790&view=diff
==============================================================================
--- maven/components/trunk/maven-embedder/pom.xml (original)
+++ maven/components/trunk/maven-embedder/pom.xml Tue Jan 3 17:14:17 2006
@@ -1,17 +1,14 @@
-<project>
+<?xml version="1.0" encoding="UTF-8"?><project>
<parent>
<artifactId>maven</artifactId>
<groupId>org.apache.maven</groupId>
- <version>2.0</version>
+ <version>2.1-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.apache.maven</groupId>
<artifactId>maven-embedder</artifactId>
<name>Maven Embedder</name>
- <version>2.0.1-SNAPSHOT</version>
- <properties>
- <mavenVersion>2.0.1-SNAPSHOT</mavenVersion>
- </properties>
+ <version>2.1-SNAPSHOT</version>
<build>
<plugins>
<plugin>
@@ -45,4 +42,7 @@
</plugin>
</plugins>
</reporting>
+ <properties>
+ <mavenVersion>2.1-SNAPSHOT</mavenVersion>
+ </properties>
</project>
Propchange: maven/components/trunk/maven-plugin-tools/maven-plugin-tools-ant/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Tue Jan 3 17:14:17 2006
@@ -1 +1,4 @@
target
+*.iml
+*.ipr
+*.iws
Propchange: maven/components/trunk/maven-plugin-tools/maven-plugin-tools-model/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Tue Jan 3 17:14:17 2006
@@ -1 +1,4 @@
target
+*.iml
+*.ipr
+*.iws
Modified:
maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/artifact/MavenMetadataSource.java
URL:
http://svn.apache.org/viewcvs/maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/artifact/MavenMetadataSource.java?rev=365790&r1=365789&r2=365790&view=diff
==============================================================================
---
maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/artifact/MavenMetadataSource.java
(original)
+++
maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/artifact/MavenMetadataSource.java
Tue Jan 3 17:14:17 2006
@@ -171,8 +171,16 @@
message += " " + relocation.getMessage() + "\n";
}
- getLogger().warn( "While downloading " +
pomArtifact.getGroupId() + ":" +
- pomArtifact.getArtifactId() + ":" +
pomArtifact.getVersion() + message + "\n" );
+ if ( artifact.getDependencyTrail() != null &&
artifact.getDependencyTrail().size() == 1 )
+ {
+ getLogger().warn( "While downloading " +
pomArtifact.getGroupId() + ":" +
+ pomArtifact.getArtifactId() + ":" +
pomArtifact.getVersion() + message + "\n" );
+ }
+ else
+ {
+ getLogger().debug( "While downloading " +
pomArtifact.getGroupId() + ":" +
+ pomArtifact.getArtifactId() + ":" +
pomArtifact.getVersion() + message + "\n" );
+ }
}
else
{
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=365790&r1=365789&r2=365790&view=diff
==============================================================================
--- maven/components/trunk/maven-reporting/maven-reporting-api/pom.xml
(original)
+++ maven/components/trunk/maven-reporting/maven-reporting-api/pom.xml Tue Jan
3 17:14:17 2006
@@ -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>
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=365790&r1=365789&r2=365790&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
Tue Jan 3 17:14:17 2006
@@ -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/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=365790&r1=365789&r2=365790&view=diff
==============================================================================
--- maven/components/trunk/maven-reporting/maven-reporting-impl/pom.xml
(original)
+++ maven/components/trunk/maven-reporting/maven-reporting-impl/pom.xml Tue Jan
3 17:14:17 2006
@@ -1,4 +1,5 @@
-<?xml version="1.0" encoding="UTF-8"?><project>
+<?xml version="1.0" encoding="UTF-8"?>
+<project>
<parent>
<artifactId>maven-reporting</artifactId>
<groupId>org.apache.maven.reporting</groupId>
@@ -33,17 +34,12 @@
<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.doxia</groupId>
+ <artifactId>doxia-site-renderer</artifactId>
+ <version>1.0-alpha-7-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.maven</groupId>
@@ -59,16 +55,6 @@
<groupId>org.apache.maven.reporting</groupId>
<artifactId>maven-reporting-api</artifactId>
<version>2.1-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/trunk/maven-reporting/maven-reporting-impl/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?rev=365790&r1=365789&r2=365790&view=diff
==============================================================================
---
maven/components/trunk/maven-reporting/maven-reporting-impl/src/main/java/org/apache/maven/reporting/AbstractMavenMultiPageReport.java
(original)
+++
maven/components/trunk/maven-reporting/maven-reporting-impl/src/main/java/org/apache/maven/reporting/AbstractMavenMultiPageReport.java
Tue Jan 3 17:14:17 2006
@@ -16,11 +16,12 @@
* limitations under the License.
*/
+import org.apache.maven.doxia.sink.Sink;
+import org.apache.maven.doxia.siterenderer.RendererException;
import org.apache.maven.reporting.sink.MultiPageSink;
import org.apache.maven.reporting.sink.SinkFactory;
-import org.codehaus.doxia.sink.Sink;
-import java.io.InputStream;
+import java.io.IOException;
import java.util.ArrayList;
import java.util.Iterator;
import java.util.List;
@@ -39,16 +40,6 @@
public void setSinkFactory( SinkFactory factory )
{
this.factory = factory;
-
- if ( getFlavour() != null )
- {
- factory.setFlavour( getFlavour() );
- }
-
- if ( !useDefaultSiteDescriptor() )
- {
- factory.setSiteDescriptor( getSiteDescriptor() );
- }
}
public SinkFactory getSinkFactory()
@@ -56,16 +47,6 @@
return factory;
}
- public String getFlavour()
- {
- return null;
- }
-
- public InputStream getSiteDescriptor()
- {
- return null;
- }
-
public boolean useDefaultSiteDescriptor()
{
return true;
@@ -74,13 +55,13 @@
public abstract boolean usePageLinkBar();
private Sink getSink( String outputName )
- throws Exception
+ throws RendererException, IOException
{
return factory.getSink( outputName );
}
public MultiPageSink startPage( String outputName )
- throws Exception
+ throws RendererException, IOException
{
return new MultiPageSink( outputName, getSink( outputName ) );
}
@@ -99,8 +80,6 @@
protected void closeReport()
{
- int counter = 1;
-
if ( !sinks.isEmpty() )
{
for ( Iterator i = sinks.iterator(); i.hasNext(); )
@@ -108,21 +87,23 @@
MultiPageSink currentSink = (MultiPageSink) i.next();
currentSink.paragraph();
- for ( Iterator j = sinks.iterator(); j.hasNext(); )
+
+ for ( int counter = 1; counter <= sinks.size(); counter++ )
{
if ( counter > 1 )
{
currentSink.text( " " );
}
- MultiPageSink sink = (MultiPageSink) j.next();
+ MultiPageSink sink = (MultiPageSink) sinks.get( counter -
1 );
sink.link( sink.getOutputName() + ".html" );
- sink.text( String.valueOf( counter++ ) );
+ sink.text( String.valueOf( counter ) );
sink.link_();
-
}
currentSink.paragraph_();
currentSink.closeSink();
}
}
+
+ super.closeReport();
}
}
Modified:
maven/components/trunk/maven-reporting/maven-reporting-impl/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?rev=365790&r1=365789&r2=365790&view=diff
==============================================================================
---
maven/components/trunk/maven-reporting/maven-reporting-impl/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
Tue Jan 3 17:14:17 2006
@@ -16,22 +16,17 @@
* limitations under the License.
*/
+import org.apache.maven.doxia.sink.Sink;
+import org.apache.maven.doxia.siterenderer.Renderer;
+import org.apache.maven.doxia.siterenderer.RendererException;
+import org.apache.maven.doxia.siterenderer.sink.SiteRendererSink;
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.codehaus.plexus.util.IOUtil;
-import org.codehaus.plexus.util.StringInputStream;
-import org.codehaus.plexus.util.StringUtils;
import java.io.File;
import java.io.IOException;
-import java.io.InputStream;
-import java.util.HashMap;
import java.util.Locale;
-import java.util.Map;
/**
* The basis for a Maven report.
@@ -43,12 +38,11 @@
extends AbstractMojo
implements MavenReport
{
-
private Sink sink;
private Locale locale = Locale.ENGLISH;
- protected abstract SiteRenderer getSiteRenderer();
+ protected abstract Renderer getSiteRenderer();
protected abstract String getOutputDirectory();
@@ -66,33 +60,43 @@
{
String outputDirectory = getOutputDirectory();
- XhtmlSink sink = new XhtmlSink( getSiteRenderer().createSink( new
File( outputDirectory ), getOutputName() + ".html",
- outputDirectory,
getSiteDescriptor(), "maven" ) );
+ SiteRendererSink sink =
+ getSiteRenderer().createSink( new File( outputDirectory ),
getOutputName() + ".html" );
- generate( sink, Locale.ENGLISH );
+ generate( sink, Locale.getDefault() );
- getSiteRenderer().copyResources( outputDirectory, "maven" );
+ // TODO: add back when skinning support is in the site renderer
+// getSiteRenderer().copyResources( outputDirectory, "maven" );
+ }
+ catch ( RendererException e )
+ {
+ throw new MojoExecutionException( "An error has occurred in " +
getName( locale ) + " report generation.",
+ e );
+ }
+ catch ( IOException e )
+ {
+ throw new MojoExecutionException( "An error has occurred in " +
getName( locale ) + " report generation.",
+ e );
}
- catch ( Exception e )
+ catch ( MavenReportException 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 );
}
}
/**
* @see
org.apache.maven.reporting.MavenReport#generate(org.codehaus.doxia.sink.Sink,
java.util.Locale)
*/
- public void generate( Sink sink, Locale locale )
+ public void generate( org.codehaus.doxia.sink.Sink sink, Locale locale )
throws MavenReportException
{
if ( sink == null )
{
throw new MavenReportException( "You must specify a sink." );
}
- else
- {
- this.sink = sink;
- }
+
+ this.sink = sink;
executeReport( locale );
@@ -109,61 +113,6 @@
public String getCategoryName()
{
return CATEGORY_PROJECT_REPORTS;
- }
-
- private String getReportsMenu()
- {
- StringBuffer buffer = new StringBuffer();
- buffer.append( "<menu name=\"Project Documentation\">\n" );
-
- buffer.append( " <item name=\"" + getName( locale ) + "\" href=\"/" +
getOutputName() + ".html\"/>\n" );
-
- buffer.append( "</menu>\n" );
-
- return buffer.toString();
- }
-
- private InputStream getSiteDescriptor()
- throws MojoExecutionException
- {
- String siteDescriptorContent = "";
-
- try
- {
- siteDescriptorContent = IOUtil.toString(
getClass().getResourceAsStream( "/default-report.xml" ) );
- }
- catch ( IOException e )
- {
- throw new MojoExecutionException( "The site descriptor cannot be
read!", e );
- }
-
- Map props = new HashMap();
-
- props.put( "reports", getReportsMenu() );
-
- // TODO: interpolate ${project.*} in general
-
- if ( getProject().getName() != null )
- {
- props.put( "project.name", getProject().getName() );
- }
- else
- {
- props.put( "project.name", "NO_PROJECT_NAME_SET" );
- }
-
- if ( getProject().getUrl() != null )
- {
- props.put( "project.url", getProject().getUrl() );
- }
- else
- {
- props.put( "project.url", "NO_PROJECT_URL_SET" );
- }
-
- siteDescriptorContent = StringUtils.interpolate(
siteDescriptorContent, props );
-
- return new StringInputStream( siteDescriptorContent );
}
public File getReportOutputDirectory()
Modified:
maven/components/trunk/maven-reporting/maven-reporting-impl/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?rev=365790&r1=365789&r2=365790&view=diff
==============================================================================
---
maven/components/trunk/maven-reporting/maven-reporting-impl/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
Tue Jan 3 17:14:17 2006
@@ -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/trunk/maven-reporting/maven-reporting-impl/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?rev=365790&r1=365789&r2=365790&view=diff
==============================================================================
---
maven/components/trunk/maven-reporting/maven-reporting-impl/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
Tue Jan 3 17:14:17 2006
@@ -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/trunk/maven-reporting/maven-reporting-impl/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?rev=365790&r1=365789&r2=365790&view=diff
==============================================================================
---
maven/components/trunk/maven-reporting/maven-reporting-impl/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
Tue Jan 3 17:14:17 2006
@@ -16,12 +16,12 @@
* 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.sink.Sink;
+import org.apache.maven.doxia.siterenderer.Renderer;
+import org.apache.maven.doxia.siterenderer.RendererException;
import java.io.File;
-import java.io.InputStream;
+import java.io.IOException;
/**
* @author <a href="[EMAIL PROTECTED]">Emmanuel Venisse</a>
@@ -29,22 +29,11 @@
*/
public class SinkFactory
{
- private String outputDirectory;
-
private String siteDirectory;
- private SiteRenderer siteRenderer;
-
- private InputStream siteDescriptor;
+ private Renderer siteRenderer;
- private String flavour;
-
- public void setOutputDirectory( String outputDirectory )
- {
- this.outputDirectory = outputDirectory;
- }
-
- public void setSiteRenderer( SiteRenderer siteRenderer )
+ public void setSiteRenderer( Renderer siteRenderer )
{
this.siteRenderer = siteRenderer;
}
@@ -54,26 +43,9 @@
this.siteDirectory = siteDirectory;
}
- public void setFlavour( String flavour )
- {
- this.flavour = flavour;
- }
-
- public void setSiteDescriptor( InputStream siteDescriptor )
- {
- this.siteDescriptor = siteDescriptor;
- }
-
public Sink getSink( String outputFileName )
- throws Exception
+ throws RendererException, IOException
{
- InputStream descriptor = siteDescriptor;
- if ( descriptor == null )
- {
- descriptor = new StringInputStream( "" );
- }
-
- return (Sink) siteRenderer.createSink( new File( siteDirectory ),
outputFileName, outputDirectory,
- descriptor, flavour );
+ return siteRenderer.createSink( new File( siteDirectory ),
outputFileName );
}
}
Propchange: maven/components/trunk/maven-script/maven-script-ant/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Tue Jan 3 17:14:17 2006
@@ -1 +1,4 @@
target
+*.iml
+*.ipr
+*.iws
Modified: maven/components/trunk/pom.xml
URL:
http://svn.apache.org/viewcvs/maven/components/trunk/pom.xml?rev=365790&r1=365789&r2=365790&view=diff
==============================================================================
--- maven/components/trunk/pom.xml (original)
+++ maven/components/trunk/pom.xml Tue Jan 3 17:14:17 2006
@@ -257,9 +257,11 @@
</dependencies>
<reporting>
<plugins>
+<!--
<plugin>
<artifactId>maven-checkstyle-plugin</artifactId>
</plugin>
+-->
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>changelog-maven-plugin</artifactId>
