You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by bi...@apache.org on 2012/07/02 00:34:17 UTC
svn commit: r1356038 - in /maven/plugin-tools/trunk:
maven-plugin-annotations/src/main/java/org/apache/maven/plugins/annotations/
maven-plugin-plugin/src/it/java-basic-annotations/src/main/java/org/apache/maven/plugin/coreit/
maven-plugin-tools-annotat...
Author: bimargulies
Date: Sun Jul 1 22:34:15 2012
New Revision: 1356038
URL: http://svn.apache.org/viewvc?rev=1356038&view=rev
Log:
MPLUGIN-219: Instantiate spelled wrong in annotation
o new enum added with correct spelling
o compatibility arranged.
Added:
maven/plugin-tools/trunk/maven-plugin-annotations/src/main/java/org/apache/maven/plugins/annotations/InstantiationStrategy.java
- copied, changed from r1355604, maven/plugin-tools/trunk/maven-plugin-annotations/src/main/java/org/apache/maven/plugins/annotations/InstanciationStrategy.java
Modified:
maven/plugin-tools/trunk/maven-plugin-annotations/src/main/java/org/apache/maven/plugins/annotations/InstanciationStrategy.java
maven/plugin-tools/trunk/maven-plugin-annotations/src/main/java/org/apache/maven/plugins/annotations/Mojo.java
maven/plugin-tools/trunk/maven-plugin-plugin/src/it/java-basic-annotations/src/main/java/org/apache/maven/plugin/coreit/Maximal.java
maven/plugin-tools/trunk/maven-plugin-tools-annotations/src/main/java/org/apache/maven/tools/plugin/annotations/JavaAnnotationsMojoDescriptorExtractor.java
maven/plugin-tools/trunk/maven-plugin-tools-annotations/src/main/java/org/apache/maven/tools/plugin/annotations/datamodel/MojoAnnotationContent.java
maven/plugin-tools/trunk/maven-plugin-tools-annotations/src/site/apt/index.apt
Modified: maven/plugin-tools/trunk/maven-plugin-annotations/src/main/java/org/apache/maven/plugins/annotations/InstanciationStrategy.java
URL: http://svn.apache.org/viewvc/maven/plugin-tools/trunk/maven-plugin-annotations/src/main/java/org/apache/maven/plugins/annotations/InstanciationStrategy.java?rev=1356038&r1=1356037&r2=1356038&view=diff
==============================================================================
--- maven/plugin-tools/trunk/maven-plugin-annotations/src/main/java/org/apache/maven/plugins/annotations/InstanciationStrategy.java (original)
+++ maven/plugin-tools/trunk/maven-plugin-annotations/src/main/java/org/apache/maven/plugins/annotations/InstanciationStrategy.java Sun Jul 1 22:34:15 2012
@@ -20,11 +20,12 @@ package org.apache.maven.plugins.annotat
*/
/**
- * Component instanciation strategy.
+ * Component instantiation strategy.
*
* @author Hervé Boutemy
* @since 3.0
*/
+@Deprecated
public enum InstanciationStrategy
{
PER_LOOKUP( "per-lookup" ),
Copied: maven/plugin-tools/trunk/maven-plugin-annotations/src/main/java/org/apache/maven/plugins/annotations/InstantiationStrategy.java (from r1355604, maven/plugin-tools/trunk/maven-plugin-annotations/src/main/java/org/apache/maven/plugins/annotations/InstanciationStrategy.java)
URL: http://svn.apache.org/viewvc/maven/plugin-tools/trunk/maven-plugin-annotations/src/main/java/org/apache/maven/plugins/annotations/InstantiationStrategy.java?p2=maven/plugin-tools/trunk/maven-plugin-annotations/src/main/java/org/apache/maven/plugins/annotations/InstantiationStrategy.java&p1=maven/plugin-tools/trunk/maven-plugin-annotations/src/main/java/org/apache/maven/plugins/annotations/InstanciationStrategy.java&r1=1355604&r2=1356038&rev=1356038&view=diff
==============================================================================
--- maven/plugin-tools/trunk/maven-plugin-annotations/src/main/java/org/apache/maven/plugins/annotations/InstanciationStrategy.java (original)
+++ maven/plugin-tools/trunk/maven-plugin-annotations/src/main/java/org/apache/maven/plugins/annotations/InstantiationStrategy.java Sun Jul 1 22:34:15 2012
@@ -25,7 +25,7 @@ package org.apache.maven.plugins.annotat
* @author Hervé Boutemy
* @since 3.0
*/
-public enum InstanciationStrategy
+public enum InstantiationStrategy
{
PER_LOOKUP( "per-lookup" ),
SINGLETON( "singleton" ),
@@ -34,7 +34,7 @@ public enum InstanciationStrategy
private final String id;
- InstanciationStrategy( String id )
+ InstantiationStrategy(String id)
{
this.id = id;
}
Modified: maven/plugin-tools/trunk/maven-plugin-annotations/src/main/java/org/apache/maven/plugins/annotations/Mojo.java
URL: http://svn.apache.org/viewvc/maven/plugin-tools/trunk/maven-plugin-annotations/src/main/java/org/apache/maven/plugins/annotations/Mojo.java?rev=1356038&r1=1356037&r2=1356038&view=diff
==============================================================================
--- maven/plugin-tools/trunk/maven-plugin-annotations/src/main/java/org/apache/maven/plugins/annotations/Mojo.java (original)
+++ maven/plugin-tools/trunk/maven-plugin-annotations/src/main/java/org/apache/maven/plugins/annotations/Mojo.java Sun Jul 1 22:34:15 2012
@@ -66,7 +66,15 @@ public @interface Mojo
* your Mojo instantiation strategy. (Only <code>per-lookup</code> and <code>singleton</code> are supported)
* @return the instantiation strategy
*/
- InstanciationStrategy instantiationStrategy() default InstanciationStrategy.PER_LOOKUP;
+ InstantiationStrategy instantiationStrategy() default InstantiationStrategy.PER_LOOKUP;
+
+ /**
+ * The original spelling of the instantiationStrategy attribute.
+ * @see #instantiationStrategy()
+ * @return the instantiation strategy
+ */
+ @Deprecated
+ InstanciationStrategy instanciationStrategy() default InstanciationStrategy.PER_LOOKUP;
/**
* execution strategy: <code>once-per-session</code> or <code>always</code>.
Modified: maven/plugin-tools/trunk/maven-plugin-plugin/src/it/java-basic-annotations/src/main/java/org/apache/maven/plugin/coreit/Maximal.java
URL: http://svn.apache.org/viewvc/maven/plugin-tools/trunk/maven-plugin-plugin/src/it/java-basic-annotations/src/main/java/org/apache/maven/plugin/coreit/Maximal.java?rev=1356038&r1=1356037&r2=1356038&view=diff
==============================================================================
--- maven/plugin-tools/trunk/maven-plugin-plugin/src/it/java-basic-annotations/src/main/java/org/apache/maven/plugin/coreit/Maximal.java (original)
+++ maven/plugin-tools/trunk/maven-plugin-plugin/src/it/java-basic-annotations/src/main/java/org/apache/maven/plugin/coreit/Maximal.java Sun Jul 1 22:34:15 2012
@@ -23,7 +23,7 @@ import org.apache.maven.plugin.AbstractM
import org.apache.maven.plugins.annotations.Component;
import org.apache.maven.plugins.annotations.ResolutionScope;
import org.apache.maven.plugins.annotations.Execute;
-import org.apache.maven.plugins.annotations.InstanciationStrategy;
+import org.apache.maven.plugins.annotations.InstantiationStrategy;
import org.apache.maven.plugins.annotations.LifecyclePhase;
import org.apache.maven.plugins.annotations.Mojo;
import org.apache.maven.plugins.annotations.Parameter;
@@ -42,7 +42,7 @@ import org.apache.maven.project.MavenPro
requiresDependencyCollection = ResolutionScope.TEST,
defaultPhase = LifecyclePhase.PACKAGE,
executionStrategy = "always",
- instantiationStrategy = InstanciationStrategy.SINGLETON,
+ instantiationStrategy = InstantiationStrategy.SINGLETON,
inheritByDefault = false,
requiresDirectInvocation = true,
requiresOnline = true,
Modified: maven/plugin-tools/trunk/maven-plugin-tools-annotations/src/main/java/org/apache/maven/tools/plugin/annotations/JavaAnnotationsMojoDescriptorExtractor.java
URL: http://svn.apache.org/viewvc/maven/plugin-tools/trunk/maven-plugin-tools-annotations/src/main/java/org/apache/maven/tools/plugin/annotations/JavaAnnotationsMojoDescriptorExtractor.java?rev=1356038&r1=1356037&r2=1356038&view=diff
==============================================================================
--- maven/plugin-tools/trunk/maven-plugin-tools-annotations/src/main/java/org/apache/maven/tools/plugin/annotations/JavaAnnotationsMojoDescriptorExtractor.java (original)
+++ maven/plugin-tools/trunk/maven-plugin-tools-annotations/src/main/java/org/apache/maven/tools/plugin/annotations/JavaAnnotationsMojoDescriptorExtractor.java Sun Jul 1 22:34:15 2012
@@ -504,7 +504,13 @@ public class JavaAnnotationsMojoDescript
mojoDescriptor.setInheritedByDefault( mojo.inheritByDefault() );
- mojoDescriptor.setInstantiationStrategy( mojo.instantiationStrategy().id() );
+ String instantiationStrategy = mojo.instantiationStrategy().id();
+ if ( instantiationStrategy == null )
+ {
+ /* Perhaps the original spelling is there. */
+ instantiationStrategy = mojo.instanciationStrategy().id();
+ }
+ mojoDescriptor.setInstantiationStrategy(instantiationStrategy);
mojoDescriptor.setAggregator( mojo.aggregator() );
mojoDescriptor.setDependencyResolutionRequired( mojo.requiresDependencyResolution().id() );
Modified: maven/plugin-tools/trunk/maven-plugin-tools-annotations/src/main/java/org/apache/maven/tools/plugin/annotations/datamodel/MojoAnnotationContent.java
URL: http://svn.apache.org/viewvc/maven/plugin-tools/trunk/maven-plugin-tools-annotations/src/main/java/org/apache/maven/tools/plugin/annotations/datamodel/MojoAnnotationContent.java?rev=1356038&r1=1356037&r2=1356038&view=diff
==============================================================================
--- maven/plugin-tools/trunk/maven-plugin-tools-annotations/src/main/java/org/apache/maven/tools/plugin/annotations/datamodel/MojoAnnotationContent.java (original)
+++ maven/plugin-tools/trunk/maven-plugin-tools-annotations/src/main/java/org/apache/maven/tools/plugin/annotations/datamodel/MojoAnnotationContent.java Sun Jul 1 22:34:15 2012
@@ -19,10 +19,10 @@ package org.apache.maven.tools.plugin.an
* under the License.
*/
-import org.apache.maven.plugins.annotations.ResolutionScope;
-import org.apache.maven.plugins.annotations.InstanciationStrategy;
+import org.apache.maven.plugins.annotations.InstantiationStrategy;
import org.apache.maven.plugins.annotations.LifecyclePhase;
import org.apache.maven.plugins.annotations.Mojo;
+import org.apache.maven.plugins.annotations.ResolutionScope;
import java.lang.annotation.Annotation;
@@ -30,6 +30,7 @@ import java.lang.annotation.Annotation;
* @author Olivier Lamy
* @since 3.0
*/
+@SuppressWarnings("deprecation")
public class MojoAnnotationContent
extends AnnotatedContent
implements Mojo
@@ -42,7 +43,7 @@ public class MojoAnnotationContent
private ResolutionScope requiresDependencyCollection = ResolutionScope.NONE;
- private InstanciationStrategy instantiationStrategy = InstanciationStrategy.PER_LOOKUP;
+ private InstantiationStrategy instantiationStrategy = InstantiationStrategy.PER_LOOKUP;
private String executionStrategy = "once-per-session";
@@ -97,14 +98,31 @@ public class MojoAnnotationContent
this.requiresDependencyCollection = ResolutionScope.valueOf( requiresDependencyCollection );
}
- public InstanciationStrategy instantiationStrategy()
+ public InstantiationStrategy instantiationStrategy()
{
return instantiationStrategy;
}
+ /**
+ * The original spelling of the instantiationStrategy attribute.
+ * This returns the value under the correct name, there's no separate
+ * field.
+ *
+ * @return the instantiation strategy
+ * @see #instantiationStrategy()
+ */
+ @SuppressWarnings("deprecation")
+ public org.apache.maven.plugins.annotations.InstanciationStrategy instanciationStrategy() {
+ if ( instantiationStrategy == null )
+ {
+ return null;
+ }
+ return org.apache.maven.plugins.annotations.InstanciationStrategy.valueOf(instanciationStrategy().name());
+ }
+
public void instantiationStrategy( String instantiationStrategy )
{
- this.instantiationStrategy = InstanciationStrategy.valueOf( instantiationStrategy );
+ this.instantiationStrategy = InstantiationStrategy.valueOf(instantiationStrategy);
}
public String executionStrategy()
Modified: maven/plugin-tools/trunk/maven-plugin-tools-annotations/src/site/apt/index.apt
URL: http://svn.apache.org/viewvc/maven/plugin-tools/trunk/maven-plugin-tools-annotations/src/site/apt/index.apt?rev=1356038&r1=1356037&r2=1356038&view=diff
==============================================================================
--- maven/plugin-tools/trunk/maven-plugin-tools-annotations/src/site/apt/index.apt (original)
+++ maven/plugin-tools/trunk/maven-plugin-tools-annotations/src/site/apt/index.apt Sun Jul 1 22:34:15 2012
@@ -42,7 +42,7 @@ import org.apache.maven.plugin.descripto
import org.apache.maven.plugins.annotations.ResolutionScope;
import org.apache.maven.plugins.annotations.Component;
import org.apache.maven.plugins.annotations.Execute;
-import org.apache.maven.plugins.annotations.InstanciationStrategy;
+import org.apache.maven.plugins.annotations.InstantiationStrategy;
import org.apache.maven.plugins.annotations.LifecyclePhase;
import org.apache.maven.plugins.annotations.Mojo;
import org.apache.maven.plugins.annotations.Parameter;
@@ -59,7 +59,7 @@ import org.apache.maven.settings.Setting
configurator = "<role hint>",
executionStrategy = "<once-per-session|always>",
inheritByDefault = <true|false>,
- instantiationStrategy = InstanciationStrategy.<strategy>,
+ instantiationStrategy = InstantiationStrategy.<strategy>,
defaultPhase = "<phase-name>",
requiresDependencyResolution = ResolutionScope.<scope>,
requiresDependencyCollection = ResolutionScope.<scope>, // (since Maven 3.0)