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 2005/04/22 10:33:34 UTC
svn commit: r164195 -
/maven/components/trunk/maven-core/src/main/java/org/apache/maven/plugin
/maven/components/trunk/maven-core/src/test/java/org/apache/maven/plugin
/maven/components/trunk/maven-plugins/maven-compiler-plugin/src/main/java/org/apache/maven/plugin
/maven/components/trunk/maven-plugins/maven-deploy-plugin/src/main/java/org/apache/maven/plugin/deploy
/maven/components/trunk/maven-plugins/maven-install-plugin/src/main/java/org/apache/maven/plugin/install
/maven/components/trunk/maven-plugins/maven-jar-plugin/src/main/java/org/apache/maven/plugin/jar
/maven/components/trunk/maven-plugins/maven-plugin-plugin/src/main/java/org/apache/maven/plugin/plugin
/maven/components/trunk/maven-plugins/maven-resources-plugin/src/main/java/org/apache/maven/plugin/resources
/maven/components/trunk/maven-plugins/maven-surefire-plugin/src/main/java/org/apache/maven/test
Author: brett
Date: Fri Apr 22 01:33:34 2005
New Revision: 164195
URL: http://svn.apache.org/viewcvs?rev=164195&view=rev
Log:
add more use of ${} expressions, fix problem when } was not at end
Modified:
maven/components/trunk/maven-core/src/main/java/org/apache/maven/plugin/PluginParameterExpressionEvaluator.java
maven/components/trunk/maven-core/src/test/java/org/apache/maven/plugin/PluginParameterExpressionEvaluatorTest.java
maven/components/trunk/maven-plugins/maven-compiler-plugin/src/main/java/org/apache/maven/plugin/CompilerMojo.java
maven/components/trunk/maven-plugins/maven-compiler-plugin/src/main/java/org/apache/maven/plugin/TestCompilerMojo.java
maven/components/trunk/maven-plugins/maven-deploy-plugin/src/main/java/org/apache/maven/plugin/deploy/DeployMojo.java
maven/components/trunk/maven-plugins/maven-install-plugin/src/main/java/org/apache/maven/plugin/install/InstallMojo.java
maven/components/trunk/maven-plugins/maven-jar-plugin/src/main/java/org/apache/maven/plugin/jar/JarMojo.java
maven/components/trunk/maven-plugins/maven-plugin-plugin/src/main/java/org/apache/maven/plugin/plugin/DescriptorGeneratorMojo.java
maven/components/trunk/maven-plugins/maven-resources-plugin/src/main/java/org/apache/maven/plugin/resources/ResourcesMojo.java
maven/components/trunk/maven-plugins/maven-resources-plugin/src/main/java/org/apache/maven/plugin/resources/TestResourcesMojo.java
maven/components/trunk/maven-plugins/maven-surefire-plugin/src/main/java/org/apache/maven/test/SurefirePlugin.java
Modified: maven/components/trunk/maven-core/src/main/java/org/apache/maven/plugin/PluginParameterExpressionEvaluator.java
URL: http://svn.apache.org/viewcvs/maven/components/trunk/maven-core/src/main/java/org/apache/maven/plugin/PluginParameterExpressionEvaluator.java?rev=164195&r1=164194&r2=164195&view=diff
==============================================================================
--- maven/components/trunk/maven-core/src/main/java/org/apache/maven/plugin/PluginParameterExpressionEvaluator.java (original)
+++ maven/components/trunk/maven-core/src/main/java/org/apache/maven/plugin/PluginParameterExpressionEvaluator.java Fri Apr 22 01:33:34 2005
@@ -57,6 +57,19 @@
String expression = stripTokens( expr );
if ( expression.equals( expr ) )
{
+ int index = expr.indexOf( "${" );
+ if ( index >= 0 )
+ {
+ int lastIndex = expr.indexOf( "}", index );
+ if ( lastIndex >= 0 )
+ {
+ String retVal = expr.substring( 0, index );
+ retVal += evaluate( expr.substring( index, lastIndex + 1 ) );
+ retVal += evaluate( expr.substring( lastIndex + 1 ) );
+ return retVal;
+ }
+ }
+
// Was not an expression
return expression;
}
@@ -148,7 +161,8 @@
if ( value instanceof String )
{
- // Note that we only half support nesting of expressions due to endsWith above
+ // TODO: without #, this could just be an evaluate call...
+
String val = (String) value;
int sharpSeparator = val.indexOf( "#" );
if ( sharpSeparator < 0 )
Modified: maven/components/trunk/maven-core/src/test/java/org/apache/maven/plugin/PluginParameterExpressionEvaluatorTest.java
URL: http://svn.apache.org/viewcvs/maven/components/trunk/maven-core/src/test/java/org/apache/maven/plugin/PluginParameterExpressionEvaluatorTest.java?rev=164195&r1=164194&r2=164195&view=diff
==============================================================================
--- maven/components/trunk/maven-core/src/test/java/org/apache/maven/plugin/PluginParameterExpressionEvaluatorTest.java (original)
+++ maven/components/trunk/maven-core/src/test/java/org/apache/maven/plugin/PluginParameterExpressionEvaluatorTest.java Fri Apr 22 01:33:34 2005
@@ -61,7 +61,6 @@
"legacy" );
ArtifactRepository repo = new ArtifactRepository( "local", "here", repoLayout );
- PluginManager mgr = (PluginManager) lookup( PluginManager.ROLE );
PlexusContainer container = getContainer();
@@ -74,39 +73,44 @@
MavenProject project = new MavenProject( model );
project.setFile( new File( "pom.xml" ).getCanonicalFile() );
- MavenSession session = new MavenSession( project, container, new Settings(), repo,
- new DefaultEventDispatcher(), new DefaultLog( container.getLogger() ),
- Collections.EMPTY_LIST );
+ MavenSession session = createSession( project, container, repo );
ExpressionEvaluator expressionEvaluator = new PluginParameterExpressionEvaluator( session, null );
- Object value = expressionEvaluator.evaluate( "#project.build.directory/classes" );
+ Object value = expressionEvaluator.evaluate( "#project.build.directory/classes" );
String actual = new File( value.toString() ).getCanonicalPath();
assertEquals( expected, actual );
+
+ value = expressionEvaluator.evaluate( "${project.build.directory}/classes" );
+ actual = new File( value.toString() ).getCanonicalPath();
+
+ assertEquals( expected, actual );
+ }
+
+ private static MavenSession createSession( MavenProject project, PlexusContainer container,
+ ArtifactRepository repo )
+ {
+ return new MavenSession( project, container, new Settings(), repo, new DefaultEventDispatcher(),
+ new DefaultLog( container.getLogger() ), Collections.EMPTY_LIST );
}
public void testParameterThatIsAComponent()
throws Exception
{
- String role = "#component.org.apache.maven.project.MavenProjectBuilder";
ArtifactRepositoryLayout repoLayout = (ArtifactRepositoryLayout) lookup( ArtifactRepositoryLayout.ROLE,
"legacy" );
ArtifactRepository repo = new ArtifactRepository( "test", "http://www.test.com", repoLayout );
- PluginManager mgr = (PluginManager) lookup( PluginManager.ROLE );
PlexusContainer container = getContainer();
- MavenSession session = new MavenSession( null, // don't need a project for this test.
- container, new Settings(), repo,
- new DefaultEventDispatcher(), new DefaultLog( container.getLogger() ),
- Collections.EMPTY_LIST );
+ MavenSession session = createSession( null, container, repo );
ExpressionEvaluator expressionEvaluator = new PluginParameterExpressionEvaluator( session, null );
- Object value = expressionEvaluator.evaluate( role );
- assertNotNull( value );
+ assertNotNull( expressionEvaluator.evaluate( "#component.org.apache.maven.project.MavenProjectBuilder" ) );
+ assertNotNull( expressionEvaluator.evaluate( "${component.org.apache.maven.project.MavenProjectBuilder}" ) );
}
public void testLocalRepositoryExtraction()
@@ -116,13 +120,9 @@
"legacy" );
ArtifactRepository repo = new ArtifactRepository( "local", "target/repo", repoLayout );
- PluginManager mgr = (PluginManager) lookup( PluginManager.ROLE );
PlexusContainer container = getContainer();
- MavenSession session = new MavenSession( null, // don't need a project for this test.
- container, new Settings(), repo,
- new DefaultEventDispatcher(), new DefaultLog( container.getLogger() ),
- Collections.EMPTY_LIST );
+ MavenSession session = createSession( null, container, repo );
ExpressionEvaluator expressionEvaluator = new PluginParameterExpressionEvaluator( session, null );
Object value = expressionEvaluator.evaluate( "#localRepository" );
Modified: maven/components/trunk/maven-plugins/maven-compiler-plugin/src/main/java/org/apache/maven/plugin/CompilerMojo.java
URL: http://svn.apache.org/viewcvs/maven/components/trunk/maven-plugins/maven-compiler-plugin/src/main/java/org/apache/maven/plugin/CompilerMojo.java?rev=164195&r1=164194&r2=164195&view=diff
==============================================================================
--- maven/components/trunk/maven-plugins/maven-compiler-plugin/src/main/java/org/apache/maven/plugin/CompilerMojo.java (original)
+++ maven/components/trunk/maven-plugins/maven-compiler-plugin/src/main/java/org/apache/maven/plugin/CompilerMojo.java Fri Apr 22 01:33:34 2005
@@ -37,20 +37,20 @@
* @requiresDependencyResolution compile
* @description Compiles application sources
* @parameter name="compileSourceRoots" type="java.util.List" required="true" validator=""
- * expression="#project.compileSourceRoots" description=""
+ * expression="${project.compileSourceRoots}" description=""
* @parameter name="outputDirectory" type="String" required="true" validator=""
- * expression="#project.build.outputDirectory" description=""
+ * expression="${project.build.outputDirectory}" description=""
* @parameter name="classpathElements" type="List" required="true" validator=""
- * expression="#project.compileClasspathElements" description=""
+ * expression="${project.compileClasspathElements}" description=""
* @parameter name="debug" type="boolean" required="false" validator=""
- * expression="#maven.compiler.debug" description="Whether to include debugging
+ * expression="${maven.compiler.debug}" description="Whether to include debugging
* information in the compiled class files; the default value is false"
* @todo change debug parameter type to Boolean
- * @parameter name="source" type="String" required="false" expression="#source" validator=""
+ * @parameter name="source" type="String" required="false" expression="${source}" validator=""
* description="The -source argument for the Java compiler"
- * @parameter name="target" type="String" required="false" expression="#target" validator=""
+ * @parameter name="target" type="String" required="false" expression="${target}" validator=""
* description="The -target argument for the Java compiler"
- * @parameter name="staleMillis" type="long" required="false" expression="#lastModGranularityMs"
+ * @parameter name="staleMillis" type="long" required="false" expression="${lastModGranularityMs}"
* validator="" description="The granularity in milliseconds of the last modification
* date for testing whether a source needs recompilation"
* @todo change staleMillis parameter type to Long
Modified: maven/components/trunk/maven-plugins/maven-compiler-plugin/src/main/java/org/apache/maven/plugin/TestCompilerMojo.java
URL: http://svn.apache.org/viewcvs/maven/components/trunk/maven-plugins/maven-compiler-plugin/src/main/java/org/apache/maven/plugin/TestCompilerMojo.java?rev=164195&r1=164194&r2=164195&view=diff
==============================================================================
--- maven/components/trunk/maven-plugins/maven-compiler-plugin/src/main/java/org/apache/maven/plugin/TestCompilerMojo.java (original)
+++ maven/components/trunk/maven-plugins/maven-compiler-plugin/src/main/java/org/apache/maven/plugin/TestCompilerMojo.java Fri Apr 22 01:33:34 2005
@@ -26,25 +26,25 @@
* type="java.util.List"
* required="true"
* validator=""
- * expression="#project.testCompileSourceRoots"
+ * expression="${project.testCompileSourceRoots}"
* description=""
* @parameter name="outputDirectory"
* type="String"
* required="true"
* validator=""
- * expression="#project.build.testOutputDirectory"
+ * expression="${project.build.testOutputDirectory}"
* description=""
* @parameter name="classpathElements"
* type="List"
* required="true"
* validator=""
- * expression="#project.testClasspathElements"
+ * expression="${project.testClasspathElements}"
* description=""
* @parameter name="debug"
* type="String"
* required="false"
* validator=""
- * expression="#maven.compiler.debug"
+ * expression="${maven.compiler.debug}"
* description="Whether to include debugging information in the compiled class files; the default value is false"
*/
public class TestCompilerMojo
Modified: maven/components/trunk/maven-plugins/maven-deploy-plugin/src/main/java/org/apache/maven/plugin/deploy/DeployMojo.java
URL: http://svn.apache.org/viewcvs/maven/components/trunk/maven-plugins/maven-deploy-plugin/src/main/java/org/apache/maven/plugin/deploy/DeployMojo.java?rev=164195&r1=164194&r2=164195&view=diff
==============================================================================
--- maven/components/trunk/maven-plugins/maven-deploy-plugin/src/main/java/org/apache/maven/plugin/deploy/DeployMojo.java (original)
+++ maven/components/trunk/maven-plugins/maven-deploy-plugin/src/main/java/org/apache/maven/plugin/deploy/DeployMojo.java Fri Apr 22 01:33:34 2005
@@ -38,25 +38,25 @@
* type="org.apache.maven.project.MavenProject"
* required="true"
* validator=""
- * expression="#project"
+ * expression="${project}"
* description=""
* @parameter name="deployer"
* type="org.apache.maven.artifact.deployer.ArtifactDeployer"
* required="true"
* validator=""
- * expression="#component.org.apache.maven.artifact.deployer.ArtifactDeployer"
+ * expression="${component.org.apache.maven.artifact.deployer.ArtifactDeployer}"
* description=""
* @parameter name="deploymentRepository"
* type="org.apache.maven.artifact.repository.ArtifactRepository"
* required="true"
* validator=""
- * expression="#project.distributionManagementArtifactRepository"
+ * expression="${project.distributionManagementArtifactRepository}"
* description=""
* @parameter name="localRepository"
* type="org.apache.maven.artifact.repository.ArtifactRepository"
* required="true"
* validator=""
- * expression="#localRepository"
+ * expression="${localRepository}"
* description=""
*/
public class DeployMojo
Modified: maven/components/trunk/maven-plugins/maven-install-plugin/src/main/java/org/apache/maven/plugin/install/InstallMojo.java
URL: http://svn.apache.org/viewcvs/maven/components/trunk/maven-plugins/maven-install-plugin/src/main/java/org/apache/maven/plugin/install/InstallMojo.java?rev=164195&r1=164194&r2=164195&view=diff
==============================================================================
--- maven/components/trunk/maven-plugins/maven-install-plugin/src/main/java/org/apache/maven/plugin/install/InstallMojo.java (original)
+++ maven/components/trunk/maven-plugins/maven-install-plugin/src/main/java/org/apache/maven/plugin/install/InstallMojo.java Fri Apr 22 01:33:34 2005
@@ -38,19 +38,19 @@
* type="org.apache.maven.project.MavenProject"
* required="true"
* validator=""
- * expression="#project"
+ * expression="${project}"
* description=""
* @parameter name="installer"
* type="org.apache.maven.artifact.installer.ArtifactInstaller"
* required="true"
* validator=""
- * expression="#component.org.apache.maven.artifact.installer.ArtifactInstaller"
+ * expression="${component.org.apache.maven.artifact.installer.ArtifactInstaller}"
* description=""
* @parameter name="localRepository"
* type="org.apache.maven.artifact.repository.ArtifactRepository"
* required="true"
* validator=""
- * expression="#localRepository"
+ * expression="${localRepository}"
* description=""
*/
public class InstallMojo
Modified: maven/components/trunk/maven-plugins/maven-jar-plugin/src/main/java/org/apache/maven/plugin/jar/JarMojo.java
URL: http://svn.apache.org/viewcvs/maven/components/trunk/maven-plugins/maven-jar-plugin/src/main/java/org/apache/maven/plugin/jar/JarMojo.java?rev=164195&r1=164194&r2=164195&view=diff
==============================================================================
--- maven/components/trunk/maven-plugins/maven-jar-plugin/src/main/java/org/apache/maven/plugin/jar/JarMojo.java (original)
+++ maven/components/trunk/maven-plugins/maven-jar-plugin/src/main/java/org/apache/maven/plugin/jar/JarMojo.java Fri Apr 22 01:33:34 2005
@@ -34,7 +34,7 @@
* type="String"
* required="true"
* validator=""
- * expression="#project.build.finalName"
+ * expression="${project.build.finalName}"
* description=""
* @parameter name="archive"
* type=""
@@ -46,19 +46,19 @@
* type="String"
* required="true"
* validator=""
- * expression="#project.build.outputDirectory"
+ * expression="${project.build.outputDirectory}"
* description=""
* @parameter name="basedir"
* type="String"
* required="true"
* validator=""
- * expression="#project.build.directory"
+ * expression="${project.build.directory}"
* description=""
* @parameter name="project"
* type="org.apache.maven.project.MavenProject"
* required="true"
* validator=""
- * expression="#project"
+ * expression="${project}"
* description="current MavenProject instance"
*/
public class JarMojo
Modified: maven/components/trunk/maven-plugins/maven-plugin-plugin/src/main/java/org/apache/maven/plugin/plugin/DescriptorGeneratorMojo.java
URL: http://svn.apache.org/viewcvs/maven/components/trunk/maven-plugins/maven-plugin-plugin/src/main/java/org/apache/maven/plugin/plugin/DescriptorGeneratorMojo.java?rev=164195&r1=164194&r2=164195&view=diff
==============================================================================
--- maven/components/trunk/maven-plugins/maven-plugin-plugin/src/main/java/org/apache/maven/plugin/plugin/DescriptorGeneratorMojo.java (original)
+++ maven/components/trunk/maven-plugins/maven-plugin-plugin/src/main/java/org/apache/maven/plugin/plugin/DescriptorGeneratorMojo.java Fri Apr 22 01:33:34 2005
@@ -35,19 +35,19 @@
* type="org.apache.maven.tools.plugin.scanner.MojoScanner"
* required="true"
* validator=""
- * expression="#component.org.apache.maven.tools.plugin.scanner.MojoScanner"
+ * expression="${component.org.apache.maven.tools.plugin.scanner.MojoScanner}"
* description="Scanner used to discover mojo descriptors from this project"
* @parameter name="project"
* type="org.apache.maven.project.MavenProject"
* required="true"
* validator=""
- * expression="#project"
+ * expression="${project}"
* description=""
* @parameter name="outputDirectory"
* type="String"
* required="true"
* validator=""
- * expression="#project.build.directory/classes/META-INF/maven"
+ * expression="${project.build.outputDirectory}/META-INF/maven"
* description=""
*/
public class DescriptorGeneratorMojo
Modified: maven/components/trunk/maven-plugins/maven-resources-plugin/src/main/java/org/apache/maven/plugin/resources/ResourcesMojo.java
URL: http://svn.apache.org/viewcvs/maven/components/trunk/maven-plugins/maven-resources-plugin/src/main/java/org/apache/maven/plugin/resources/ResourcesMojo.java?rev=164195&r1=164194&r2=164195&view=diff
==============================================================================
--- maven/components/trunk/maven-plugins/maven-resources-plugin/src/main/java/org/apache/maven/plugin/resources/ResourcesMojo.java (original)
+++ maven/components/trunk/maven-plugins/maven-resources-plugin/src/main/java/org/apache/maven/plugin/resources/ResourcesMojo.java Fri Apr 22 01:33:34 2005
@@ -43,13 +43,13 @@
* type="String"
* required="true"
* validator=""
- * expression="#project.build.outputDirectory"
+ * expression="${project.build.outputDirectory}"
* description=""
* @parameter name="resources"
* type="List"
* required="true"
* validator=""
- * expression="#project.build.resources"
+ * expression="${project.build.resources}"
* description=""
*/
public class ResourcesMojo
Modified: maven/components/trunk/maven-plugins/maven-resources-plugin/src/main/java/org/apache/maven/plugin/resources/TestResourcesMojo.java
URL: http://svn.apache.org/viewcvs/maven/components/trunk/maven-plugins/maven-resources-plugin/src/main/java/org/apache/maven/plugin/resources/TestResourcesMojo.java?rev=164195&r1=164194&r2=164195&view=diff
==============================================================================
--- maven/components/trunk/maven-plugins/maven-resources-plugin/src/main/java/org/apache/maven/plugin/resources/TestResourcesMojo.java (original)
+++ maven/components/trunk/maven-plugins/maven-resources-plugin/src/main/java/org/apache/maven/plugin/resources/TestResourcesMojo.java Fri Apr 22 01:33:34 2005
@@ -26,13 +26,13 @@
* type="String"
* required="true"
* validator=""
- * expression="#project.build.testOutputDirectory"
+ * expression="${project.build.testOutputDirectory}"
* description=""
* @parameter name="resources"
* type="List"
* required="true"
* validator=""
- * expression="#project.build.testResources"
+ * expression="${project.build.testResources}"
* description=""
*/
public class TestResourcesMojo
Modified: maven/components/trunk/maven-plugins/maven-surefire-plugin/src/main/java/org/apache/maven/test/SurefirePlugin.java
URL: http://svn.apache.org/viewcvs/maven/components/trunk/maven-plugins/maven-surefire-plugin/src/main/java/org/apache/maven/test/SurefirePlugin.java?rev=164195&r1=164194&r2=164195&view=diff
==============================================================================
--- maven/components/trunk/maven-plugins/maven-surefire-plugin/src/main/java/org/apache/maven/test/SurefirePlugin.java (original)
+++ maven/components/trunk/maven-plugins/maven-surefire-plugin/src/main/java/org/apache/maven/test/SurefirePlugin.java Fri Apr 22 01:33:34 2005
@@ -38,19 +38,19 @@
* type="String"
* required="true"
* validator="validator"
- * expression="#basedir"
+ * expression="${basedir}"
* description=""
* @parameter name="classesDirectory"
* type="String"
* required="true"
* validator="validator"
- * expression="#project.build.outputDirectory"
+ * expression="${project.build.outputDirectory}"
* description=""
* @parameter name="testClassesDirectory"
* type="String"
* required="true"
* validator="validator"
- * expression="#project.build.testOutputDirectory"
+ * expression="${project.build.testOutputDirectory}"
* description=""
* @parameter name="includes"
* type="java.util.List"
@@ -68,25 +68,25 @@
* type="java.util.List"
* required="true"
* validator=""
- * expression="#project.testClasspathElements"
+ * expression="${project.testClasspathElements}"
* description=""
* @parameter name="reportsDirectory"
* type="String"
* required="false"
* validator=""
- * expression="#project.build.directory/surefire-reports"
+ * expression="${project.build.directory/surefire-reports}"
* description="Base directory where all reports are written to."
* @parameter name="test"
* type="String"
* required="false"
* validator=""
- * expression="#test"
+ * expression="${test}"
* description="Specify this parameter if you want to use the test regex notation to select tests to run."
* @parameter name="localRepository"
* type="org.apache.maven.artifact.repository.ArtifactRepository"
* required="true"
* validator=""
- * expression="#localRepository"
+ * expression="${localRepository}"
* description=""
* @todo make version of junit and surefire configurable
* @todo make report to be produced configurable
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@maven.apache.org
For additional commands, e-mail: dev-help@maven.apache.org