jvanzyl 02/03/24 14:49:09
Modified: src/java/org/apache/maven ProjectResolver.java
Log:
Allow the project resolver to deal with an individual JAR file or a
directory containing JAR and class files.
Revision Changes Path
1.6 +26 -20
jakarta-turbine-maven/src/java/org/apache/maven/ProjectResolver.java
Index: ProjectResolver.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine-maven/src/java/org/apache/maven/ProjectResolver.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- ProjectResolver.java 24 Mar 2002 22:24:47 -0000 1.5
+++ ProjectResolver.java 24 Mar 2002 22:49:09 -0000 1.6
@@ -77,15 +77,15 @@
* in a project descriptor.
*
* @author <a href="mailto:[EMAIL PROTECTED]";>Jason van Zyl</a>
- * @version $Id: ProjectResolver.java,v 1.5 2002/03/24 22:24:47 jvanzyl Exp $
+ * @version $Id: ProjectResolver.java,v 1.6 2002/03/24 22:49:09 jvanzyl Exp $
*/
public class ProjectResolver
{
/**
* Base directory in which JAR files and class files will
- * be searched for.
+ * be searched for or just a JAR file.
*/
- private File baseDirectory;
+ private File base;
/**
* Listener that registers class references as they
@@ -139,9 +139,9 @@
* @param baseDirectory Directory in which JARs and class files
* are searched for.
*/
- public void setBaseDirectory(File baseDirectory)
+ public void setBase(File base)
{
- this.baseDirectory = baseDirectory;
+ this.base = base;
}
/**
@@ -162,25 +162,31 @@
public void resolveDependencies()
{
// Collect all the JAR and class file that we can find
- // in the baseDirectory.
+ // in the base or just process the JAR.
- String[] files =
- MavenUtils.getFiles(baseDirectory.getAbsolutePath(), "*.jar,*.class");
-
- for (int i = 0; i < files.length; i++)
+ if (base.isDirectory())
{
- String file = files[i];
-
- if (file.endsWith("jar"))
- {
- processJAR(file);
- }
- else
+ String[] files =
+ MavenUtils.getFiles(base.getAbsolutePath(), "*.jar,*.class");
+
+ for (int i = 0; i < files.length; i++)
{
- processClassReference(file);
+ String file = files[i];
+
+ if (file.endsWith("jar"))
+ {
+ processJAR(file);
+ }
+ else
+ {
+ processClassReference(file);
+ }
}
}
-
+ else
+ {
+ processJAR(base.getAbsolutePath());
+ }
}
/**
@@ -255,7 +261,7 @@
public static void main(String[] args)
{
ProjectResolver bdr = new ProjectResolver();
- bdr.setBaseDirectory(new File(args[0]));
+ bdr.setBase(new File(args[0]));
bdr.setPackageExcludes(args[1]);
bdr.resolveDependencies();
List packageReferences = bdr.getPackageReferences();
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
