svn commit: r1361828 - in /maven/shared/trunk/maven-script-interpreter: pom.xml src/main/java/org/apache/maven/shared/scriptinterpreter/BeanShellScriptInterpreter.java src/main/java/org/apache/maven/shared/scriptinterpreter/GroovyScriptInterpreter.java

[hb...@apache.org]

Author: hboutemy
Date: Sun Jul 15 22:30:27 2012
New Revision: 1361828

URL: http://svn.apache.org/viewvc?rev=1361828&view=rev
Log:
[MSHARED-230] use plexus java 5 annotations instead of old-style javadoc annotations

Modified:
    maven/shared/trunk/maven-script-interpreter/pom.xml
    maven/shared/trunk/maven-script-interpreter/src/main/java/org/apache/maven/shared/scriptinterpreter/BeanShellScriptInterpreter.java
    maven/shared/trunk/maven-script-interpreter/src/main/java/org/apache/maven/shared/scriptinterpreter/GroovyScriptInterpreter.java

Modified: maven/shared/trunk/maven-script-interpreter/pom.xml
URL: http://svn.apache.org/viewvc/maven/shared/trunk/maven-script-interpreter/pom.xml?rev=1361828&r1=1361827&r2=1361828&view=diff
==============================================================================
--- maven/shared/trunk/maven-script-interpreter/pom.xml (original)
+++ maven/shared/trunk/maven-script-interpreter/pom.xml Sun Jul 15 22:30:27 2012
@@ -54,6 +54,11 @@
       <version>2.0.5</version>
     </dependency>
     <dependency>
+      <groupId>org.codehaus.plexus</groupId>
+      <artifactId>plexus-component-annotations</artifactId>
+      <version>1.5.5</version>
+    </dependency>
+    <dependency>
       <groupId>org.codehaus.groovy</groupId>
       <artifactId>groovy</artifactId>
       <version>1.8.3</version>
@@ -87,13 +92,11 @@
     <plugins>
       <plugin>
         <groupId>org.codehaus.plexus</groupId>
-        <artifactId>plexus-maven-plugin</artifactId>
+        <artifactId>plexus-component-metadata</artifactId>
         <executions>
           <execution>
-            <id>create-component-descriptor</id>
-            <phase>generate-resources</phase>
             <goals>
-              <goal>descriptor</goal>
+              <goal>generate-metadata</goal>
             </goals>
           </execution>
         </executions>

Modified: maven/shared/trunk/maven-script-interpreter/src/main/java/org/apache/maven/shared/scriptinterpreter/BeanShellScriptInterpreter.java
URL: http://svn.apache.org/viewvc/maven/shared/trunk/maven-script-interpreter/src/main/java/org/apache/maven/shared/scriptinterpreter/BeanShellScriptInterpreter.java?rev=1361828&r1=1361827&r2=1361828&view=diff
==============================================================================
--- maven/shared/trunk/maven-script-interpreter/src/main/java/org/apache/maven/shared/scriptinterpreter/BeanShellScriptInterpreter.java (original)
+++ maven/shared/trunk/maven-script-interpreter/src/main/java/org/apache/maven/shared/scriptinterpreter/BeanShellScriptInterpreter.java Sun Jul 15 22:30:27 2012
@@ -30,13 +30,15 @@ import java.io.PrintStream;
 import java.util.List;
 import java.util.Map;
 
+import org.codehaus.plexus.component.annotations.Component;
+
 /**
  * Provides a facade to evaluate BeanShell scripts.
  *
  * @author Benjamin Bentmann
  * @version $Id$
- * @plexus.component role="org.apache.maven.shared.scriptinterpreter.ScriptInterpreter" role-hint="bsh"
  */
+@Component( role = ScriptInterpreter.class, hint = "bsh" )
 public class BeanShellScriptInterpreter
     implements ScriptInterpreter
 {

Modified: maven/shared/trunk/maven-script-interpreter/src/main/java/org/apache/maven/shared/scriptinterpreter/GroovyScriptInterpreter.java
URL: http://svn.apache.org/viewvc/maven/shared/trunk/maven-script-interpreter/src/main/java/org/apache/maven/shared/scriptinterpreter/GroovyScriptInterpreter.java?rev=1361828&r1=1361827&r2=1361828&view=diff
==============================================================================
--- maven/shared/trunk/maven-script-interpreter/src/main/java/org/apache/maven/shared/scriptinterpreter/GroovyScriptInterpreter.java (original)
+++ maven/shared/trunk/maven-script-interpreter/src/main/java/org/apache/maven/shared/scriptinterpreter/GroovyScriptInterpreter.java Sun Jul 15 22:30:27 2012
@@ -23,6 +23,7 @@ import groovy.lang.Binding;
 import groovy.lang.GroovyShell;
 import org.apache.tools.ant.AntClassLoader;
 import org.codehaus.groovy.control.CompilerConfiguration;
+import org.codehaus.plexus.component.annotations.Component;
 
 import java.io.File;
 import java.io.PrintStream;
@@ -35,8 +36,8 @@ import java.util.Map;
  * 
  * @author Benjamin Bentmann
  * @version $Id$
- * @plexus.component role="org.apache.maven.shared.scriptinterpreter.ScriptInterpreter" role-hint="groovy"
  */
+@Component( role = ScriptInterpreter.class, hint = "groovy" )
 public class GroovyScriptInterpreter
     implements ScriptInterpreter
 {
@@ -44,7 +45,8 @@ public class GroovyScriptInterpreter
     /**
      * {@inheritDoc}
      */
-    public Object evaluateScript( String script, List<String> classPath, Map<String, ? extends Object> globalVariables, PrintStream scriptOutput )
+    public Object evaluateScript( String script, List<String> classPath, Map<String, ? extends Object> globalVariables,
+                                  PrintStream scriptOutput )
         throws ScriptEvaluationException
     {
         PrintStream origOut = System.out;