You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by jv...@apache.org on 2009/10/13 08:49:25 UTC
svn commit: r824607 - in /maven/maven-3/trunk:
apache-maven/src/main/assembly/
maven-core/src/main/java/org/apache/maven/project/
maven-embedder/src/main/java/org/apache/maven/cli/
maven-model-builder/src/main/java/org/apache/maven/model/building/ mave...
Author: jvanzyl
Date: Tue Oct 13 06:49:25 2009
New Revision: 824607
URL: http://svn.apache.org/viewvc?rev=824607&view=rev
Log:
o changes to allow polyglot maven to work
Modified:
maven/maven-3/trunk/apache-maven/src/main/assembly/bin.xml
maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/project/DefaultProjectBuilder.java
maven/maven-3/trunk/maven-embedder/src/main/java/org/apache/maven/cli/MavenCli.java
maven/maven-3/trunk/maven-model-builder/src/main/java/org/apache/maven/model/building/DefaultModelBuilder.java
maven/maven-3/trunk/maven-model-builder/src/main/java/org/apache/maven/model/superpom/DefaultSuperPomProvider.java
Modified: maven/maven-3/trunk/apache-maven/src/main/assembly/bin.xml
URL: http://svn.apache.org/viewvc/maven/maven-3/trunk/apache-maven/src/main/assembly/bin.xml?rev=824607&r1=824606&r2=824607&view=diff
==============================================================================
--- maven/maven-3/trunk/apache-maven/src/main/assembly/bin.xml (original)
+++ maven/maven-3/trunk/apache-maven/src/main/assembly/bin.xml Tue Oct 13 06:49:25 2009
@@ -20,8 +20,6 @@
<assembly>
<id>bin</id>
<formats>
- <format>tar.gz</format>
- <format>tar.bz2</format>
<format>zip</format>
</formats>
<dependencySets>
Modified: maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/project/DefaultProjectBuilder.java
URL: http://svn.apache.org/viewvc/maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/project/DefaultProjectBuilder.java?rev=824607&r1=824606&r2=824607&view=diff
==============================================================================
--- maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/project/DefaultProjectBuilder.java (original)
+++ maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/project/DefaultProjectBuilder.java Tue Oct 13 06:49:25 2009
@@ -37,8 +37,8 @@
import org.apache.maven.model.building.ModelBuildingRequest;
import org.apache.maven.model.building.ModelBuildingResult;
import org.apache.maven.model.building.ModelProblem;
+import org.apache.maven.model.building.ModelProcessor;
import org.apache.maven.model.building.UrlModelSource;
-import org.apache.maven.model.locator.ModelLocator;
import org.apache.maven.model.resolution.ModelResolver;
import org.apache.maven.project.artifact.ProjectArtifact;
import org.apache.maven.repository.RepositorySystem;
@@ -59,7 +59,7 @@
private ModelBuilder modelBuilder;
@Requirement
- private ModelLocator modelLocator;
+ private ModelProcessor modelProcessor;
@Requirement
private ProjectBuildingHelper projectBuildingHelper;
@@ -344,7 +344,7 @@
if ( moduleFile.isDirectory() )
{
- moduleFile = modelLocator.locatePom( moduleFile );
+ moduleFile = modelProcessor.locatePom( moduleFile );
}
if ( !moduleFile.isFile() )
Modified: maven/maven-3/trunk/maven-embedder/src/main/java/org/apache/maven/cli/MavenCli.java
URL: http://svn.apache.org/viewvc/maven/maven-3/trunk/maven-embedder/src/main/java/org/apache/maven/cli/MavenCli.java?rev=824607&r1=824606&r2=824607&view=diff
==============================================================================
--- maven/maven-3/trunk/maven-embedder/src/main/java/org/apache/maven/cli/MavenCli.java (original)
+++ maven/maven-3/trunk/maven-embedder/src/main/java/org/apache/maven/cli/MavenCli.java Tue Oct 13 06:49:25 2009
@@ -36,6 +36,7 @@
import org.apache.maven.execution.MavenExecutionRequest;
import org.apache.maven.execution.MavenExecutionRequestPopulator;
import org.apache.maven.execution.MavenExecutionResult;
+import org.apache.maven.model.building.ModelProcessor;
import org.apache.maven.model.locator.ModelLocator;
import org.apache.maven.repository.ArtifactTransferListener;
import org.apache.maven.settings.Settings;
@@ -48,6 +49,7 @@
import org.codehaus.plexus.ContainerConfiguration;
import org.codehaus.plexus.DefaultContainerConfiguration;
import org.codehaus.plexus.DefaultPlexusContainer;
+import org.codehaus.plexus.PlexusContainer;
import org.codehaus.plexus.PlexusContainerException;
import org.codehaus.plexus.classworlds.ClassWorld;
import org.codehaus.plexus.component.repository.exception.ComponentLifecycleException;
@@ -83,7 +85,7 @@
private PrintStreamLogger logger;
- private ModelLocator modelLocator;
+ private ModelProcessor modelProcessor;
public static void main( String[] args )
{
@@ -127,8 +129,14 @@
logger = new PrintStreamLogger( System.out );
container.setLoggerManager( new MavenLoggerManager( logger ) );
+
+ customizeContainer( container );
}
+ protected void customizeContainer( PlexusContainer container )
+ {
+ }
+
public int doMain( String[] args, String workingDirectory, PrintStream stdout, PrintStream stderr )
{
if ( stdout == null )
@@ -225,7 +233,7 @@
{
maven = container.lookup( Maven.class );
- modelLocator = container.lookup( ModelLocator.class );
+ modelProcessor = createModelProcessor( container );
}
catch ( ComponentLookupException e )
{
@@ -490,6 +498,12 @@
}
}
+ protected ModelProcessor createModelProcessor( PlexusContainer container )
+ throws ComponentLookupException
+ {
+ return container.lookup( ModelProcessor.class );
+ }
+
private Configuration buildEmbedderConfiguration( CommandLine commandLine, String workingDirectory )
{
File userSettingsFile;
@@ -741,7 +755,7 @@
}
else if ( ( request.getPom() == null ) && ( request.getBaseDirectory() != null ) )
{
- File pom = modelLocator.locatePom( new File( request.getBaseDirectory() ) );
+ File pom = modelProcessor.locatePom( new File( request.getBaseDirectory() ) );
request.setPom( pom );
}
Modified: maven/maven-3/trunk/maven-model-builder/src/main/java/org/apache/maven/model/building/DefaultModelBuilder.java
URL: http://svn.apache.org/viewvc/maven/maven-3/trunk/maven-model-builder/src/main/java/org/apache/maven/model/building/DefaultModelBuilder.java?rev=824607&r1=824606&r2=824607&view=diff
==============================================================================
--- maven/maven-3/trunk/maven-model-builder/src/main/java/org/apache/maven/model/building/DefaultModelBuilder.java (original)
+++ maven/maven-3/trunk/maven-model-builder/src/main/java/org/apache/maven/model/building/DefaultModelBuilder.java Tue Oct 13 06:49:25 2009
@@ -39,8 +39,6 @@
import org.apache.maven.model.inheritance.InheritanceAssembler;
import org.apache.maven.model.interpolation.ModelInterpolator;
import org.apache.maven.model.io.ModelParseException;
-import org.apache.maven.model.io.ModelReader;
-import org.apache.maven.model.locator.ModelLocator;
import org.apache.maven.model.management.DependencyManagementInjector;
import org.apache.maven.model.management.PluginManagementInjector;
import org.apache.maven.model.normalization.ModelNormalizer;
@@ -67,12 +65,8 @@
public class DefaultModelBuilder
implements ModelBuilder
{
-
- @Requirement
- private ModelLocator modelLocator;
-
@Requirement
- private ModelReader modelReader;
+ private ModelProcessor modelProcessor;
@Requirement
private ModelValidator modelValidator;
@@ -304,9 +298,9 @@
{
boolean strict = request.getValidationLevel() >= ModelBuildingRequest.VALIDATION_LEVEL_MAVEN_2_0;
- Map<String, ?> options = Collections.singletonMap( ModelReader.IS_STRICT, Boolean.valueOf( strict ) );
+ Map<String, ?> options = Collections.singletonMap( ModelProcessor.IS_STRICT, Boolean.valueOf( strict ) );
- model = modelReader.read( modelSource.getInputStream(), options );
+ model = modelProcessor.read( modelSource.getInputStream(), options );
}
catch ( ModelParseException e )
{
@@ -523,7 +517,7 @@
if ( pomFile.isDirectory() )
{
- pomFile = modelLocator.locatePom( pomFile );
+ pomFile = modelProcessor.locatePom( pomFile );
}
return pomFile;
Modified: maven/maven-3/trunk/maven-model-builder/src/main/java/org/apache/maven/model/superpom/DefaultSuperPomProvider.java
URL: http://svn.apache.org/viewvc/maven/maven-3/trunk/maven-model-builder/src/main/java/org/apache/maven/model/superpom/DefaultSuperPomProvider.java?rev=824607&r1=824606&r2=824607&view=diff
==============================================================================
--- maven/maven-3/trunk/maven-model-builder/src/main/java/org/apache/maven/model/superpom/DefaultSuperPomProvider.java (original)
+++ maven/maven-3/trunk/maven-model-builder/src/main/java/org/apache/maven/model/superpom/DefaultSuperPomProvider.java Tue Oct 13 06:49:25 2009
@@ -21,8 +21,11 @@
import java.io.IOException;
import java.io.InputStream;
+import java.util.HashMap;
+import java.util.Map;
import org.apache.maven.model.Model;
+import org.apache.maven.model.building.ModelProcessor;
import org.apache.maven.model.io.ModelReader;
import org.codehaus.plexus.component.annotations.Component;
import org.codehaus.plexus.component.annotations.Requirement;
@@ -43,7 +46,7 @@
private Model superModel;
@Requirement
- private ModelReader modelReader;
+ private ModelProcessor modelProcessor;
public Model getSuperModel( String version )
{
@@ -61,7 +64,9 @@
try
{
- superModel = modelReader.read( is, null );
+ Map<String,String> options = new HashMap<String,String>();
+ options.put( "xml:4.0.0", "xml:4.0.0" );
+ superModel = modelProcessor.read( is, options );
}
catch ( IOException e )
{