You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@maven.apache.org by br...@apache.org on 2004/03/28 00:54:39 UTC
cvs commit: maven/src/java/org/apache/maven/plugin JellyScriptHousing.java PluginManager.java PluginScriptParser.java
brett 2004/03/27 15:54:39
Modified: src/java/org/apache/maven Tag: MAVEN-1_0-BRANCH
MavenUtils.java
src/java/org/apache/maven/plugin Tag: MAVEN-1_0-BRANCH
JellyScriptHousing.java PluginManager.java
PluginScriptParser.java
Log:
need to set these properties each time - integrateMap will not override them
Revision Changes Path
No revision
No revision
1.107.4.14 +14 -17 maven/src/java/org/apache/maven/MavenUtils.java
Index: MavenUtils.java
===================================================================
RCS file: /home/cvs/maven/src/java/org/apache/maven/MavenUtils.java,v
retrieving revision 1.107.4.13
retrieving revision 1.107.4.14
diff -u -r1.107.4.13 -r1.107.4.14
--- MavenUtils.java 26 Mar 2004 00:18:06 -0000 1.107.4.13
+++ MavenUtils.java 27 Mar 2004 23:54:39 -0000 1.107.4.14
@@ -824,27 +824,24 @@
{
value = map.get( key );
- if ( value instanceof String )
+ try
{
- try
- {
- String literalValue = (String) value;
- Expression expr = CompositeExpression.parse( literalValue, factory );
+ String literalValue = (String) value;
+ Expression expr = CompositeExpression.parse( literalValue, factory );
- if ( expr != null )
- {
- value = expr;
- }
- else
- {
- value = literalValue;
- }
+ if ( expr != null )
+ {
+ value = expr;
}
- catch ( Exception e )
+ else
{
- // do nothing.
- log.debug( "Unexpected error evaluating expression", e );
+ value = literalValue;
}
+ }
+ catch ( Exception e )
+ {
+ // do nothing.
+ log.debug( "Unexpected error evaluating expression", e );
}
context.setVariable( key, value );
}
No revision
No revision
1.3.4.9 +1 -4 maven/src/java/org/apache/maven/plugin/JellyScriptHousing.java
Index: JellyScriptHousing.java
===================================================================
RCS file: /home/cvs/maven/src/java/org/apache/maven/plugin/JellyScriptHousing.java,v
retrieving revision 1.3.4.8
retrieving revision 1.3.4.9
diff -u -r1.3.4.8 -r1.3.4.9
--- JellyScriptHousing.java 26 Mar 2004 00:22:42 -0000 1.3.4.8
+++ JellyScriptHousing.java 27 Mar 2004 23:54:39 -0000 1.3.4.9
@@ -201,9 +201,6 @@
map.putAll( props );
}
- map.put( "plugin.dir", pluginDirectory );
- map.put( "plugin.resources", new File( pluginDirectory, "plugin-resources" ) );
-
return map;
}
}
1.70.4.28 +4 -1 maven/src/java/org/apache/maven/plugin/PluginManager.java
Index: PluginManager.java
===================================================================
RCS file: /home/cvs/maven/src/java/org/apache/maven/plugin/PluginManager.java,v
retrieving revision 1.70.4.27
retrieving revision 1.70.4.28
diff -u -r1.70.4.27 -r1.70.4.28
--- PluginManager.java 26 Mar 2004 00:22:42 -0000 1.70.4.27
+++ PluginManager.java 27 Mar 2004 23:54:39 -0000 1.70.4.28
@@ -580,6 +580,9 @@
pluginContext.setInherit( true );
pluginContext.setVariable( "context", pluginContext );
pluginContext.setVariable( "plugin", housing.getProject() );
+ pluginContext.setVariable( "plugin.dir", housing.getPluginDirectory() );
+ pluginContext.setVariable( "plugin.resources", new File( housing.getPluginDirectory(), "plugin-resources" ) );
+
runScript( housing, pluginContext );
}
1.1.4.9 +8 -1 maven/src/java/org/apache/maven/plugin/PluginScriptParser.java
Index: PluginScriptParser.java
===================================================================
RCS file: /home/cvs/maven/src/java/org/apache/maven/plugin/PluginScriptParser.java,v
retrieving revision 1.1.4.8
retrieving revision 1.1.4.9
diff -u -r1.1.4.8 -r1.1.4.9
--- PluginScriptParser.java 25 Mar 2004 05:04:03 -0000 1.1.4.8
+++ PluginScriptParser.java 27 Mar 2004 23:54:39 -0000 1.1.4.9
@@ -100,9 +100,16 @@
{
importUri = attributes.getValue( "file" );
}
+ if ( importUri != null )
+ {
+ // We -could- evaluate this as an expression, but the only thing set at this point is ${basedir}
+ // and some expressions will spit out exceptions (eg ${context.getVariable('blah')})
+ // TODO: maybe sub in basedir, plugin.resources and plugin.dir?
+ }
+
if ( importUri == null )
{
- log.warn( rawName + " does not have a uri in " + jellyScriptHousing.getName() );
+ log.debug( rawName + " does not have a uri in " + jellyScriptHousing.getName() );
}
else
{
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@maven.apache.org
For additional commands, e-mail: dev-help@maven.apache.org