You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by be...@apache.org on 2009/05/25 22:59:59 UTC
svn commit: r778500 - in /maven/components/branches/MNG-2766:
maven-core/src/test/java/org/apache/maven/project/
maven-core/src/test/java/org/apache/maven/project/harness/
maven-core/src/test/java/org/apache/maven/settings/
maven-model-builder/src/main...
Author: bentmann
Date: Mon May 25 20:59:59 2009
New Revision: 778500
URL: http://svn.apache.org/viewvc?rev=778500&view=rev
Log:
o Deleted DomainModel
Removed:
maven/components/branches/MNG-2766/maven-model-builder/src/main/java/org/apache/maven/model/DomainModel.java
Modified:
maven/components/branches/MNG-2766/maven-core/src/test/java/org/apache/maven/project/PomConstructionTest.java
maven/components/branches/MNG-2766/maven-core/src/test/java/org/apache/maven/project/harness/PomTestWrapper.java
maven/components/branches/MNG-2766/maven-core/src/test/java/org/apache/maven/settings/PomConstructionWithSettingsTest.java
Modified: maven/components/branches/MNG-2766/maven-core/src/test/java/org/apache/maven/project/PomConstructionTest.java
URL: http://svn.apache.org/viewvc/maven/components/branches/MNG-2766/maven-core/src/test/java/org/apache/maven/project/PomConstructionTest.java?rev=778500&r1=778499&r2=778500&view=diff
==============================================================================
--- maven/components/branches/MNG-2766/maven-core/src/test/java/org/apache/maven/project/PomConstructionTest.java (original)
+++ maven/components/branches/MNG-2766/maven-core/src/test/java/org/apache/maven/project/PomConstructionTest.java Mon May 25 20:59:59 2009
@@ -138,7 +138,6 @@
throws Exception
{
PomTestWrapper tester = buildPom("micromailer");
- assertEquals( 2, tester.getDomainModel().getLineageCount() );
assertModelEquals( tester, "child-descriptor", "build/plugins[1]/executions[1]/goals[1]" );
}
@@ -147,7 +146,6 @@
throws Exception
{
PomTestWrapper pom = buildPom( "dependency-scope/sub" );
- System.out.println(pom.getDomainModel().asString());
}
@@ -278,7 +276,6 @@
throws Exception
{
PomTestWrapper pom = buildPom( "plugin-config-duplicate/dup" );
- System.out.println(pom.getDomainModel().asString());
}
*/
@@ -331,7 +328,6 @@
throws Exception
{
PomTestWrapper pom = buildPom( "consecutive_empty_elements" );
- pom.getDomainModel().asString();
}
public void testOrderOfGoalsFromPluginExecutionWithoutPluginManagement()
@@ -1289,7 +1285,7 @@
{
PomTestWrapper pom = buildPom( "inherited-properties-interpolation/active-profile/sub" );
- assertEquals(1, pom.getDomainModel().getModel().getProfiles().size());
+ assertEquals(1, pom.getMavenProject().getModel().getProfiles().size());
buildPom( "inherited-properties-interpolation/active-profile/sub", "it-parent", "it-child" );
assertEquals( "CHILD", pom.getValue( "properties/overridden" ) );
@@ -1411,7 +1407,6 @@
PomTestWrapper pom = buildPom( "dependency-scope-inheritance/sub" );
String scope = (String) pom.getValue("dependencies[1]/scope");
assertNull("Scope not null: " + scope, scope);
- System.out.println(pom.getDomainModel().asString());
}
@@ -1419,7 +1414,6 @@
throws Exception
{
PomTestWrapper pom = buildPom( "dependency-scope/sub" );
- // System.out.println(pom.getDomainModel().asString());
}
//This will fail on a validation error if incorrect
Modified: maven/components/branches/MNG-2766/maven-core/src/test/java/org/apache/maven/project/harness/PomTestWrapper.java
URL: http://svn.apache.org/viewvc/maven/components/branches/MNG-2766/maven-core/src/test/java/org/apache/maven/project/harness/PomTestWrapper.java?rev=778500&r1=778499&r2=778500&view=diff
==============================================================================
--- maven/components/branches/MNG-2766/maven-core/src/test/java/org/apache/maven/project/harness/PomTestWrapper.java (original)
+++ maven/components/branches/MNG-2766/maven-core/src/test/java/org/apache/maven/project/harness/PomTestWrapper.java Mon May 25 20:59:59 2009
@@ -26,14 +26,11 @@
import org.apache.commons.jxpath.JXPathContext;
import org.apache.commons.jxpath.JXPathNotFoundException;
import org.apache.commons.jxpath.ri.JXPathContextReferenceImpl;
-import org.apache.maven.model.DomainModel;
import org.apache.maven.project.MavenProject;
public class PomTestWrapper
{
- private DomainModel domainModel;
-
private File pomFile;
private JXPathContext context;
@@ -45,24 +42,6 @@
JXPathContextReferenceImpl.addNodePointerFactory( new Xpp3DomPointerFactory() );
}
- public PomTestWrapper( DomainModel domainModel )
- throws IOException
- {
- this( null, domainModel );
- }
-
- public PomTestWrapper( File pomFile, DomainModel domainModel )
- throws IOException
- {
- if ( domainModel == null )
- {
- throw new IllegalArgumentException( "domainModel: null" );
- }
- this.domainModel = domainModel;
- this.pomFile = pomFile;
- context = JXPathContext.newContext( domainModel.getModel());
- }
-
public PomTestWrapper( File pomFile, MavenProject mavenProject )
throws IOException
{
@@ -86,39 +65,11 @@
context = JXPathContext.newContext( mavenProject.getModel() );
}
- public PomTestWrapper( File file )
- throws IOException
- {
- if ( file == null )
- {
- throw new IllegalArgumentException( "file: null" );
- }
-
- this.domainModel = new DomainModel( file );
- context = JXPathContext.newContext( domainModel.getModel() );
- }
-
public MavenProject getMavenProject()
{
return mavenProject;
}
- public DomainModel getDomainModel()
- throws IOException {
- if ( domainModel == null && mavenProject != null )
- {
- domainModel = new DomainModel( mavenProject.getModel() );
- int lineageCount = 1;
- for ( MavenProject parent = mavenProject.getParent(); parent != null; parent = parent.getParent() )
- {
- lineageCount++;
- }
- domainModel.setLineageCount( lineageCount );
- }
-
- return this.domainModel;
- }
-
public File getBasedir()
{
return ( pomFile != null ) ? pomFile.getParentFile() : null;
Modified: maven/components/branches/MNG-2766/maven-core/src/test/java/org/apache/maven/settings/PomConstructionWithSettingsTest.java
URL: http://svn.apache.org/viewvc/maven/components/branches/MNG-2766/maven-core/src/test/java/org/apache/maven/settings/PomConstructionWithSettingsTest.java?rev=778500&r1=778499&r2=778500&view=diff
==============================================================================
--- maven/components/branches/MNG-2766/maven-core/src/test/java/org/apache/maven/settings/PomConstructionWithSettingsTest.java (original)
+++ maven/components/branches/MNG-2766/maven-core/src/test/java/org/apache/maven/settings/PomConstructionWithSettingsTest.java Mon May 25 20:59:59 2009
@@ -69,7 +69,6 @@
{
PomTestWrapper pom = buildPom( "repositories" );
assertEquals("maven-core-it-0", pom.getValue( "repositories[1]/id" ));
- System.out.println(pom.getDomainModel().asString());
}
private PomTestWrapper buildPom( String pomPath )