You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by jd...@apache.org on 2005/10/27 16:48:00 UTC

svn commit: r328885 - in /maven/components/trunk/maven-core/src: main/java/org/apache/maven/plugin/PluginParameterExpressionEvaluator.java test/java/org/apache/maven/plugin/PluginParameterExpressionEvaluatorTest.java

Author: jdcasey
Date: Thu Oct 27 07:47:55 2005
New Revision: 328885

URL: http://svn.apache.org/viewcvs?rev=328885&view=rev
Log:
Adding '$' as an escape character for variable-syntax which should be passed through.

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

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=328885&r1=328884&r2=328885&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 Thu Oct 27 07:47:55 2005
@@ -115,7 +115,7 @@
         {
             return null;
         }
-
+        
         String expression = stripTokens( expr );
         if ( expression.equals( expr ) )
         {
@@ -126,14 +126,23 @@
                 if ( lastIndex >= 0 )
                 {
                     String retVal = expr.substring( 0, index );
-                    retVal += evaluate( expr.substring( index, lastIndex + 1 ) );
+                    
+                    if ( index > 0 && expr.charAt( index - 1 ) == '$' )
+                    {
+                        retVal += expr.substring( index + 1, lastIndex + 1 );
+                    }
+                    else
+                    {
+                        retVal += evaluate( expr.substring( index, lastIndex + 1 ) );
+                    }
+                    
                     retVal += evaluate( expr.substring( lastIndex + 1 ) );
                     return retVal;
                 }
             }
 
             // Was not an expression
-            return expression;
+            return expression.replaceAll( "\\$\\$", "$" );
         }
 
         MojoDescriptor mojoDescriptor = mojoExecution.getMojoDescriptor();

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=328885&r1=328884&r2=328885&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 Thu Oct 27 07:47:55 2005
@@ -73,6 +73,59 @@
         assertEquals( expected, actual );
     }
 
+    public void testEscapedVariablePassthrough()
+        throws Exception
+    {
+        String var = "${var}";
+
+        Model model = new Model();
+        model.setVersion( "1" );
+
+        MavenProject project = new MavenProject( model );
+
+        ExpressionEvaluator ee = createExpressionEvaluator( project, null, new Properties() );
+
+        Object value = ee.evaluate( "$" + var );
+
+        assertEquals( var, value );
+    }
+
+    public void testEscapedVariablePassthroughInLargerExpression()
+        throws Exception
+    {
+        String var = "${var}";
+        String key = var + " with version: ${project.version}";
+
+        Model model = new Model();
+        model.setVersion( "1" );
+
+        MavenProject project = new MavenProject( model );
+
+        ExpressionEvaluator ee = createExpressionEvaluator( project, null, new Properties() );
+
+        Object value = ee.evaluate( "$" + key );
+
+        assertEquals( "${var} with version: 1", value );
+    }
+
+    public void testMultipleSubExpressionsInLargerExpression()
+        throws Exception
+    {
+        String key = "${project.artifactId} with version: ${project.version}";
+
+        Model model = new Model();
+        model.setArtifactId( "test" );
+        model.setVersion( "1" );
+
+        MavenProject project = new MavenProject( model );
+
+        ExpressionEvaluator ee = createExpressionEvaluator( project, null, new Properties() );
+
+        Object value = ee.evaluate( key );
+
+        assertEquals( "test with version: 1", value );
+    }
+
     public void testPOMPropertyExtractionWithMissingProject_WithDotNotation()
         throws Exception
     {