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/08 23:43:35 UTC
svn commit: r693291 [4/4] - in
/maven/components/branches/sisbell-maven-2.1-profile/maven-project/src/main/java/org/apache/maven:
./ profiles/ profiles/activation/ profiles/build/ profiles/injection/
project/ project/artifact/ project/builder/ project/...
Modified: maven/components/branches/sisbell-maven-2.1-profile/maven-project/src/main/java/org/apache/maven/project/builder/impl/DefaultProjectBuilder.java
URL: http://svn.apache.org/viewvc/maven/components/branches/sisbell-maven-2.1-profile/maven-project/src/main/java/org/apache/maven/project/builder/impl/DefaultProjectBuilder.java?rev=693291&r1=693290&r2=693291&view=diff
==============================================================================
--- maven/components/branches/sisbell-maven-2.1-profile/maven-project/src/main/java/org/apache/maven/project/builder/impl/DefaultProjectBuilder.java (original)
+++ maven/components/branches/sisbell-maven-2.1-profile/maven-project/src/main/java/org/apache/maven/project/builder/impl/DefaultProjectBuilder.java Mon Sep 8 14:43:31 2008
@@ -28,7 +28,12 @@
import org.apache.maven.project.MavenProject;
import org.apache.maven.project.ProjectBuilderConfiguration;
import org.apache.maven.project.RepositoryHelper;
-import org.apache.maven.project.builder.*;
+import org.apache.maven.project.builder.ArtifactModelContainerFactory;
+import org.apache.maven.project.builder.IdModelContainerFactory;
+import org.apache.maven.project.builder.PomArtifactResolver;
+import org.apache.maven.project.builder.PomClassicDomainModel;
+import org.apache.maven.project.builder.PomClassicTransformer;
+import org.apache.maven.project.builder.ProjectBuilder;
import org.apache.maven.project.validation.ModelValidationResult;
import org.apache.maven.project.validation.ModelValidator;
import org.apache.maven.shared.model.DomainModel;
@@ -41,7 +46,11 @@
import java.io.File;
import java.io.IOException;
import java.io.InputStream;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.List;
/**
* Default implementation of the project builder.
@@ -87,11 +96,11 @@
/**
* @see ProjectBuilder#buildFromLocalPath(java.io.InputStream, java.util.List, java.util.Collection, java.util.Collection, org.apache.maven.project.builder.PomArtifactResolver, java.io.File, org.apache.maven.project.ProjectBuilderConfiguration)
*/
- public MavenProject buildFromLocalPath(InputStream pom, List<Model> inheritedModels,
- Collection<ImportModel> importModels,
- Collection<InterpolatorProperty> interpolatorProperties,
- PomArtifactResolver resolver, File projectDirectory,
- ProjectBuilderConfiguration projectBuilderConfiguration)
+ public MavenProject buildFromLocalPath( InputStream pom, List<Model> inheritedModels,
+ Collection<ImportModel> importModels,
+ Collection<InterpolatorProperty> interpolatorProperties,
+ PomArtifactResolver resolver, File projectDirectory,
+ ProjectBuilderConfiguration projectBuilderConfiguration )
throws IOException
{
if ( pom == null )
@@ -143,19 +152,20 @@
}
else
{
- mavenParents = getDomainModelParentsFromRepository( domainModel, resolver ) ;
+ mavenParents = getDomainModelParentsFromRepository( domainModel, resolver );
}
- if(mavenParents.size() > 0) {
- PomClassicDomainModel dm = (PomClassicDomainModel) mavenParents.get(0);
+ if ( mavenParents.size() > 0 )
+ {
+ PomClassicDomainModel dm = (PomClassicDomainModel) mavenParents.get( 0 );
parentFile = dm.getFile();
- domainModel.setParentFile(parentFile);
+ domainModel.setParentFile( parentFile );
// mavenParent = buildFromLocalPath( dm.getInputStream(), inheritedModels,
// importModels, interpolatorProperties, resolver, projectDirectory);
- // mavenParent.setFile(dm.getFile());
+ // mavenParent.setFile(dm.getFile());
}
- domainModels.addAll(mavenParents);
+ domainModels.addAll( mavenParents );
}
for ( Model model : inheritedModels )
@@ -163,27 +173,34 @@
domainModels.add( new PomClassicDomainModel( model ) );
}
- PomClassicTransformer transformer = new PomClassicTransformer(null);
+ PomClassicTransformer transformer = new PomClassicTransformer( null );
ModelTransformerContext ctx = new ModelTransformerContext(
Arrays.asList( new ArtifactModelContainerFactory(), new IdModelContainerFactory() ) );
- PomClassicDomainModel transformedDomainModel =
- ( (PomClassicDomainModel) ctx.transform( domainModels, transformer, transformer, importModels, properties ) );
- // System.out.println(transformedDomainModel.asString());
- try {
+ PomClassicDomainModel transformedDomainModel = ( (PomClassicDomainModel) ctx.transform( domainModels,
+ transformer,
+ transformer,
+ importModels,
+ properties ) );
+ // System.out.println(transformedDomainModel.asString());
+ try
+ {
MavenProject mavenProject = new MavenProject( transformedDomainModel.getModel(), artifactFactory,
- mavenTools, repositoryHelper, null, projectBuilderConfiguration);
- mavenProject.setParentFile(parentFile);
+ mavenTools, repositoryHelper, null,
+ projectBuilderConfiguration );
+ mavenProject.setParentFile( parentFile );
return mavenProject;
- } catch (InvalidRepositoryException e) {
- throw new IOException(e.getMessage());
+ }
+ catch ( InvalidRepositoryException e )
+ {
+ throw new IOException( e.getMessage() );
}
}
/**
* Returns true if the relative path of the specified parent references a pom, otherwise returns false.
*
- * @param parent the parent model info
+ * @param parent the parent model info
* @param projectDirectory the project directory of the child pom
* @return true if the relative path of the specified parent references a pom, otherwise returns fals
*/
@@ -227,12 +244,11 @@
artifactFactory.createParentArtifact( parent.getGroupId(), parent.getArtifactId(), parent.getVersion() );
artifactResolver.resolve( artifactParent );
- PomClassicDomainModel parentDomainModel =
- new PomClassicDomainModel( artifactParent.getFile() );
+ PomClassicDomainModel parentDomainModel = new PomClassicDomainModel( artifactParent.getFile() );
if ( !parentDomainModel.matchesParent( domainModel.getModel().getParent() ) )
{
- logger.warn( "Parent pom ids do not match: Parent File = " + artifactParent.getFile().getAbsolutePath()
- + ": Child ID = " + domainModel.getModel().getId() );
+ logger.warn( "Parent pom ids do not match: Parent File = " + artifactParent.getFile().getAbsolutePath() +
+ ": Child ID = " + domainModel.getModel().getId() );
return domainModels;
}
else
@@ -247,7 +263,7 @@
}
/**
- * Returns list of domain model parents of the specified domain model. The parent domain models are part
+ * Returns list of domain model parents of the specified domain model. The parent domain models are part
*
* @param domainModel
* @param artifactResolver
@@ -288,11 +304,11 @@
throw new IOException( "File does not exist: File = " + parentFile.getAbsolutePath() );
}
- PomClassicDomainModel parentDomainModel = new PomClassicDomainModel( parentFile );
+ PomClassicDomainModel parentDomainModel = new PomClassicDomainModel( parentFile );
if ( !parentDomainModel.matchesParent( domainModel.getModel().getParent() ) )
{
- logger.warn( "Parent pom ids do not match: Parent File = " + parentFile.getAbsolutePath()
- + ": Child ID = " + domainModel.getModel().getId() );
+ logger.warn( "Parent pom ids do not match: Parent File = " + parentFile.getAbsolutePath() +
+ ": Child ID = " + domainModel.getModel().getId() );
}
domainModels.add( parentDomainModel );
Modified: maven/components/branches/sisbell-maven-2.1-profile/maven-project/src/main/java/org/apache/maven/project/inheritance/DefaultModelInheritanceAssembler.java
URL: http://svn.apache.org/viewvc/maven/components/branches/sisbell-maven-2.1-profile/maven-project/src/main/java/org/apache/maven/project/inheritance/DefaultModelInheritanceAssembler.java?rev=693291&r1=693290&r2=693291&view=diff
==============================================================================
--- maven/components/branches/sisbell-maven-2.1-profile/maven-project/src/main/java/org/apache/maven/project/inheritance/DefaultModelInheritanceAssembler.java (original)
+++ maven/components/branches/sisbell-maven-2.1-profile/maven-project/src/main/java/org/apache/maven/project/inheritance/DefaultModelInheritanceAssembler.java Mon Sep 8 14:43:31 2008
@@ -19,12 +19,32 @@
* under the License.
*/
-import org.apache.maven.model.*;
+import org.apache.maven.model.Build;
+import org.apache.maven.model.Dependency;
+import org.apache.maven.model.DependencyManagement;
+import org.apache.maven.model.DeploymentRepository;
+import org.apache.maven.model.DistributionManagement;
+import org.apache.maven.model.Model;
+import org.apache.maven.model.PluginManagement;
+import org.apache.maven.model.ReportPlugin;
+import org.apache.maven.model.ReportSet;
+import org.apache.maven.model.Reporting;
+import org.apache.maven.model.Resource;
+import org.apache.maven.model.Scm;
+import org.apache.maven.model.Site;
import org.apache.maven.project.ModelUtils;
import org.codehaus.plexus.util.StringUtils;
import org.codehaus.plexus.util.xml.Xpp3Dom;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.LinkedHashMap;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Map;
+import java.util.Properties;
+import java.util.StringTokenizer;
+import java.util.TreeMap;
/**
* @author Jason van Zyl
@@ -38,9 +58,7 @@
// TODO: Remove this!
@SuppressWarnings("unchecked")
- public void assembleBuildInheritance( Build childBuild,
- Build parentBuild,
- boolean handleAsInheritance )
+ public void assembleBuildInheritance( Build childBuild, Build parentBuild, boolean handleAsInheritance )
{
// The build has been set but we want to step in here and fill in
// values that have not been set by the child.
@@ -116,8 +134,7 @@
}
else
{
- ModelUtils.mergePluginLists( childBuild.getPluginManagement(), parentBuild.getPluginManagement(),
- false );
+ ModelUtils.mergePluginLists( childBuild.getPluginManagement(), parentBuild.getPluginManagement(), false );
}
}
@@ -510,7 +527,7 @@
child.flushReportSetMap();
}
- }
+ }
// TODO: Remove this!
@SuppressWarnings("unchecked")
@@ -560,7 +577,8 @@
}
}
- private void assembleDistributionInheritence( Model child, Model parent, String childPathAdjustment, boolean appendPaths )
+ private void assembleDistributionInheritence( Model child, Model parent, String childPathAdjustment,
+ boolean appendPaths )
{
if ( parent.getDistributionManagement() != null )
{
@@ -713,7 +731,6 @@
}
}
-
StringBuffer cleanedPath = new StringBuffer();
while ( !pathElements.isEmpty() )
Modified: maven/components/branches/sisbell-maven-2.1-profile/maven-project/src/main/java/org/apache/maven/project/inheritance/ModelInheritanceAssembler.java
URL: http://svn.apache.org/viewvc/maven/components/branches/sisbell-maven-2.1-profile/maven-project/src/main/java/org/apache/maven/project/inheritance/ModelInheritanceAssembler.java?rev=693291&r1=693290&r2=693291&view=diff
==============================================================================
--- maven/components/branches/sisbell-maven-2.1-profile/maven-project/src/main/java/org/apache/maven/project/inheritance/ModelInheritanceAssembler.java (original)
+++ maven/components/branches/sisbell-maven-2.1-profile/maven-project/src/main/java/org/apache/maven/project/inheritance/ModelInheritanceAssembler.java Mon Sep 8 14:43:31 2008
@@ -30,9 +30,7 @@
{
String ROLE = ModelInheritanceAssembler.class.getName();
- void assembleBuildInheritance( Build childBuild,
- Build parentBuild,
- boolean handleAsInheriance );
+ void assembleBuildInheritance( Build childBuild, Build parentBuild, boolean handleAsInheriance );
void copyModel( Model dest, Model source );
}
Modified: maven/components/branches/sisbell-maven-2.1-profile/maven-project/src/main/java/org/apache/maven/project/interpolation/ModelInterpolator.java
URL: http://svn.apache.org/viewvc/maven/components/branches/sisbell-maven-2.1-profile/maven-project/src/main/java/org/apache/maven/project/interpolation/ModelInterpolator.java?rev=693291&r1=693290&r2=693291&view=diff
==============================================================================
--- maven/components/branches/sisbell-maven-2.1-profile/maven-project/src/main/java/org/apache/maven/project/interpolation/ModelInterpolator.java (original)
+++ maven/components/branches/sisbell-maven-2.1-profile/maven-project/src/main/java/org/apache/maven/project/interpolation/ModelInterpolator.java Mon Sep 8 14:43:31 2008
@@ -42,29 +42,20 @@
* @deprecated Use {@link ModelInterpolator#interpolate(Model, File, ProjectBuilderConfiguration, boolean)} instead.
*/
@Deprecated
- Model interpolate( Model project,
- Map<String, ?> context )
+ Model interpolate( Model project, Map<String, ?> context )
throws ModelInterpolationException;
/**
* @deprecated Use {@link ModelInterpolator#interpolate(Model, File, ProjectBuilderConfiguration, boolean)} instead.
*/
@Deprecated
- Model interpolate( Model model,
- Map<String, ?> context,
- boolean strict )
+ Model interpolate( Model model, Map<String, ?> context, boolean strict )
throws ModelInterpolationException;
- Model interpolate( Model model,
- File projectDir,
- ProjectBuilderConfiguration config,
- boolean debugEnabled )
+ Model interpolate( Model model, File projectDir, ProjectBuilderConfiguration config, boolean debugEnabled )
throws ModelInterpolationException;
- String interpolate( String src,
- Model model,
- File projectDir,
- ProjectBuilderConfiguration config,
+ String interpolate( String src, Model model, File projectDir, ProjectBuilderConfiguration config,
boolean debugEnabled )
throws ModelInterpolationException;
}
\ No newline at end of file
Modified: maven/components/branches/sisbell-maven-2.1-profile/maven-project/src/main/java/org/apache/maven/project/interpolation/PathTranslatingPostProcessor.java
URL: http://svn.apache.org/viewvc/maven/components/branches/sisbell-maven-2.1-profile/maven-project/src/main/java/org/apache/maven/project/interpolation/PathTranslatingPostProcessor.java?rev=693291&r1=693290&r2=693291&view=diff
==============================================================================
--- maven/components/branches/sisbell-maven-2.1-profile/maven-project/src/main/java/org/apache/maven/project/interpolation/PathTranslatingPostProcessor.java (original)
+++ maven/components/branches/sisbell-maven-2.1-profile/maven-project/src/main/java/org/apache/maven/project/interpolation/PathTranslatingPostProcessor.java Mon Sep 8 14:43:31 2008
@@ -26,7 +26,6 @@
import java.util.List;
/**
- *
* @version $Id: PathTranslatingPostProcessor.java 677447 2008-07-16 22:15:57Z jdcasey $
*/
public class PathTranslatingPostProcessor
@@ -34,7 +33,9 @@
{
private final List unprefixedPathKeys;
+
private final File projectDir;
+
private final PathTranslator pathTranslator;
public PathTranslatingPostProcessor( List unprefixedPathKeys, File projectDir, PathTranslator pathTranslator )
@@ -44,8 +45,7 @@
this.pathTranslator = pathTranslator;
}
- public Object execute( String expression,
- Object value )
+ public Object execute( String expression, Object value )
{
if ( projectDir != null && value != null && unprefixedPathKeys.contains( expression ) )
{
Modified: maven/components/branches/sisbell-maven-2.1-profile/maven-project/src/main/java/org/apache/maven/project/interpolation/RegexBasedModelInterpolator.java
URL: http://svn.apache.org/viewvc/maven/components/branches/sisbell-maven-2.1-profile/maven-project/src/main/java/org/apache/maven/project/interpolation/RegexBasedModelInterpolator.java?rev=693291&r1=693290&r2=693291&view=diff
==============================================================================
--- maven/components/branches/sisbell-maven-2.1-profile/maven-project/src/main/java/org/apache/maven/project/interpolation/RegexBasedModelInterpolator.java (original)
+++ maven/components/branches/sisbell-maven-2.1-profile/maven-project/src/main/java/org/apache/maven/project/interpolation/RegexBasedModelInterpolator.java Mon Sep 8 14:43:31 2008
@@ -25,7 +25,15 @@
import org.apache.maven.project.DefaultProjectBuilderConfiguration;
import org.apache.maven.project.ProjectBuilderConfiguration;
import org.apache.maven.project.path.PathTranslator;
-import org.codehaus.plexus.interpolation.*;
+import org.codehaus.plexus.interpolation.InterpolationException;
+import org.codehaus.plexus.interpolation.MapBasedValueSource;
+import org.codehaus.plexus.interpolation.ObjectBasedValueSource;
+import org.codehaus.plexus.interpolation.PrefixAwareRecursionInterceptor;
+import org.codehaus.plexus.interpolation.PrefixedObjectValueSource;
+import org.codehaus.plexus.interpolation.PrefixedValueSourceWrapper;
+import org.codehaus.plexus.interpolation.RecursionInterceptor;
+import org.codehaus.plexus.interpolation.RegexBasedInterpolator;
+import org.codehaus.plexus.interpolation.ValueSource;
import org.codehaus.plexus.logging.AbstractLogEnabled;
import org.codehaus.plexus.logging.Logger;
import org.codehaus.plexus.util.xml.pull.XmlPullParserException;
@@ -34,7 +42,12 @@
import java.io.IOException;
import java.io.StringReader;
import java.io.StringWriter;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+import java.util.Properties;
/**
* Use a regular expression search to find and resolve expressions within the POM.
@@ -48,7 +61,8 @@
implements ModelInterpolator
{
- private static final List<String> PROJECT_PREFIXES = Arrays.asList( new String[]{ "pom.", "project." } );
+ private static final List<String> PROJECT_PREFIXES = Arrays.asList( new String[]{"pom.", "project."} );
+
private static final List<String> TRANSLATED_PATH_EXPRESSIONS;
static
@@ -75,7 +89,7 @@
throws IOException
{
}
-
+
// for testing.
protected RegexBasedModelInterpolator( PathTranslator pathTranslator )
{
@@ -88,9 +102,7 @@
Properties props = new Properties();
props.putAll( context );
- return interpolate( model,
- null,
- new DefaultProjectBuilderConfiguration().setExecutionProperties( props ),
+ return interpolate( model, null, new DefaultProjectBuilderConfiguration().setExecutionProperties( props ),
true );
}
@@ -100,9 +112,7 @@
Properties props = new Properties();
props.putAll( context );
- return interpolate( model,
- null,
- new DefaultProjectBuilderConfiguration().setExecutionProperties( props ),
+ return interpolate( model, null, new DefaultProjectBuilderConfiguration().setExecutionProperties( props ),
true );
}
@@ -112,14 +122,14 @@
* <br/>
* <b>NOTE:</b> This will result in a different instance of Model being returned!!!
*
- * @param model The inbound Model instance, to serialize and reference for expression resolution
- * @param context The other context map to be used during resolution
+ * @param model The inbound Model instance, to serialize and reference for expression resolution
+ * @param context The other context map to be used during resolution
* @param overrideContext The context map which should be used to OVERRIDE
* values from everything else. This will come from the CLI
* or userProperties in the execution request.
- * @param projectDir The directory from which the current model's pom was read.
- * @param strict This parameter is ignored!
- * @param debugMessages If true, print any feedback from the interpolator out to the DEBUG log-level.
+ * @param projectDir The directory from which the current model's pom was read.
+ * @param strict This parameter is ignored!
+ * @param debugMessages If true, print any feedback from the interpolator out to the DEBUG log-level.
* @return The resolved instance of the inbound Model. This is a different instance!
*/
public Model interpolate( Model model, File projectDir, ProjectBuilderConfiguration config, boolean debugMessages )
@@ -163,23 +173,21 @@
/**
* Interpolates all expressions in the src parameter.
- * <p>
+ * <p/>
* The algorithm used for each expression is:
* <ul>
- * <li>If it starts with either "pom." or "project.", the expression is evaluated against the model.</li>
- * <li>If the value is null, get the value from the context.</li>
- * <li>If the value is null, but the context contains the expression, don't replace the expression string
- * with the value, and continue to find other expressions.</li>
- * <li>If the value is null, get it from the model properties.</li>
- * <li>
+ * <li>If it starts with either "pom." or "project.", the expression is evaluated against the model.</li>
+ * <li>If the value is null, get the value from the context.</li>
+ * <li>If the value is null, but the context contains the expression, don't replace the expression string
+ * with the value, and continue to find other expressions.</li>
+ * <li>If the value is null, get it from the model properties.</li>
+ * <li>
+ *
* @param overrideContext
* @param debugMessages
*/
- public String interpolate( String src,
- Model model,
- final File projectDir,
- ProjectBuilderConfiguration config,
- boolean debugMessages )
+ public String interpolate( String src, Model model, final File projectDir, ProjectBuilderConfiguration config,
+ boolean debugMessages )
throws ModelInterpolationException
{
Logger logger = getLogger();
@@ -195,7 +203,8 @@
ValueSource modelValueSource1 = new PrefixedObjectValueSource( PROJECT_PREFIXES, model, false );
ValueSource modelValueSource2 = new ObjectBasedValueSource( model );
- ValueSource basedirValueSource = new PrefixedValueSourceWrapper( new ValueSource(){
+ ValueSource basedirValueSource = new PrefixedValueSourceWrapper( new ValueSource()
+ {
public Object getValue( String expression )
{
if ( projectDir != null && "basedir".equals( expression ) )
@@ -205,8 +214,7 @@
return null;
}
- },
- PROJECT_PREFIXES, true );
+ }, PROJECT_PREFIXES, true );
RegexBasedInterpolator interpolator = new RegexBasedInterpolator();
@@ -215,13 +223,14 @@
interpolator.addValueSource( new BuildTimestampValueSource( config.getBuildStartTime(), timestampFormat ) );
interpolator.addValueSource( new MapBasedValueSource( config.getExecutionProperties() ) );
interpolator.addValueSource( modelValueSource1 );
- interpolator.addValueSource( new PrefixedValueSourceWrapper( new MapBasedValueSource( modelProperties ), PROJECT_PREFIXES, true ) );
+ interpolator.addValueSource(
+ new PrefixedValueSourceWrapper( new MapBasedValueSource( modelProperties ), PROJECT_PREFIXES, true ) );
interpolator.addValueSource( modelValueSource2 );
interpolator.addValueSource( new MapBasedValueSource( config.getUserProperties() ) );
-
+
PathTranslatingPostProcessor pathTranslatingPostProcessor =
new PathTranslatingPostProcessor( TRANSLATED_PATH_EXPRESSIONS, projectDir, pathTranslator );
-
+
interpolator.addPostProcessor( pathTranslatingPostProcessor );
RecursionInterceptor recursionInterceptor = new PrefixAwareRecursionInterceptor( PROJECT_PREFIXES );
@@ -231,7 +240,7 @@
{
result = interpolator.interpolate( result, "", recursionInterceptor );
}
- catch( InterpolationException e )
+ catch ( InterpolationException e )
{
throw new ModelInterpolationException( e.getMessage(), e );
}
Modified: maven/components/branches/sisbell-maven-2.1-profile/maven-project/src/main/java/org/apache/maven/project/path/DefaultPathTranslator.java
URL: http://svn.apache.org/viewvc/maven/components/branches/sisbell-maven-2.1-profile/maven-project/src/main/java/org/apache/maven/project/path/DefaultPathTranslator.java?rev=693291&r1=693290&r2=693291&view=diff
==============================================================================
--- maven/components/branches/sisbell-maven-2.1-profile/maven-project/src/main/java/org/apache/maven/project/path/DefaultPathTranslator.java (original)
+++ maven/components/branches/sisbell-maven-2.1-profile/maven-project/src/main/java/org/apache/maven/project/path/DefaultPathTranslator.java Mon Sep 8 14:43:31 2008
@@ -31,11 +31,7 @@
public class DefaultPathTranslator
implements PathTranslator
{
- private static final String[] BASEDIR_EXPRESSIONS = {
- "${basedir}",
- "${pom.basedir}",
- "${project.basedir}"
- };
+ private static final String[] BASEDIR_EXPRESSIONS = {"${basedir}", "${pom.basedir}", "${project.basedir}"};
private String FILE_SEPARATOR = "/";
Modified: maven/components/branches/sisbell-maven-2.1-profile/maven-project/src/main/java/org/apache/maven/project/validation/DefaultModelValidator.java
URL: http://svn.apache.org/viewvc/maven/components/branches/sisbell-maven-2.1-profile/maven-project/src/main/java/org/apache/maven/project/validation/DefaultModelValidator.java?rev=693291&r1=693290&r2=693291&view=diff
==============================================================================
--- maven/components/branches/sisbell-maven-2.1-profile/maven-project/src/main/java/org/apache/maven/project/validation/DefaultModelValidator.java (original)
+++ maven/components/branches/sisbell-maven-2.1-profile/maven-project/src/main/java/org/apache/maven/project/validation/DefaultModelValidator.java Mon Sep 8 14:43:31 2008
@@ -20,7 +20,16 @@
*/
import org.apache.maven.artifact.Artifact;
-import org.apache.maven.model.*;
+import org.apache.maven.model.Build;
+import org.apache.maven.model.Dependency;
+import org.apache.maven.model.DependencyManagement;
+import org.apache.maven.model.Model;
+import org.apache.maven.model.Parent;
+import org.apache.maven.model.Plugin;
+import org.apache.maven.model.ReportPlugin;
+import org.apache.maven.model.Reporting;
+import org.apache.maven.model.Repository;
+import org.apache.maven.model.Resource;
import org.codehaus.plexus.util.StringUtils;
import java.io.File;
@@ -54,14 +63,14 @@
if ( !model.getModules().isEmpty() && !"pom".equals( model.getPackaging() ) )
{
result.addMessage( "Packaging '" + model.getPackaging() + "' is invalid. Aggregator projects " +
- "require 'pom' as packaging." );
+ "require 'pom' as packaging." );
}
Parent parent = model.getParent();
if ( parent != null )
{
if ( parent.getGroupId().equals( model.getGroupId() ) &&
- parent.getArtifactId().equals( model.getArtifactId() ) )
+ parent.getArtifactId().equals( model.getArtifactId() ) )
{
result.addMessage( "The parent element cannot have the same ID as the project." );
}
@@ -79,7 +88,8 @@
validateStringNotEmpty( "dependencies.dependency.type", result, d.getType(), dependencySourceHint( d ) );
- validateStringNotEmpty( "dependencies.dependency.version", result, d.getVersion(), dependencySourceHint( d ) );
+ validateStringNotEmpty( "dependencies.dependency.version", result, d.getVersion(),
+ dependencySourceHint( d ) );
if ( Artifact.SCOPE_SYSTEM.equals( d.getScope() ) )
{
@@ -91,10 +101,10 @@
}
else
{
- if ( ! new File( systemPath ).isAbsolute() )
+ if ( !new File( systemPath ).isAbsolute() )
{
result.addMessage( "For dependency " + d + ": system-scoped dependency must " +
- "specify an absolute path systemPath." );
+ "specify an absolute path systemPath." );
}
}
}
@@ -124,14 +134,15 @@
if ( StringUtils.isEmpty( systemPath ) )
{
- result.addMessage( "For managed dependency " + d + ": system-scoped dependency must specify systemPath." );
+ result.addMessage(
+ "For managed dependency " + d + ": system-scoped dependency must specify systemPath." );
}
else
{
- if ( ! new File( systemPath ).isAbsolute() )
+ if ( !new File( systemPath ).isAbsolute() )
{
result.addMessage( "For managed dependency " + d + ": system-scoped dependency must " +
- "specify an absolute path systemPath." );
+ "specify an absolute path systemPath." );
}
}
}
@@ -249,7 +260,6 @@
}
}
-
// ----------------------------------------------------------------------
// Field validation
// ----------------------------------------------------------------------
@@ -280,7 +290,8 @@
* <li><code>string.length > 0</code>
* </ul>
*/
- private boolean validateStringNotEmpty( String fieldName, ModelValidationResult result, String string, String sourceHint )
+ private boolean validateStringNotEmpty( String fieldName, ModelValidationResult result, String string,
+ String sourceHint )
{
if ( !validateNotNull( fieldName, result, string, sourceHint ) )
{
@@ -301,7 +312,6 @@
result.addMessage( "'" + fieldName + "' is missing." );
}
-
return false;
}
Modified: maven/components/branches/sisbell-maven-2.1-profile/maven-project/src/main/java/org/apache/maven/project/workspace/DefaultProjectWorkspace.java
URL: http://svn.apache.org/viewvc/maven/components/branches/sisbell-maven-2.1-profile/maven-project/src/main/java/org/apache/maven/project/workspace/DefaultProjectWorkspace.java?rev=693291&r1=693290&r2=693291&view=diff
==============================================================================
--- maven/components/branches/sisbell-maven-2.1-profile/maven-project/src/main/java/org/apache/maven/project/workspace/DefaultProjectWorkspace.java (original)
+++ maven/components/branches/sisbell-maven-2.1-profile/maven-project/src/main/java/org/apache/maven/project/workspace/DefaultProjectWorkspace.java Mon Sep 8 14:43:31 2008
@@ -16,6 +16,7 @@
{
private MavenWorkspaceStore workspaceStore;
+
private Logger logger;
public DefaultProjectWorkspace()
@@ -28,9 +29,7 @@
this.logger = logger;
}
- public ModelAndFile getModelAndFile( String groupId,
- String artifactId,
- String version )
+ public ModelAndFile getModelAndFile( String groupId, String artifactId, String version )
{
Map cache = workspaceStore.getWorkspaceCache( ProjectWorkspace.MODEL_AND_FILE_BYGAV_KEY );
@@ -70,9 +69,7 @@
return (MavenProject) cache.get( pathKey );
}
- public MavenProject getProject( String groupId,
- String artifactId,
- String version )
+ public MavenProject getProject( String groupId, String artifactId, String version )
{
Map cache = workspaceStore.getWorkspaceCache( ProjectWorkspace.PROJECT_INSTANCE_BYGAV_KEY );
@@ -131,7 +128,8 @@
public void storeProjectByFile( MavenProject project )
{
- if ( project.getFile() == null ){
+ if ( project.getFile() == null )
+ {
return;
}
Modified: maven/components/branches/sisbell-maven-2.1-profile/maven-project/src/main/java/org/apache/maven/realm/DefaultMavenRealmManager.java
URL: http://svn.apache.org/viewvc/maven/components/branches/sisbell-maven-2.1-profile/maven-project/src/main/java/org/apache/maven/realm/DefaultMavenRealmManager.java?rev=693291&r1=693290&r2=693291&view=diff
==============================================================================
--- maven/components/branches/sisbell-maven-2.1-profile/maven-project/src/main/java/org/apache/maven/realm/DefaultMavenRealmManager.java (original)
+++ maven/components/branches/sisbell-maven-2.1-profile/maven-project/src/main/java/org/apache/maven/realm/DefaultMavenRealmManager.java Mon Sep 8 14:43:31 2008
@@ -36,21 +36,30 @@
import org.codehaus.plexus.logging.Logger;
import java.net.MalformedURLException;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
public class DefaultMavenRealmManager
implements MavenRealmManager
{
private Map pluginArtifacts = new HashMap();
+
private Set managedRealmIds = new HashSet();
private final ClassWorld world;
+
private final PlexusContainer container;
+
private final Logger logger;
- public DefaultMavenRealmManager( PlexusContainer container,
- Logger logger )
+ public DefaultMavenRealmManager( PlexusContainer container, Logger logger )
{
world = container.getContainerRealm().getWorld();
this.container = container;
@@ -107,8 +116,7 @@
}
}
- public ClassRealm createExtensionRealm( Artifact extensionArtifact,
- List artifacts )
+ public ClassRealm createExtensionRealm( Artifact extensionArtifact, List artifacts )
throws RealmManagementException
{
String id = RealmUtils.createExtensionRealmId( extensionArtifact );
@@ -120,8 +128,7 @@
}
catch ( DuplicateRealmException e )
{
- throw new RealmManagementException( id, "Extension realm: " + id + " already exists.",
- e );
+ throw new RealmManagementException( id, "Extension realm: " + id + " already exists.", e );
}
populateRealm( id, realm, extensionArtifact, artifacts, null );
@@ -129,24 +136,25 @@
return realm;
}
- public void importExtensionsIntoProjectRealm( String projectGroupId,
- String projectArtifactId,
- String projectVersion,
- Artifact extensionArtifact )
+ public void importExtensionsIntoProjectRealm( String projectGroupId, String projectArtifactId,
+ String projectVersion, Artifact extensionArtifact )
throws RealmManagementException
{
String extensionRealmId = RealmUtils.createExtensionRealmId( extensionArtifact );
if ( extensionArtifact.getFile() == null )
{
- throw new RealmManagementException( extensionRealmId, "Cannot import project extensions; extension artifact has no associated file that can be scanned for extension components (extension: " + extensionArtifact.getId() + ")" );
+ throw new RealmManagementException( extensionRealmId,
+ "Cannot import project extensions; extension artifact has no associated file that can be scanned for extension components (extension: " +
+ extensionArtifact.getId() + ")" );
}
-
ComponentDiscoverer discoverer = new DefaultComponentDiscoverer();
discoverer.setManager( RealmScanningUtils.getDummyComponentDiscovererManager() );
- List componentSetDescriptors = RealmScanningUtils.scanForComponentSetDescriptors( extensionArtifact, discoverer, container.getContext(), extensionRealmId );
+ List componentSetDescriptors = RealmScanningUtils.scanForComponentSetDescriptors( extensionArtifact, discoverer,
+ container.getContext(),
+ extensionRealmId );
ClassRealm realm = getProjectRealm( projectGroupId, projectArtifactId, projectVersion, true );
@@ -161,7 +169,9 @@
try
{
- logger.debug( "Importing: " + implementation + "\nwith role: " + comp.getRole() + "\nand hint: " + comp.getRoleHint() + "\nfrom extension realm: " + extensionRealmId + "\nto project realm: " + realm.getId() );
+ logger.debug( "Importing: " + implementation + "\nwith role: " + comp.getRole() + "\nand hint: " +
+ comp.getRoleHint() + "\nfrom extension realm: " + extensionRealmId + "\nto project realm: " +
+ realm.getId() );
// Import the extension component's implementation class into the project-level
// realm.
@@ -180,12 +190,17 @@
}
catch ( NoSuchRealmException e )
{
- throw new RealmManagementException( extensionRealmId, "Failed to create import for component: " + implementation + " from extension realm: " + extensionRealmId + " to project realm: " + realm.getId(), e );
+ throw new RealmManagementException( extensionRealmId, "Failed to create import for component: " +
+ implementation + " from extension realm: " + extensionRealmId + " to project realm: " +
+ realm.getId(), e );
}
catch ( ComponentRepositoryException e )
{
String projectId = RealmUtils.createProjectId( projectGroupId, projectArtifactId, projectVersion );
- throw new RealmManagementException( extensionRealmId, "Unable to discover components from imports to project: " + projectId + " from extension artifact: " + extensionArtifact.getId(), e );
+ throw new RealmManagementException( extensionRealmId,
+ "Unable to discover components from imports to project: " +
+ projectId + " from extension artifact: " +
+ extensionArtifact.getId(), e );
}
}
}
@@ -196,7 +211,8 @@
return getProjectRealm( projectGroupId, projectArtifactId, projectVersion, false );
}
- private ClassRealm getProjectRealm( String projectGroupId, String projectArtifactId, String projectVersion, boolean create )
+ private ClassRealm getProjectRealm( String projectGroupId, String projectArtifactId, String projectVersion,
+ boolean create )
{
String id = RealmUtils.createProjectId( projectGroupId, projectArtifactId, projectVersion );
@@ -259,10 +275,8 @@
pluginArtifacts.remove( id );
}
- public ClassRealm createPluginRealm( Plugin plugin,
- Artifact pluginArtifact,
- List artifacts,
- ArtifactFilter coreArtifactFilter )
+ public ClassRealm createPluginRealm( Plugin plugin, Artifact pluginArtifact, List artifacts,
+ ArtifactFilter coreArtifactFilter )
throws RealmManagementException
{
String id = RealmUtils.createPluginRealmId( plugin );
@@ -277,8 +291,7 @@
}
catch ( DuplicateRealmException e )
{
- throw new RealmManagementException( id, "Plugin realm: " + id + " already exists.",
- e );
+ throw new RealmManagementException( id, "Plugin realm: " + id + " already exists.", e );
}
populateRealm( id, realm, pluginArtifact, artifacts, coreArtifactFilter );
@@ -289,10 +302,7 @@
return realm;
}
- private void populateRealm( String id,
- ClassRealm realm,
- Artifact mainArtifact,
- List artifacts,
+ private void populateRealm( String id, ClassRealm realm, Artifact mainArtifact, List artifacts,
ArtifactFilter coreArtifactFilter )
throws RealmManagementException
{
@@ -304,10 +314,8 @@
}
catch ( MalformedURLException e )
{
- throw new RealmManagementException( id, mainArtifact, "Invalid URL for artifact file: "
- + mainArtifact.getFile()
- + " to be used in realm: " + id
- + ".", e );
+ throw new RealmManagementException( id, mainArtifact, "Invalid URL for artifact file: " +
+ mainArtifact.getFile() + " to be used in realm: " + id + ".", e );
}
}
@@ -323,15 +331,14 @@
}
catch ( MalformedURLException e )
{
- throw new RealmManagementException( id, artifact, "Invalid URL for artifact file: "
- + artifact.getFile()
- + " to be used in realm: " + id
- + ".", e );
+ throw new RealmManagementException( id, artifact, "Invalid URL for artifact file: " +
+ artifact.getFile() + " to be used in realm: " + id + ".", e );
}
}
else
{
- logger.debug( "Excluding artifact: " + artifact.getArtifactId() + " from plugin realm; it's already included in Maven's core." );
+ logger.debug( "Excluding artifact: " + artifact.getArtifactId() +
+ " from plugin realm; it's already included in Maven's core." );
}
}
}
@@ -354,8 +361,7 @@
return null;
}
- public void setPluginArtifacts( Plugin plugin,
- List artifacts )
+ public void setPluginArtifacts( Plugin plugin, List artifacts )
{
String id = RealmUtils.createPluginRealmId( plugin );
Modified: maven/components/branches/sisbell-maven-2.1-profile/maven-project/src/main/java/org/apache/maven/realm/MavenRealmManager.java
URL: http://svn.apache.org/viewvc/maven/components/branches/sisbell-maven-2.1-profile/maven-project/src/main/java/org/apache/maven/realm/MavenRealmManager.java?rev=693291&r1=693290&r2=693291&view=diff
==============================================================================
--- maven/components/branches/sisbell-maven-2.1-profile/maven-project/src/main/java/org/apache/maven/realm/MavenRealmManager.java (original)
+++ maven/components/branches/sisbell-maven-2.1-profile/maven-project/src/main/java/org/apache/maven/realm/MavenRealmManager.java Mon Sep 8 14:43:31 2008
@@ -14,32 +14,24 @@
boolean hasExtensionRealm( Artifact extensionArtifact );
- ClassRealm createExtensionRealm( Artifact extensionArtifact,
- List artifacts )
+ ClassRealm createExtensionRealm( Artifact extensionArtifact, List artifacts )
throws RealmManagementException;
- void importExtensionsIntoProjectRealm( String projectGroupId,
- String projectArtifactId,
- String projectVersion,
+ void importExtensionsIntoProjectRealm( String projectGroupId, String projectArtifactId, String projectVersion,
Artifact extensionArtifact )
throws RealmManagementException;
- ClassRealm getProjectRealm( String groupId,
- String artifactId,
- String version );
+ ClassRealm getProjectRealm( String groupId, String artifactId, String version );
ClassRealm getPluginRealm( Plugin plugin );
List getPluginArtifacts( Plugin plugin );
- ClassRealm createPluginRealm( Plugin plugin,
- Artifact pluginArtifact,
- List artifacts,
+ ClassRealm createPluginRealm( Plugin plugin, Artifact pluginArtifact, List artifacts,
ArtifactFilter coreArtifactFilter )
throws RealmManagementException;
void disposePluginRealm( Plugin plugin );
- void setPluginArtifacts( Plugin plugin,
- List artifacts );
+ void setPluginArtifacts( Plugin plugin, List artifacts );
}
Modified: maven/components/branches/sisbell-maven-2.1-profile/maven-project/src/main/java/org/apache/maven/realm/RealmManagementException.java
URL: http://svn.apache.org/viewvc/maven/components/branches/sisbell-maven-2.1-profile/maven-project/src/main/java/org/apache/maven/realm/RealmManagementException.java?rev=693291&r1=693290&r2=693291&view=diff
==============================================================================
--- maven/components/branches/sisbell-maven-2.1-profile/maven-project/src/main/java/org/apache/maven/realm/RealmManagementException.java (original)
+++ maven/components/branches/sisbell-maven-2.1-profile/maven-project/src/main/java/org/apache/maven/realm/RealmManagementException.java Mon Sep 8 14:43:31 2008
@@ -13,8 +13,11 @@
{
private final String realmId;
+
private String offendingGroupId;
+
private String offendingArtifactId;
+
private String offendingVersion;
public RealmManagementException( String realmId, String message, DuplicateRealmException cause )
@@ -23,7 +26,8 @@
this.realmId = realmId;
}
- public RealmManagementException( String realmId, Artifact offendingArtifact, String message, MalformedURLException cause )
+ public RealmManagementException( String realmId, Artifact offendingArtifact, String message,
+ MalformedURLException cause )
{
super( message, cause );
this.realmId = realmId;
@@ -32,25 +36,19 @@
offendingVersion = offendingArtifact.getVersion();
}
- public RealmManagementException( String realmId,
- String message,
- NoSuchRealmException cause )
+ public RealmManagementException( String realmId, String message, NoSuchRealmException cause )
{
super( message, cause );
this.realmId = realmId;
}
- public RealmManagementException( String realmId,
- String message,
- ComponentRepositoryException cause )
+ public RealmManagementException( String realmId, String message, ComponentRepositoryException cause )
{
super( message, cause );
this.realmId = realmId;
}
- public RealmManagementException( String realmId,
- String message,
- PlexusConfigurationException cause )
+ public RealmManagementException( String realmId, String message, PlexusConfigurationException cause )
{
super( message, cause );
this.realmId = realmId;
Modified: maven/components/branches/sisbell-maven-2.1-profile/maven-project/src/main/java/org/apache/maven/realm/RealmScanningUtils.java
URL: http://svn.apache.org/viewvc/maven/components/branches/sisbell-maven-2.1-profile/maven-project/src/main/java/org/apache/maven/realm/RealmScanningUtils.java?rev=693291&r1=693290&r2=693291&view=diff
==============================================================================
--- maven/components/branches/sisbell-maven-2.1-profile/maven-project/src/main/java/org/apache/maven/realm/RealmScanningUtils.java (original)
+++ maven/components/branches/sisbell-maven-2.1-profile/maven-project/src/main/java/org/apache/maven/realm/RealmScanningUtils.java Mon Sep 8 14:43:31 2008
@@ -23,10 +23,8 @@
private static final String DISCOVERY_REALM_ID = "discovery realm";
- public static List scanForComponentSetDescriptors( Artifact artifact,
- ComponentDiscoverer discoverer,
- Context context,
- String discoveryContextId )
+ public static List scanForComponentSetDescriptors( Artifact artifact, ComponentDiscoverer discoverer,
+ Context context, String discoveryContextId )
throws RealmManagementException
{
ClassWorld discoveryWorld = new ClassWorld();
@@ -44,7 +42,9 @@
}
catch ( DuplicateRealmException e )
{
- throw new RealmManagementException( discoveryContextId, "Unable to create temporary ClassRealm for local-component discovery.", e );
+ throw new RealmManagementException( discoveryContextId,
+ "Unable to create temporary ClassRealm for local-component discovery.",
+ e );
}
try
@@ -53,7 +53,9 @@
}
catch ( MalformedURLException e )
{
- throw new RealmManagementException( discoveryContextId, artifact, "Unable to generate URL from artifact file: " + artifact.getFile() + " for local-component discovery.", e );
+ throw new RealmManagementException( discoveryContextId, artifact,
+ "Unable to generate URL from artifact file: " + artifact.getFile() +
+ " for local-component discovery.", e );
}
try
@@ -65,7 +67,9 @@
}
catch ( PlexusConfigurationException e )
{
- throw new RealmManagementException( discoveryContextId, "Unable to discover components in artifact: " + artifact.getId(), e );
+ throw new RealmManagementException( discoveryContextId,
+ "Unable to discover components in artifact: " + artifact.getId(),
+ e );
}
}
finally
@@ -92,7 +96,8 @@
return new DummyDiscovererManager();
}
- private static final class DummyDiscovererManager implements ComponentDiscovererManager
+ private static final class DummyDiscovererManager
+ implements ComponentDiscovererManager
{
public void fireComponentDiscoveryEvent( ComponentDiscoveryEvent arg0 )
Modified: maven/components/branches/sisbell-maven-2.1-profile/maven-project/src/main/java/org/apache/maven/realm/RealmUtils.java
URL: http://svn.apache.org/viewvc/maven/components/branches/sisbell-maven-2.1-profile/maven-project/src/main/java/org/apache/maven/realm/RealmUtils.java?rev=693291&r1=693290&r2=693291&view=diff
==============================================================================
--- maven/components/branches/sisbell-maven-2.1-profile/maven-project/src/main/java/org/apache/maven/realm/RealmUtils.java (original)
+++ maven/components/branches/sisbell-maven-2.1-profile/maven-project/src/main/java/org/apache/maven/realm/RealmUtils.java Mon Sep 8 14:43:31 2008
@@ -36,27 +36,25 @@
public static String createExtensionRealmId( Artifact extensionArtifact )
{
- return "/extensions/" + extensionArtifact.getGroupId() + ":"
- + extensionArtifact.getArtifactId() + ":" + extensionArtifact.getVersion() +
- "/thread:" + Thread.currentThread().getName(); //add thread to the mix to prevent clashes in paralel execution
+ return "/extensions/" + extensionArtifact.getGroupId() + ":" + extensionArtifact.getArtifactId() + ":" +
+ extensionArtifact.getVersion() + "/thread:" +
+ Thread.currentThread().getName(); //add thread to the mix to prevent clashes in paralel execution
}
- public static String createProjectId( String projectGroupId,
- String projectArtifactId,
- String projectVersion )
+ public static String createProjectId( String projectGroupId, String projectArtifactId, String projectVersion )
{
- return "/projects/" + projectGroupId + ":" + projectArtifactId + ":" + projectVersion +
- "/thread:" + Thread.currentThread().getName(); //add thread to the mix to prevent clashes in paralel execution
+ return "/projects/" + projectGroupId + ":" + projectArtifactId + ":" + projectVersion + "/thread:" +
+ Thread.currentThread().getName(); //add thread to the mix to prevent clashes in paralel execution
}
public static String createPluginRealmId( Plugin plugin )
{
StringBuffer id = new StringBuffer().append( "/plugins/" )
- .append( plugin.getGroupId() )
- .append( ':' )
- .append( plugin.getArtifactId() )
- .append( ':' )
- .append( plugin.getVersion() );
+ .append( plugin.getGroupId() )
+ .append( ':' )
+ .append( plugin.getArtifactId() )
+ .append( ':' )
+ .append( plugin.getVersion() );
StringBuffer depId = new StringBuffer();
@@ -70,10 +68,10 @@
Dependency dep = (Dependency) it.next();
depId.append( dep.getGroupId() )
- .append( ':' )
- .append( dep.getArtifactId() )
- .append( ';' )
- .append( dep.getVersion() );
+ .append( ':' )
+ .append( dep.getArtifactId() )
+ .append( ';' )
+ .append( dep.getVersion() );
if ( it.hasNext() )
{
@@ -87,7 +85,8 @@
}
id.append( '@' ).append( depId.toString().hashCode() )
- .append( "/thread:" ).append( Thread.currentThread().getName() ); //add thread to the mix to prevent clashes in paralel execution
+ .append( "/thread:" ).append(
+ Thread.currentThread().getName() ); //add thread to the mix to prevent clashes in paralel execution
return id.toString();
}