werken 2002/07/06 09:18:21
Modified: src/java/org/apache/maven/app Maven.java
MavenJellyContext.java
Log:
Gotta use a MavenJellyContext instead of a normal JellyContext when
nesting.
Revision Changes Path
1.51 +1 -1 jakarta-turbine-maven/src/java/org/apache/maven/app/Maven.java
Index: Maven.java
===================================================================
RCS file: /home/cvs/jakarta-turbine-maven/src/java/org/apache/maven/app/Maven.java,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -r1.50 -r1.51
--- Maven.java 6 Jul 2002 15:49:06 -0000 1.50
+++ Maven.java 6 Jul 2002 16:18:21 -0000 1.51
@@ -808,7 +808,7 @@
// lets create a child context
// so that URIs are relative to the projects build file
- JellyContext context = new JellyContext( getJellyContext() );
+ MavenJellyContext context = new MavenJellyContext( getJellyContext() );
URL projectURL = projectBuildFile.getParentFile().toURL();
1.8 +6 -2
jakarta-turbine-maven/src/java/org/apache/maven/app/MavenJellyContext.java
Index: MavenJellyContext.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine-maven/src/java/org/apache/maven/app/MavenJellyContext.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- MavenJellyContext.java 5 Jul 2002 23:17:43 -0000 1.7
+++ MavenJellyContext.java 6 Jul 2002 16:18:21 -0000 1.8
@@ -185,25 +185,29 @@
*/
public Object getVariable(String name)
{
+ // System.err.println( "getVariable(" + name + ")" );
+
Object value = this.props.get(name);
- // Object value = super.getVariable(name);
if (value == null)
{
value = super.getVariable(name);
- // value = this.props.get(name);
}
if (value instanceof String)
{
+ // System.err.println( "getVariable(" + name + ") is-a string" );
value = ProjectHelper.replaceProperties(getAntProject(),
(String) value,
this.asProps);
}
else if ( value instanceof Expression )
{
+ // System.err.println( "getVariable(" + name + ") is-a expression" );
value = ((Expression)value).evaluate( this );
}
+
+ // System.err.println( "getVariable(" + name + ") -> " + value );
return value;
}
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
