You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by br...@apache.org on 2008/03/03 00:33:49 UTC
svn commit: r632878 -
/maven/enforcer/trunk/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/EvaluateBeanshell.java
Author: brianf
Date: Sun Mar 2 15:33:49 2008
New Revision: 632878
URL: http://svn.apache.org/viewvc?rev=632878&view=rev
Log:
MENFORCER-33 remove unused code in beanshell rule
Modified:
maven/enforcer/trunk/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/EvaluateBeanshell.java
Modified: maven/enforcer/trunk/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/EvaluateBeanshell.java
URL: http://svn.apache.org/viewvc/maven/enforcer/trunk/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/EvaluateBeanshell.java?rev=632878&r1=632877&r2=632878&view=diff
==============================================================================
--- maven/enforcer/trunk/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/EvaluateBeanshell.java (original)
+++ maven/enforcer/trunk/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/EvaluateBeanshell.java Sun Mar 2 15:33:49 2008
@@ -28,7 +28,6 @@
import org.apache.maven.plugin.logging.Log;
import org.apache.maven.project.MavenProject;
import org.codehaus.plexus.component.configurator.expression.ExpressionEvaluationException;
-import org.codehaus.plexus.component.repository.exception.ComponentLookupException;
import org.codehaus.plexus.util.StringUtils;
import bsh.EvalError;
@@ -61,22 +60,6 @@
try
{
- // get the various expressions out of the
- // helper.
- MavenProject project = (MavenProject) helper.evaluate( "${project}" );
- MavenSession session = (MavenSession) helper.evaluate( "${session}" );
- String target = (String) helper.evaluate( "${project.build.directory}" );
- String artifactId = (String) helper.evaluate( "${project.artifactId}" );
- ArtifactResolver resolver = (ArtifactResolver) helper.getComponent( ArtifactResolver.class );
- RuntimeInformation rti = (RuntimeInformation) helper.getComponent( RuntimeInformation.class );
-
- log.debug( "Retrieved Target Folder: " + target );
- log.debug( "Retrieved ArtifactId: " + artifactId );
- log.debug( "Retrieved Project: " + project );
- log.debug( "Retrieved RuntimeInfo: " + rti );
- log.debug( "Retrieved Session: " + session );
- log.debug( "Retrieved Resolver: " + resolver );
-
log.debug( "Echo condition : " + this.condition );
// Evaluate condition within Plexus Container
String script = (String) helper.evaluate( this.condition );
@@ -90,10 +73,6 @@
throw new EnforcerRuleException( this.message );
}
}
- catch ( ComponentLookupException e )
- {
- throw new EnforcerRuleException( "Unable to lookup a component", e );
- }
catch ( ExpressionEvaluationException e )
{
throw new EnforcerRuleException( "Unable to evaluate an expression", e );
@@ -152,4 +131,4 @@
return false;
}
-}
\ No newline at end of file
+}