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 2009/04/17 00:29:52 UTC
svn commit: r765793 - in /maven/components/trunk:
maven-core/src/main/java/org/apache/maven/plugin/
maven-mercury/src/main/java/org/apache/maven/mercury/
maven-project-builder/src/main/java/org/apache/maven/project/builder/
maven-project/src/main/java/...
Author: sisbell
Date: Thu Apr 16 22:29:52 2009
New Revision: 765793
URL: http://svn.apache.org/viewvc?rev=765793&view=rev
Log:
Moved over interpolation into it's own class.
Added:
maven/components/trunk/maven-project-builder/src/main/java/org/apache/maven/project/builder/DefaultInterpolator.java
- copied, changed from r765682, maven/components/trunk/maven-project-builder/src/main/java/org/apache/maven/project/builder/ModelInterpolator.java
maven/components/trunk/maven-project-builder/src/main/java/org/apache/maven/project/builder/Interpolator.java
Removed:
maven/components/trunk/maven-project-builder/src/main/java/org/apache/maven/project/builder/ModelInterpolator.java
Modified:
maven/components/trunk/maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginManager.java
maven/components/trunk/maven-mercury/src/main/java/org/apache/maven/mercury/MavenDependencyProcessor.java
maven/components/trunk/maven-project-builder/src/main/java/org/apache/maven/project/builder/ProcessorContext.java
maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java
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=765793&r1=765792&r2=765793&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 Apr 16 22:29:52 2009
@@ -15,7 +15,6 @@
* the License.
*/
-import java.io.ByteArrayInputStream;
import java.io.File;
import java.io.IOException;
import java.io.StringReader;
@@ -73,6 +72,7 @@
import org.apache.maven.project.MavenProjectBuilder;
import org.apache.maven.project.ProjectBuildingException;
import org.apache.maven.project.artifact.InvalidDependencyVersionException;
+import org.apache.maven.project.builder.DefaultInterpolator;
import org.apache.maven.project.builder.InterpolatorProperty;
import org.apache.maven.project.builder.ModelProperty;
import org.apache.maven.project.builder.PomInterpolatorTag;
@@ -511,7 +511,7 @@
PomInterpolatorTag.EXECUTION_PROPERTIES.name() ) );
interpolatorProperties
.addAll( InterpolatorProperty.toInterpolatorProperties( session.getProjectBuilderConfiguration().getUserProperties(), PomInterpolatorTag.USER_PROPERTIES.name() ) );
- String interpolatedDom = interpolateXmlString( String.valueOf( dom ), interpolatorProperties );
+ String interpolatedDom = new DefaultInterpolator().interpolateXmlString( String.valueOf( dom ), interpolatorProperties );
dom = Xpp3DomBuilder.build( new StringReader( interpolatedDom ) );
}
catch ( XmlPullParserException e )
@@ -1526,30 +1526,6 @@
}
}
- private static String interpolateXmlString( String xml, List<InterpolatorProperty> interpolatorProperties )
- throws IOException
- {
- List<ModelProperty> modelProperties = ProcessorContext.marshallXmlToModelProperties( new ByteArrayInputStream( xml.getBytes() ), ProjectUri.baseUri, ProcessorContext.URIS );
-
- Map<String, String> aliases = new HashMap<String, String>();
- aliases.put( "project.", "pom." );
-
- List<InterpolatorProperty> ips = new ArrayList<InterpolatorProperty>( interpolatorProperties );
- ips.addAll( ProcessorContext.createInterpolatorProperties( modelProperties, ProjectUri.baseUri, aliases, PomInterpolatorTag.PROJECT_PROPERTIES.name()) );
-
- for ( ModelProperty mp : modelProperties )
- {
- if ( mp.getUri().startsWith( ProjectUri.properties ) && mp.getValue() != null )
- {
- String uri = mp.getUri();
- ips.add( new InterpolatorProperty( "${" + uri.substring( uri.lastIndexOf( "/" ) + 1, uri.length() ) + "}", mp.getValue() ) );
- }
- }
-
- ProcessorContext.interpolateModelProperties( modelProperties, ips );
- return ProcessorContext.unmarshalModelPropertiesToXml( modelProperties, ProjectUri.baseUri );
- }
-
// Plugin Prefix Loader
/**
Modified: maven/components/trunk/maven-mercury/src/main/java/org/apache/maven/mercury/MavenDependencyProcessor.java
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-mercury/src/main/java/org/apache/maven/mercury/MavenDependencyProcessor.java?rev=765793&r1=765792&r2=765793&view=diff
==============================================================================
--- maven/components/trunk/maven-mercury/src/main/java/org/apache/maven/mercury/MavenDependencyProcessor.java (original)
+++ maven/components/trunk/maven-mercury/src/main/java/org/apache/maven/mercury/MavenDependencyProcessor.java Thu Apr 16 22:29:52 2009
@@ -29,9 +29,9 @@
import org.apache.maven.mercury.builder.api.DependencyProcessorException;
import org.apache.maven.mercury.builder.api.MetadataReader;
import org.apache.maven.mercury.builder.api.MetadataReaderException;
+import org.apache.maven.project.builder.DefaultInterpolator;
import org.apache.maven.project.builder.DomainModel;
import org.apache.maven.project.builder.InterpolatorProperty;
-import org.apache.maven.project.builder.PomClassicDomainModel;
import org.apache.maven.project.builder.PomInterpolatorTag;
import org.apache.maven.project.builder.ProcessorContext;
import org.codehaus.plexus.component.annotations.Component;
@@ -108,7 +108,7 @@
}
try {
- return new MavenDomainModel(ProcessorContext.interpolateDomainModel(ProcessorContext.build(domainModels, null),
+ return new MavenDomainModel(new DefaultInterpolator().interpolateDomainModel(ProcessorContext.build(domainModels, null),
interpolatorProperties)).getDependencyMetadata();
} catch (IOException e) {
throw new DependencyProcessorException();
Copied: maven/components/trunk/maven-project-builder/src/main/java/org/apache/maven/project/builder/DefaultInterpolator.java (from r765682, maven/components/trunk/maven-project-builder/src/main/java/org/apache/maven/project/builder/ModelInterpolator.java)
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-project-builder/src/main/java/org/apache/maven/project/builder/DefaultInterpolator.java?p2=maven/components/trunk/maven-project-builder/src/main/java/org/apache/maven/project/builder/DefaultInterpolator.java&p1=maven/components/trunk/maven-project-builder/src/main/java/org/apache/maven/project/builder/ModelInterpolator.java&r1=765682&r2=765793&rev=765793&view=diff
==============================================================================
--- maven/components/trunk/maven-project-builder/src/main/java/org/apache/maven/project/builder/ModelInterpolator.java (original)
+++ maven/components/trunk/maven-project-builder/src/main/java/org/apache/maven/project/builder/DefaultInterpolator.java Thu Apr 16 22:29:52 2009
@@ -1,275 +1,314 @@
package org.apache.maven.project.builder;
+import java.io.ByteArrayInputStream;
import java.io.File;
import java.io.IOException;
+import java.io.InputStream;
import java.util.ArrayList;
+import java.util.Arrays;
import java.util.Collections;
import java.util.Comparator;
import java.util.HashMap;
+import java.util.HashSet;
import java.util.LinkedHashSet;
+import java.util.LinkedList;
import java.util.List;
import java.util.Map;
+import java.util.Set;
-import org.apache.maven.model.Model;
+import javax.xml.stream.XMLInputFactory;
+import javax.xml.stream.XMLStreamConstants;
+import javax.xml.stream.XMLStreamException;
+import javax.xml.stream.XMLStreamReader;
-public class ModelInterpolator {
+import org.apache.maven.model.Build;
+import org.apache.maven.model.Model;
+import org.apache.maven.model.Reporting;
+import org.apache.maven.model.Resource;
- private HashMap<String, String> values;
+public class DefaultInterpolator implements Interpolator {
- public ModelInterpolator()
+ public String interpolateXmlString(String xml,
+ List<InterpolatorProperty> interpolatorProperties) throws IOException
{
- values = new HashMap<String, String>();
- }
-
- public static void interpolate(PomClassicDomainModel domainModel, List<InterpolatorProperty> interpolatorProperties ) throws IOException
- {
- List<ModelProperty> m = new ArrayList<ModelProperty>();
-
- Model model = domainModel.getModel();
+ List<ModelProperty> modelProperties = marshallXmlToModelProperties( new ByteArrayInputStream( xml.getBytes() ), ProjectUri.baseUri, URIS );
- m.add(new ModelProperty(ProjectUri.groupId, model.getGroupId()));
- m.add(new ModelProperty(ProjectUri.artifactId, model.getArtifactId()));
-
- interpolateModelProperties(m, interpolatorProperties, domainModel);
- //Set model properties on model
-
+ Map<String, String> aliases = new HashMap<String, String>();
+ aliases.put( "project.", "pom." );
+
+ List<InterpolatorProperty> ips = new ArrayList<InterpolatorProperty>( interpolatorProperties );
+ ips.addAll( createInterpolatorProperties( modelProperties, ProjectUri.baseUri, aliases, PomInterpolatorTag.PROJECT_PROPERTIES.name()) );
+
+ for ( ModelProperty mp : modelProperties )
+ {
+ if ( mp.getUri().startsWith( ProjectUri.properties ) && mp.getValue() != null )
+ {
+ String uri = mp.getUri();
+ ips.add( new InterpolatorProperty( "${" + uri.substring( uri.lastIndexOf( "/" ) + 1, uri.length() ) + "}", mp.getValue() ) );
+ }
+ }
+
+ interpolateModelProperties( modelProperties, ips );
+ return unmarshalModelPropertiesToXml( modelProperties, ProjectUri.baseUri );
+ }
+
+ public PomClassicDomainModel interpolateDomainModel( PomClassicDomainModel dm, List<InterpolatorProperty> interpolatorProperties )
+ throws IOException {
+
+ if (dm == null) {
+ throw new IllegalArgumentException("dm: null");
+ }
+ if (!containsProjectVersion(interpolatorProperties)) {
+ aliases.put("\\$\\{project.version\\}", "\\$\\{version\\}");
+ }
+ //TODO: Insert customized logic for parsing
+ List<ModelProperty> modelProperties = getModelProperties(dm.getInputStream());
+
+ if ("jar".equals(dm.getModel().getPackaging())) {
+ modelProperties.add(new ModelProperty(ProjectUri.packaging, "jar"));
+ }
+
+ List<ModelProperty> firstPassModelProperties = new ArrayList<ModelProperty>();
+ List<ModelProperty> secondPassModelProperties = new ArrayList<ModelProperty>();
+
+ ModelProperty buildProperty = new ModelProperty(ProjectUri.Build.xUri,
+ null);
+
+ for ( ModelProperty mp : modelProperties )
+ {
+ if ( mp.getValue() != null && !mp.getUri().contains( "#property" ) && !mp.getUri().contains( "#collection" ) )
+ {
+ if ( ( !buildProperty.isParentOf( mp ) && !mp.getUri().equals( ProjectUri.Reporting.outputDirectory ) || mp.getUri().equals(
+ ProjectUri.Build.finalName ) ) )
+ {
+ firstPassModelProperties.add( mp );
+ }
+ else
+ {
+ secondPassModelProperties.add( mp );
+ }
+ }
+ }
+
+ List<InterpolatorProperty> standardInterpolatorProperties = new ArrayList<InterpolatorProperty>();
+
+ if (dm.isPomInBuild()) {
+ String basedir = dm.getProjectDirectory().getAbsolutePath();
+ standardInterpolatorProperties.add(new InterpolatorProperty(
+ "${project.basedir}", basedir,
+ PomInterpolatorTag.PROJECT_PROPERTIES.name()));
+ standardInterpolatorProperties.add(new InterpolatorProperty(
+ "${basedir}", basedir,
+ PomInterpolatorTag.PROJECT_PROPERTIES.name()));
+ standardInterpolatorProperties.add(new InterpolatorProperty(
+ "${pom.basedir}", basedir,
+ PomInterpolatorTag.PROJECT_PROPERTIES.name()));
+
+ String baseuri = dm.getProjectDirectory().toURI().toString();
+ standardInterpolatorProperties.add(new InterpolatorProperty(
+ "${project.baseUri}", baseuri,
+ PomInterpolatorTag.PROJECT_PROPERTIES.name()));
+ standardInterpolatorProperties.add(new InterpolatorProperty(
+ "${pom.baseUri}", baseuri,
+ PomInterpolatorTag.PROJECT_PROPERTIES.name()));
+ }
+
+ for (ModelProperty mp : modelProperties) {
+ if (mp.getUri().startsWith(ProjectUri.properties)
+ && mp.getValue() != null) {
+ String uri = mp.getUri();
+ standardInterpolatorProperties.add(new InterpolatorProperty(
+ "${"
+ + uri.substring(uri.lastIndexOf("/") + 1, uri
+ .length()) + "}", mp.getValue(),
+ PomInterpolatorTag.PROJECT_PROPERTIES.name()));
+ }
+ }
+
+ // FIRST PASS - Withhold using build directories as interpolator
+ // properties
+ List<InterpolatorProperty> ips1 = new ArrayList<InterpolatorProperty>(
+ interpolatorProperties);
+ ips1.addAll(standardInterpolatorProperties);
+ ips1.addAll(createInterpolatorProperties(
+ firstPassModelProperties, ProjectUri.baseUri, aliases,
+ PomInterpolatorTag.PROJECT_PROPERTIES.name()));
+ Collections.sort(ips1, new Comparator<InterpolatorProperty>() {
+ public int compare(InterpolatorProperty o, InterpolatorProperty o1) {
+ if (o.getTag() == null || o1.getTag() == null) {
+ return 0;
+ }
+ return PomInterpolatorTag.valueOf(o.getTag()).compareTo(
+ PomInterpolatorTag.valueOf(o1.getTag()));
+ }
+ });
+
+ interpolateModelProperties(modelProperties, ips1);
+
+ // SECOND PASS - Set absolute paths on build directories
+ if (dm.isPomInBuild()) {
+ String basedir = dm.getProjectDirectory().getAbsolutePath();
+ Map<ModelProperty, ModelProperty> buildDirectories = new HashMap<ModelProperty, ModelProperty>();
+ for (ModelProperty mp : secondPassModelProperties) {
+ if (mp.getUri().startsWith(ProjectUri.Build.xUri)
+ || mp.getUri().equals(
+ ProjectUri.Reporting.outputDirectory)) {
+ File file = new File(mp.getResolvedValue());
+ if (!file.isAbsolute()
+ && !mp.getResolvedValue().startsWith(
+ "${project.build.")
+ && !mp.getResolvedValue().equals(
+ "${project.basedir}")) {
+ buildDirectories.put(mp, new ModelProperty(mp.getUri(),
+ new File(basedir, file.getPath())
+ .getAbsolutePath()));
+ }
+ }
+ }
+ for (Map.Entry<ModelProperty, ModelProperty> e : buildDirectories
+ .entrySet()) {
+ secondPassModelProperties.remove(e.getKey());
+ secondPassModelProperties.add(e.getValue());
+ }
+ }
+
+ // THIRD PASS - Use build directories as interpolator properties
+ List<InterpolatorProperty> ips2 = new ArrayList<InterpolatorProperty>(
+ interpolatorProperties);
+ ips2.addAll(standardInterpolatorProperties);
+ ips2.addAll(createInterpolatorProperties(
+ secondPassModelProperties, ProjectUri.baseUri, aliases,
+ PomInterpolatorTag.PROJECT_PROPERTIES.name()));
+ ips2.addAll(interpolatorProperties);
+ Collections.sort(ips2, new Comparator<InterpolatorProperty>() {
+ public int compare(InterpolatorProperty o, InterpolatorProperty o1) {
+ if (o.getTag() == null || o1.getTag() == null) {
+ return 0;
+ }
+
+ return PomInterpolatorTag.valueOf(o.getTag()).compareTo(
+ PomInterpolatorTag.valueOf(o1.getTag()));
+ }
+ });
+
+ interpolateModelProperties(modelProperties, ips2);
+ try
+ {
+ String xml = unmarshalModelPropertiesToXml( modelProperties, ProjectUri.baseUri );
+ PomClassicDomainModel domainModel = new PomClassicDomainModel( new ByteArrayInputStream ( xml.getBytes( "UTF-8" )));
+ if ( dm.getProjectDirectory() != null )
+ {
+ alignPaths(domainModel.getModel(), dm.getProjectDirectory());
+ }
+ return domainModel;
+ }
+ catch ( IOException e )
+ {
+ throw new IllegalStateException( "Unmarshalling of model properties failed", e );
+ }
+
- //InterpolatorProperty ip = new InterpolatorProperty();
- //ModelProperty mp;
- /*
- values.put("groupId", model.getGroupId());
- values.put("artifactId", model.getArtifactId());
- values.put("version", model.getVersion());
- values.put("packaging", model.getPackaging());
- values.put("name", model.getName());
- values.put("description", model.getDescription());
- //Collect uninterpolated values
- HashMap<String, String> hm = new HashMap<String, String>();
- for(Map.Entry<String, String> entry : hm.entrySet())
+ /*
+ for(ModelProperty mp : modelProperties)
{
-
+ if((mp.getValue() != null) && !mp.getValue().equals(mp.getResolvedValue()))
+ {
+ if(mp.getUri().equals(ProjectUri.version))
+ {
+
+ }
+ }
}
*/
}
-
- /*
- * addProjectAlias( "modelVersion", true );
- addProjectAlias( "groupId", true );
- addProjectAlias( "artifactId", true );
- addProjectAlias( "version", true );
- addProjectAlias( "packaging", true );
- addProjectAlias( "name", true );
- addProjectAlias( "description", true );
- addProjectAlias( "inceptionYear", true );
- addProjectAlias( "url", true );
- addProjectAlias( "parent", false );
- addProjectAlias( "prerequisites", false );
- addProjectAlias( "organization", false );
- addProjectAlias( "build", false );
- addProjectAlias( "reporting", false );
- addProjectAlias( "scm", false );
- addProjectAlias( "distributionManagement", false );
- addProjectAlias( "issueManagement", false );
- addProjectAlias( "ciManagement", false );
- */
-
- private static final Map<String, String> aliases = new HashMap<String, String>();
-
- private static void addProjectAlias( String element, boolean leaf )
- {
- String suffix = leaf ? "\\}" : "\\.";
- aliases.put( "\\$\\{project\\." + element + suffix, "\\$\\{" + element + suffix );
- }
-
- static
- {
- aliases.put( "\\$\\{project\\.", "\\$\\{pom\\." );
- addProjectAlias( "modelVersion", true );
- addProjectAlias( "groupId", true );
- addProjectAlias( "artifactId", true );
- addProjectAlias( "version", true );
- addProjectAlias( "packaging", true );
- addProjectAlias( "name", true );
- addProjectAlias( "description", true );
- addProjectAlias( "inceptionYear", true );
- addProjectAlias( "url", true );
- addProjectAlias( "parent", false );
- addProjectAlias( "prerequisites", false );
- addProjectAlias( "organization", false );
- addProjectAlias( "build", false );
- addProjectAlias( "reporting", false );
- addProjectAlias( "scm", false );
- addProjectAlias( "distributionManagement", false );
- addProjectAlias( "issueManagement", false );
- addProjectAlias( "ciManagement", false );
- }
-
- private static void interpolateModelProperties( List<ModelProperty> mps,
- List<InterpolatorProperty> interpolatorProperties,
- PomClassicDomainModel dm )
- throws IOException
- {
-
- if(dm == null)
- {
- throw new IllegalArgumentException("dm: null");
- }
- if ( !containsProjectVersion( interpolatorProperties ) )
- {
- aliases.put( "\\$\\{project.version\\}", "\\$\\{version\\}" );
- }
-
- if("jar".equals( dm.getModel().getPackaging() ) )
- {
- mps.add( new ModelProperty(ProjectUri.packaging, "jar") );
- }
-
- List<ModelProperty> firstPassModelProperties = new ArrayList<ModelProperty>();
- List<ModelProperty> secondPassModelProperties = new ArrayList<ModelProperty>();
-
- ModelProperty buildProperty = new ModelProperty( ProjectUri.Build.xUri, null );
- for ( ModelProperty mp : mps )
- {
- if ( mp.getValue() != null )
- {
- //!buildProperty.isParentOf( mp ) &&
- if ( ( !mp.getUri().equals( ProjectUri.Reporting.outputDirectory ) || mp.getUri().equals(
- ProjectUri.Build.finalName ) ) )
- {
- firstPassModelProperties.add( mp );
- }
- else
- {
- secondPassModelProperties.add( mp );
- }
- }
- }
-
- List<InterpolatorProperty> standardInterpolatorProperties = new ArrayList<InterpolatorProperty>();
-
- if ( dm.isPomInBuild() )
- {
- String basedir = dm.getProjectDirectory().getAbsolutePath();
- standardInterpolatorProperties.add( new InterpolatorProperty( "${project.basedir}", basedir,
- PomInterpolatorTag.PROJECT_PROPERTIES.name() ) );
- standardInterpolatorProperties.add( new InterpolatorProperty( "${basedir}", basedir,
- PomInterpolatorTag.PROJECT_PROPERTIES.name() ) );
- standardInterpolatorProperties.add( new InterpolatorProperty( "${pom.basedir}", basedir,
- PomInterpolatorTag.PROJECT_PROPERTIES.name() ) );
-
- String baseuri = dm.getProjectDirectory().toURI().toString();
- standardInterpolatorProperties.add( new InterpolatorProperty( "${project.baseUri}", baseuri,
- PomInterpolatorTag.PROJECT_PROPERTIES.name() ) );
- standardInterpolatorProperties.add( new InterpolatorProperty( "${pom.baseUri}", baseuri,
- PomInterpolatorTag.PROJECT_PROPERTIES.name() ) );
- }
-
- for ( ModelProperty mp : mps )
- {
- if ( mp.getUri().startsWith( ProjectUri.properties ) && mp.getValue() != null )
- {
- String uri = mp.getUri();
- standardInterpolatorProperties.add( new InterpolatorProperty(
- "${"
- + uri.substring(
- uri.lastIndexOf( "/" ) + 1,
- uri.length() ) + "}",
- mp.getValue(),
- PomInterpolatorTag.PROJECT_PROPERTIES.name() ) );
- }
- }
-
- // FIRST PASS - Withhold using build directories as interpolator properties
- List<InterpolatorProperty> ips1 = new ArrayList<InterpolatorProperty>( interpolatorProperties );
- ips1.addAll( standardInterpolatorProperties );
- ips1.addAll(createInterpolatorProperties(firstPassModelProperties,
- ProjectUri.baseUri, aliases,
- PomInterpolatorTag.PROJECT_PROPERTIES.name()));
- Collections.sort( ips1, new Comparator<InterpolatorProperty>()
- {
- public int compare( InterpolatorProperty o, InterpolatorProperty o1 )
- {
- if ( o.getTag() == null || o1.getTag() == null )
- {
- return 0;
- }
- return PomInterpolatorTag.valueOf( o.getTag() ).compareTo( PomInterpolatorTag.valueOf( o1.getTag() ) );
- }
- } );
-
- interpolateModelProperties( mps, ips1 );
-
- // SECOND PASS - Set absolute paths on build directories
-
- if ( dm.isPomInBuild() )
- {
- String basedir = dm.getProjectDirectory().getAbsolutePath();
- Map<ModelProperty, ModelProperty> buildDirectories = new HashMap<ModelProperty, ModelProperty>();
- for ( ModelProperty mp : secondPassModelProperties )
- {
- if ( mp.getUri().startsWith( ProjectUri.Build.xUri )
- || mp.getUri().equals( ProjectUri.Reporting.outputDirectory ) )
- {
- File file = new File( mp.getResolvedValue() );
- if ( !file.isAbsolute() && !mp.getResolvedValue().startsWith( "${project.build." )
- && !mp.getResolvedValue().equals( "${project.basedir}" ) )
- {
- buildDirectories.put( mp,
- new ModelProperty( mp.getUri(),
- new File( basedir, file.getPath() ).getAbsolutePath() ) );
- }
- }
- }
- for ( Map.Entry<ModelProperty, ModelProperty> e : buildDirectories.entrySet() )
- {
- secondPassModelProperties.remove( e.getKey() );
- secondPassModelProperties.add( e.getValue() );
- }
- }
-
- // THIRD PASS - Use build directories as interpolator properties
- List<InterpolatorProperty> ips2 = new ArrayList<InterpolatorProperty>( interpolatorProperties );
- ips2.addAll( standardInterpolatorProperties );
- ips2.addAll(createInterpolatorProperties(secondPassModelProperties,
- ProjectUri.baseUri, aliases,
- PomInterpolatorTag.PROJECT_PROPERTIES.name()));
- ips2.addAll( interpolatorProperties );
- Collections.sort( ips2, new Comparator<InterpolatorProperty>()
- {
- public int compare( InterpolatorProperty o, InterpolatorProperty o1 )
- {
- if ( o.getTag() == null || o1.getTag() == null )
- {
- return 0;
- }
-
- return PomInterpolatorTag.valueOf( o.getTag() ).compareTo( PomInterpolatorTag.valueOf( o1.getTag() ) );
- }
- } );
-
- interpolateModelProperties( mps, ips2 );
- }
-
- private static void interpolateModelProperties(
- List<ModelProperty> modelProperties,
- List<InterpolatorProperty> interpolatorProperties) {
+ /**
+ * Post-processes the paths of build directories by aligning relative paths to the project directory and normalizing
+ * file separators to the platform-specific separator.
+ *
+ * @param model The model to process, must not be {@code null}.
+ * @param basedir The project directory, must not be {@code null}.
+ */
+ private static void alignPaths( Model model, File basedir )
+ {
+ Build build = model.getBuild();
+ if ( build != null )
+ {
+ build.setDirectory( getAlignedPathFor( build.getDirectory(), basedir ) );
+ build.setOutputDirectory( getAlignedPathFor( build.getOutputDirectory(), basedir ) );
+ build.setTestOutputDirectory( getAlignedPathFor( build.getTestOutputDirectory(), basedir ) );
+ build.setSourceDirectory( getAlignedPathFor( build.getSourceDirectory(), basedir ) );
+ build.setTestSourceDirectory( getAlignedPathFor( build.getTestSourceDirectory(), basedir ) );
+ build.setScriptSourceDirectory( getAlignedPathFor( build.getScriptSourceDirectory(), basedir ) );
+
+ for ( Resource r : build.getResources() )
+ {
+ r.setDirectory( getAlignedPathFor( r.getDirectory(), basedir ) );
+ }
+
+ for ( Resource r : build.getTestResources() )
+ {
+ r.setDirectory( getAlignedPathFor( r.getDirectory(), basedir ) );
+ }
+
+ List<String> filters = new ArrayList<String>();
+ for ( String f : build.getFilters() )
+ {
+ filters.add( getAlignedPathFor( f, basedir ) );
+ }
+ build.setFilters( filters );
+ }
+
+ Reporting reporting = model.getReporting();
+ if ( reporting != null )
+ {
+ reporting.setOutputDirectory( getAlignedPathFor( reporting.getOutputDirectory(), basedir ) );
+ }
+
+ }
+
+ private static String getAlignedPathFor(String path, File basedir)
+ {
+ if ( path != null )
+ {
+ File file = new File( path );
+ if ( file.isAbsolute() )
+ {
+ // path was already absolute, just normalize file separator and we're done
+ path = file.getPath();
+ }
+ else if ( file.getPath().startsWith( File.separator ) )
+ {
+ // drive-relative Windows path, don't align with project directory but with drive root
+ path = file.getAbsolutePath();
+ }
+ else
+ {
+ // an ordinary relative path, align with project directory
+ path = new File( new File( basedir, path ).toURI().normalize() ).getAbsolutePath();
+ }
+ }
+ return path;
+ }
+ private static void interpolateModelProperties(List<ModelProperty> modelProperties,
+ List<InterpolatorProperty> interpolatorProperties )
+ {
if (modelProperties == null) {
throw new IllegalArgumentException("modelProperties: null");
}
-
+
if (interpolatorProperties == null) {
throw new IllegalArgumentException("interpolatorProperties: null");
}
-
+
List<ModelProperty> unresolvedProperties = new ArrayList<ModelProperty>();
for (ModelProperty mp : modelProperties) {
if (!mp.isResolved()) {
unresolvedProperties.add(mp);
}
}
-
+
LinkedHashSet<InterpolatorProperty> ips = new LinkedHashSet<InterpolatorProperty>();
ips.addAll(interpolatorProperties);
boolean continueInterpolation = true;
@@ -279,27 +318,28 @@
for (ModelProperty mp : unresolvedProperties) {
if (mp.resolveWith(ip) && !continueInterpolation) {
continueInterpolation = true;
+ break;
}
}
}
}
}
-
- public static List<InterpolatorProperty> createInterpolatorProperties(List<ModelProperty> modelProperties,
- String baseUriForModel,
- Map<String, String> aliases,
- String interpolatorTag)
-{
+
+ private static List<InterpolatorProperty> createInterpolatorProperties(List<ModelProperty> modelProperties,
+ String baseUriForModel,
+ Map<String, String> aliases,
+ String interpolatorTag)
+ {
if (modelProperties == null) {
throw new IllegalArgumentException("modelProperties: null");
}
-
+
if (baseUriForModel == null) {
throw new IllegalArgumentException("baseUriForModel: null");
}
-
+
List<InterpolatorProperty> interpolatorProperties = new ArrayList<InterpolatorProperty>();
-
+
for (ModelProperty mp : modelProperties) {
InterpolatorProperty ip = mp
.asInterpolatorProperty(baseUriForModel);
@@ -314,7 +354,7 @@
}
}
}
-
+
List<InterpolatorProperty> ips = new ArrayList<InterpolatorProperty>();
for (InterpolatorProperty ip : interpolatorProperties) {
if (!ips.contains(ip)) {
@@ -322,20 +362,446 @@
}
}
return ips;
- }
-
- private static boolean containsProjectVersion( List<InterpolatorProperty> interpolatorProperties )
+ }
+
+ private static List<ModelProperty> getModelProperties(InputStream is) throws IOException
+ {
+ Set<String> s = new HashSet<String>();
+ //TODO: Should add all collections from ProjectUri
+ s.addAll(URIS);
+ s.add(ProjectUri.Build.PluginManagement.Plugins.Plugin.Executions.xUri);
+ s.add(ProjectUri.DependencyManagement.Dependencies.Dependency.Exclusions.xUri);
+ s.add(ProjectUri.Dependencies.Dependency.Exclusions.xUri);
+ s.add(ProjectUri.Build.Plugins.Plugin.Executions.xUri);
+ s.add(ProjectUri.Build.Plugins.Plugin.Executions.Execution.Goals.xURI);
+ s.add(ProjectUri.Reporting.Plugins.Plugin.ReportSets.xUri);
+ s.add(ProjectUri.Reporting.Plugins.Plugin.ReportSets.ReportSet.configuration);
+ s.add(ProjectUri.Build.Plugins.Plugin.Executions.Execution.configuration);
+ //TODO: More profile info
+ s.add(ProjectUri.Profiles.Profile.Build.PluginManagement.Plugins.Plugin.Executions.xUri);
+ s.add(ProjectUri.Profiles.Profile.DependencyManagement.Dependencies.Dependency.Exclusions.xUri);
+ s.add(ProjectUri.Profiles.Profile.Dependencies.Dependency.Exclusions.xUri);
+ s.add(ProjectUri.Profiles.Profile.Build.Plugins.Plugin.Executions.xUri);
+ s.add(ProjectUri.Profiles.Profile.Build.Plugins.Plugin.Executions.Execution.Goals.xURI);
+ s.add(ProjectUri.Profiles.Profile.Reporting.Plugins.Plugin.ReportSets.xUri);
+ s.add(ProjectUri.Profiles.Profile.Reporting.Plugins.Plugin.ReportSets.ReportSet.configuration);
+ s.add(ProjectUri.Profiles.Profile.Build.Plugins.Plugin.Executions.Execution.configuration);
+ s.add(ProjectUri.Profiles.Profile.properties);
+ s.add(ProjectUri.Profiles.Profile.modules);
+ s.add(ProjectUri.Profiles.Profile.Dependencies.xUri);
+ s.add(ProjectUri.Profiles.Profile.Build.Plugins.Plugin.configuration);
+
+ return new ArrayList<ModelProperty>(marshallXmlToModelProperties(is, ProjectUri.baseUri, s ));
+ }
+
+ /**
+ * Returns XML string unmarshalled from the specified list of model properties
+ *
+ * @param modelProperties the model properties to unmarshal. May not be null or empty
+ * @param baseUri the base uri of every model property. May not be null or empty.
+ * @return XML string unmarshalled from the specified list of model properties
+ * @throws IOException if there was a problem with unmarshalling
+ */
+ private static String unmarshalModelPropertiesToXml( List<ModelProperty> modelProperties, String baseUri )
+ throws IOException
+ {
+ if ( modelProperties == null || modelProperties.isEmpty() )
+ {
+ throw new IllegalArgumentException( "modelProperties: null or empty" );
+ }
+
+ if ( baseUri == null || baseUri.trim().length() == 0 )
+ {
+ throw new IllegalArgumentException( "baseUri: null or empty" );
+ }
+
+ final int basePosition = baseUri.length();
+
+ StringBuffer sb = new StringBuffer();
+ List<String> lastUriTags = new ArrayList<String>();
+ for ( ModelProperty mp : modelProperties )
+ {
+ String uri = mp.getUri();
+ if ( uri.contains( "#property" ) )
+ {
+ continue;
+ }
+
+ //String val = (mp.getResolvedValue() != null) ? "\"" + mp.getResolvedValue() + "\"" : null;
+ // System.out.println("new ModelProperty(\"" + mp.getUri() +"\" , " + val +"),");
+ if ( !uri.startsWith( baseUri ) )
+ {
+ throw new IllegalArgumentException(
+ "Passed in model property that does not match baseUri: Property URI = " + uri + ", Base URI = " +
+ baseUri );
+ }
+
+ List<String> tagNames = getTagNamesFromUri( basePosition, uri );
+
+ for ( int i = lastUriTags.size() - 1; i >= 0 && i >= tagNames.size() - 1; i-- )
+ {
+ sb.append( toEndTag( lastUriTags.get( i ) ) );
+ }
+
+ String tag = tagNames.get( tagNames.size() - 1 );
+
+ List<ModelProperty> attributes = new ArrayList<ModelProperty>();
+ for(int peekIndex = modelProperties.indexOf( mp ) + 1; peekIndex < modelProperties.size(); peekIndex++)
+ {
+ if ( peekIndex <= modelProperties.size() - 1 )
+ {
+ ModelProperty peekProperty = modelProperties.get( peekIndex );
+ if ( peekProperty.getUri().contains( "#property" ) )
+ {
+ attributes.add(peekProperty);
+ }
+ else
+ {
+ break;
+ }
+ }
+ else
+ {
+ break;
+ }
+ }
+
+ sb.append( toStartTag( tag, attributes ) );
+
+ if ( mp.getResolvedValue() != null )
+ {
+ sb.append( mp.getResolvedValue() );
+ }
+
+ lastUriTags = tagNames;
+ }
+
+ for ( int i = lastUriTags.size() - 1; i >= 1; i-- )
+ {
+ sb.append( toEndTag( lastUriTags.get( i ) ) );
+ }
+
+ return sb.toString();
+ }
+
+ /**
+ * Returns list of tag names parsed from the specified uri. All #collection parts of the tag are removed from the
+ * tag names.
+ *
+ * @param basePosition the base position in the specified URI to start the parse
+ * @param uri the uri to parse for tag names
+ * @return list of tag names parsed from the specified uri
+ */
+ private static List<String> getTagNamesFromUri( int basePosition, String uri )
+ {
+ return Arrays.asList( uri.substring( basePosition ).replaceAll( "#collection", "" )
+ .replaceAll("#set", "").split( "/" ) );
+ }
+
+ /**
+ * Returns the XML formatted start tag for the specified value and the specified attribute.
+ *
+ * @param value the value to use for the start tag
+ * @param attributes the attribute to use in constructing of start tag
+ * @return the XML formatted start tag for the specified value and the specified attribute
+ */
+ private static String toStartTag( String value, List<ModelProperty> attributes )
+ {
+ StringBuffer sb = new StringBuffer(); //TODO: Support more than one attribute
+ sb.append( "\r\n<" ).append( value );
+ if ( attributes != null )
+ {
+ for(ModelProperty attribute : attributes)
+ {
+ sb.append( " " ).append(
+ attribute.getUri().substring( attribute.getUri().indexOf( "#property/" ) + 10 ) ).append( "=\"" )
+ .append( attribute.getResolvedValue() ).append( "\" " );
+ }
+ }
+ sb.append( ">" );
+ return sb.toString();
+ }
+
+ /**
+ * Returns XML formatted end tag for the specified value.
+ *
+ * @param value the value to use for the end tag
+ * @return xml formatted end tag for the specified value
+ */
+ private static String toEndTag( String value )
+ {
+ if ( value.trim().length() == 0 )
+ {
+ return "";
+ }
+ StringBuffer sb = new StringBuffer();
+ sb.append( "</" ).append( value ).append( ">" );
+ return sb.toString();
+ }
+
+
+ private static final Set<String> URIS = Collections.unmodifiableSet(new HashSet<String>( Arrays.asList( ProjectUri.Build.Extensions.xUri,
+ ProjectUri.Build.PluginManagement.Plugins.xUri,
+ ProjectUri.Build.PluginManagement.Plugins.Plugin.configuration,
+ ProjectUri.Build.PluginManagement.Plugins.Plugin.Executions.xUri,
+ ProjectUri.Build.PluginManagement.Plugins.Plugin.Executions.Execution.Goals.xURI,
+ ProjectUri.Build.PluginManagement.Plugins.Plugin.Dependencies.xUri,
+ ProjectUri.Build.PluginManagement.Plugins.Plugin.Dependencies.Dependency.Exclusions.xUri,
+ ProjectUri.Build.Plugins.xUri,
+ ProjectUri.properties,
+ ProjectUri.Build.Plugins.Plugin.configuration,
+ ProjectUri.Reporting.Plugins.xUri,
+ ProjectUri.Reporting.Plugins.Plugin.configuration,
+ ProjectUri.Build.Plugins.Plugin.Dependencies.xUri,
+ ProjectUri.Build.Resources.xUri,
+ ProjectUri.Build.Resources.Resource.includes,
+ ProjectUri.Build.Resources.Resource.excludes,
+ ProjectUri.Build.TestResources.xUri,
+ ProjectUri.Build.Filters.xUri,
+ ProjectUri.CiManagement.Notifiers.xUri,
+ ProjectUri.Contributors.xUri,
+ ProjectUri.Dependencies.xUri,
+ ProjectUri.DependencyManagement.Dependencies.xUri,
+ ProjectUri.Developers.xUri,
+ ProjectUri.Developers.Developer.roles,
+ ProjectUri.Licenses.xUri,
+ ProjectUri.MailingLists.xUri,
+ ProjectUri.Modules.xUri,
+ ProjectUri.PluginRepositories.xUri,
+ ProjectUri.Profiles.xUri,
+ ProjectUri.Profiles.Profile.Build.Plugins.xUri,
+ ProjectUri.Profiles.Profile.Build.Plugins.Plugin.Dependencies.xUri,
+ ProjectUri.Profiles.Profile.Build.Plugins.Plugin.Executions.xUri,
+ ProjectUri.Profiles.Profile.Build.Resources.xUri,
+ ProjectUri.Profiles.Profile.Build.TestResources.xUri,
+ ProjectUri.Profiles.Profile.Dependencies.xUri,
+ ProjectUri.Profiles.Profile.DependencyManagement.Dependencies.xUri,
+ ProjectUri.Profiles.Profile.PluginRepositories.xUri,
+ ProjectUri.Profiles.Profile.Reporting.Plugins.xUri,
+ ProjectUri.Profiles.Profile.Repositories.xUri,
+ ProjectUri.Profiles.Profile.Build.PluginManagement.Plugins.xUri,
+ ProjectUri.Profiles.Profile.Build.PluginManagement.Plugins.Plugin.Dependencies.xUri,
+ ProjectUri.Reporting.Plugins.xUri,
+ ProjectUri.Repositories.xUri) ));
+
+ /**
+ * Returns list of model properties transformed from the specified input stream.
+ *
+ * @param inputStream input stream containing the xml document. May not be null.
+ * @param baseUri the base uri of every model property. May not be null or empty.
+ * @param collections set of uris that are to be treated as a collection (multiple entries). May be null.
+ * @return list of model properties transformed from the specified input stream.
+ * @throws IOException if there was a problem doing the transform
+ */
+ private static List<ModelProperty> marshallXmlToModelProperties( InputStream inputStream, String baseUri,
+ Set<String> collections )
+ throws IOException {
+ if (inputStream == null) {
+ throw new IllegalArgumentException("inputStream: null");
+ }
+
+ if (baseUri == null || baseUri.trim().length() == 0) {
+ throw new IllegalArgumentException("baseUri: null");
+ }
+
+ if (collections == null) {
+ collections = Collections.emptySet();
+ }
+
+ List<ModelProperty> modelProperties = new ArrayList<ModelProperty>();
+ XMLInputFactory xmlInputFactory = new com.ctc.wstx.stax.WstxInputFactory();
+ xmlInputFactory.setProperty(
+ XMLInputFactory.IS_REPLACING_ENTITY_REFERENCES, Boolean.FALSE);
+ xmlInputFactory.setProperty(XMLInputFactory.IS_NAMESPACE_AWARE,
+ Boolean.FALSE);
+
+ Uri uri = new Uri(baseUri);
+ String tagName = baseUri;
+ StringBuilder tagValue = new StringBuilder(256);
+
+ int depth = 0;
+ int depthOfTagValue = depth;
+ XMLStreamReader xmlStreamReader = null;
+ try {
+ xmlStreamReader = xmlInputFactory
+ .createXMLStreamReader(inputStream);
+
+ Map<String, String> attributes = new HashMap<String, String>();
+ for (;; xmlStreamReader.next()) {
+ int type = xmlStreamReader.getEventType();
+ switch (type) {
+
+ case XMLStreamConstants.CDATA:
+ case XMLStreamConstants.CHARACTERS: {
+ if (depth == depthOfTagValue) {
+ tagValue.append(xmlStreamReader.getTextCharacters(),
+ xmlStreamReader.getTextStart(), xmlStreamReader
+ .getTextLength());
+ }
+ break;
+ }
+
+ case XMLStreamConstants.START_ELEMENT: {
+ if (!tagName.equals(baseUri)) {
+ String value = null;
+ if (depth < depthOfTagValue) {
+ value = tagValue.toString().trim();
+ }
+ modelProperties.add(new ModelProperty(tagName, value));
+ if (!attributes.isEmpty()) {
+ for (Map.Entry<String, String> e : attributes
+ .entrySet()) {
+ modelProperties.add(new ModelProperty(e
+ .getKey(), e.getValue()));
+ }
+ attributes.clear();
+ }
+ }
+
+ depth++;
+ tagName = uri.getUriFor(xmlStreamReader.getName()
+ .getLocalPart(), depth);
+ if (collections.contains(tagName + "#collection")) {
+ tagName = tagName + "#collection";
+ uri.addTag(xmlStreamReader.getName().getLocalPart()
+ + "#collection");
+ } else if (collections.contains(tagName + "#set")) {
+ tagName = tagName + "#set";
+ uri.addTag(xmlStreamReader.getName().getLocalPart()
+ + "#set");
+ } else {
+ uri.addTag(xmlStreamReader.getName().getLocalPart());
+ }
+ tagValue.setLength(0);
+ depthOfTagValue = depth;
+ }
+ case XMLStreamConstants.ATTRIBUTE: {
+ for (int i = 0; i < xmlStreamReader.getAttributeCount(); i++) {
+
+ attributes.put(tagName
+ + "#property/"
+ + xmlStreamReader.getAttributeName(i)
+ .getLocalPart(), xmlStreamReader
+ .getAttributeValue(i));
+ }
+ break;
+ }
+ case XMLStreamConstants.END_ELEMENT: {
+ depth--;
+ break;
+ }
+ case XMLStreamConstants.END_DOCUMENT: {
+ modelProperties.add(new ModelProperty(tagName, tagValue
+ .toString().trim()));
+ if (!attributes.isEmpty()) {
+ for (Map.Entry<String, String> e : attributes
+ .entrySet()) {
+ modelProperties.add(new ModelProperty(e.getKey(), e
+ .getValue()));
+ }
+ attributes.clear();
+ }
+ return modelProperties;
+ }
+ }
+ }
+ } catch (XMLStreamException e) {
+ throw new IOException(":" + e.toString());
+ } finally {
+ if (xmlStreamReader != null) {
+ try {
+ xmlStreamReader.close();
+ } catch (XMLStreamException e) {
+ e.printStackTrace();
+ }
+ }
+ try {
+ inputStream.close();
+ } catch (IOException e) {
+
+ }
+ }
+ }
+
+ private static final Map<String, String> aliases = new HashMap<String, String>();
+
+ private static void addProjectAlias( String element, boolean leaf )
+ {
+ String suffix = leaf ? "\\}" : "\\.";
+ aliases.put( "\\$\\{project\\." + element + suffix, "\\$\\{" + element + suffix );
+ }
+
+ static
+ {
+ aliases.put( "\\$\\{project\\.", "\\$\\{pom\\." );
+ addProjectAlias( "modelVersion", true );
+ addProjectAlias( "groupId", true );
+ addProjectAlias( "artifactId", true );
+ addProjectAlias( "version", true );
+ addProjectAlias( "packaging", true );
+ addProjectAlias( "name", true );
+ addProjectAlias( "description", true );
+ addProjectAlias( "inceptionYear", true );
+ addProjectAlias( "url", true );
+ addProjectAlias( "parent", false );
+ addProjectAlias( "prerequisites", false );
+ addProjectAlias( "organization", false );
+ addProjectAlias( "build", false );
+ addProjectAlias( "reporting", false );
+ addProjectAlias( "scm", false );
+ addProjectAlias( "distributionManagement", false );
+ addProjectAlias( "issueManagement", false );
+ addProjectAlias( "ciManagement", false );
+ }
+
+ private static boolean containsProjectVersion( List<InterpolatorProperty> interpolatorProperties )
+ {
+ InterpolatorProperty versionInterpolatorProperty =
+ new ModelProperty( ProjectUri.version, "" ).asInterpolatorProperty( ProjectUri.baseUri );
+ for ( InterpolatorProperty ip : interpolatorProperties )
+ {
+ if ( ip.equals( versionInterpolatorProperty ) )
+ {
+ return true;
+ }
+ }
+ return false;
+ }
+ /**
+ * Class for storing information about URIs.
+ */
+ private static class Uri
{
- InterpolatorProperty versionInterpolatorProperty =
- new ModelProperty( ProjectUri.version, "" ).asInterpolatorProperty( ProjectUri.baseUri );
- for ( InterpolatorProperty ip : interpolatorProperties )
+
+ List<String> uris;
+
+ Uri( String baseUri )
+ {
+ uris = new LinkedList<String>();
+ uris.add( baseUri );
+ }
+
+ String getUriFor( String tag, int depth )
{
- if ( ip.equals( versionInterpolatorProperty ) )
+ setUrisToDepth( depth );
+ StringBuffer sb = new StringBuffer();
+ for ( String tagName : uris )
{
- return true;
+ sb.append( tagName ).append( "/" );
}
+ sb.append( tag );
+ return sb.toString();
+ }
+
+ void addTag( String tag )
+ {
+ uris.add( tag );
+ }
+
+ void setUrisToDepth( int depth )
+ {
+ uris = new LinkedList<String>( uris.subList( 0, depth ) );
}
- return false;
- }
-
+ }
+
}
Added: maven/components/trunk/maven-project-builder/src/main/java/org/apache/maven/project/builder/Interpolator.java
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-project-builder/src/main/java/org/apache/maven/project/builder/Interpolator.java?rev=765793&view=auto
==============================================================================
--- maven/components/trunk/maven-project-builder/src/main/java/org/apache/maven/project/builder/Interpolator.java (added)
+++ maven/components/trunk/maven-project-builder/src/main/java/org/apache/maven/project/builder/Interpolator.java Thu Apr 16 22:29:52 2009
@@ -0,0 +1,15 @@
+package org.apache.maven.project.builder;
+
+import java.io.IOException;
+import java.util.List;
+
+public interface Interpolator
+{
+
+ String interpolateXmlString( String xml, List<InterpolatorProperty> interpolatorProperties )
+ throws IOException;
+
+ PomClassicDomainModel interpolateDomainModel( PomClassicDomainModel dm, List<InterpolatorProperty> interpolatorProperties )
+ throws IOException ;
+
+}
Modified: maven/components/trunk/maven-project-builder/src/main/java/org/apache/maven/project/builder/ProcessorContext.java
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-project-builder/src/main/java/org/apache/maven/project/builder/ProcessorContext.java?rev=765793&r1=765792&r2=765793&view=diff
==============================================================================
--- maven/components/trunk/maven-project-builder/src/main/java/org/apache/maven/project/builder/ProcessorContext.java (original)
+++ maven/components/trunk/maven-project-builder/src/main/java/org/apache/maven/project/builder/ProcessorContext.java Thu Apr 16 22:29:52 2009
@@ -19,29 +19,12 @@
* under the License.
*/
-import java.io.ByteArrayInputStream;
-import java.io.File;
import java.io.IOException;
-import java.io.InputStream;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collection;
import java.util.Collections;
-import java.util.Comparator;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.LinkedHashSet;
-import java.util.LinkedList;
import java.util.List;
-import java.util.Map;
-import java.util.Set;
-
-import javax.xml.stream.XMLInputFactory;
-import javax.xml.stream.XMLStreamConstants;
-import javax.xml.stream.XMLStreamException;
-import javax.xml.stream.XMLStreamReader;
-
-import org.apache.maven.model.Build;
import org.apache.maven.model.BuildBase;
import org.apache.maven.model.Dependency;
import org.apache.maven.model.DependencyManagement;
@@ -50,10 +33,8 @@
import org.apache.maven.model.PluginExecution;
import org.apache.maven.model.PluginManagement;
import org.apache.maven.model.Profile;
-import org.apache.maven.model.Reporting;
import org.apache.maven.model.Resource;
import org.apache.maven.project.builder.PomClassicDomainModel;
-import org.apache.maven.project.builder.ProjectUri;
import org.codehaus.plexus.util.xml.Xpp3Dom;
public class ProcessorContext
@@ -271,120 +252,6 @@
}
- private static final Map<String, String> aliases = new HashMap<String, String>();
-
- private static void addProjectAlias( String element, boolean leaf )
- {
- String suffix = leaf ? "\\}" : "\\.";
- aliases.put( "\\$\\{project\\." + element + suffix, "\\$\\{" + element + suffix );
- }
-
- static
- {
- aliases.put( "\\$\\{project\\.", "\\$\\{pom\\." );
- addProjectAlias( "modelVersion", true );
- addProjectAlias( "groupId", true );
- addProjectAlias( "artifactId", true );
- addProjectAlias( "version", true );
- addProjectAlias( "packaging", true );
- addProjectAlias( "name", true );
- addProjectAlias( "description", true );
- addProjectAlias( "inceptionYear", true );
- addProjectAlias( "url", true );
- addProjectAlias( "parent", false );
- addProjectAlias( "prerequisites", false );
- addProjectAlias( "organization", false );
- addProjectAlias( "build", false );
- addProjectAlias( "reporting", false );
- addProjectAlias( "scm", false );
- addProjectAlias( "distributionManagement", false );
- addProjectAlias( "issueManagement", false );
- addProjectAlias( "ciManagement", false );
- }
-
- private static boolean containsProjectVersion( List<InterpolatorProperty> interpolatorProperties )
- {
- InterpolatorProperty versionInterpolatorProperty =
- new ModelProperty( ProjectUri.version, "" ).asInterpolatorProperty( ProjectUri.baseUri );
- for ( InterpolatorProperty ip : interpolatorProperties )
- {
- if ( ip.equals( versionInterpolatorProperty ) )
- {
- return true;
- }
- }
- return false;
- }
-
- /**
- * Post-processes the paths of build directories by aligning relative paths to the project directory and normalizing
- * file separators to the platform-specific separator.
- *
- * @param model The model to process, must not be {@code null}.
- * @param basedir The project directory, must not be {@code null}.
- */
- private static void alignPaths( Model model, File basedir )
- {
- Build build = model.getBuild();
- if ( build != null )
- {
- build.setDirectory( getAlignedPathFor( build.getDirectory(), basedir ) );
- build.setOutputDirectory( getAlignedPathFor( build.getOutputDirectory(), basedir ) );
- build.setTestOutputDirectory( getAlignedPathFor( build.getTestOutputDirectory(), basedir ) );
- build.setSourceDirectory( getAlignedPathFor( build.getSourceDirectory(), basedir ) );
- build.setTestSourceDirectory( getAlignedPathFor( build.getTestSourceDirectory(), basedir ) );
- build.setScriptSourceDirectory( getAlignedPathFor( build.getScriptSourceDirectory(), basedir ) );
-
- for ( Resource r : build.getResources() )
- {
- r.setDirectory( getAlignedPathFor( r.getDirectory(), basedir ) );
- }
-
- for ( Resource r : build.getTestResources() )
- {
- r.setDirectory( getAlignedPathFor( r.getDirectory(), basedir ) );
- }
-
- List<String> filters = new ArrayList<String>();
- for ( String f : build.getFilters() )
- {
- filters.add( getAlignedPathFor( f, basedir ) );
- }
- build.setFilters( filters );
- }
-
- Reporting reporting = model.getReporting();
- if ( reporting != null )
- {
- reporting.setOutputDirectory( getAlignedPathFor( reporting.getOutputDirectory(), basedir ) );
- }
-
- }
-
- private static String getAlignedPathFor(String path, File basedir)
- {
- if ( path != null )
- {
- File file = new File( path );
- if ( file.isAbsolute() )
- {
- // path was already absolute, just normalize file separator and we're done
- path = file.getPath();
- }
- else if ( file.getPath().startsWith( File.separator ) )
- {
- // drive-relative Windows path, don't align with project directory but with drive root
- path = file.getAbsolutePath();
- }
- else
- {
- // an ordinary relative path, align with project directory
- path = new File( new File( basedir, path ).toURI().normalize() ).getAbsolutePath();
- }
- }
- return path;
- }
-
public static Profile copyOfProfile(Profile profile)
{
Profile p = new Profile();
@@ -461,655 +328,4 @@
return p;
}
-
- public static PomClassicDomainModel interpolateDomainModel( PomClassicDomainModel dm, List<InterpolatorProperty> interpolatorProperties )
- throws IOException {
-
- if (dm == null) {
- throw new IllegalArgumentException("dm: null");
- }
- if (!containsProjectVersion(interpolatorProperties)) {
- aliases.put("\\$\\{project.version\\}", "\\$\\{version\\}");
- }
- //TODO: Insert customized logic for parsing
- List<ModelProperty> modelProperties = getModelProperties(dm.getInputStream());
-
- if ("jar".equals(dm.getModel().getPackaging())) {
- modelProperties.add(new ModelProperty(ProjectUri.packaging, "jar"));
- }
-
- List<ModelProperty> firstPassModelProperties = new ArrayList<ModelProperty>();
- List<ModelProperty> secondPassModelProperties = new ArrayList<ModelProperty>();
-
- ModelProperty buildProperty = new ModelProperty(ProjectUri.Build.xUri,
- null);
-
- for ( ModelProperty mp : modelProperties )
- {
- if ( mp.getValue() != null && !mp.getUri().contains( "#property" ) && !mp.getUri().contains( "#collection" ) )
- {
- if ( ( !buildProperty.isParentOf( mp ) && !mp.getUri().equals( ProjectUri.Reporting.outputDirectory ) || mp.getUri().equals(
- ProjectUri.Build.finalName ) ) )
- {
- firstPassModelProperties.add( mp );
- }
- else
- {
- secondPassModelProperties.add( mp );
- }
- }
- }
-
- /*
- if ( !buildProperty.isParentOf(mp) && mp.getValue() != null && !mp.getUri().contains("#property")
- && !mp.getUri().contains("#collection")) {
- if ((!mp.getUri().equals(
- ProjectUri.Reporting.outputDirectory) || mp
- .getUri().equals(ProjectUri.Build.finalName))) {
- firstPassModelProperties.add(mp);
- } else {
- secondPassModelProperties.add(mp);
- }
- }
- */
-
- List<InterpolatorProperty> standardInterpolatorProperties = new ArrayList<InterpolatorProperty>();
-
- if (dm.isPomInBuild()) {
- String basedir = dm.getProjectDirectory().getAbsolutePath();
- standardInterpolatorProperties.add(new InterpolatorProperty(
- "${project.basedir}", basedir,
- PomInterpolatorTag.PROJECT_PROPERTIES.name()));
- standardInterpolatorProperties.add(new InterpolatorProperty(
- "${basedir}", basedir,
- PomInterpolatorTag.PROJECT_PROPERTIES.name()));
- standardInterpolatorProperties.add(new InterpolatorProperty(
- "${pom.basedir}", basedir,
- PomInterpolatorTag.PROJECT_PROPERTIES.name()));
-
- String baseuri = dm.getProjectDirectory().toURI().toString();
- standardInterpolatorProperties.add(new InterpolatorProperty(
- "${project.baseUri}", baseuri,
- PomInterpolatorTag.PROJECT_PROPERTIES.name()));
- standardInterpolatorProperties.add(new InterpolatorProperty(
- "${pom.baseUri}", baseuri,
- PomInterpolatorTag.PROJECT_PROPERTIES.name()));
- }
-
- for (ModelProperty mp : modelProperties) {
- if (mp.getUri().startsWith(ProjectUri.properties)
- && mp.getValue() != null) {
- String uri = mp.getUri();
- standardInterpolatorProperties.add(new InterpolatorProperty(
- "${"
- + uri.substring(uri.lastIndexOf("/") + 1, uri
- .length()) + "}", mp.getValue(),
- PomInterpolatorTag.PROJECT_PROPERTIES.name()));
- }
- }
-
- // FIRST PASS - Withhold using build directories as interpolator
- // properties
- List<InterpolatorProperty> ips1 = new ArrayList<InterpolatorProperty>(
- interpolatorProperties);
- ips1.addAll(standardInterpolatorProperties);
- ips1.addAll(createInterpolatorProperties(
- firstPassModelProperties, ProjectUri.baseUri, aliases,
- PomInterpolatorTag.PROJECT_PROPERTIES.name()));
- Collections.sort(ips1, new Comparator<InterpolatorProperty>() {
- public int compare(InterpolatorProperty o, InterpolatorProperty o1) {
- if (o.getTag() == null || o1.getTag() == null) {
- return 0;
- }
- return PomInterpolatorTag.valueOf(o.getTag()).compareTo(
- PomInterpolatorTag.valueOf(o1.getTag()));
- }
- });
-
- interpolateModelProperties(modelProperties, ips1);
-
- // SECOND PASS - Set absolute paths on build directories
- if (dm.isPomInBuild()) {
- String basedir = dm.getProjectDirectory().getAbsolutePath();
- Map<ModelProperty, ModelProperty> buildDirectories = new HashMap<ModelProperty, ModelProperty>();
- for (ModelProperty mp : secondPassModelProperties) {
- if (mp.getUri().startsWith(ProjectUri.Build.xUri)
- || mp.getUri().equals(
- ProjectUri.Reporting.outputDirectory)) {
- File file = new File(mp.getResolvedValue());
- if (!file.isAbsolute()
- && !mp.getResolvedValue().startsWith(
- "${project.build.")
- && !mp.getResolvedValue().equals(
- "${project.basedir}")) {
- buildDirectories.put(mp, new ModelProperty(mp.getUri(),
- new File(basedir, file.getPath())
- .getAbsolutePath()));
- }
- }
- }
- for (Map.Entry<ModelProperty, ModelProperty> e : buildDirectories
- .entrySet()) {
- secondPassModelProperties.remove(e.getKey());
- secondPassModelProperties.add(e.getValue());
- }
- }
-
- // THIRD PASS - Use build directories as interpolator properties
- List<InterpolatorProperty> ips2 = new ArrayList<InterpolatorProperty>(
- interpolatorProperties);
- ips2.addAll(standardInterpolatorProperties);
- ips2.addAll(createInterpolatorProperties(
- secondPassModelProperties, ProjectUri.baseUri, aliases,
- PomInterpolatorTag.PROJECT_PROPERTIES.name()));
- ips2.addAll(interpolatorProperties);
- Collections.sort(ips2, new Comparator<InterpolatorProperty>() {
- public int compare(InterpolatorProperty o, InterpolatorProperty o1) {
- if (o.getTag() == null || o1.getTag() == null) {
- return 0;
- }
-
- return PomInterpolatorTag.valueOf(o.getTag()).compareTo(
- PomInterpolatorTag.valueOf(o1.getTag()));
- }
- });
-
- interpolateModelProperties(modelProperties, ips2);
-
- try
- {
- String xml = unmarshalModelPropertiesToXml( modelProperties, ProjectUri.baseUri );
- PomClassicDomainModel domainModel = new PomClassicDomainModel( new ByteArrayInputStream ( xml.getBytes( "UTF-8" )));
- if ( dm.getProjectDirectory() != null )
- {
- alignPaths(domainModel.getModel(), dm.getProjectDirectory());
- }
- return domainModel;
- }
- catch ( IOException e )
- {
- throw new IllegalStateException( "Unmarshalling of model properties failed", e );
- }
-
-
-
- /*
- for(ModelProperty mp : modelProperties)
- {
- if((mp.getValue() != null) && !mp.getValue().equals(mp.getResolvedValue()))
- {
- if(mp.getUri().equals(ProjectUri.version))
- {
-
- }
- }
- }
- */
- }
-
- public static void interpolateModelProperties(List<ModelProperty> modelProperties,
- List<InterpolatorProperty> interpolatorProperties )
- {
- if (modelProperties == null) {
- throw new IllegalArgumentException("modelProperties: null");
- }
-
- if (interpolatorProperties == null) {
- throw new IllegalArgumentException("interpolatorProperties: null");
- }
-
- List<ModelProperty> unresolvedProperties = new ArrayList<ModelProperty>();
- for (ModelProperty mp : modelProperties) {
- if (!mp.isResolved()) {
- unresolvedProperties.add(mp);
- }
- }
-
- LinkedHashSet<InterpolatorProperty> ips = new LinkedHashSet<InterpolatorProperty>();
- ips.addAll(interpolatorProperties);
- boolean continueInterpolation = true;
- while (continueInterpolation) {
- continueInterpolation = false;
- for (InterpolatorProperty ip : ips) {
- for (ModelProperty mp : unresolvedProperties) {
- if (mp.resolveWith(ip) && !continueInterpolation) {
- continueInterpolation = true;
- break;
- }
- }
- }
- }
- }
-
- public static List<InterpolatorProperty> createInterpolatorProperties(List<ModelProperty> modelProperties,
- String baseUriForModel,
- Map<String, String> aliases,
- String interpolatorTag)
- {
- if (modelProperties == null) {
- throw new IllegalArgumentException("modelProperties: null");
- }
-
- if (baseUriForModel == null) {
- throw new IllegalArgumentException("baseUriForModel: null");
- }
-
- List<InterpolatorProperty> interpolatorProperties = new ArrayList<InterpolatorProperty>();
-
- for (ModelProperty mp : modelProperties) {
- InterpolatorProperty ip = mp
- .asInterpolatorProperty(baseUriForModel);
- if (ip != null) {
- ip.setTag(interpolatorTag);
- interpolatorProperties.add(ip);
- for (Map.Entry<String, String> a : aliases.entrySet()) {
- interpolatorProperties.add(new InterpolatorProperty(ip
- .getKey().replaceAll(a.getKey(), a.getValue()), ip
- .getValue().replaceAll(a.getKey(), a.getValue()),
- interpolatorTag));
- }
- }
- }
-
- List<InterpolatorProperty> ips = new ArrayList<InterpolatorProperty>();
- for (InterpolatorProperty ip : interpolatorProperties) {
- if (!ips.contains(ip)) {
- ips.add(ip);
- }
- }
- return ips;
- }
-
- /**
- * Returns XML string unmarshalled from the specified list of model properties
- *
- * @param modelProperties the model properties to unmarshal. May not be null or empty
- * @param baseUri the base uri of every model property. May not be null or empty.
- * @return XML string unmarshalled from the specified list of model properties
- * @throws IOException if there was a problem with unmarshalling
- */
- public static String unmarshalModelPropertiesToXml( List<ModelProperty> modelProperties, String baseUri )
- throws IOException
- {
- if ( modelProperties == null || modelProperties.isEmpty() )
- {
- throw new IllegalArgumentException( "modelProperties: null or empty" );
- }
-
- if ( baseUri == null || baseUri.trim().length() == 0 )
- {
- throw new IllegalArgumentException( "baseUri: null or empty" );
- }
-
- final int basePosition = baseUri.length();
-
- StringBuffer sb = new StringBuffer();
- List<String> lastUriTags = new ArrayList<String>();
- for ( ModelProperty mp : modelProperties )
- {
- String uri = mp.getUri();
- if ( uri.contains( "#property" ) )
- {
- continue;
- }
-
- //String val = (mp.getResolvedValue() != null) ? "\"" + mp.getResolvedValue() + "\"" : null;
- // System.out.println("new ModelProperty(\"" + mp.getUri() +"\" , " + val +"),");
- if ( !uri.startsWith( baseUri ) )
- {
- throw new IllegalArgumentException(
- "Passed in model property that does not match baseUri: Property URI = " + uri + ", Base URI = " +
- baseUri );
- }
-
- List<String> tagNames = getTagNamesFromUri( basePosition, uri );
-
- for ( int i = lastUriTags.size() - 1; i >= 0 && i >= tagNames.size() - 1; i-- )
- {
- sb.append( toEndTag( lastUriTags.get( i ) ) );
- }
-
- String tag = tagNames.get( tagNames.size() - 1 );
-
- List<ModelProperty> attributes = new ArrayList<ModelProperty>();
- for(int peekIndex = modelProperties.indexOf( mp ) + 1; peekIndex < modelProperties.size(); peekIndex++)
- {
- if ( peekIndex <= modelProperties.size() - 1 )
- {
- ModelProperty peekProperty = modelProperties.get( peekIndex );
- if ( peekProperty.getUri().contains( "#property" ) )
- {
- attributes.add(peekProperty);
- }
- else
- {
- break;
- }
- }
- else
- {
- break;
- }
- }
-
- sb.append( toStartTag( tag, attributes ) );
-
- if ( mp.getResolvedValue() != null )
- {
- sb.append( mp.getResolvedValue() );
- }
-
- lastUriTags = tagNames;
- }
-
- for ( int i = lastUriTags.size() - 1; i >= 1; i-- )
- {
- sb.append( toEndTag( lastUriTags.get( i ) ) );
- }
-
- return sb.toString();
- }
-
- /**
- * Returns list of tag names parsed from the specified uri. All #collection parts of the tag are removed from the
- * tag names.
- *
- * @param basePosition the base position in the specified URI to start the parse
- * @param uri the uri to parse for tag names
- * @return list of tag names parsed from the specified uri
- */
- private static List<String> getTagNamesFromUri( int basePosition, String uri )
- {
- return Arrays.asList( uri.substring( basePosition ).replaceAll( "#collection", "" )
- .replaceAll("#set", "").split( "/" ) );
- }
-
- /**
- * Returns the XML formatted start tag for the specified value and the specified attribute.
- *
- * @param value the value to use for the start tag
- * @param attributes the attribute to use in constructing of start tag
- * @return the XML formatted start tag for the specified value and the specified attribute
- */
- private static String toStartTag( String value, List<ModelProperty> attributes )
- {
- StringBuffer sb = new StringBuffer(); //TODO: Support more than one attribute
- sb.append( "\r\n<" ).append( value );
- if ( attributes != null )
- {
- for(ModelProperty attribute : attributes)
- {
- sb.append( " " ).append(
- attribute.getUri().substring( attribute.getUri().indexOf( "#property/" ) + 10 ) ).append( "=\"" )
- .append( attribute.getResolvedValue() ).append( "\" " );
- }
- }
- sb.append( ">" );
- return sb.toString();
- }
-
- /**
- * Returns XML formatted end tag for the specified value.
- *
- * @param value the value to use for the end tag
- * @return xml formatted end tag for the specified value
- */
- private static String toEndTag( String value )
- {
- if ( value.trim().length() == 0 )
- {
- return "";
- }
- StringBuffer sb = new StringBuffer();
- sb.append( "</" ).append( value ).append( ">" );
- return sb.toString();
- }
-
- private static List<ModelProperty> getModelProperties(InputStream is) throws IOException
- {
- Set<String> s = new HashSet<String>();
- //TODO: Should add all collections from ProjectUri
- s.addAll(URIS);
- s.add(ProjectUri.Build.PluginManagement.Plugins.Plugin.Executions.xUri);
- s.add(ProjectUri.DependencyManagement.Dependencies.Dependency.Exclusions.xUri);
- s.add(ProjectUri.Dependencies.Dependency.Exclusions.xUri);
- s.add(ProjectUri.Build.Plugins.Plugin.Executions.xUri);
- s.add(ProjectUri.Build.Plugins.Plugin.Executions.Execution.Goals.xURI);
- s.add(ProjectUri.Reporting.Plugins.Plugin.ReportSets.xUri);
- s.add(ProjectUri.Reporting.Plugins.Plugin.ReportSets.ReportSet.configuration);
- s.add(ProjectUri.Build.Plugins.Plugin.Executions.Execution.configuration);
- //TODO: More profile info
- s.add(ProjectUri.Profiles.Profile.Build.PluginManagement.Plugins.Plugin.Executions.xUri);
- s.add(ProjectUri.Profiles.Profile.DependencyManagement.Dependencies.Dependency.Exclusions.xUri);
- s.add(ProjectUri.Profiles.Profile.Dependencies.Dependency.Exclusions.xUri);
- s.add(ProjectUri.Profiles.Profile.Build.Plugins.Plugin.Executions.xUri);
- s.add(ProjectUri.Profiles.Profile.Build.Plugins.Plugin.Executions.Execution.Goals.xURI);
- s.add(ProjectUri.Profiles.Profile.Reporting.Plugins.Plugin.ReportSets.xUri);
- s.add(ProjectUri.Profiles.Profile.Reporting.Plugins.Plugin.ReportSets.ReportSet.configuration);
- s.add(ProjectUri.Profiles.Profile.Build.Plugins.Plugin.Executions.Execution.configuration);
- s.add(ProjectUri.Profiles.Profile.properties);
- s.add(ProjectUri.Profiles.Profile.modules);
- s.add(ProjectUri.Profiles.Profile.Dependencies.xUri);
- s.add(ProjectUri.Profiles.Profile.Build.Plugins.Plugin.configuration);
-
- return new ArrayList<ModelProperty>(marshallXmlToModelProperties(is, ProjectUri.baseUri, s ));
- }
- public static final Set<String> URIS = Collections.unmodifiableSet(new HashSet<String>( Arrays.asList( ProjectUri.Build.Extensions.xUri,
- ProjectUri.Build.PluginManagement.Plugins.xUri,
- ProjectUri.Build.PluginManagement.Plugins.Plugin.configuration,
- ProjectUri.Build.PluginManagement.Plugins.Plugin.Executions.xUri,
- ProjectUri.Build.PluginManagement.Plugins.Plugin.Executions.Execution.Goals.xURI,
- ProjectUri.Build.PluginManagement.Plugins.Plugin.Dependencies.xUri,
- ProjectUri.Build.PluginManagement.Plugins.Plugin.Dependencies.Dependency.Exclusions.xUri,
- ProjectUri.Build.Plugins.xUri,
- ProjectUri.properties,
- ProjectUri.Build.Plugins.Plugin.configuration,
- ProjectUri.Reporting.Plugins.xUri,
- ProjectUri.Reporting.Plugins.Plugin.configuration,
- ProjectUri.Build.Plugins.Plugin.Dependencies.xUri,
- ProjectUri.Build.Resources.xUri,
- ProjectUri.Build.Resources.Resource.includes,
- ProjectUri.Build.Resources.Resource.excludes,
- ProjectUri.Build.TestResources.xUri,
- ProjectUri.Build.Filters.xUri,
- ProjectUri.CiManagement.Notifiers.xUri,
- ProjectUri.Contributors.xUri,
- ProjectUri.Dependencies.xUri,
- ProjectUri.DependencyManagement.Dependencies.xUri,
- ProjectUri.Developers.xUri,
- ProjectUri.Developers.Developer.roles,
- ProjectUri.Licenses.xUri,
- ProjectUri.MailingLists.xUri,
- ProjectUri.Modules.xUri,
- ProjectUri.PluginRepositories.xUri,
- ProjectUri.Profiles.xUri,
- ProjectUri.Profiles.Profile.Build.Plugins.xUri,
- ProjectUri.Profiles.Profile.Build.Plugins.Plugin.Dependencies.xUri,
- ProjectUri.Profiles.Profile.Build.Plugins.Plugin.Executions.xUri,
- ProjectUri.Profiles.Profile.Build.Resources.xUri,
- ProjectUri.Profiles.Profile.Build.TestResources.xUri,
- ProjectUri.Profiles.Profile.Dependencies.xUri,
- ProjectUri.Profiles.Profile.DependencyManagement.Dependencies.xUri,
- ProjectUri.Profiles.Profile.PluginRepositories.xUri,
- ProjectUri.Profiles.Profile.Reporting.Plugins.xUri,
- ProjectUri.Profiles.Profile.Repositories.xUri,
- ProjectUri.Profiles.Profile.Build.PluginManagement.Plugins.xUri,
- ProjectUri.Profiles.Profile.Build.PluginManagement.Plugins.Plugin.Dependencies.xUri,
- ProjectUri.Reporting.Plugins.xUri,
- ProjectUri.Repositories.xUri) ));
-
- /**
- * Returns list of model properties transformed from the specified input stream.
- *
- * @param inputStream input stream containing the xml document. May not be null.
- * @param baseUri the base uri of every model property. May not be null or empty.
- * @param collections set of uris that are to be treated as a collection (multiple entries). May be null.
- * @return list of model properties transformed from the specified input stream.
- * @throws IOException if there was a problem doing the transform
- */
- public static List<ModelProperty> marshallXmlToModelProperties( InputStream inputStream, String baseUri,
- Set<String> collections )
- throws IOException {
- if (inputStream == null) {
- throw new IllegalArgumentException("inputStream: null");
- }
-
- if (baseUri == null || baseUri.trim().length() == 0) {
- throw new IllegalArgumentException("baseUri: null");
- }
-
- if (collections == null) {
- collections = Collections.emptySet();
- }
-
- List<ModelProperty> modelProperties = new ArrayList<ModelProperty>();
- XMLInputFactory xmlInputFactory = new com.ctc.wstx.stax.WstxInputFactory();
- xmlInputFactory.setProperty(
- XMLInputFactory.IS_REPLACING_ENTITY_REFERENCES, Boolean.FALSE);
- xmlInputFactory.setProperty(XMLInputFactory.IS_NAMESPACE_AWARE,
- Boolean.FALSE);
-
- Uri uri = new Uri(baseUri);
- String tagName = baseUri;
- StringBuilder tagValue = new StringBuilder(256);
-
- int depth = 0;
- int depthOfTagValue = depth;
- XMLStreamReader xmlStreamReader = null;
- try {
- xmlStreamReader = xmlInputFactory
- .createXMLStreamReader(inputStream);
-
- Map<String, String> attributes = new HashMap<String, String>();
- for (;; xmlStreamReader.next()) {
- int type = xmlStreamReader.getEventType();
- switch (type) {
-
- case XMLStreamConstants.CDATA:
- case XMLStreamConstants.CHARACTERS: {
- if (depth == depthOfTagValue) {
- tagValue.append(xmlStreamReader.getTextCharacters(),
- xmlStreamReader.getTextStart(), xmlStreamReader
- .getTextLength());
- }
- break;
- }
-
- case XMLStreamConstants.START_ELEMENT: {
- if (!tagName.equals(baseUri)) {
- String value = null;
- if (depth < depthOfTagValue) {
- value = tagValue.toString().trim();
- }
- modelProperties.add(new ModelProperty(tagName, value));
- if (!attributes.isEmpty()) {
- for (Map.Entry<String, String> e : attributes
- .entrySet()) {
- modelProperties.add(new ModelProperty(e
- .getKey(), e.getValue()));
- }
- attributes.clear();
- }
- }
-
- depth++;
- tagName = uri.getUriFor(xmlStreamReader.getName()
- .getLocalPart(), depth);
- if (collections.contains(tagName + "#collection")) {
- tagName = tagName + "#collection";
- uri.addTag(xmlStreamReader.getName().getLocalPart()
- + "#collection");
- } else if (collections.contains(tagName + "#set")) {
- tagName = tagName + "#set";
- uri.addTag(xmlStreamReader.getName().getLocalPart()
- + "#set");
- } else {
- uri.addTag(xmlStreamReader.getName().getLocalPart());
- }
- tagValue.setLength(0);
- depthOfTagValue = depth;
- }
- case XMLStreamConstants.ATTRIBUTE: {
- for (int i = 0; i < xmlStreamReader.getAttributeCount(); i++) {
-
- attributes.put(tagName
- + "#property/"
- + xmlStreamReader.getAttributeName(i)
- .getLocalPart(), xmlStreamReader
- .getAttributeValue(i));
- }
- break;
- }
- case XMLStreamConstants.END_ELEMENT: {
- depth--;
- break;
- }
- case XMLStreamConstants.END_DOCUMENT: {
- modelProperties.add(new ModelProperty(tagName, tagValue
- .toString().trim()));
- if (!attributes.isEmpty()) {
- for (Map.Entry<String, String> e : attributes
- .entrySet()) {
- modelProperties.add(new ModelProperty(e.getKey(), e
- .getValue()));
- }
- attributes.clear();
- }
- return modelProperties;
- }
- }
- }
- } catch (XMLStreamException e) {
- throw new IOException(":" + e.toString());
- } finally {
- if (xmlStreamReader != null) {
- try {
- xmlStreamReader.close();
- } catch (XMLStreamException e) {
- e.printStackTrace();
- }
- }
- try {
- inputStream.close();
- } catch (IOException e) {
-
- }
- }
- }
- /**
- * Class for storing information about URIs.
- */
- private static class Uri
- {
-
- List<String> uris;
-
- Uri( String baseUri )
- {
- uris = new LinkedList<String>();
- uris.add( baseUri );
- }
-
- String getUriFor( String tag, int depth )
- {
- setUrisToDepth( depth );
- StringBuffer sb = new StringBuffer();
- for ( String tagName : uris )
- {
- sb.append( tagName ).append( "/" );
- }
- sb.append( tag );
- return sb.toString();
- }
-
- void addTag( String tag )
- {
- uris.add( tag );
- }
-
- void setUrisToDepth( int depth )
- {
- uris = new LinkedList<String>( uris.subList( 0, depth ) );
- }
- }
}
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=765793&r1=765792&r2=765793&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 Apr 16 22:29:52 2009
@@ -43,6 +43,7 @@
import org.apache.maven.profiles.ProfileManagerInfo;
import org.apache.maven.profiles.ProfileManager;
import org.apache.maven.project.artifact.InvalidDependencyVersionException;
+import org.apache.maven.project.builder.DefaultInterpolator;
import org.apache.maven.project.builder.DomainModel;
import org.apache.maven.project.builder.InterpolatorProperty;
import org.apache.maven.project.builder.ModelEventListener;
@@ -387,7 +388,7 @@
try
{
//List<ModelProperty> mps = domainModel.getModelProperties();
- model = ProcessorContext.interpolateDomainModel( domainModel, interpolatorProperties ).getModel();
+ model = new DefaultInterpolator().interpolateDomainModel( domainModel, interpolatorProperties ).getModel();
/*
if ( domainModel.getProjectDirectory() != null )
{