You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by si...@apache.org on 2008/09/13 12:07:24 UTC
svn commit: r694912 - in /maven/components/trunk:
maven-core/src/main/java/org/apache/maven/
maven-core/src/main/java/org/apache/maven/errors/
maven-core/src/main/java/org/apache/maven/execution/
maven-core/src/main/java/org/apache/maven/path/ maven-co...
Author: sisbell
Date: Sat Sep 13 03:07:23 2008
New Revision: 694912
URL: http://svn.apache.org/viewvc?rev=694912&view=rev
Log:
Moved PathTranslator to maven-core. maven-project no longer uses it.
Added:
maven/components/trunk/maven-core/src/main/java/org/apache/maven/execution/DuplicateProjectException.java (contents, props changed)
- copied, changed from r694659, maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/DuplicateProjectException.java
maven/components/trunk/maven-core/src/main/java/org/apache/maven/path/
maven/components/trunk/maven-core/src/main/java/org/apache/maven/path/DefaultPathTranslator.java (contents, props changed)
- copied, changed from r694659, maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/path/DefaultPathTranslator.java
maven/components/trunk/maven-core/src/main/java/org/apache/maven/path/PathTranslator.java (contents, props changed)
- copied, changed from r694659, maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/path/PathTranslator.java
maven/components/trunk/maven-core/src/test/java/org/apache/maven/path/
maven/components/trunk/maven-core/src/test/java/org/apache/maven/path/DefaultPathTranslatorTest.java (with props)
Removed:
maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/DuplicateProjectException.java
maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/path/
maven/components/trunk/maven-project/src/test/java/org/apache/maven/project/path/
Modified:
maven/components/trunk/maven-core/src/main/java/org/apache/maven/DefaultMaven.java
maven/components/trunk/maven-core/src/main/java/org/apache/maven/errors/CoreErrorReporter.java
maven/components/trunk/maven-core/src/main/java/org/apache/maven/errors/DefaultCoreErrorReporter.java
maven/components/trunk/maven-core/src/main/java/org/apache/maven/errors/DefaultProjectErrorReporter.java
maven/components/trunk/maven-core/src/main/java/org/apache/maven/errors/ProjectErrorReporter.java
maven/components/trunk/maven-core/src/main/java/org/apache/maven/errors/ProjectErrorTips.java
maven/components/trunk/maven-core/src/main/java/org/apache/maven/execution/ReactorManager.java
maven/components/trunk/maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginManager.java
maven/components/trunk/maven-core/src/main/java/org/apache/maven/plugin/PluginParameterExpressionEvaluator.java
maven/components/trunk/maven-core/src/main/resources/META-INF/plexus/components.xml
maven/components/trunk/maven-core/src/test/java/org/apache/maven/execution/ProjectSorterTest.java
maven/components/trunk/maven-core/src/test/java/org/apache/maven/plugin/PluginParameterExpressionEvaluatorTest.java
maven/components/trunk/maven-core/src/test/resources/org/apache/maven/plugin/PluginParameterExpressionEvaluatorTest.xml
maven/components/trunk/maven-embedder/src/main/java/org/apache/maven/embedder/MavenEmbedder.java
maven/components/trunk/maven-embedder/src/test/projects/complex-project/maven-core/src/main/resources/META-INF/plexus/components.xml
maven/components/trunk/maven-embedder/src/test/projects/complex-project/maven-core/src/test/resources/org/apache/maven/plugin/PluginParameterExpressionEvaluatorTest.xml
maven/components/trunk/maven-embedder/src/test/projects/complex-project/maven-project/src/main/resources/META-INF/plexus/components.xml
maven/components/trunk/maven-embedder/src/test/projects/complex-project/maven-project/src/test/resources/org/apache/maven/project/ProjectClasspathTest.xml
maven/components/trunk/maven-embedder/src/test/projects/complex-project/maven-project/src/test/resources/org/apache/maven/project/canonical/CanonicalProjectBuilderTest.xml
maven/components/trunk/maven-project/src/main/resources/META-INF/plexus/components.xml
Modified: maven/components/trunk/maven-core/src/main/java/org/apache/maven/DefaultMaven.java
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-core/src/main/java/org/apache/maven/DefaultMaven.java?rev=694912&r1=694911&r2=694912&view=diff
==============================================================================
--- maven/components/trunk/maven-core/src/main/java/org/apache/maven/DefaultMaven.java (original)
+++ maven/components/trunk/maven-core/src/main/java/org/apache/maven/DefaultMaven.java Sat Sep 13 03:07:23 2008
@@ -21,12 +21,7 @@
import org.apache.maven.artifact.versioning.DefaultArtifactVersion;
-import org.apache.maven.execution.DefaultMavenExecutionResult;
-import org.apache.maven.execution.MavenExecutionRequest;
-import org.apache.maven.execution.MavenExecutionResult;
-import org.apache.maven.execution.MavenSession;
-import org.apache.maven.execution.ReactorManager;
-import org.apache.maven.execution.RuntimeInformation;
+import org.apache.maven.execution.*;
import org.apache.maven.extension.BuildExtensionScanner;
import org.apache.maven.extension.ExtensionScanningException;
import org.apache.maven.lifecycle.LifecycleExecutionException;
@@ -35,7 +30,7 @@
import org.apache.maven.monitor.event.DeprecationEventDispatcher;
import org.apache.maven.monitor.event.EventDispatcher;
import org.apache.maven.monitor.event.MavenEvents;
-import org.apache.maven.project.DuplicateProjectException;
+import org.apache.maven.execution.DuplicateProjectException;
import org.apache.maven.project.MavenProject;
import org.apache.maven.project.MavenProjectBuilder;
import org.apache.maven.project.ProjectBuildingException;
Modified: maven/components/trunk/maven-core/src/main/java/org/apache/maven/errors/CoreErrorReporter.java
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-core/src/main/java/org/apache/maven/errors/CoreErrorReporter.java?rev=694912&r1=694911&r2=694912&view=diff
==============================================================================
--- maven/components/trunk/maven-core/src/main/java/org/apache/maven/errors/CoreErrorReporter.java (original)
+++ maven/components/trunk/maven-core/src/main/java/org/apache/maven/errors/CoreErrorReporter.java Sat Sep 13 03:07:23 2008
@@ -38,7 +38,7 @@
import org.apache.maven.project.ProjectBuildingException;
import org.apache.maven.project.artifact.InvalidDependencyVersionException;
import org.apache.maven.errors.ProjectErrorReporter;
-import org.apache.maven.project.path.PathTranslator;
+import org.apache.maven.path.PathTranslator;
import org.apache.maven.reactor.MavenExecutionException;
import org.apache.maven.reactor.MissingModuleException;
import org.apache.maven.realm.RealmManagementException;
Modified: maven/components/trunk/maven-core/src/main/java/org/apache/maven/errors/DefaultCoreErrorReporter.java
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-core/src/main/java/org/apache/maven/errors/DefaultCoreErrorReporter.java?rev=694912&r1=694911&r2=694912&view=diff
==============================================================================
--- maven/components/trunk/maven-core/src/main/java/org/apache/maven/errors/DefaultCoreErrorReporter.java (original)
+++ maven/components/trunk/maven-core/src/main/java/org/apache/maven/errors/DefaultCoreErrorReporter.java Sat Sep 13 03:07:23 2008
@@ -2,6 +2,7 @@
import org.apache.maven.NoGoalsSpecifiedException;
import org.apache.maven.ProjectCycleException;
+import org.apache.maven.path.PathTranslator;
import org.apache.maven.artifact.Artifact;
import org.apache.maven.artifact.ArtifactUtils;
import org.apache.maven.artifact.metadata.ArtifactMetadataRetrievalException;
@@ -45,7 +46,6 @@
import org.apache.maven.errors.ProjectErrorReporter;
import org.apache.maven.errors.ProjectReporterManager;
import org.apache.maven.extension.ModelInterpolationException;
-import org.apache.maven.project.path.PathTranslator;
import org.apache.maven.reactor.MavenExecutionException;
import org.apache.maven.reactor.MissingModuleException;
import org.apache.maven.realm.RealmManagementException;
Modified: maven/components/trunk/maven-core/src/main/java/org/apache/maven/errors/DefaultProjectErrorReporter.java
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-core/src/main/java/org/apache/maven/errors/DefaultProjectErrorReporter.java?rev=694912&r1=694911&r2=694912&view=diff
==============================================================================
--- maven/components/trunk/maven-core/src/main/java/org/apache/maven/errors/DefaultProjectErrorReporter.java (original)
+++ maven/components/trunk/maven-core/src/main/java/org/apache/maven/errors/DefaultProjectErrorReporter.java Sat Sep 13 03:07:23 2008
@@ -14,7 +14,7 @@
import org.apache.maven.profiles.activation.ProfileActivationContext;
import org.apache.maven.profiles.activation.ProfileActivationException;
import org.apache.maven.profiles.activation.ProfileActivator;
-import org.apache.maven.project.DuplicateProjectException;
+import org.apache.maven.execution.DuplicateProjectException;
import org.apache.maven.project.InvalidProjectModelException;
import org.apache.maven.project.InvalidProjectVersionException;
import org.apache.maven.project.MavenProject;
Modified: maven/components/trunk/maven-core/src/main/java/org/apache/maven/errors/ProjectErrorReporter.java
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-core/src/main/java/org/apache/maven/errors/ProjectErrorReporter.java?rev=694912&r1=694911&r2=694912&view=diff
==============================================================================
--- maven/components/trunk/maven-core/src/main/java/org/apache/maven/errors/ProjectErrorReporter.java (original)
+++ maven/components/trunk/maven-core/src/main/java/org/apache/maven/errors/ProjectErrorReporter.java Sat Sep 13 03:07:23 2008
@@ -11,7 +11,7 @@
import org.apache.maven.profiles.activation.ProfileActivationContext;
import org.apache.maven.profiles.activation.ProfileActivationException;
import org.apache.maven.profiles.activation.ProfileActivator;
-import org.apache.maven.project.DuplicateProjectException;
+import org.apache.maven.execution.DuplicateProjectException;
import org.apache.maven.project.InvalidProjectModelException;
import org.apache.maven.project.InvalidProjectVersionException;
import org.apache.maven.project.MavenProject;
Modified: maven/components/trunk/maven-core/src/main/java/org/apache/maven/errors/ProjectErrorTips.java
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-core/src/main/java/org/apache/maven/errors/ProjectErrorTips.java?rev=694912&r1=694911&r2=694912&view=diff
==============================================================================
--- maven/components/trunk/maven-core/src/main/java/org/apache/maven/errors/ProjectErrorTips.java (original)
+++ maven/components/trunk/maven-core/src/main/java/org/apache/maven/errors/ProjectErrorTips.java Sat Sep 13 03:07:23 2008
@@ -8,7 +8,7 @@
import org.apache.maven.profiles.activation.ProfileActivationContext;
import org.apache.maven.profiles.activation.ProfileActivationException;
import org.apache.maven.profiles.activation.ProfileActivator;
-import org.apache.maven.project.DuplicateProjectException;
+import org.apache.maven.execution.DuplicateProjectException;
import org.apache.maven.project.InvalidProjectVersionException;
import org.apache.maven.project.MavenProject;
import org.apache.maven.extension.ModelInterpolationException;
Copied: maven/components/trunk/maven-core/src/main/java/org/apache/maven/execution/DuplicateProjectException.java (from r694659, maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/DuplicateProjectException.java)
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-core/src/main/java/org/apache/maven/execution/DuplicateProjectException.java?p2=maven/components/trunk/maven-core/src/main/java/org/apache/maven/execution/DuplicateProjectException.java&p1=maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/DuplicateProjectException.java&r1=694659&r2=694912&rev=694912&view=diff
==============================================================================
--- maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/DuplicateProjectException.java (original)
+++ maven/components/trunk/maven-core/src/main/java/org/apache/maven/execution/DuplicateProjectException.java Sat Sep 13 03:07:23 2008
@@ -1,4 +1,4 @@
-package org.apache.maven.project;
+package org.apache.maven.execution;
import java.io.File;
Propchange: maven/components/trunk/maven-core/src/main/java/org/apache/maven/execution/DuplicateProjectException.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/components/trunk/maven-core/src/main/java/org/apache/maven/execution/DuplicateProjectException.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Modified: maven/components/trunk/maven-core/src/main/java/org/apache/maven/execution/ReactorManager.java
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-core/src/main/java/org/apache/maven/execution/ReactorManager.java?rev=694912&r1=694911&r2=694912&view=diff
==============================================================================
--- maven/components/trunk/maven-core/src/main/java/org/apache/maven/execution/ReactorManager.java (original)
+++ maven/components/trunk/maven-core/src/main/java/org/apache/maven/execution/ReactorManager.java Sat Sep 13 03:07:23 2008
@@ -22,7 +22,7 @@
import org.apache.maven.artifact.ArtifactUtils;
import org.apache.maven.plugin.descriptor.PluginDescriptor;
-import org.apache.maven.project.DuplicateProjectException;
+import org.apache.maven.execution.DuplicateProjectException;
import org.apache.maven.project.MavenProject;
import org.apache.maven.model.Dependency;
import org.apache.maven.model.Plugin;
Copied: maven/components/trunk/maven-core/src/main/java/org/apache/maven/path/DefaultPathTranslator.java (from r694659, maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/path/DefaultPathTranslator.java)
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-core/src/main/java/org/apache/maven/path/DefaultPathTranslator.java?p2=maven/components/trunk/maven-core/src/main/java/org/apache/maven/path/DefaultPathTranslator.java&p1=maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/path/DefaultPathTranslator.java&r1=694659&r2=694912&rev=694912&view=diff
==============================================================================
--- maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/path/DefaultPathTranslator.java (original)
+++ maven/components/trunk/maven-core/src/main/java/org/apache/maven/path/DefaultPathTranslator.java Sat Sep 13 03:07:23 2008
@@ -1,4 +1,4 @@
-package org.apache.maven.project.path;
+package org.apache.maven.path;
/*
* Licensed to the Apache Software Foundation (ASF) under one
Propchange: maven/components/trunk/maven-core/src/main/java/org/apache/maven/path/DefaultPathTranslator.java
------------------------------------------------------------------------------
cvs2svn:cvs-rev = 1.10
Propchange: maven/components/trunk/maven-core/src/main/java/org/apache/maven/path/DefaultPathTranslator.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/components/trunk/maven-core/src/main/java/org/apache/maven/path/DefaultPathTranslator.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Copied: maven/components/trunk/maven-core/src/main/java/org/apache/maven/path/PathTranslator.java (from r694659, maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/path/PathTranslator.java)
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-core/src/main/java/org/apache/maven/path/PathTranslator.java?p2=maven/components/trunk/maven-core/src/main/java/org/apache/maven/path/PathTranslator.java&p1=maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/path/PathTranslator.java&r1=694659&r2=694912&rev=694912&view=diff
==============================================================================
--- maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/path/PathTranslator.java (original)
+++ maven/components/trunk/maven-core/src/main/java/org/apache/maven/path/PathTranslator.java Sat Sep 13 03:07:23 2008
@@ -1,4 +1,4 @@
-package org.apache.maven.project.path;
+package org.apache.maven.path;
/*
* Licensed to the Apache Software Foundation (ASF) under one
Propchange: maven/components/trunk/maven-core/src/main/java/org/apache/maven/path/PathTranslator.java
------------------------------------------------------------------------------
cvs2svn:cvs-rev = 1.4
Propchange: maven/components/trunk/maven-core/src/main/java/org/apache/maven/path/PathTranslator.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/components/trunk/maven-core/src/main/java/org/apache/maven/path/PathTranslator.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Modified: maven/components/trunk/maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginManager.java
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginManager.java?rev=694912&r1=694911&r2=694912&view=diff
==============================================================================
--- maven/components/trunk/maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginManager.java (original)
+++ maven/components/trunk/maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginManager.java Sat Sep 13 03:07:23 2008
@@ -20,6 +20,7 @@
*/
import org.apache.maven.ArtifactFilterManager;
+import org.apache.maven.path.PathTranslator;
import org.apache.maven.shared.model.InterpolatorProperty;
import org.apache.maven.artifact.Artifact;
import org.apache.maven.artifact.factory.ArtifactFactory;
@@ -62,7 +63,6 @@
import org.apache.maven.project.builder.PomClassicTransformer;
import org.apache.maven.project.artifact.InvalidDependencyVersionException;
import org.apache.maven.project.artifact.MavenMetadataSource;
-import org.apache.maven.project.path.PathTranslator;
import org.apache.maven.realm.MavenRealmManager;
import org.apache.maven.realm.RealmManagementException;
import org.apache.maven.reporting.MavenReport;
@@ -91,7 +91,6 @@
import java.io.IOException;
import java.io.StringReader;
-import java.io.File;
import java.util.ArrayList;
import java.util.Collection;
import java.util.Collections;
Modified: maven/components/trunk/maven-core/src/main/java/org/apache/maven/plugin/PluginParameterExpressionEvaluator.java
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-core/src/main/java/org/apache/maven/plugin/PluginParameterExpressionEvaluator.java?rev=694912&r1=694911&r2=694912&view=diff
==============================================================================
--- maven/components/trunk/maven-core/src/main/java/org/apache/maven/plugin/PluginParameterExpressionEvaluator.java (original)
+++ maven/components/trunk/maven-core/src/main/java/org/apache/maven/plugin/PluginParameterExpressionEvaluator.java Sat Sep 13 03:07:23 2008
@@ -23,7 +23,7 @@
import org.apache.maven.plugin.descriptor.MojoDescriptor;
import org.apache.maven.plugin.descriptor.PluginDescriptor;
import org.apache.maven.project.MavenProject;
-import org.apache.maven.project.path.PathTranslator;
+import org.apache.maven.path.PathTranslator;
import org.codehaus.plexus.component.configurator.expression.ExpressionEvaluationException;
import org.codehaus.plexus.component.configurator.expression.ExpressionEvaluator;
import org.codehaus.plexus.logging.Logger;
Modified: maven/components/trunk/maven-core/src/main/resources/META-INF/plexus/components.xml
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-core/src/main/resources/META-INF/plexus/components.xml?rev=694912&r1=694911&r2=694912&view=diff
==============================================================================
--- maven/components/trunk/maven-core/src/main/resources/META-INF/plexus/components.xml (original)
+++ maven/components/trunk/maven-core/src/main/resources/META-INF/plexus/components.xml Sat Sep 13 03:07:23 2008
@@ -226,6 +226,11 @@
</component>
<component>
+ <role>org.apache.maven.path.PathTranslator</role>
+ <implementation>org.apache.maven.path.DefaultPathTranslator</implementation>
+ </component>
+
+ <component>
<role>org.apache.maven.ArtifactFilterManager</role>
<implementation>org.apache.maven.DefaultArtifactFilterManager</implementation>
</component>
@@ -240,7 +245,7 @@
<role>org.apache.maven.ArtifactFilterManager</role>
</requirement>
<requirement>
- <role>org.apache.maven.project.path.PathTranslator</role>
+ <role>org.apache.maven.path.PathTranslator</role>
</requirement>
<requirement>
<role>org.apache.maven.plugin.MavenPluginCollector</role>
Modified: maven/components/trunk/maven-core/src/test/java/org/apache/maven/execution/ProjectSorterTest.java
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-core/src/test/java/org/apache/maven/execution/ProjectSorterTest.java?rev=694912&r1=694911&r2=694912&view=diff
==============================================================================
--- maven/components/trunk/maven-core/src/test/java/org/apache/maven/execution/ProjectSorterTest.java (original)
+++ maven/components/trunk/maven-core/src/test/java/org/apache/maven/execution/ProjectSorterTest.java Sat Sep 13 03:07:23 2008
@@ -24,7 +24,7 @@
import org.apache.maven.model.Dependency;
import org.apache.maven.model.Extension;
import org.apache.maven.model.Model;
-import org.apache.maven.project.DuplicateProjectException;
+import org.apache.maven.execution.DuplicateProjectException;
import org.apache.maven.project.MavenProject;
import org.codehaus.plexus.util.dag.CycleDetectedException;
Added: maven/components/trunk/maven-core/src/test/java/org/apache/maven/path/DefaultPathTranslatorTest.java
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-core/src/test/java/org/apache/maven/path/DefaultPathTranslatorTest.java?rev=694912&view=auto
==============================================================================
--- maven/components/trunk/maven-core/src/test/java/org/apache/maven/path/DefaultPathTranslatorTest.java (added)
+++ maven/components/trunk/maven-core/src/test/java/org/apache/maven/path/DefaultPathTranslatorTest.java Sat Sep 13 03:07:23 2008
@@ -0,0 +1,48 @@
+/*
+ * 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.
+ */
+
+package org.apache.maven.path;
+
+import java.io.File;
+
+import junit.framework.TestCase;
+
+public class DefaultPathTranslatorTest
+ extends TestCase
+{
+
+ public void testAlignToBasedirWhereBasedirExpressionIsTheCompleteValue()
+ {
+ File basedir = new File( System.getProperty( "java.io.tmpdir" ), "test" ).getAbsoluteFile();
+
+ String aligned = new DefaultPathTranslator().alignToBaseDirectory( "${basedir}", basedir );
+
+ assertEquals( basedir.getAbsolutePath(), aligned );
+ }
+
+ public void testAlignToBasedirWhereBasedirExpressionIsTheValuePrefix()
+ {
+ File basedir = new File( System.getProperty( "java.io.tmpdir" ), "test" ).getAbsoluteFile();
+
+ String aligned = new DefaultPathTranslator().alignToBaseDirectory( "${basedir}/dir", basedir );
+
+ assertEquals( new File( basedir, "dir" ).getAbsolutePath(), aligned );
+ }
+
+}
Propchange: maven/components/trunk/maven-core/src/test/java/org/apache/maven/path/DefaultPathTranslatorTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/components/trunk/maven-core/src/test/java/org/apache/maven/path/DefaultPathTranslatorTest.java
------------------------------------------------------------------------------
svn:keywords = "Author Date Id Revision"
Modified: maven/components/trunk/maven-core/src/test/java/org/apache/maven/plugin/PluginParameterExpressionEvaluatorTest.java
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-core/src/test/java/org/apache/maven/plugin/PluginParameterExpressionEvaluatorTest.java?rev=694912&r1=694911&r2=694912&view=diff
==============================================================================
--- maven/components/trunk/maven-core/src/test/java/org/apache/maven/plugin/PluginParameterExpressionEvaluatorTest.java (original)
+++ maven/components/trunk/maven-core/src/test/java/org/apache/maven/plugin/PluginParameterExpressionEvaluatorTest.java Sat Sep 13 03:07:23 2008
@@ -27,18 +27,15 @@
import org.apache.maven.artifact.repository.DefaultArtifactRepository;
import org.apache.maven.artifact.repository.layout.ArtifactRepositoryLayout;
import org.apache.maven.artifact.versioning.VersionRange;
-import org.apache.maven.execution.DefaultMavenExecutionRequest;
-import org.apache.maven.execution.MavenExecutionRequest;
-import org.apache.maven.execution.MavenSession;
-import org.apache.maven.execution.ReactorManager;
+import org.apache.maven.execution.*;
import org.apache.maven.model.Build;
import org.apache.maven.model.Model;
import org.apache.maven.monitor.event.DefaultEventDispatcher;
import org.apache.maven.plugin.descriptor.MojoDescriptor;
import org.apache.maven.plugin.descriptor.PluginDescriptor;
-import org.apache.maven.project.DuplicateProjectException;
+import org.apache.maven.execution.DuplicateProjectException;
import org.apache.maven.project.MavenProject;
-import org.apache.maven.project.path.PathTranslator;
+import org.apache.maven.path.PathTranslator;
import org.apache.maven.settings.Settings;
import org.codehaus.plexus.PlexusContainer;
import org.codehaus.plexus.PlexusTestCase;
Modified: maven/components/trunk/maven-core/src/test/resources/org/apache/maven/plugin/PluginParameterExpressionEvaluatorTest.xml
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-core/src/test/resources/org/apache/maven/plugin/PluginParameterExpressionEvaluatorTest.xml?rev=694912&r1=694911&r2=694912&view=diff
==============================================================================
--- maven/components/trunk/maven-core/src/test/resources/org/apache/maven/plugin/PluginParameterExpressionEvaluatorTest.xml (original)
+++ maven/components/trunk/maven-core/src/test/resources/org/apache/maven/plugin/PluginParameterExpressionEvaluatorTest.xml Sat Sep 13 03:07:23 2008
@@ -33,7 +33,7 @@
<role>org.apache.maven.project.validation.ModelValidator</role>
</requirement>
<requirement>
- <role>org.apache.maven.project.path.PathTranslator</role>
+ <role>org.apache.maven.path.PathTranslator</role>
</requirement>
<requirement>
<role>org.apache.maven.artifact.factory.ArtifactFactory</role>
Modified: maven/components/trunk/maven-embedder/src/main/java/org/apache/maven/embedder/MavenEmbedder.java
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-embedder/src/main/java/org/apache/maven/embedder/MavenEmbedder.java?rev=694912&r1=694911&r2=694912&view=diff
==============================================================================
--- maven/components/trunk/maven-embedder/src/main/java/org/apache/maven/embedder/MavenEmbedder.java (original)
+++ maven/components/trunk/maven-embedder/src/main/java/org/apache/maven/embedder/MavenEmbedder.java Sat Sep 13 03:07:23 2008
@@ -33,12 +33,7 @@
import org.apache.maven.embedder.execution.MavenExecutionRequestPopulator;
import org.apache.maven.errors.CoreErrorReporter;
import org.apache.maven.errors.CoreReporterManager;
-import org.apache.maven.execution.DefaultMavenExecutionRequest;
-import org.apache.maven.execution.DefaultMavenExecutionResult;
-import org.apache.maven.execution.MavenExecutionRequest;
-import org.apache.maven.execution.MavenExecutionResult;
-import org.apache.maven.execution.MavenSession;
-import org.apache.maven.execution.ReactorManager;
+import org.apache.maven.execution.*;
import org.apache.maven.extension.BuildExtensionScanner;
import org.apache.maven.extension.ExtensionScanningException;
import org.apache.maven.lifecycle.LifecycleException;
@@ -60,7 +55,7 @@
import org.apache.maven.plugin.descriptor.PluginDescriptorBuilder;
import org.apache.maven.plugin.version.PluginVersionNotFoundException;
import org.apache.maven.plugin.version.PluginVersionResolutionException;
-import org.apache.maven.project.DuplicateProjectException;
+import org.apache.maven.execution.DuplicateProjectException;
import org.apache.maven.project.MavenProject;
import org.apache.maven.project.MavenProjectBuilder;
import org.apache.maven.project.MavenProjectBuildingResult;
Modified: maven/components/trunk/maven-embedder/src/test/projects/complex-project/maven-core/src/main/resources/META-INF/plexus/components.xml
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-embedder/src/test/projects/complex-project/maven-core/src/main/resources/META-INF/plexus/components.xml?rev=694912&r1=694911&r2=694912&view=diff
==============================================================================
--- maven/components/trunk/maven-embedder/src/test/projects/complex-project/maven-core/src/main/resources/META-INF/plexus/components.xml (original)
+++ maven/components/trunk/maven-embedder/src/test/projects/complex-project/maven-core/src/main/resources/META-INF/plexus/components.xml Sat Sep 13 03:07:23 2008
@@ -80,7 +80,7 @@
<role>org.apache.maven.ArtifactFilterManager</role>
</requirement>
<requirement>
- <role>org.apache.maven.project.path.PathTranslator</role>
+ <role>org.apache.maven.path.PathTranslator</role>
</requirement>
<requirement>
<role>org.apache.maven.plugin.MavenPluginCollector</role>
Modified: maven/components/trunk/maven-embedder/src/test/projects/complex-project/maven-core/src/test/resources/org/apache/maven/plugin/PluginParameterExpressionEvaluatorTest.xml
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-embedder/src/test/projects/complex-project/maven-core/src/test/resources/org/apache/maven/plugin/PluginParameterExpressionEvaluatorTest.xml?rev=694912&r1=694911&r2=694912&view=diff
==============================================================================
--- maven/components/trunk/maven-embedder/src/test/projects/complex-project/maven-core/src/test/resources/org/apache/maven/plugin/PluginParameterExpressionEvaluatorTest.xml (original)
+++ maven/components/trunk/maven-embedder/src/test/projects/complex-project/maven-core/src/test/resources/org/apache/maven/plugin/PluginParameterExpressionEvaluatorTest.xml Sat Sep 13 03:07:23 2008
@@ -27,7 +27,7 @@
<role>org.apache.maven.project.validation.ModelValidator</role>
</requirement>
<requirement>
- <role>org.apache.maven.project.path.PathTranslator</role>
+ <role>org.apache.maven.path.PathTranslator</role>
</requirement>
<requirement>
<role>org.apache.maven.artifact.factory.ArtifactFactory</role>
Modified: maven/components/trunk/maven-embedder/src/test/projects/complex-project/maven-project/src/main/resources/META-INF/plexus/components.xml
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-embedder/src/test/projects/complex-project/maven-project/src/main/resources/META-INF/plexus/components.xml?rev=694912&r1=694911&r2=694912&view=diff
==============================================================================
--- maven/components/trunk/maven-embedder/src/test/projects/complex-project/maven-project/src/main/resources/META-INF/plexus/components.xml (original)
+++ maven/components/trunk/maven-embedder/src/test/projects/complex-project/maven-project/src/main/resources/META-INF/plexus/components.xml Sat Sep 13 03:07:23 2008
@@ -165,7 +165,7 @@
<role>org.apache.maven.project.validation.ModelValidator</role>
</requirement>
<requirement>
- <role>org.apache.maven.project.path.PathTranslator</role>
+ <role>org.apache.maven.path.PathTranslator</role>
</requirement>
<requirement>
<role>org.apache.maven.artifact.factory.ArtifactFactory</role>
@@ -288,8 +288,8 @@
| I realize this is duplicated but allows the project builder to work by itself
-->
<component>
- <role>org.apache.maven.project.path.PathTranslator</role>
- <implementation>org.apache.maven.project.path.DefaultPathTranslator</implementation>
+ <role>org.apache.maven.path.PathTranslator</role>
+ <implementation>org.apache.maven.path.DefaultPathTranslator</implementation>
</component>
<component>
Modified: maven/components/trunk/maven-embedder/src/test/projects/complex-project/maven-project/src/test/resources/org/apache/maven/project/ProjectClasspathTest.xml
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-embedder/src/test/projects/complex-project/maven-project/src/test/resources/org/apache/maven/project/ProjectClasspathTest.xml?rev=694912&r1=694911&r2=694912&view=diff
==============================================================================
--- maven/components/trunk/maven-embedder/src/test/projects/complex-project/maven-project/src/test/resources/org/apache/maven/project/ProjectClasspathTest.xml (original)
+++ maven/components/trunk/maven-embedder/src/test/projects/complex-project/maven-project/src/test/resources/org/apache/maven/project/ProjectClasspathTest.xml Sat Sep 13 03:07:23 2008
@@ -98,7 +98,7 @@
<role>org.apache.maven.project.validation.ModelValidator</role>
</requirement>
<requirement>
- <role>org.apache.maven.project.path.PathTranslator</role>
+ <role>org.apache.maven.path.PathTranslator</role>
</requirement>
<requirement>
<role>org.apache.maven.artifact.factory.ArtifactFactory</role>
Modified: maven/components/trunk/maven-embedder/src/test/projects/complex-project/maven-project/src/test/resources/org/apache/maven/project/canonical/CanonicalProjectBuilderTest.xml
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-embedder/src/test/projects/complex-project/maven-project/src/test/resources/org/apache/maven/project/canonical/CanonicalProjectBuilderTest.xml?rev=694912&r1=694911&r2=694912&view=diff
==============================================================================
--- maven/components/trunk/maven-embedder/src/test/projects/complex-project/maven-project/src/test/resources/org/apache/maven/project/canonical/CanonicalProjectBuilderTest.xml (original)
+++ maven/components/trunk/maven-embedder/src/test/projects/complex-project/maven-project/src/test/resources/org/apache/maven/project/canonical/CanonicalProjectBuilderTest.xml Sat Sep 13 03:07:23 2008
@@ -89,7 +89,7 @@
<role>org.apache.maven.project.validation.ModelValidator</role>
</requirement>
<requirement>
- <role>org.apache.maven.project.path.PathTranslator</role>
+ <role>org.apache.maven.path.PathTranslator</role>
</requirement>
<requirement>
<role>org.apache.maven.artifact.factory.ArtifactFactory</role>
Modified: maven/components/trunk/maven-project/src/main/resources/META-INF/plexus/components.xml
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-project/src/main/resources/META-INF/plexus/components.xml?rev=694912&r1=694911&r2=694912&view=diff
==============================================================================
--- maven/components/trunk/maven-project/src/main/resources/META-INF/plexus/components.xml (original)
+++ maven/components/trunk/maven-project/src/main/resources/META-INF/plexus/components.xml Sat Sep 13 03:07:23 2008
@@ -223,11 +223,7 @@
<!-- ********************* FIXME *******************************************
| I realize this is duplicated but allows the project builder to work by itself
-->
- <component>
- <role>org.apache.maven.project.path.PathTranslator</role>
- <implementation>org.apache.maven.project.path.DefaultPathTranslator</implementation>
- </component>
-
+
<component>
<role>org.apache.maven.artifact.metadata.ArtifactMetadataSource</role>
<role-hint>maven</role-hint>