Author: vsiveton
Date: Sat Aug 9 05:14:13 2008
New Revision: 684237
URL: http://svn.apache.org/viewvc?rev=684237&view=rev
Log:
o code readingness
Modified:
maven/plugin-tools/trunk/maven-plugin-tools-beanshell/src/main/java/org/apache/maven/tools/plugin/extractor/beanshell/BeanshellMojoDescriptorExtractor.java
Modified:
maven/plugin-tools/trunk/maven-plugin-tools-beanshell/src/main/java/org/apache/maven/tools/plugin/extractor/beanshell/BeanshellMojoDescriptorExtractor.java
URL:
http://svn.apache.org/viewvc/maven/plugin-tools/trunk/maven-plugin-tools-beanshell/src/main/java/org/apache/maven/tools/plugin/extractor/beanshell/BeanshellMojoDescriptorExtractor.java?rev=684237&r1=684236&r2=684237&view=diff
==============================================================================
---
maven/plugin-tools/trunk/maven-plugin-tools-beanshell/src/main/java/org/apache/maven/tools/plugin/extractor/beanshell/BeanshellMojoDescriptorExtractor.java
(original)
+++
maven/plugin-tools/trunk/maven-plugin-tools-beanshell/src/main/java/org/apache/maven/tools/plugin/extractor/beanshell/BeanshellMojoDescriptorExtractor.java
Sat Aug 9 05:14:13 2008
@@ -47,35 +47,6 @@
public class BeanshellMojoDescriptorExtractor
extends AbstractScriptedMojoDescriptorExtractor
{
- private MojoDescriptor createMojoDescriptor( String basedir, String
resource, PluginDescriptor pluginDescriptor )
- throws InvalidPluginDescriptorException
- {
- MojoDescriptor mojoDescriptor = new MojoDescriptor();
- mojoDescriptor.setPluginDescriptor( pluginDescriptor );
-
- mojoDescriptor.setLanguage( "bsh" );
- mojoDescriptor.setComponentConfigurator( "bsh" );
-
- mojoDescriptor.setImplementation( resource );
-
- Interpreter interpreter = new Interpreter();
-
- try
- {
- interpreter.set( "file", new File( basedir, resource ) );
-
- interpreter.set( "mojoDescriptor", mojoDescriptor );
-
- interpreter.eval( new InputStreamReader(
getClass().getResourceAsStream( "/extractor.bsh" ) ) );
- }
- catch ( EvalError evalError )
- {
- throw new InvalidPluginDescriptorException( "Error scanning
beanshell script", evalError );
- }
-
- return mojoDescriptor;
- }
-
/** [EMAIL PROTECTED] */
protected String getScriptFileExtension()
{
@@ -117,4 +88,40 @@
return descriptors;
}
+
+ /**
+ * @param basedir not null
+ * @param resource not null
+ * @param pluginDescriptor not null
+ * @return a new Mojo descriptor instance
+ * @throws InvalidPluginDescriptorException if any
+ */
+ private MojoDescriptor createMojoDescriptor( String basedir, String
resource, PluginDescriptor pluginDescriptor )
+ throws InvalidPluginDescriptorException
+ {
+ MojoDescriptor mojoDescriptor = new MojoDescriptor();
+ mojoDescriptor.setPluginDescriptor( pluginDescriptor );
+
+ mojoDescriptor.setLanguage( "bsh" );
+ mojoDescriptor.setComponentConfigurator( "bsh" );
+
+ mojoDescriptor.setImplementation( resource );
+
+ Interpreter interpreter = new Interpreter();
+
+ try
+ {
+ interpreter.set( "file", new File( basedir, resource ) );
+
+ interpreter.set( "mojoDescriptor", mojoDescriptor );
+
+ interpreter.eval( new InputStreamReader(
getClass().getResourceAsStream( "/extractor.bsh" ) ) );
+ }
+ catch ( EvalError evalError )
+ {
+ throw new InvalidPluginDescriptorException( "Error scanning
beanshell script", evalError );
+ }
+
+ return mojoDescriptor;
+ }
}
\ No newline at end of file
