Author: carlos
Date: Tue Mar 28 22:48:51 2006
New Revision: 389696
URL: http://svn.apache.org/viewcvs?rev=389696&view=rev
Log:
Complete migration upgrading licenses to Apache License
Removed:
maven/sandbox/maven-plugin-testing-harness/src/main/java/org/codehaus/
Modified:
maven/sandbox/maven-plugin-testing-harness/src/main/java/org/apache/maven/plugins/testing/AbstractMojoTestCase.java
maven/sandbox/maven-plugin-testing-harness/src/main/java/org/apache/maven/plugins/testing/ConfigurationException.java
maven/sandbox/maven-plugin-testing-harness/src/main/java/org/apache/maven/plugins/testing/ResolverExpressionEvaluatorStub.java
maven/sandbox/maven-plugin-testing-harness/src/main/java/org/apache/maven/plugins/testing/stubs/ArtifactStub.java
maven/sandbox/maven-plugin-testing-harness/src/main/java/org/apache/maven/plugins/testing/stubs/MavenProjectStub.java
Modified:
maven/sandbox/maven-plugin-testing-harness/src/main/java/org/apache/maven/plugins/testing/AbstractMojoTestCase.java
URL:
http://svn.apache.org/viewcvs/maven/sandbox/maven-plugin-testing-harness/src/main/java/org/apache/maven/plugins/testing/AbstractMojoTestCase.java?rev=389696&r1=389695&r2=389696&view=diff
==============================================================================
---
maven/sandbox/maven-plugin-testing-harness/src/main/java/org/apache/maven/plugins/testing/AbstractMojoTestCase.java
(original)
+++
maven/sandbox/maven-plugin-testing-harness/src/main/java/org/apache/maven/plugins/testing/AbstractMojoTestCase.java
Tue Mar 28 22:48:51 2006
@@ -1,7 +1,7 @@
package org.apache.maven.plugins.testing;
/*
- * Copyright 2001-2004 The Apache Software Foundation.
+ * Copyright 2001-2006 The Apache Software Foundation.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -16,24 +16,22 @@
* limitations under the License.
*/
+import java.io.File;
+import java.io.FileReader;
+import java.io.Reader;
+import java.util.Map;
+import org.apache.maven.monitor.logging.DefaultLog;
+import org.apache.maven.plugin.Mojo;
+import org.apache.maven.plugin.logging.Log;
import org.codehaus.plexus.PlexusTestCase;
-import org.codehaus.plexus.util.xml.Xpp3DomBuilder;
-import org.codehaus.plexus.util.xml.Xpp3Dom;
-import org.codehaus.plexus.util.ReflectionUtils;
-import org.codehaus.plexus.configuration.PlexusConfiguration;
-import org.codehaus.plexus.configuration.xml.XmlPlexusConfiguration;
import org.codehaus.plexus.component.configurator.ComponentConfigurator;
import
org.codehaus.plexus.component.configurator.expression.ExpressionEvaluator;
-import org.apache.maven.plugin.Mojo;
-import org.apache.maven.plugin.logging.Log;
-import org.apache.maven.monitor.logging.DefaultLog;
-import org.apache.maven.project.MavenProjectBuilder;
-
-import java.io.Reader;
-import java.io.FileReader;
-import java.io.File;
-import java.util.Map;
+import org.codehaus.plexus.configuration.PlexusConfiguration;
+import org.codehaus.plexus.configuration.xml.XmlPlexusConfiguration;
+import org.codehaus.plexus.util.ReflectionUtils;
+import org.codehaus.plexus.util.xml.Xpp3Dom;
+import org.codehaus.plexus.util.xml.Xpp3DomBuilder;
// todo: add a way to use the plugin POM for the lookup so that the user
doesn't have to provide the a:g:v:goal
// as the role hint for the mojo lookup.
@@ -171,7 +169,7 @@
/* requires v10 of plexus container for lookup on expression
evaluator
ExpressionEvaluator evaluator = (ExpressionEvaluator)
getContainer().lookup( ExpressionEvaluator.ROLE, "stub-evaluator" );
*/
- ExpressionEvaluator evaluator = new
StubResolverExpressionEvaluator();
+ ExpressionEvaluator evaluator = new
ResolverExpressionEvaluatorStub();
configurator.configureComponent( mojo, pluginConfiguration,
evaluator, getContainer().getContainerRealm() );
}
@@ -226,7 +224,7 @@
PlexusConfiguration pluginConfiguration = extractPluginConfiguration(
artifactId, pom );
- ExpressionEvaluator evaluator = new StubResolverExpressionEvaluator();
+ ExpressionEvaluator evaluator = new ResolverExpressionEvaluatorStub();
configurator.configureComponent( mojo, pluginConfiguration, evaluator,
getContainer().getContainerRealm() );
@@ -247,7 +245,7 @@
{
validateContainerStatus();
- ExpressionEvaluator evaluator = new StubResolverExpressionEvaluator();
+ ExpressionEvaluator evaluator = new ResolverExpressionEvaluatorStub();
configurator.configureComponent( mojo, pluginConfiguration, evaluator,
getContainer().getContainerRealm() );
Modified:
maven/sandbox/maven-plugin-testing-harness/src/main/java/org/apache/maven/plugins/testing/ConfigurationException.java
URL:
http://svn.apache.org/viewcvs/maven/sandbox/maven-plugin-testing-harness/src/main/java/org/apache/maven/plugins/testing/ConfigurationException.java?rev=389696&r1=389695&r2=389696&view=diff
==============================================================================
---
maven/sandbox/maven-plugin-testing-harness/src/main/java/org/apache/maven/plugins/testing/ConfigurationException.java
(original)
+++
maven/sandbox/maven-plugin-testing-harness/src/main/java/org/apache/maven/plugins/testing/ConfigurationException.java
Tue Mar 28 22:48:51 2006
@@ -1,6 +1,7 @@
package org.apache.maven.plugins.testing;
+
/*
- * Copyright 2005 The Codehaus.
+ * Copyright 2001-2006 The Apache Software Foundation.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Modified:
maven/sandbox/maven-plugin-testing-harness/src/main/java/org/apache/maven/plugins/testing/ResolverExpressionEvaluatorStub.java
URL:
http://svn.apache.org/viewcvs/maven/sandbox/maven-plugin-testing-harness/src/main/java/org/apache/maven/plugins/testing/ResolverExpressionEvaluatorStub.java?rev=389696&r1=389695&r2=389696&view=diff
==============================================================================
---
maven/sandbox/maven-plugin-testing-harness/src/main/java/org/apache/maven/plugins/testing/ResolverExpressionEvaluatorStub.java
(original)
+++
maven/sandbox/maven-plugin-testing-harness/src/main/java/org/apache/maven/plugins/testing/ResolverExpressionEvaluatorStub.java
Tue Mar 28 22:48:51 2006
@@ -1,15 +1,7 @@
package org.apache.maven.plugins.testing;
-import org.codehaus.plexus.PlexusContainer;
-import org.codehaus.plexus.DefaultPlexusContainer;
-import org.codehaus.plexus.PlexusTestCase;
-import
org.codehaus.plexus.component.repository.exception.ComponentLookupException;
-import
org.codehaus.plexus.component.configurator.expression.ExpressionEvaluator;
-import
org.codehaus.plexus.component.configurator.expression.ExpressionEvaluationException;
-
-import java.io.File;
/*
- * Copyright 2005 The Codehaus.
+ * Copyright 2001-2006 The Apache Software Foundation.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -23,6 +15,12 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
+
+import java.io.File;
+
+import org.codehaus.plexus.PlexusTestCase;
+import
org.codehaus.plexus.component.configurator.expression.ExpressionEvaluationException;
+import
org.codehaus.plexus.component.configurator.expression.ExpressionEvaluator;
/**
* StubResolverExpressionEvaluator:
Modified:
maven/sandbox/maven-plugin-testing-harness/src/main/java/org/apache/maven/plugins/testing/stubs/ArtifactStub.java
URL:
http://svn.apache.org/viewcvs/maven/sandbox/maven-plugin-testing-harness/src/main/java/org/apache/maven/plugins/testing/stubs/ArtifactStub.java?rev=389696&r1=389695&r2=389696&view=diff
==============================================================================
---
maven/sandbox/maven-plugin-testing-harness/src/main/java/org/apache/maven/plugins/testing/stubs/ArtifactStub.java
(original)
+++
maven/sandbox/maven-plugin-testing-harness/src/main/java/org/apache/maven/plugins/testing/stubs/ArtifactStub.java
Tue Mar 28 22:48:51 2006
@@ -1,8 +1,7 @@
package org.apache.maven.plugins.testing.stubs;
-
/*
- * Copyright 2005 The Codehaus.
+ * Copyright 2001-2006 The Apache Software Foundation.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Modified:
maven/sandbox/maven-plugin-testing-harness/src/main/java/org/apache/maven/plugins/testing/stubs/MavenProjectStub.java
URL:
http://svn.apache.org/viewcvs/maven/sandbox/maven-plugin-testing-harness/src/main/java/org/apache/maven/plugins/testing/stubs/MavenProjectStub.java?rev=389696&r1=389695&r2=389696&view=diff
==============================================================================
---
maven/sandbox/maven-plugin-testing-harness/src/main/java/org/apache/maven/plugins/testing/stubs/MavenProjectStub.java
(original)
+++
maven/sandbox/maven-plugin-testing-harness/src/main/java/org/apache/maven/plugins/testing/stubs/MavenProjectStub.java
Tue Mar 28 22:48:51 2006
@@ -1,7 +1,7 @@
package org.apache.maven.plugins.testing.stubs;
/*
- * Copyright 2005 The Codehaus.
+ * Copyright 2001-2006 The Apache Software Foundation.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
