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/10/13 07:31:10 UTC
svn commit: r320668 [1/3] - in /maven/components/trunk:
maven-artifact-ant/src/main/java/org/apache/maven/artifact/ant/
maven-artifact-manager/src/main/java/org/apache/maven/artifact/resolver/
maven-artifact/src/main/java/org/apache/maven/artifact/reso...
Author: brett
Date: Wed Oct 12 22:30:22 2005
New Revision: 320668
URL: http://svn.apache.org/viewcvs?rev=320668&view=rev
Log:
PR: MNG-122
exception clean up phase 1
Added:
maven/components/trunk/maven-core/src/main/java/org/apache/maven/BuildFailureException.java (with props)
maven/components/trunk/maven-core/src/main/java/org/apache/maven/reactor/MavenExecutionException.java (contents, props changed)
- copied, changed from r314825, maven/components/trunk/maven-core/src/main/java/org/apache/maven/reactor/ReactorException.java
Removed:
maven/components/trunk/maven-core/src/main/java/org/apache/maven/plugin/PluginContainerException.java
maven/components/trunk/maven-core/src/main/java/org/apache/maven/reactor/ReactorException.java
maven/components/trunk/maven-core/src/main/java/org/apache/maven/usability/PluginContainerDiagnoser.java
Modified:
maven/components/trunk/maven-artifact-ant/src/main/java/org/apache/maven/artifact/ant/AbstractArtifactTask.java
maven/components/trunk/maven-artifact-ant/src/main/java/org/apache/maven/artifact/ant/DependenciesTask.java
maven/components/trunk/maven-artifact-ant/src/main/java/org/apache/maven/artifact/ant/DeployTask.java
maven/components/trunk/maven-artifact-ant/src/main/java/org/apache/maven/artifact/ant/InstallTask.java
maven/components/trunk/maven-artifact-ant/src/main/java/org/apache/maven/artifact/ant/InstallWagonProviderTask.java
maven/components/trunk/maven-artifact-ant/src/main/java/org/apache/maven/artifact/ant/Pom.java
maven/components/trunk/maven-artifact-manager/src/main/java/org/apache/maven/artifact/resolver/DefaultArtifactResolver.java
maven/components/trunk/maven-artifact/src/main/java/org/apache/maven/artifact/resolver/AbstractArtifactResolutionException.java
maven/components/trunk/maven-artifact/src/main/java/org/apache/maven/artifact/resolver/ArtifactResolutionException.java
maven/components/trunk/maven-artifact/src/main/java/org/apache/maven/artifact/resolver/DefaultArtifactCollector.java
maven/components/trunk/maven-core/src/main/java/org/apache/maven/DefaultMaven.java
maven/components/trunk/maven-core/src/main/java/org/apache/maven/Maven.java
maven/components/trunk/maven-core/src/main/java/org/apache/maven/cli/MavenCli.java
maven/components/trunk/maven-core/src/main/java/org/apache/maven/extension/DefaultExtensionManager.java
maven/components/trunk/maven-core/src/main/java/org/apache/maven/extension/ExtensionManager.java
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/plugin/DefaultPluginManager.java
maven/components/trunk/maven-core/src/main/java/org/apache/maven/plugin/PluginConfigurationException.java
maven/components/trunk/maven-core/src/main/java/org/apache/maven/plugin/PluginManager.java
maven/components/trunk/maven-core/src/main/java/org/apache/maven/plugin/PluginParameterException.java
maven/components/trunk/maven-core/src/main/java/org/apache/maven/plugin/version/PluginVersionResolutionException.java
maven/components/trunk/maven-core/src/main/java/org/apache/maven/usability/PluginConfigurationDiagnoser.java
maven/components/trunk/maven-core/src/main/resources/META-INF/plexus/components.xml
maven/components/trunk/maven-plugins/maven-antlr-plugin/ (props changed)
maven/components/trunk/maven-plugins/maven-antrun-plugin/ (props changed)
maven/components/trunk/maven-plugins/maven-projecthelp-plugin/ (props changed)
maven/components/trunk/maven-plugins/maven-projecthelp-plugin/src/main/java/org/apache/maven/plugins/projecthelp/DescribeMojo.java
maven/components/trunk/maven-plugins/maven-release-plugin/src/main/java/org/apache/maven/plugins/release/AbstractReleaseMojo.java
maven/components/trunk/maven-plugins/maven-release-plugin/src/main/java/org/apache/maven/plugins/release/PerformReleaseMojo.java
maven/components/trunk/maven-plugins/maven-release-plugin/src/main/java/org/apache/maven/plugins/release/PrepareReleaseMojo.java
maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java
maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/MavenProject.java
maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/artifact/MavenMetadataSource.java
maven/components/trunk/maven-project/src/test/java/org/apache/maven/project/artifact/MavenMetadataSourceTest.java
Modified: maven/components/trunk/maven-artifact-ant/src/main/java/org/apache/maven/artifact/ant/AbstractArtifactTask.java
URL: http://svn.apache.org/viewcvs/maven/components/trunk/maven-artifact-ant/src/main/java/org/apache/maven/artifact/ant/AbstractArtifactTask.java?rev=320668&r1=320667&r2=320668&view=diff
==============================================================================
--- maven/components/trunk/maven-artifact-ant/src/main/java/org/apache/maven/artifact/ant/AbstractArtifactTask.java (original)
+++ maven/components/trunk/maven-artifact-ant/src/main/java/org/apache/maven/artifact/ant/AbstractArtifactTask.java Wed Oct 12 22:30:22 2005
@@ -75,8 +75,8 @@
localRepository = getDefaultLocalRepository();
}
- ArtifactRepositoryLayout repositoryLayout = (ArtifactRepositoryLayout) lookup( ArtifactRepositoryLayout.ROLE,
- localRepository.getLayout() );
+ ArtifactRepositoryLayout repositoryLayout =
+ (ArtifactRepositoryLayout) lookup( ArtifactRepositoryLayout.ROLE, localRepository.getLayout() );
CustomWagonManager manager = (CustomWagonManager) lookup( WagonManager.ROLE );
manager.setLocalRepository( localRepository.getLocation() );
@@ -86,8 +86,8 @@
protected ArtifactRepository createRemoteArtifactRepository( RemoteRepository repository )
{
- ArtifactRepositoryLayout repositoryLayout = (ArtifactRepositoryLayout) lookup( ArtifactRepositoryLayout.ROLE,
- repository.getLayout() );
+ ArtifactRepositoryLayout repositoryLayout =
+ (ArtifactRepositoryLayout) lookup( ArtifactRepositoryLayout.ROLE, repository.getLayout() );
WagonManager manager = (WagonManager) lookup( WagonManager.ROLE );
@@ -367,22 +367,22 @@
return pom;
}
-
+
public void diagnoseError( Throwable error )
{
try
{
ErrorDiagnostics diagnostics = (ErrorDiagnostics) embedder.lookup( ErrorDiagnostics.ROLE );
-
+
StringBuffer message = new StringBuffer();
message.append( "An error has occurred while processing the Maven artifact tasks.\n" );
message.append( " Diagnosis:\n\n" );
message.append( diagnostics.diagnose( error ) );
-
+
message.append( "\n\n" );
-
+
log( message.toString(), Project.MSG_INFO );
}
catch ( ComponentLookupException e )
@@ -440,4 +440,23 @@
policy.setUpdatePolicy( pomRepoPolicy.getUpdatePolicy() );
return policy;
}
+
+ /**
+ * @noinspection RefusedBequest
+ */
+ public void execute()
+ {
+ try
+ {
+ doExecute();
+ }
+ catch ( BuildException e )
+ {
+ diagnoseError( e );
+
+ throw e;
+ }
+ }
+
+ protected abstract void doExecute();
}
Modified: maven/components/trunk/maven-artifact-ant/src/main/java/org/apache/maven/artifact/ant/DependenciesTask.java
URL: http://svn.apache.org/viewcvs/maven/components/trunk/maven-artifact-ant/src/main/java/org/apache/maven/artifact/ant/DependenciesTask.java?rev=320668&r1=320667&r2=320668&view=diff
==============================================================================
--- maven/components/trunk/maven-artifact-ant/src/main/java/org/apache/maven/artifact/ant/DependenciesTask.java (original)
+++ maven/components/trunk/maven-artifact-ant/src/main/java/org/apache/maven/artifact/ant/DependenciesTask.java Wed Oct 12 22:30:22 2005
@@ -29,7 +29,6 @@
import org.apache.maven.artifact.resolver.filter.ArtifactFilter;
import org.apache.maven.artifact.resolver.filter.ScopeArtifactFilter;
import org.apache.maven.artifact.resolver.filter.TypeArtifactFilter;
-import org.apache.maven.artifact.versioning.InvalidVersionSpecificationException;
import org.apache.maven.model.Dependency;
import org.apache.maven.model.Repository;
import org.apache.maven.project.MavenProjectBuilder;
@@ -70,175 +69,156 @@
private boolean verbose;
- /**
- * @noinspection RefusedBequest
- */
- public void execute()
+ protected void doExecute()
{
- try
- {
- ArtifactRepository localRepo = createLocalArtifactRepository();
+ ArtifactRepository localRepo = createLocalArtifactRepository();
- ArtifactResolver resolver = (ArtifactResolver) lookup( ArtifactResolver.ROLE );
- MavenProjectBuilder projectBuilder = (MavenProjectBuilder) lookup( MavenProjectBuilder.ROLE );
- ArtifactFactory artifactFactory = (ArtifactFactory) lookup( ArtifactFactory.ROLE );
- MavenMetadataSource metadataSource = (MavenMetadataSource) lookup( ArtifactMetadataSource.ROLE );
+ ArtifactResolver resolver = (ArtifactResolver) lookup( ArtifactResolver.ROLE );
+ MavenProjectBuilder projectBuilder = (MavenProjectBuilder) lookup( MavenProjectBuilder.ROLE );
+ ArtifactFactory artifactFactory = (ArtifactFactory) lookup( ArtifactFactory.ROLE );
+ MavenMetadataSource metadataSource = (MavenMetadataSource) lookup( ArtifactMetadataSource.ROLE );
- List dependencies = this.dependencies;
+ List dependencies = this.dependencies;
- Pom pom = buildPom( projectBuilder, localRepo );
- if ( pom != null )
+ Pom pom = buildPom( projectBuilder, localRepo );
+ if ( pom != null )
+ {
+ if ( !dependencies.isEmpty() )
{
- if ( !dependencies.isEmpty() )
- {
- throw new BuildException( "You cannot specify both dependencies and a pom in the dependencies task" );
- }
-
- dependencies = pom.getDependencies();
+ throw new BuildException( "You cannot specify both dependencies and a pom in the dependencies task" );
+ }
- for ( Iterator i = pom.getRepositories().iterator(); i.hasNext(); )
- {
- Repository pomRepository = (Repository) i.next();
+ dependencies = pom.getDependencies();
- remoteRepositories.add( createAntRemoteRepository( pomRepository ) );
- }
- }
- else
+ for ( Iterator i = pom.getRepositories().iterator(); i.hasNext(); )
{
- // we have to have some sort of Pom object in order to satisfy the requirements for building the
- // originating Artifact below...
- pom = createDummyPom();
- }
+ Repository pomRepository = (Repository) i.next();
- if ( dependencies.isEmpty() )
- {
- log( "There were no dependencies specified", Project.MSG_WARN );
+ remoteRepositories.add( createAntRemoteRepository( pomRepository ) );
}
+ }
+ else
+ {
+ // we have to have some sort of Pom object in order to satisfy the requirements for building the
+ // originating Artifact below...
+ pom = createDummyPom();
+ }
- Set artifacts;
- try
- {
- artifacts = MavenMetadataSource.createArtifacts( artifactFactory, dependencies, null, null, null );
- }
- catch ( InvalidVersionSpecificationException e )
- {
- throw new BuildException( "Invalid version specification", e );
- }
+ if ( dependencies.isEmpty() )
+ {
+ log( "There were no dependencies specified", Project.MSG_WARN );
+ }
- log( "Resolving dependencies...", Project.MSG_VERBOSE );
+ log( "Resolving dependencies...", Project.MSG_VERBOSE );
- WagonManager wagonManager = (WagonManager) lookup( WagonManager.ROLE );
- wagonManager.setDownloadMonitor( new AntDownloadMonitor() );
+ WagonManager wagonManager = (WagonManager) lookup( WagonManager.ROLE );
+ wagonManager.setDownloadMonitor( new AntDownloadMonitor() );
- ArtifactResolutionResult result;
- try
- {
- Artifact pomArtifact = artifactFactory.createBuildArtifact( pom.getGroupId(), pom.getArtifactId(), pom
- .getVersion(), pom.getPackaging() );
+ ArtifactResolutionResult result;
+ Set artifacts;
+ try
+ {
+ artifacts = metadataSource.createArtifacts( artifactFactory, dependencies, null, null, null );
- List listeners = Collections.EMPTY_LIST;
- if ( verbose )
- {
- listeners = Collections.singletonList( new AntResolutionListener( getProject() ) );
- }
+ Artifact pomArtifact = artifactFactory.createBuildArtifact( pom.getGroupId(), pom.getArtifactId(), pom
+ .getVersion(), pom.getPackaging() );
- List remoteRepositories = getRemoteRepositories();
+ List listeners = Collections.EMPTY_LIST;
+ if ( verbose )
+ {
+ listeners = Collections.singletonList( new AntResolutionListener( getProject() ) );
+ }
- RemoteRepository remoteRepository = getDefaultRemoteRepository();
- remoteRepositories.add( remoteRepository );
+ List remoteRepositories = getRemoteRepositories();
- List remoteArtifactRepositories = createRemoteArtifactRepositories( remoteRepositories );
+ RemoteRepository remoteRepository = getDefaultRemoteRepository();
+ remoteRepositories.add( remoteRepository );
- // TODO: managed dependencies
- Map managedDependencies = Collections.EMPTY_MAP;
+ List remoteArtifactRepositories = createRemoteArtifactRepositories( remoteRepositories );
- ArtifactFilter filter = null;
- if ( useScope != null )
- {
- filter = new ScopeArtifactFilter( useScope );
- }
- if ( type != null )
- {
- TypeArtifactFilter typeArtifactFilter = new TypeArtifactFilter( type );
- if ( filter != null )
- {
- AndArtifactFilter andFilter = new AndArtifactFilter();
- andFilter.add( filter );
- andFilter.add( typeArtifactFilter );
- filter = andFilter;
- }
- else
- {
- filter = typeArtifactFilter;
- }
- }
+ // TODO: managed dependencies
+ Map managedDependencies = Collections.EMPTY_MAP;
- result = resolver.resolveTransitively( artifacts, pomArtifact, managedDependencies, localRepo,
- remoteArtifactRepositories, metadataSource, filter, listeners );
- }
- catch ( ArtifactResolutionException e )
+ ArtifactFilter filter = null;
+ if ( useScope != null )
{
- throw new BuildException( "Unable to resolve artifact", e );
+ filter = new ScopeArtifactFilter( useScope );
}
- catch ( ArtifactNotFoundException e )
+ if ( type != null )
{
- // TODO: improve handling
- throw new BuildException( "Unable to locate artifact", e );
+ TypeArtifactFilter typeArtifactFilter = new TypeArtifactFilter( type );
+ if ( filter != null )
+ {
+ AndArtifactFilter andFilter = new AndArtifactFilter();
+ andFilter.add( filter );
+ andFilter.add( typeArtifactFilter );
+ filter = andFilter;
+ }
+ else
+ {
+ filter = typeArtifactFilter;
+ }
}
- if ( pathId != null && getProject().getReference( pathId ) != null )
- {
- throw new BuildException( "Reference ID " + pathId + " already exists" );
- }
+ result = resolver.resolveTransitively( artifacts, pomArtifact, managedDependencies, localRepo,
+ remoteArtifactRepositories, metadataSource, filter, listeners );
+ }
+ catch ( ArtifactResolutionException e )
+ {
+ throw new BuildException( "Unable to resolve artifact", e );
+ }
+ catch ( ArtifactNotFoundException e )
+ {
+ // TODO: improve handling
+ throw new BuildException( "Unable to locate artifact", e );
+ }
- if ( filesetId != null && getProject().getReference( filesetId ) != null )
- {
- throw new BuildException( "Reference ID " + filesetId + " already exists" );
- }
+ if ( pathId != null && getProject().getReference( pathId ) != null )
+ {
+ throw new BuildException( "Reference ID " + pathId + " already exists" );
+ }
- FileList fileList = new FileList();
- fileList.setDir( getLocalRepository().getLocation() );
+ if ( filesetId != null && getProject().getReference( filesetId ) != null )
+ {
+ throw new BuildException( "Reference ID " + filesetId + " already exists" );
+ }
- FileSet fileSet = new FileSet();
- fileSet.setDir( fileList.getDir( getProject() ) );
+ FileList fileList = new FileList();
+ fileList.setDir( getLocalRepository().getLocation() );
- if ( result.getArtifacts().isEmpty() )
- {
- fileSet.createExclude().setName( "**/**" );
- }
- else
- {
- for ( Iterator i = result.getArtifacts().iterator(); i.hasNext(); )
- {
- Artifact artifact = (Artifact) i.next();
- String filename = localRepo.pathOf( artifact );
+ FileSet fileSet = new FileSet();
+ fileSet.setDir( fileList.getDir( getProject() ) );
- FileList.FileName file = new FileList.FileName();
- file.setName( filename );
+ if ( result.getArtifacts().isEmpty() )
+ {
+ fileSet.createExclude().setName( "**/**" );
+ }
+ else
+ {
+ for ( Iterator i = result.getArtifacts().iterator(); i.hasNext(); )
+ {
+ Artifact artifact = (Artifact) i.next();
+ String filename = localRepo.pathOf( artifact );
- fileList.addConfiguredFile( file );
+ FileList.FileName file = new FileList.FileName();
+ file.setName( filename );
- fileSet.createInclude().setName( filename );
- }
- }
+ fileList.addConfiguredFile( file );
- if ( pathId != null )
- {
- Path path = new Path( getProject() );
- path.addFilelist( fileList );
- getProject().addReference( pathId, path );
+ fileSet.createInclude().setName( filename );
}
+ }
- if ( filesetId != null )
- {
- getProject().addReference( filesetId, fileSet );
- }
+ if ( pathId != null )
+ {
+ Path path = new Path( getProject() );
+ path.addFilelist( fileList );
+ getProject().addReference( pathId, path );
}
- catch ( BuildException e )
+
+ if ( filesetId != null )
{
- diagnoseError( e );
-
- throw e;
+ getProject().addReference( filesetId, fileSet );
}
}
Modified: maven/components/trunk/maven-artifact-ant/src/main/java/org/apache/maven/artifact/ant/DeployTask.java
URL: http://svn.apache.org/viewcvs/maven/components/trunk/maven-artifact-ant/src/main/java/org/apache/maven/artifact/ant/DeployTask.java?rev=320668&r1=320667&r2=320668&view=diff
==============================================================================
--- maven/components/trunk/maven-artifact-ant/src/main/java/org/apache/maven/artifact/ant/DeployTask.java (original)
+++ maven/components/trunk/maven-artifact-ant/src/main/java/org/apache/maven/artifact/ant/DeployTask.java Wed Oct 12 22:30:22 2005
@@ -43,92 +43,83 @@
private File file;
- public void execute()
+ protected void doExecute()
{
- try
- {
- ArtifactRepository localRepo = createLocalArtifactRepository();
- MavenProjectBuilder builder = (MavenProjectBuilder) lookup( MavenProjectBuilder.ROLE );
+ ArtifactRepository localRepo = createLocalArtifactRepository();
+ MavenProjectBuilder builder = (MavenProjectBuilder) lookup( MavenProjectBuilder.ROLE );
- Pom pom = buildPom( builder, localRepo );
+ Pom pom = buildPom( builder, localRepo );
- if ( pom == null )
- {
- throw new BuildException( "A POM element is required to deploy to the repository" );
- }
+ if ( pom == null )
+ {
+ throw new BuildException( "A POM element is required to deploy to the repository" );
+ }
- Artifact artifact = createArtifact( pom );
+ Artifact artifact = createArtifact( pom );
- DistributionManagement distributionManagement = pom.getDistributionManagement();
+ DistributionManagement distributionManagement = pom.getDistributionManagement();
- if ( remoteSnapshotRepository == null && remoteRepository == null )
+ if ( remoteSnapshotRepository == null && remoteRepository == null )
+ {
+ if ( distributionManagement != null )
{
- if ( distributionManagement != null )
+ if ( distributionManagement.getSnapshotRepository() != null )
{
- if ( distributionManagement.getSnapshotRepository() != null )
- {
- remoteSnapshotRepository = createAntRemoteRepositoryBase( distributionManagement
- .getSnapshotRepository() );
- }
- if ( distributionManagement.getRepository() != null )
- {
- remoteRepository = createAntRemoteRepositoryBase( distributionManagement.getRepository() );
- }
+ remoteSnapshotRepository = createAntRemoteRepositoryBase( distributionManagement
+ .getSnapshotRepository() );
+ }
+ if ( distributionManagement.getRepository() != null )
+ {
+ remoteRepository = createAntRemoteRepositoryBase( distributionManagement.getRepository() );
}
}
+ }
- if ( remoteSnapshotRepository == null )
- {
- remoteSnapshotRepository = remoteRepository;
- }
+ if ( remoteSnapshotRepository == null )
+ {
+ remoteSnapshotRepository = remoteRepository;
+ }
- ArtifactRepository deploymentRepository = null;
- if ( artifact.isSnapshot() && remoteSnapshotRepository != null )
- {
- deploymentRepository = createRemoteArtifactRepository( remoteSnapshotRepository );
- }
- else if ( remoteRepository != null )
- {
- deploymentRepository = createRemoteArtifactRepository( remoteRepository );
- }
- else
- {
- throw new BuildException(
- "A distributionManagement element or remoteRepository element is required to deploy" );
- }
+ ArtifactRepository deploymentRepository;
+ if ( artifact.isSnapshot() && remoteSnapshotRepository != null )
+ {
+ deploymentRepository = createRemoteArtifactRepository( remoteSnapshotRepository );
+ }
+ else if ( remoteRepository != null )
+ {
+ deploymentRepository = createRemoteArtifactRepository( remoteRepository );
+ }
+ else
+ {
+ throw new BuildException(
+ "A distributionManagement element or remoteRepository element is required to deploy" );
+ }
- // Deploy the POM
- boolean isPomArtifact = "pom".equals( pom.getPackaging() );
- if ( !isPomArtifact )
- {
- ArtifactMetadata metadata = new ProjectArtifactMetadata( artifact, pom.getFile() );
- artifact.addMetadata( metadata );
- }
+ // Deploy the POM
+ boolean isPomArtifact = "pom".equals( pom.getPackaging() );
+ if ( !isPomArtifact )
+ {
+ ArtifactMetadata metadata = new ProjectArtifactMetadata( artifact, pom.getFile() );
+ artifact.addMetadata( metadata );
+ }
- log( "Deploying to " + deploymentRepository.getUrl() );
- ArtifactDeployer deployer = (ArtifactDeployer) lookup( ArtifactDeployer.ROLE );
- try
+ log( "Deploying to " + deploymentRepository.getUrl() );
+ ArtifactDeployer deployer = (ArtifactDeployer) lookup( ArtifactDeployer.ROLE );
+ try
+ {
+ if ( !isPomArtifact )
{
- if ( !isPomArtifact )
- {
- deployer.deploy( file, artifact, deploymentRepository, localRepo );
- }
- else
- {
- deployer.deploy( pom.getFile(), artifact, deploymentRepository, localRepo );
- }
+ deployer.deploy( file, artifact, deploymentRepository, localRepo );
}
- catch ( ArtifactDeploymentException e )
+ else
{
- // TODO: deployment exception that does not give a trace
- throw new BuildException( "Error deploying artifact", e );
+ deployer.deploy( pom.getFile(), artifact, deploymentRepository, localRepo );
}
}
- catch ( BuildException e )
+ catch ( ArtifactDeploymentException e )
{
- diagnoseError( e );
-
- throw e;
+ // TODO: deployment exception that does not give a trace
+ throw new BuildException( "Error deploying artifact", e );
}
}
Modified: maven/components/trunk/maven-artifact-ant/src/main/java/org/apache/maven/artifact/ant/InstallTask.java
URL: http://svn.apache.org/viewcvs/maven/components/trunk/maven-artifact-ant/src/main/java/org/apache/maven/artifact/ant/InstallTask.java?rev=320668&r1=320667&r2=320668&view=diff
==============================================================================
--- maven/components/trunk/maven-artifact-ant/src/main/java/org/apache/maven/artifact/ant/InstallTask.java (original)
+++ maven/components/trunk/maven-artifact-ant/src/main/java/org/apache/maven/artifact/ant/InstallTask.java Wed Oct 12 22:30:22 2005
@@ -39,47 +39,38 @@
{
private File file;
- public void execute()
+ protected void doExecute()
{
- try
- {
- ArtifactRepository localRepo = createLocalArtifactRepository();
+ ArtifactRepository localRepo = createLocalArtifactRepository();
- MavenProjectBuilder builder = (MavenProjectBuilder) lookup( MavenProjectBuilder.ROLE );
- Pom pom = buildPom( builder, localRepo );
+ MavenProjectBuilder builder = (MavenProjectBuilder) lookup( MavenProjectBuilder.ROLE );
+ Pom pom = buildPom( builder, localRepo );
- Artifact artifact = createArtifact( pom );
+ Artifact artifact = createArtifact( pom );
- boolean isPomArtifact = "pom".equals( pom.getPackaging() );
- if ( !isPomArtifact )
- {
- ArtifactMetadata metadata = new ProjectArtifactMetadata( artifact, pom.getFile() );
- artifact.addMetadata( metadata );
- }
+ boolean isPomArtifact = "pom".equals( pom.getPackaging() );
+ if ( !isPomArtifact )
+ {
+ ArtifactMetadata metadata = new ProjectArtifactMetadata( artifact, pom.getFile() );
+ artifact.addMetadata( metadata );
+ }
- ArtifactInstaller installer = (ArtifactInstaller) lookup( ArtifactInstaller.ROLE );
- try
+ ArtifactInstaller installer = (ArtifactInstaller) lookup( ArtifactInstaller.ROLE );
+ try
+ {
+ if ( !isPomArtifact )
{
- if ( !isPomArtifact )
- {
- installer.install( file, artifact, localRepo );
- }
- else
- {
- installer.install( pom.getFile(), artifact, localRepo );
- }
+ installer.install( file, artifact, localRepo );
}
- catch ( ArtifactInstallationException e )
+ else
{
- // TODO: install exception that does not give a trace
- throw new BuildException( "Error installing artifact", e );
+ installer.install( pom.getFile(), artifact, localRepo );
}
}
- catch ( BuildException e )
+ catch ( ArtifactInstallationException e )
{
- diagnoseError( e );
-
- throw e;
+ // TODO: install exception that does not give a trace
+ throw new BuildException( "Error installing artifact", e );
}
}
Modified: maven/components/trunk/maven-artifact-ant/src/main/java/org/apache/maven/artifact/ant/InstallWagonProviderTask.java
URL: http://svn.apache.org/viewcvs/maven/components/trunk/maven-artifact-ant/src/main/java/org/apache/maven/artifact/ant/InstallWagonProviderTask.java?rev=320668&r1=320667&r2=320668&view=diff
==============================================================================
--- maven/components/trunk/maven-artifact-ant/src/main/java/org/apache/maven/artifact/ant/InstallWagonProviderTask.java (original)
+++ maven/components/trunk/maven-artifact-ant/src/main/java/org/apache/maven/artifact/ant/InstallWagonProviderTask.java Wed Oct 12 22:30:22 2005
@@ -17,6 +17,7 @@
*/
import org.apache.maven.artifact.Artifact;
+import org.apache.maven.artifact.ArtifactUtils;
import org.apache.maven.artifact.factory.ArtifactFactory;
import org.apache.maven.artifact.metadata.ArtifactMetadataSource;
import org.apache.maven.artifact.repository.ArtifactRepository;
@@ -47,6 +48,8 @@
private String version;
+ private static final String WAGON_GROUP_ID = "org.apache.maven.wagon";
+
public String getArtifactId()
{
return artifactId;
@@ -67,59 +70,60 @@
this.version = version;
}
- public void execute()
+ public void doExecute()
throws BuildException
{
+ MavenMetadataSource metadataSource = (MavenMetadataSource) lookup( ArtifactMetadataSource.ROLE );
+
+ ArtifactResolver resolver = (ArtifactResolver) lookup( ArtifactResolver.ROLE );
+ ArtifactRepository artifactRepository = createRemoteArtifactRepository( getDefaultRemoteRepository() );
+ List remoteRepositories = Collections.singletonList( artifactRepository );
+
+ VersionRange versionRange;
try
{
- MavenMetadataSource metadataSource = (MavenMetadataSource) lookup( ArtifactMetadataSource.ROLE );
+ versionRange = VersionRange.createFromVersionSpec( version );
+ }
+ catch ( InvalidVersionSpecificationException e )
+ {
+ throw new BuildException( "Unable to get extension '" +
+ ArtifactUtils.versionlessKey( WAGON_GROUP_ID, artifactId ) + "' because version '" + version +
+ " is invalid: " + e.getMessage(), e );
+ }
- ArtifactResolver resolver = (ArtifactResolver) lookup( ArtifactResolver.ROLE );
- ArtifactRepository artifactRepository = createRemoteArtifactRepository( getDefaultRemoteRepository() );
- List remoteRepositories = Collections.singletonList( artifactRepository );
- try
- {
- ArtifactFactory factory = (ArtifactFactory) lookup( ArtifactFactory.ROLE );
- VersionRange versionRange = VersionRange.createFromVersionSpec( version );
- Artifact providerArtifact = factory.createExtensionArtifact( "org.apache.maven.wagon", artifactId,
- versionRange );
- ArtifactResolutionResult result = resolver.resolveTransitively( Collections
- .singleton( providerArtifact ), createArtifact( createDummyPom() ),
- createLocalArtifactRepository(),
- remoteRepositories, metadataSource,
- null );
-
- log( "Installing provider: " + providerArtifact );
-
- for ( Iterator i = result.getArtifacts().iterator(); i.hasNext(); )
- {
- Artifact a = (Artifact) i.next();
- getEmbedder().getContainer().addJarResource( a.getFile() );
- }
- }
- catch ( ArtifactResolutionException e )
- {
- throw new BuildException( "Unable to locate wagon provider in remote repository", e );
- }
- catch ( PlexusContainerException e )
- {
- throw new BuildException( "Unable to locate wagon provider in remote repository", e );
- }
- catch ( InvalidVersionSpecificationException e )
- {
- throw new BuildException( "Unable to locate wagon provider in remote repository", e );
- }
- catch ( ArtifactNotFoundException e )
+ ArtifactFactory factory = (ArtifactFactory) lookup( ArtifactFactory.ROLE );
+ Artifact providerArtifact = factory.createExtensionArtifact( WAGON_GROUP_ID, artifactId, versionRange );
+
+ ArtifactResolutionResult result;
+ try
+ {
+ result = resolver.resolveTransitively( Collections.singleton( providerArtifact ),
+ createArtifact( createDummyPom() ), createLocalArtifactRepository(),
+ remoteRepositories, metadataSource, null );
+ }
+ catch ( ArtifactResolutionException e )
+ {
+ throw new BuildException( "Unable to locate wagon provider in remote repository", e );
+ }
+ catch ( ArtifactNotFoundException e )
+ {
+ throw new BuildException( "Unable to locate wagon provider in remote repository", e );
+ }
+
+ log( "Installing provider: " + providerArtifact );
+
+ try
+ {
+ for ( Iterator i = result.getArtifacts().iterator(); i.hasNext(); )
{
- throw new BuildException( "Unable to locate wagon provider in remote repository", e );
+ Artifact a = (Artifact) i.next();
+ getEmbedder().getContainer().addJarResource( a.getFile() );
}
}
- catch ( BuildException e )
+ catch ( PlexusContainerException e )
{
- diagnoseError( e );
-
- throw e;
+ throw new BuildException( "Unable to locate wagon provider in remote repository", e );
}
-
}
+
}
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=320668&r1=320667&r2=320668&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 Wed Oct 12 22:30:22 2005
@@ -268,7 +268,7 @@
/**
* Registers POMPropertyHelper as a property interceptor
*/
- public void execute()
+ protected void doExecute()
{
ArtifactRepository localRepo = createLocalArtifactRepository();
MavenProjectBuilder projectBuilder = (MavenProjectBuilder) lookup( MavenProjectBuilder.ROLE );
Modified: maven/components/trunk/maven-artifact-manager/src/main/java/org/apache/maven/artifact/resolver/DefaultArtifactResolver.java
URL: http://svn.apache.org/viewcvs/maven/components/trunk/maven-artifact-manager/src/main/java/org/apache/maven/artifact/resolver/DefaultArtifactResolver.java?rev=320668&r1=320667&r2=320668&view=diff
==============================================================================
--- maven/components/trunk/maven-artifact-manager/src/main/java/org/apache/maven/artifact/resolver/DefaultArtifactResolver.java (original)
+++ maven/components/trunk/maven-artifact-manager/src/main/java/org/apache/maven/artifact/resolver/DefaultArtifactResolver.java Wed Oct 12 22:30:22 2005
@@ -117,9 +117,7 @@
{
if ( !wagonManager.isOnline() )
{
- getLogger().debug( "System is offline. Cannot resolve artifact: " + artifact + "." );
-
- return;
+ throw new ArtifactResolutionException( "System is offline.", artifact );
}
try
Modified: maven/components/trunk/maven-artifact/src/main/java/org/apache/maven/artifact/resolver/AbstractArtifactResolutionException.java
URL: http://svn.apache.org/viewcvs/maven/components/trunk/maven-artifact/src/main/java/org/apache/maven/artifact/resolver/AbstractArtifactResolutionException.java?rev=320668&r1=320667&r2=320668&view=diff
==============================================================================
--- maven/components/trunk/maven-artifact/src/main/java/org/apache/maven/artifact/resolver/AbstractArtifactResolutionException.java (original)
+++ maven/components/trunk/maven-artifact/src/main/java/org/apache/maven/artifact/resolver/AbstractArtifactResolutionException.java Wed Oct 12 22:30:22 2005
@@ -133,10 +133,10 @@
sb.append( "Path to dependency: " );
sb.append( LS );
int num = 1;
- for ( Iterator i = path.iterator(); i.hasNext(); )
+ for ( Iterator i = path.iterator(); i.hasNext(); num++ )
{
sb.append( "\t" );
- sb.append( num++ );
+ sb.append( num );
sb.append( ") " );
sb.append( i.next() );
sb.append( LS );
Modified: maven/components/trunk/maven-artifact/src/main/java/org/apache/maven/artifact/resolver/ArtifactResolutionException.java
URL: http://svn.apache.org/viewcvs/maven/components/trunk/maven-artifact/src/main/java/org/apache/maven/artifact/resolver/ArtifactResolutionException.java?rev=320668&r1=320667&r2=320668&view=diff
==============================================================================
--- maven/components/trunk/maven-artifact/src/main/java/org/apache/maven/artifact/resolver/ArtifactResolutionException.java (original)
+++ maven/components/trunk/maven-artifact/src/main/java/org/apache/maven/artifact/resolver/ArtifactResolutionException.java Wed Oct 12 22:30:22 2005
@@ -33,6 +33,12 @@
super( message, groupId, artifactId, version, type, remoteRepositories, path, t );
}
+ public ArtifactResolutionException( String message, String groupId, String artifactId, String version, String type,
+ Throwable t )
+ {
+ super( message, groupId, artifactId, version, type, null, null, t );
+ }
+
public ArtifactResolutionException( String message, Artifact artifact )
{
super( message, artifact );
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=320668&r1=320667&r2=320668&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 Wed Oct 12 22:30:22 2005
@@ -258,11 +258,9 @@
catch ( CyclicDependencyException e )
{
// would like to throw this, but we have crappy stuff in the repo
- // no logger to use here either just now
- // TODO: should the remoteRepositories list be null here?!
fireEvent( ResolutionListener.OMIT_FOR_CYCLE, listeners,
- new ResolutionNode( e.getArtifact(), null, child ) );
+ new ResolutionNode( e.getArtifact(), remoteRepositories, child ) );
}
catch ( ArtifactMetadataRetrievalException e )
{
Added: maven/components/trunk/maven-core/src/main/java/org/apache/maven/BuildFailureException.java
URL: http://svn.apache.org/viewcvs/maven/components/trunk/maven-core/src/main/java/org/apache/maven/BuildFailureException.java?rev=320668&view=auto
==============================================================================
--- maven/components/trunk/maven-core/src/main/java/org/apache/maven/BuildFailureException.java (added)
+++ maven/components/trunk/maven-core/src/main/java/org/apache/maven/BuildFailureException.java Wed Oct 12 22:30:22 2005
@@ -0,0 +1,32 @@
+package org.apache.maven;
+
+/*
+ * 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.
+ */
+
+/**
+ * One or more builds failed.
+ *
+ * @author <a href="mailto:brett@apache.org">Brett Porter</a>
+ * @version $Id$
+ */
+public class BuildFailureException
+ extends Throwable
+{
+ public BuildFailureException( String message )
+ {
+ super( message );
+ }
+}
Propchange: maven/components/trunk/maven-core/src/main/java/org/apache/maven/BuildFailureException.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/components/trunk/maven-core/src/main/java/org/apache/maven/BuildFailureException.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Modified: maven/components/trunk/maven-core/src/main/java/org/apache/maven/DefaultMaven.java
URL: http://svn.apache.org/viewcvs/maven/components/trunk/maven-core/src/main/java/org/apache/maven/DefaultMaven.java?rev=320668&r1=320667&r2=320668&view=diff
==============================================================================
--- maven/components/trunk/maven-core/src/main/java/org/apache/maven/DefaultMaven.java (original)
+++ maven/components/trunk/maven-core/src/main/java/org/apache/maven/DefaultMaven.java Wed Oct 12 22:30:22 2005
@@ -38,7 +38,7 @@
import org.apache.maven.project.MavenProject;
import org.apache.maven.project.MavenProjectBuilder;
import org.apache.maven.project.ProjectBuildingException;
-import org.apache.maven.reactor.ReactorException;
+import org.apache.maven.reactor.MavenExecutionException;
import org.apache.maven.settings.Mirror;
import org.apache.maven.settings.Proxy;
import org.apache.maven.settings.Server;
@@ -88,7 +88,7 @@
protected LifecycleExecutor lifecycleExecutor;
protected PlexusContainer container;
-
+
protected ErrorDiagnostics errorDiagnostics;
protected RuntimeInformation runtimeInformation;
@@ -104,7 +104,7 @@
// ----------------------------------------------------------------------
public MavenExecutionResponse execute( MavenExecutionRequest request )
- throws ReactorException, SettingsConfigurationException
+ throws SettingsConfigurationException, MavenExecutionException
{
if ( request.getSettings().isOffline() )
{
@@ -120,7 +120,7 @@
}
catch ( ComponentLookupException e )
{
- throw new ReactorException( "Cannot retrieve WagonManager in order to set offline mode.", e );
+ throw new MavenExecutionException( "Cannot retrieve WagonManager in order to set offline mode.", e );
}
finally
{
@@ -141,11 +141,11 @@
}
catch ( ComponentLookupException e )
{
- throw new ReactorException( "Unable to configure Maven for execution", e );
+ throw new MavenExecutionException( "Unable to configure Maven for execution", e );
}
catch ( ComponentLifecycleException e )
{
- throw new ReactorException( "Unable to configure Maven for execution", e );
+ throw new MavenExecutionException( "Unable to configure Maven for execution", e );
}
EventDispatcher dispatcher = request.getEventDispatcher();
@@ -182,7 +182,7 @@
}
catch ( IOException e )
{
- throw new ReactorException( "Error processing projects for the reactor: ", e );
+ throw new MavenExecutionException( "Error processing projects for the reactor: ", e );
}
catch ( ArtifactResolutionException e )
{
@@ -225,87 +225,77 @@
}
}
+ MavenSession session = createSession( request, rm );
+
+ session.setUsingPOMsFromFilesystem( foundProjects );
+
try
{
- MavenSession session = createSession( request, rm );
-
- session.setUsingPOMsFromFilesystem( foundProjects );
+ MavenExecutionResponse response = lifecycleExecutor.execute( session, rm, dispatcher );
- try
+ // TODO: is this perhaps more appropriate in the CLI?
+ if ( response.isExecutionFailure() )
{
- MavenExecutionResponse response = lifecycleExecutor.execute( session, rm, dispatcher );
+ dispatcher.dispatchError( event, request.getBaseDirectory(), response.getException() );
- // TODO: is this perhaps more appropriate in the CLI?
- if ( response.isExecutionFailure() )
- {
- dispatcher.dispatchError( event, request.getBaseDirectory(), response.getException() );
+ // TODO: yuck! Revisit when cleaning up the exception handling from the top down
+ Throwable exception = response.getException();
- // TODO: yuck! Revisit when cleaning up the exception handling from the top down
- Throwable exception = response.getException();
+ // TODO: replace all handling by buildfailureexception/mavenexecutionexception or lifecycleexecutionexception
+ if ( exception instanceof BuildFailureException )
+ {
+ logFailure( response, rm, exception, null );
+ }
+ else if ( exception instanceof MojoFailureException )
+ {
+ MojoFailureException e = (MojoFailureException) exception;
- if ( ReactorManager.FAIL_AT_END.equals( rm.getFailureBehavior() ) &&
- exception instanceof ReactorException )
- {
- logFailure( response, rm, exception, null );
- }
- else if ( exception instanceof MojoFailureException )
+ logFailure( response, rm, e, e.getLongMessage() );
+ }
+ else if ( exception instanceof MojoExecutionException )
+ {
+ // TODO: replace by above
+ if ( exception.getCause() == null )
{
- MojoFailureException e = (MojoFailureException) exception;
+ MojoExecutionException e = (MojoExecutionException) exception;
logFailure( response, rm, e, e.getLongMessage() );
}
- else if ( exception instanceof MojoExecutionException )
- {
- // TODO: replace by above
- if ( exception.getCause() == null )
- {
- MojoExecutionException e = (MojoExecutionException) exception;
-
- logFailure( response, rm, e, e.getLongMessage() );
- }
- else
- {
- // TODO: throw exceptions like this, so "failures" are just that
- logError( response );
- }
- }
- else if ( exception instanceof ArtifactNotFoundException )
- {
- logFailure( response, rm, exception, null );
- }
else
{
- // TODO: this should be a "FATAL" exception, reported to the
- // developers - however currently a LOT of
- // "user" errors fall through the cracks (like invalid POMs, as
- // one example)
+ // TODO: throw exceptions like this, so "failures" are just that
logError( response );
}
-
- return response;
+ }
+ else if ( exception instanceof ArtifactNotFoundException )
+ {
+ logFailure( response, rm, exception, null );
}
else
{
- logSuccess( response, rm );
+ // TODO: this should be a "FATAL" exception, reported to the
+ // developers - however currently a LOT of
+ // "user" errors fall through the cracks (like invalid POMs, as
+ // one example)
+ logError( response );
}
}
- catch ( LifecycleExecutionException e )
+ else
{
- logFatal( e );
-
- throw new ReactorException( "Error executing project within the reactor", e );
+ logSuccess( response, rm );
}
dispatcher.dispatchEnd( event, request.getBaseDirectory() );
- // TODO: not really satisfactory
- return null;
+ return response;
}
- catch ( ReactorException e )
+ catch ( LifecycleExecutionException e )
{
+ logFatal( e );
+
dispatcher.dispatchError( event, request.getBaseDirectory(), e );
- throw e;
+ throw new MavenExecutionException( "Error executing project within the reactor", e );
}
}
@@ -418,8 +408,8 @@
private List collectProjects( List files, ArtifactRepository localRepository, boolean recursive, Settings settings,
ProfileManager globalProfileManager, boolean isRoot )
- throws ProjectBuildingException, ReactorException, IOException, ArtifactResolutionException,
- ProfileActivationException
+ throws ArtifactResolutionException, ProjectBuildingException, ProfileActivationException,
+ MavenExecutionException
{
List projects = new ArrayList( files.size() );
@@ -445,10 +435,17 @@
if ( project.getPrerequisites() != null && project.getPrerequisites().getMaven() != null )
{
DefaultArtifactVersion version = new DefaultArtifactVersion( project.getPrerequisites().getMaven() );
- if ( runtimeInformation.getApplicationVersion().compareTo( version ) < 0 )
+ try
+ {
+ if ( runtimeInformation.getApplicationVersion().compareTo( version ) < 0 )
+ {
+ throw new ProjectBuildingException( project.getId(), "Unable to build project '" +
+ project.getFile() + "; it requires Maven version " + version.toString() );
+ }
+ }
+ catch ( IOException e )
{
- throw new ProjectBuildingException( project.getId(), "Unable to build project '" + project.getFile() +
- "; it requires Maven version " + version.toString() );
+ throw new MavenExecutionException( "Unable to get Maven application version", e );
}
}
@@ -479,8 +476,8 @@
moduleFiles.add( moduleFile );
}
- List collectedProjects = collectProjects( moduleFiles, localRepository, recursive, settings,
- globalProfileManager, false );
+ List collectedProjects =
+ collectProjects( moduleFiles, localRepository, recursive, settings, globalProfileManager, false );
projects.addAll( collectedProjects );
project.setCollectedProjects( collectedProjects );
}
@@ -498,8 +495,8 @@
{
if ( pom.length() == 0 )
{
- throw new ProjectBuildingException(
- "unknown", "The file " + pom.getAbsolutePath() + " you specified has zero length." );
+ throw new ProjectBuildingException( "unknown", "The file " + pom.getAbsolutePath() +
+ " you specified has zero length." );
}
}
Modified: maven/components/trunk/maven-core/src/main/java/org/apache/maven/Maven.java
URL: http://svn.apache.org/viewcvs/maven/components/trunk/maven-core/src/main/java/org/apache/maven/Maven.java?rev=320668&r1=320667&r2=320668&view=diff
==============================================================================
--- maven/components/trunk/maven-core/src/main/java/org/apache/maven/Maven.java (original)
+++ maven/components/trunk/maven-core/src/main/java/org/apache/maven/Maven.java Wed Oct 12 22:30:22 2005
@@ -18,7 +18,7 @@
import org.apache.maven.execution.MavenExecutionRequest;
import org.apache.maven.execution.MavenExecutionResponse;
-import org.apache.maven.reactor.ReactorException;
+import org.apache.maven.reactor.MavenExecutionException;
/**
* @author <a href="mailto:jason@maven.org">Jason van Zyl </a>
@@ -33,5 +33,5 @@
String RELEASE_POMv4 = "release-pom.xml";
MavenExecutionResponse execute( MavenExecutionRequest request )
- throws ReactorException, SettingsConfigurationException;
+ throws MavenExecutionException, SettingsConfigurationException;
}
Modified: maven/components/trunk/maven-core/src/main/java/org/apache/maven/cli/MavenCli.java
URL: http://svn.apache.org/viewcvs/maven/components/trunk/maven-core/src/main/java/org/apache/maven/cli/MavenCli.java?rev=320668&r1=320667&r2=320668&view=diff
==============================================================================
--- maven/components/trunk/maven-core/src/main/java/org/apache/maven/cli/MavenCli.java (original)
+++ maven/components/trunk/maven-core/src/main/java/org/apache/maven/cli/MavenCli.java Wed Oct 12 22:30:22 2005
@@ -41,7 +41,7 @@
import org.apache.maven.plugin.Mojo;
import org.apache.maven.profiles.DefaultProfileManager;
import org.apache.maven.profiles.ProfileManager;
-import org.apache.maven.reactor.ReactorException;
+import org.apache.maven.reactor.MavenExecutionException;
import org.apache.maven.settings.MavenSettingsBuilder;
import org.apache.maven.settings.RuntimeInfo;
import org.apache.maven.settings.Settings;
@@ -250,7 +250,7 @@
{
response = maven.execute( request );
}
- catch ( ReactorException e )
+ catch ( MavenExecutionException e )
{
showFatalError( "Error executing Maven for a project", e, showErrors );
return 1;
@@ -461,11 +461,11 @@
{
// TODO: release
// TODO: something in plexus to show all active hooks?
- ArtifactRepositoryLayout repositoryLayout = (ArtifactRepositoryLayout) embedder.lookup(
- ArtifactRepositoryLayout.ROLE, "default" );
+ ArtifactRepositoryLayout repositoryLayout =
+ (ArtifactRepositoryLayout) embedder.lookup( ArtifactRepositoryLayout.ROLE, "default" );
- ArtifactRepositoryFactory artifactRepositoryFactory = (ArtifactRepositoryFactory) embedder.lookup(
- ArtifactRepositoryFactory.ROLE );
+ ArtifactRepositoryFactory artifactRepositoryFactory =
+ (ArtifactRepositoryFactory) embedder.lookup( ArtifactRepositoryFactory.ROLE );
String url = settings.getLocalRepository();
@@ -677,7 +677,7 @@
"Synonym for " + FORCE_PLUGIN_UPDATES ).create( FORCE_PLUGIN_UPDATES2 ) );
options.addOption( OptionBuilder.withLongOpt( "no-plugin-updates" ).withDescription(
"Suppress upToDate check for any relevant registered plugins" ).create( SUPPRESS_PLUGIN_UPDATES ) );
-
+
options.addOption( OptionBuilder.withLongOpt( "no-plugin-registry" ).withDescription(
"Don't use ~/.m2/plugin-registry.xml for plugin versions" ).create( SUPPRESS_PLUGIN_REGISTRY ) );
Modified: maven/components/trunk/maven-core/src/main/java/org/apache/maven/extension/DefaultExtensionManager.java
URL: http://svn.apache.org/viewcvs/maven/components/trunk/maven-core/src/main/java/org/apache/maven/extension/DefaultExtensionManager.java?rev=320668&r1=320667&r2=320668&view=diff
==============================================================================
--- maven/components/trunk/maven-core/src/main/java/org/apache/maven/extension/DefaultExtensionManager.java (original)
+++ maven/components/trunk/maven-core/src/main/java/org/apache/maven/extension/DefaultExtensionManager.java Wed Oct 12 22:30:22 2005
@@ -24,7 +24,6 @@
import org.apache.maven.artifact.resolver.ArtifactResolutionException;
import org.apache.maven.artifact.resolver.ArtifactResolutionResult;
import org.apache.maven.artifact.resolver.ArtifactResolver;
-import org.apache.maven.artifact.versioning.InvalidVersionSpecificationException;
import org.apache.maven.model.Extension;
import org.apache.maven.project.MavenProject;
import org.codehaus.plexus.PlexusConstants;
@@ -53,8 +52,7 @@
private PlexusContainer container;
public void addExtension( Extension extension, MavenProject project, ArtifactRepository localRepository )
- throws ArtifactResolutionException, PlexusContainerException, InvalidVersionSpecificationException,
- ArtifactNotFoundException
+ throws ArtifactResolutionException, PlexusContainerException, ArtifactNotFoundException
{
String extensionId = ArtifactUtils.versionlessKey( extension.getGroupId(), extension.getArtifactId() );
Modified: maven/components/trunk/maven-core/src/main/java/org/apache/maven/extension/ExtensionManager.java
URL: http://svn.apache.org/viewcvs/maven/components/trunk/maven-core/src/main/java/org/apache/maven/extension/ExtensionManager.java?rev=320668&r1=320667&r2=320668&view=diff
==============================================================================
--- maven/components/trunk/maven-core/src/main/java/org/apache/maven/extension/ExtensionManager.java (original)
+++ maven/components/trunk/maven-core/src/main/java/org/apache/maven/extension/ExtensionManager.java Wed Oct 12 22:30:22 2005
@@ -19,7 +19,6 @@
import org.apache.maven.artifact.repository.ArtifactRepository;
import org.apache.maven.artifact.resolver.ArtifactNotFoundException;
import org.apache.maven.artifact.resolver.ArtifactResolutionException;
-import org.apache.maven.artifact.versioning.InvalidVersionSpecificationException;
import org.apache.maven.model.Extension;
import org.apache.maven.project.MavenProject;
import org.codehaus.plexus.PlexusContainerException;
@@ -33,6 +32,5 @@
public interface ExtensionManager
{
void addExtension( Extension extension, MavenProject project, ArtifactRepository localRepository )
- throws ArtifactResolutionException, PlexusContainerException, InvalidVersionSpecificationException,
- ArtifactNotFoundException;
+ throws ArtifactResolutionException, PlexusContainerException, ArtifactNotFoundException;
}