jvanzyl 2003/12/07 20:52:10
Modified: maven-project/src/java/org/apache/maven/project
DefaultProjectBuilder.java ProjectBuilder.java
maven-project/src/test/org/apache/maven/project
DefaultProjectBuilderTest.java
Added: maven-project/src/java/org/apache/maven/project Project.java
Log:
o tests are running, now time to fix the failures and get the coverage up.
Revision Changes Path
1.8 +6 -6
maven-components/maven-project/src/java/org/apache/maven/project/DefaultProjectBuilder.java
Index: DefaultProjectBuilder.java
===================================================================
RCS file:
/home/cvs/maven-components/maven-project/src/java/org/apache/maven/project/DefaultProjectBuilder.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- DefaultProjectBuilder.java 8 Dec 2003 04:41:51 -0000 1.7
+++ DefaultProjectBuilder.java 8 Dec 2003 04:52:10 -0000 1.8
@@ -60,22 +60,22 @@
// Protected methods to be used by the Maven facade.
// ----------------------------------------------------------------------
- public MavenProject build( File project )
+ public Project build( File project )
throws Exception
{
return getProject( project, true );
}
- public MavenProject getProject( File project )
+ public Project getProject( File project )
throws Exception
{
return getProject( project, true );
}
- public MavenProject getProject( File projectDescriptor, boolean useParentPom )
+ public Project getProject( File projectDescriptor, boolean useParentPom )
throws Exception
{
- MavenProject project = new MavenProject();
+ Project project = new Project();
Map properties = createProjectProperties( projectDescriptor.getParentFile()
);
@@ -124,7 +124,7 @@
File parentModel = new File( modelToExtend );
- MavenProject parent = (MavenProject) parentPoms.get(
parentModel.getCanonicalPath() );
+ Project parent = (Project) parentPoms.get(
parentModel.getCanonicalPath() );
if ( parent == null )
{
@@ -399,7 +399,7 @@
for ( int i = 0; i < files.length; i++ )
{
- MavenProject p = getProject( new File( files[i] ) );
+ Project p = getProject( new File( files[i] ) );
projects.add( p );
}
1.5 +2 -2
maven-components/maven-project/src/java/org/apache/maven/project/ProjectBuilder.java
Index: ProjectBuilder.java
===================================================================
RCS file:
/home/cvs/maven-components/maven-project/src/java/org/apache/maven/project/ProjectBuilder.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- ProjectBuilder.java 8 Dec 2003 04:41:51 -0000 1.4
+++ ProjectBuilder.java 8 Dec 2003 04:52:10 -0000 1.5
@@ -11,9 +11,9 @@
static String DEFAULTS_PROPERTIES = "driver.properties";
- MavenProject getProject( File project )
+ Project getProject( File project )
throws Exception;
- MavenProject build( File project )
+ Project build( File project )
throws Exception;
}
1.8 +0 -24
maven-components/maven-project/src/java/org/apache/maven/project/Project.java
1.7 +2 -1
maven-components/maven-project/src/test/org/apache/maven/project/DefaultProjectBuilderTest.java
Index: DefaultProjectBuilderTest.java
===================================================================
RCS file:
/home/cvs/maven-components/maven-project/src/test/org/apache/maven/project/DefaultProjectBuilderTest.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- DefaultProjectBuilderTest.java 8 Dec 2003 04:41:51 -0000 1.6
+++ DefaultProjectBuilderTest.java 8 Dec 2003 04:52:10 -0000 1.7
@@ -23,7 +23,7 @@
private ProjectBuilder projectBuilder;
/** Project. */
- private MavenProject project;
+ private Project project;
/**
*
@@ -74,6 +74,7 @@
// ----------------------------------------------------------------------
assertEquals( "3", model.getModelVersion() );
+
assertEquals( "maven", model.getGroupId() );
assertEquals( "Maven", model.getName() );
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
