dlr 2002/10/11 15:57:09
Modified: src/java/org/apache/maven CreateDependencyClasspath.java
Log:
Corrected handling of the maven.jar.override property in the execute()
method. MavenJellyContext.getVariable(String) can returns a Boolean
object when a variable's value is convertable into such --
maven.jar.override is this type of variable.
Revision Changes Path
1.7 +5 -4
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.6
retrieving revision 1.7
diff -u -u -r1.6 -r1.7
--- CreateDependencyClasspath.java 11 Oct 2002 19:58:47 -0000 1.6
+++ CreateDependencyClasspath.java 11 Oct 2002 22:57:08 -0000 1.7
@@ -74,6 +74,7 @@
* maven.xml files and plugin.jelly files.
*
* @author <a href="mailto:[EMAIL PROTECTED]";>Jason van Zyl</a>
+ * @author <a href="mailto:[EMAIL PROTECTED]";>Daniel Rall</a>
* @version $Id$
*/
public class CreateDependencyClasspath
@@ -166,8 +167,7 @@
mavenProject = (Project) context.getVariable("pom");
}
- String mavenJarOverride =
- (String) context.getVariable("maven.jar.override");
+ Object mavenJarOverride = context.getVariable("maven.jar.override");
String mavenRepoLocal =
(String) context.getVariable("maven.repo.local");
org.apache.tools.ant.Project antProject =
@@ -191,7 +191,8 @@
(String) context.getVariable("maven.jar." + d.getId());
Path path = new Path(antProject);
- if ("on".equalsIgnoreCase(mavenJarOverride)
+ if ((mavenJarOverride instanceof Boolean
+ && ((Boolean) mavenJarOverride).booleanValue())
&& (mavenJarProperty != null)
&& (mavenJarProperty.length() > 0))
{
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
