Author: brett
Date: Tue Jul 19 18:03:25 2005
New Revision: 219824
URL: http://svn.apache.org/viewcvs?rev=219824&view=rev
Log:
apply some inspections
Added:
maven/components/trunk/maven-project/src/test/java/org/apache/maven/project/TestArtifactResolver.java
(contents, props changed)
- copied, changed from r219817,
maven/components/trunk/maven-project/src/test/java/org/apache/maven/project/ProjectClasspathArtifactResolver.java
Removed:
maven/components/trunk/maven-project/src/test/java/org/apache/maven/project/ProjectClasspathArtifactResolver.java
Modified:
maven/components/trunk/maven-project/src/test/java/org/apache/maven/project/MavenProjectTestCase.java
maven/components/trunk/maven-project/src/test/java/org/apache/maven/project/ProjectClasspathTest.java
maven/components/trunk/maven-project/src/test/resources/org/apache/maven/project/ProjectClasspathTest.xml
Modified:
maven/components/trunk/maven-project/src/test/java/org/apache/maven/project/MavenProjectTestCase.java
URL:
http://svn.apache.org/viewcvs/maven/components/trunk/maven-project/src/test/java/org/apache/maven/project/MavenProjectTestCase.java?rev=219824&r1=219823&r2=219824&view=diff
==============================================================================
---
maven/components/trunk/maven-project/src/test/java/org/apache/maven/project/MavenProjectTestCase.java
(original)
+++
maven/components/trunk/maven-project/src/test/java/org/apache/maven/project/MavenProjectTestCase.java
Tue Jul 19 18:03:25 2005
@@ -103,9 +103,8 @@
protected MavenProject getProjectWithDependencies( File pom )
throws Exception
{
- return projectBuilder.buildWithDependencies( pom, getLocalRepository(),
- new
ProjectClasspathArtifactResolver.Source( artifactFactory,
artifactRepositoryFactory, getContainer() ),
- Collections.EMPTY_LIST );
+ return projectBuilder.buildWithDependencies( pom,
getLocalRepository(), new TestArtifactResolver.Source(
+ artifactFactory, artifactRepositoryFactory, getContainer() ),
Collections.EMPTY_LIST );
}
protected MavenProject getProject( File pom )
Modified:
maven/components/trunk/maven-project/src/test/java/org/apache/maven/project/ProjectClasspathTest.java
URL:
http://svn.apache.org/viewcvs/maven/components/trunk/maven-project/src/test/java/org/apache/maven/project/ProjectClasspathTest.java?rev=219824&r1=219823&r2=219824&view=diff
==============================================================================
---
maven/components/trunk/maven-project/src/test/java/org/apache/maven/project/ProjectClasspathTest.java
(original)
+++
maven/components/trunk/maven-project/src/test/java/org/apache/maven/project/ProjectClasspathTest.java
Tue Jul 19 18:03:25 2005
@@ -36,12 +36,12 @@
File f = getFileForClasspathResource( dir +
"project-with-scoped-dependencies.xml" );
// XXX: Because this test fails, we resort to crude reflection hacks,
see PLX-108 for the solution
-// assertEquals( ProjectClasspathArtifactResolver.class,
getContainer().lookup( ArtifactResolver.ROLE ).getClass() );
+// assertEquals( TestArtifactResolver.class, getContainer().lookup(
ArtifactResolver.ROLE ).getClass() );
MavenProjectBuilder builder = (MavenProjectBuilder)
getContainer().lookup( MavenProjectBuilder.ROLE );
Field declaredField = builder.getClass().getDeclaredField(
"artifactResolver" );
boolean acc = declaredField.isAccessible();
declaredField.setAccessible( true );
- declaredField.set( builder, getContainer().lookup(
ProjectClasspathArtifactResolver.class.getName() ) );
+ declaredField.set( builder, getContainer().lookup(
TestArtifactResolver.class.getName() ) );
declaredField.setAccessible( acc );
// XXX: end hack
Copied:
maven/components/trunk/maven-project/src/test/java/org/apache/maven/project/TestArtifactResolver.java
(from r219817,
maven/components/trunk/maven-project/src/test/java/org/apache/maven/project/ProjectClasspathArtifactResolver.java)
URL:
http://svn.apache.org/viewcvs/maven/components/trunk/maven-project/src/test/java/org/apache/maven/project/TestArtifactResolver.java?p2=maven/components/trunk/maven-project/src/test/java/org/apache/maven/project/TestArtifactResolver.java&p1=maven/components/trunk/maven-project/src/test/java/org/apache/maven/project/ProjectClasspathArtifactResolver.java&r1=219817&r2=219824&rev=219824&view=diff
==============================================================================
---
maven/components/trunk/maven-project/src/test/java/org/apache/maven/project/ProjectClasspathArtifactResolver.java
(original)
+++
maven/components/trunk/maven-project/src/test/java/org/apache/maven/project/TestArtifactResolver.java
Tue Jul 19 18:03:25 2005
@@ -48,7 +48,7 @@
import java.util.List;
import java.util.Set;
-public class ProjectClasspathArtifactResolver
+public class TestArtifactResolver
extends DefaultArtifactResolver
implements Contextualizable
{
@@ -56,7 +56,7 @@
private PlexusContainer container;
- public static class Source
+ static class Source
implements ArtifactMetadataSource
{
private ArtifactFactory artifactFactory;
@@ -109,7 +109,7 @@
IOUtil.close( r );
}
- Set artifacts = null;
+ Set artifacts;
try
{
artifacts = createArtifacts( model.getDependencies(),
artifact.getScope() );
@@ -156,6 +156,9 @@
}
}
+ /**
+ * @noinspection RefusedBequest
+ */
public void resolve( Artifact artifact, List remoteRepositories,
ArtifactRepository localRepository )
throws ArtifactResolutionException
{
Propchange:
maven/components/trunk/maven-project/src/test/java/org/apache/maven/project/TestArtifactResolver.java
------------------------------------------------------------------------------
cvs2svn:cvs-rev = 1.8
Propchange:
maven/components/trunk/maven-project/src/test/java/org/apache/maven/project/TestArtifactResolver.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
maven/components/trunk/maven-project/src/test/java/org/apache/maven/project/TestArtifactResolver.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Modified:
maven/components/trunk/maven-project/src/test/resources/org/apache/maven/project/ProjectClasspathTest.xml
URL:
http://svn.apache.org/viewcvs/maven/components/trunk/maven-project/src/test/resources/org/apache/maven/project/ProjectClasspathTest.xml?rev=219824&r1=219823&r2=219824&view=diff
==============================================================================
---
maven/components/trunk/maven-project/src/test/resources/org/apache/maven/project/ProjectClasspathTest.xml
(original)
+++
maven/components/trunk/maven-project/src/test/resources/org/apache/maven/project/ProjectClasspathTest.xml
Tue Jul 19 18:03:25 2005
@@ -1,9 +1,9 @@
<plexus>
<components>
-<!-- Due to PLX-108, have to work around it...
+ <!-- Due to PLX-108, have to work around it...
<component>
<role>org.apache.maven.artifact.ArtifactResolver</role>
-
<implementation>org.apache.maven.project.ProjectClasspathArtifactResolver</implementation>
+ <implementation>org.apache.maven.project.TestArtifactResolvertion>
<requirements>
<requirement>
<role>org.apache.maven.artifact.manager.WagonManager</role>
@@ -15,8 +15,8 @@
</component>
-->
<component>
- <role>org.apache.maven.project.ProjectClasspathArtifactResolver</role>
-
<implementation>org.apache.maven.project.ProjectClasspathArtifactResolver</implementation>
+ <role>org.apache.maven.project.TestArtifactResolver</role>
+
<implementation>org.apache.maven.project.TestArtifactResolver</implementation>
<requirements>
<requirement>
<role>org.apache.maven.artifact.manager.WagonManager</role>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
