Re: [PATCH] More patches for non-jar dependency support

[Michael McKibben]

On 2 Oct 2002, Jason van Zyl wrote:

> On Wed, 2002-10-02 at 15:19, Michael McKibben wrote:
> > Oh, sorry about that. I am not sure why the entire license changed.
> > Perhaps my emacs changed the newlines without me realizing it? I created
> > the diff using
> >
> > 'cvs diff -u filename.java' > filename.java.patch
> >
> > Should I just do a jumbo patch relative from the maven project root? Sorry
> > for the confusion. Do you want me to try resubmitting a cleaner patch?
>
> That would be great. One patch for all the changes is cool.

Okay here is a cleaner patch.

Regards,

--mike


Index: src/java/org/apache/maven/CreateDependencyClasspath.java
===================================================================
RCS file: 
/home/cvspublic/jakarta-turbine-maven/src/java/org/apache/maven/CreateDependencyClasspath.java,v
retrieving revision 1.4
diff -u -r1.4 CreateDependencyClasspath.java
--- src/java/org/apache/maven/CreateDependencyClasspath.java    26 Aug 2002 11:41:25 
-0000      1.4
+++ src/java/org/apache/maven/CreateDependencyClasspath.java    2 Oct 2002 19:32:19 
+-0000
@@ -62,6 +62,8 @@
 import org.apache.maven.app.MavenJellyContext;
 import org.apache.maven.project.Dependency;
 import org.apache.maven.project.Project;
+import org.apache.maven.repository.DefaultArtifactFactory;
+import org.apache.maven.repository.Artifact;
 import org.apache.tools.ant.types.Path;
 
 /**
@@ -177,6 +179,15 @@
              i.hasNext();)
         {
             Dependency d = (Dependency) i.next();
+
+           // Only add jar dependencies to the classpath
+           //
+           if (!(d.isCompileType() || d.isTestType() 
+                 || "jar".equals(d.getType()))) 
+           {
+               continue;
+           }
+
             String mavenJarProperty = 
                     (String) context.getVariable("maven.jar." + d.getId());
             Path path = new Path(antProject);
@@ -193,9 +204,9 @@
             }
             else
             {
+               Artifact artifact = DefaultArtifactFactory.createArtifact(d);
                 // Use the jar in the local repository.
-                path.setPath(mavenRepoLocal + PS + d.getProjectId() + PS
-                             + "jars" + PS + d.getJar());
+                path.setPath(mavenRepoLocal + artifact.getPath());
                 classpath.append(path);
             }
 
@@ -207,4 +218,4 @@
             antProject.addReference(refid, classpath);
         }
     }
-}
\ No newline at end of file
+}
Index: src/java/org/apache/maven/repository/DefaultArtifactFactory.java
===================================================================
RCS file: 
/home/cvspublic/jakarta-turbine-maven/src/java/org/apache/maven/repository/DefaultArtifactFactory.java,v
retrieving revision 1.1
diff -u -r1.1 DefaultArtifactFactory.java
--- src/java/org/apache/maven/repository/DefaultArtifactFactory.java    1 Oct 2002 
21:28:26 -0000       1.1
+++ src/java/org/apache/maven/repository/DefaultArtifactFactory.java    2 Oct 2002 
+19:32:20 -0000
@@ -73,7 +73,8 @@
     public static Artifact createArtifact(Dependency dependency)
     {
         Artifact artifact = null;
-        if (dependency.isCompileType())
+        if (dependency.isCompileType() || dependency.isTestType() 
+           || "jar".equals(dependency.getType()))
         {
             DefaultJarArtifact dja = new DefaultJarArtifact();
             dja.setDependency(dependency);
Index: src/java/org/apache/maven/repository/GenericArtifact.java
===================================================================
RCS file: 
/home/cvspublic/jakarta-turbine-maven/src/java/org/apache/maven/repository/GenericArtifact.java,v
retrieving revision 1.1
diff -u -r1.1 GenericArtifact.java
--- src/java/org/apache/maven/repository/GenericArtifact.java   1 Oct 2002 21:28:26 
-0000       1.1
+++ src/java/org/apache/maven/repository/GenericArtifact.java   2 Oct 2002 19:32:20 
+-0000
@@ -89,7 +89,8 @@
         String artifact = dependency.getArtifact();
         String typeDir;
 
-        if (dependency.isCompileType() || dependency.isTestType())
+        if (dependency.isCompileType() || dependency.isTestType()
+           || "jar".equals(dependency.getType()))
         {
             typeDir = "jars";
         }

--
To unsubscribe, e-mail:   <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>