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 2006/04/01 00:31:38 UTC
svn commit: r390526 - in /maven/components/branches/maven-embedder-refactor:
./ maven-core/src/main/java/org/apache/maven/
maven-project/src/main/java/org/apache/maven/project/
Author: jvanzyl
Date: Fri Mar 31 14:31:37 2006
New Revision: 390526
URL: http://svn.apache.org/viewcvs?rev=390526&view=rev
Log:
o adding a constant for strict parsing and setting it to true which is what we are currrently
doing on the trunk. Just easier to spot then "true" in the source.
Modified:
maven/components/branches/maven-embedder-refactor/maven-core/src/main/java/org/apache/maven/DefaultCommonMavenObjectFactory.java
maven/components/branches/maven-embedder-refactor/maven-project/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java
maven/components/branches/maven-embedder-refactor/maven-project/src/main/java/org/apache/maven/project/MavenProjectBuilder.java
maven/components/branches/maven-embedder-refactor/pom.xml
Modified: maven/components/branches/maven-embedder-refactor/maven-core/src/main/java/org/apache/maven/DefaultCommonMavenObjectFactory.java
URL: http://svn.apache.org/viewcvs/maven/components/branches/maven-embedder-refactor/maven-core/src/main/java/org/apache/maven/DefaultCommonMavenObjectFactory.java?rev=390526&r1=390525&r2=390526&view=diff
==============================================================================
--- maven/components/branches/maven-embedder-refactor/maven-core/src/main/java/org/apache/maven/DefaultCommonMavenObjectFactory.java (original)
+++ maven/components/branches/maven-embedder-refactor/maven-core/src/main/java/org/apache/maven/DefaultCommonMavenObjectFactory.java Fri Mar 31 14:31:37 2006
@@ -62,8 +62,7 @@
localRepositoryUrl = "file://" + localRepositoryUrl;
}
- return createRepository( "local", localRepositoryUrl, false, true,
- ArtifactRepositoryPolicy.CHECKSUM_POLICY_WARN );
+ return createRepository( "local", localRepositoryUrl, false, true, ArtifactRepositoryPolicy.CHECKSUM_POLICY_WARN );
}
public ArtifactRepository createRepository( String repositoryId,
Modified: maven/components/branches/maven-embedder-refactor/maven-project/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java
URL: http://svn.apache.org/viewcvs/maven/components/branches/maven-embedder-refactor/maven-project/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java?rev=390526&r1=390525&r2=390526&view=diff
==============================================================================
--- maven/components/branches/maven-embedder-refactor/maven-project/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java (original)
+++ maven/components/branches/maven-embedder-refactor/maven-project/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java Fri Mar 31 14:31:37 2006
@@ -263,7 +263,7 @@
try
{
- project = processProjectLogic( "<Super-POM>", project, null, null, true );
+ project = processProjectLogic( "<Super-POM>", project, null, null, STRICT_MODEL_PARSING );
project.setExecutionRoot( true );
@@ -409,7 +409,7 @@
boolean checkDistributionManagementStatus )
throws ProjectBuildingException
{
- Model model = readModel( "unknown", projectDescriptor, true );
+ Model model = readModel( "unknown", projectDescriptor, STRICT_MODEL_PARSING );
MavenProject project = buildInternal( projectDescriptor.getAbsolutePath(),
model,
@@ -417,7 +417,7 @@
buildArtifactRepositories( getSuperModel() ),
projectDescriptor,
profileManager,
- true );
+ STRICT_MODEL_PARSING );
if ( checkDistributionManagementStatus )
{
@@ -466,7 +466,7 @@
File file = projectArtifact.getFile();
- model = readModel( projectId, file, false );
+ model = readModel( projectId, file, STRICT_MODEL_PARSING );
String downloadUrl = null;
@@ -1451,7 +1451,7 @@
String projectId = safeVersionlessKey( STANDALONE_SUPERPOM_GROUPID, STANDALONE_SUPERPOM_ARTIFACTID );
- return readModel( projectId, url, true );
+ return readModel( projectId, url, STRICT_MODEL_PARSING );
}
public void contextualize( Context context )
Modified: maven/components/branches/maven-embedder-refactor/maven-project/src/main/java/org/apache/maven/project/MavenProjectBuilder.java
URL: http://svn.apache.org/viewcvs/maven/components/branches/maven-embedder-refactor/maven-project/src/main/java/org/apache/maven/project/MavenProjectBuilder.java?rev=390526&r1=390525&r2=390526&view=diff
==============================================================================
--- maven/components/branches/maven-embedder-refactor/maven-project/src/main/java/org/apache/maven/project/MavenProjectBuilder.java (original)
+++ maven/components/branches/maven-embedder-refactor/maven-project/src/main/java/org/apache/maven/project/MavenProjectBuilder.java Fri Mar 31 14:31:37 2006
@@ -36,6 +36,8 @@
String STANDALONE_SUPERPOM_VERSION = "2.0";
+ boolean STRICT_MODEL_PARSING = true;
+
MavenProject build( File project, ArtifactRepository localRepository, ProfileManager globalProfileManager )
throws ProjectBuildingException;
Modified: maven/components/branches/maven-embedder-refactor/pom.xml
URL: http://svn.apache.org/viewcvs/maven/components/branches/maven-embedder-refactor/pom.xml?rev=390526&r1=390525&r2=390526&view=diff
==============================================================================
--- maven/components/branches/maven-embedder-refactor/pom.xml (original)
+++ maven/components/branches/maven-embedder-refactor/pom.xml Fri Mar 31 14:31:37 2006
@@ -1,5 +1,4 @@
<?xml version="1.0" encoding="UTF-8"?>
-
<!--
~ Copyright 2005-2006 The Apache Software Foundation.
~