Moved PathTranslator to maven-core. maven-project no longer uses it.

git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@694912 13f79535-47bb-0310-9956-ffa450edef68

maven-core/src/main/java/org/apache/maven/DefaultMaven.java

@@ -21,12 +21,7 @@
 
 
 import org.apache.maven.artifact.versioning.DefaultArtifactVersion;
-import org.apache.maven.execution.DefaultMavenExecutionResult;
+import org.apache.maven.execution.*;
-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.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;

maven-core/src/main/java/org/apache/maven/errors/CoreErrorReporter.java

@@ -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;

maven-core/src/main/java/org/apache/maven/errors/DefaultCoreErrorReporter.java

@@ -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;

maven-core/src/main/java/org/apache/maven/errors/DefaultProjectErrorReporter.java

@@ -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;

maven-core/src/main/java/org/apache/maven/errors/ProjectErrorReporter.java

@@ -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;

maven-core/src/main/java/org/apache/maven/errors/ProjectErrorTips.java

@@ -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;

maven-core/src/main/java/org/apache/maven/execution/DuplicateProjectException.java

@@ -1,4 +1,4 @@
-package org.apache.maven.project;
+package org.apache.maven.execution;
 
 import java.io.File;
 

maven-core/src/main/java/org/apache/maven/execution/ReactorManager.java

@@ -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;

maven-core/src/main/java/org/apache/maven/path/DefaultPathTranslator.java

@@ -1,4 +1,4 @@
-package org.apache.maven.project.path;
+package org.apache.maven.path;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one

maven-core/src/main/java/org/apache/maven/path/PathTranslator.java

@@ -1,4 +1,4 @@
-package org.apache.maven.project.path;
+package org.apache.maven.path;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one

maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginManager.java

@@ -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;

maven-core/src/main/java/org/apache/maven/plugin/PluginParameterExpressionEvaluator.java

@@ -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;

maven-core/src/main/resources/META-INF/plexus/components.xml

@@ -225,6 +225,11 @@ under the License.
       </requirements>
     </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>
@@ -240,7 +245,7 @@ under the License.
           <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>

maven-core/src/test/java/org/apache/maven/execution/ProjectSorterTest.java

@@ -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;
 

maven-core/src/test/java/org/apache/maven/path/DefaultPathTranslatorTest.java

@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package org.apache.maven.project.path;
+package org.apache.maven.path;
 
 import java.io.File;
 

maven-core/src/test/java/org/apache/maven/plugin/PluginParameterExpressionEvaluatorTest.java

@@ -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.*;
-import org.apache.maven.execution.MavenExecutionRequest;
-import org.apache.maven.execution.MavenSession;
-import org.apache.maven.execution.ReactorManager;
 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;

maven-core/src/test/resources/org/apache/maven/plugin/PluginParameterExpressionEvaluatorTest.xml

@@ -33,7 +33,7 @@ under the License.
           <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>

maven-embedder/src/main/java/org/apache/maven/embedder/MavenEmbedder.java

@@ -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.*;
-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.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;

maven-embedder/src/test/projects/complex-project/maven-core/src/main/resources/META-INF/plexus/components.xml

@@ -80,7 +80,7 @@ under the License.
           <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>

maven-embedder/src/test/projects/complex-project/maven-core/src/test/resources/org/apache/maven/plugin/PluginParameterExpressionEvaluatorTest.xml

@@ -27,7 +27,7 @@ under the License.
           <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>

maven-embedder/src/test/projects/complex-project/maven-project/src/main/resources/META-INF/plexus/components.xml

@@ -165,7 +165,7 @@ under the License.
           <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 @@ under the License.
 | I realize this is duplicated but allows the project builder to work by itself
 -->
     <component>
-      <role>org.apache.maven.project.path.PathTranslator</role>
+      <role>org.apache.maven.path.PathTranslator</role>
-      <implementation>org.apache.maven.project.path.DefaultPathTranslator</implementation>
+      <implementation>org.apache.maven.path.DefaultPathTranslator</implementation>
     </component>
     
     <component>

maven-embedder/src/test/projects/complex-project/maven-project/src/test/resources/org/apache/maven/project/ProjectClasspathTest.xml

@@ -98,7 +98,7 @@ under the License.
           <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>

maven-embedder/src/test/projects/complex-project/maven-project/src/test/resources/org/apache/maven/project/canonical/CanonicalProjectBuilderTest.xml

@@ -89,7 +89,7 @@ under the License.
           <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>

maven-project/src/main/resources/META-INF/plexus/components.xml

@@ -223,11 +223,7 @@ under the License.
 <!-- ********************* 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>