Author: jvanzyl
Date: Sat Mar 10 16:48:53 2007
New Revision: 516820
URL: http://svn.apache.org/viewvc?view=rev&rev=516820
Log:
o testing repeatedly with an empty repository
Modified:
maven/components/trunk/build.properties
maven/components/trunk/maven-artifact-manager/src/main/java/org/apache/maven/artifact/manager/DefaultWagonManager.java
maven/components/trunk/maven-artifact-manager/src/main/java/org/apache/maven/artifact/manager/WagonManager.java
maven/components/trunk/maven-artifact-manager/src/main/java/org/apache/maven/artifact/resolver/DefaultArtifactResolver.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/plugin/version/DefaultPluginVersionManager.java
maven/components/trunk/maven-core/src/main/resources/META-INF/plexus/components.xml
maven/components/trunk/maven-embedder/pom.xml
maven/components/trunk/maven-embedder/src/main/java/org/apache/maven/embedder/MavenEmbedder.java
maven/components/trunk/maven-embedder/src/main/java/org/apache/maven/embedder/execution/DefaultMavenExecutionRequestDefaultsPopulator.java
maven/components/trunk/maven-embedder/src/test/embedder-test-project/pom.xml
maven/components/trunk/maven-embedder/src/test/java/org/apache/maven/embedder/MavenEmbedderTest.java
maven/components/trunk/maven-embedder/src/test/resources/pom.xml
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/artifact/MavenMetadataSource.java
maven/components/trunk/pom.xml
Modified: maven/components/trunk/build.properties
URL:
http://svn.apache.org/viewvc/maven/components/trunk/build.properties?view=diff&rev=516820&r1=516819&r2=516820
==============================================================================
--- maven/components/trunk/build.properties (original)
+++ maven/components/trunk/build.properties Sat Mar 10 16:48:53 2007
@@ -18,7 +18,7 @@
classworlds.version=1.2-alpha-7
plexus.version=1.0-alpha-19
plexus-archiver.version=1.0-alpha-8
-plexus-utils.version=1.4
+plexus-utils.version=1.4.1
plexus-interactivity-api.version=1.0-alpha-6-SNAPSHOT
commons-cli.version=1.0
commons-lang.version=2.1
Modified:
maven/components/trunk/maven-artifact-manager/src/main/java/org/apache/maven/artifact/manager/DefaultWagonManager.java
URL:
http://svn.apache.org/viewvc/maven/components/trunk/maven-artifact-manager/src/main/java/org/apache/maven/artifact/manager/DefaultWagonManager.java?view=diff&rev=516820&r1=516819&r2=516820
==============================================================================
---
maven/components/trunk/maven-artifact-manager/src/main/java/org/apache/maven/artifact/manager/DefaultWagonManager.java
(original)
+++
maven/components/trunk/maven-artifact-manager/src/main/java/org/apache/maven/artifact/manager/DefaultWagonManager.java
Sat Mar 10 16:48:53 2007
@@ -328,6 +328,7 @@
else
{
getLogger().debug( "Trying repository " + repository.getId() );
+
getRemoteFile( repository, artifact.getFile(), remotePath,
downloadMonitor, policy.getChecksumPolicy(),
false );
getLogger().debug( " Artifact resolved" );
@@ -785,6 +786,20 @@
public void setInteractive( boolean interactive )
{
this.interactive = interactive;
+ }
+
+ public void findAndRegisterWagons( PlexusContainer container )
+ {
+ try
+ {
+ Map wagons = container.lookupMap( Wagon.ROLE );
+
+ registerWagons( wagons.keySet(), container );
+ }
+ catch ( ComponentLookupException e )
+ {
+ // no wagons found in the extension
+ }
}
public void registerWagons( Collection wagons, PlexusContainer
extensionContainer )
Modified:
maven/components/trunk/maven-artifact-manager/src/main/java/org/apache/maven/artifact/manager/WagonManager.java
URL:
http://svn.apache.org/viewvc/maven/components/trunk/maven-artifact-manager/src/main/java/org/apache/maven/artifact/manager/WagonManager.java?view=diff&rev=516820&r1=516819&r2=516820
==============================================================================
---
maven/components/trunk/maven-artifact-manager/src/main/java/org/apache/maven/artifact/manager/WagonManager.java
(original)
+++
maven/components/trunk/maven-artifact-manager/src/main/java/org/apache/maven/artifact/manager/WagonManager.java
Sat Mar 10 16:48:53 2007
@@ -117,4 +117,6 @@
void setInteractive( boolean interactive );
void registerWagons( Collection wagons, PlexusContainer extensionContainer
);
+
+ void findAndRegisterWagons( PlexusContainer container );
}
Modified:
maven/components/trunk/maven-artifact-manager/src/main/java/org/apache/maven/artifact/resolver/DefaultArtifactResolver.java
URL:
http://svn.apache.org/viewvc/maven/components/trunk/maven-artifact-manager/src/main/java/org/apache/maven/artifact/resolver/DefaultArtifactResolver.java?view=diff&rev=516820&r1=516819&r2=516820
==============================================================================
---
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
Sat Mar 10 16:48:53 2007
@@ -295,7 +295,8 @@
}
catch ( ArtifactNotFoundException anfe )
{
- getLogger().debug( anfe.getMessage() );
+ getLogger().debug( anfe.getMessage(), anfe );
+
missingArtifacts.add( node.getArtifact() );
}
}
@@ -303,14 +304,6 @@
if ( missingArtifacts.size() > 0 )
{
throw new MultipleArtifactsNotFoundException( originatingArtifact,
missingArtifacts, remoteRepositories );
-// String message = "required artifacts missing:\n";
-// for ( Iterator i = missingArtifacts.iterator(); i.hasNext(); )
-// {
-// Artifact missingArtifact = (Artifact) i.next();
-// message += " " + missingArtifact.getId() + "\n";
-// }
-// message += "\nfor the artifact:";
-// throw new ArtifactResolutionException( message,
originatingArtifact, remoteRepositories );
}
return artifactResolutionResult;
Modified:
maven/components/trunk/maven-core/src/main/java/org/apache/maven/extension/DefaultExtensionManager.java
URL:
http://svn.apache.org/viewvc/maven/components/trunk/maven-core/src/main/java/org/apache/maven/extension/DefaultExtensionManager.java?view=diff&rev=516820&r1=516819&r2=516820
==============================================================================
---
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
Sat Mar 10 16:48:53 2007
@@ -158,16 +158,7 @@
public void registerWagons()
{
- try
- {
- Map wagons = container.lookupMap( Wagon.ROLE );
-
- wagonManager.registerWagons( wagons.keySet(), container );
- }
- catch ( ComponentLookupException e )
- {
- // no wagons found in the extension
- }
+ wagonManager.findAndRegisterWagons( container );
}
public void contextualize( Context context )
Modified:
maven/components/trunk/maven-core/src/main/java/org/apache/maven/plugin/version/DefaultPluginVersionManager.java
URL:
http://svn.apache.org/viewvc/maven/components/trunk/maven-core/src/main/java/org/apache/maven/plugin/version/DefaultPluginVersionManager.java?view=diff&rev=516820&r1=516819&r2=516820
==============================================================================
---
maven/components/trunk/maven-core/src/main/java/org/apache/maven/plugin/version/DefaultPluginVersionManager.java
(original)
+++
maven/components/trunk/maven-core/src/main/java/org/apache/maven/plugin/version/DefaultPluginVersionManager.java
Sat Mar 10 16:48:53 2007
@@ -35,12 +35,9 @@
import org.apache.maven.model.Plugin;
import org.apache.maven.model.ReportPlugin;
import org.apache.maven.plugin.InvalidPluginException;
-import org.apache.maven.plugin.registry.MavenPluginRegistryBuilder;
-import org.apache.maven.plugin.registry.PluginRegistry;
import org.apache.maven.project.MavenProject;
import org.apache.maven.project.MavenProjectBuilder;
import org.apache.maven.project.ProjectBuildingException;
-import org.codehaus.plexus.components.interactivity.InputHandler;
import org.codehaus.plexus.logging.AbstractLogEnabled;
import org.codehaus.plexus.util.StringUtils;
@@ -53,17 +50,10 @@
extends AbstractLogEnabled
implements PluginVersionManager
{
- private MavenPluginRegistryBuilder mavenPluginRegistryBuilder;
-
private ArtifactFactory artifactFactory;
- private InputHandler inputHandler;
-
private ArtifactMetadataSource artifactMetadataSource;
- // TODO: [jc] Revisit to remove this piece of state. PLUGIN REGISTRY MAY
BE UPDATED ON DISK OUT-OF-PROCESS!
- private PluginRegistry pluginRegistry;
-
private MavenProjectBuilder mavenProjectBuilder;
private RuntimeInformation runtimeInformation;
@@ -118,21 +108,12 @@
}
}
- // we're NEVER going to persist POM-derived plugin versions.
- String updatedVersion = null;
-
// third pass...we're always checking for latest install/deploy, so
retrieve the version for LATEST metadata and
// also set that resolved version as the <useVersion/> in settings.xml.
if ( StringUtils.isEmpty( version ) )
{
// 1. resolve the version to be used
version = resolveMetaVersion( groupId, artifactId, project,
localRepository, Artifact.LATEST_VERSION );
-
- if ( version != null )
- {
- // 2. Set the updatedVersion so the user will be prompted
whether to make this version permanent.
- updatedVersion = version;
- }
}
// final pass...retrieve the version for RELEASE and also set that
resolved version as the <useVersion/>
@@ -141,12 +122,6 @@
{
// 1. resolve the version to be used
version = resolveMetaVersion( groupId, artifactId, project,
localRepository, Artifact.RELEASE_VERSION );
-
- if ( version != null )
- {
- // 2. Set the updatedVersion so the user will be prompted
whether to make this version permanent.
- updatedVersion = version;
- }
}
// if we're still empty here, and the current project matches the
plugin in question, use the current project's
Modified:
maven/components/trunk/maven-core/src/main/resources/META-INF/plexus/components.xml
URL:
http://svn.apache.org/viewvc/maven/components/trunk/maven-core/src/main/resources/META-INF/plexus/components.xml?view=diff&rev=516820&r1=516819&r2=516820
==============================================================================
---
maven/components/trunk/maven-core/src/main/resources/META-INF/plexus/components.xml
(original)
+++
maven/components/trunk/maven-core/src/main/resources/META-INF/plexus/components.xml
Sat Mar 10 16:48:53 2007
@@ -611,14 +611,7 @@
<role-hint>default</role-hint>
</requirement>
<requirement>
-
<role>org.apache.maven.plugin.registry.MavenPluginRegistryBuilder</role>
- </requirement>
- <requirement>
<role>org.apache.maven.artifact.factory.ArtifactFactory</role>
- </requirement>
- <requirement>
-
<role>org.codehaus.plexus.components.interactivity.InputHandler</role>
- <role-hint>default</role-hint>
</requirement>
<requirement>
<role>org.apache.maven.project.MavenProjectBuilder</role>
Modified: maven/components/trunk/maven-embedder/pom.xml
URL:
http://svn.apache.org/viewvc/maven/components/trunk/maven-embedder/pom.xml?view=diff&rev=516820&r1=516819&r2=516820
==============================================================================
--- maven/components/trunk/maven-embedder/pom.xml (original)
+++ maven/components/trunk/maven-embedder/pom.xml Sat Mar 10 16:48:53 2007
@@ -86,6 +86,7 @@
<exclude>classworlds:classworlds</exclude>
<exclude>junit:junit</exclude>
<exclude>jmock:jmock</exclude>
+ <exclude>xml-apis:xml-apis</exclude>
</excludes>
<!--
<dependenciesToHide>
@@ -128,6 +129,18 @@
<groupId>commons-logging</groupId>
</exclusion>
</exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.maven.wagon</groupId>
+ <artifactId>wagon-http-lightweight</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.maven.wagon</groupId>
+ <artifactId>wagon-ssh</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.maven.wagon</groupId>
+ <artifactId>wagon-ssh-external</artifactId>
</dependency>
</dependencies>
<distributionManagement>
Modified:
maven/components/trunk/maven-embedder/src/main/java/org/apache/maven/embedder/MavenEmbedder.java
URL:
http://svn.apache.org/viewvc/maven/components/trunk/maven-embedder/src/main/java/org/apache/maven/embedder/MavenEmbedder.java?view=diff&rev=516820&r1=516819&r2=516820
==============================================================================
---
maven/components/trunk/maven-embedder/src/main/java/org/apache/maven/embedder/MavenEmbedder.java
(original)
+++
maven/components/trunk/maven-embedder/src/main/java/org/apache/maven/embedder/MavenEmbedder.java
Sat Mar 10 16:48:53 2007
@@ -427,10 +427,14 @@
{
request = defaultsPopulator.populateDefaults( request, this );
//mkleint: copied from DefaultLifecycleExecutor
+
project = readProject( new File( request.getPomFile() ) );
+
Map handlers = findArtifactTypeHandlers( project );
+
//is this necessary in this context, I doubt it..mkleint
artifactHandlerManager.addHandlers( handlers );
+
project = mavenProjectBuilder.buildWithDependencies( new File(
request.getPomFile() ),
request.getLocalRepository(), profileManager,
request.getTransferListener() );
Modified:
maven/components/trunk/maven-embedder/src/main/java/org/apache/maven/embedder/execution/DefaultMavenExecutionRequestDefaultsPopulator.java
URL:
http://svn.apache.org/viewvc/maven/components/trunk/maven-embedder/src/main/java/org/apache/maven/embedder/execution/DefaultMavenExecutionRequestDefaultsPopulator.java?view=diff&rev=516820&r1=516819&r2=516820
==============================================================================
---
maven/components/trunk/maven-embedder/src/main/java/org/apache/maven/embedder/execution/DefaultMavenExecutionRequestDefaultsPopulator.java
(original)
+++
maven/components/trunk/maven-embedder/src/main/java/org/apache/maven/embedder/execution/DefaultMavenExecutionRequestDefaultsPopulator.java
Sat Mar 10 16:48:53 2007
@@ -113,6 +113,8 @@
}
else
{
+ wagonManager.findAndRegisterWagons( container );
+
wagonManager.setInteractive( request.isInteractiveMode() );
wagonManager.setDownloadMonitor( request.getTransferListener() );
Modified:
maven/components/trunk/maven-embedder/src/test/embedder-test-project/pom.xml
URL:
http://svn.apache.org/viewvc/maven/components/trunk/maven-embedder/src/test/embedder-test-project/pom.xml?view=diff&rev=516820&r1=516819&r2=516820
==============================================================================
---
maven/components/trunk/maven-embedder/src/test/embedder-test-project/pom.xml
(original)
+++
maven/components/trunk/maven-embedder/src/test/embedder-test-project/pom.xml
Sat Mar 10 16:48:53 2007
@@ -17,25 +17,6 @@
under the License.
-->
-<!--
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements. See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership. The ASF licenses this file
-to you 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 xmlns="http://maven.apache.org/POM/4.0.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/maven-v4_0_0.xsd";>
<modelVersion>4.0.0</modelVersion>
Modified:
maven/components/trunk/maven-embedder/src/test/java/org/apache/maven/embedder/MavenEmbedderTest.java
URL:
http://svn.apache.org/viewvc/maven/components/trunk/maven-embedder/src/test/java/org/apache/maven/embedder/MavenEmbedderTest.java?view=diff&rev=516820&r1=516819&r2=516820
==============================================================================
---
maven/components/trunk/maven-embedder/src/test/java/org/apache/maven/embedder/MavenEmbedderTest.java
(original)
+++
maven/components/trunk/maven-embedder/src/test/java/org/apache/maven/embedder/MavenEmbedderTest.java
Sat Mar 10 16:48:53 2007
@@ -247,9 +247,21 @@
throws Exception
{
MavenExecutionRequest request = new
DefaultMavenExecutionRequest().setShowErrors( true )
- .setPomFile( getPomFile().getAbsolutePath() );
+ .setPomFile( getPomFile().getAbsolutePath() ).setShowErrors( true
);
MavenExecutionResult result = maven.readProjectWithDependencies(
request );
+
+ if ( result.hasExceptions() )
+ {
+ for ( Iterator i = result.getExceptions().iterator(); i.hasNext();
)
+ {
+ Exception e = (Exception) i.next();
+
+ e.printStackTrace();
+ }
+
+ fail( "Exception is readProjectWithDependencies() test." );
+ }
assertNoExceptions( result );
Modified: maven/components/trunk/maven-embedder/src/test/resources/pom.xml
URL:
http://svn.apache.org/viewvc/maven/components/trunk/maven-embedder/src/test/resources/pom.xml?view=diff&rev=516820&r1=516819&r2=516820
==============================================================================
--- maven/components/trunk/maven-embedder/src/test/resources/pom.xml (original)
+++ maven/components/trunk/maven-embedder/src/test/resources/pom.xml Sat Mar 10
16:48:53 2007
@@ -21,31 +21,9 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.apache.maven</groupId>
<artifactId>maven-model</artifactId>
- <name>Maven Model</name>
- <version>2.0-beta-2-SNAPSHOT</version>
- <description>Maven Model</description>
- <build>
- <plugins>
- <plugin>
- <groupId>org.codehaus.modello</groupId>
- <artifactId>modello-maven-plugin</artifactId>
- <executions>
- <execution>
- <goals>
- <goal>xpp3-writer</goal>
- <goal>java</goal>
- <goal>xpp3-reader</goal>
- <goal>xsd</goal>
- </goals>
- </execution>
- </executions>
- <configuration>
- <version>4.0.0</version>
- <model>maven.mdo</model>
- </configuration>
- </plugin>
- </plugins>
- </build>
+ <name>Maven Embedder Test Project</name>
+ <version>1.0</version>
+ <description>Maven Embedder Test Project</description>
<dependencies>
<dependency>
<groupId>plexus</groupId>
Modified:
maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java
URL:
http://svn.apache.org/viewvc/maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java?view=diff&rev=516820&r1=516819&r2=516820
==============================================================================
---
maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java
(original)
+++
maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java
Sat Mar 10 16:48:53 2007
@@ -19,25 +19,6 @@
* under the License.
*/
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you 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.apache.maven.MavenTools;
import org.apache.maven.artifact.Artifact;
import org.apache.maven.artifact.ArtifactStatus;
Modified:
maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/artifact/MavenMetadataSource.java
URL:
http://svn.apache.org/viewvc/maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/artifact/MavenMetadataSource.java?view=diff&rev=516820&r1=516819&r2=516820
==============================================================================
---
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
Sat Mar 10 16:48:53 2007
@@ -59,7 +59,7 @@
import java.util.Set;
/**
- * @author <a href="mailto:[EMAIL PROTECTED]">Jason van Zyl</a>
+ * @author Jason van Zyl
* @author <a href="mailto:[EMAIL PROTECTED]">Brett Porter</a>
* @version $Id$
*/
Modified: maven/components/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/maven/components/trunk/pom.xml?view=diff&rev=516820&r1=516819&r2=516820
==============================================================================
--- maven/components/trunk/pom.xml (original)
+++ maven/components/trunk/pom.xml Sat Mar 10 16:48:53 2007
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.maven</groupId>
<artifactId>maven-parent</artifactId>
- <version>6-SNAPSHOT</version>
+ <version>5</version>
<relativePath>../pom/maven/pom.xml</relativePath>
</parent>
<artifactId>maven</artifactId>
@@ -177,6 +177,21 @@
<dependency>
<groupId>org.apache.maven.wagon</groupId>
<artifactId>wagon-file</artifactId>
+ <version>${wagonVersion}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.maven.wagon</groupId>
+ <artifactId>wagon-http-lightweight</artifactId>
+ <version>${wagonVersion}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.maven.wagon</groupId>
+ <artifactId>wagon-ssh</artifactId>
+ <version>${wagonVersion}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.maven.wagon</groupId>
+ <artifactId>wagon-ssh-external</artifactId>
<version>${wagonVersion}</version>
</dependency>
<dependency>
