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 6293c70cc048d0b17b9d54a628ad9d1a9d107d2a Author: Olivier Lamy <[email protected]> AuthorDate: Sat Apr 21 15:27:14 2012 +0000 move expression evaluator to o.a.a package namespace git-svn-id: https://svn.apache.org/repos/asf/archiva/redback/redback-components/trunk@1328690 13f79535-47bb-0310-9956-ffa450edef68 --- .../components}/evaluator/DefaultExpressionEvaluator.java | 4 ++-- .../redback/components}/evaluator/EvaluatorException.java | 2 +- .../redback/components}/evaluator/ExpressionEvaluator.java | 2 +- .../redback/components}/evaluator/ExpressionSource.java | 2 +- .../evaluator/sources/PropertiesExpressionSource.java | 6 +++--- .../evaluator/sources/SystemPropertyExpressionSource.java | 6 +++--- .../evaluator/sources/DefaultExpressionEvaluatorTest.java | 10 ++++++---- 7 files changed, 17 insertions(+), 15 deletions(-) diff --git a/src/main/java/org/codehaus/plexus/evaluator/DefaultExpressionEvaluator.java b/src/main/java/org/apache/archiva/redback/components/evaluator/DefaultExpressionEvaluator.java similarity index 96% rename from src/main/java/org/codehaus/plexus/evaluator/DefaultExpressionEvaluator.java rename to src/main/java/org/apache/archiva/redback/components/evaluator/DefaultExpressionEvaluator.java index ad3a5e5..976cfb8 100644 --- a/src/main/java/org/codehaus/plexus/evaluator/DefaultExpressionEvaluator.java +++ b/src/main/java/org/apache/archiva/redback/components/evaluator/DefaultExpressionEvaluator.java @@ -1,4 +1,4 @@ -package org.codehaus.plexus.evaluator; +package org.apache.archiva.redback.components.evaluator; /* * Licensed to the Apache Software Foundation (ASF) under one @@ -32,7 +32,7 @@ import java.util.regex.Pattern; * * @author <a href="mailto:[email protected]";>Joakim Erdfelt</a> * @version $Id$ - * @plexus.component role="org.codehaus.plexus.evaluator.ExpressionEvaluator" + * @plexus.component role="org.apache.archiva.redback.components.evaluator.ExpressionEvaluator" * role-hint="default" * instantiation-strategy="per-lookup" */ diff --git a/src/main/java/org/codehaus/plexus/evaluator/EvaluatorException.java b/src/main/java/org/apache/archiva/redback/components/evaluator/EvaluatorException.java similarity index 95% rename from src/main/java/org/codehaus/plexus/evaluator/EvaluatorException.java rename to src/main/java/org/apache/archiva/redback/components/evaluator/EvaluatorException.java index 8cade66..834bc3e 100644 --- a/src/main/java/org/codehaus/plexus/evaluator/EvaluatorException.java +++ b/src/main/java/org/apache/archiva/redback/components/evaluator/EvaluatorException.java @@ -1,4 +1,4 @@ -package org.codehaus.plexus.evaluator; +package org.apache.archiva.redback.components.evaluator; /* * Licensed to the Apache Software Foundation (ASF) under one diff --git a/src/main/java/org/codehaus/plexus/evaluator/ExpressionEvaluator.java b/src/main/java/org/apache/archiva/redback/components/evaluator/ExpressionEvaluator.java similarity index 97% rename from src/main/java/org/codehaus/plexus/evaluator/ExpressionEvaluator.java rename to src/main/java/org/apache/archiva/redback/components/evaluator/ExpressionEvaluator.java index 5b38f72..cbbe9be 100644 --- a/src/main/java/org/codehaus/plexus/evaluator/ExpressionEvaluator.java +++ b/src/main/java/org/apache/archiva/redback/components/evaluator/ExpressionEvaluator.java @@ -1,4 +1,4 @@ -package org.codehaus.plexus.evaluator; +package org.apache.archiva.redback.components.evaluator; /* * Licensed to the Apache Software Foundation (ASF) under one diff --git a/src/main/java/org/codehaus/plexus/evaluator/ExpressionSource.java b/src/main/java/org/apache/archiva/redback/components/evaluator/ExpressionSource.java similarity index 95% rename from src/main/java/org/codehaus/plexus/evaluator/ExpressionSource.java rename to src/main/java/org/apache/archiva/redback/components/evaluator/ExpressionSource.java index 55a538e..199227a 100644 --- a/src/main/java/org/codehaus/plexus/evaluator/ExpressionSource.java +++ b/src/main/java/org/apache/archiva/redback/components/evaluator/ExpressionSource.java @@ -1,4 +1,4 @@ -package org.codehaus.plexus.evaluator; +package org.apache.archiva.redback.components.evaluator; /* * Licensed to the Apache Software Foundation (ASF) under one diff --git a/src/main/java/org/codehaus/plexus/evaluator/sources/PropertiesExpressionSource.java b/src/main/java/org/apache/archiva/redback/components/evaluator/sources/PropertiesExpressionSource.java similarity index 87% rename from src/main/java/org/codehaus/plexus/evaluator/sources/PropertiesExpressionSource.java rename to src/main/java/org/apache/archiva/redback/components/evaluator/sources/PropertiesExpressionSource.java index 9cd1387..4ff95b7 100644 --- a/src/main/java/org/codehaus/plexus/evaluator/sources/PropertiesExpressionSource.java +++ b/src/main/java/org/apache/archiva/redback/components/evaluator/sources/PropertiesExpressionSource.java @@ -1,4 +1,4 @@ -package org.codehaus.plexus.evaluator.sources; +package org.apache.archiva.redback.components.evaluator.sources; /* * Licensed to the Apache Software Foundation (ASF) under one @@ -19,7 +19,7 @@ package org.codehaus.plexus.evaluator.sources; * under the License. */ -import org.codehaus.plexus.evaluator.ExpressionSource; +import org.apache.archiva.redback.components.evaluator.ExpressionSource; import java.util.Properties; @@ -29,7 +29,7 @@ import java.util.Properties; * @author <a href="mailto:[email protected]";>Joakim Erdfelt</a> * @version $Id$ * - * @plexus.component role="org.codehaus.plexus.evaluator.ExpressionSource" + * @plexus.component role="org.apache.archiva.redback.components.evaluator.ExpressionSource" * role-hint="properties" */ public class PropertiesExpressionSource diff --git a/src/main/java/org/codehaus/plexus/evaluator/sources/SystemPropertyExpressionSource.java b/src/main/java/org/apache/archiva/redback/components/evaluator/sources/SystemPropertyExpressionSource.java similarity index 84% rename from src/main/java/org/codehaus/plexus/evaluator/sources/SystemPropertyExpressionSource.java rename to src/main/java/org/apache/archiva/redback/components/evaluator/sources/SystemPropertyExpressionSource.java index ddbba84..5042a90 100644 --- a/src/main/java/org/codehaus/plexus/evaluator/sources/SystemPropertyExpressionSource.java +++ b/src/main/java/org/apache/archiva/redback/components/evaluator/sources/SystemPropertyExpressionSource.java @@ -1,4 +1,4 @@ -package org.codehaus.plexus.evaluator.sources; +package org.apache.archiva.redback.components.evaluator.sources; /* * Licensed to the Apache Software Foundation (ASF) under one @@ -19,7 +19,7 @@ package org.codehaus.plexus.evaluator.sources; * under the License. */ -import org.codehaus.plexus.evaluator.ExpressionSource; +import org.apache.archiva.redback.components.evaluator.ExpressionSource; /** * SystemPropertyExpressionSource @@ -27,7 +27,7 @@ import org.codehaus.plexus.evaluator.ExpressionSource; * @author <a href="mailto:[email protected]";>Joakim Erdfelt</a> * @version $Id$ * - * @plexus.component role="org.codehaus.plexus.evaluator.ExpressionSource" + * @plexus.component role="org.apache.archiva.redback.components.evaluator.ExpressionSource" * role-hint="sysprops" */ public class SystemPropertyExpressionSource diff --git a/src/test/java/org/codehaus/plexus/evaluator/sources/DefaultExpressionEvaluatorTest.java b/src/test/java/org/apache/archiva/redback/components/evaluator/sources/DefaultExpressionEvaluatorTest.java similarity index 93% rename from src/test/java/org/codehaus/plexus/evaluator/sources/DefaultExpressionEvaluatorTest.java rename to src/test/java/org/apache/archiva/redback/components/evaluator/sources/DefaultExpressionEvaluatorTest.java index c6d15e2..5f2a7f1 100644 --- a/src/test/java/org/codehaus/plexus/evaluator/sources/DefaultExpressionEvaluatorTest.java +++ b/src/test/java/org/apache/archiva/redback/components/evaluator/sources/DefaultExpressionEvaluatorTest.java @@ -1,4 +1,4 @@ -package org.codehaus.plexus.evaluator.sources; +package org.apache.archiva.redback.components.evaluator.sources; /* * Licensed to the Apache Software Foundation (ASF) under one @@ -20,9 +20,11 @@ package org.codehaus.plexus.evaluator.sources; */ import junit.framework.TestCase; -import org.codehaus.plexus.evaluator.DefaultExpressionEvaluator; -import org.codehaus.plexus.evaluator.EvaluatorException; -import org.codehaus.plexus.evaluator.ExpressionEvaluator; +import org.apache.archiva.redback.components.evaluator.DefaultExpressionEvaluator; +import org.apache.archiva.redback.components.evaluator.EvaluatorException; +import org.apache.archiva.redback.components.evaluator.sources.PropertiesExpressionSource; +import org.apache.archiva.redback.components.evaluator.sources.SystemPropertyExpressionSource; +import org.apache.archiva.redback.components.evaluator.ExpressionEvaluator; import java.util.Properties; -- To stop receiving notification emails like this one, please contact [email protected].
