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/11/20 23:19:34 UTC
svn commit: r719406 - in /maven/components/trunk:
maven-core/src/main/java/org/apache/maven/errors/
maven-core/src/main/java/org/apache/maven/path/
maven-core/src/main/java/org/apache/maven/plugin/
maven-core/src/main/resources/META-INF/plexus/ maven-c...
Author: sisbell
Date: Thu Nov 20 14:19:34 2008
New Revision: 719406
URL: http://svn.apache.org/viewvc?rev=719406&view=rev
Log:
Moved PathTranslator back to project module to fix class reference issue with the enforcer plugin. Added a preprocess method on the ModelTransformer to allow processing of plugin config elements. Need to add information about which elements are collections so they are not lost during a sort.
Added:
maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/path/
- copied from r718854, maven/components/trunk/maven-core/src/main/java/org/apache/maven/path/
maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/path/DefaultPathTranslator.java
- copied, changed from r719273, maven/components/trunk/maven-core/src/main/java/org/apache/maven/path/DefaultPathTranslator.java
maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/path/PathTranslator.java
- copied, changed from r719273, maven/components/trunk/maven-core/src/main/java/org/apache/maven/path/PathTranslator.java
maven/components/trunk/maven-project/src/test/java/org/apache/maven/project/path/
maven/components/trunk/maven-project/src/test/java/org/apache/maven/project/path/DefaultPathTranslatorTest.java (contents, props changed)
- copied, changed from r718854, maven/components/trunk/maven-core/src/test/java/org/apache/maven/path/DefaultPathTranslatorTest.java
Removed:
maven/components/trunk/maven-core/src/main/java/org/apache/maven/path/
maven/components/trunk/maven-core/src/test/java/org/apache/maven/path/
Modified:
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/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/plugin/PluginParameterExpressionEvaluatorTest.java
maven/components/trunk/maven-core/src/test/resources/org/apache/maven/plugin/PluginParameterExpressionEvaluatorTest.xml
maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java
maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/builder/PomClassicTransformer.java
maven/components/trunk/maven-shared-model/src/main/java/org/apache/maven/shared/model/ModelTransformer.java
maven/components/trunk/maven-shared-model/src/main/java/org/apache/maven/shared/model/ModelTransformerContext.java
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=719406&r1=719405&r2=719406&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 Thu Nov 20 14:19:34 2008
@@ -7,7 +7,6 @@
import org.apache.maven.artifact.resolver.AbstractArtifactResolutionException;
import org.apache.maven.artifact.resolver.ArtifactNotFoundException;
import org.apache.maven.artifact.resolver.ArtifactResolutionException;
-import org.apache.maven.artifact.resolver.ArtifactResolutionResult;
import org.apache.maven.artifact.resolver.MultipleArtifactsNotFoundException;
import org.apache.maven.artifact.versioning.ArtifactVersion;
import org.apache.maven.artifact.versioning.InvalidVersionSpecificationException;
@@ -35,7 +34,7 @@
import org.apache.maven.project.MavenProject;
import org.apache.maven.project.ProjectBuildingException;
import org.apache.maven.project.artifact.InvalidDependencyVersionException;
-import org.apache.maven.path.PathTranslator;
+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;
@@ -44,9 +43,7 @@
import org.codehaus.plexus.configuration.PlexusConfiguration;
import org.codehaus.plexus.logging.Logger;
-import java.io.File;
import java.util.List;
-import java.util.Map;
public interface CoreErrorReporter
extends ProjectErrorReporter
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=719406&r1=719405&r2=719406&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 Thu Nov 20 14:19:34 2008
@@ -2,7 +2,7 @@
import org.apache.maven.NoGoalsSpecifiedException;
import org.apache.maven.ProjectCycleException;
-import org.apache.maven.path.PathTranslator;
+import org.apache.maven.project.path.PathTranslator;
import org.apache.maven.artifact.Artifact;
import org.apache.maven.artifact.ArtifactUtils;
import org.apache.maven.artifact.metadata.ArtifactMetadataRetrievalException;
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=719406&r1=719405&r2=719406&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 Thu Nov 20 14:19:34 2008
@@ -20,7 +20,7 @@
*/
import org.apache.maven.ArtifactFilterManager;
-import org.apache.maven.path.PathTranslator;
+import org.apache.maven.project.path.PathTranslator;
import org.apache.maven.shared.model.InterpolatorProperty;
import org.apache.maven.artifact.Artifact;
import org.apache.maven.artifact.factory.ArtifactFactory;
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=719406&r1=719405&r2=719406&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 Thu Nov 20 14:19:34 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.path.PathTranslator;
+import org.apache.maven.project.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=719406&r1=719405&r2=719406&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 Thu Nov 20 14:19:34 2008
@@ -205,8 +205,8 @@
</component>
<component>
- <role>org.apache.maven.path.PathTranslator</role>
- <implementation>org.apache.maven.path.DefaultPathTranslator</implementation>
+ <role>org.apache.maven.project.path.PathTranslator</role>
+ <implementation>org.apache.maven.project.path.DefaultPathTranslator</implementation>
</component>
<component>
@@ -224,7 +224,7 @@
<role>org.apache.maven.ArtifactFilterManager</role>
</requirement>
<requirement>
- <role>org.apache.maven.path.PathTranslator</role>
+ <role>org.apache.maven.project.path.PathTranslator</role>
</requirement>
<requirement>
<role>org.apache.maven.plugin.MavenPluginCollector</role>
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=719406&r1=719405&r2=719406&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 Thu Nov 20 14:19:34 2008
@@ -35,7 +35,7 @@
import org.apache.maven.plugin.descriptor.PluginDescriptor;
import org.apache.maven.execution.DuplicateProjectException;
import org.apache.maven.project.MavenProject;
-import org.apache.maven.path.PathTranslator;
+import org.apache.maven.project.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=719406&r1=719405&r2=719406&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 Thu Nov 20 14:19:34 2008
@@ -30,7 +30,7 @@
<role>org.apache.maven.project.validation.ModelValidator</role>
</requirement>
<requirement>
- <role>org.apache.maven.path.PathTranslator</role>
+ <role>org.apache.maven.project.path.PathTranslator</role>
</requirement>
<requirement>
<role>org.apache.maven.artifact.factory.ArtifactFactory</role>
Modified: maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java?rev=719406&r1=719405&r2=719406&view=diff
==============================================================================
--- maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java (original)
+++ maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java Thu Nov 20 14:19:34 2008
@@ -41,10 +41,7 @@
import org.apache.maven.profiles.activation.ProfileActivationException;
import org.apache.maven.profiles.build.ProfileAdvisor;
import org.apache.maven.project.artifact.InvalidDependencyVersionException;
-import org.apache.maven.project.builder.PomArtifactResolver;
-import org.apache.maven.project.builder.ProjectBuilder;
-import org.apache.maven.project.builder.PomInterpolatorTag;
-import org.apache.maven.project.builder.PomClassicTransformer;
+import org.apache.maven.project.builder.*;
import org.apache.maven.project.validation.ModelValidationResult;
import org.apache.maven.project.validation.ModelValidator;
import org.codehaus.plexus.logging.LogEnabled;
@@ -53,7 +50,6 @@
import org.codehaus.plexus.util.IOUtil;
import org.codehaus.plexus.util.ReaderFactory;
import org.codehaus.plexus.util.StringUtils;
-import org.codehaus.plexus.util.WriterFactory;
import org.codehaus.plexus.util.xml.pull.XmlPullParserException;
import java.io.File;
@@ -61,7 +57,6 @@
import java.io.IOException;
import java.io.Reader;
import java.io.StringReader;
-import java.io.Writer;
import java.net.URL;
import java.util.*;
import java.text.SimpleDateFormat;
@@ -134,7 +129,7 @@
getSuperProject( config, projectDescriptor, true ).getModel() ), artifactResolver ), config );
project.setFile( projectDescriptor );
- project = buildInternal( project.getModel(), config, projectDescriptor, project.getParentFile(), true );
+ project = buildWithProfiles( project.getModel(), config, projectDescriptor, project.getParentFile(), true );
Build build = project.getBuild();
// NOTE: setting this script-source root before path translation, because
@@ -193,8 +188,8 @@
artifactRepositories.addAll( repositoryHelper.buildArtifactRepositories( getSuperProject( config, artifact.getFile(), false ).getModel() ) );
project = readModelFromLocalPath( "unknown", artifact.getFile(), new PomArtifactResolver( config.getLocalRepository(), artifactRepositories, artifactResolver ), config );
- project = buildInternal( project.getModel(), config, artifact.getFile(), project.getParentFile(), false );
-
+ project = buildWithProfiles( project.getModel(), config, artifact.getFile(), project.getParentFile(), false );
+ // project = readModelFromLocalPath( "unknown", artifact.getFile(), new PomArtifactResolver( config.getLocalRepository(), artifactRepositories, artifactResolver ), config );
artifact.setFile( f );
project.setVersion( artifact.getVersion() );
@@ -352,7 +347,7 @@
return logger;
}
- private MavenProject buildInternal( Model model, ProjectBuilderConfiguration config, File projectDescriptor,
+ private MavenProject buildWithProfiles( Model model, ProjectBuilderConfiguration config, File projectDescriptor,
File parentDescriptor, boolean isReactorProject )
throws ProjectBuildingException
{
Modified: maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/builder/PomClassicTransformer.java
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/builder/PomClassicTransformer.java?rev=719406&r1=719405&r2=719406&view=diff
==============================================================================
--- maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/builder/PomClassicTransformer.java (original)
+++ maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/builder/PomClassicTransformer.java Thu Nov 20 14:19:34 2008
@@ -746,6 +746,11 @@
return false;
}
+ public List<ModelProperty> preprocessModelProperties(List<ModelProperty> modelProperties)
+ {
+ return new ArrayList<ModelProperty>(modelProperties);
+ }
+
/**
* Returns the base uri of all model properties: http://apache.org/maven/project/
*
Copied: maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/path/DefaultPathTranslator.java (from r719273, maven/components/trunk/maven-core/src/main/java/org/apache/maven/path/DefaultPathTranslator.java)
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/path/DefaultPathTranslator.java?p2=maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/path/DefaultPathTranslator.java&p1=maven/components/trunk/maven-core/src/main/java/org/apache/maven/path/DefaultPathTranslator.java&r1=719273&r2=719406&rev=719406&view=diff
==============================================================================
--- maven/components/trunk/maven-core/src/main/java/org/apache/maven/path/DefaultPathTranslator.java (original)
+++ maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/path/DefaultPathTranslator.java Thu Nov 20 14:19:34 2008
@@ -1,4 +1,4 @@
-package org.apache.maven.path;
+package org.apache.maven.project.path;
/*
* Licensed to the Apache Software Foundation (ASF) under one
Copied: maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/path/PathTranslator.java (from r719273, maven/components/trunk/maven-core/src/main/java/org/apache/maven/path/PathTranslator.java)
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/path/PathTranslator.java?p2=maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/path/PathTranslator.java&p1=maven/components/trunk/maven-core/src/main/java/org/apache/maven/path/PathTranslator.java&r1=719273&r2=719406&rev=719406&view=diff
==============================================================================
--- maven/components/trunk/maven-core/src/main/java/org/apache/maven/path/PathTranslator.java (original)
+++ maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/path/PathTranslator.java Thu Nov 20 14:19:34 2008
@@ -1,4 +1,4 @@
-package org.apache.maven.path;
+package org.apache.maven.project.path;
/*
* Licensed to the Apache Software Foundation (ASF) under one
Copied: maven/components/trunk/maven-project/src/test/java/org/apache/maven/project/path/DefaultPathTranslatorTest.java (from r718854, maven/components/trunk/maven-core/src/test/java/org/apache/maven/path/DefaultPathTranslatorTest.java)
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-project/src/test/java/org/apache/maven/project/path/DefaultPathTranslatorTest.java?p2=maven/components/trunk/maven-project/src/test/java/org/apache/maven/project/path/DefaultPathTranslatorTest.java&p1=maven/components/trunk/maven-core/src/test/java/org/apache/maven/path/DefaultPathTranslatorTest.java&r1=718854&r2=719406&rev=719406&view=diff
==============================================================================
--- maven/components/trunk/maven-core/src/test/java/org/apache/maven/path/DefaultPathTranslatorTest.java (original)
+++ maven/components/trunk/maven-project/src/test/java/org/apache/maven/project/path/DefaultPathTranslatorTest.java Thu Nov 20 14:19:34 2008
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.maven.path;
+package org.apache.maven.project.path;
import java.io.File;
Propchange: maven/components/trunk/maven-project/src/test/java/org/apache/maven/project/path/DefaultPathTranslatorTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/components/trunk/maven-project/src/test/java/org/apache/maven/project/path/DefaultPathTranslatorTest.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Modified: maven/components/trunk/maven-shared-model/src/main/java/org/apache/maven/shared/model/ModelTransformer.java
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-shared-model/src/main/java/org/apache/maven/shared/model/ModelTransformer.java?rev=719406&r1=719405&r2=719406&view=diff
==============================================================================
--- maven/components/trunk/maven-shared-model/src/main/java/org/apache/maven/shared/model/ModelTransformer.java (original)
+++ maven/components/trunk/maven-shared-model/src/main/java/org/apache/maven/shared/model/ModelTransformer.java Thu Nov 20 14:19:34 2008
@@ -30,6 +30,8 @@
public interface ModelTransformer
{
+ List<ModelProperty> preprocessModelProperties(List<ModelProperty> modelProperties);
+
String getBaseUri();
/**
Modified: maven/components/trunk/maven-shared-model/src/main/java/org/apache/maven/shared/model/ModelTransformerContext.java
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-shared-model/src/main/java/org/apache/maven/shared/model/ModelTransformerContext.java?rev=719406&r1=719405&r2=719406&view=diff
==============================================================================
--- maven/components/trunk/maven-shared-model/src/main/java/org/apache/maven/shared/model/ModelTransformerContext.java (original)
+++ maven/components/trunk/maven-shared-model/src/main/java/org/apache/maven/shared/model/ModelTransformerContext.java Thu Nov 20 14:19:34 2008
@@ -233,6 +233,7 @@
List<ModelProperty> transformedProperties =
importModelProperties(importModels, fromModelTransformer.transformToModelProperties( domainModels));
+ transformedProperties = fromModelTransformer.preprocessModelProperties(transformedProperties);
String baseUriForModel = fromModelTransformer.getBaseUri();
List<ModelProperty> modelProperties =