This is an automated email from the ASF dual-hosted git repository. martin_s pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/archiva-redback-components-expression-evaluator.git
commit 99d38a2db68dc71edc681c3b359cd86b5e845df6 Author: Olivier Lamy <[email protected]> AuthorDate: Sat Apr 21 15:30:40 2012 +0000 no more need of plexus stuff git-svn-id: https://svn.apache.org/repos/asf/archiva/redback/redback-components/trunk@1328693 13f79535-47bb-0310-9956-ffa450edef68 --- .../components/evaluator/DefaultExpressionEvaluator.java | 3 --- .../redback/components/evaluator/ExpressionEvaluator.java | 10 ++++------ .../archiva/redback/components/evaluator/ExpressionSource.java | 4 ++-- .../evaluator/sources/PropertiesExpressionSource.java | 2 -- .../evaluator/sources/SystemPropertyExpressionSource.java | 3 --- 5 files changed, 6 insertions(+), 16 deletions(-) diff --git a/src/main/java/org/apache/archiva/redback/components/evaluator/DefaultExpressionEvaluator.java b/src/main/java/org/apache/archiva/redback/components/evaluator/DefaultExpressionEvaluator.java index 976cfb8..dcfc5c1 100644 --- a/src/main/java/org/apache/archiva/redback/components/evaluator/DefaultExpressionEvaluator.java +++ b/src/main/java/org/apache/archiva/redback/components/evaluator/DefaultExpressionEvaluator.java @@ -32,9 +32,6 @@ import java.util.regex.Pattern; * * @author <a href="mailto:[email protected]";>Joakim Erdfelt</a> * @version $Id$ - * @plexus.component role="org.apache.archiva.redback.components.evaluator.ExpressionEvaluator" - * role-hint="default" - * instantiation-strategy="per-lookup" */ public class DefaultExpressionEvaluator implements ExpressionEvaluator diff --git a/src/main/java/org/apache/archiva/redback/components/evaluator/ExpressionEvaluator.java b/src/main/java/org/apache/archiva/redback/components/evaluator/ExpressionEvaluator.java index cbbe9be..23ef5c7 100644 --- a/src/main/java/org/apache/archiva/redback/components/evaluator/ExpressionEvaluator.java +++ b/src/main/java/org/apache/archiva/redback/components/evaluator/ExpressionEvaluator.java @@ -22,18 +22,16 @@ package org.apache.archiva.redback.components.evaluator; import java.util.List; /** - * ExpressionEvaluator + * ExpressionEvaluator * * @author <a href="mailto:[email protected]";>Joakim Erdfelt</a> * @version $Id$ */ public interface ExpressionEvaluator { - String ROLE = ExpressionEvaluator.class.getName(); - /** * Add a source for expression resolution. - * + * * @param source the source to add. */ void addExpressionSource( ExpressionSource source ); @@ -50,14 +48,14 @@ public interface ExpressionEvaluator /** * Get the List of expression sources. - * + * * @return the list of expression sources. */ List getExpressionSourceList(); /** * Remove a specific expression source. - * + * * @param source the source to remove. * @return true if expression source was removed. */ diff --git a/src/main/java/org/apache/archiva/redback/components/evaluator/ExpressionSource.java b/src/main/java/org/apache/archiva/redback/components/evaluator/ExpressionSource.java index 199227a..e0a036e 100644 --- a/src/main/java/org/apache/archiva/redback/components/evaluator/ExpressionSource.java +++ b/src/main/java/org/apache/archiva/redback/components/evaluator/ExpressionSource.java @@ -20,7 +20,7 @@ package org.apache.archiva.redback.components.evaluator; */ /** - * ExpressionSource + * ExpressionSource * * @author <a href="mailto:[email protected]";>Joakim Erdfelt</a> * @version $Id$ @@ -29,7 +29,7 @@ public interface ExpressionSource { /** * Gets a value for a provided Expression. - * + * * @param expression the expression to attempt to get a value for. * @return the value for the expression, or null if no value found. */ diff --git a/src/main/java/org/apache/archiva/redback/components/evaluator/sources/PropertiesExpressionSource.java b/src/main/java/org/apache/archiva/redback/components/evaluator/sources/PropertiesExpressionSource.java index 4ff95b7..38cc73d 100644 --- a/src/main/java/org/apache/archiva/redback/components/evaluator/sources/PropertiesExpressionSource.java +++ b/src/main/java/org/apache/archiva/redback/components/evaluator/sources/PropertiesExpressionSource.java @@ -29,8 +29,6 @@ import java.util.Properties; * @author <a href="mailto:[email protected]";>Joakim Erdfelt</a> * @version $Id$ * - * @plexus.component role="org.apache.archiva.redback.components.evaluator.ExpressionSource" - * role-hint="properties" */ public class PropertiesExpressionSource implements ExpressionSource diff --git a/src/main/java/org/apache/archiva/redback/components/evaluator/sources/SystemPropertyExpressionSource.java b/src/main/java/org/apache/archiva/redback/components/evaluator/sources/SystemPropertyExpressionSource.java index 5042a90..4dae6dd 100644 --- a/src/main/java/org/apache/archiva/redback/components/evaluator/sources/SystemPropertyExpressionSource.java +++ b/src/main/java/org/apache/archiva/redback/components/evaluator/sources/SystemPropertyExpressionSource.java @@ -26,9 +26,6 @@ import org.apache.archiva.redback.components.evaluator.ExpressionSource; * * @author <a href="mailto:[email protected]";>Joakim Erdfelt</a> * @version $Id$ - * - * @plexus.component role="org.apache.archiva.redback.components.evaluator.ExpressionSource" - * role-hint="sysprops" */ public class SystemPropertyExpressionSource implements ExpressionSource -- To stop receiving notification emails like this one, please contact [email protected].
