You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@maven.apache.org by jv...@apache.org on 2003/05/26 18:25:14 UTC
cvs commit: maven-new/core/src/test-input/artifact-satisfier/all-in-repo project.properties
jvanzyl 2003/05/26 09:25:14
Modified: core/src/java/org/apache/maven/artifact/factory
DefaultArtifactFactory.java
core/src/java/org/apache/maven/artifact/handlers
ArtifactHandlerManager.java JarHandler.java
NOPHandler.java PluginHandler.java
core/src/java/org/apache/maven/artifact/processor
DefaultArtifactProcessor.java
core/src/java/org/apache/maven/artifact/satisfy
DefaultDependencySatisfier.java
core/src/test/org/apache/maven/artifact/download
MockArtifactDownloader.java
core/src/test/org/apache/maven/artifact/handlers
DefaultArtifactHandlerManagerTest.java
core/src/test/org/apache/maven/artifact/processor
DefaultArtifactProcessorTest.xml
core/src/test-input/artifact-satisfier/all-in-repo
project.properties
Log:
o Changes to get the tests passing
Revision Changes Path
1.17 +5 -5 maven-new/core/src/java/org/apache/maven/artifact/factory/DefaultArtifactFactory.java
Index: DefaultArtifactFactory.java
===================================================================
RCS file: /home/cvs/maven-new/core/src/java/org/apache/maven/artifact/factory/DefaultArtifactFactory.java,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- DefaultArtifactFactory.java 26 May 2003 13:11:24 -0000 1.16
+++ DefaultArtifactFactory.java 26 May 2003 16:25:13 -0000 1.17
@@ -197,13 +197,13 @@
if ( mavenRepoLocal == null )
{
- if ( project.getProperties().get( "maven.repo.local" ) != null )
+ if ( System.getProperty( "maven.repo.local" ) != null )
{
- mavenRepoLocal = (String) project.getProperties().get( "maven.repo.local" );
+ mavenRepoLocal = System.getProperty( "maven.repo.local" );
}
- else if ( System.getProperty( "maven.repo.local" ) != null )
+ else if ( project.getProperties().get( "maven.repo.local" ) != null )
{
- mavenRepoLocal = System.getProperty( "maven.repo.local" );
+ mavenRepoLocal = (String) project.getProperties().get( "maven.repo.local" );
}
}
1.3 +3 -16 maven-new/core/src/java/org/apache/maven/artifact/handlers/ArtifactHandlerManager.java
Index: ArtifactHandlerManager.java
===================================================================
RCS file: /home/cvs/maven-new/core/src/java/org/apache/maven/artifact/handlers/ArtifactHandlerManager.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ArtifactHandlerManager.java 25 May 2003 19:04:50 -0000 1.2
+++ ArtifactHandlerManager.java 26 May 2003 16:25:13 -0000 1.3
@@ -60,7 +60,7 @@
import org.apache.maven.artifact.Artifact;
/**
- * @author <a href="michal.maczka@dimatics.com">Michal Maczka</a>
+ * @author <a href="michal.maczka@dimatics.com">Michal Maczka</a>
* @version $Id$
*/
public interface ArtifactHandlerManager
@@ -70,21 +70,8 @@
/**
* Returns handler for given artifact
- * @param artifact the Artifact for which
+ * @param artifact the Artifact for which
* @return the Handler which will be used for processing the artifact
*/
public ArtifactHandler getHandler( Artifact artifact ) throws MavenException;
-
- /**
- * Allows to set "Default Handler" - the handler
- * which will be returned by <code>getHandler()</code>
- * when no handler is associated with given artifact(type).
- * This is useful when testing - e.g.
- * <code>MockArtifactHandler</code> can be used to test
- * {@link org.apache.maven.artifact.processor.ArtifactProcessor} class.
- *
- * @param artifactHandler the artifact handler which will be used
- * @return the <code>ArtifactHandler</code> which was previously used
- */
- public ArtifactHandler setDefaultHandler( ArtifactHandler artifactHandler );
}
1.5 +3 -2 maven-new/core/src/java/org/apache/maven/artifact/handlers/JarHandler.java
Index: JarHandler.java
===================================================================
RCS file: /home/cvs/maven-new/core/src/java/org/apache/maven/artifact/handlers/JarHandler.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- JarHandler.java 20 May 2003 19:57:52 -0000 1.4
+++ JarHandler.java 26 May 2003 16:25:13 -0000 1.5
@@ -68,7 +68,8 @@
* @author Michal Maczka
* @version $Revision$ $Date$
*/
-public class JarHandler implements ArtifactHandler
+public class JarHandler
+ implements ArtifactHandler
{
/**
1.5 +3 -3 maven-new/core/src/java/org/apache/maven/artifact/handlers/NOPHandler.java
Index: NOPHandler.java
===================================================================
RCS file: /home/cvs/maven-new/core/src/java/org/apache/maven/artifact/handlers/NOPHandler.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- NOPHandler.java 20 May 2003 19:57:52 -0000 1.4
+++ NOPHandler.java 26 May 2003 16:25:13 -0000 1.5
@@ -64,7 +64,8 @@
* @author Michal Maczka
* @version $Revision$ $Date$
*/
-public class NOPHandler implements ArtifactHandler
+public class NOPHandler
+ implements ArtifactHandler
{
/**
@@ -72,7 +73,6 @@
*/
public void process( Artifact artifact, Project project )
{
-
}
}
1.4 +3 -2 maven-new/core/src/java/org/apache/maven/artifact/handlers/PluginHandler.java
Index: PluginHandler.java
===================================================================
RCS file: /home/cvs/maven-new/core/src/java/org/apache/maven/artifact/handlers/PluginHandler.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- PluginHandler.java 20 May 2003 19:57:52 -0000 1.3
+++ PluginHandler.java 26 May 2003 16:25:13 -0000 1.4
@@ -66,7 +66,8 @@
* @author Michal Maczka
* @version $Revision$ $Date$
*/
-public class PluginHandler implements ArtifactHandler
+public class PluginHandler
+ implements ArtifactHandler
{
/**
* @see org.apache.maven.artifact.handlers.ArtifactHandler#process(org.apache.maven.artifact.Artifact, org.apache.maven.project.Project)
1.4 +7 -6 maven-new/core/src/java/org/apache/maven/artifact/processor/DefaultArtifactProcessor.java
Index: DefaultArtifactProcessor.java
===================================================================
RCS file: /home/cvs/maven-new/core/src/java/org/apache/maven/artifact/processor/DefaultArtifactProcessor.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- DefaultArtifactProcessor.java 25 May 2003 19:04:50 -0000 1.3
+++ DefaultArtifactProcessor.java 26 May 2003 16:25:13 -0000 1.4
@@ -77,8 +77,9 @@
* @author <a href="mailto:michal.maczka@dimatics.com">Michal Maczka</a>
* @version $Id$
*/
-public class DefaultArtifactProcessor implements Serviceable, ArtifactProcessor
-{
+public class DefaultArtifactProcessor
+ implements Serviceable, ArtifactProcessor
+{
/** */
private ArtifactFactory artifactFactory = null;
@@ -87,14 +88,15 @@
/** */
private ArtifactVerifier artifactVerifier = null;
-
+
/** */
private ArtifactHandlerManager handlerManager = null;
/**
* @see org.apache.maven.artifact.ArtifactListProcessor#processArtifacts(org.apache.maven.project.Project)
*/
- public void processArtifacts( Project project ) throws Exception
+ public void processArtifacts( Project project )
+ throws Exception
{
//1.
@@ -127,7 +129,6 @@
*/
public void service(ServiceManager serviceManager) throws ServiceException
{
-
artifactFactory =
(ArtifactFactory) serviceManager.lookup(ArtifactFactory.ROLE);
dependencySatisfier =
1.5 +3 -6 maven-new/core/src/java/org/apache/maven/artifact/satisfy/DefaultDependencySatisfier.java
Index: DefaultDependencySatisfier.java
===================================================================
RCS file: /home/cvs/maven-new/core/src/java/org/apache/maven/artifact/satisfy/DefaultDependencySatisfier.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- DefaultDependencySatisfier.java 26 May 2003 13:12:27 -0000 1.4
+++ DefaultDependencySatisfier.java 26 May 2003 16:25:13 -0000 1.5
@@ -96,7 +96,8 @@
/**
* @see org.apache.avalon.framework.service.Serviceable#service(org.apache.avalon.framework.service.ServiceManager)
*/
- public void service( ServiceManager serviceManager ) throws ServiceException
+ public void service( ServiceManager serviceManager )
+ throws ServiceException
{
artifactDownloader =
(ArtifactDownloader) serviceManager.lookup( ArtifactDownloader.ROLE );
@@ -131,7 +132,6 @@
{
Artifact artifact = (Artifact) i.next();
-
// The artifact plain doesn't exist so chalk it up as a failed dependency.
if ( artifact.exists() == false )
{
@@ -250,7 +250,4 @@
}
}
}
-
-
-
}
1.2 +3 -2 maven-new/core/src/test/org/apache/maven/artifact/download/MockArtifactDownloader.java
Index: MockArtifactDownloader.java
===================================================================
RCS file: /home/cvs/maven-new/core/src/test/org/apache/maven/artifact/download/MockArtifactDownloader.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- MockArtifactDownloader.java 25 May 2003 19:10:24 -0000 1.1
+++ MockArtifactDownloader.java 26 May 2003 16:25:13 -0000 1.2
@@ -69,7 +69,8 @@
* @author <a href="mailto:michal.maczka@dimatics.com">Michal Maczka</a>
* @version $Id$
*/
-public class MockArtifactDownloader implements ArtifactDownloader
+public class MockArtifactDownloader
+ implements ArtifactDownloader
{
/** */
1.2 +3 -2 maven-new/core/src/test/org/apache/maven/artifact/handlers/DefaultArtifactHandlerManagerTest.java
Index: DefaultArtifactHandlerManagerTest.java
===================================================================
RCS file: /home/cvs/maven-new/core/src/test/org/apache/maven/artifact/handlers/DefaultArtifactHandlerManagerTest.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- DefaultArtifactHandlerManagerTest.java 25 May 2003 19:10:24 -0000 1.1
+++ DefaultArtifactHandlerManagerTest.java 26 May 2003 16:25:13 -0000 1.2
@@ -64,7 +64,8 @@
* @author <a href="michal.maczka@dimatics.com">Michal Maczka</a>
* @version $Id$
*/
-public class DefaultArtifactHandlerManagerTest extends PlexusTestCase
+public class DefaultArtifactHandlerManagerTest
+ extends PlexusTestCase
{
private ArtifactHandlerManager artifactHandlerManager = null;
1.4 +8 -0 maven-new/core/src/test/org/apache/maven/artifact/processor/DefaultArtifactProcessorTest.xml
Index: DefaultArtifactProcessorTest.xml
===================================================================
RCS file: /home/cvs/maven-new/core/src/test/org/apache/maven/artifact/processor/DefaultArtifactProcessorTest.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- DefaultArtifactProcessorTest.xml 26 May 2003 14:04:12 -0000 1.3
+++ DefaultArtifactProcessorTest.xml 26 May 2003 16:25:13 -0000 1.4
@@ -25,6 +25,14 @@
<implementation>org.apache.maven.artifact.handlers.DefaultArtifactHandlerManager</implementation>
<configuration/>
</component>
+
+ <component>
+ <role>org.apache.maven.artifact.handlers.ArtifactHandler</role>
+ <role-hint>default</role-hint>
+ <implementation>org.apache.maven.artifact.handlers.MockArtifactHandler</implementation>
+ <configuration/>
+ </component>
+
<component>
<role>org.apache.maven.artifact.processor.ArtifactProcessor</role>
<implementation>org.apache.maven.artifact.processor.DefaultArtifactProcessor</implementation>
1.2 +1 -1 maven-new/core/src/test-input/artifact-satisfier/all-in-repo/project.properties
Index: project.properties
===================================================================
RCS file: /home/cvs/maven-new/core/src/test-input/artifact-satisfier/all-in-repo/project.properties,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- project.properties 25 May 2003 19:26:30 -0000 1.1
+++ project.properties 26 May 2003 16:25:14 -0000 1.2
@@ -1,4 +1,4 @@
-maven.repo.local=/../../maven-repo-local
+maven.repo.local=${basedir}/../../maven-repo-local
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@maven.apache.org
For additional commands, e-mail: dev-help@maven.apache.org