You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by hb...@apache.org on 2012/05/12 19:07:01 UTC
svn commit: r1337592 - in /maven/plugin-tools/trunk:
maven-plugin-annotations/src/main/java/org/apache/maven/plugins/annotations/
maven-plugin-tools-annotations/src/main/java/org/apache/maven/tools/plugin/annotations/datamodel/
maven-plugin-tools-annot...
Author: hboutemy
Date: Sat May 12 17:07:01 2012
New Revision: 1337592
URL: http://svn.apache.org/viewvc?rev=1337592&view=rev
Log:
added InstanciationStrategy enumeration
Added:
maven/plugin-tools/trunk/maven-plugin-annotations/src/main/java/org/apache/maven/plugins/annotations/InstanciationStrategy.java (with props)
Modified:
maven/plugin-tools/trunk/maven-plugin-annotations/src/main/java/org/apache/maven/plugins/annotations/Mojo.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
Added: 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=1337592&view=auto
==============================================================================
--- maven/plugin-tools/trunk/maven-plugin-annotations/src/main/java/org/apache/maven/plugins/annotations/InstanciationStrategy.java (added)
+++ maven/plugin-tools/trunk/maven-plugin-annotations/src/main/java/org/apache/maven/plugins/annotations/InstanciationStrategy.java Sat May 12 17:07:01 2012
@@ -0,0 +1,44 @@
+package org.apache.maven.plugins.annotations;
+
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+/**
+ * @author Hervé Boutemy
+ * @since 3.0
+ */
+public enum InstanciationStrategy
+{
+ PER_LOOKUP( "per-lookup" ),
+ SINGLETON( "singleton" ),
+ KEEP_ALIVE( "keep-alive" ),
+ POOLABLE( "poolable" );
+
+ private final String id;
+
+ InstanciationStrategy( String id )
+ {
+ this.id = id;
+ }
+
+ public String id()
+ {
+ return this.id;
+ }
+}
Propchange: maven/plugin-tools/trunk/maven-plugin-annotations/src/main/java/org/apache/maven/plugins/annotations/InstanciationStrategy.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/plugin-tools/trunk/maven-plugin-annotations/src/main/java/org/apache/maven/plugins/annotations/InstanciationStrategy.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Propchange: maven/plugin-tools/trunk/maven-plugin-annotations/src/main/java/org/apache/maven/plugins/annotations/InstanciationStrategy.java
------------------------------------------------------------------------------
svn:mime-type = text/plain
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=1337592&r1=1337591&r2=1337592&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 Sat May 12 17:07:01 2012
@@ -44,7 +44,7 @@ public @interface Mojo
DependencyScope requiresDependencyCollection() default DependencyScope.RUNTIME;
- String instantiationStrategy() default "per-lookup";
+ InstanciationStrategy instantiationStrategy() default InstanciationStrategy.PER_LOOKUP;
String executionStrategy() default "once-per-session";
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=1337592&r1=1337591&r2=1337592&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 Sat May 12 17:07:01 2012
@@ -20,6 +20,7 @@ package org.apache.maven.tools.plugin.an
*/
import org.apache.maven.plugins.annotations.DependencyScope;
+import org.apache.maven.plugins.annotations.InstanciationStrategy;
import org.apache.maven.plugins.annotations.LifecyclePhase;
import org.apache.maven.plugins.annotations.Mojo;
@@ -41,7 +42,7 @@ public class MojoAnnotationContent
private DependencyScope requiresDependencyCollection = DependencyScope.RUNTIME;
- private String instantiationStrategy = "per-lookup";
+ private InstanciationStrategy instantiationStrategy = InstanciationStrategy.PER_LOOKUP;
private String executionStrategy = "once-per-session";
@@ -96,12 +97,12 @@ public class MojoAnnotationContent
this.requiresDependencyCollection = requiresDependencyCollection;
}
- public String instantiationStrategy()
+ public InstanciationStrategy instantiationStrategy()
{
return instantiationStrategy;
}
- public void instantiationStrategy( String instantiationStrategy )
+ public void instantiationStrategy( InstanciationStrategy instantiationStrategy )
{
this.instantiationStrategy = instantiationStrategy;
}
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=1337592&r1=1337591&r2=1337592&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 Sat May 12 17:07:01 2012
@@ -39,6 +39,7 @@ import org.apache.maven.plugin.AbstractM
import org.apache.maven.plugins.annotations.DependencyScope;
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.LifecyclePhase;
import org.apache.maven.plugins.annotations.Mojo;
import org.apache.maven.plugins.annotations.Parameter;
@@ -53,7 +54,7 @@ import org.apache.maven.plugins.annotati
configurator = "<roleHint>",
executionStrategy = "<once-per-session|always>",
inheritByDefault = <true|false>,
- instantiationStrategy = "<per-lookup|singleton|keep-alive|poolable>",
+ instantiationStrategy = InstanciationStrategy.<strategy>,
defaultPhase = "<phaseName>",
requiresDependencyResolution = DependencyScope.<scope>,
requiresDependencyCollection = DependencyScope.<scope>, // (since Maven 3.0)