Return-Path: Delivered-To: apmail-maven-m2-dev-archive@www.apache.org Received: (qmail 13869 invoked from network); 5 Dec 2004 22:06:37 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199) by minotaur-2.apache.org with SMTP; 5 Dec 2004 22:06:37 -0000 Received: (qmail 88656 invoked by uid 500); 5 Dec 2004 22:06:36 -0000 Delivered-To: apmail-maven-m2-dev-archive@maven.apache.org Received: (qmail 88639 invoked by uid 500); 5 Dec 2004 22:06:36 -0000 Mailing-List: contact m2-dev-help@maven.apache.org; run by ezmlm Precedence: bulk list-help: list-unsubscribe: list-post: List-Id: "Maven 2 Developers List" Reply-To: "Maven 2 Developers List" Delivered-To: mailing list m2-dev@maven.apache.org Received: (qmail 88625 invoked by uid 500); 5 Dec 2004 22:06:36 -0000 Delivered-To: apmail-maven-components-cvs@apache.org Received: (qmail 88622 invoked by uid 99); 5 Dec 2004 22:06:36 -0000 X-ASF-Spam-Status: No, hits=-10.0 required=10.0 tests=ALL_TRUSTED,NO_REAL_NAME X-Spam-Check-By: apache.org Received: from minotaur.apache.org (HELO minotaur.apache.org) (209.237.227.194) by apache.org (qpsmtpd/0.28) with SMTP; Sun, 05 Dec 2004 14:06:36 -0800 Received: (qmail 13855 invoked by uid 1162); 5 Dec 2004 22:06:35 -0000 Date: 5 Dec 2004 22:06:35 -0000 Message-ID: <20041205220635.13838.qmail@minotaur.apache.org> From: jvanzyl@apache.org To: maven-components-cvs@apache.org Subject: cvs commit: maven-components/maven-core/src/main/java/org/apache/maven/plugin PluginParameterExpressionEvaluator.java X-Virus-Checked: Checked X-Spam-Rating: minotaur-2.apache.org 1.6.2 0/1000/N jvanzyl 2004/12/05 14:06:34 Modified: maven-core/src/main/java/org/apache/maven/plugin PluginParameterExpressionEvaluator.java Log: o we're still using ognl-esque expressions but we don't need its syntax internally. Revision Changes Path 1.2 +3 -8 maven-components/maven-core/src/main/java/org/apache/maven/plugin/PluginParameterExpressionEvaluator.java Index: PluginParameterExpressionEvaluator.java =================================================================== RCS file: /home/cvs/maven-components/maven-core/src/main/java/org/apache/maven/plugin/PluginParameterExpressionEvaluator.java,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- PluginParameterExpressionEvaluator.java 5 Dec 2004 21:45:35 -0000 1.1 +++ PluginParameterExpressionEvaluator.java 5 Dec 2004 22:06:34 -0000 1.2 @@ -70,12 +70,12 @@ if ( pathSeparator > 0 ) { - value = getValue( expression.substring( 9, pathSeparator ), context.getProject() ) + value = getValue( expression.substring( 1, pathSeparator ), context.getProject() ) + expression.substring( pathSeparator ); } else { - value = getValue( expression.substring( 9 ), context.getProject() ); + value = getValue( expression.substring( 1 ), context.getProject() ); } } catch ( Exception e ) @@ -131,11 +131,6 @@ private static Object getValue( String expression, MavenProject project ) throws Exception { - - expression = "project." + expression; - - System.out.println( "expression = " + expression ); - return ReflectionProjectValueExtractor.evaluate( expression, project ); } }