brett 2003/12/30 17:36:32
Modified: src/test/java/org/apache/maven/project Tag: MAVEN-1_0-BRANCH
BasedirTest.java
src/java/org/apache/maven/project Tag: MAVEN-1_0-BRANCH
Build.java
Log:
resource inheritence
Revision Changes Path
No revision
No revision
1.2.4.1 +1 -19 maven/src/test/java/org/apache/maven/project/BasedirTest.java
Index: BasedirTest.java
===================================================================
RCS file: /home/cvs/maven/src/test/java/org/apache/maven/project/BasedirTest.java,v
retrieving revision 1.2
retrieving revision 1.2.4.1
diff -u -r1.2 -r1.2.4.1
--- BasedirTest.java 19 Aug 2003 04:45:37 -0000 1.2
+++ BasedirTest.java 31 Dec 2003 01:36:32 -0000 1.2.4.1
@@ -85,12 +85,6 @@
new File( basedir, "src/test" ).getCanonicalPath() );
assertEquals( "check aspect source directory",
p.getBuild().getAspectSourceDirectory(),
new File( basedir, "src/java" ).getCanonicalPath() );
- for ( Iterator i = p.getBuild().getResources().iterator(); i.hasNext(); )
- {
- Resource r = ( Resource ) i.next();
- assertEquals( "check resource directory", r.getDirectory(),
- new File( basedir, "src/messages" ).getCanonicalPath() );
- }
}
/**
@@ -108,12 +102,6 @@
new File( basedir, "src/test" ).getCanonicalPath() );
assertEquals( "check aspect source directory", new File(
p.getBuild().getAspectSourceDirectory() ).getCanonicalPath(),
new File( basedir, "src/java" ).getCanonicalPath() );
- for ( Iterator i = p.getBuild().getResources().iterator(); i.hasNext(); )
- {
- Resource r = ( Resource ) i.next();
- assertEquals( "check resource directory", new File( r.getDirectory()
).getCanonicalPath(),
- new File( basedir, "src/messages" ).getCanonicalPath() );
- }
}
/**
@@ -132,12 +120,6 @@
new File( basedir, "src/test/basedir/extend-1"
).getCanonicalPath() );
assertEquals( "check aspect source directory",
p.getBuild().getAspectSourceDirectory(),
new File( basedir, "src/test/basedir/extend-1"
).getCanonicalPath() );
- for ( Iterator i = p.getBuild().getResources().iterator(); i.hasNext(); )
- {
- Resource r = ( Resource ) i.next();
- assertEquals( "check resource directory", r.getDirectory(),
- new File( basedir, "src/test/basedir/extend-2"
).getCanonicalPath() );
- }
}
/**
No revision
No revision
1.24.4.2 +2 -3 maven/src/java/org/apache/maven/project/Build.java
Index: Build.java
===================================================================
RCS file: /home/cvs/maven/src/java/org/apache/maven/project/Build.java,v
retrieving revision 1.24.4.1
retrieving revision 1.24.4.2
diff -u -r1.24.4.1 -r1.24.4.2
--- Build.java 26 Nov 2003 11:45:17 -0000 1.24.4.1
+++ Build.java 31 Dec 2003 01:36:32 -0000 1.24.4.2
@@ -352,7 +352,6 @@
/**
* Setup inheritence from a parent project build element.
* @param parent the parent build element
- * @todo [1.0] merging the resources causes the unit tests to fail, but we
didn't provide this before anyway
*/
void mergeParent(Build parent)
{
@@ -381,7 +380,7 @@
nagEmailAddress = parent.nagEmailAddress;
}
-// Project.mergeLists(parent.resources, resources);
+ Project.mergeLists(parent.resources, resources);
Project.mergeLists(parent.sourceModifications, sourceModifications);
if (unitTest == null)
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
