dlr 2002/10/11 12:58:47
Modified: src/java/org/apache/maven CreateDependencyClasspath.java
Log:
o Removed tabs from the execute() method.
o Shortened test for the maven.override.jar property, and made it case
insensitive.
Revision Changes Path
1.6 +10 -11
jakarta-turbine-maven/src/java/org/apache/maven/CreateDependencyClasspath.java
Index: CreateDependencyClasspath.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine-maven/src/java/org/apache/maven/CreateDependencyClasspath.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -u -r1.5 -r1.6
--- CreateDependencyClasspath.java 2 Oct 2002 20:14:39 -0000 1.5
+++ CreateDependencyClasspath.java 11 Oct 2002 19:58:47 -0000 1.6
@@ -180,19 +180,18 @@
{
Dependency d = (Dependency) i.next();
- // Only add jar dependencies to the classpath
- //
- if (!(d.isCompileType() || d.isTestType()
- || "jar".equals(d.getType())))
- {
- continue;
- }
+ // 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());
+ (String) context.getVariable("maven.jar." + d.getId());
Path path = new Path(antProject);
- if ((mavenJarOverride != null) && mavenJarOverride.equals("on")
+ if ("on".equalsIgnoreCase(mavenJarOverride)
&& (mavenJarProperty != null)
&& (mavenJarProperty.length() > 0))
{
@@ -204,7 +203,7 @@
}
else
{
- Artifact artifact = DefaultArtifactFactory.createArtifact(d);
+ Artifact artifact = DefaultArtifactFactory.createArtifact(d);
// Use the jar in the local repository.
path.setPath(mavenRepoLocal + artifact.getPath());
classpath.append(path);
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
