You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@maven.apache.org by mi...@apache.org on 2003/05/25 21:04:50 UTC
cvs commit: maven-new/core/src/java/org/apache/maven/artifact/satisfy DependencySatisfier.java DefaultDependencySatisfier.java
michal 2003/05/25 12:04:50
Modified: core/src/java/org/apache/maven/artifact/download
DefaultArtifactDownloader.java
ArtifactDownloader.java
core/src/java/org/apache/maven/artifact/factory
DefaultArtifactFactory.java
core/src/java/org/apache/maven/artifact/processor
DefaultArtifactProcessor.java
core/src/java/org/apache/maven/artifact/handlers
DefaultArtifactHandlerManager.java
ArtifactHandlerManager.java
core/src/java/org/apache/maven/artifact/satisfy
DependencySatisfier.java
DefaultDependencySatisfier.java
Log:
Testing, Testing, Testing
Revision Changes Path
1.3 +4 -2 maven-new/core/src/java/org/apache/maven/artifact/download/DefaultArtifactDownloader.java
Index: DefaultArtifactDownloader.java
===================================================================
RCS file: /home/cvs/maven-new/core/src/java/org/apache/maven/artifact/download/DefaultArtifactDownloader.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- DefaultArtifactDownloader.java 23 May 2003 22:48:59 -0000 1.2
+++ DefaultArtifactDownloader.java 25 May 2003 19:04:50 -0000 1.3
@@ -1,3 +1,5 @@
+package org.apache.maven.artifact.download;
+
/* ====================================================================
* The Apache Software License, Version 1.1
*
@@ -53,7 +55,7 @@
*
* ====================================================================
*/
-package org.apache.maven.artifact.download;
+
import org.apache.avalon.framework.configuration.Configurable;
import org.apache.avalon.framework.configuration.Configuration;
1.2 +3 -2 maven-new/core/src/java/org/apache/maven/artifact/download/ArtifactDownloader.java
Index: ArtifactDownloader.java
===================================================================
RCS file: /home/cvs/maven-new/core/src/java/org/apache/maven/artifact/download/ArtifactDownloader.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ArtifactDownloader.java 20 May 2003 19:57:52 -0000 1.1
+++ ArtifactDownloader.java 25 May 2003 19:04:50 -0000 1.2
@@ -1,3 +1,5 @@
+package org.apache.maven.artifact.download;
+
/* ====================================================================
* The Apache Software License, Version 1.1
*
@@ -53,7 +55,6 @@
*
* ====================================================================
*/
-package org.apache.maven.artifact.download;
import org.apache.maven.project.Project;
import org.apache.maven.artifact.Artifact;
1.15 +3 -2 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.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- DefaultArtifactFactory.java 25 May 2003 15:11:38 -0000 1.14
+++ DefaultArtifactFactory.java 25 May 2003 19:04:50 -0000 1.15
@@ -86,7 +86,7 @@
/**
* Return the list of artifact for given project
- * type.
+ * type. The same list is set in the project
*
* @param project The base dependency.
* @return The appropriate artifact based on the dependency type.
@@ -161,6 +161,7 @@
}
artifacts.add( artifact );
}
+ project.setArtifacts( artifacts );
return artifacts;
}
1.3 +5 -3 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.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- DefaultArtifactProcessor.java 25 May 2003 09:44:23 -0000 1.2
+++ DefaultArtifactProcessor.java 25 May 2003 19:04:50 -0000 1.3
@@ -1,3 +1,5 @@
+package org.apache.maven.artifact.processor;
+
/* ====================================================================
* The Apache Software License, Version 1.1
*
@@ -53,7 +55,7 @@
*
* ====================================================================
*/
-package org.apache.maven.artifact.processor;
+
import java.util.Iterator;
import java.util.List;
@@ -92,7 +94,7 @@
/**
* @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.
1.2 +54 -19 maven-new/core/src/java/org/apache/maven/artifact/handlers/DefaultArtifactHandlerManager.java
Index: DefaultArtifactHandlerManager.java
===================================================================
RCS file: /home/cvs/maven-new/core/src/java/org/apache/maven/artifact/handlers/DefaultArtifactHandlerManager.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- DefaultArtifactHandlerManager.java 25 May 2003 09:44:23 -0000 1.1
+++ DefaultArtifactHandlerManager.java 25 May 2003 19:04:50 -0000 1.2
@@ -1,3 +1,5 @@
+package org.apache.maven.artifact.handlers;
+
/* ====================================================================
* The Apache Software License, Version 1.1
*
@@ -54,8 +56,6 @@
* ====================================================================
*/
-package org.apache.maven.artifact.handlers;
-
import java.io.File;
import java.io.InputStream;
import java.util.HashMap;
@@ -74,9 +74,11 @@
public class DefaultArtifactHandlerManager
implements ArtifactHandlerManager, Initializable
{
-
-
- private ArtifactHandler defaultHandler = new NOPHandler();
+
+ /**
+ * Default Handler
+ */
+ private ArtifactHandler defaultHandler = new NOPHandler();
/**
* Maps type to its handler Object
@@ -95,24 +97,57 @@
* @param type
* @return
*/
- public ArtifactHandler getHandler(Artifact artifact) throws Exception
+ public ArtifactHandler getHandler( Artifact artifact ) throws MavenException
{
- String type = artifact.getType();
- if (cachedHandlers.containsKey(type))
+ String type = artifact.getType();
+ if (cachedHandlers.containsKey( type ))
{
- return (ArtifactHandler) cachedHandlers.get(type);
+ return (ArtifactHandler) cachedHandlers.get( type );
}
- String handlerClassname = handlers.getProperty(type);
- if (handlerClassname == null)
+ String handlerClassname = handlers.getProperty( type );
+ if ( handlerClassname == null )
{
return defaultHandler;
}
- Class clazz = Class.forName(handlerClassname);
- ArtifactHandler artifactHandler = (ArtifactHandler) clazz.newInstance();
- cachedHandlers.put(type, artifactHandler);
+ Class clazz = null;
+ try
+ {
+ clazz = Class.forName( handlerClassname );
+ }
+ catch ( Exception e )
+ {
+ String msg =
+ "ArtifactHandler class: '" + handlerClassname + "' not found";
+ throw new MavenException( msg, e );
+ }
+ ArtifactHandler artifactHandler = null;
+ try
+ {
+ artifactHandler = ( ArtifactHandler ) clazz.newInstance();
+ }
+ catch ( Exception e )
+ {
+ String msg =
+ "ArtifactHandler : '"
+ + handlerClassname
+ + "' cannot be instantiated";
+ throw new MavenException( msg, e );
+ }
+
+ cachedHandlers.put( type, artifactHandler );
return artifactHandler;
}
+ /**
+ * @see DefaultArtifactHandlerManager#setDefaultHandler(ArtifactHandler)
+ */
+ public ArtifactHandler setDefaultHandler( ArtifactHandler defaultHandler )
+ {
+ ArtifactHandler previousHandler = this.defaultHandler;
+ this.defaultHandler = defaultHandler;
+ return previousHandler;
+ }
+
// ----------------------------------------------------------------------
// Lifecycle Management
@@ -124,7 +159,7 @@
* @throws java.lang.Exception if any error occures
*/
public void initialize() throws Exception
- {
+ {
InputStream inputStream = null;
File configFile = null;
try
@@ -134,12 +169,12 @@
clazz.getResourceAsStream(
MavenConstants.ARTIFACT_HANDLER_PROPERTIES);
handlers = new Properties();
- handlers.load(inputStream);
+ handlers.load( inputStream );
}
catch (Exception e)
{
String message = "Cannot read global layout.properties file";
- throw new MavenException(message, e);
+ throw new MavenException( message, e );
}
finally
{
@@ -149,7 +184,7 @@
{
inputStream.close();
}
- catch (Exception e)
+ catch ( Exception e )
{
}
}
1.2 +18 -5 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.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ArtifactHandlerManager.java 25 May 2003 09:44:23 -0000 1.1
+++ ArtifactHandlerManager.java 25 May 2003 19:04:50 -0000 1.2
@@ -56,6 +56,7 @@
package org.apache.maven.artifact.handlers;
+import org.apache.maven.MavenException;
import org.apache.maven.artifact.Artifact;
/**
@@ -68,10 +69,22 @@
public static final String ROLE = ArtifactHandlerManager.class.getName();
/**
- *
- * @param artifact
- * @return
+ * Returns handler for given artifact
+ * @param artifact the Artifact for which
+ * @return the Handler which will be used for processing the artifact
*/
- public ArtifactHandler getHandler( Artifact artifact ) throws Exception;
+ 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.3 +6 -3 maven-new/core/src/java/org/apache/maven/artifact/satisfy/DependencySatisfier.java
Index: DependencySatisfier.java
===================================================================
RCS file: /home/cvs/maven-new/core/src/java/org/apache/maven/artifact/satisfy/DependencySatisfier.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- DependencySatisfier.java 24 May 2003 03:22:01 -0000 1.2
+++ DependencySatisfier.java 25 May 2003 19:04:50 -0000 1.3
@@ -1,3 +1,5 @@
+package org.apache.maven.artifact.satisfy;
+
/* ====================================================================
* The Apache Software License, Version 1.1
*
@@ -53,7 +55,7 @@
*
* ====================================================================
*/
-package org.apache.maven.artifact.satisfy;
+
import org.apache.maven.project.Project;
@@ -77,6 +79,7 @@
* @throws org.apache.maven.artifact.satisfy.UnsatisfiedDependencyException
* @throws ChecksumVerificationException
*/
- void satisfyDependencies( Project project )
+ public void satisfyDependencies( Project project )
throws UnsatisfiedDependencyException;
+
}
1.3 +4 -1 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.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- DefaultDependencySatisfier.java 24 May 2003 03:22:01 -0000 1.2
+++ DefaultDependencySatisfier.java 25 May 2003 19:04:50 -0000 1.3
@@ -134,6 +134,7 @@
for ( Iterator i = project.getArtifacts().iterator(); i.hasNext(); )
{
Artifact artifact = (Artifact) i.next();
+
// The artifact plain doesn't exist so chalk it up as a failed dependency.
if ( artifact.exists() == false )
@@ -253,5 +254,7 @@
}
}
}
+
+
}
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@maven.apache.org
For additional commands, e-mail: dev-help@maven.apache.org